widen: Keep track of nodes when creating new TypeMap

jinko-core · Aug 29, 2024 · f3185b3 · f3185b3
1 parent 4b2534a
commit f3185b3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/typecheck/src/typemap.rs b/typecheck/src/typemap.rs
@@ -23,8 +23,8 @@ pub struct TypeRef(pub(crate) OriginIdx); // FIXME: Remove vis?
 
 #[derive(Debug)]
 pub struct TypeMap {
-    nodes: HashMap<OriginIdx, TypeRef>,
-    // FIXME: Remove?
+    // FIXME: Remove pub-ability?
+    pub(crate) nodes: HashMap<OriginIdx, TypeRef>,
     pub(crate) types: HashMap<TypeRef, Type>,
 }
 

diff --git a/typecheck/src/widen.rs b/typecheck/src/widen.rs
@@ -33,7 +33,7 @@ fn widen_inner(
 }
 
 pub fn widen(fir: &Fir<FlattenData<'_>>, type_ctx: TypeCtx<TypeMap>) -> TypeCtx<TypeMap> {
-    let types = type_ctx
+    let mut types = type_ctx
         .types
         .types
         .iter()
@@ -48,6 +48,10 @@ pub fn widen(fir: &Fir<FlattenData<'_>>, type_ctx: TypeCtx<TypeMap>) -> TypeCtx<
             tymap
         });
 
+    // Don't forget to keep track of all the nodes that make use of the types
+    // we just widened
+    types.nodes = type_ctx.types.nodes;
+
     TypeCtx {
         primitives: type_ctx.primitives,
         types,