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

Use AvailableExternally-linkage for externs for imports

Browse Source
This commit is contained in:
Sofia 2025-07-15 20:01:46 +03:00
parent 6f8c02ac04
commit 6788ef1690
10 changed files with 44 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
reid-llvm-lib/src/compile.rs
View File

@ -265,8 +265,15 @@ impl FunctionHolder {
return; return;
} }
if self.data.flags.is_imported && !in_main_module { if self.data.flags.is_imported {
LLVMSetLinkage(own_function.value_ref, LLVMLinkage::LLVMExternalLinkage); if self.data.flags.is_extern {
LLVMSetLinkage(
own_function.value_ref,
LLVMLinkage::LLVMAvailableExternallyLinkage,
);
} else {
LLVMSetLinkage(own_function.value_ref, LLVMLinkage::LLVMExternalLinkage);
}
} else { } else {
LLVMSetLinkage(own_function.value_ref, LLVMLinkage::LLVMPrivateLinkage); LLVMSetLinkage(own_function.value_ref, LLVMLinkage::LLVMPrivateLinkage);
} }

2
reid/src/ast/process.rs
View File

@ -58,7 +58,7 @@ impl ast::Module {
.cloned() .cloned()
.map(|p| (p.0, p.1.into())) .map(|p| (p.0, p.1.into()))
.collect(), .collect(),
kind: mir::FunctionDefinitionKind::Extern, kind: mir::FunctionDefinitionKind::Extern(false),
}; };
functions.push(def); functions.push(def);
} }

5
reid/src/codegen.rs
View File

@ -69,12 +69,13 @@ impl mir::Module {
..FunctionFlags::default() ..FunctionFlags::default()
}, },
), ),
mir::FunctionDefinitionKind::Extern => module.function( mir::FunctionDefinitionKind::Extern(imported) => module.function(
&function.name, &function.name,
function.return_type.get_type(), function.return_type.get_type(),
param_types, param_types,
FunctionFlags { FunctionFlags {
is_extern: true, is_extern: true,
is_imported: *imported,
..FunctionFlags::default() ..FunctionFlags::default()
}, },
), ),
@ -117,7 +118,7 @@ impl mir::Module {
} }
} }
} }
mir::FunctionDefinitionKind::Extern => {} mir::FunctionDefinitionKind::Extern(_) => {}
} }
} }

3
reid/src/mir/display.rs
View File

@ -61,7 +61,8 @@ impl Display for FunctionDefinitionKind {
write!(f, "{}", block)?; write!(f, "{}", block)?;
Ok(()) Ok(())
} }
Self::Extern => write!(f, "<External>"), Self::Extern(true) => write!(f, "<Classical Extern>"),
Self::Extern(false) => write!(f, "<Imported Extern>"),
} }
} }
} }

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

@ -193,7 +193,7 @@ impl Pass for LinkerPass {
is_imported: false, is_imported: false,
return_type: func.return_type.clone(), return_type: func.return_type.clone(),
parameters: func.parameters.clone(), parameters: func.parameters.clone(),
kind: super::FunctionDefinitionKind::Extern, kind: super::FunctionDefinitionKind::Extern(true),
}); });
} }
} }

7
reid/src/mir/mod.rs
View File

