From 0ab44584aa058a5b95cb8a3bd268046ccf71066a Mon Sep 17 00:00:00 2001 From: Tomasz Miąsko Date: Thu, 19 Nov 2020 05:36:55 +0100 Subject: Revert "Normalize function type during validation" This reverts commit d486bfcbff107e8a6769e00c59d02b13c664b6ee. --- .../issue-50865-private-impl-trait/auxiliary/lib.rs | 4 ++++ src/test/ui/mir/mir-inlining/ice-issue-77306-1.rs | 18 ++++-------------- 2 files changed, 8 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/test/ui/issues/issue-50865-private-impl-trait/auxiliary/lib.rs b/src/test/ui/issues/issue-50865-private-impl-trait/auxiliary/lib.rs index f3a51b415fa..fb4bf2b8b44 100644 --- a/src/test/ui/issues/issue-50865-private-impl-trait/auxiliary/lib.rs +++ b/src/test/ui/issues/issue-50865-private-impl-trait/auxiliary/lib.rs @@ -1,3 +1,7 @@ +// 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

( // Error won't happen if "bar" is not generic diff --git a/src/test/ui/mir/mir-inlining/ice-issue-77306-1.rs b/src/test/ui/mir/mir-inlining/ice-issue-77306-1.rs index ccb279f7fa2..4d083bf2321 100644 --- a/src/test/ui/mir/mir-inlining/ice-issue-77306-1.rs +++ b/src/test/ui/mir/mir-inlining/ice-issue-77306-1.rs @@ -1,27 +1,17 @@ -// 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 +// run-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) { - hide()(); -} - pub fn create() -> impl FnOnce() { || () } -pub fn hide() -> impl Fn() { - write -} - fn main() { write(); - write_generic(()); } -- cgit 1.4.1-3-g733a5