Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions crates/hir-ty/src/consteval.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,18 +87,24 @@ fn intern_const_ref<'db>(
let valtree = match (ty.kind(), value) {
(TyKind::Uint(uint), Literal::Uint(value, _)) => {
let size = uint.bit_width().map(Size::from_bits).unwrap_or(data_layout.pointer_size());
let scalar = ScalarInt::try_from_uint(*value, size).unwrap();
let Some(scalar) = ScalarInt::try_from_uint(*value, size) else {
return Ok(Const::error(interner));
};
ValTreeKind::Leaf(scalar)
}
(TyKind::Uint(uint), Literal::Int(value, _)) => {
// `Literal::Int` is the default, so we also need to account for the type being uint.
let size = uint.bit_width().map(Size::from_bits).unwrap_or(data_layout.pointer_size());
let scalar = ScalarInt::try_from_uint(*value as u128, size).unwrap();
let Some(scalar) = ScalarInt::try_from_uint(*value as u128, size) else {
return Ok(Const::error(interner));
};
ValTreeKind::Leaf(scalar)
}
(TyKind::Int(int), Literal::Int(value, _)) => {
let size = int.bit_width().map(Size::from_bits).unwrap_or(data_layout.pointer_size());
let scalar = ScalarInt::try_from_int(*value, size).unwrap();
let Some(scalar) = ScalarInt::try_from_int(*value, size) else {
return Ok(Const::error(interner));
};
ValTreeKind::Leaf(scalar)
}
(TyKind::Bool, Literal::Bool(value)) => ValTreeKind::Leaf(ScalarInt::from(*value)),
Expand Down Expand Up @@ -219,7 +225,9 @@ pub fn usize_const<'db>(db: &'db dyn HirDatabase, value: Option<u128>, krate: Cr
return Const::error(interner);
};
let usize_ty = interner.default_types().types.usize;
let scalar = ScalarInt::try_from_uint(value, data_layout.pointer_size()).unwrap();
let Some(scalar) = ScalarInt::try_from_uint(value, data_layout.pointer_size()) else {
return Const::error(interner);
};
Const::new_valtree(interner, usize_ty, ValTreeKind::Leaf(scalar))
}

Expand Down
10 changes: 10 additions & 0 deletions crates/hir-ty/src/tests/regression/new_solver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,16 @@ const A: [u8; S] = [0; 8];
);
}

#[test]
fn oversized_array_len_does_not_panic() {
// The array length literal does not fit in `usize`; interning it must not panic.
check_no_mismatches(
r#"
fn f(_: [u8; 18446744073709551616]) {}
"#,
);
}

#[test]
fn another_20654_case() {
check_no_mismatches(
Expand Down