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

Merge branch 'trunk' into unit-types

Browse source
This commit is contained in:
Richard Feldman 2020-03-19 22:05:22 -04:00 • committed by GitHub
commit b33af811d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 156 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

30
compiler/gen/src/crane/build.rs
View file

@ -285,40 +285,19 @@ pub fn build_expr<'a, B: Backend>(
Access {
label,
field_layout,
struct_layout: Layout::Struct(fields),
struct_layout: Layout::Struct(sorted_fields),
record,
} => {
let cfg = env.cfg;
// Reconstruct the struct to determine the combined layout
// TODO get rid of clones
let mut reconstructed_struct_layout =
Vec::with_capacity_in(fields.len() + 1, env.arena);
for field in fields.iter() {
reconstructed_struct_layout.push(field.clone());
}
reconstructed_struct_layout.push((label.clone(), field_layout.clone()));
reconstructed_struct_layout.sort_by(|a, b| {
a.0.partial_cmp(&b.0)
.expect("TODO: failed to sort struct fields in crane access")
});
// Find the offset we are trying to access
let mut offset = 0;
for (local_label, layout) in reconstructed_struct_layout.iter() {
for (local_label, local_field_layout) in sorted_fields.iter() {
if local_label == label {
break;
}
let field_size = match layout {
Layout::Builtin(Builtin::Int64) => std::mem::size_of::<i64>(),
_ => panic!(
"Missing struct field size in offset calculation for struct access for {:?}",
layout
),
};
offset += field_size;
offset += local_field_layout.stack_size(ptr_bytes);
}
let offset = i32::try_from(offset)
@ -326,10 +305,11 @@ pub fn build_expr<'a, B: Backend>(
let mem_flags = MemFlags::new();
let record = build_expr(env, scope, module, builder, record, procs);
let field_type = type_from_layout(cfg, field_layout);
builder
.ins()
.load(cfg.pointer_type(), mem_flags, record, Offset32::new(offset))
.load(field_type, mem_flags, record, Offset32::new(offset))
}
AccessAtIndex {
index,

18
compiler/gen/src/llvm/build.rs
View file

@ -496,26 +496,14 @@ pub fn build_expr<'a, 'ctx, 'env>(
}
Access {
label,
field_layout,
struct_layout: Layout::Struct(fields),
struct_layout: Layout::Struct(sorted_fields),
record,
..
} => {
let builder = env.builder;
// Reconstruct struct layout
let mut reconstructed_struct_layout =
Vec::with_capacity_in(fields.len() + 1, env.arena);
for field in fields.iter() {
reconstructed_struct_layout.push(field.clone());
}
reconstructed_struct_layout.push((label.clone(), field_layout.clone()));
reconstructed_struct_layout.sort_by(|a, b| {
a.0.partial_cmp(&b.0)
.expect("TODO: failed to sort struct fields in crane access")
});
// Get index
let index = reconstructed_struct_layout
let index = sorted_fields
.iter()
.position(|(local_label, _)| local_label == label)
.unwrap() as u32; // TODO