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

fixes explicit globals in macros (#21502)

Browse source
This commit is contained in:
ringabout 2023-03-13 03:03:46 +08:00 • committed by GitHub
commit b2c1dcbbc9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/vmgen.nim
View file

@ -1909,7 +1909,8 @@ proc genVarSection(c: PCtx; n: PNode) =
c.genAdditionalCopy(a[2], opcWrDeref, tmp, 0, val) c.genAdditionalCopy(a[2], opcWrDeref, tmp, 0, val)
c.freeTemp(val) c.freeTemp(val)
c.freeTemp(tmp) c.freeTemp(tmp)
elif not importcCondVar(s) and not (s.typ.kind == tyProc and s.typ.callConv == ccClosure): # fixes #10938 elif not importcCondVar(s) and not (s.typ.kind == tyProc and s.typ.callConv == ccClosure) and
sfPure notin s.flags: # fixes #10938
# there is a pre-existing issue with closure types in VM # there is a pre-existing issue with closure types in VM
# if `(var s: proc () = default(proc ()); doAssert s == nil)` works for you; # if `(var s: proc () = default(proc ()); doAssert s == nil)` works for you;
# you might remove the second condition. # you might remove the second condition.

13
tests/vm/tvmmisc.nim
View file

@ -643,3 +643,16 @@ const b = block:
doAssert a == @[@[0, 1, 2], @[0, 1, 2], @[0, 1, 2]] doAssert a == @[@[0, 1, 2], @[0, 1, 2], @[0, 1, 2]]
doAssert b == @[@[0, 1, 2], @[0, 1, 2], @[0, 1, 2]] doAssert b == @[@[0, 1, 2], @[0, 1, 2], @[0, 1, 2]]
macro m1(s: string): int =
var ProcID {.global, compileTime.}: int
inc(ProcID)
result = newLit(ProcID)
proc macroGlobal =
doAssert m1("Macro argument") == 1
doAssert m1("Macro argument") == 2
doAssert m1("Macro argument") == 3
static: macroGlobal()
macroGlobal()