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

Fixes #10352 (#10416)

Browse source
This commit is contained in:
slangmgh 2019-01-28 16:34:03 +08:00 • committed by Andreas Rumpf
commit dfa5faea0f
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
compiler/cgen.nim
View file

@ -1327,16 +1327,6 @@ proc genInitCode(m: BModule) =
appcg(m, m.s[cfsTypeInit1], "static #TNimType $1[$2];$n", appcg(m, m.s[cfsTypeInit1], "static #TNimType $1[$2];$n",
[m.nimTypesName, rope(m.nimTypes)]) [m.nimTypesName, rope(m.nimTypes)])
if m.initProc.gcFrameId > 0:
moduleInitRequired = true
add(prc, initGCFrame(m.initProc))
if m.initProc.s(cpsLocals).len > 0:
moduleInitRequired = true
add(prc, genSectionStart(cpsLocals, m.config))
add(prc, m.initProc.s(cpsLocals))
add(prc, genSectionEnd(cpsLocals, m.config))
if m.preInitProc.s(cpsInit).len > 0 or m.preInitProc.s(cpsStmts).len > 0: if m.preInitProc.s(cpsInit).len > 0 or m.preInitProc.s(cpsStmts).len > 0:
# Give this small function its own scope # Give this small function its own scope
addf(prc, "{$N", []) addf(prc, "{$N", [])
@ -1362,6 +1352,19 @@ proc genInitCode(m: BModule) =
add(prc, genSectionEnd(cpsStmts, m.config)) add(prc, genSectionEnd(cpsStmts, m.config))
addf(prc, "}$N", []) addf(prc, "}$N", [])
# add new scope for following code, because old vcc compiler need variable
# be defined at the top of the block
addf(prc, "{$N", [])
if m.initProc.gcFrameId > 0:
moduleInitRequired = true
add(prc, initGCFrame(m.initProc))
if m.initProc.s(cpsLocals).len > 0:
moduleInitRequired = true
add(prc, genSectionStart(cpsLocals, m.config))
add(prc, m.initProc.s(cpsLocals))
add(prc, genSectionEnd(cpsLocals, m.config))
if m.initProc.s(cpsInit).len > 0 or m.initProc.s(cpsStmts).len > 0: if m.initProc.s(cpsInit).len > 0 or m.initProc.s(cpsStmts).len > 0:
moduleInitRequired = true moduleInitRequired = true
if optStackTrace in m.initProc.options and frameDeclared notin m.flags: if optStackTrace in m.initProc.options and frameDeclared notin m.flags:
@ -1388,6 +1391,7 @@ proc genInitCode(m: BModule) =
if m.initProc.gcFrameId > 0: if m.initProc.gcFrameId > 0:
moduleInitRequired = true moduleInitRequired = true
add(prc, deinitGCFrame(m.initProc)) add(prc, deinitGCFrame(m.initProc))
addf(prc, "}$N", [])
addf(prc, "}$N$N", []) addf(prc, "}$N$N", [])