language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-27 22:09:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

working version of joinpoints with phi nodes

Browse source
This commit is contained in:
Folkert 2022-01-23 00:40:14 +01:00
parent 7baec2b201
commit 38b03282fd
1 changed files with 33 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

57
compiler/gen_llvm/src/llvm/build.rs
View file

@ -45,7 +45,7 @@ use inkwell::types::{
use inkwell::values::BasicValueEnum::{self, *};
use inkwell::values::{
BasicMetadataValueEnum, BasicValue, CallSiteValue, CallableValue, FloatValue, FunctionValue,
InstructionOpcode, InstructionValue, IntValue, PointerValue, StructValue,
InstructionOpcode, InstructionValue, IntValue, PhiValue, PointerValue, StructValue,
};
use inkwell::OptimizationLevel;
use inkwell::{AddressSpace, IntPredicate};
@ -129,7 +129,7 @@ impl<'ctx> Iterator for FunctionIterator<'ctx> {
pub struct Scope<'a, 'ctx> {
symbols: ImMap<Symbol, (Layout<'a>, BasicValueEnum<'ctx>)>,
pub top_level_thunks: ImMap<Symbol, (ProcLayout<'a>, FunctionValue<'ctx>)>,
join_points: ImMap<JoinPointId, (BasicBlock<'ctx>, &'a [PointerValue<'ctx>])>,
join_points: ImMap<JoinPointId, (BasicBlock<'ctx>, &'a [PhiValue<'ctx>])>,
}
impl<'a, 'ctx> Scope<'a, 'ctx> {
@ -2655,21 +2655,30 @@ pub fn build_exp_stmt<'a, 'ctx, 'env>(
let builder = env.builder;
let context = env.context;
let mut joinpoint_args = Vec::with_capacity_in(parameters.len(), env.arena);
for param in parameters.iter() {
let btype = basic_type_from_layout(env, &param.layout);
joinpoint_args.push(create_entry_block_alloca(
env,
parent,
btype,
"joinpointarg",
));
}
// create new block
let cont_block = context.append_basic_block(parent, "joinpointcont");
let mut joinpoint_args = Vec::with_capacity_in(parameters.len(), env.arena);
{
let current = builder.get_insert_block().unwrap();
builder.position_at_end(cont_block);
for param in parameters.iter() {
let basic_type = basic_type_from_layout(env, &param.layout);
let phi_type = if param.layout.is_passed_by_reference() {
basic_type.ptr_type(AddressSpace::Generic).into()
} else {
basic_type
};
let phi_node = env.builder.build_phi(phi_type, "joinpointarg");
joinpoint_args.push(phi_node);
}
builder.position_at_end(current);
}
// store this join point
let joinpoint_args = joinpoint_args.into_bump_slice();
scope.join_points.insert(*id, (cont_block, joinpoint_args));
@ -2689,12 +2698,9 @@ pub fn build_exp_stmt<'a, 'ctx, 'env>(
// put the cont block at the back
builder.position_at_end(cont_block);
for (ptr, param) in joinpoint_args.iter().zip(parameters.iter()) {
let value = if param.layout.is_passed_by_reference() {
(*ptr).into()
} else {
env.builder.build_load(*ptr, "load_jp_argument")
};
// bind the values
for (phi_value, param) in joinpoint_args.iter().zip(parameters.iter()) {
let value = phi_value.as_basic_value();
scope.insert(param.symbol, (param.layout, value));
}
@ -2715,15 +2721,18 @@ pub fn build_exp_stmt<'a, 'ctx, 'env>(
result
}
Jump(join_point, arguments) => {
let builder = env.builder;
let context = env.context;
let (cont_block, argument_pointers) = scope.join_points.get(join_point).unwrap();
let (cont_block, argument_phi_values) = scope.join_points.get(join_point).unwrap();
for (pointer, argument) in argument_pointers.iter().zip(arguments.iter()) {
let (value, layout) = load_symbol_and_layout(scope, argument);
let current_block = builder.get_insert_block().unwrap();
store_roc_value(env, *layout, *pointer, value);
for (phi_value, argument) in argument_phi_values.iter().zip(arguments.iter()) {
let (value, _) = load_symbol_and_layout(scope, argument);
phi_value.add_incoming(&[(&value, current_block)]);
}
builder.build_unconditional_branch(*cont_block);