bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Don't trigger ICE for ReError when the other region is empty.

Browse source
This commit is contained in:
Lenko Donchev 2023-02-26 12:51:49 -06:00
parent 58136ffa92
commit 65e56616fc
3 changed files with 50 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_infer/src/infer/lexical_region_resolve/mod.rs
View file

@ -438,7 +438,11 @@ impl<'cx, 'tcx> LexicalResolver<'cx, 'tcx> {
}
(VarValue::Value(a), VarValue::Empty(_)) => {
match *a {
ReLateBound(..) | ReErased | ReError(_) => {
// this is always on an error path,
// so it doesn't really matter if it's shorter or longer than an empty region
ReError(_) => false,
ReLateBound(..) | ReErased => {
bug!("cannot relate region: {:?}", a);
}
@ -467,7 +471,11 @@ impl<'cx, 'tcx> LexicalResolver<'cx, 'tcx> {
}
(VarValue::Empty(a_ui), VarValue::Value(b)) => {
match *b {
ReLateBound(..) | ReErased | ReError(_) => {
// this is always on an error path,
// so it doesn't really matter if it's shorter or longer than an empty region
ReError(_) => false,
ReLateBound(..) | ReErased => {
bug!("cannot relate region: {:?}", b);
}