summary refs log tree commit diff stats
path: root/compiler
diff options
context:
space:
mode:
authorAndreas Rumpf <rumpf_a@web.de>2020-07-08 18:59:34 +0200
committerGitHub <noreply@github.com>2020-07-08 18:59:34 +0200
commitbc712c28fce6e8a849af305f1f84ab193c7cf090 (patch)
tree4a80d53ff54d4990780c05432aa0a633ecfd7ff6 /compiler
parent27579cfd3a473c1b449c6c62997107005f8d4c90 (diff)
downloadNim-bc712c28fce6e8a849af305f1f84ab193c7cf090.tar.gz
fixes #14865 (#14937)
Diffstat (limited to 'compiler')
-rw-r--r--compiler/ccgthreadvars.nim1
-rw-r--r--compiler/ccgtypes.nim1
2 files changed, 2 insertions, 0 deletions
diff --git a/compiler/ccgthreadvars.nim b/compiler/ccgthreadvars.nim
index 8bf5e573f..eba46f829 100644
--- a/compiler/ccgthreadvars.nim
+++ b/compiler/ccgthreadvars.nim
@@ -42,6 +42,7 @@ proc declareThreadVar(m: BModule, s: PSym, isExtern: bool) =
 proc generateThreadLocalStorage(m: BModule) =
   if m.g.nimtv != nil and (usesThreadVars in m.flags or sfMainModule in m.module.flags):
     for t in items(m.g.nimtvDeps): discard getTypeDesc(m, t)
+    finishTypeDescriptions(m)
     m.s[cfsSeqTypes].addf("typedef struct {$1} NimThreadVars;$n", [m.g.nimtv])
 
 proc generateThreadVarsSize(m: BModule) =
diff --git a/compiler/ccgtypes.nim b/compiler/ccgtypes.nim
index fb205110e..f1dc85818 100644
--- a/compiler/ccgtypes.nim
+++ b/compiler/ccgtypes.nim
@@ -944,6 +944,7 @@ proc finishTypeDescriptions(m: BModule) =
     else:
       discard getTypeDescAux(m, t, check)
     inc(i)
+  m.typeStack.setLen 0
 
 template cgDeclFrmt*(s: PSym): string =
   s.constraint.strVal