mirror of
https://github.com/roc-lang/roc.git
synced 2025-08-20 12:00:16 +00:00
fix llvm backend c abi for parameters passed by reference on the stack
This commit is contained in:
parent
9ba74c02e7
commit
08be0dc8aa
2 changed files with 46 additions and 16 deletions
|
@ -3836,8 +3836,9 @@ fn expose_function_to_host_help_c_abi_v2<'a, 'ctx, 'env>(
|
||||||
return_layout: Layout<'a>,
|
return_layout: Layout<'a>,
|
||||||
c_function_name: &str,
|
c_function_name: &str,
|
||||||
) -> FunctionValue<'ctx> {
|
) -> FunctionValue<'ctx> {
|
||||||
let it = arguments.iter().map(|l| basic_type_from_layout(env, l));
|
let it = arguments.iter().map(|l| to_cc_type(env, l));
|
||||||
let argument_types = Vec::from_iter_in(it, env.arena);
|
let argument_types = Vec::from_iter_in(it, env.arena);
|
||||||
|
|
||||||
let return_type = basic_type_from_layout(env, &return_layout);
|
let return_type = basic_type_from_layout(env, &return_layout);
|
||||||
|
|
||||||
let cc_return = to_cc_return(env, &return_layout);
|
let cc_return = to_cc_return(env, &return_layout);
|
||||||
|
@ -3888,15 +3889,46 @@ fn expose_function_to_host_help_c_abi_v2<'a, 'ctx, 'env>(
|
||||||
param_types.len()
|
param_types.len()
|
||||||
);
|
);
|
||||||
|
|
||||||
let it = params.iter().zip(param_types).map(|(arg, fastcc_type)| {
|
let it = params
|
||||||
let arg_type = arg.get_type();
|
.iter()
|
||||||
if arg_type == *fastcc_type {
|
.zip(param_types)
|
||||||
// the C and Fast calling conventions agree
|
.enumerate()
|
||||||
*arg
|
.map(|(i, (arg, fastcc_type))| {
|
||||||
} else {
|
let arg_type = arg.get_type();
|
||||||
complex_bitcast_check_size(env, *arg, *fastcc_type, "to_fastcc_type_2")
|
if arg_type == *fastcc_type {
|
||||||
}
|
// the C and Fast calling conventions agree
|
||||||
});
|
*arg
|
||||||
|
} else {
|
||||||
|
// not pretty, but seems to cover all our current cases
|
||||||
|
if arg_type.is_pointer_type() && !fastcc_type.is_pointer_type() {
|
||||||
|
// Modify the argument to specify it is passed by value and nonnull
|
||||||
|
let byval = context.create_type_attribute(
|
||||||
|
Attribute::get_named_enum_kind_id("byval"),
|
||||||
|
arg_type.into_pointer_type().get_element_type(),
|
||||||
|
);
|
||||||
|
let nonnull = context.create_type_attribute(
|
||||||
|
Attribute::get_named_enum_kind_id("nonnull"),
|
||||||
|
arg_type.into_pointer_type().get_element_type(),
|
||||||
|
);
|
||||||
|
c_function.add_attribute(AttributeLoc::Param((i + 1) as u32), byval);
|
||||||
|
c_function.add_attribute(AttributeLoc::Param((i + 1) as u32), nonnull);
|
||||||
|
// bitcast the ptr
|
||||||
|
let fastcc_ptr = env
|
||||||
|
.builder
|
||||||
|
.build_bitcast(
|
||||||
|
*arg,
|
||||||
|
fastcc_type.ptr_type(AddressSpace::Generic),
|
||||||
|
"bitcast_arg",
|
||||||
|
)
|
||||||
|
.into_pointer_value();
|
||||||
|
|
||||||
|
let loaded = env.builder.build_load(fastcc_ptr, "load_arg");
|
||||||
|
loaded
|
||||||
|
} else {
|
||||||
|
complex_bitcast_check_size(env, *arg, *fastcc_type, "to_fastcc_type_2")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
let arguments = Vec::from_iter_in(it, env.arena);
|
let arguments = Vec::from_iter_in(it, env.arena);
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@ comptime {
|
||||||
const mem = std.mem;
|
const mem = std.mem;
|
||||||
const Allocator = mem.Allocator;
|
const Allocator = mem.Allocator;
|
||||||
|
|
||||||
extern fn roc__mainForHost_1_exposed(input: *RocList) RocList;
|
extern fn roc__mainForHost_1_exposed(input: RocList) callconv(.C) RocList;
|
||||||
|
|
||||||
const Align = 2 * @alignOf(usize);
|
const Align = 2 * @alignOf(usize);
|
||||||
extern fn malloc(size: usize) callconv(.C) ?*align(Align) anyopaque;
|
extern fn malloc(size: usize) callconv(.C) ?*align(Align) anyopaque;
|
||||||
|
@ -83,7 +83,7 @@ export fn roc_memset(dst: [*]u8, value: i32, size: usize) callconv(.C) void {
|
||||||
// warning! the array is currently stack-allocated so don't make this too big
|
// warning! the array is currently stack-allocated so don't make this too big
|
||||||
const NUM_NUMS = 100;
|
const NUM_NUMS = 100;
|
||||||
|
|
||||||
const RocList = extern struct { elements: [*]i64, length: usize };
|
const RocList = extern struct { elements: [*]i64, length: usize, capacity: usize };
|
||||||
|
|
||||||
const Unit = extern struct {};
|
const Unit = extern struct {};
|
||||||
|
|
||||||
|
@ -101,16 +101,14 @@ pub export fn main() u8 {
|
||||||
numbers[i] = @mod(@intCast(i64, i), 12);
|
numbers[i] = @mod(@intCast(i64, i), 12);
|
||||||
}
|
}
|
||||||
|
|
||||||
var roc_list = RocList{ .elements = numbers, .length = NUM_NUMS };
|
var roc_list = RocList{ .elements = numbers, .length = NUM_NUMS, .capacity = NUM_NUMS };
|
||||||
|
|
||||||
// start time
|
// start time
|
||||||
var ts1: std.os.timespec = undefined;
|
var ts1: std.os.timespec = undefined;
|
||||||
std.os.clock_gettime(std.os.CLOCK.REALTIME, &ts1) catch unreachable;
|
std.os.clock_gettime(std.os.CLOCK.REALTIME, &ts1) catch unreachable;
|
||||||
|
|
||||||
// actually call roc to populate the callresult
|
// actually call roc to populate the callresult
|
||||||
var callresult: RocList = roc__mainForHost_1_exposed(&roc_list);
|
const callresult: RocList = roc__mainForHost_1_exposed(roc_list);
|
||||||
|
|
||||||
// const callresult: RocList = roc__mainForHost_1_exposed_generic(&roc_list);
|
|
||||||
|
|
||||||
// stdout the result
|
// stdout the result
|
||||||
const length = std.math.min(20, callresult.length);
|
const length = std.math.min(20, callresult.length);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue