From e73ef59cb6d806d9f5405237383d65bf02095127 Mon Sep 17 00:00:00 2001 From: lcnr Date: Thu, 8 Dec 2022 12:23:10 +0100 Subject: [PATCH] add regression test for #105009 --- ...sue-95978-validator-lifetime-comparison.rs | 0 src/test/ui/mir/validate/needs-reveal-all.rs | 52 +++++++++++++++++++ 2 files changed, 52 insertions(+) rename src/test/ui/mir/{ => validate}/issue-95978-validator-lifetime-comparison.rs (100%) create mode 100644 src/test/ui/mir/validate/needs-reveal-all.rs diff --git a/src/test/ui/mir/issue-95978-validator-lifetime-comparison.rs b/src/test/ui/mir/validate/issue-95978-validator-lifetime-comparison.rs similarity index 100% rename from src/test/ui/mir/issue-95978-validator-lifetime-comparison.rs rename to src/test/ui/mir/validate/issue-95978-validator-lifetime-comparison.rs diff --git a/src/test/ui/mir/validate/needs-reveal-all.rs b/src/test/ui/mir/validate/needs-reveal-all.rs new file mode 100644 index 000000000000..3852daf245eb --- /dev/null +++ b/src/test/ui/mir/validate/needs-reveal-all.rs @@ -0,0 +1,52 @@ +// Regression test for #105009. the issue here was that even after the `RevealAll` pass, +// `validate` still used `Reveal::UserFacing`. This meant that it now ends up comparing +// opaque types with their revealed version, resulting in an ICE. +// +// We're using these flags to run the `RevealAll` pass while making it less likely to +// accidentally removing the assignment from `Foo` to `Foo`. + +// compile-flags: -Zinline_mir=yes -Zmir-opt-level=0 -Zvalidate-mir +// run-pass + +use std::hint::black_box; + +trait Func { + type Ret: Id; +} + +trait Id { + type Assoc; +} +impl Id for u32 { + type Assoc = u32; +} +impl Id for i32 { + type Assoc = i32; +} + +impl R, R: Id> Func for F { + type Ret = R; +} + +fn bar() -> impl Copy + Id { + 0u32 +} + +struct Foo { + _func: T, + value: Option<<::Ret as Id>::Assoc>, +} + +fn main() { + let mut fn_def = black_box(Foo { + _func: bar, + value: None, + }); + let fn_ptr = black_box(Foo { + _func: bar as fn() -> _, + value: None, + }); + + fn_def.value = fn_ptr.value; + black_box(fn_def); +}