Checkpoint

Author: saethlin

compiler/rustc_ty_utils/src/abi.rs

@@ -53,15 +53,7 @@ fn fn_sig_for_fn_abi<'tcx>(
             //
             // We normalize the `fn_sig` again after instantiating at a later point.
             let mut sig = match *ty.kind() {
-                ty::FnDef(def_id, args) => tcx
-                    .fn_sig(def_id)
-                    .map_bound(|fn_sig| {
-                        tcx.normalize_erasing_regions(
-                            ty::TypingEnv::non_body_analysis(tcx, def_id),
-                            fn_sig,
-                        )
-                    })
-                    .instantiate(tcx, args),
+                ty::FnDef(def_id, args) => tcx.fn_sig(def_id).instantiate(tcx, args),
                 _ => unreachable!(),
             };
 

compiler/rustc_ty_utils/src/layout.rs

@@ -594,6 +594,13 @@ fn layout_of_uncached<'tcx>(
 
             let maybe_unsized = def.is_struct()
                 && def.non_enum_variant().tail_opt().is_some_and(|last_field| {
+                    /*
+                    let typing_env = if cx.typing_env == ty::TypingEnv::fully_monomorphized() {
+                        cx.typing_env
+                    } else {
+                        ty::TypingEnv::post_analysis(tcx, def.did())
+                    };
+                    */
                     let typing_env = ty::TypingEnv::post_analysis(tcx, def.did());
                     !tcx.type_of(last_field.did).instantiate_identity().is_sized(tcx, typing_env)
                 });

tests/ui/const-generics/generic_const_exprs/issue-94287.rs

@@ -1,5 +1,5 @@
 //@ aux-build:issue-94287-aux.rs
-//@ build-fail
+//@ build-pass
 
 extern crate issue_94287_aux;