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

Fix linker type importing

Browse Source
This commit is contained in:
Sofia 2025-08-06 21:01:05 +03:00
parent 8d32f2bbad
commit 2a8842658d
2 changed files with 34 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -325,12 +325,31 @@ impl<'map> Pass for LinkerPass<'map> {
// 2. Add all manually imported types to the list of types that need // 2. Add all manually imported types to the list of types that need
// to be resolved and recursed // to be resolved and recursed
for (name, (source_module, meta)) in &linker_module.type_imports { for (name, (source_module, meta)) in &linker_module.type_imports {
unresolved_types.insert( let imported_ty_key = CustomTypeKey(name.clone(), source_module.clone());
CustomTypeKey(name.clone(), source_module.clone()),
(meta.clone(), false), let imported_ty = TypeKind::CustomType(imported_ty_key.clone());
); let imported = modules.get(&imported_ty_key.1).unwrap().module.borrow();
for (ty, func) in &imported.associated_functions {
if *ty != imported_ty {
continue;
} }
for ty in import_type(&func.return_type) {
unresolved_types.insert(ty, (meta.clone(), true));
}
for param in &func.parameters {
for ty in import_type(&param.ty) {
unresolved_types.insert(ty, (meta.clone(), true));
}
}
}
unresolved_types.insert(imported_ty_key.clone(), (meta.clone(), false));
}
dbg!(&importer_module.module_id, &unresolved_types);
// 3. Recurse these types to find their true sources, find their // 3. Recurse these types to find their true sources, find their
// dependencies, and list them all. Store manually imported types // dependencies, and list them all. Store manually imported types
// in a separate mapping for later. // in a separate mapping for later.
@ -429,36 +448,6 @@ impl<'map> Pass for LinkerPass<'map> {
} }
} }
let mut assoc_function_types = HashSet::new();
let types = import_type(&func.return_type);
let return_type = func.return_type.clone();
assoc_function_types.extend(types);
let mut param_tys = Vec::new();
for param in &func.parameters {
let types = import_type(&param.ty);
assoc_function_types.extend(types);
param_tys.push(param.clone());
}
for inner_ty in assoc_function_types {
if inner_ty.1 != imported_module_id {
let resolved = match resolve_types_recursively(
&inner_ty,
importer_module.module_id,
&modules,
HashSet::new(),
) {
Ok(ty) => ty,
Err(e) => {
state.note_errors(&vec![e], meta);
return Ok(());
}
};
imported_types.extend(resolved);
}
}
importer_module.associated_functions.push(( importer_module.associated_functions.push((
ty.clone(), ty.clone(),
FunctionDefinition { FunctionDefinition {
@ -466,8 +455,8 @@ impl<'map> Pass for LinkerPass<'map> {
linkage_name: Some(format!("{}::{}", ty, func_name)), linkage_name: Some(format!("{}::{}", ty, func_name)),
is_pub: false, is_pub: false,
is_imported: false, is_imported: false,
return_type, return_type: func.return_type.clone(),
parameters: param_tys, parameters: func.parameters.clone(),
kind: super::FunctionDefinitionKind::Extern(true), kind: super::FunctionDefinitionKind::Extern(true),
source: Some(imported_module_id), source: Some(imported_module_id),
signature_meta: func.signature_meta, signature_meta: func.signature_meta,
@ -475,17 +464,21 @@ impl<'map> Pass for LinkerPass<'map> {
)); ));
} }
} }
let resolved = match resolve_types_recursively(&ty, importer_module.module_id, &modules, HashSet::new())
{ let resolved = match resolve_type(&ty, &modules) {
Ok(ty) => ty, Ok(ty) => ty.clone(),
Err(e) => { Err(e) => {
state.note_errors(&vec![e], meta); state.note_errors(&vec![e], meta);
return Ok(()); return Ok(());
} }
}; };
imported_types.extend(resolved);
imported_types.insert(CustomTypeKey(ty.0.clone(), importer_module.module_id), resolved.1);
imported_types.insert(ty, resolved.1);
} }
dbg!(&imported_types);
// 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 imported_ty_module = modules.get(&imported_module_id).unwrap().module.borrow();

2
reid/src/mir/typecheck/mod.rs
View File

@ -333,7 +333,7 @@ impl TypeKind {
.map(|_| ()) .map(|_| ())
.ok_or(ErrorKind::NoSuchType( .ok_or(ErrorKind::NoSuchType(
custom_type_key.0.clone(), custom_type_key.0.clone(),
state.module_id.unwrap(), custom_type_key.1.clone(),
)) ))
} }
TypeKind::Borrow(type_kind, _) => type_kind.is_known(state), TypeKind::Borrow(type_kind, _) => type_kind.is_known(state),