Don't reveal in const prop

oli-obk · oli-obk · commit 21e8d6322d06 · 2023-09-11T17:30:08.000Z
diff --git a/compiler/rustc_mir_transform/src/const_prop_lint.rs b/compiler/rustc_mir_transform/src/const_prop_lint.rs
@@ -176,7 +176,7 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
     ) -> ConstPropagator<'mir, 'tcx> {
         let def_id = body.source.def_id();
         let args = &GenericArgs::identity_for_item(tcx, def_id);
-        let param_env = tcx.param_env_reveal_all_normalized(def_id);
+        let param_env = tcx.param_env(def_id);
 
         let can_const_prop = CanConstProp::check(tcx, param_env, body);
         let mut ecx = InterpCx::new(
diff --git a/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-impl.stderr b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-impl.stderr
@@ -4,11 +4,6 @@ error[E0391]: cycle detected when elaborating drops for `<impl at $DIR/issue-249
 LL |     const BAR: u32 = IMPL_REF_BAR;
    |                      ^^^^^^^^^^^^
    |
-note: ...which requires const-evaluating + checking `IMPL_REF_BAR`...
-  --> $DIR/issue-24949-assoc-const-static-recursion-impl.rs:7:1
-   |
-LL | const IMPL_REF_BAR: u32 = GlobalImplRef::BAR;
-   | ^^^^^^^^^^^^^^^^^^^^^^^
 note: ...which requires const-evaluating + checking `IMPL_REF_BAR`...
   --> $DIR/issue-24949-assoc-const-static-recursion-impl.rs:7:27
    |
diff --git a/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait-default.stderr b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait-default.stderr
@@ -4,11 +4,6 @@ error[E0391]: cycle detected when elaborating drops for `FooDefault::BAR`
 LL |     const BAR: u32 = DEFAULT_REF_BAR;
    |                      ^^^^^^^^^^^^^^^
    |
-note: ...which requires const-evaluating + checking `DEFAULT_REF_BAR`...
-  --> $DIR/issue-24949-assoc-const-static-recursion-trait-default.rs:11:1
-   |
-LL | const DEFAULT_REF_BAR: u32 = <GlobalDefaultRef>::BAR;
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: ...which requires const-evaluating + checking `DEFAULT_REF_BAR`...
   --> $DIR/issue-24949-assoc-const-static-recursion-trait-default.rs:11:30
    |
diff --git a/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait.stderr b/tests/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait.stderr
@@ -4,11 +4,6 @@ error[E0391]: cycle detected when elaborating drops for `<impl at $DIR/issue-249
 LL |     const BAR: u32 = TRAIT_REF_BAR;
    |                      ^^^^^^^^^^^^^
    |
-note: ...which requires const-evaluating + checking `TRAIT_REF_BAR`...
-  --> $DIR/issue-24949-assoc-const-static-recursion-trait.rs:7:1
-   |
-LL | const TRAIT_REF_BAR: u32 = <GlobalTraitRef>::BAR;
-   | ^^^^^^^^^^^^^^^^^^^^^^^^
 note: ...which requires const-evaluating + checking `TRAIT_REF_BAR`...
   --> $DIR/issue-24949-assoc-const-static-recursion-trait.rs:7:28
    |

Original file line number	Diff line number	Diff line change
@@ -4,11 +4,6 @@ error[E0391]: cycle detected when elaborating drops for `<impl at $DIR/issue-249
`4`	`4`	`LL \| const BAR: u32 = IMPL_REF_BAR;`
`5`	`5`	`\| ^^^^^^^^^^^^`
`6`	`6`	`\|`
`7`		-note: ...which requires const-evaluating + checking `IMPL_REF_BAR`...
`8`		`- --> $DIR/issue-24949-assoc-const-static-recursion-impl.rs:7:1`
`9`		`- \|`
`10`		`-LL \| const IMPL_REF_BAR: u32 = GlobalImplRef::BAR;`
`11`		`- \| ^^^^^^^^^^^^^^^^^^^^^^^`
`12`	`7`	note: ...which requires const-evaluating + checking `IMPL_REF_BAR`...
`13`	`8`	`--> $DIR/issue-24949-assoc-const-static-recursion-impl.rs:7:27`
`14`	`9`	`\|`
Original file line number	Diff line number	Diff line change
@@ -4,11 +4,6 @@ error[E0391]: cycle detected when elaborating drops for `FooDefault::BAR`
`4`	`4`	`LL \| const BAR: u32 = DEFAULT_REF_BAR;`
`5`	`5`	`\| ^^^^^^^^^^^^^^^`
`6`	`6`	`\|`
`7`		-note: ...which requires const-evaluating + checking `DEFAULT_REF_BAR`...
`8`		`- --> $DIR/issue-24949-assoc-const-static-recursion-trait-default.rs:11:1`
`9`		`- \|`
`10`		`-LL \| const DEFAULT_REF_BAR: u32 = <GlobalDefaultRef>::BAR;`
`11`		`- \| ^^^^^^^^^^^^^^^^^^^^^^^^^^`
`12`	`7`	note: ...which requires const-evaluating + checking `DEFAULT_REF_BAR`...
`13`	`8`	`--> $DIR/issue-24949-assoc-const-static-recursion-trait-default.rs:11:30`
`14`	`9`	`\|`
Original file line number	Diff line number	Diff line change
@@ -4,11 +4,6 @@ error[E0391]: cycle detected when elaborating drops for `<impl at $DIR/issue-249
`4`	`4`	`LL \| const BAR: u32 = TRAIT_REF_BAR;`
`5`	`5`	`\| ^^^^^^^^^^^^^`
`6`	`6`	`\|`
`7`		-note: ...which requires const-evaluating + checking `TRAIT_REF_BAR`...
`8`		`- --> $DIR/issue-24949-assoc-const-static-recursion-trait.rs:7:1`
`9`		`- \|`
`10`		`-LL \| const TRAIT_REF_BAR: u32 = <GlobalTraitRef>::BAR;`
`11`		`- \| ^^^^^^^^^^^^^^^^^^^^^^^^`
`12`	`7`	note: ...which requires const-evaluating + checking `TRAIT_REF_BAR`...
`13`	`8`	`--> $DIR/issue-24949-assoc-const-static-recursion-trait.rs:7:28`
`14`	`9`	`\|`