@ -254,21 +254,22 @@ pub struct FunctionDefinition {
pub enum FunctionDefinitionKind { pub enum FunctionDefinitionKind {
/// Actual definition block and surrounding signature range /// Actual definition block and surrounding signature range
Local(Block, Metadata), Local(Block, Metadata),
Extern, /// True = imported from other module, False = Is user defined extern
Extern(bool),
} }
impl FunctionDefinition { impl FunctionDefinition {
fn block_meta(&self) -> Metadata { fn block_meta(&self) -> Metadata {
match &self.kind { match &self.kind {
FunctionDefinitionKind::Local(block, _) => block.meta, FunctionDefinitionKind::Local(block, _) => block.meta,
FunctionDefinitionKind::Extern => Metadata::default(), FunctionDefinitionKind::Extern(_) => Metadata::default(),
} }
} }
fn signature(&self) -> Metadata { fn signature(&self) -> Metadata {
match &self.kind { match &self.kind {
FunctionDefinitionKind::Local(_, metadata) => *metadata, FunctionDefinitionKind::Local(_, metadata) => *metadata,
FunctionDefinitionKind::Extern => Metadata::default(), FunctionDefinitionKind::Extern(_) => Metadata::default(),
} }
} }
} }

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

@ -261,7 +261,7 @@ impl FunctionDefinition {
scope.return_type_hint = Some(self.return_type.clone()); scope.return_type_hint = Some(self.return_type.clone());
block.pass(pass, state, scope); block.pass(pass, state, scope);
} }
FunctionDefinitionKind::Extern => {} FunctionDefinitionKind::Extern(_) => {}
}; };
} }
} }

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

@ -94,7 +94,7 @@ impl FunctionDefinition {
state.scope.return_type_hint = Some(self.return_type.clone()); state.scope.return_type_hint = Some(self.return_type.clone());
block.typecheck(&mut state.inner(), &hints, Some(&return_type)) block.typecheck(&mut state.inner(), &hints, Some(&return_type))
} }
FunctionDefinitionKind::Extern => { FunctionDefinitionKind::Extern(_) => {
Ok((ReturnKind::Soft, TypeKind::Vague(Vague::Unknown))) Ok((ReturnKind::Soft, TypeKind::Vague(Vague::Unknown)))
} }
}; };

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

@ -64,7 +64,7 @@ impl FunctionDefinition {
ret_ty.narrow(&scope_hints.from_type(&self.return_type).unwrap()); ret_ty.narrow(&scope_hints.from_type(&self.return_type).unwrap());
} }
} }
FunctionDefinitionKind::Extern => {} FunctionDefinitionKind::Extern(_) => {}
}; };
Ok(()) Ok(())

33
reid/src/mir/types.rs
View File

@ -181,14 +181,16 @@ impl IndexedVariableReference {
} }
} }
#[derive(Debug, Clone, Copy, thiserror::Error)] #[derive(Debug, Clone, thiserror::Error)]
pub enum EqualsIssue { pub enum EqualsIssue {
#[error("Function is already defined locally at {:?}", (.0).range)] #[error("Function is already defined locally at {:?}", (.0).range)]
ExistsLocally(Metadata), ExistsLocally(Metadata),
#[error("asd")] #[error("Equals")]
Equals, Equals,
#[error("asd")] #[error("Function {0} is already declared locally at {:?}", (.1).range)]
ConflictingImports, AlreadyExtern(String, Metadata),
#[error("Function {0} is already imported from another module")]
ConflictWithImport(String),
} }
impl FunctionDefinition { impl FunctionDefinition {
@ -197,15 +199,22 @@ impl FunctionDefinition {
FunctionDefinitionKind::Local(_, metadata) => { FunctionDefinitionKind::Local(_, metadata) => {
Err(EqualsIssue::ExistsLocally(*metadata)) Err(EqualsIssue::ExistsLocally(*metadata))
} }
FunctionDefinitionKind::Extern => { FunctionDefinitionKind::Extern(imported) => {
if self.is_pub == other.is_pub if *imported {
&& self.name == other.name Err(EqualsIssue::ConflictWithImport(self.name.clone()))
&& self.parameters == other.parameters
&& self.return_type == other.return_type
{
Ok(())
} else { } else {
Err(EqualsIssue::ConflictingImports) if self.is_pub == other.is_pub
&& self.name == other.name
&& self.parameters == other.parameters
&& self.return_type == other.return_type
{
Ok(())
} else {
Err(EqualsIssue::AlreadyExtern(
self.name.clone(),
self.signature(),
))
}
} }
} }
} }