diff options
| author | Jacek Sieka <arnetheduck@gmail.com> | 2016-08-25 22:59:51 +0800 |
|---|---|---|
| committer | Jacek Sieka <arnetheduck@gmail.com> | 2016-08-25 22:59:51 +0800 |
| commit | db2f96daba9c04db2f24cb783c79fb37799cd9ea (patch) | |
| tree | 567beb43c7e4549abfcae1ea66e5232d7525e001 /compiler/ccgtrav.nim | |
| parent | 3116744c86f37ac4e4e5fec3d6d1635304ed717f (diff) | |
| parent | 84a09d2f5b0866491e55fef0fef541e8cc548852 (diff) | |
| download | Nim-db2f96daba9c04db2f24cb783c79fb37799cd9ea.tar.gz | |
Merge remote-tracking branch 'origin/devel' into initallocator-fix
Diffstat (limited to 'compiler/ccgtrav.nim')
| -rw-r--r-- | compiler/ccgtrav.nim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/ccgtrav.nim b/compiler/ccgtrav.nim index 0da6396ea..c4d47f148 100644 --- a/compiler/ccgtrav.nim +++ b/compiler/ccgtrav.nim @@ -100,7 +100,7 @@ proc genTraverseProcSeq(c: var TTraversalClosure, accessor: Rope, typ: PType) = proc genTraverseProc(m: BModule, typ: PType, reason: TTypeInfoReason): Rope = var c: TTraversalClosure var p = newProc(nil, m) - result = getGlobalTempName() + result = getTempName(m) case reason of tiNew: c.visitorFrmt = "#nimGCvisit((void*)$1, op);$n" @@ -135,7 +135,7 @@ proc genTraverseProcForGlobal(m: BModule, s: PSym): Rope = var c: TTraversalClosure var p = newProc(nil, m) var sLoc = s.loc.r - result = getGlobalTempName() + result = getTempName(m) if sfThread in s.flags and emulatedThreadVars(): accessThreadLocalVar(p, s) @@ -143,7 +143,7 @@ proc genTraverseProcForGlobal(m: BModule, s: PSym): Rope = c.visitorFrmt = "#nimGCvisit((void*)$1, 0);$n" c.p = p - let header = "N_NIMCALL(void, $1)()" % [result] + let header = "N_NIMCALL(void, $1)(void)" % [result] genTraverseProc(c, sLoc, s.loc.t) let generatedProc = "$1 {$n$2$3$4}$n" % |