Move mir-opt tests to toplevel

rust-lang · Jul 29, 2020 · f07607f · f07607f
1 parent 86be22e
commit f07607f
Show file tree

Hide file tree

Showing 195 changed files with 68 additions and 275 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -611,6 +611,7 @@ dependencies = [
  "diff",
  "env_logger 0.7.1",
  "getopts",
+ "glob",
  "lazy_static",
  "libc",
  "log",

diff --git a/fuckyou.rb b/fuckyou.rb
diff --git a/omg.mir b/omg.mir
diff --git a/src/librustc_mir/util/pretty.rs b/src/librustc_mir/util/pretty.rs
@@ -197,8 +197,15 @@ fn dump_path(
     };
 
     let file_name = format!(
-        "{}.{}{}{}{}.{}.{}.{}", crate_name,
-        item_name, shim_disambiguator, promotion_id, pass_num, pass_name, disambiguator, extension,
+        "{}.{}{}{}{}.{}.{}.{}",
+        crate_name,
+        item_name,
+        shim_disambiguator,
+        promotion_id,
+        pass_num,
+        pass_name,
+        disambiguator,
+        extension,
     );
 
     file_path.push(&file_name);

diff --git a/...of_reborrow.SimplifyCfg-initial.after.mir → ...of_reborrow.SimplifyCfg-initial.after.mir b/...of_reborrow.SimplifyCfg-initial.after.mir → ...of_reborrow.SimplifyCfg-initial.after.mir
diff --git a/...ow_and_cast.SimplifyCfg-initial.after.mir → ...ow_and_cast.SimplifyCfg-initial.after.mir b/...ow_and_cast.SimplifyCfg-initial.after.mir → ...ow_and_cast.SimplifyCfg-initial.after.mir
diff --git a/...ain.SimplifyCfg-elaborate-drops.after.mir → ...mplifyCfg-elaborate-drops.after.mir.32bit b/...ain.SimplifyCfg-elaborate-drops.after.mir → ...mplifyCfg-elaborate-drops.after.mir.32bit
diff --git a/...ain.SimplifyCfg-elaborate-drops.after.mir → ...mplifyCfg-elaborate-drops.after.mir.64bit b/...ain.SimplifyCfg-elaborate-drops.after.mir → ...mplifyCfg-elaborate-drops.after.mir.64bit
diff --git a/...gnment.main.SimplifyCfg-initial.after.mir → ...gnment.main.SimplifyCfg-initial.after.mir b/...gnment.main.SimplifyCfg-initial.after.mir → ...gnment.main.SimplifyCfg-initial.after.mir
diff --git a/...r/box_expr.main.ElaborateDrops.before.mir → ...t/box_expr.main.ElaborateDrops.before.mir b/...r/box_expr.main.ElaborateDrops.before.mir → ...t/box_expr.main.ElaborateDrops.before.mir
diff --git a/...ain.SimplifyCfg-elaborate-drops.after.mir → ...ain.SimplifyCfg-elaborate-drops.after.mir b/...ain.SimplifyCfg-elaborate-drops.after.mir → ...ain.SimplifyCfg-elaborate-drops.after.mir
diff --git a/...ay_len/32bit/rustc.norm2.InstCombine.diff → ...ne_array_len.norm2.InstCombine.diff.32bit b/...ay_len/32bit/rustc.norm2.InstCombine.diff → ...ne_array_len.norm2.InstCombine.diff.32bit
diff --git a/.../combine_array_len.norm2.InstCombine.diff → ...ne_array_len.norm2.InstCombine.diff.64bit b/.../combine_array_len.norm2.InstCombine.diff → ...ne_array_len.norm2.InstCombine.diff.64bit
diff --git a/...tion/32bit/rustc.main.ConstProp.after.mir → ...allocation.main.ConstProp.after.mir.32bit b/...tion/32bit/rustc.main.ConstProp.after.mir → ...allocation.main.ConstProp.after.mir.32bit
diff --git a/...const_allocation.main.ConstProp.after.mir → ...allocation.main.ConstProp.after.mir.64bit b/...const_allocation.main.ConstProp.after.mir → ...allocation.main.ConstProp.after.mir.64bit
diff --git a/...ion2/32bit/rustc.main.ConstProp.after.mir → ...llocation2.main.ConstProp.after.mir.32bit b/...ion2/32bit/rustc.main.ConstProp.after.mir → ...llocation2.main.ConstProp.after.mir.32bit
diff --git a/...onst_allocation2.main.ConstProp.after.mir → ...llocation2.main.ConstProp.after.mir.64bit b/...onst_allocation2.main.ConstProp.after.mir → ...llocation2.main.ConstProp.after.mir.64bit
diff --git a/...ion3/32bit/rustc.main.ConstProp.after.mir → ...llocation3.main.ConstProp.after.mir.32bit b/...ion3/32bit/rustc.main.ConstProp.after.mir → ...llocation3.main.ConstProp.after.mir.32bit
diff --git a/...onst_allocation3.main.ConstProp.after.mir → ...llocation3.main.ConstProp.after.mir.64bit b/...onst_allocation3.main.ConstProp.after.mir → ...llocation3.main.ConstProp.after.mir.64bit
diff --git a/...tatic.BAR-promoted[0].ConstProp.after.mir → ...tatic.BAR-promoted[0].ConstProp.after.mir b/...tatic.BAR-promoted[0].ConstProp.after.mir → ...tatic.BAR-promoted[0].ConstProp.after.mir
diff --git a/...otion_extern_static.BAR.PromoteTemps.diff → ...otion_extern_static.BAR.PromoteTemps.diff b/...otion_extern_static.BAR.PromoteTemps.diff → ...otion_extern_static.BAR.PromoteTemps.diff
diff --git a/...tatic.FOO-promoted[0].ConstProp.after.mir → ...tatic.FOO-promoted[0].ConstProp.after.mir b/...tatic.FOO-promoted[0].ConstProp.after.mir → ...tatic.FOO-promoted[0].ConstProp.after.mir
diff --git a/...otion_extern_static.FOO.PromoteTemps.diff → ...otion_extern_static.FOO.PromoteTemps.diff b/...otion_extern_static.FOO.PromoteTemps.diff → ...otion_extern_static.FOO.PromoteTemps.diff
diff --git a/...p/aggregate/aggregate.main.ConstProp.diff → .../const_prop/aggregate.main.ConstProp.diff b/...p/aggregate/aggregate.main.ConstProp.diff → .../const_prop/aggregate.main.ConstProp.diff
diff --git a/...ray_index/32bit/rustc.main.ConstProp.diff → ...rop/array_index.main.ConstProp.diff.32bit b/...ray_index/32bit/rustc.main.ConstProp.diff → ...rop/array_index.main.ConstProp.diff.32bit
diff --git a/...dex/64bit/array_index.main.ConstProp.diff → ...rop/array_index.main.ConstProp.diff.64bit b/...dex/64bit/array_index.main.ConstProp.diff → ...rop/array_index.main.ConstProp.diff.64bit
diff --git a/...ro/bad_op_div_by_zero.main.ConstProp.diff → ...op/bad_op_div_by_zero.main.ConstProp.diff b/...ro/bad_op_div_by_zero.main.ConstProp.diff → ...op/bad_op_div_by_zero.main.ConstProp.diff
diff --git a/...ro/bad_op_mod_by_zero.main.ConstProp.diff → ...op/bad_op_mod_by_zero.main.ConstProp.diff b/...ro/bad_op_mod_by_zero.main.ConstProp.diff → ...op/bad_op_mod_by_zero.main.ConstProp.diff
diff --git a/...or_slices/32bit/rustc.main.ConstProp.diff → ..._oob_for_slices.main.ConstProp.diff.32bit b/...or_slices/32bit/rustc.main.ConstProp.diff → ..._oob_for_slices.main.ConstProp.diff.32bit
diff --git a/...unsafe_oob_for_slices.main.ConstProp.diff → ..._oob_for_slices.main.ConstProp.diff.64bit b/...unsafe_oob_for_slices.main.ConstProp.diff → ..._oob_for_slices.main.ConstProp.diff.64bit
diff --git a/...es/boolean_identities.test.ConstProp.diff → ...op/boolean_identities.test.ConstProp.diff b/...es/boolean_identities.test.ConstProp.diff → ...op/boolean_identities.test.ConstProp.diff
diff --git a/...onst_prop/boxes/boxes.main.ConstProp.diff → ...-opt/const_prop/boxes.main.ConstProp.diff b/...onst_prop/boxes/boxes.main.ConstProp.diff → ...-opt/const_prop/boxes.main.ConstProp.diff
diff --git a/.../const_prop/cast/cast.main.ConstProp.diff → ...r-opt/const_prop/cast.main.ConstProp.diff b/.../const_prop/cast/cast.main.ConstProp.diff → ...r-opt/const_prop/cast.main.ConstProp.diff
diff --git a/...ecked_add/checked_add.main.ConstProp.diff → ...onst_prop/checked_add.main.ConstProp.diff b/...ecked_add/checked_add.main.ConstProp.diff → ...onst_prop/checked_add.main.ConstProp.diff
diff --git a/...prop_fails_gracefully.main.ConstProp.diff → ...prop_fails_gracefully.main.ConstProp.diff b/...prop_fails_gracefully.main.ConstProp.diff → ...prop_fails_gracefully.main.ConstProp.diff
diff --git a/..._flow_simplification.hello.ConstProp.diff → ..._flow_simplification.hello.ConstProp.diff b/..._flow_simplification.hello.ConstProp.diff → ..._flow_simplification.hello.ConstProp.diff
diff --git a/...implification.hello.PreCodegen.before.mir → ...implification.hello.PreCodegen.before.mir b/...implification.hello.PreCodegen.before.mir → ...implification.hello.PreCodegen.before.mir
diff --git a/...criminant/32bit/rustc.main.ConstProp.diff → ...op/discriminant.main.ConstProp.diff.32bit b/...criminant/32bit/rustc.main.ConstProp.diff → ...op/discriminant.main.ConstProp.diff.32bit
diff --git a/...nt/64bit/discriminant.main.ConstProp.diff → ...op/discriminant.main.ConstProp.diff.64bit b/...nt/64bit/discriminant.main.ConstProp.diff → ...op/discriminant.main.ConstProp.diff.64bit
diff --git a/...rop/indirect/indirect.main.ConstProp.diff → ...t/const_prop/indirect.main.ConstProp.diff b/...rop/indirect/indirect.main.ConstProp.diff → ...t/const_prop/indirect.main.ConstProp.diff
diff --git a/...sue-66971/issue_66971.main.ConstProp.diff → ...onst_prop/issue_66971.main.ConstProp.diff b/...sue-66971/issue_66971.main.ConstProp.diff → ...onst_prop/issue_66971.main.ConstProp.diff
diff --git a/...sue-67019/issue_67019.main.ConstProp.diff → ...onst_prop/issue_67019.main.ConstProp.diff b/...sue-67019/issue_67019.main.ConstProp.diff → ...onst_prop/issue_67019.main.ConstProp.diff
diff --git a/..._by_zero/mult_by_zero.test.ConstProp.diff → ...nst_prop/mult_by_zero.test.ConstProp.diff b/..._by_zero/mult_by_zero.test.ConstProp.diff → ...nst_prop/mult_by_zero.test.ConstProp.diff
diff --git a/...able/mutable_variable.main.ConstProp.diff → ...prop/mutable_variable.main.ConstProp.diff b/...able/mutable_variable.main.ConstProp.diff → ...prop/mutable_variable.main.ConstProp.diff
diff --git a/...le_variable_aggregate.main.ConstProp.diff → ...le_variable_aggregate.main.ConstProp.diff b/...le_variable_aggregate.main.ConstProp.diff → ...le_variable_aggregate.main.ConstProp.diff
diff --git a/...ble_aggregate_mut_ref.main.ConstProp.diff → ...ble_aggregate_mut_ref.main.ConstProp.diff b/...ble_aggregate_mut_ref.main.ConstProp.diff → ...ble_aggregate_mut_ref.main.ConstProp.diff
diff --git a/...ggregate_partial_read.main.ConstProp.diff → ...ggregate_partial_read.main.ConstProp.diff b/...ggregate_partial_read.main.ConstProp.diff → ...ggregate_partial_read.main.ConstProp.diff
diff --git a/...able_variable_no_prop.main.ConstProp.diff → ...able_variable_no_prop.main.ConstProp.diff b/...able_variable_no_prop.main.ConstProp.diff → ...able_variable_no_prop.main.ConstProp.diff
diff --git a/...ariable_unprop_assign.main.ConstProp.diff → ...ariable_unprop_assign.main.ConstProp.diff b/...ariable_unprop_assign.main.ConstProp.diff → ...ariable_unprop_assign.main.ConstProp.diff
diff --git a/..._variable/32bit/rustc.main.ConstProp.diff → ...s_into_variable.main.ConstProp.diff.32bit b/..._variable/32bit/rustc.main.ConstProp.diff → ...s_into_variable.main.ConstProp.diff.32bit
diff --git a/...timizes_into_variable.main.ConstProp.diff → ...s_into_variable.main.ConstProp.diff.64bit b/...timizes_into_variable.main.ConstProp.diff → ...s_into_variable.main.ConstProp.diff.64bit
diff --git a/...32bit/rustc.main.SimplifyLocals.after.mir → ...iable.main.SimplifyLocals.after.mir.32bit b/...32bit/rustc.main.SimplifyLocals.after.mir → ...iable.main.SimplifyLocals.after.mir.32bit
diff --git a/...to_variable.main.SimplifyLocals.after.mir → ...iable.main.SimplifyLocals.after.mir.64bit b/...to_variable.main.SimplifyLocals.after.mir → ...iable.main.SimplifyLocals.after.mir.64bit
diff --git a/...read_immutable_static.main.ConstProp.diff → ...read_immutable_static.main.ConstProp.diff b/...read_immutable_static.main.ConstProp.diff → ...read_immutable_static.main.ConstProp.diff
diff --git a/...p/ref_deref/ref_deref.main.ConstProp.diff → .../const_prop/ref_deref.main.ConstProp.diff b/...p/ref_deref/ref_deref.main.ConstProp.diff → .../const_prop/ref_deref.main.ConstProp.diff
diff --git a/...ef_deref/ref_deref.main.PromoteTemps.diff → ...nst_prop/ref_deref.main.PromoteTemps.diff b/...ef_deref/ref_deref.main.PromoteTemps.diff → ...nst_prop/ref_deref.main.PromoteTemps.diff
diff --git a/...ect/ref_deref_project.main.ConstProp.diff → ...rop/ref_deref_project.main.ConstProp.diff b/...ect/ref_deref_project.main.ConstProp.diff → ...rop/ref_deref_project.main.ConstProp.diff
diff --git a/.../ref_deref_project.main.PromoteTemps.diff → .../ref_deref_project.main.PromoteTemps.diff b/.../ref_deref_project.main.PromoteTemps.diff → .../ref_deref_project.main.PromoteTemps.diff
diff --git a/...y_fn_ptr/reify_fn_ptr.main.ConstProp.diff → ...nst_prop/reify_fn_ptr.main.ConstProp.diff b/...y_fn_ptr/reify_fn_ptr.main.ConstProp.diff → ...nst_prop/reify_fn_ptr.main.ConstProp.diff
diff --git a/...op/repeat/32bit/rustc.main.ConstProp.diff → ...nst_prop/repeat.main.ConstProp.diff.32bit b/...op/repeat/32bit/rustc.main.ConstProp.diff → ...nst_prop/repeat.main.ConstProp.diff.32bit
diff --git a/...p/repeat/64bit/repeat.main.ConstProp.diff → ...nst_prop/repeat.main.ConstProp.diff.64bit b/...p/repeat/64bit/repeat.main.ConstProp.diff → ...nst_prop/repeat.main.ConstProp.diff.64bit
diff --git a/...urn_place/return_place.add.ConstProp.diff → ...onst_prop/return_place.add.ConstProp.diff b/...urn_place/return_place.add.ConstProp.diff → ...onst_prop/return_place.add.ConstProp.diff
diff --git a/...ce/return_place.add.PreCodegen.before.mir → ...op/return_place.add.PreCodegen.before.mir b/...ce/return_place.add.PreCodegen.before.mir → ...op/return_place.add.PreCodegen.before.mir
diff --git a/...r_literal_propagation.main.ConstProp.diff → ...r_literal_propagation.main.ConstProp.diff b/...r_literal_propagation.main.ConstProp.diff → ...r_literal_propagation.main.ConstProp.diff
diff --git a/...slice_len/32bit/rustc.main.ConstProp.diff → ..._prop/slice_len.main.ConstProp.diff.32bit b/...slice_len/32bit/rustc.main.ConstProp.diff → ..._prop/slice_len.main.ConstProp.diff.32bit
diff --git a/...e_len/64bit/slice_len.main.ConstProp.diff → ..._prop/slice_len.main.ConstProp.diff.64bit b/...e_len/64bit/slice_len.main.ConstProp.diff → ..._prop/slice_len.main.ConstProp.diff.64bit
diff --git a/...switch_int/switch_int.main.ConstProp.diff → ...const_prop/switch_int.main.ConstProp.diff b/...switch_int/switch_int.main.ConstProp.diff → ...const_prop/switch_int.main.ConstProp.diff
diff --git a/...in.SimplifyBranches-after-const-prop.diff → ...in.SimplifyBranches-after-const-prop.diff b/...in.SimplifyBranches-after-const-prop.diff → ...in.SimplifyBranches-after-const-prop.diff
diff --git a/...e_literal_propagation.main.ConstProp.diff → ...e_literal_propagation.main.ConstProp.diff b/...e_literal_propagation.main.ConstProp.diff → ...e_literal_propagation.main.ConstProp.diff
diff --git a/.../const_prop_miscompile.bar.ConstProp.diff → .../const_prop_miscompile.bar.ConstProp.diff b/.../const_prop_miscompile.bar.ConstProp.diff → .../const_prop_miscompile.bar.ConstProp.diff
diff --git a/.../const_prop_miscompile.foo.ConstProp.diff → .../const_prop_miscompile.foo.ConstProp.diff b/.../const_prop_miscompile.foo.ConstProp.diff → .../const_prop_miscompile.foo.ConstProp.diff
diff --git a/...opy_propagation.test.CopyPropagation.diff → ...opy_propagation.test.CopyPropagation.diff b/...opy_propagation.test.CopyPropagation.diff → ...opy_propagation.test.CopyPropagation.diff
diff --git a/...pagation_arg.arg_src.CopyPropagation.diff → ...pagation_arg.arg_src.CopyPropagation.diff b/...pagation_arg.arg_src.CopyPropagation.diff → ...pagation_arg.arg_src.CopyPropagation.diff
diff --git a/..._propagation_arg.bar.CopyPropagation.diff → ..._propagation_arg.bar.CopyPropagation.diff b/..._propagation_arg.bar.CopyPropagation.diff → ..._propagation_arg.bar.CopyPropagation.diff
diff --git a/..._propagation_arg.baz.CopyPropagation.diff → ..._propagation_arg.baz.CopyPropagation.diff b/..._propagation_arg.baz.CopyPropagation.diff → ..._propagation_arg.baz.CopyPropagation.diff
diff --git a/..._propagation_arg.foo.CopyPropagation.diff → ..._propagation_arg.foo.CopyPropagation.diff b/..._propagation_arg.foo.CopyPropagation.diff → ..._propagation_arg.foo.CopyPropagation.diff
diff --git a/...t/deaggregator_test.bar.Deaggregator.diff → ...t/deaggregator_test.bar.Deaggregator.diff b/...t/deaggregator_test.bar.Deaggregator.diff → ...t/deaggregator_test.bar.Deaggregator.diff
diff --git a/...ggregator_test_enum.bar.Deaggregator.diff → ...ggregator_test_enum.bar.Deaggregator.diff b/...ggregator_test_enum.bar.Deaggregator.diff → ...ggregator_test_enum.bar.Deaggregator.diff
diff --git a/...gator_test_enum_2.test1.Deaggregator.diff → ...gator_test_enum_2.test1.Deaggregator.diff b/...gator_test_enum_2.test1.Deaggregator.diff → ...gator_test_enum_2.test1.Deaggregator.diff
diff --git a/...ator_test_multiple.test.Deaggregator.diff → ...ator_test_multiple.test.Deaggregator.diff b/...ator_test_multiple.test.Deaggregator.diff → ...ator_test_multiple.test.Deaggregator.diff
diff --git a/...match_tuple.SimplifyCfg-initial.after.mir → ...match_tuple.SimplifyCfg-initial.after.mir b/...match_tuple.SimplifyCfg-initial.after.mir → ...match_tuple.SimplifyCfg-initial.after.mir
diff --git a/...Fn-call.AddMovesForPackedDrops.before.mir → ...Fn-call.AddMovesForPackedDrops.before.mir b/...Fn-call.AddMovesForPackedDrops.before.mir → ...Fn-call.AddMovesForPackedDrops.before.mir
diff --git a/...nup.main-{{closure}}.generator_drop.0.mir → ...nup.main-{{closure}}.generator_drop.0.mir b/...nup.main-{{closure}}.generator_drop.0.mir → ...nup.main-{{closure}}.generator_drop.0.mir
diff --git a/...ain-{{closure}}.StateTransform.before.mir → ...ain-{{closure}}.StateTransform.before.mir b/...ain-{{closure}}.StateTransform.before.mir → ...ain-{{closure}}.StateTransform.before.mir
diff --git a/...y.main-{{closure}}.generator_resume.0.mir → ...y.main-{{closure}}.generator_resume.0.mir b/...y.main-{{closure}}.generator_resume.0.mir → ...y.main-{{closure}}.generator_resume.0.mir
diff --git a/...-opt/graphviz/graphviz.main.mir_map.0.dot → src/test/mir-opt/graphviz.main.mir_map.0.dot b/...-opt/graphviz/graphviz.main.mir_map.0.dot → src/test/mir-opt/graphviz.main.mir_map.0.dot
diff --git a/...d/inline_any_operand.bar.Inline.after.mir → ...e/inline_any_operand.bar.Inline.after.mir b/...d/inline_any_operand.bar.Inline.after.mir → ...e/inline_any_operand.bar.Inline.after.mir
diff --git a/...osure/inline_closure.foo.Inline.after.mir → ...nline/inline_closure.foo.Inline.after.mir b/...osure/inline_closure.foo.Inline.after.mir → ...nline/inline_closure.foo.Inline.after.mir
diff --git a/..._closure_borrows_arg.foo.Inline.after.mir → ..._closure_borrows_arg.foo.Inline.after.mir b/..._closure_borrows_arg.foo.Inline.after.mir → ..._closure_borrows_arg.foo.Inline.after.mir
diff --git a/...ine_closure_captures.foo.Inline.after.mir → ...ine_closure_captures.foo.Inline.after.mir b/...ine_closure_captures.foo.Inline.after.mir → ...ine_closure_captures.foo.Inline.after.mir
diff --git a/...to-box-place/32bit/rustc.main.Inline.diff → ...ine_into_box_place.main.Inline.diff.32bit b/...to-box-place/32bit/rustc.main.Inline.diff → ...ine_into_box_place.main.Inline.diff.32bit
diff --git a/...it/inline_into_box_place.main.Inline.diff → ...ine_into_box_place.main.Inline.diff.64bit b/...it/inline_into_box_place.main.Inline.diff → ...ine_into_box_place.main.Inline.diff.64bit
diff --git a/...e-retag/inline_retag.bar.Inline.after.mir → .../inline/inline_retag.bar.Inline.after.mir b/...e-retag/inline_retag.bar.Inline.after.mir → .../inline/inline_retag.bar.Inline.after.mir
diff --git a/...on/inline_specialization.main.Inline.diff → ...ne/inline_specialization.main.Inline.diff b/...on/inline_specialization.main.Inline.diff → ...ne/inline_specialization.main.Inline.diff
diff --git a/...inline_trait_method.test.Inline.after.mir → ...inline_trait_method.test.Inline.after.mir b/...inline_trait_method.test.Inline.after.mir → ...inline_trait_method.test.Inline.after.mir
diff --git a/...ine_trait_method_2.test2.Inline.after.mir → ...ine_trait_method_2.test2.Inline.after.mir b/...ine_trait_method_2.test2.Inline.after.mir → ...ine_trait_method_2.test2.Inline.after.mir
diff --git a/...7_inline_as_ref_as_mut.a.Inline.after.mir → ...7_inline_as_ref_as_mut.a.Inline.after.mir b/...7_inline_as_ref_as_mut.a.Inline.after.mir → ...7_inline_as_ref_as_mut.a.Inline.after.mir
diff --git a/...7_inline_as_ref_as_mut.b.Inline.after.mir → ...7_inline_as_ref_as_mut.b.Inline.after.mir b/...7_inline_as_ref_as_mut.b.Inline.after.mir → ...7_inline_as_ref_as_mut.b.Inline.after.mir
diff --git a/...7_inline_as_ref_as_mut.c.Inline.after.mir → ...7_inline_as_ref_as_mut.c.Inline.after.mir b/...7_inline_as_ref_as_mut.c.Inline.after.mir → ...7_inline_as_ref_as_mut.c.Inline.after.mir
diff --git a/...7_inline_as_ref_as_mut.d.Inline.after.mir → ...7_inline_as_ref_as_mut.d.Inline.after.mir b/...7_inline_as_ref_as_mut.d.Inline.after.mir → ...7_inline_as_ref_as_mut.d.Inline.after.mir
diff --git a/...overage/rustc.bar.InstrumentCoverage.diff → ...ment_coverage.bar.InstrumentCoverage.diff b/...overage/rustc.bar.InstrumentCoverage.diff → ...ment_coverage.bar.InstrumentCoverage.diff
@@ -7,7 +7,7 @@
 
       bb0: {
 +         StorageLive(_1);                 // scope 0 at $DIR/instrument_coverage.rs:18:18: 18:18
-+         _1 = const std::intrinsics::count_code_region(const 10208505205182607101_u64, const 0_u32, const 501_u32, const 513_u32) -> bb2; // scope 0 at $DIR/instrument_coverage.rs:18:18: 18:18
++         _1 = const std::intrinsics::count_code_region(const 10208505205182607101_u64, const 0_u32, const 529_u32, const 541_u32) -> bb2; // scope 0 at $DIR/instrument_coverage.rs:18:18: 18:18
 +                                          // ty::Const
 +                                          // + ty: unsafe extern "rust-intrinsic" fn(u64, u32, u32, u32) {std::intrinsics::count_code_region}
 +                                          // + val: Value(Scalar(<ZST>))
@@ -28,16 +28,16 @@
 +                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
 +                                          // ty::Const
 +                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x000001f5))
