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

fix #20866 [ORC] Bad codegen for global pointer to iterator (#20876)

Browse source
This commit is contained in:
Bung 2022-11-23 03:05:16 +08:00 • committed by GitHub
commit 354eb2a86c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/semstmts.nim
View file

@ -593,9 +593,12 @@ proc msgSymChoiceUseQualifier(c: PContext; n: PNode; note = errGenerated) =
template isLocalVarSym(n: PNode): bool = template isLocalVarSym(n: PNode): bool =
n.kind == nkSym and n.kind == nkSym and
n.sym.kind in {skVar, skLet} and not (n.sym.kind in {skVar, skLet} and not
({sfGlobal, sfPure} <= n.sym.flags or ({sfGlobal, sfPure} <= n.sym.flags or
sfCompileTime in n.sym.flags) sfCompileTime in n.sym.flags) or
n.sym.kind in {skProc, skFunc, skIterator} and
sfGlobal notin n.sym.flags
)
proc usesLocalVar(n: PNode): bool = proc usesLocalVar(n: PNode): bool =
for z in 1 ..< n.len: for z in 1 ..< n.len:

10
tests/global/t3505.nim
View file

@ -4,7 +4,7 @@ action: "reject"
nimout: ''' nimout: '''
t3505.nim(22, 22) Error: cannot assign local to global variable t3505.nim(22, 22) Error: cannot assign local to global variable
t3505.nim(31, 28) Error: cannot assign local to global variable t3505.nim(31, 28) Error: cannot assign local to global variable
t3505.nim(39, 29) Error: cannot assign local to global variable
@ -31,3 +31,11 @@ proc main() =
var x {.global.} = initX2(initX(f)) var x {.global.} = initX2(initX(f))
main() main()
# issue #20866
proc foo2() =
iterator bar() {.closure.} =
discard
var g {.global.} = rawProc(bar)
foo2()