fix: added fixes for global scope

Author: Zffu

compiler/astoir_hir/src/scope.rs

@@ -66,6 +66,7 @@ impl HIRGlobalScopeStorage {
         name: EntryKey,
         descriptor: HIRFunction,
         brctx: HIRBranchedContext,
+        origin: &K,
     ) -> DiagnosticResult<usize> {
         self.descriptors.push(descriptor);
         self.contexts.push(brctx);

compiler/astoir_hir_lowering/src/func.rs

@@ -135,7 +135,9 @@ pub fn lower_ast_function_declaration(
         context.global_scope.scope.entry_to_ind.remove(&key);
         context.global_scope.scope.value_to_ind.remove(&entry);
         context.global_scope.descriptors.pop();
+        //context.global_scope.contexts.pop();
         context.global_scope.scope.descriptor_counter -= 1;
+        //context.global_scope.scope.ctx_counter -= 1;
 
         // Append the new verison as a impl-containing function
 

compiler/astoir_mir/src/builder.rs

@@ -838,7 +838,7 @@ pub fn build_call(
     ind: usize,
     args: Vec<BaseMIRValue>,
 ) -> DiagnosticResult<Option<BaseMIRValue>> {
-    let func = &ctx.functions[func];
+    let func = &ctx.functions[&func];
 
     for (arg, t) in args.iter().zip(func.arguments.iter()) {
         if !arg.vtype.is_truly_eq(t) {

compiler/astoir_mir/src/ctx.rs

@@ -16,7 +16,7 @@ use crate::{
 };
 
 pub struct MIRContext {
-    pub functions: Vec<MIRFunction>,
+    pub functions: HashMap<usize, MIRFunction>,
     pub blocks: Vec<MIRBlock>,
 
     pub block_to_func: HashMap<usize, usize>,
@@ -29,7 +29,7 @@ pub struct MIRContext {
 impl MIRContext {
     pub fn new() -> Self {
         MIRContext {
-            functions: vec![],
+            functions: HashMap::new(),
             ssa_hints: HintStorage::new(),
             blocks: vec![],
             writer: InstructionWriterPosition {
@@ -45,7 +45,7 @@ impl MIRContext {
 
         self.blocks.push(MIRBlock::new(ind));
 
-        self.functions[func].blocks.push(ind);
+        self.functions.get_mut(&func).unwrap().blocks.push(ind);
 
         self.block_to_func.insert(ind, func);
 
@@ -67,11 +67,10 @@ impl MIRContext {
     }
 
     pub fn append_function(&mut self, func: MIRFunction) -> usize {
-        let ind = self.functions.len();
+        let id = func.id;
+        self.functions.insert(id, func);
 
-        self.functions.push(func);
-
-        return ind;
+        return id;
     }
 
     pub fn append_inst(&mut self, inst: MIRInstruction) -> InstructionValue {
@@ -156,7 +155,7 @@ impl MIRContext {
 impl Display for MIRContext {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         for func in &self.functions {
-            writeln!(f, "{}", func)?;
+            writeln!(f, "{}", func.1)?;
         }
 
         for block in &self.blocks {

compiler/astoir_mir/src/funcs.rs

@@ -31,15 +31,15 @@ impl MIRFunction {
         arguments: Vec<Type>,
         return_type: Option<Type>,
         is_from_struct: bool,
-        ctx: &MIRContext,
+        id: usize,
     ) -> Self {
         return MIRFunction {
             blocks: vec![],
             name: HashedString::new(name),
             arguments,
             return_type,
             is_from_struct,
-            id: ctx.functions.len(),
+            id,
         };
     }
 

compiler/astoir_mir/src/insts/mod.rs

@@ -294,7 +294,7 @@ impl MIRInstruction {
                 function,
                 arguments: _,
             } => {
-                let func = &ctx.functions[*function];
+                let func = &ctx.functions[function];
 
                 return func.return_type.is_some();
             }
@@ -476,7 +476,7 @@ impl MIRInstruction {
                 function,
                 arguments: _,
             } => {
-                let func = &ctx.functions[*function];
+                let func = &ctx.functions[function];
 
                 return func.return_type.clone().unwrap();
             }

compiler/astoir_mir_lowering/src/funcs.rs

@@ -62,7 +62,7 @@ pub fn lower_hir_function_decl(
 
         let name = fns.2.clone();
 
-        let mut func = MIRFunction::new(name, args, ret_type, requires_this, &cctx.mir_ctx);
+        let mut func = MIRFunction::new(name, args, ret_type, requires_this, func_name);
         let block = func.append_entry_block(&mut cctx.mir_ctx);
 
         cctx.mir_ctx.writer.move_end(block);
@@ -132,7 +132,7 @@ pub fn lower_hir_shadow_decl(
             ret_type = None
         }
 
-        let func = MIRFunction::new(name, args, ret_type, false, &ctx.mir_ctx);
+        let func = MIRFunction::new(name, args, ret_type, false, func_name);
 
         ctx.mir_ctx.append_function(func);
         return Ok(true);

compiler/astoir_mir_lowering/src/introductions.rs

@@ -47,7 +47,7 @@ pub fn handle_var_introduction_queue(
             }
         };
 
-        let fns = &ctx.hir_ctx.global_scope.implementations[*fns_ind].0;
+        let fns = &ctx.hir_ctx.global_scope.contexts[*fns_ind];
 
         let eligible = fns.is_eligible_for_ssa(new_var);
 

compiler/astoir_mir_lowering/src/lib.rs

@@ -6,8 +6,7 @@ use astoir_hir::{
 };
 use astoir_mir::{ctx::MIRContext, funcs::MIRFunction};
 use compiler_typing::{
-    SizedType, TypedGlobalScope, TypedGlobalScopeEntry, raw::RawType,
-    structs::LoweredStructTypeContainer, tree::Type,
+    SizedType, TypedGlobalScopeEntry, raw::RawType, structs::LoweredStructTypeContainer, tree::Type,
 };
 use compiler_utils::utils::indexed::IndexStorage;
 use diagnostics::{DiagnosticResult, unsure_panic};
@@ -62,9 +61,7 @@ pub fn lower_hir(ctx: HIRContext) -> DiagnosticResult<MIRContext> {
                 descriptor_ind: _,
                 impl_ind,
             } => {
-                let node = lowering_ctx.hir_ctx.global_scope.implementations[impl_ind]
-                    .1
-                    .clone();
+                let node = lowering_ctx.hir_ctx.global_scope.implementations[impl_ind].clone();
 
                 lower_hir_top_level(node, &mut lowering_ctx)?;
             }
@@ -95,7 +92,7 @@ pub fn lower_hir(ctx: HIRContext) -> DiagnosticResult<MIRContext> {
                     ret_type = None
                 }
 
-                let func = MIRFunction::new(name, args, ret_type, false, &mut lowering_ctx.mir_ctx);
+                let func = MIRFunction::new(name, args, ret_type, false, entry.parent_index);
 
                 lowering_ctx.mir_ctx.append_function(func);
             }

compiler/astoir_mir_lowering/src/vars.rs

@@ -38,6 +38,13 @@ pub fn lower_hir_variable_declaration(
             } => impl_ind,
 
             _ => {
+                println!("Curr entry: {}", func);
+                println!("Entry dump: ");
+
+                for entry in ctx.hir_ctx.global_scope.scope.entries.clone() {
+                    println!("- {:#?}", entry);
+                }
+
                 return Err(make_expected_simple_error_originless(
                     &"function".to_string(),
                     &ctx.hir_ctx.global_scope.scope.entries[func].entry_type,
@@ -46,7 +53,7 @@ pub fn lower_hir_variable_declaration(
             }
         };
 
-        let local_ctx = ctx.hir_ctx.global_scope.contexts[*fns_ind].0.clone();
+        let local_ctx = ctx.hir_ctx.global_scope.contexts[*fns_ind].clone();
 
         if local_ctx.is_eligible_for_ssa(variable) {
             if default_val.is_some() {