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

also for recursive tags

Browse source
This commit is contained in:
Folkert 2021-08-12 21:37:00 +02:00
parent c058368a6d
commit ecfb0e2685
1 changed files with 17 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

54
compiler/mono/src/layout.rs
View file

@ -1286,23 +1286,7 @@ fn layout_from_flat_type<'a>(
let rec_var = subs.get_root_key_without_compacting(rec_var); let rec_var = subs.get_root_key_without_compacting(rec_var);
let mut tag_layouts = Vec::with_capacity_in(tags.len(), arena); let mut tag_layouts = Vec::with_capacity_in(tags.len(), arena);
let mut new_tags = MutMap::default(); let tags_vec = cheap_sort_tags(arena, tags, subs);
for (tag_index, index) in tags.iter_all() {
let tag = subs[tag_index].clone();
let slice = subs[index];
let mut new_vars = std::vec::Vec::new();
for var_index in slice {
let var = subs[var_index];
new_vars.push(var);
}
new_tags.insert(tag, new_vars);
}
// VERY IMPORTANT: sort the tags
let mut tags_vec: std::vec::Vec<_> = new_tags.into_iter().collect();
tags_vec.sort();
let mut nullable = None; let mut nullable = None;
@ -1324,7 +1308,8 @@ fn layout_from_flat_type<'a>(
let mut tag_layout = Vec::with_capacity_in(variables.len() + 1, arena); let mut tag_layout = Vec::with_capacity_in(variables.len() + 1, arena);
for var in variables { for var_index in variables {
let var = subs[var_index];
// TODO does this cause problems with mutually recursive unions? // TODO does this cause problems with mutually recursive unions?
if rec_var == subs.get_root_key_without_compacting(var) { if rec_var == subs.get_root_key_without_compacting(var) {
tag_layout.push(Layout::RecursivePointer); tag_layout.push(Layout::RecursivePointer);
@ -2032,23 +2017,13 @@ pub fn union_sorted_tags_help<'a>(
} }
} }
pub fn layout_from_tag_union<'a>(arena: &'a Bump, tags: UnionTags, subs: &Subs) -> Layout<'a> { fn cheap_sort_tags<'a, 'b>(
use UnionVariant::*; arena: &'a Bump,
tags: UnionTags,
subs: &'b Subs,
) -> Vec<'a, (&'b TagName, VariableSubsSlice)> {
let mut tags_vec = Vec::with_capacity_in(tags.len(), arena); let mut tags_vec = Vec::with_capacity_in(tags.len(), arena);
// for (tag_index, index) in tags.iter_all() {
// let tag = subs[tag_index].clone();
// let slice = subs[index];
// let mut new_vars = std::vec::Vec::new();
// for var_index in slice {
// let var = subs[var_index];
// new_vars.push(var);
// }
//
// tags_vec.push((tag, new_vars));
// }
for (tag_index, index) in tags.iter_all() { for (tag_index, index) in tags.iter_all() {
let tag = &subs[tag_index]; let tag = &subs[tag_index];
let slice = subs[index]; let slice = subs[index];
@ -2056,6 +2031,14 @@ pub fn layout_from_tag_union<'a>(arena: &'a Bump, tags: UnionTags, subs: &Subs)
tags_vec.push((tag, slice)); tags_vec.push((tag, slice));
} }
tags_vec
}
pub fn layout_from_tag_union<'a>(arena: &'a Bump, tags: UnionTags, subs: &Subs) -> Layout<'a> {
use UnionVariant::*;
let tags_vec = cheap_sort_tags(arena, tags, subs);
match tags_vec.get(0) { match tags_vec.get(0) {
Some((tag_name, arguments)) if *tag_name == &TagName::Private(Symbol::NUM_AT_NUM) => { Some((tag_name, arguments)) if *tag_name == &TagName::Private(Symbol::NUM_AT_NUM) => {
debug_assert_eq!(arguments.len(), 1); debug_assert_eq!(arguments.len(), 1);
@ -2078,13 +2061,10 @@ pub fn layout_from_tag_union<'a>(arena: &'a Bump, tags: UnionTags, subs: &Subs)
arguments: field_layouts, arguments: field_layouts,
.. ..
} => { } => {
// work around a lifetime issue
let field_layouts =
Vec::from_iter_in(field_layouts.into_iter(), arena).into_bump_slice();
if field_layouts.len() == 1 { if field_layouts.len() == 1 {
field_layouts[0] field_layouts[0]
} else { } else {
Layout::Struct(field_layouts) Layout::Struct(field_layouts.into_bump_slice())
} }
} }
Wrapped(variant) => { Wrapped(variant) => {