Possibly fix passing of arrays

This commit is contained in:
Sofia 2026-04-14 19:18:10 +03:00
parent b97aa3f212
commit e76540182f
3 changed files with 89 additions and 39 deletions

BIN
a.out

Binary file not shown.

View File

@ -158,23 +158,41 @@ namespace AST {
} }
codegen::StackValue CastExpression::codegen(codegen::Builder& builder, codegen::Scope& scope) { codegen::StackValue CastExpression::codegen(codegen::Builder& builder, codegen::Scope& scope) {
auto expr = this->m_expr->codegen(builder, scope); auto expr_ty = this->m_expr->get_codegen_type(scope);
auto cast = types::find_cast(scope.casts, expr.ty, this->m_ty); if (expr_ty->m_kind == types::TypeKind::Pointer && this->m_ty->m_kind == types::TypeKind::Pointer) {
if (cast) { std::cout << expr_ty->formatted() << std::endl;
if (cast->target_ty->m_kind == types::TypeKind::Pointer && cast->casted_ty->m_kind == types::TypeKind::Array) { auto lvalued = scope.with_lvalue();
auto allocated = builder.builder->CreateAlloca(cast->casted_ty->codegen(builder)); auto expr = this->m_expr->codegen(builder, lvalued);
builder.builder->CreateStore(expr.value, allocated); auto cast = types::find_cast(scope.casts, expr.ty, this->m_ty);
if (cast) {
return codegen::StackValue{ return codegen::StackValue{
cast->codegen(builder, cast->target_ty, allocated), cast->codegen(builder, cast->target_ty, expr.value),
cast->target_ty cast->target_ty
}; };
} }
return codegen::StackValue{ else {
cast->codegen(builder, cast->target_ty, expr.value), return expr;
cast->target_ty }
}; }
else {
auto expr = this->m_expr->codegen(builder, scope);
auto cast = types::find_cast(scope.casts, expr.ty, this->m_ty);
if (cast) {
// if (cast->target_ty->m_kind == types::TypeKind::Pointer && cast->casted_ty->m_kind == types::TypeKind::Array) {
// auto allocated = builder.builder->CreateAlloca(cast->casted_ty->codegen(builder));
// builder.builder->CreateStore(expr.value, allocated);
// return codegen::StackValue{
// cast->codegen(builder, cast->target_ty, allocated),
// cast->target_ty
// };
// }
return codegen::StackValue{
cast->codegen(builder, cast->target_ty, expr.value),
cast->target_ty
};
}
return expr;
} }
return expr;
} }
std::shared_ptr<types::Type> RefExpression::get_codegen_type(codegen::Scope& scope) { std::shared_ptr<types::Type> RefExpression::get_codegen_type(codegen::Scope& scope) {
@ -258,23 +276,42 @@ namespace AST {
}; };
} }
} }
else if (ptr_ty->m_inner->m_kind == types::TypeKind::Array) {
std::cout << ptr_ty->m_inner->formatted() << std::endl;
// Must be an array otherwise // Must be an array otherwise
auto arr_ty = dynamic_cast<types::ArrayType*>(ptr_ty->m_inner.get()); auto arr_ty = dynamic_cast<types::ArrayType*>(ptr_ty->m_inner.get());
auto gep_value = builder.builder->CreateGEP(arr_ty->m_inner->codegen(builder), value.value, idx_list, "GEP"); auto gep_value = builder.builder->CreateGEP(arr_ty->m_inner->codegen(builder), value.value, idx_list, "GEP");
if (scope.is_lvalue) { if (scope.is_lvalue) {
return codegen::StackValue{ return codegen::StackValue{
gep_value, gep_value,
value.ty, value.ty,
}; };
}
else {
auto inner_ptr_ty = types::PointerType{ arr_ty->m_inner };
auto loaded = inner_ptr_ty.load(builder, gep_value);
return codegen::StackValue{
loaded.first,
loaded.second
};
}
} }
else { else {
auto inner_ptr_ty = types::PointerType{ arr_ty->m_inner }; auto gep_value = builder.builder->CreateGEP(ptr_ty->m_inner->codegen(builder), value.value, idx_list, "GEP");
auto loaded = inner_ptr_ty.load(builder, gep_value); if (scope.is_lvalue) {
return codegen::StackValue{ return codegen::StackValue{
loaded.first, gep_value,
loaded.second value.ty,
}; };
}
else {
auto loaded = value.ty->load(builder, gep_value);
return codegen::StackValue{
loaded.first,
loaded.second
};
}
} }
} }
@ -382,19 +419,32 @@ namespace AST {
int counter = 0; int counter = 0;
for (auto& param : this->m_params) { for (auto& param : this->m_params) {
builder.builder->SetInsertPoint(BB); if (param.second->m_kind == types::TypeKind::Pointer) {
auto arg_ptr = builder.builder->CreateAlloca(param_ty_ptrs[counter]->codegen(builder)); auto ty = param_ty_ptrs[counter];
auto param_ty_ptr = std::shared_ptr<types::Type>{ auto arg = function->getArg(counter++);
new types::PointerType { param_ty_ptrs[counter]} if (param.first) {
}; arg->setName(*param.first);
auto arg = function->getArg(counter++); inner_scope.values[*param.first] = codegen::StackValue{
builder.builder->CreateStore(arg, arg_ptr); arg,
if (param.first) { ty,
arg->setName(*param.first); };
inner_scope.values[*param.first] = codegen::StackValue{ }
arg_ptr, }
param_ty_ptr, else {
builder.builder->SetInsertPoint(BB);
auto arg_ptr = builder.builder->CreateAlloca(param_ty_ptrs[counter]->codegen(builder));
auto param_ty_ptr = std::shared_ptr<types::Type>{
new types::PointerType { param_ty_ptrs[counter]}
}; };
auto arg = function->getArg(counter++);
builder.builder->CreateStore(arg, arg_ptr);
if (param.first) {
arg->setName(*param.first);
inner_scope.values[*param.first] = codegen::StackValue{
arg_ptr,
param_ty_ptr,
};
}
} }
} }

View File

@ -398,7 +398,7 @@ namespace parsing {
auto array_postfix = postfix.unwrap(); auto array_postfix = postfix.unwrap();
if (array_postfix) { if (array_postfix) {
param_ty = std::shared_ptr<types::Type>{ param_ty = std::shared_ptr<types::Type>{
new types::ArrayType(param_ty, *array_postfix) new types::PointerType(param_ty)
}; };
} }
else { else {