codegen: Skip true type dependency cache for boxed types

SerenityOS · Feb 18, 2023 · ba0c036 · ba0c036
1 parent 953089b
commit ba0c036
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/selfhost/codegen.jakt b/selfhost/codegen.jakt
@@ -456,14 +456,14 @@ struct CodeGenerator {
     fn extract_dependencies_from(this, type_id: TypeId, dependency_graph: [String : [String]], top_level: bool) throws -> [String] {
         mut dependencies: [String] = []
 
-        if dependency_graph.contains(type_id.to_string()) {
+        let type_ = .program.get_type(type_id)
+        if not type_.is_boxed(program: .program) and dependency_graph.contains(type_id.to_string()) {
             for dependency in dependency_graph.get(type_id.to_string())! {
                 dependencies.push(dependency)
             }
             return dependencies
         }
 
-        let type_ = .program.get_type(type_id)
         let inner_dependencies = match type_ {
             Enum(enum_id) => .extract_dependencies_from_enum(enum_id, dependency_graph, top_level)
             GenericEnumInstance(id) => .extract_dependencies_from_enum(enum_id: id, dependency_graph, top_level)

diff --git a/selfhost/types.jakt b/selfhost/types.jakt
@@ -274,6 +274,13 @@ boxed enum Type {
     Function(params: [TypeId], can_throw: bool, return_type_id: TypeId, pseudo_function_id: FunctionId)
     Self
 
+
+    fn is_boxed(this, program: CheckedProgram) -> bool => match this {
+        Struct(struct_id) | GenericInstance(id: struct_id) => program.get_struct(struct_id).record_type is Class
+        Enum(enum_id) | GenericEnumInstance(id: enum_id) => program.get_enum(enum_id).is_boxed
+        else => false
+    }
+
     fn is_concrete(this) -> bool => match this {
         TypeVariable | Self | Unknown => false
         else => true