ic: properly handle module references

A module ID isn't necessarily the same before and after loading/storing a rodfile. Loading and storing of `LibId`s now considers this.
nim-works · Jul 15, 2023 · 2ce0fb9 · 2ce0fb9
1 parent 6f3988a
commit 2ce0fb9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/compiler/ic/ic.nim b/compiler/ic/ic.nim
@@ -423,7 +423,8 @@ proc storeSym*(s: PSym; c: var PackedEncoder; m: var PackedModule): PackedItemId
     p.typ = s.typ.storeType(c, m)
     c.addMissing s.owner
     p.owner = s.owner.safeItemId(c, m)
-    p.annex = s.annex
+    if s.annex.index != 0:
+      p.annex = (toLitId(s.annex.module.FileIndex, c, m), s.annex.index)
 
     # fill the reserved slot, nothing else:
     m.syms[s.itemId.item] = p
@@ -832,10 +833,15 @@ proc loadProcBody(c: var PackedDecoder; g: var PackedModuleGraph; thisModule: in
       result = loadNodes(c, g, thisModule, tree, n0)
     inc i
 
+proc moduleIndex(c: var PackedDecoder; g: PackedModuleGraph; thisModule: int;
+                 module: LitId): int32 {.inline.} =
+  ## Returns the module ID for the stored ``FileIndex`` identified by `module`.
+  result = if module == LitId(0): thisModule.int32
+           else: toFileIndexCached(c, g, thisModule, module).int32
+
 proc moduleIndex*(c: var PackedDecoder; g: PackedModuleGraph; thisModule: int;
                   s: PackedItemId): int32 {.inline.} =
-  result = if s.module == LitId(0): thisModule.int32
-           else: toFileIndexCached(c, g, thisModule, s.module).int32
+  result = moduleIndex(c, g, thisModule, s.module)
 
 proc symHeaderFromPacked(c: var PackedDecoder; g: var PackedModuleGraph;
                          s: PackedSym; si, item: int32): PSym =
@@ -870,7 +876,10 @@ proc symBodyFromPacked(c: var PackedDecoder; g: var PackedModuleGraph;
     loadAstBodyLazy(s, ast)
   else:
     loadAstBody(s, ast)
-  result.annex = s.annex
+
+  if s.annex.index != 0:
+    result.annex = LibId(module: moduleIndex(c, g, si, s.annex.module),
+                        index: s.annex.index)
 
   if s.kind in {skLet, skVar, skField, skForVar}:
     result.guard = loadSym(c, g, si, s.guard)

diff --git a/compiler/ic/packed_ast.nim b/compiler/ic/packed_ast.nim
@@ -61,7 +61,7 @@ type
     offset*: int
     externalName*: LitId # instead of TLoc
     extFlags*: ExternalFlags
-    annex*: LibId
+    annex*: tuple[module: LitId, index: uint32]
     constraint*: NodeId
 
   PackedType* = object