diff --git a/src/librustc_mir/interpret/operand.rs b/src/librustc_mir/interpret/operand.rs
index 4257c29bfee..df3dc44b229 100644
--- a/src/librustc_mir/interpret/operand.rs
+++ b/src/librustc_mir/interpret/operand.rs
@@ -199,7 +199,12 @@ fn from_known_layout<'tcx>(
     match layout {
         None => compute(),
         Some(layout) => {
-            debug_assert_eq!(layout.ty, compute()?.ty);
+            if cfg!(debug_assertions) {
+                let layout2 = compute()?;
+                assert_eq!(layout.details, layout2.details,
+                    "Mismatch in layout of supposedly equal-layout types {:?} and {:?}",
+                    layout.ty, layout2.ty);
+            }
             Ok(layout)
         }
     }