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

fix (maybe?) join points

Browse source
This commit is contained in:
Folkert 2021-05-09 12:58:57 +02:00
parent 4f376bf4f8
commit 5d9cf5d9a7
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
compiler/mono/src/alias_analysis.rs
View file

@ -132,16 +132,20 @@ fn stmt_spec(
let (jpid, jp_argument) = let (jpid, jp_argument) =
builder.declare_join_point(block, jp_arg_type_id, ret_type_id)?; builder.declare_join_point(block, jp_arg_type_id, ret_type_id)?;
env.join_points.insert(*id, jpid); let join_body_sub_block = {
let jp_body_block = builder.add_block(); env.join_points.insert(*id, jpid);
let jp_body_block = builder.add_block();
// unpack the argument // unpack the argument
for (i, p) in parameters.iter().enumerate() { for (i, p) in parameters.iter().enumerate() {
let value_id = builder.add_get_tuple_field(jp_body_block, jp_argument, i as u32)?; let value_id =
env.symbols.insert(p.symbol, value_id); builder.add_get_tuple_field(jp_body_block, jp_argument, i as u32)?;
} env.symbols.insert(p.symbol, value_id);
}
let jp_body_value_id = stmt_spec(builder, env, jp_body_block, layout, remainder)?; let jp_body_value_id = stmt_spec(builder, env, jp_body_block, layout, remainder)?;
BlockExpr(jp_body_block, jp_body_value_id)
};
// NOTE the symbols bound by the join point can shadow the argument symbols of the // NOTE the symbols bound by the join point can shadow the argument symbols of the
// surrounding function, so we don't remove them from the env here // surrounding function, so we don't remove them from the env here
@ -152,9 +156,9 @@ fn stmt_spec(
let cont_value_id = stmt_spec(builder, env, cont_block, layout, continuation)?; let cont_value_id = stmt_spec(builder, env, cont_block, layout, continuation)?;
env.join_points.remove(id); env.join_points.remove(id);
builder.define_join_point(jpid, BlockExpr(jp_body_block, jp_body_value_id))?; builder.define_join_point(jpid, join_body_sub_block)?;
Ok(cont_value_id) builder.add_sub_block(block, BlockExpr(cont_block, cont_value_id))
} }
Jump(id, symbols) => { Jump(id, symbols) => {
let ret_type_id = layout_spec(builder, layout)?; let ret_type_id = layout_spec(builder, layout)?;