rust-lang
diff --git a/‎tests/mir-opt/const_prop/aggregate.foo.PreCodegen.after.panic-abort.mir
-49 b/‎tests/mir-opt/const_prop/aggregate.foo.PreCodegen.after.panic-abort.mir
-49
diff --git a/‎tests/mir-opt/const_prop/aggregate.foo.PreCodegen.after.panic-unwind.mir
-49 b/‎tests/mir-opt/const_prop/aggregate.foo.PreCodegen.after.panic-unwind.mir
-49
diff --git a/‎tests/mir-opt/const_prop/aggregate.main.PreCodegen.after.panic-abort.mir
-36 b/‎tests/mir-opt/const_prop/aggregate.main.PreCodegen.after.panic-abort.mir
-36
diff --git a/‎tests/mir-opt/const_prop/aggregate.main.PreCodegen.after.panic-unwind.mir
-36 b/‎tests/mir-opt/const_prop/aggregate.main.PreCodegen.after.panic-unwind.mir
-36
diff --git a/‎tests/mir-opt/const_prop/aggregate.rs
+14-4 b/‎tests/mir-opt/const_prop/aggregate.rs
+14-4
@@ -1,19 +1,29 @@
-// skip-filecheck
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY
 // unit-test: ConstProp
 // compile-flags: -O
 
 // EMIT_MIR aggregate.main.ConstProp.diff
-// EMIT_MIR aggregate.main.PreCodegen.after.mir
 fn main() {
+    // CHECK-LABEL: fn main(
+    // CHECK: debug x => [[x:_.*]];
+    // CHECK-NOT: = Add(
+    // CHECK: [[x]] = const 1_u8;
+    // CHECK-NOT: = Add(
+    // CHECK: foo(const 1_u8)
     let x = (0, 1, 2).1 + 0;
     foo(x);
 }
 
+// Verify that we still propagate if part of the aggregate is not known.
 // EMIT_MIR aggregate.foo.ConstProp.diff
-// EMIT_MIR aggregate.foo.PreCodegen.after.mir
 fn foo(x: u8) {
-    // Verify that we still propagate if part of the aggregate is not known.
+    // CHECK-LABEL: fn foo(
+    // CHECK: debug first => [[first:_.*]];
+    // CHECK: debug second => [[second:_.*]];
+    // CHECK-NOT: = Add(
+    // CHECK: [[first]] = const 1_i32;
+    // CHECK-NOT: = Add(
+    // CHECK: [[second]] = const 3_i32;
     let first = (0, x).0 + 1;
     let second = (x, 1).1 + 2;
 }