++                                          // + val: Value(Scalar(0x00000211))
 +                                          // mir::Constant
 +                                          // + span: $DIR/instrument_coverage.rs:18:18: 18:18
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x000001f5)) }
++                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000211)) }
 +                                          // ty::Const
 +                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x00000201))
++                                          // + val: Value(Scalar(0x0000021d))
 +                                          // mir::Constant
 +                                          // + span: $DIR/instrument_coverage.rs:18:18: 18:18
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000201)) }
++                                          // + literal: Const { ty: u32, val: Value(Scalar(0x0000021d)) }
 +     }
 + 
 +     bb1 (cleanup): {

diff --git a/...verage/rustc.main.InstrumentCoverage.diff → ...ent_coverage.main.InstrumentCoverage.diff b/...verage/rustc.main.InstrumentCoverage.diff → ...ent_coverage.main.InstrumentCoverage.diff
@@ -11,7 +11,7 @@
       bb0: {
 -         falseUnwind -> [real: bb1, cleanup: bb2]; // scope 0 at $DIR/instrument_coverage.rs:10:5: 14:6
 +         StorageLive(_4);                 // scope 0 at $DIR/instrument_coverage.rs:9:11: 9:11
-+         _4 = const std::intrinsics::count_code_region(const 16004455475339839479_u64, const 0_u32, const 397_u32, const 465_u32) -> bb7; // scope 0 at $DIR/instrument_coverage.rs:9:11: 9:11
++         _4 = const std::intrinsics::count_code_region(const 16004455475339839479_u64, const 0_u32, const 425_u32, const 493_u32) -> bb7; // scope 0 at $DIR/instrument_coverage.rs:9:11: 9:11
 +                                          // ty::Const
 +                                          // + ty: unsafe extern "rust-intrinsic" fn(u64, u32, u32, u32) {std::intrinsics::count_code_region}
 +                                          // + val: Value(Scalar(<ZST>))
@@ -32,16 +32,16 @@
 +                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
 +                                          // ty::Const
 +                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x0000018d))
