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

re-implement roc returning by pointer

Browse source
This commit is contained in:
Folkert 2021-10-22 13:24:18 +02:00
parent 171c0836e4
commit 2ff3a97ada
1 changed files with 41 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4389,16 +4389,21 @@ fn roc_call_with_args<'a, 'ctx, 'env>(
let fn_val = let fn_val =
function_value_by_func_spec(env, func_spec, symbol, argument_layouts, result_layout); function_value_by_func_spec(env, func_spec, symbol, argument_layouts, result_layout);
<<<<<<< HEAD
call_roc_function(env, fn_val, result_layout, arguments) call_roc_function(env, fn_val, result_layout, arguments)
} }
fn call_roc_function<'a, 'ctx, 'env>( fn call_roc_function<'a, 'ctx, 'env>(
env: &Env<'a, 'ctx, 'env>, env: &Env<'a, 'ctx, 'env>,
roc_function: FunctionValue<'ctx>, roc_function: FunctionValue<'ctx>,
_result_layout: &Layout<'a>, result_layout: &Layout<'a>,
arguments: &[BasicValueEnum<'ctx>], arguments: &[BasicValueEnum<'ctx>],
) -> BasicValueEnum<'ctx> { ) -> BasicValueEnum<'ctx> {
match RocReturn::from_layout(env, result_layout) {
RocReturn::Return => {
debug_assert_eq!(
roc_function.get_type().get_param_types().len(),
arguments.len()
);
let call = env.builder.build_call(roc_function, arguments, "call"); let call = env.builder.build_call(roc_function, arguments, "call");
// roc functions should have the fast calling convention // roc functions should have the fast calling convention
@ -4412,6 +4417,28 @@ fn call_roc_function<'a, 'ctx, 'env>(
) )
}) })
} }
RocReturn::ByPointer => {
let mut arguments = Vec::from_iter_in(arguments.iter().copied(), env.arena);
let result_type = basic_type_from_layout(env, result_layout);
let result_alloca = env.builder.build_alloca(result_type, "result_value");
arguments.push(result_alloca.into());
debug_assert_eq!(
roc_function.get_type().get_param_types().len(),
arguments.len()
);
let call = env.builder.build_call(roc_function, &arguments, "call");
// roc functions should have the fast calling convention
debug_assert_eq!(roc_function.get_call_conventions(), FAST_CALL_CONV);
call.set_call_convention(FAST_CALL_CONV);
env.builder.build_load(result_alloca, "load_result")
}
}
}
/// Translates a target_lexicon::Triple to a LLVM calling convention u32 /// Translates a target_lexicon::Triple to a LLVM calling convention u32
/// as described in https://llvm.org/doxygen/namespacellvm_1_1CallingConv.html /// as described in https://llvm.org/doxygen/namespacellvm_1_1CallingConv.html
@ -5751,10 +5778,7 @@ enum RocReturn {
impl RocReturn { impl RocReturn {
fn roc_return_by_pointer(layout: Layout) -> bool { fn roc_return_by_pointer(layout: Layout) -> bool {
match layout { match layout {
Layout::Union(union_layout) => match union_layout { Layout::Union(union_layout) => matches!(union_layout, UnionLayout::NonRecursive(_)),
UnionLayout::NonRecursive(_) => true,
_ => false,
},
Layout::LambdaSet(lambda_set) => { Layout::LambdaSet(lambda_set) => {
RocReturn::roc_return_by_pointer(lambda_set.runtime_representation()) RocReturn::roc_return_by_pointer(lambda_set.runtime_representation())
} }
@ -5762,7 +5786,7 @@ impl RocReturn {
} }
} }
fn from_layout<'a, 'ctx, 'env>(env: &Env<'a, 'ctx, 'env>, layout: &Layout<'a>) -> Self { fn from_layout<'a, 'ctx, 'env>(_env: &Env<'a, 'ctx, 'env>, layout: &Layout<'a>) -> Self {
if false && Self::roc_return_by_pointer(*layout) { if false && Self::roc_return_by_pointer(*layout) {
RocReturn::ByPointer RocReturn::ByPointer
} else { } else {