language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-03 08:34:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

WIP

Browse source
This commit is contained in:
Folkert 2021-06-09 19:21:24 +02:00
parent 3c8d675378
commit 9476f63e07
4 changed files with 55 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -825,16 +825,25 @@ pub fn build_exp_call<'a, 'ctx, 'env>(
op,
closure_layout,
function_owns_closure_data,
} => run_higher_order_low_level(
specialization_id,
} => {
let bytes = specialization_id.to_bytes();
let callee_var = CalleeSpecVar(&bytes);
let func_spec = func_spec_solutions.callee_spec(callee_var).unwrap();
// let fn_val = function_value_by_func_spec(env, func_spec, symbol, *layout);
run_higher_order_low_level(
env,
layout_ids,
scope,
layout,
*op,
*closure_layout,
func_spec,
*function_owns_closure_data,
arguments,
),
)
}
CallType::Foreign {
foreign_symbol,
@ -3793,6 +3802,7 @@ fn run_higher_order_low_level<'a, 'ctx, 'env>(
return_layout: &Layout<'a>,
op: LowLevel,
function_layout: Layout<'a>,
func_spec: FuncSpec,
function_owns_closure_data: bool,
args: &[Symbol],
) -> BasicValueEnum<'ctx> {

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

@ -414,7 +414,7 @@ fn call_spec(
*update_mode,
call.arguments,
),
HigherOrderLowLevel { .. } => {
HigherOrderLowLevel { op, .. } => {
// TODO overly pessimstic
// filter_map because one of the arguments is a function name, which
// is not defined in the env

6
compiler/mono/src/inc_dec.rs
View file

@ -454,7 +454,10 @@ impl<'a> Context<'a> {
}
HigherOrderLowLevel {
op, closure_layout, ..
op,
closure_layout,
specialization_id,
..
} => {
macro_rules! create_call {
($borrows:expr) => {
@ -464,6 +467,7 @@ impl<'a> Context<'a> {
op: *op,
closure_layout: *closure_layout,
function_owns_closure_data: true,
specialization_id: *specialization_id,
}
} else {
call_type

37
compiler/mono/src/ir.rs
View file

@ -1146,6 +1146,8 @@ pub enum CallType<'a> {
op: LowLevel,
/// the layout of the closure argument, if any
closure_layout: Layout<'a>,
/// specialization id of the function argument
specialization_id: CallSpecId,
/// does the function need to own the closure data
function_owns_closure_data: bool,
},
@ -2707,11 +2709,12 @@ macro_rules! match_on_closure_argument {
$env,
lambda_set,
$closure_data_symbol,
|top_level_function, closure_data, function_layout| self::Call {
|top_level_function, closure_data, function_layout, specialization_id| self::Call {
call_type: CallType::HigherOrderLowLevel {
op: $op,
closure_layout: function_layout,
function_owns_closure_data: false
specialization_id,
function_owns_closure_data: false,
},
arguments: arena.alloc([$($x,)* top_level_function, closure_data]),
},
@ -7696,7 +7699,7 @@ fn lowlevel_match_on_lambda_set<'a, ToLowLevelCall>(
hole: &'a Stmt<'a>,
) -> Stmt<'a>
where
ToLowLevelCall: Fn(Symbol, Symbol, Layout<'a>) -> Call<'a> + Copy,
ToLowLevelCall: Fn(Symbol, Symbol, Layout<'a>, CallSpecId) -> Call<'a> + Copy,
{
match lambda_set.runtime_representation() {
Layout::Union(_) => {
@ -7733,7 +7736,13 @@ where
Layout::Struct(_) => {
let function_symbol = lambda_set.set[0].0;
let call = to_lowlevel_call(function_symbol, closure_data_symbol, function_layout);
let call_spec_id = env.next_call_specialization_id();
let call = to_lowlevel_call(
function_symbol,
closure_data_symbol,
function_layout,
call_spec_id,
);
build_call(env, call, assigned, return_layout, env.arena.alloc(hole))
}
@ -7787,7 +7796,7 @@ fn lowlevel_union_lambda_set_to_switch<'a, ToLowLevelCall>(
hole: &'a Stmt<'a>,
) -> Stmt<'a>
where
ToLowLevelCall: Fn(Symbol, Symbol, Layout<'a>) -> Call<'a> + Copy,
ToLowLevelCall: Fn(Symbol, Symbol, Layout<'a>, CallSpecId) -> Call<'a> + Copy,
{
debug_assert!(!lambda_set.is_empty());
@ -7800,7 +7809,13 @@ where
let hole = Stmt::Jump(join_point_id, env.arena.alloc([assigned]));
let call = to_lowlevel_call(*function_symbol, closure_data_symbol, function_layout);
let call_spec_id = env.next_call_specialization_id();
let call = to_lowlevel_call(
*function_symbol,
closure_data_symbol,
function_layout,
call_spec_id,
);
let stmt = build_call(env, call, assigned, return_layout, env.arena.alloc(hole));
branches.push((i as u64, BranchInfo::None, stmt));
@ -8206,7 +8221,7 @@ fn lowlevel_enum_lambda_set_to_switch<'a, ToLowLevelCall>(
hole: &'a Stmt<'a>,
) -> Stmt<'a>
where
ToLowLevelCall: Fn(Symbol, Symbol, Layout<'a>) -> Call<'a> + Copy,
ToLowLevelCall: Fn(Symbol, Symbol, Layout<'a>, CallSpecId) -> Call<'a> + Copy,
{
debug_assert!(!lambda_set.is_empty());
@ -8219,7 +8234,13 @@ where
let hole = Stmt::Jump(join_point_id, env.arena.alloc([result_symbol]));
let call = to_lowlevel_call(*function_symbol, closure_data_symbol, function_layout);
let call_spec_id = env.next_call_specialization_id();
let call = to_lowlevel_call(
*function_symbol,
closure_data_symbol,
function_layout,
call_spec_id,
);
let stmt = build_call(
env,
call,