semProcAux hasError cover fixupInstantiatedSymbols

nim-works · Oct 3, 2023 · cf0a45a · cf0a45a
1 parent 0e09df4
commit cf0a45a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/compiler/sem/seminst.nim b/compiler/sem/seminst.nim
@@ -119,15 +119,20 @@ proc instantiateBody(c: PContext, n, params: PNode, result, orig: PSym) =
     trackProc(c, result, result.ast[bodyPos])
     dec c.inGenericInst
 
-proc fixupInstantiatedSymbols(c: PContext, s: PSym) =
+proc fixupInstantiatedSymbols(c: PContext, s: PSym): bool =
+  result = true
   for i in 0..<c.generics.len:
     if c.generics[i].genericSym.id == s.id:
-      var oldPrc = c.generics[i].inst.sym
+      var 
+        oldPrc = c.generics[i].inst.sym
+        n = oldPrc.ast
+      if n.kind == nkError:
+        result = false
+        continue
       pushProcCon(c, oldPrc)
       pushOwner(c, oldPrc)
       pushInfoContext(c.config, oldPrc.info)
       openScope(c)
-      var n = oldPrc.ast
       n[bodyPos] = copyTree(getBody(c.graph, s))
       instantiateBody(c, n, oldPrc.typ.n, oldPrc, s)
       closeScope(c)

diff --git a/compiler/sem/semstmts.nim b/compiler/sem/semstmts.nim
@@ -2810,7 +2810,8 @@ proc semProcAux(c: PContext, n: PNode, validPragmas: TSpecialWords,
         result[bodyPos] = semGenericStmt(c, n[bodyPos])
         closeScope(c)
         if s.magic == mNone:
-          fixupInstantiatedSymbols(c, s)
+          if not fixupInstantiatedSymbols(c, s):
+            hasError = true
       if s.kind == skMethod: semMethodPrototype(c, s, result)
       popProcCon(c)
   else: