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

Store args, return type on lambda set

Browse source
This commit is contained in:
Ayaz Hafiz 2023-01-13 16:08:25 -06:00
parent fb0668f13b
commit 8dc2a5daa7
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
3 changed files with 50 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

30
crates/compiler/mono/src/layout/intern.rs
View file

@ -133,6 +133,8 @@ pub trait LayoutInterner<'a>: Sized {
/// lambda set onto itself.
fn insert_lambda_set(
&mut self,
args: &'a &'a [InLayout<'a>],
ret: InLayout<'a>,
set: &'a &'a [(Symbol, &'a [InLayout<'a>])],
representation: InLayout<'a>,
) -> LambdaSet<'a>;
@ -310,10 +312,14 @@ fn hash<V: std::hash::Hash>(val: V) -> u64 {
#[inline(always)]
fn make_normalized_lamdba_set<'a>(
args: &'a &'a [InLayout<'a>],
ret: InLayout<'a>,
set: &'a &'a [(Symbol, &'a [InLayout<'a>])],
representation: InLayout<'a>,
) -> LambdaSet<'a> {
LambdaSet {
args,
ret,
set,
representation,
full_layout: Layout::VOID,
@ -460,6 +466,8 @@ impl<'a> LayoutInterner<'a> for TLLayoutInterner<'a> {
fn insert_lambda_set(
&mut self,
args: &'a &'a [InLayout<'a>],
ret: InLayout<'a>,
set: &'a &'a [(Symbol, &'a [InLayout<'a>])],
representation: InLayout<'a>,
) -> LambdaSet<'a> {
@ -475,7 +483,7 @@ impl<'a> LayoutInterner<'a> for TLLayoutInterner<'a> {
// - if so, use that one immediately
// - otherwise, allocate a new (global) slot, intern the lambda set, and then fill the slot in
let global = &self.parent;
let normalized = make_normalized_lamdba_set(set, representation);
let normalized = make_normalized_lamdba_set(args, ret, set, representation);
let normalized_hash = hash(normalized);
let mut new_interned_layout = None;
let (_, &mut full_lambda_set) = self
@ -571,6 +579,8 @@ impl<'a> LayoutInterner<'a> for STLayoutInterner<'a> {
fn insert_lambda_set(
&mut self,
args: &'a &'a [InLayout<'a>],
ret: InLayout<'a>,
set: &'a &'a [(Symbol, &'a [InLayout<'a>])],
representation: InLayout<'a>,
) -> LambdaSet<'a> {
@ -579,7 +589,7 @@ impl<'a> LayoutInterner<'a> for STLayoutInterner<'a> {
// inserted lambda set
// - if so, use that one immediately
// - otherwise, allocate a new slot, intern the lambda set, and then fill the slot in
let normalized_lambda_set = make_normalized_lamdba_set(set, representation);
let normalized_lambda_set = make_normalized_lamdba_set(args, ret, set, representation);
if let Some(lambda_set) = self.normalized_lambda_set_map.get(&normalized_lambda_set) {
return *lambda_set;
}
@ -587,6 +597,8 @@ impl<'a> LayoutInterner<'a> for STLayoutInterner<'a> {
// This lambda set must be new to the interner, reserve a slot and fill it in.
let slot = unsafe { InLayout::from_reserved_index(self.vec.len()) };
let lambda_set = LambdaSet {
args,
ret,
set,
representation,
full_layout: slot,
@ -622,6 +634,8 @@ mod insert_lambda_set {
const TARGET_INFO: TargetInfo = TargetInfo::default_x86_64();
const TEST_SET: &&[(Symbol, &[InLayout])] =
&(&[(Symbol::ATTR_ATTR, &[Layout::UNIT] as &[_])] as &[_]);
const TEST_ARGS: &&[InLayout] = &(&[Layout::UNIT] as &[_]);
const TEST_RET: InLayout = Layout::UNIT;
#[test]
fn two_threads_write() {
@ -634,7 +648,7 @@ mod insert_lambda_set {
for _ in 0..10 {
let mut interner = global.fork();
handles.push(std::thread::spawn(move || {
interner.insert_lambda_set(set, repr)
interner.insert_lambda_set(TEST_ARGS, TEST_RET, set, repr)
}));
}
let ins: Vec<_> = handles.into_iter().map(|t| t.join().unwrap()).collect();
@ -648,7 +662,7 @@ mod insert_lambda_set {
let global = GlobalLayoutInterner::with_capacity(2, TARGET_INFO);
let mut interner = global.fork();
let lambda_set = interner.insert_lambda_set(TEST_SET, Layout::UNIT);
let lambda_set = interner.insert_lambda_set(TEST_ARGS, TEST_RET, TEST_SET, Layout::UNIT);
let lambda_set_layout_in = interner.insert(Layout::LambdaSet(lambda_set));
assert_eq!(lambda_set.full_layout, lambda_set_layout_in);
}
@ -661,12 +675,12 @@ mod insert_lambda_set {
let in1 = {
let mut interner = global.fork();
interner.insert_lambda_set(set, repr)
interner.insert_lambda_set(TEST_ARGS, TEST_RET, set, repr)
};
let in2 = {
let mut st_interner = global.unwrap().unwrap();
st_interner.insert_lambda_set(set, repr)
st_interner.insert_lambda_set(TEST_ARGS, TEST_RET, set, repr)
};
assert_eq!(in1, in2);
@ -680,12 +694,12 @@ mod insert_lambda_set {
let set = TEST_SET;
let repr = Layout::UNIT;
let in1 = st_interner.insert_lambda_set(set, repr);
let in1 = st_interner.insert_lambda_set(TEST_ARGS, TEST_RET, set, repr);
let global = st_interner.into_global();
let mut interner = global.fork();
let in2 = interner.insert_lambda_set(set, repr);
let in2 = interner.insert_lambda_set(TEST_ARGS, TEST_RET, set, repr);
assert_eq!(in1, in2);
}