jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes #19724; don't be aggressive when you infer sink parameters (#20314)

Browse source 
* fixes #19724; don't be aggressive when you infer sink parameters

* better logic and updated tests

* wip

* fixes tests (#20330)

* restore tests

* try splitPath

Co-authored-by: xflywind <43030857+xflywind@users.noreply.github.com>

* Apply suggestions from code review

* Apply suggestions from code review

Co-authored-by: ringabout <43030857+ringabout@users.noreply.github.com>
Co-authored-by: xflywind <43030857+xflywind@users.noreply.github.com>
This commit is contained in:
Andreas Rumpf 2022-09-12 00:58:29 +02:00 • committed by GitHub
commit 6bf21e7b3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
compiler/sempass2.nim
View file

@ -67,7 +67,7 @@ type
exc: PNode # stack of exceptions
tags: PNode # list of tags
forbids: PNode # list of tags
bottom, inTryStmt, inExceptOrFinallyStmt, leftPartOfAsgn: int
bottom, inTryStmt, inExceptOrFinallyStmt, leftPartOfAsgn, inIfStmt: int
owner: PSym
ownerModule: PSym
init: seq[int] # list of initialized variables
@ -681,6 +681,7 @@ proc breaksBlock(n: PNode): bool =
proc trackCase(tracked: PEffects, n: PNode) =
track(tracked, n[0])
inc tracked.inIfStmt
let oldState = tracked.init.len
let oldFacts = tracked.guards.s.len
let stringCase = n[0].typ != nil and skipTypes(n[0].typ,
@ -707,9 +708,11 @@ proc trackCase(tracked: PEffects, n: PNode) =
if count >= toCover: tracked.init.add id
# else we can't merge
setLen(tracked.guards.s, oldFacts)
dec tracked.inIfStmt
proc trackIf(tracked: PEffects, n: PNode) =
track(tracked, n[0][0])
inc tracked.inIfStmt
let oldFacts = tracked.guards.s.len
addFact(tracked.guards, n[0][0])
let oldState = tracked.init.len
@ -740,6 +743,7 @@ proc trackIf(tracked: PEffects, n: PNode) =
if count >= toCover: tracked.init.add id
# else we can't merge as it is not exhaustive
setLen(tracked.guards.s, oldFacts)
dec tracked.inIfStmt
proc trackBlock(tracked: PEffects, n: PNode) =
if n.kind in {nkStmtList, nkStmtListExpr}:
@ -819,6 +823,10 @@ proc passedToEffectsDelayedParam(tracked: PEffects; n: PNode) =
markSideEffect(tracked, n, n.info)
]#
proc checkForSink(tracked: PEffects; n: PNode) =
if tracked.inIfStmt == 0:
checkForSink(tracked.config, tracked.c.idgen, tracked.owner, n)
proc trackCall(tracked: PEffects; n: PNode) =
template gcsafeAndSideeffectCheck() =
if notGcSafe(op) and not importedFromC(a):
@ -918,7 +926,7 @@ proc trackCall(tracked: PEffects; n: PNode) =
case op[i].kind
of tySink:
createTypeBoundOps(tracked, op[i][0], n.info)
checkForSink(tracked.config, tracked.c.idgen, tracked.owner, n[i])
checkForSink(tracked, n[i])
of tyVar:
tracked.hasDangerousAssign = true
#of tyOut:
@ -1080,7 +1088,7 @@ proc track(tracked: PEffects, n: PNode) =
if tracked.owner.kind != skMacro and n[0].typ.kind notin {tyOpenArray, tyVarargs}:
createTypeBoundOps(tracked, n[0].typ, n.info)
if n[0].kind != nkSym or not isLocalVar(tracked, n[0].sym):
checkForSink(tracked.config, tracked.c.idgen, tracked.owner, n[1])
checkForSink(tracked, n[1])
if not tracked.hasDangerousAssign and n[0].kind != nkSym:
tracked.hasDangerousAssign = true
of nkVarSection, nkLetSection:
@ -1187,9 +1195,9 @@ proc track(tracked: PEffects, n: PNode) =
if x.kind == nkExprColonExpr:
if x[0].kind == nkSym:
notNilCheck(tracked, x[1], x[0].sym.typ)
checkForSink(tracked.config, tracked.c.idgen, tracked.owner, x[1])
checkForSink(tracked, x[1])
else:
checkForSink(tracked.config, tracked.c.idgen, tracked.owner, x)
checkForSink(tracked, x)
setLen(tracked.guards.s, oldFacts)
if tracked.owner.kind != skMacro:
# XXX n.typ can be nil in runnableExamples, we need to do something about it.
@ -1204,7 +1212,7 @@ proc track(tracked: PEffects, n: PNode) =
createTypeBoundOps(tracked, n[i][0].typ, n.info)
else:
createTypeBoundOps(tracked, n[i].typ, n.info)
checkForSink(tracked.config, tracked.c.idgen, tracked.owner, n[i])
checkForSink(tracked, n[i])
of nkPragmaBlock:
let pragmaList = n[0]
var bc = createBlockContext(tracked)
@ -1271,7 +1279,7 @@ proc track(tracked: PEffects, n: PNode) =
of nkBracket:
for i in 0..<n.safeLen:
track(tracked, n[i])
checkForSink(tracked.config, tracked.c.idgen, tracked.owner, n[i])
checkForSink(tracked, n[i])
if tracked.owner.kind != skMacro:
createTypeBoundOps(tracked, n.typ, n.info)
of nkBracketExpr: