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

All of test_gen works again

Browse source
This commit is contained in:
Ayaz Hafiz 2022-05-04 09:13:42 -04:00
parent 3c2dd488a5
commit bc987fd4d7
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
2 changed files with 59 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

59
compiler/mono/src/ir.rs
View file

@ -2465,6 +2465,17 @@ fn specialize_external<'a>(
(Some(closure_layout), CapturedSymbols::Captured(captured)) => {
// debug_assert!(!captured.is_empty());
// An argument from the closure list may have taken on a specialized symbol
// name during the evaluation of the def body. If this is the case, load the
// specialized name rather than the original captured name!
// let get_specialized_name = |symbol, layout| {
// procs
// .needed_symbol_specializations
// .get(&(symbol, layout))
// .map(|(_, specialized)| *specialized)
// .unwrap_or(symbol)
// };
match closure_layout.layout_for_member(proc_name) {
ClosureRepresentation::Union {
alphabetic_order_fields: field_layouts,
@ -2499,6 +2510,8 @@ fn specialize_external<'a>(
union_layout,
};
// let symbol = get_specialized_name(**symbol, **layout);
specialized_body = Stmt::Let(
**symbol,
expr,
@ -2540,6 +2553,8 @@ fn specialize_external<'a>(
structure: Symbol::ARG_CLOSURE,
};
// let symbol = get_specialized_name(**symbol, **layout);
specialized_body = Stmt::Let(
**symbol,
expr,
@ -2585,8 +2600,9 @@ fn specialize_external<'a>(
.map(|&(layout, symbol)| {
let symbol = procs
.needed_symbol_specializations
.get(&(symbol, layout))
.map(|(_, specialized_symbol)| *specialized_symbol)
// We can remove the specialization since this is the definition site.
.remove(&(symbol, layout))
.map(|(_, specialized_symbol)| specialized_symbol)
.unwrap_or(symbol);
(layout, symbol)
@ -3002,19 +3018,25 @@ fn specialize_naked_symbol<'a>(
}
}
use roc_can::expr::Expr;
if let ReuseSymbol::Value(_symbol) = can_reuse_symbol(env, procs, &Expr::Var(symbol)) {
let real_symbol =
possible_reuse_symbol_or_spec(env, procs, layout_cache, &Expr::Var(symbol), variable);
return match hole {
Stmt::Jump(id, _) => Stmt::Jump(*id, env.arena.alloc([real_symbol])),
_ => Stmt::Ret(real_symbol),
};
}
let mut symbol = symbol;
let result = match hole {
Stmt::Jump(id, _) => Stmt::Jump(*id, env.arena.alloc([symbol])),
_ => Stmt::Ret(symbol),
_ => {
use roc_can::expr::Expr;
if let ReuseSymbol::Value(_symbol) = can_reuse_symbol(env, procs, &Expr::Var(symbol)) {
let real_symbol = possible_reuse_symbol_or_spec(
env,
procs,
layout_cache,
&Expr::Var(symbol),
variable,
);
symbol = real_symbol;
Stmt::Ret(real_symbol)
} else {
Stmt::Ret(symbol)
}
}
};
// if the symbol is a function symbol, ensure it is properly specialized!
@ -4717,6 +4739,7 @@ fn get_specialization<'a>(
#[allow(clippy::too_many_arguments)]
fn construct_closure_data<'a, I>(
env: &mut Env<'a, '_>,
// procs: &mut Procs<'a>,
lambda_set: LambdaSet<'a>,
name: Symbol,
symbols: I,
@ -4730,6 +4753,16 @@ where
let lambda_set_layout = Layout::LambdaSet(lambda_set);
let symbols = symbols.into_iter();
// It may be the case that while capturing a symbol, we actually want to capture it under a
// different name than what the
// let get_specialized_name = |symbol, layout| {
// procs
// .needed_symbol_specializations
// .get(&(symbol, layout))
// .map(|(_, specialized)| *specialized)
// .unwrap_or(symbol)
// };
let result = match lambda_set.layout_for_member(name) {
ClosureRepresentation::Union {
tag_id,