Cache more types

Princess-org · Dec 6, 2023 · 260014a · 260014a
1 parent e2ed9d7
commit 260014a
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/src/compiler.pr b/src/compiler.pr
@@ -563,7 +563,7 @@ export type State = struct {
     // Vector of LoopState 
     loops: &Vector(LoopState)
     // Map of Value
-    ditypes: &SMap(&Value)
+    ditypes: &Map(&typechecking::Type, &Value)
     difile: &Value
     diunit: &Value
     // Vector of Value
@@ -6430,10 +6430,7 @@ def di_type(tpe: &typechecking::Type, state: &State) -> &Value {
     }
 
     let anonymous = tpe.type_name == null
-    var ditpe: &Value = null
-    if not anonymous {
-        ditpe = state.ditypes.get_or_default(tpe.type_name, null)
-    }
+    var ditpe = state.ditypes.get_or_default(tpe, null)
     if ditpe { return ditpe }
 
     var name = tpe.type_name
@@ -6447,9 +6444,7 @@ def di_type(tpe: &typechecking::Type, state: &State) -> &Value {
 
     ditpe = {} !&Value
     let ditpep = push_meta(ditpe, state)
-    if not anonymous {
-        (@state).ditypes[tpe.type_name] = ditpep
-    }
+    (@state).ditypes[tpe] = ditpep
 
     if tpe.kind == typechecking::TypeKind::BOX {
         tpe = tpe.weak
@@ -9087,7 +9082,7 @@ export def make_state(module: &toolchain::Module) -> &State {
     let state = {
         module = module,
         loops = vector::make(LoopState),
-        ditypes = map::make(type &Value),
+        ditypes = map::make(type &typechecking::Type, type &Value),
         discope = vector::make(type &Value),
         current_block = make_block(),
         globals = map::make(type *),