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

Fix two canonicalization crashes: try() and overflowed tuple indexes

Browse source
This commit is contained in:
Joshua Warner 2025-01-11 13:51:30 -08:00
parent 7d464a2989
commit e0ef01fa82
No known key found for this signature in database
GPG key ID: 89AD497003F93FDD
11 changed files with 114 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

49
crates/compiler/can/src/expr.rs
View file

@ -1268,21 +1268,9 @@ pub fn canonicalize_expr<'a>(
output,
)
}
ast::Expr::AccessorFunction(field) => (
RecordAccessor(StructAccessorData {
name: scope.gen_unique_symbol(),
function_var: var_store.fresh(),
record_var: var_store.fresh(),
ext_var: var_store.fresh(),
closure_var: var_store.fresh(),
field_var: var_store.fresh(),
field: match field {
Accessor::RecordField(field) => IndexOrField::Field((*field).into()),
Accessor::TupleIndex(index) => IndexOrField::Index(index.parse().unwrap()),
},
}),
Output::default(),
),
ast::Expr::AccessorFunction(field) => {
canonicalize_accessor_function(env, var_store, scope, field, region)
}
ast::Expr::TupleAccess(tuple_expr, field) => {
let (loc_expr, output) = canonicalize_expr(env, var_store, scope, region, tuple_expr);
@ -1656,6 +1644,37 @@ pub fn canonicalize_expr<'a>(
)
}
fn canonicalize_accessor_function(
env: &mut Env<'_>,
var_store: &mut VarStore,
scope: &mut Scope,
field: &Accessor<'_>,
region: Region,
) -> (Expr, Output) {
(
Expr::RecordAccessor(StructAccessorData {
name: scope.gen_unique_symbol(),
function_var: var_store.fresh(),
record_var: var_store.fresh(),
ext_var: var_store.fresh(),
closure_var: var_store.fresh(),
field_var: var_store.fresh(),
field: match field {
Accessor::RecordField(field) => IndexOrField::Field((*field).into()),
Accessor::TupleIndex(index) => match index.parse() {
Ok(index) => IndexOrField::Index(index),
Err(_) => {
let error = roc_problem::can::RuntimeError::InvalidTupleIndex(region);
env.problem(Problem::RuntimeError(error.clone()));
return (Expr::RuntimeError(error), Output::default());
}
},
},
}),
Output::default(),
)
}
pub fn canonicalize_record<'a>(
env: &mut Env<'a>,
var_store: &mut VarStore,