-
Notifications
You must be signed in to change notification settings - Fork 12.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix ICE involving calling
Instance.ty
during const evaluation
Fixes #67639 `Instance.ty` assumes that we are in a fully monomorphic context (e.g. codegen), and can therefore use an empty `ParamEnv` when performing normalization. Howver, the MIR constant evaluator code ends up calling `Instance.ty` as a result of us attemptign to 'speculatively' const-evaluate generic functions during const propagation. As a result, we may end up with projections involving type parameters (e.g. <T as MyTrait>::Bar>) in the type we are trying to normalize. Normalization expects us to have proper predicates in the `ParamEnv` for such projections, and will ICE if we don't. This commit adds a new method `Instance.ty_env`, which takes a `ParamEnv` for use during normalization. The MIR const-evaluator code is changed to use this method, passing in the proper `ParamEnv` for the context at hand.
- Loading branch information
Showing
4 changed files
with
64 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
// compile-flags: -Z mir-opt-level=3 | ||
// build-pass | ||
|
||
// This used to ICE in const-prop due | ||
// to an empty ParamEnv being used during normalization | ||
// of a generic type | ||
|
||
|
||
fn main() { | ||
join_all::<u32>(); | ||
} | ||
|
||
trait Foo { | ||
type Item; | ||
} | ||
|
||
impl Foo for u32 { | ||
type Item = u8; | ||
} | ||
|
||
trait Bar { | ||
type Item2; | ||
} | ||
|
||
impl Bar for u8 { | ||
type Item2 = u64; | ||
} | ||
|
||
fn join_all<I>() | ||
where I: Foo, | ||
I::Item: Bar | ||
{ | ||
Vec::<<I::Item as Bar>::Item2>::new(); // ICE occurs processing this line | ||
} |