++                                          // + val: Value(Scalar(0x000001a9))
 +                                          // mir::Constant
 +                                          // + span: $DIR/instrument_coverage.rs:9:11: 9:11
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x0000018d)) }
++                                          // + literal: Const { ty: u32, val: Value(Scalar(0x000001a9)) }
 +                                          // ty::Const
 +                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x000001d1))
++                                          // + val: Value(Scalar(0x000001ed))
 +                                          // mir::Constant
 +                                          // + span: $DIR/instrument_coverage.rs:9:11: 9:11
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x000001d1)) }
++                                          // + literal: Const { ty: u32, val: Value(Scalar(0x000001ed)) }
       }
 
       bb1: {

diff --git a/src/test/mir-opt/issue-72181/rustc.bar.mir_map.0.mir b/src/test/mir-opt/issue-72181/rustc.bar.mir_map.0.mir
diff --git a/src/test/mir-opt/issue-72181/rustc.foo.mir_map.0.mir b/src/test/mir-opt/issue-72181/rustc.foo.mir_map.0.mir
diff --git a/src/test/mir-opt/issue-72181/rustc.main.mir_map.0.mir b/src/test/mir-opt/issue-72181/rustc.main.mir_map.0.mir
diff --git a/..._38669.main.SimplifyCfg-initial.after.mir → ..._38669.main.SimplifyCfg-initial.after.mir b/..._38669.main.SimplifyCfg-initial.after.mir → ..._38669.main.SimplifyCfg-initial.after.mir
diff --git a/...issue_41110.main.ElaborateDrops.after.mir → ...issue_41110.main.ElaborateDrops.after.mir b/...issue_41110.main.ElaborateDrops.after.mir → ...issue_41110.main.ElaborateDrops.after.mir
diff --git a/...issue_41110.test.ElaborateDrops.after.mir → ...issue_41110.test.ElaborateDrops.after.mir b/...issue_41110.test.ElaborateDrops.after.mir → ...issue_41110.test.ElaborateDrops.after.mir
diff --git a/...nt}}.SimplifyCfg-qualify-consts.after.mir → ...implifyCfg-qualify-consts.after.mir.32bit b/...nt}}.SimplifyCfg-qualify-consts.after.mir → ...implifyCfg-qualify-consts.after.mir.32bit
diff --git a/...nt}}.SimplifyCfg-qualify-consts.after.mir → ...implifyCfg-qualify-consts.after.mir.64bit b/...nt}}.SimplifyCfg-qualify-consts.after.mir → ...implifyCfg-qualify-consts.after.mir.64bit
diff --git a/...issue_41888.main.ElaborateDrops.after.mir → ...issue_41888.main.ElaborateDrops.after.mir b/...issue_41888.main.ElaborateDrops.after.mir → ...issue_41888.main.ElaborateDrops.after.mir
diff --git a/...ssue-49232/issue_49232.main.mir_map.0.mir → ...st/mir-opt/issue_49232.main.mir_map.0.mir b/...ssue-49232/issue_49232.main.mir_map.0.mir → ...st/mir-opt/issue_49232.main.mir_map.0.mir
diff --git a/...ssue_62289.test.ElaborateDrops.before.mir → ...ssue_62289.test.ElaborateDrops.before.mir b/...ssue_62289.test.ElaborateDrops.before.mir → ...ssue_62289.test.ElaborateDrops.before.mir
diff --git a/...issue-72181/32bit/rustc.bar.mir_map.0.mir → ...r-opt/issue_72181.bar.mir_map.0.mir.32bit b/...issue-72181/32bit/rustc.bar.mir_map.0.mir → ...r-opt/issue_72181.bar.mir_map.0.mir.32bit
diff --git a/...72181/64bit/issue_72181.bar.mir_map.0.mir → ...r-opt/issue_72181.bar.mir_map.0.mir.64bit b/...72181/64bit/issue_72181.bar.mir_map.0.mir → ...r-opt/issue_72181.bar.mir_map.0.mir.64bit
diff --git a/...issue-72181/32bit/rustc.foo.mir_map.0.mir → ...r-opt/issue_72181.foo.mir_map.0.mir.32bit b/...issue-72181/32bit/rustc.foo.mir_map.0.mir → ...r-opt/issue_72181.foo.mir_map.0.mir.32bit
diff --git a/...72181/64bit/issue_72181.foo.mir_map.0.mir → ...r-opt/issue_72181.foo.mir_map.0.mir.64bit b/...72181/64bit/issue_72181.foo.mir_map.0.mir → ...r-opt/issue_72181.foo.mir_map.0.mir.64bit
diff --git a/...ssue-72181/32bit/rustc.main.mir_map.0.mir → ...-opt/issue_72181.main.mir_map.0.mir.32bit b/...ssue-72181/32bit/rustc.main.mir_map.0.mir → ...-opt/issue_72181.main.mir_map.0.mir.32bit
diff --git a/...2181/64bit/issue_72181.main.mir_map.0.mir → ...-opt/issue_72181.main.mir_map.0.mir.64bit b/...2181/64bit/issue_72181.main.mir_map.0.mir → ...-opt/issue_72181.main.mir_map.0.mir.64bit
diff --git a/...sue-72181-1/issue_72181_1.f.mir_map.0.mir → ...est/mir-opt/issue_72181_1.f.mir_map.0.mir b/...sue-72181-1/issue_72181_1.f.mir_map.0.mir → ...est/mir-opt/issue_72181_1.f.mir_map.0.mir
diff --git a/...-72181-1/issue_72181_1.main.mir_map.0.mir → .../mir-opt/issue_72181_1.main.mir_map.0.mir b/...-72181-1/issue_72181_1.main.mir_map.0.mir → .../mir-opt/issue_72181_1.main.mir_map.0.mir
diff --git a/...ue-73223/32bit/rustc.main.PreCodegen.diff → ...pt/issue_73223.main.PreCodegen.diff.32bit b/...ue-73223/32bit/rustc.main.PreCodegen.diff → ...pt/issue_73223.main.PreCodegen.diff.32bit
diff --git a/...23/64bit/issue_73223.main.PreCodegen.diff → ...pt/issue_73223.main.PreCodegen.diff.64bit b/...23/64bit/issue_73223.main.PreCodegen.diff → ...pt/issue_73223.main.PreCodegen.diff.64bit
diff --git a/...32bit/rustc.main.SimplifyArmIdentity.diff → ...73223.main.SimplifyArmIdentity.diff.32bit b/...32bit/rustc.main.SimplifyArmIdentity.diff → ...73223.main.SimplifyArmIdentity.diff.32bit
diff --git a/...issue_73223.main.SimplifyArmIdentity.diff → ...73223.main.SimplifyArmIdentity.diff.64bit b/...issue_73223.main.SimplifyArmIdentity.diff → ...73223.main.SimplifyArmIdentity.diff.64bit
diff --git a/...main.SimplifyCfg-qualify-consts.after.mir → ...main.SimplifyCfg-qualify-consts.after.mir b/...main.SimplifyCfg-qualify-consts.after.mir → ...main.SimplifyCfg-qualify-consts.after.mir
diff --git a/...g-initial.after-ElaborateDrops.after.diff → ...g-initial.after-ElaborateDrops.after.diff b/...g-initial.after-ElaborateDrops.after.diff → ...g-initial.after-ElaborateDrops.after.diff
diff --git a/....full_tested_match.PromoteTemps.after.mir → ....full_tested_match.PromoteTemps.after.mir b/....full_tested_match.PromoteTemps.after.mir → ....full_tested_match.PromoteTemps.after.mir
diff --git a/...ull_tested_match2.PromoteTemps.before.mir → ...ull_tested_match2.PromoteTemps.before.mir b/...ull_tested_match2.PromoteTemps.before.mir → ...ull_tested_match2.PromoteTemps.before.mir
diff --git a/..._false_edges.main.PromoteTemps.before.mir → ..._false_edges.main.PromoteTemps.before.mir b/..._false_edges.main.PromoteTemps.before.mir → ..._false_edges.main.PromoteTemps.before.mir
diff --git a/...h_test.main.SimplifyCfg-initial.after.mir → ...h_test.main.SimplifyCfg-initial.after.mir b/...h_test.main.SimplifyCfg-initial.after.mir → ...h_test.main.SimplifyCfg-initial.after.mir
diff --git a/...sic/named_lifetimes_basic.use_x.nll.0.mir → ...nll/named_lifetimes_basic.use_x.nll.0.mir b/...sic/named_lifetimes_basic.use_x.nll.0.mir → ...nll/named_lifetimes_basic.use_x.nll.0.mir
diff --git a/...ubtyping-basic/32bit/rustc.main.nll.0.mir → ...gion_subtyping_basic.main.nll.0.mir.32bit b/...ubtyping-basic/32bit/rustc.main.nll.0.mir → ...gion_subtyping_basic.main.nll.0.mir.32bit
diff --git a/...bit/region_subtyping_basic.main.nll.0.mir → ...gion_subtyping_basic.main.nll.0.mir.64bit b/...bit/region_subtyping_basic.main.nll.0.mir → ...gion_subtyping_basic.main.nll.0.mir.64bit
diff --git a/...rap.SimplifyCfg-elaborate-drops.after.mir → ...rap.SimplifyCfg-elaborate-drops.after.mir b/...rap.SimplifyCfg-elaborate-drops.after.mir → ...rap.SimplifyCfg-elaborate-drops.after.mir
diff --git a/...after_call.main.ElaborateDrops.before.mir → ...after_call.main.ElaborateDrops.before.mir b/...after_call.main.ElaborateDrops.before.mir → ...after_call.main.ElaborateDrops.before.mir
diff --git a/...e/nrvo_simple.nrvo.RenameReturnPlace.diff → ...t/nrvo_simple.nrvo.RenameReturnPlace.diff b/...e/nrvo_simple.nrvo.RenameReturnPlace.diff → ...t/nrvo_simple.nrvo.RenameReturnPlace.diff
diff --git a/...ain.SimplifyCfg-elaborate-drops.after.mir → ...mplifyCfg-elaborate-drops.after.mir.32bit b/...ain.SimplifyCfg-elaborate-drops.after.mir → ...mplifyCfg-elaborate-drops.after.mir.32bit
diff --git a/...ain.SimplifyCfg-elaborate-drops.after.mir → ...mplifyCfg-elaborate-drops.after.mir.64bit b/...ain.SimplifyCfg-elaborate-drops.after.mir → ...mplifyCfg-elaborate-drops.after.mir.64bit
diff --git a/...ch_guard.CleanupNonCodegenStatements.diff → ...ch_guard.CleanupNonCodegenStatements.diff b/...ch_guard.CleanupNonCodegenStatements.diff → ...ch_guard.CleanupNonCodegenStatements.diff
diff --git a/...ver_const.no_codegen.PreCodegen.after.mir → ...ver_const.no_codegen.PreCodegen.after.mir b/...ver_const.no_codegen.PreCodegen.after.mir → ...ver_const.no_codegen.PreCodegen.after.mir
diff --git a/...lace.Test.SimplifyCfg-make_shim.after.mir → ...lace.Test.SimplifyCfg-make_shim.after.mir b/...lace.Test.SimplifyCfg-make_shim.after.mir → ...lace.Test.SimplifyCfg-make_shim.after.mir
diff --git a/...e}}.SimplifyCfg-elaborate-drops.after.mir → ...e}}.SimplifyCfg-elaborate-drops.after.mir b/...e}}.SimplifyCfg-elaborate-drops.after.mir → ...e}}.SimplifyCfg-elaborate-drops.after.mir
diff --git a/...ain.SimplifyCfg-elaborate-drops.after.mir → ...ain.SimplifyCfg-elaborate-drops.after.mir b/...ain.SimplifyCfg-elaborate-drops.after.mir → ...ain.SimplifyCfg-elaborate-drops.after.mir
diff --git a/...foo.SimplifyCfg-elaborate-drops.after.mir → ...foo.SimplifyCfg-elaborate-drops.after.mir b/...foo.SimplifyCfg-elaborate-drops.after.mir → ...foo.SimplifyCfg-elaborate-drops.after.mir
diff --git a/...shr.SimplifyCfg-elaborate-drops.after.mir → ...shr.SimplifyCfg-elaborate-drops.after.mir b/...shr.SimplifyCfg-elaborate-drops.after.mir → ...shr.SimplifyCfg-elaborate-drops.after.mir
diff --git a/...atch/32bit/rustc.match_bool.mir_map.0.mir → ...mple_match.match_bool.mir_map.0.mir.32bit b/...atch/32bit/rustc.match_bool.mir_map.0.mir → ...mple_match.match_bool.mir_map.0.mir.32bit
diff --git a/...bit/simple_match.match_bool.mir_map.0.mir → ...mple_match.match_bool.mir_map.0.mir.64bit b/...bit/simple_match.match_bool.mir_map.0.mir → ...mple_match.match_bool.mir_map.0.mir.64bit
diff --git a/src/test/mir-opt/simplify-arm-identity/rustc.main.SimplifyArmIdentity.diff b/src/test/mir-opt/simplify-arm-identity/rustc.main.SimplifyArmIdentity.diff
diff --git a/.../simplify_arm.id.SimplifyArmIdentity.diff → .../simplify_arm.id.SimplifyArmIdentity.diff b/.../simplify_arm.id.SimplifyArmIdentity.diff → .../simplify_arm.id.SimplifyArmIdentity.diff
diff --git a/...m/simplify_arm.id.SimplifyBranchSame.diff → ...t/simplify_arm.id.SimplifyBranchSame.diff b/...m/simplify_arm.id.SimplifyBranchSame.diff → ...t/simplify_arm.id.SimplifyBranchSame.diff
diff --git a/...fy_arm.id_result.SimplifyArmIdentity.diff → ...fy_arm.id_result.SimplifyArmIdentity.diff b/...fy_arm.id_result.SimplifyArmIdentity.diff → ...fy_arm.id_result.SimplifyArmIdentity.diff
diff --git a/...ify_arm.id_result.SimplifyBranchSame.diff → ...ify_arm.id_result.SimplifyBranchSame.diff b/...ify_arm.id_result.SimplifyBranchSame.diff → ...ify_arm.id_result.SimplifyBranchSame.diff
diff --git a/...plify_arm.id_try.SimplifyArmIdentity.diff → ...plify_arm.id_try.SimplifyArmIdentity.diff b/...plify_arm.id_try.SimplifyArmIdentity.diff → ...plify_arm.id_try.SimplifyArmIdentity.diff
diff --git a/...mplify_arm.id_try.SimplifyBranchSame.diff → ...mplify_arm.id_try.SimplifyBranchSame.diff b/...mplify_arm.id_try.SimplifyBranchSame.diff → ...mplify_arm.id_try.SimplifyBranchSame.diff
diff --git a/...32bit/rustc.main.SimplifyArmIdentity.diff → ...ntity.main.SimplifyArmIdentity.diff.32bit b/...32bit/rustc.main.SimplifyArmIdentity.diff → ...ntity.main.SimplifyArmIdentity.diff.32bit
diff --git a/...rm_identity.main.SimplifyArmIdentity.diff → ...ntity.main.SimplifyArmIdentity.diff.64bit b/...rm_identity.main.SimplifyArmIdentity.diff → ...ntity.main.SimplifyArmIdentity.diff.64bit
diff --git a/...plify_cfg.main.SimplifyCfg-early-opt.diff → ...plify_cfg.main.SimplifyCfg-early-opt.diff b/...plify_cfg.main.SimplifyCfg-early-opt.diff → ...plify_cfg.main.SimplifyCfg-early-opt.diff
diff --git a/...implify_cfg.main.SimplifyCfg-initial.diff → ...implify_cfg.main.SimplifyCfg-initial.diff b/...implify_cfg.main.SimplifyCfg-initial.diff → ...implify_cfg.main.SimplifyCfg-initial.diff
diff --git a/...in.SimplifyBranches-after-const-prop.diff → ...in.SimplifyBranches-after-const-prop.diff b/...in.SimplifyBranches-after-const-prop.diff → ...in.SimplifyBranches-after-const-prop.diff
diff --git a/...locals_fixedpoint.foo.SimplifyLocals.diff → ...locals_fixedpoint.foo.SimplifyLocals.diff b/...locals_fixedpoint.foo.SimplifyLocals.diff → ...locals_fixedpoint.foo.SimplifyLocals.diff
diff --git a/...es_unused_consts.main.SimplifyLocals.diff → ...es_unused_consts.main.SimplifyLocals.diff b/...es_unused_consts.main.SimplifyLocals.diff → ...es_unused_consts.main.SimplifyLocals.diff
diff --git a/...reads/32bit/rustc.map.SimplifyLocals.diff → ...inant_reads.map.SimplifyLocals.diff.32bit b/...reads/32bit/rustc.map.SimplifyLocals.diff → ...inant_reads.map.SimplifyLocals.diff.32bit
diff --git a/...iscriminant_reads.map.SimplifyLocals.diff → ...inant_reads.map.SimplifyLocals.diff.64bit b/...iscriminant_reads.map.SimplifyLocals.diff → ...inant_reads.map.SimplifyLocals.diff.64bit
diff --git a/..._match/simplify_match.main.ConstProp.diff → ...ir-opt/simplify_match.main.ConstProp.diff b/..._match/simplify_match.main.ConstProp.diff → ...ir-opt/simplify_match.main.ConstProp.diff
diff --git a/...try.try_identity.SimplifyArmIdentity.diff → ...try.try_identity.SimplifyArmIdentity.diff b/...try.try_identity.SimplifyArmIdentity.diff → ...try.try_identity.SimplifyArmIdentity.diff
diff --git a/...try_identity.SimplifyBranchSame.after.mir → ...try_identity.SimplifyBranchSame.after.mir b/...try_identity.SimplifyBranchSame.after.mir → ...try_identity.SimplifyBranchSame.after.mir
diff --git a/...try.try_identity.SimplifyLocals.after.mir → ...try.try_identity.SimplifyLocals.after.mir b/...try.try_identity.SimplifyLocals.after.mir → ...try.try_identity.SimplifyLocals.after.mir
diff --git a/....{{impl}}-append.SimplifyArmIdentity.diff → ....{{impl}}-append.SimplifyArmIdentity.diff b/....{{impl}}-append.SimplifyArmIdentity.diff → ....{{impl}}-append.SimplifyArmIdentity.diff
diff --git a/...String].AddMovesForPackedDrops.before.mir → ...].AddMovesForPackedDrops.before.mir.32bit b/...String].AddMovesForPackedDrops.before.mir → ...].AddMovesForPackedDrops.before.mir.32bit
diff --git a/...String].AddMovesForPackedDrops.before.mir → ...].AddMovesForPackedDrops.before.mir.64bit b/...String].AddMovesForPackedDrops.before.mir → ...].AddMovesForPackedDrops.before.mir.64bit
diff --git a/...ge_live_dead_in_statics.XXX.mir_map.0.mir → ...ge_live_dead_in_statics.XXX.mir_map.0.mir b/...ge_live_dead_in_statics.XXX.mir_map.0.mir → ...ge_live_dead_in_statics.XXX.mir_map.0.mir
diff --git a/...rage_ranges/storage_ranges.main.nll.0.mir → ...est/mir-opt/storage_ranges.main.nll.0.mir b/...rage_ranges/storage_ranges.main.nll.0.mir → ...est/mir-opt/storage_ranges.main.nll.0.mir
diff --git a/...s_access.main.SimplifyCfg-final.after.mir → ...s_access.main.SimplifyCfg-final.after.mir b/...s_access.main.SimplifyCfg-final.after.mir → ...s_access.main.SimplifyCfg-final.after.mir
diff --git a/...ve_out.move_out_by_subslice.mir_map.0.mir → ...ve_out.move_out_by_subslice.mir_map.0.mir b/...ve_out.move_out_by_subslice.mir_map.0.mir → ...ve_out.move_out_by_subslice.mir_map.0.mir
diff --git a/..._move_out.move_out_from_end.mir_map.0.mir → ..._move_out.move_out_from_end.mir_map.0.mir b/..._move_out.move_out_from_end.mir_map.0.mir → ..._move_out.move_out_from_end.mir_map.0.mir
diff --git a/...um.process_never.SimplifyLocals.after.mir → ...um.process_never.SimplifyLocals.after.mir b/...um.process_never.SimplifyLocals.after.mir → ...um.process_never.SimplifyLocals.after.mir
diff --git a/...num.process_void.SimplifyLocals.after.mir → ...num.process_void.SimplifyLocals.after.mir b/...num.process_void.SimplifyLocals.after.mir → ...num.process_void.SimplifyLocals.after.mir
diff --git a/...fter-uninhabited-enum-branching.after.mir → ...fter-uninhabited-enum-branching.after.mir b/...fter-uninhabited-enum-branching.after.mir → ...fter-uninhabited-enum-branching.after.mir
diff --git a/...nching.main.UninhabitedEnumBranching.diff → ...nching.main.UninhabitedEnumBranching.diff b/...nching.main.UninhabitedEnumBranching.diff → ...nching.main.UninhabitedEnumBranching.diff
diff --git a/...eachable.main.UnreachablePropagation.diff → ...eachable.main.UnreachablePropagation.diff b/...eachable.main.UnreachablePropagation.diff → ...eachable.main.UnreachablePropagation.diff
diff --git a/...able_asm.main.UnreachablePropagation.diff → ...able_asm.main.UnreachablePropagation.diff b/...able_asm.main.UnreachablePropagation.diff → ...able_asm.main.UnreachablePropagation.diff
diff --git a/...le_asm_2.main.UnreachablePropagation.diff → ...le_asm_2.main.UnreachablePropagation.diff b/...le_asm_2.main.UnreachablePropagation.diff → ...le_asm_2.main.UnreachablePropagation.diff
diff --git a/...iverging.main.UnreachablePropagation.diff → ...iverging.main.UnreachablePropagation.diff b/...iverging.main.UnreachablePropagation.diff → ...iverging.main.UnreachablePropagation.diff
diff --git a/...2bit/rustc.E-V-{{constant}}.mir_map.0.mir → ...ypes.E-V-{{constant}}.mir_map.0.mir.32bit b/...2bit/rustc.E-V-{{constant}}.mir_map.0.mir → ...ypes.E-V-{{constant}}.mir_map.0.mir.32bit
diff --git a/...item_types.E-V-{{constant}}.mir_map.0.mir → ...ypes.E-V-{{constant}}.mir_map.0.mir.64bit b/...item_types.E-V-{{constant}}.mir_map.0.mir → ...ypes.E-V-{{constant}}.mir_map.0.mir.64bit
diff --git a/...ustc.Test-X-{{constructor}}.mir_map.0.mir → ...est-X-{{constructor}}.mir_map.0.mir.32bit b/...ustc.Test-X-{{constructor}}.mir_map.0.mir → ...est-X-{{constructor}}.mir_map.0.mir.32bit
diff --git a/...ypes.Test-X-{{constructor}}.mir_map.0.mir → ...est-X-{{constructor}}.mir_map.0.mir.64bit b/...ypes.Test-X-{{constructor}}.mir_map.0.mir → ...est-X-{{constructor}}.mir_map.0.mir.64bit
diff --git a/...ec_i32_.AddMovesForPackedDrops.before.mir → ..._.AddMovesForPackedDrops.before.mir.32bit b/...ec_i32_.AddMovesForPackedDrops.before.mir → ..._.AddMovesForPackedDrops.before.mir.32bit
diff --git a/...ec_i32_.AddMovesForPackedDrops.before.mir → ..._.AddMovesForPackedDrops.before.mir.64bit b/...ec_i32_.AddMovesForPackedDrops.before.mir → ..._.AddMovesForPackedDrops.before.mir.64bit
diff --git a/...{impl}}-ASSOCIATED_CONSTANT.mir_map.0.mir → ...}-ASSOCIATED_CONSTANT.mir_map.0.mir.32bit b/...{impl}}-ASSOCIATED_CONSTANT.mir_map.0.mir → ...}-ASSOCIATED_CONSTANT.mir_map.0.mir.32bit
diff --git a/...{impl}}-ASSOCIATED_CONSTANT.mir_map.0.mir → ...}-ASSOCIATED_CONSTANT.mir_map.0.mir.64bit b/...{impl}}-ASSOCIATED_CONSTANT.mir_map.0.mir → ...}-ASSOCIATED_CONSTANT.mir_map.0.mir.64bit
diff --git a/...e_storage.while_loop.PreCodegen.after.mir → ...e_storage.while_loop.PreCodegen.after.mir b/...e_storage.while_loop.PreCodegen.after.mir → ...e_storage.while_loop.PreCodegen.after.mir
diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml
@@ -15,6 +15,7 @@ serde_json = "1.0"
 rustfix = "0.5.0"
 lazy_static = "1.0"
 walkdir = "2"
+glob = "0.3.0"
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2"
-Original file line number
+Diff line change
@@ Expand Up / @@ -611,6 +611,7 @@ dependencies = [ @@
      "diff",
      "env_logger 0.7.1",
      "getopts",
+     "glob",
      "lazy_static",
      "libc",
      "log",
@@ Expand Down @@