Avoid revealing in layout_of

Author: oli-obk

compiler/rustc_middle/src/ty/layout.rs

@@ -324,6 +324,7 @@ impl<'tcx> SizeSkeleton<'tcx> {
         param_env: ty::ParamEnv<'tcx>,
     ) -> Result<SizeSkeleton<'tcx>, &'tcx LayoutError<'tcx>> {
         debug_assert!(!ty.has_non_region_infer());
+        let param_env = param_env.with_reveal_all_normalized(tcx);
 
         // First try computing a static layout.
         let err = match tcx.layout_of(param_env.and(ty)) {

compiler/rustc_passes/src/layout_test.rs

@@ -66,7 +66,7 @@ pub fn ensure_wf<'tcx>(
 }
 
 fn dump_layout_of(tcx: TyCtxt<'_>, item_def_id: LocalDefId, attr: &Attribute) {
-    let param_env = tcx.param_env(item_def_id);
+    let param_env = tcx.param_env_reveal_all_normalized(item_def_id);
     let ty = tcx.type_of(item_def_id).instantiate_identity();
     let span = tcx.def_span(item_def_id.to_def_id());
     if !ensure_wf(tcx, param_env, ty, item_def_id, span) {

compiler/rustc_symbol_mangling/src/typeid/typeid_itanium_cxx_abi.rs

@@ -1106,7 +1106,10 @@ pub fn typeid_for_instance<'tcx>(
     options: TypeIdOptions,
 ) -> String {
     let fn_abi = tcx
-        .fn_abi_of_instance(tcx.param_env(instance.def_id()).and((*instance, ty::List::empty())))
+        .fn_abi_of_instance(
+            tcx.param_env_reveal_all_normalized(instance.def_id())
+                .and((*instance, ty::List::empty())),
+        )
         .unwrap_or_else(|instance| {
             bug!("typeid_for_instance: couldn't get fn_abi of instance {:?}", instance)
         });

compiler/rustc_ty_utils/src/layout.rs

@@ -35,7 +35,6 @@ fn layout_of<'tcx>(
     let (param_env, ty) = query.into_parts();
     debug!(?ty);
 
-    let param_env = param_env.with_reveal_all_normalized(tcx);
     let unnormalized_ty = ty;
 
     // FIXME: We might want to have two different versions of `layout_of`:

tests/ui/recursion/issue-26548-recursion-via-normalize.rs

@@ -1,11 +1,11 @@
-//~ ERROR cycle detected when computing layout of `core::option::Option<S>`
+//~ ERROR cycle detected when computing layout of `core::option::Option<<S as Mirror>::It>`
 //~| NOTE see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
 //~| NOTE ...which requires computing layout of `S`...
-//~| NOTE ...which requires computing layout of `core::option::Option<<S as Mirror>::It>`...
-//~| NOTE ...which again requires computing layout of `core::option::Option<S>`, completing the cycle
-//~| NOTE cycle used when computing layout of `core::option::Option<<S as Mirror>::It>`
+//~| NOTE ...which again requires computing layout of `core::option::Option<<S as Mirror>::It>`, completing the cycle
+//~| NOTE ...which requires computing layout of `core::option::Option<S>`...
 
 trait Mirror {
+    //~^ NOTE: cycle used when checking deathness of variables in top-level module
     type It: ?Sized;
 }
 impl<T: ?Sized> Mirror for T {

tests/ui/recursion/issue-26548-recursion-via-normalize.stderr

@@ -1,9 +1,19 @@
-error[E0391]: cycle detected when computing layout of `core::option::Option<S>`
+error[E0391]: cycle detected when computing layout of `core::option::Option<<S as Mirror>::It>`
    |
+   = note: ...which requires computing layout of `core::option::Option<S>`...
    = note: ...which requires computing layout of `S`...
-   = note: ...which requires computing layout of `core::option::Option<<S as Mirror>::It>`...
-   = note: ...which again requires computing layout of `core::option::Option<S>`, completing the cycle
-   = note: cycle used when computing layout of `core::option::Option<<S as Mirror>::It>`
+   = note: ...which again requires computing layout of `core::option::Option<<S as Mirror>::It>`, completing the cycle
+note: cycle used when checking deathness of variables in top-level module
+  --> $DIR/issue-26548-recursion-via-normalize.rs:7:1
+   |
+LL | / trait Mirror {
+LL | |
+LL | |     type It: ?Sized;
+LL | | }
+...  |
+LL | |     let _s = S(None);
+LL | | }
+   | |_^
    = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
 
 error: aborting due to previous error