Fix tests.

Author: ywxt

compiler/rustc_codegen_llvm/src/base.rs

@@ -88,7 +88,7 @@ pub(crate) fn compile_codegen_unit(
                 cx.codegen_unit.items_in_deterministic_order(cx.tcx)
             } else {
                 // The `items` has a deterministic order, so we can use it directly.
-                cx.codegen_unit.items().iter().cloned().collect()
+                cx.codegen_unit.items().iter().map(|(item, data)| (*item, *data)).collect()
             };
             for &(mono_item, data) in &mono_items {
                 mono_item.predefine::<Builder<'_, '_, '_>>(

compiler/rustc_middle/src/mir/mono.rs

@@ -12,7 +12,6 @@ use rustc_data_structures::unord::UnordMap;
 use rustc_hashes::Hash128;
 use rustc_hir::ItemId;
 use rustc_hir::def_id::{CrateNum, DefId, DefIdSet, LOCAL_CRATE};
-use rustc_index::Idx;
 use rustc_macros::{HashStable, TyDecodable, TyEncodable};
 use rustc_query_system::ich::StableHashingContext;
 use rustc_session::config::OptLevel;
@@ -540,7 +539,7 @@ impl<'tcx> CodegenUnit<'tcx> {
         ) -> Option<T> {
             match item {
                 MonoItem::Fn(ref instance) => match instance.def {
-                    InstanceKind::Item(def) => def.as_local().map(op),
+                    InstanceKind::Item(def) => def.as_local().map(|_| op(def)),
                     InstanceKind::VTableShim(..)
                     | InstanceKind::ReifyShim(..)
                     | InstanceKind::Intrinsic(..)
@@ -556,14 +555,14 @@ impl<'tcx> CodegenUnit<'tcx> {
                     | InstanceKind::FutureDropPollShim(..)
                     | InstanceKind::AsyncDropGlueCtorShim(..) => None,
                 },
-                MonoItem::Static(def_id) => def_id.as_local().map(op),
-                MonoItem::GlobalAsm(item_id) => Some(op(item_id.owner_id.def_id)),
+                MonoItem::Static(def_id) => def_id.as_local().map(|_| op(def_id)),
+                MonoItem::GlobalAsm(item_id) => Some(op(item_id.owner_id.def_id.to_def_id())),
             }
         }
         fn item_sort_key<'tcx>(tcx: TyCtxt<'tcx>, item: MonoItem<'tcx>) -> ItemSortKey<'tcx> {
             ItemSortKey(
                 local_item_query(item, |def_id| tcx.def_span(def_id)),
-                local_item_query(item, |def_id| tcx.def_path(id).to_string_no_crate_verbose()),
+                local_item_query(item, |def_id| tcx.def_path(def_id).to_string_no_crate_verbose()),
                 item.symbol_name(tcx),
             )
         }

src/tools/compiletest/src/runtest.rs

@@ -1694,10 +1694,10 @@ impl<'test> TestCx<'test> {
             }
             TestMode::Assembly | TestMode::Codegen => {
                 rustc.arg("-Cdebug-assertions=no");
-                // For assembly and codegen tests, we want to use the same order 
-                // of the items of a codegen unit as the source order， so that 
+                // For assembly and codegen tests, we want to use the same order
+                // of the items of a codegen unit as the source order，so that
                 // we can compare the output with the source code through filecheck.
-                rustc.arg("-Zcodegen-source-order")
+                rustc.arg("-Zcodegen-source-order");
             }
             TestMode::Crashes => {
                 set_mir_dump_dir(&mut rustc);

tests/assembly-llvm/asm/aarch64-modifiers.rs

@@ -55,35 +55,17 @@ check!(vreg vreg "add {0}.4s, {0}.4s, {0}.4s");
 // CHECK: //NO_APP
 check!(vreg_b vreg "ldr {:b}, [x0]");
 
-// CHECK-LABEL: vreg_h:
-// CHECK: //APP
-// CHECK: ldr h0, [x0]
-// CHECK: //NO_APP
-check!(vreg_h vreg "ldr {:h}, [x0]");
-
-// CHECK-LABEL: vreg_s:
-// CHECK: //APP
-// CHECK: ldr s0, [x0]
-// CHECK: //NO_APP
-check!(vreg_s vreg "ldr {:s}, [x0]");
-
 // CHECK-LABEL: vreg_d:
 // CHECK: //APP
 // CHECK: ldr d0, [x0]
 // CHECK: //NO_APP
 check!(vreg_d vreg "ldr {:d}, [x0]");
 
-// CHECK-LABEL: vreg_q:
-// CHECK: //APP
-// CHECK: ldr q0, [x0]
-// CHECK: //NO_APP
-check!(vreg_q vreg "ldr {:q}, [x0]");
-
-// CHECK-LABEL: vreg_v:
+// CHECK-LABEL: vreg_h:
 // CHECK: //APP
-// CHECK: add v0.4s, v0.4s, v0.4s
+// CHECK: ldr h0, [x0]
 // CHECK: //NO_APP
-check!(vreg_v vreg "add {0:v}.4s, {0:v}.4s, {0:v}.4s");
+check!(vreg_h vreg "ldr {:h}, [x0]");
 
 // CHECK-LABEL: vreg_low16:
 // CHECK: //APP
@@ -97,32 +79,50 @@ check!(vreg_low16 vreg_low16 "add {0}.4s, {0}.4s, {0}.4s");
 // CHECK: //NO_APP
 check!(vreg_low16_b vreg_low16 "ldr {:b}, [x0]");
 
+// CHECK-LABEL: vreg_low16_d:
+// CHECK: //APP
+// CHECK: ldr d0, [x0]
+// CHECK: //NO_APP
+check!(vreg_low16_d vreg_low16 "ldr {:d}, [x0]");
+
 // CHECK-LABEL: vreg_low16_h:
 // CHECK: //APP
 // CHECK: ldr h0, [x0]
 // CHECK: //NO_APP
 check!(vreg_low16_h vreg_low16 "ldr {:h}, [x0]");
 
+// CHECK-LABEL: vreg_low16_q:
+// CHECK: //APP
+// CHECK: ldr q0, [x0]
+// CHECK: //NO_APP
+check!(vreg_low16_q vreg_low16 "ldr {:q}, [x0]");
+
 // CHECK-LABEL: vreg_low16_s:
 // CHECK: //APP
 // CHECK: ldr s0, [x0]
 // CHECK: //NO_APP
 check!(vreg_low16_s vreg_low16 "ldr {:s}, [x0]");
 
-// CHECK-LABEL: vreg_low16_d:
+// CHECK-LABEL: vreg_low16_v:
 // CHECK: //APP
-// CHECK: ldr d0, [x0]
+// CHECK: add v0.4s, v0.4s, v0.4s
 // CHECK: //NO_APP
-check!(vreg_low16_d vreg_low16 "ldr {:d}, [x0]");
+check!(vreg_low16_v vreg_low16 "add {0:v}.4s, {0:v}.4s, {0:v}.4s");
 
-// CHECK-LABEL: vreg_low16_q:
+// CHECK-LABEL: vreg_q:
 // CHECK: //APP
 // CHECK: ldr q0, [x0]
 // CHECK: //NO_APP
-check!(vreg_low16_q vreg_low16 "ldr {:q}, [x0]");
+check!(vreg_q vreg "ldr {:q}, [x0]");
 
-// CHECK-LABEL: vreg_low16_v:
+// CHECK-LABEL: vreg_s:
+// CHECK: //APP
+// CHECK: ldr s0, [x0]
+// CHECK: //NO_APP
+check!(vreg_s vreg "ldr {:s}, [x0]");
+
+// CHECK-LABEL: vreg_v:
 // CHECK: //APP
 // CHECK: add v0.4s, v0.4s, v0.4s
 // CHECK: //NO_APP
-check!(vreg_low16_v vreg_low16 "add {0:v}.4s, {0:v}.4s, {0:v}.4s");
+check!(vreg_v vreg "add {0:v}.4s, {0:v}.4s, {0:v}.4s");