Merge pull request #79 from Quickfall/fix/78-enum_lrus

[fix] Enum LRUs

Author: Zffu

compiler/astoir_mir_lowering/src/lib.rs

@@ -1,3 +1,5 @@
+use std::{collections::HashMap, hash::Hash};
+
 use astoir_hir::{ctx::HIRContext, nodes::{HIRNode, HIRNodeKind}};
 use astoir_mir::ctx::MIRContext;
 use compiler_typing::{SizedType, raw::RawType, structs::LoweredStructTypeContainer, tree::Type};
@@ -55,7 +57,7 @@ pub fn lower_hir(ctx: HIRContext) -> DiagnosticResult<MIRContext> {
 pub fn lower_hir_generic(ctx: &MIRLoweringContext, t: &Type, generic: &RawType) -> DiagnosticResult<Type> {
 	match generic {
 		RawType::Struct(a, b) => {
-			let mut lowered_container = LoweredStructTypeContainer { fields: IndexStorage::new(), functions: IndexStorage::new(), is_lowered_enum_child: false, is_lowered_enum_parent: false, lowered_enum_child: None, lowered_enum_parent: None };
+			let mut lowered_container = LoweredStructTypeContainer { fields: IndexStorage::new(), functions: IndexStorage::new(), is_lowered_enum_child: false, is_lowered_enum_parent: false, lowered_enum_child: None, lowered_enum_parent: None, hir_mir_indexes: HashMap::new() };
 
 			for field in &b.fields.vals {
 				lowered_container.fields.vals.push(lower_hir_type(ctx, field.clone().resolve(t))?);
@@ -65,7 +67,7 @@ pub fn lower_hir_generic(ctx: &MIRLoweringContext, t: &Type, generic: &RawType)
 		},
 
 		RawType::EnumEntry(container) => {
-			let mut lowered_container = LoweredStructTypeContainer { fields: IndexStorage::new(), functions: IndexStorage::new(), is_lowered_enum_child: true, is_lowered_enum_parent: false, lowered_enum_child: Some(container.clone()), lowered_enum_parent: None };
+			let mut lowered_container = LoweredStructTypeContainer { fields: IndexStorage::new(), functions: IndexStorage::new(), is_lowered_enum_child: true, is_lowered_enum_parent: false, lowered_enum_child: Some(container.clone()), lowered_enum_parent: None, hir_mir_indexes: HashMap::new() };
 
 			let parent = match &ctx.hir_ctx.type_storage.types.vals[container.parent] {
 				RawType::Enum(container) => container.clone(),
@@ -74,15 +76,20 @@ pub fn lower_hir_generic(ctx: &MIRLoweringContext, t: &Type, generic: &RawType)
 
 			lowered_container.fields.vals.push(Type::GenericLowered(parent.get_hint_type())); // Enum entry hint
 
+			let mut ind = 0;
 			for field in &container.fields.vals {
+				lowered_container.append_hir_index_conv(ind, lowered_container.fields.vals.len()); // Allow for LRU to work correctly
+
 				lowered_container.fields.vals.push(lower_hir_type(ctx, field.clone().resolve(t))?);
+
+				ind += 1;
 			}
 
 			return Ok(Type::GenericLowered(RawType::LoweredStruct(false, lowered_container))); 
 		},
 
 		RawType::Enum(container) => {
-			let mut lowered_container = LoweredStructTypeContainer { fields: IndexStorage::new(), functions: IndexStorage::new(), is_lowered_enum_child: false, is_lowered_enum_parent: true, lowered_enum_parent: Some(container.clone()), lowered_enum_child: None };
+			let mut lowered_container = LoweredStructTypeContainer { fields: IndexStorage::new(), functions: IndexStorage::new(), is_lowered_enum_child: false, is_lowered_enum_parent: true, lowered_enum_parent: Some(container.clone()), lowered_enum_child: None, hir_mir_indexes: HashMap::new() };
 
 			let mut entry_size = 0;
 

compiler/astoir_mir_lowering/src/lru.rs

@@ -1,6 +1,7 @@
 use astoir_hir::{nodes::{HIRNode, HIRNodeKind}, structs::StructLRUStep};
 use astoir_mir::{blocks::refer::MIRBlockReference, builder::build_field_pointer, vals::{base::BaseMIRValue, refer::MIRVariableReference}};
-use diagnostics::DiagnosticResult;
+use compiler_typing::raw::RawType;
+use diagnostics::{DiagnosticResult, unsure_panic};
 
 use crate::MIRLoweringContext;
 
@@ -10,9 +11,15 @@ pub fn lower_hir_lru_step(block: MIRBlockReference, step: StructLRUStep, ctx: &m
 			return Ok(ctx.mir_ctx.blocks[block].get_variable_ref(variable)?.as_pointer_ref()?.into());
 		}
 
-		let ptr = curr.unwrap().as_ptr()?;
+		let curr = curr.unwrap();
+		let ptr = curr.as_ptr()?;
 
-		return Ok(build_field_pointer(&mut ctx.mir_ctx, ptr, variable)?.into())
+		let struct_type = match ctx.mir_ctx.ssa_hints.get_hint(curr.get_ssa_index()).get_type().get_generic(&ctx.hir_ctx.type_storage) {
+			RawType::LoweredStruct(_, container) => container,
+			_ => unsure_panic!("lower_hir_lru_step curr was not an actual thing")
+		};
+
+		return Ok(build_field_pointer(&mut ctx.mir_ctx, ptr, struct_type.resolve_hir_index(variable))?.into())
 	}
 
 	panic!("Invalid step!")

compiler/compiler_typing/src/structs.rs

@@ -1,3 +1,5 @@
+use std::collections::HashMap;
+
 use compiler_utils::utils::indexed::IndexStorage;
 use diagnostics::{DiagnosticResult, builders::{make_cannot_find_type_field, make_cannot_find_type_function}};
 
@@ -18,9 +20,27 @@ pub struct LoweredStructTypeContainer {
 	pub is_lowered_enum_parent: bool,
 	pub lowered_enum_parent: Option<RawEnumTypeContainer>, 
 	pub lowered_enum_child: Option<RawEnumEntryContainer>,
+	pub hir_mir_indexes: HashMap<usize, usize>,
 	pub functions: IndexStorage<usize>
 }
 
+impl LoweredStructTypeContainer {
+
+	/// Resolves the given `HIR` field index into the corresponding `MIR` field index if said one has changed.
+	pub fn resolve_hir_index(&self, ind: usize) -> usize {
+		if self.hir_mir_indexes.contains_key(&ind) {
+			return self.hir_mir_indexes[&ind];
+		}
+
+		return ind;
+	}
+
+	pub fn append_hir_index_conv(&mut self, hir: usize, mir: usize) {
+		self.hir_mir_indexes.insert(hir, mir);
+	}
+
+}
+
 impl SizedType for RawStructTypeContainer {
 	fn get_size(&self, t: &Type, compacted_size: bool, storage: &TypeStorage) -> usize {
 		let mut size = 0;