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

Fix allocator

Browse Source
This commit is contained in:
Sofia 2025-07-28 19:04:37 +03:00
parent 1b1a5934f5
commit e412a2e1d7
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
reid/src/codegen/allocator.rs
View File

@ -154,11 +154,7 @@ impl mir::Expression {
allocated.extend(lhs.allocate(scope));
allocated.extend(rhs.allocate(scope));
}
mir::ExprKind::FunctionCall(FunctionCall { parameters, .. }) => {
for param in parameters {
allocated.extend(param.allocate(scope));
}
}
mir::ExprKind::FunctionCall(fn_call) => allocated.extend(fn_call.allocate(&fn_call.name, scope)),
mir::ExprKind::If(IfExpression(cond, then_ex, else_ex)) => {
allocated.extend(cond.allocate(scope));
allocated.extend(then_ex.allocate(scope));
@ -174,13 +170,34 @@ impl mir::Expression {
mir::ExprKind::CastTo(expression, _) => {
allocated.extend(expression.allocate(scope));
}
mir::ExprKind::AssociatedFunctionCall(_, FunctionCall { parameters, .. }) => {
for param in parameters {
allocated.extend(param.allocate(scope));
}
mir::ExprKind::AssociatedFunctionCall(ty, fn_call) => {
allocated.extend(fn_call.allocate(&format!("{}::{}", ty, fn_call.name), scope))
}
}
allocated
}
}
impl mir::FunctionCall {
fn allocate<'ctx, 'a>(&self, name: &String, scope: &mut AllocatorScope<'ctx, 'a>) -> Vec<Allocation> {
let mut allocated = Vec::new();
for param in &self.parameters {
allocated.extend(param.allocate(scope));
}
if self.return_type != TypeKind::Void {
let allocation = scope
.block
.build_named(
name,
reid_lib::Instr::Alloca(self.return_type.get_type(scope.type_values)),
)
.unwrap();
allocated.push(Allocation(name.clone(), self.return_type.clone(), allocation));
}
allocated
}
}

5
reid/src/codegen/mod.rs
View File

@ -1346,8 +1346,9 @@ fn codegen_function_call<'ctx, 'a>(
let ptr = if ret_type_kind != TypeKind::Void {
let ptr = scope
.block
.build_named(&call.name, Instr::Alloca(ret_type.clone()))
.allocator
.borrow_mut()
.allocate(&call_name, &call.return_type)
.unwrap();
scope
.block