language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-01 15:51:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Revert "Store layouts in a layout-buffer for expects"

Browse source 
This reverts commit bba6e36a18.
This commit is contained in:
Ayaz Hafiz 2022-12-14 14:05:46 -06:00
parent bba6e36a18
commit 897b69b072
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
8 changed files with 30 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,6 @@ use roc_can::abilities::SpecializationId;
use roc_can::expr::{AnnotatedMark, ClosureData, ExpectLookup, IntValue};
use roc_can::module::ExposedByModule;
use roc_collections::all::{default_hasher, BumpMap, BumpMapDefault, MutMap};
use roc_collections::soa::Slice;
use roc_collections::VecMap;
use roc_debug_flags::dbg_do;
#[cfg(debug_assertions)]
@ -1625,7 +1624,7 @@ pub enum Stmt<'a> {
condition: Symbol,
region: Region,
lookups: &'a [Symbol],
layouts: Slice<Layout<'a>>,
layouts: &'a [Layout<'a>],
/// what happens after the expect
remainder: &'a Stmt<'a>,
},
@ -1633,7 +1632,7 @@ pub enum Stmt<'a> {
condition: Symbol,
region: Region,
lookups: &'a [Symbol],
layouts: Slice<Layout<'a>>,
layouts: &'a [Layout<'a>],
/// what happens after the expect
remainder: &'a Stmt<'a>,
},
@ -6599,14 +6598,11 @@ pub fn from_can<'a>(
}
}
let layouts_slice = env.layout_buffer.reserve(layouts.len());
env.layout_buffer.set_reserved(layouts_slice, layouts);
let mut stmt = Stmt::Expect {
condition: cond_symbol,
region: loc_condition.region,
lookups: lookups.into_bump_slice(),
layouts: layouts_slice,
layouts: layouts.into_bump_slice(),
remainder: env.arena.alloc(rest),
};
@ -6658,14 +6654,11 @@ pub fn from_can<'a>(
}
}
let layouts_slice = env.layout_buffer.reserve(layouts.len());
env.layout_buffer.set_reserved(layouts_slice, layouts);
let mut stmt = Stmt::ExpectFx {
condition: cond_symbol,
region: loc_condition.region,
lookups: lookups.into_bump_slice(),
layouts: layouts_slice,
layouts: layouts.into_bump_slice(),
remainder: env.arena.alloc(rest),
};
@ -7106,7 +7099,7 @@ fn substitute_in_stmt_help<'a>(
condition: substitute(subs, *condition).unwrap_or(*condition),
region: *region,
lookups: new_lookups.into_bump_slice(),
layouts: *layouts,
layouts,
remainder: new_remainder,
};
@ -7132,7 +7125,7 @@ fn substitute_in_stmt_help<'a>(
condition: substitute(subs, *condition).unwrap_or(*condition),
region: *region,
lookups: new_lookups.into_bump_slice(),
layouts: *layouts,
layouts,
remainder: new_remainder,
};