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

Fix List.set monomorphization

Browse source
This commit is contained in:
Richard Feldman 2020-06-23 23:42:09 -04:00
parent 08be131eef
commit 14c31d55ee
3 changed files with 108 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

78
compiler/can/src/builtins.rs
View file

@ -449,11 +449,15 @@ fn list_len(symbol: Symbol, var_store: &mut VarStore) -> Def {
fn list_get(symbol: Symbol, var_store: &mut VarStore) -> Def { fn list_get(symbol: Symbol, var_store: &mut VarStore) -> Def {
let arg_list = Symbol::ARG_1; let arg_list = Symbol::ARG_1;
let arg_index = Symbol::ARG_2; let arg_index = Symbol::ARG_2;
let bool_var = var_store.fresh();
let ulen_var = var_store.fresh();
let branch_var = var_store.fresh();
let list_var = var_store.fresh();
// Perform a bounds check. If it passes, run LowLevel::ListGetUnsafe // Perform a bounds check. If it passes, run LowLevel::ListGetUnsafe
let body = If { let body = If {
cond_var: var_store.fresh(), cond_var: bool_var,
branch_var: var_store.fresh(), branch_var,
branches: vec![( branches: vec![(
// if-condition // if-condition
no_region( no_region(
@ -461,17 +465,17 @@ fn list_get(symbol: Symbol, var_store: &mut VarStore) -> Def {
RunLowLevel { RunLowLevel {
op: LowLevel::NumLt, op: LowLevel::NumLt,
args: vec![ args: vec![
(var_store.fresh(), Var(arg_index)), (ulen_var, Var(arg_index)),
( (
var_store.fresh(), ulen_var,
RunLowLevel { RunLowLevel {
op: LowLevel::ListLen, op: LowLevel::ListLen,
args: vec![(var_store.fresh(), Var(arg_list))], args: vec![(list_var, Var(arg_list))],
ret_var: var_store.fresh(), ret_var: ulen_var,
}, },
), ),
], ],
ret_var: var_store.fresh(), ret_var: bool_var,
}, },
), ),
// then-branch // then-branch
@ -483,11 +487,8 @@ fn list_get(symbol: Symbol, var_store: &mut VarStore) -> Def {
// List#getUnsafe list index // List#getUnsafe list index
RunLowLevel { RunLowLevel {
op: LowLevel::ListGetUnsafe, op: LowLevel::ListGetUnsafe,
args: vec![ args: vec![(list_var, Var(arg_list)), (ulen_var, Var(arg_index))],
(var_store.fresh(), Var(arg_list)), ret_var: ulen_var,
(var_store.fresh(), Var(arg_index)),
],
ret_var: var_store.fresh(),
}, },
], ],
var_store, var_store,
@ -515,12 +516,17 @@ fn list_set(symbol: Symbol, var_store: &mut VarStore) -> Def {
let arg_list = Symbol::ARG_1; let arg_list = Symbol::ARG_1;
let arg_index = Symbol::ARG_2; let arg_index = Symbol::ARG_2;
let arg_elem = Symbol::ARG_3; let arg_elem = Symbol::ARG_3;
let bool_var = var_store.fresh();
let ulen_var = var_store.fresh();
let list_var = var_store.fresh();
let branch_var = var_store.fresh();
let elem_var = var_store.fresh();
// Perform a bounds check. If it passes, run LowLevel::ListSet. // Perform a bounds check. If it passes, run LowLevel::ListSet.
// Otherwise, return the list unmodified. // Otherwise, return the list unmodified.
let body = If { let body = If {
cond_var: var_store.fresh(), cond_var: bool_var,
branch_var: var_store.fresh(), branch_var,
branches: vec![( branches: vec![(
// if-condition // if-condition
no_region( no_region(
@ -528,17 +534,17 @@ fn list_set(symbol: Symbol, var_store: &mut VarStore) -> Def {
RunLowLevel { RunLowLevel {
op: LowLevel::NumLt, op: LowLevel::NumLt,
args: vec![ args: vec![
(var_store.fresh(), Var(arg_index)), (ulen_var, Var(arg_index)),
( (
var_store.fresh(), ulen_var,
RunLowLevel { RunLowLevel {
op: LowLevel::ListLen, op: LowLevel::ListLen,
args: vec![(var_store.fresh(), Var(arg_list))], args: vec![(list_var, Var(arg_list))],
ret_var: var_store.fresh(), ret_var: ulen_var,
}, },
), ),
], ],
ret_var: var_store.fresh(), ret_var: bool_var,
}, },
), ),
// then-branch // then-branch
@ -547,11 +553,11 @@ fn list_set(symbol: Symbol, var_store: &mut VarStore) -> Def {
RunLowLevel { RunLowLevel {
op: LowLevel::ListSet, op: LowLevel::ListSet,
args: vec![ args: vec![
(var_store.fresh(), Var(arg_list)), (list_var, Var(arg_list)),
(var_store.fresh(), Var(arg_index)), (ulen_var, Var(arg_index)),
(var_store.fresh(), Var(arg_elem)), (elem_var, Var(arg_elem)),
], ],
ret_var: var_store.fresh(), ret_var: list_var,
}, },
), ),
)], )],
@ -571,37 +577,41 @@ fn list_set(symbol: Symbol, var_store: &mut VarStore) -> Def {
/// Num.rem : Int, Int -> Result Int [ DivByZero ]* /// Num.rem : Int, Int -> Result Int [ DivByZero ]*
fn num_rem(symbol: Symbol, var_store: &mut VarStore) -> Def { fn num_rem(symbol: Symbol, var_store: &mut VarStore) -> Def {
let num_var = var_store.fresh();
let unbound_zero_var = var_store.fresh();
let bool_var = var_store.fresh(); let bool_var = var_store.fresh();
let branch_var = var_store.fresh();
let body = If { let body = If {
branch_var: var_store.fresh(), branch_var,
cond_var: var_store.fresh(), cond_var: bool_var,
branches: vec![( branches: vec![(
// if condition // if condition
no_region( no_region(
// Num.neq arg1 0 // Num.isNeq arg2 0
RunLowLevel { RunLowLevel {
op: LowLevel::NotEq, op: LowLevel::NotEq,
args: vec![ args: vec![
(bool_var, Var(Symbol::ARG_2)), (num_var, Var(Symbol::ARG_2)),
(bool_var, Int(var_store.fresh(), 0)), (num_var, Num(unbound_zero_var, 0)),
], ],
ret_var: var_store.fresh(), ret_var: bool_var,
}, },
), ),
// arg1 was not zero // arg1 was not zero
no_region( no_region(
// Ok (Int.#remUnsafe arg0 arg1) // Ok (Int.#remUnsafe arg1 arg2)
tag( tag(
"Ok", "Ok",
vec![ vec![
// Num.#remUnsafe arg0 arg1 // Num.#remUnsafe arg1 arg2
RunLowLevel { RunLowLevel {
op: LowLevel::NumRemUnchecked, op: LowLevel::NumRemUnchecked,
args: vec![ args: vec![
(var_store.fresh(), Var(Symbol::ARG_1)), (num_var, Var(Symbol::ARG_1)),
(var_store.fresh(), Var(Symbol::ARG_2)), (num_var, Var(Symbol::ARG_2)),
], ],
ret_var: var_store.fresh(), ret_var: num_var,
}, },
], ],
var_store, var_store,

17
compiler/mono/src/expr.rs
View file

@ -520,13 +520,13 @@ fn from_can<'a>(
for (arg_var, arg_expr) in args { for (arg_var, arg_expr) in args {
let arg = from_can(env, arg_expr, procs, layout_cache); let arg = from_can(env, arg_expr, procs, layout_cache);
let layout = layout_cache let layout = layout_cache
.from_var(env.arena, arg_var, env.subs, env.pointer_size) .from_var(env.arena, dbg!(arg_var), env.subs, env.pointer_size)
.unwrap_or_else(|err| panic!("TODO turn fn_var into a RuntimeError {:?}", err)); .unwrap_or_else(|err| todo!("TODO turn fn_var into a RuntimeError {:?}", err));
mono_args.push((arg, layout)); mono_args.push((arg, layout));
} }
Expr::RunLowLevel(op, mono_args.into_bump_slice()) dbg!(Expr::RunLowLevel(op, mono_args.into_bump_slice()))
} }
Call(boxed, loc_args, _) => { Call(boxed, loc_args, _) => {
@ -597,6 +597,13 @@ fn from_can<'a>(
branches, branches,
final_else, final_else,
} => { } => {
dbg!(If {
cond_var,
branch_var,
branches: branches.clone(),
final_else: final_else.clone(),
});
let mut expr = from_can(env, final_else.value, procs, layout_cache); let mut expr = from_can(env, final_else.value, procs, layout_cache);
let arena = env.arena; let arena = env.arena;
@ -608,8 +615,8 @@ fn from_can<'a>(
.expect("invalid cond_layout"); .expect("invalid cond_layout");
for (loc_cond, loc_then) in branches.into_iter().rev() { for (loc_cond, loc_then) in branches.into_iter().rev() {
let cond = from_can(env, loc_cond.value, procs, layout_cache); let cond = from_can(env, dbg!(loc_cond.value), procs, layout_cache);
let then = from_can(env, loc_then.value, procs, layout_cache); let then = from_can(env, dbg!(loc_then.value), procs, layout_cache);
let branch_symbol = env.unique_symbol(); let branch_symbol = env.unique_symbol();

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

@ -8,6 +8,9 @@ use std::collections::BTreeMap;
pub const MAX_ENUM_SIZE: usize = (std::mem::size_of::<u8>() * 8) as usize; pub const MAX_ENUM_SIZE: usize = (std::mem::size_of::<u8>() * 8) as usize;
/// If a (Num *) gets translated to a Layout, this is the numeric type it defaults to.
const DEFAULT_NUM_BUILTIN: Builtin<'_> = Builtin::Int64;
/// Types for code gen must be monomorphic. No type variables allowed! /// Types for code gen must be monomorphic. No type variables allowed!
#[derive(Clone, Debug, PartialEq, Eq, Hash)] #[derive(Clone, Debug, PartialEq, Eq, Hash)]
pub enum Layout<'a> { pub enum Layout<'a> {
@ -50,8 +53,13 @@ impl<'a> Layout<'a> {
) -> Result<Self, LayoutProblem> { ) -> Result<Self, LayoutProblem> {
use roc_types::subs::Content::*; use roc_types::subs::Content::*;
match content { match content.dbg(subs) {
FlexVar(_) | RigidVar(_) => Err(LayoutProblem::UnboundVar), var @ FlexVar(_) | var @ RigidVar(_) => {
unreachable!(
"Encountered an unresolved {:?} when determining layout",
var
);
}
Structure(flat_type) => layout_from_flat_type(arena, flat_type, subs, pointer_size), Structure(flat_type) => layout_from_flat_type(arena, flat_type, subs, pointer_size),
Alias(Symbol::NUM_INT, args, _) => { Alias(Symbol::NUM_INT, args, _) => {
@ -228,12 +236,6 @@ impl<'a> Builtin<'a> {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub enum LayoutProblem { pub enum LayoutProblem {
/// We get this error when, after unwrapping all the Attr wrappers,
/// we ultimately end up with an unresolved FlexVar. This can happen
/// legitimately, for example when resolving a layout for a `List (Attr * *)` -
/// which should be an empty list. However, if we get all the way back to
/// the top and it's still this error, that's a compiler bug.
UnboundVar,
Erroneous, Erroneous,
} }
@ -249,16 +251,16 @@ fn layout_from_flat_type<'a>(
Apply(symbol, args) => { Apply(symbol, args) => {
match symbol { match symbol {
Symbol::NUM_INT => { Symbol::NUM_INT => {
debug_assert!(args.is_empty()); debug_assert_eq!(args.len(), 0);
Ok(Layout::Builtin(Builtin::Int64)) Ok(Layout::Builtin(Builtin::Int64))
} }
Symbol::NUM_FLOAT => { Symbol::NUM_FLOAT => {
debug_assert!(args.is_empty()); debug_assert_eq!(args.len(), 0);
Ok(Layout::Builtin(Builtin::Float64)) Ok(Layout::Builtin(Builtin::Float64))
} }
Symbol::NUM_NUM => { Symbol::NUM_NUM | Symbol::NUM_AT_NUM => {
// Num.Num should only ever have 1 argument, e.g. Num.Num Int.Integer // Num.Num should only ever have 1 argument, e.g. Num.Num Int.Integer
debug_assert!(args.len() == 1); debug_assert_eq!(args.len(), 1);
let var = args.iter().next().unwrap(); let var = args.iter().next().unwrap();
let content = subs.get_without_compacting(*var).content; let content = subs.get_without_compacting(*var).content;
@ -266,23 +268,7 @@ fn layout_from_flat_type<'a>(
layout_from_num_content(content) layout_from_num_content(content)
} }
Symbol::STR_STR => Ok(Layout::Builtin(Builtin::Str)), Symbol::STR_STR => Ok(Layout::Builtin(Builtin::Str)),
Symbol::LIST_LIST => { Symbol::LIST_LIST => unwrap_list(arena, subs, args[0], pointer_size),
use LayoutProblem::*;
let content = subs.get_without_compacting(args[0]).content;
match Layout::new(arena, content, subs, pointer_size) {
Ok(elem_layout) => {
// This is a normal list.
Ok(Layout::Builtin(Builtin::List(arena.alloc(elem_layout))))
}
Err(UnboundVar) => {
// This is an empty list. That's fine!
Ok(Layout::Builtin(Builtin::EmptyList))
}
Err(Erroneous) => Err(Erroneous),
}
}
Symbol::ATTR_ATTR => { Symbol::ATTR_ATTR => {
debug_assert_eq!(args.len(), 2); debug_assert_eq!(args.len(), 2);
@ -451,12 +437,12 @@ fn union_sorted_tags_help<'a>(
UnionVariant::ByteUnion(tag_names) UnionVariant::ByteUnion(tag_names)
} }
1 => { 1 => {
// special-case NUM_AT_NUM: if its argument is a FlexVar, make it Int
let (tag_name, arguments) = tags_vec.remove(0); let (tag_name, arguments) = tags_vec.remove(0);
// just one tag in the union (but with arguments) can be a struct // just one tag in the union (but with arguments) can be a struct
let mut layouts = Vec::with_capacity_in(tags_vec.len(), arena); let mut layouts = Vec::with_capacity_in(tags_vec.len(), arena);
// special-case NUM_AT_NUM: if its argument is a FlexVar, make it Int
match tag_name { match tag_name {
TagName::Private(Symbol::NUM_AT_NUM) => { TagName::Private(Symbol::NUM_AT_NUM) => {
layouts.push(unwrap_num_tag(subs, arguments[0]).expect("invalid num layout")); layouts.push(unwrap_num_tag(subs, arguments[0]).expect("invalid num layout"));
@ -516,7 +502,9 @@ pub fn layout_from_tag_union<'a>(
Unwrapped(field_layouts) => match first_tag.0 { Unwrapped(field_layouts) => match first_tag.0 {
TagName::Private(Symbol::NUM_AT_NUM) => { TagName::Private(Symbol::NUM_AT_NUM) => {
let arguments = first_tag.1; let arguments = first_tag.1;
debug_assert!(arguments.len() == 1);
debug_assert_eq!(arguments.len(), 1);
let var = arguments.iter().next().unwrap(); let var = arguments.iter().next().unwrap();
unwrap_num_tag(subs, *var).expect("invalid Num argument") unwrap_num_tag(subs, *var).expect("invalid Num argument")
@ -562,7 +550,7 @@ fn layout_from_num_content<'a>(content: Content) -> Result<Layout<'a>, LayoutPro
// type variable, then assume it's a 64-bit integer. // type variable, then assume it's a 64-bit integer.
// //
// (e.g. for (5 + 5) assume both 5s are 64-bit integers.) // (e.g. for (5 + 5) assume both 5s are 64-bit integers.)
Ok(Layout::Builtin(Builtin::Int64)) Ok(Layout::Builtin(DEFAULT_NUM_BUILTIN))
} }
Structure(Apply(symbol, args)) => match symbol { Structure(Apply(symbol, args)) => match symbol {
Symbol::NUM_INTEGER => Ok(Layout::Builtin(Builtin::Int64)), Symbol::NUM_INTEGER => Ok(Layout::Builtin(Builtin::Int64)),
@ -588,14 +576,14 @@ fn unwrap_num_tag<'a>(subs: &Subs, var: Variable) -> Result<Layout<'a>, LayoutPr
match subs.get_without_compacting(var).content { match subs.get_without_compacting(var).content {
Content::Structure(flat_type) => match flat_type { Content::Structure(flat_type) => match flat_type {
FlatType::Apply(Symbol::ATTR_ATTR, args) => { FlatType::Apply(Symbol::ATTR_ATTR, args) => {
debug_assert!(args.len() == 2); debug_assert_eq!(args.len(), 2);
let arg_var = args.get(1).unwrap(); let arg_var = args.get(1).unwrap();
unwrap_num_tag(subs, *arg_var) unwrap_num_tag(subs, *arg_var)
} }
_ => { _ => {
panic!("TODO handle Num.@Num flat_type {:?}", flat_type); todo!("TODO handle Num.@Num flat_type {:?}", flat_type);
} }
}, },
Content::Alias(Symbol::NUM_INTEGER, args, _) => { Content::Alias(Symbol::NUM_INTEGER, args, _) => {
@ -606,12 +594,39 @@ fn unwrap_num_tag<'a>(subs: &Subs, var: Variable) -> Result<Layout<'a>, LayoutPr
debug_assert!(args.is_empty()); debug_assert!(args.is_empty());
Ok(Layout::Builtin(Builtin::Float64)) Ok(Layout::Builtin(Builtin::Float64))
} }
Content::FlexVar(_) => { Content::FlexVar(_) | Content::RigidVar(_) => {
// If this was still a (Num *) then default to compiling it to i64 // If this was still a (Num *) then default to compiling it to i64
Ok(Layout::Builtin(Builtin::Int64)) Ok(Layout::Builtin(DEFAULT_NUM_BUILTIN))
} }
other => { other => {
panic!("TODO non structure Num.@Num flat_type {:?}", other); todo!("TODO non structure Num.@Num flat_type {:?}", other);
}
}
}
fn unwrap_list<'a>(
arena: &'a Bump,
subs: &Subs,
var: Variable,
pointer_size: u32,
) -> Result<Layout<'a>, LayoutProblem> {
match subs.get_without_compacting(var).content {
Content::Structure(FlatType::Apply(Symbol::ATTR_ATTR, args)) => {
debug_assert_eq!(args.len(), 2);
let arg_var = args.get(1).unwrap();
unwrap_list(arena, subs, *arg_var, pointer_size)
}
Content::FlexVar(_) | Content::RigidVar(_) => {
// If this was still a (List *) then it must have been an empty list
Ok(Layout::Builtin(Builtin::EmptyList))
}
content => {
let elem_layout = Layout::new(arena, content, subs, pointer_size)?;
// This is a normal list.
Ok(Layout::Builtin(Builtin::List(arena.alloc(elem_layout))))
} }
} }
} }