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

Drop unused target_info from layout

Browse source
This commit is contained in:
Richard Feldman 2024-01-24 23:30:55 -05:00
parent 87ec602b1e
commit 76dcbee25f
No known key found for this signature in database
GPG key ID: F1F21AA5B1D9E43B
4 changed files with 31 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

54
crates/compiler/mono/src/ir.rs
View file

@ -3120,8 +3120,7 @@ fn specialize_host_specializations<'a>(
let symbol = env.unique_symbol();
let lambda_name = LambdaName::no_niche(symbol);
let mut layout_env =
layout::Env::from_components(layout_cache, env.subs, env.arena, env.target_info);
let mut layout_env = layout::Env::from_components(layout_cache, env.subs, env.arena);
let lambda_set = env.subs.get_lambda_set(var);
let raw_function_layout =
RawFunctionLayout::from_var(&mut layout_env, lambda_set.ambient_function)
@ -4542,12 +4541,8 @@ pub fn with_hole<'a>(
tuple_var, elems, ..
} => {
let sorted_elems_result = {
let mut layout_env = layout::Env::from_components(
layout_cache,
env.subs,
env.arena,
env.target_info,
);
let mut layout_env =
layout::Env::from_components(layout_cache, env.subs, env.arena);
layout::sort_tuple_elems(&mut layout_env, tuple_var)
};
let sorted_elems = match sorted_elems_result {
@ -4577,12 +4572,8 @@ pub fn with_hole<'a>(
..
} => {
let sorted_fields_result = {
let mut layout_env = layout::Env::from_components(
layout_cache,
env.subs,
env.arena,
env.target_info,
);
let mut layout_env =
layout::Env::from_components(layout_cache, env.subs, env.arena);
layout::sort_record_fields(&mut layout_env, record_var)
};
let sorted_fields = match sorted_fields_result {
@ -4916,12 +4907,8 @@ pub fn with_hole<'a>(
..
} => {
let sorted_fields_result = {
let mut layout_env = layout::Env::from_components(
layout_cache,
env.subs,
env.arena,
env.target_info,
);
let mut layout_env =
layout::Env::from_components(layout_cache, env.subs, env.arena);
layout::sort_record_fields(&mut layout_env, record_var)
};
let sorted_fields = match sorted_fields_result {
@ -5029,12 +5016,8 @@ pub fn with_hole<'a>(
..
} => {
let sorted_elems_result = {
let mut layout_env = layout::Env::from_components(
layout_cache,
env.subs,
env.arena,
env.target_info,
);
let mut layout_env =
layout::Env::from_components(layout_cache, env.subs, env.arena);
layout::sort_tuple_elems(&mut layout_env, tuple_var)
};
let sorted_elems = match sorted_elems_result {
@ -5142,12 +5125,8 @@ pub fn with_hole<'a>(
// This has the benefit that we don't need to do anything special for reference
// counting
let sorted_fields_result = {
let mut layout_env = layout::Env::from_components(
layout_cache,
env.subs,
env.arena,
env.target_info,
);
let mut layout_env =
layout::Env::from_components(layout_cache, env.subs, env.arena);
layout::sort_record_fields(&mut layout_env, record_var)
};
@ -6368,8 +6347,7 @@ fn convert_tag_union<'a>(
) -> Stmt<'a> {
use crate::layout::UnionVariant::*;
let res_variant = {
let mut layout_env =
layout::Env::from_components(layout_cache, env.subs, env.arena, env.target_info);
let mut layout_env = layout::Env::from_components(layout_cache, env.subs, env.arena);
crate::layout::union_sorted_tags(&mut layout_env, variant_var)
};
let variant = match res_variant {
@ -8046,12 +8024,8 @@ fn can_reuse_symbol<'a>(
..
} => {
let sorted_fields_result = {
let mut layout_env = layout::Env::from_components(
layout_cache,
env.subs,
env.arena,
env.target_info,
);
let mut layout_env =
layout::Env::from_components(layout_cache, env.subs, env.arena);
layout::sort_record_fields(&mut layout_env, *record_var)
};

24
crates/compiler/mono/src/ir/pattern.rs
View file

@ -385,12 +385,8 @@ fn from_can_pattern_help<'a>(
use roc_exhaustive::Union;
let res_variant = {
let mut layout_env = layout::Env::from_components(
layout_cache,
env.subs,
env.arena,
env.target_info,
);
let mut layout_env =
layout::Env::from_components(layout_cache, env.subs, env.arena);
crate::layout::union_sorted_tags(&mut layout_env, *whole_var).map_err(Into::into)
};
@ -880,12 +876,8 @@ fn from_can_pattern_help<'a>(
} => {
// sorted fields based on the type
let sorted_elems = {
let mut layout_env = layout::Env::from_components(
layout_cache,
env.subs,
env.arena,
env.target_info,
);
let mut layout_env =
layout::Env::from_components(layout_cache, env.subs, env.arena);
crate::layout::sort_tuple_elems(&mut layout_env, *whole_var)
.map_err(RuntimeError::from)?
};
@ -936,12 +928,8 @@ fn from_can_pattern_help<'a>(
} => {
// sorted fields based on the type
let sorted_fields = {
let mut layout_env = layout::Env::from_components(
layout_cache,
env.subs,
env.arena,
env.target_info,
);
let mut layout_env =
layout::Env::from_components(layout_cache, env.subs, env.arena);
crate::layout::sort_record_fields(&mut layout_env, *whole_var)
.map_err(RuntimeError::from)?
};

39
crates/compiler/mono/src/layout.rs
View file

@ -160,7 +160,6 @@ impl<'a> LayoutCache<'a> {
arena,
subs,
seen: Vec::new_in(arena),
target_info: self.target_info,
cache: self,
};
@ -186,7 +185,6 @@ impl<'a> LayoutCache<'a> {
arena,
subs,
seen: Vec::new_in(arena),
target_info: self.target_info,
cache: self,
};
@ -1821,7 +1819,7 @@ impl<'a> LambdaSet<'a> {
ret_var: Variable,
target_info: TargetInfo,
) -> Result<Self, LayoutProblem> {
let mut env = Env::from_components(cache, subs, arena, target_info);
let mut env = Env::from_components(cache, subs, arena);
Self::from_var(&mut env, args, closure_var, ret_var).value()
}
@ -2229,7 +2227,6 @@ macro_rules! list_element_layout {
}
pub struct Env<'a, 'b> {
target_info: TargetInfo,
pub(crate) arena: &'a Bump,
seen: Vec<'a, Variable>,
pub(crate) subs: &'b Subs,
@ -2241,14 +2238,12 @@ impl<'a, 'b> Env<'a, 'b> {
cache: &'b mut LayoutCache<'a>,
subs: &'b Subs,
arena: &'a Bump,
target_info: TargetInfo,
) -> Self {
Self {
cache,
subs,
seen: Vec::new_in(arena),
arena,
target_info,
}
}
@ -2518,7 +2513,7 @@ impl<'a> Layout<'a> {
}
}
RangedNumber(range) => Self::layout_from_ranged_number(env, range),
RangedNumber(range) => Self::layout_from_ranged_number(range),
Error => cacheable(Err(LayoutProblem::Erroneous)),
}
@ -2539,18 +2534,12 @@ impl<'a> Layout<'a> {
}
}
fn layout_from_ranged_number(
env: &mut Env<'a, '_>,
range: NumericRange,
) -> Cacheable<LayoutResult<'a>> {
fn layout_from_ranged_number(range: NumericRange) -> Cacheable<LayoutResult<'a>> {
// We don't pass the range down because `RangedNumber`s are somewhat rare, they only
// appear due to number literals, so no need to increase parameter list sizes.
let num_layout = range.default_compilation_width();
cacheable(Ok(Layout::int_literal_width_to_int(
num_layout,
env.target_info,
)))
cacheable(Ok(Layout::int_literal_width_to_int(num_layout)))
}
/// Returns Err(()) if given an error, or Ok(Layout) if given a non-erroneous Structure.
@ -3028,10 +3017,7 @@ impl<'a> Layout<'a> {
Layout::DEC
}
pub fn int_literal_width_to_int(
width: roc_types::num::IntLitWidth,
target_info: TargetInfo,
) -> InLayout<'a> {
pub fn int_literal_width_to_int(width: roc_types::num::IntLitWidth) -> InLayout<'a> {
use roc_types::num::IntLitWidth::*;
match width {
U8 => Layout::U8,
@ -3229,7 +3215,6 @@ fn layout_from_flat_type<'a>(
let arena = env.arena;
let subs = env.subs;
let target_info = env.target_info;
match flat_type {
Apply(symbol, args) => {
@ -3237,11 +3222,6 @@ fn layout_from_flat_type<'a>(
match symbol {
// Ints
Symbol::NUM_NAT => {
debug_assert_eq!(args.len(), 0);
cacheable(Ok(Layout::usize(env.target_info)))
}
Symbol::NUM_I128 => {
debug_assert_eq!(args.len(), 0);
cacheable(Ok(Layout::I128))
@ -3305,7 +3285,7 @@ fn layout_from_flat_type<'a>(
let var = args[0];
let content = subs.get_content_without_compacting(var);
layout_from_num_content(content, target_info)
layout_from_num_content(content)
}
Symbol::STR_STR => cacheable(Ok(Layout::STR)),
@ -4539,10 +4519,7 @@ pub fn ext_var_is_empty_tag_union(_: &Subs, _: TagExt) -> bool {
unreachable!();
}
fn layout_from_num_content<'a>(
content: &Content,
target_info: TargetInfo,
) -> Cacheable<LayoutResult<'a>> {
fn layout_from_num_content<'a>(content: &Content) -> Cacheable<LayoutResult<'a>> {
use roc_types::subs::Content::*;
use roc_types::subs::FlatType::*;
@ -4558,8 +4535,6 @@ fn layout_from_num_content<'a>(
FlexAbleVar(_, _) | RigidAbleVar(_, _) => todo_abilities!("Not reachable yet"),
Structure(Apply(symbol, args)) => match *symbol {
// Ints
Symbol::NUM_NAT => Ok(Layout::usize(target_info)),
Symbol::NUM_INTEGER => Ok(Layout::I64),
Symbol::NUM_I128 => Ok(Layout::I128),
Symbol::NUM_I64 => Ok(Layout::I64),