Rollup merge of #78969 - tmiasko:normalize, r=davidtwco

Normalize function type during validation

During inlining, the callee body is normalized and has types revealed,
but some of locals corresponding to the arguments might come from the
caller body which is not. As a result the caller body does not pass
validation without additional normalization.

Closes #78442.
This commit is contained in:
Dylan DPC 2020-11-15 03:02:51 +01:00 committed by GitHub
commit 7e0441dc36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 16 deletions

View file

@ -1,7 +1,3 @@
// revisions: default miropt
//[miropt]compile-flags: -Z mir-opt-level=2
// ~^ This flag is for #77668, it used to be ICE.
#![crate_type = "lib"]
pub fn bar<P>( // Error won't happen if "bar" is not generic

View file

@ -1,17 +1,27 @@
// run-pass
// Regression test for various issues related to normalization & inlining.
// * #68347, #77306, #77668 - missed normalization during inlining.
// * #78442 - missed normalization in validator after inlining.
//
// build-pass
// compile-flags:-Zmir-opt-level=2
// Previously ICEd because we did not normalize during inlining,
// see https://github.com/rust-lang/rust/pull/77306 for more discussion.
pub fn write() {
create()()
}
pub fn write_generic<T>(_t: T) {
hide()();
}
pub fn create() -> impl FnOnce() {
|| ()
}
pub fn hide() -> impl Fn() {
write
}
fn main() {
write();
write_generic(());
}