language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-27 05:49:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Get rid of passing target_info a bunch

Browse source
This commit is contained in:
Ayaz Hafiz 2023-06-16 21:38:30 -05:00
parent 8495f3b085
commit bc41db2a34
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
18 changed files with 154 additions and 287 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/compiler/gen_llvm/src/llvm/build.rs
View file

@ -1656,8 +1656,7 @@ fn build_tag<'a, 'ctx>(
let data_layout_repr = LayoutRepr::Struct(tags[tag_id as usize]);
let data = RocStruct::build(env, layout_interner, data_layout_repr, scope, arguments);
let roc_union =
RocUnion::tagged_from_slices(layout_interner, env.context, tags, env.target_info);
let roc_union = RocUnion::tagged_from_slices(layout_interner, env.context, tags);
let tag_alloca = env
.builder
@ -1765,12 +1764,8 @@ fn build_tag<'a, 'ctx>(
nullable_id,
other_fields,
} => {
let roc_union = RocUnion::untagged_from_slices(
layout_interner,
env.context,
&[other_fields],
env.target_info,
);
let roc_union =
RocUnion::untagged_from_slices(layout_interner, env.context, &[other_fields]);
if tag_id == *nullable_id as _ {
let output_type = roc_union.struct_type().ptr_type(AddressSpace::default());
@ -2127,9 +2122,9 @@ fn reserve_with_refcount_union_as_block_of_memory<'a, 'ctx>(
let ptr_bytes = env.target_info;
let roc_union = if union_layout.stores_tag_id_as_data(ptr_bytes) {
RocUnion::tagged_from_slices(layout_interner, env.context, fields, env.target_info)
RocUnion::tagged_from_slices(layout_interner, env.context, fields)
} else {
RocUnion::untagged_from_slices(layout_interner, env.context, fields, env.target_info)
RocUnion::untagged_from_slices(layout_interner, env.context, fields)
};
reserve_with_refcount_help(
@ -2709,8 +2704,7 @@ pub(crate) fn build_exp_stmt<'a, 'ctx>(
LayoutRepr::Builtin(Builtin::List(element_layout)) => {
debug_assert!(value.is_struct_value());
let element_layout = layout_interner.get_repr(element_layout);
let alignment =
element_layout.alignment_bytes(layout_interner, env.target_info);
let alignment = element_layout.alignment_bytes(layout_interner);
build_list::decref(env, value.into_struct_value(), alignment);
}

38
crates/compiler/gen_llvm/src/llvm/convert.rs
View file

@ -16,7 +16,7 @@ use super::struct_::RocStruct;
pub fn basic_type_from_layout<'a, 'ctx, 'env>(
env: &Env<'a, 'ctx, 'env>,
layout_interner: &'env STLayoutInterner<'a>,
layout_interner: &STLayoutInterner<'a>,
layout: LayoutRepr<'_>,
) -> BasicTypeEnum<'ctx> {
use LayoutRepr::*;
@ -81,32 +81,25 @@ pub fn struct_type_from_union_layout<'a, 'ctx>(
match union_layout {
NonRecursive([]) => env.context.struct_type(&[], false),
NonRecursive(tags) => {
RocUnion::tagged_from_slices(layout_interner, env.context, tags, env.target_info)
.struct_type()
RocUnion::tagged_from_slices(layout_interner, env.context, tags).struct_type()
}
Recursive(tags)
| NullableWrapped {
other_tags: tags, ..
} => {
if union_layout.stores_tag_id_as_data(env.target_info) {
RocUnion::tagged_from_slices(layout_interner, env.context, tags, env.target_info)
.struct_type()
RocUnion::tagged_from_slices(layout_interner, env.context, tags).struct_type()
} else {
RocUnion::untagged_from_slices(layout_interner, env.context, tags, env.target_info)
.struct_type()
RocUnion::untagged_from_slices(layout_interner, env.context, tags).struct_type()
}
}
NullableUnwrapped { other_fields, .. } => RocUnion::untagged_from_slices(
layout_interner,
env.context,
&[other_fields],
env.target_info,
)
.struct_type(),
NonNullableUnwrapped(fields) => {
RocUnion::untagged_from_slices(layout_interner, env.context, &[fields], env.target_info)
NullableUnwrapped { other_fields, .. } => {
RocUnion::untagged_from_slices(layout_interner, env.context, &[other_fields])
.struct_type()
}
NonNullableUnwrapped(fields) => {
RocUnion::untagged_from_slices(layout_interner, env.context, &[fields]).struct_type()
}
}
}
@ -289,7 +282,6 @@ impl<'ctx> RocUnion<'ctx> {
fn new(
context: &'ctx Context,
_target_info: TargetInfo,
data_align: u32,
data_width: u32,
tag_type: Option<TagType>,
@ -353,7 +345,6 @@ impl<'ctx> RocUnion<'ctx> {
interner: &STLayoutInterner,
context: &'ctx Context,
layouts: &[&[InLayout<'_>]],
target_info: TargetInfo,
) -> Self {
let tag_type = match layouts.len() {
0 => unreachable!("zero-element tag union is not represented as a RocUnion"),
@ -361,22 +352,19 @@ impl<'ctx> RocUnion<'ctx> {
_ => TagType::I16,
};
let (data_width, data_align) =
Layout::stack_size_and_alignment_slices(interner, layouts, target_info);
let (data_width, data_align) = Layout::stack_size_and_alignment_slices(interner, layouts);
Self::new(context, target_info, data_align, data_width, Some(tag_type))
Self::new(context, data_align, data_width, Some(tag_type))
}
pub fn untagged_from_slices(
interner: &STLayoutInterner,
context: &'ctx Context,
layouts: &[&[InLayout<'_>]],
target_info: TargetInfo,
) -> Self {
let (data_width, data_align) =
Layout::stack_size_and_alignment_slices(interner, layouts, target_info);
let (data_width, data_align) = Layout::stack_size_and_alignment_slices(interner, layouts);
Self::new(context, target_info, data_align, data_width, None)
Self::new(context, data_align, data_width, None)
}
pub fn data_width(&self) -> u32 {

15
crates/compiler/gen_llvm/src/llvm/expect.rs
View file

@ -679,12 +679,7 @@ fn build_clone_tag_help<'a, 'ctx>(
let block = env.context.append_basic_block(parent, "tag_id_modify");
env.builder.position_at_end(block);
let roc_union = RocUnion::tagged_from_slices(
layout_interner,
env.context,
tags,
env.target_info,
);
let roc_union = RocUnion::tagged_from_slices(layout_interner, env.context, tags);
// load the tag payload (if any)
let payload_layout = LayoutRepr::struct_(field_layouts);
@ -760,8 +755,7 @@ fn build_clone_tag_help<'a, 'ctx>(
basic_type_from_layout(env, layout_interner, layout_interner.get_repr(layout));
let data = load_tag_data(env, layout_interner, union_layout, tag_value, basic_type);
let (width, _) =
union_layout.data_size_and_alignment(layout_interner, env.target_info);
let (width, _) = union_layout.data_size_and_alignment(layout_interner);
let cursors = Cursors {
offset: extra_offset,
@ -801,7 +795,7 @@ fn build_clone_tag_help<'a, 'ctx>(
let basic_type =
basic_type_from_layout(env, layout_interner, layout_interner.get_repr(layout));
let (width, _) = union_layout.data_size_and_alignment(layout_interner, env.target_info);
let (width, _) = union_layout.data_size_and_alignment(layout_interner);
let cursors = Cursors {
offset: extra_offset,
@ -862,8 +856,7 @@ fn build_clone_tag_help<'a, 'ctx>(
layout_interner.get_repr(layout),
);
let (width, _) =
union_layout.data_size_and_alignment(layout_interner, env.target_info);
let (width, _) = union_layout.data_size_and_alignment(layout_interner);
let cursors = Cursors {
offset: extra_offset,

4
crates/compiler/gen_llvm/src/llvm/refcounting.rs
View file

@ -805,9 +805,7 @@ fn modify_refcount_str_help<'a, 'ctx>(
let parent = fn_val;
let str_type = zig_str_type(env);
let str_wrapper = if LayoutRepr::Builtin(Builtin::Str)
.is_passed_by_reference(layout_interner, env.target_info)
{
let str_wrapper = if LayoutRepr::Builtin(Builtin::Str).is_passed_by_reference(layout_interner) {
env.builder
.new_build_load(str_type, arg_val.into_pointer_value(), "load_str_to_stack")
} else {

2
crates/compiler/gen_llvm/src/llvm/struct_.rs
View file

@ -55,7 +55,7 @@ impl<'ctx> RocStruct<'ctx> {
struct_val,
} = build_struct_helper(env, layout_interner, scope, sorted_fields);
let passed_by_ref = layout_repr.is_passed_by_reference(layout_interner, env.target_info);
let passed_by_ref = layout_repr.is_passed_by_reference(layout_interner);
if passed_by_ref {
let alloca = env.builder.build_alloca(struct_type, "struct_alloca");