teascade/reid-llvm
1
1
Fork 0
Code Issues Pull Requests Packages Releases 5 Wiki Activity

Fix inconsitent multiple typedefs

Browse Source
This commit is contained in:
Sofia 2025-08-12 21:02:32 +03:00
parent fe6fe6c435
commit c23160bc32
4 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
reid-llvm-lib/src/builder.rs
View File

@ -14,10 +14,10 @@ use crate::{
util::match_types, util::match_types,
}; };
#[derive(Clone, Hash, Copy, PartialEq, Eq)] #[derive(Clone, Hash, Copy, PartialEq, Eq, PartialOrd)]
pub struct ModuleValue(pub(crate) usize); pub struct ModuleValue(pub(crate) usize);
#[derive(Clone, Hash, Copy, PartialEq, Eq)] #[derive(Clone, Hash, Copy, PartialEq, Eq, PartialOrd)]
pub struct TypeValue(pub(crate) ModuleValue, pub(crate) usize); pub struct TypeValue(pub(crate) ModuleValue, pub(crate) usize);
#[derive(Clone, Hash, Copy, PartialEq, Eq)] #[derive(Clone, Hash, Copy, PartialEq, Eq)]
@ -517,7 +517,7 @@ impl Builder {
} }
for (a, b) in param_types.iter().zip(params) { for (a, b) in param_types.iter().zip(params) {
if *a != b.get_type(&self)? { if *a != b.get_type(&self)? {
return Err(ErrorKind::Null); // TODO error: params do not match return Err(ErrorKind::TypesIncompatible(a.clone(), b.get_type(&self)?)); // TODO error: params do not match
} }
} }
Ok(()) Ok(())

4
reid-llvm-lib/src/lib.rs
View File

@ -26,6 +26,8 @@ mod util;
pub enum ErrorKind { pub enum ErrorKind {
#[error("NULL error, should never occur!")] #[error("NULL error, should never occur!")]
Null, Null,
#[error("Types {0:?} and {1:?} incompatible")]
TypesIncompatible(Type, Type),
} }
pub type CompileResult<T> = Result<T, ErrorKind>; pub type CompileResult<T> = Result<T, ErrorKind>;
@ -498,7 +500,7 @@ pub enum Instr {
FunctionCall(FunctionValue, Vec<InstructionValue>), FunctionCall(FunctionValue, Vec<InstructionValue>),
} }
#[derive(Debug, PartialEq, Eq, Clone, Hash)] #[derive(Debug, PartialEq, Eq, Clone, Hash, PartialOrd)]
pub enum Type { pub enum Type {
I8, I8,
I16, I16,

2
reid/src/mir/fmt.rs
View File

@ -117,7 +117,7 @@ impl Display for TypeDefinition {
self.name, self.name,
self.source_module, self.source_module,
if let Some(mod_id) = self.importer { if let Some(mod_id) = self.importer {
format!("; imported to {}", mod_id) format!("; imported by {}", mod_id)
} else { } else {
String::new() String::new()
} }

17
reid/src/mir/linker.rs
View File

@ -481,18 +481,29 @@ impl<'map> Pass for LinkerPass<'map> {
} }
} }
let mut typedef_keys = HashMap::new();
// 4. Import all listed types. // 4. Import all listed types.
for (importer_typekey, imported_module_id) in &imported_types { for (importer_typekey, imported_module_id) in &imported_types {
let imported_ty_module = modules.get(&imported_module_id).unwrap().module.borrow();
let importee_typekey = CustomTypeKey(importer_typekey.0.clone(), *imported_module_id); let importee_typekey = CustomTypeKey(importer_typekey.0.clone(), *imported_module_id);
if let Some(module_id) = typedef_keys.get(&importee_typekey) {
if *module_id != importer_module.module_id {
typedef_keys.insert(importee_typekey.clone(), importer_typekey.1);
}
} else {
typedef_keys.insert(importee_typekey.clone(), importer_typekey.1);
}
}
for (typedef_key, importer_module_id) in &typedef_keys {
let imported_ty_module = modules.get(&typedef_key.1).unwrap().module.borrow();
if let Some(typedef) = imported_ty_module if let Some(typedef) = imported_ty_module
.typedefs .typedefs
.iter() .iter()
.find(|ty| CustomTypeKey(ty.name.clone(), ty.source_module) == importee_typekey) .find(|ty| CustomTypeKey(ty.name.clone(), ty.source_module) == *typedef_key)
.cloned() .cloned()
{ {
importer_module.typedefs.push(TypeDefinition { importer_module.typedefs.push(TypeDefinition {
importer: Some(importer_typekey.1), importer: Some(*importer_module_id),
..typedef ..typedef
}); });
} }