update mir-opt tests & fix codegen-llvm test

Author: BennoLossin

tests/codegen-llvm/naked-fn/generics.rs

@@ -20,11 +20,11 @@ fn test(x: u64) {
 }
 
 // CHECK: .balign 4
-// CHECK: add rax, 2
+// CHECK: add rax, 1
 // CHECK: add rax, 42
 
 // CHECK: .balign 4
-// CHECK: add rax, 1
+// CHECK: add rax, 2
 // CHECK: add rax, 42
 
 #[unsafe(naked)]

tests/mir-opt/const_prop/offset_of.concrete.GVN.panic-unwind.diff

@@ -34,25 +34,25 @@
 
       bb0: {
           StorageLive(_1);
--         _1 = OffsetOf(Alpha, FieldPath([(0, 0)]));
+-         _1 = FieldOffset(field_of!(Alpha, x));
 +         _1 = const 4_usize;
           StorageLive(_2);
--         _2 = OffsetOf(Alpha, FieldPath([(0, 1)]));
+-         _2 = FieldOffset(field_of!(Alpha, y));
 +         _2 = const 0_usize;
           StorageLive(_3);
--         _3 = OffsetOf(Alpha, FieldPath([(0, 2), (0, 0)]));
+-         _3 = FieldOffset(field_of!(Alpha, z.0));
 +         _3 = const 2_usize;
           StorageLive(_4);
--         _4 = OffsetOf(Alpha, FieldPath([(0, 2), (0, 1)]));
+-         _4 = FieldOffset(field_of!(Alpha, z.1));
 +         _4 = const 3_usize;
           StorageLive(_5);
--         _5 = OffsetOf(Epsilon, FieldPath([(0, 0)]));
+-         _5 = FieldOffset(field_of!(Epsilon, 0));
 +         _5 = const 1_usize;
           StorageLive(_6);
--         _6 = OffsetOf(Epsilon, FieldPath([(0, 1)]));
+-         _6 = FieldOffset(field_of!(Epsilon, 1));
 +         _6 = const 2_usize;
           StorageLive(_7);
--         _7 = OffsetOf(Epsilon, FieldPath([(2, 0)]));
+-         _7 = FieldOffset(field_of!(Epsilon, c));
 +         _7 = const 4_usize;
           _0 = const ();
           StorageDead(_7);

tests/mir-opt/const_prop/offset_of.generic.GVN.panic-unwind.diff

@@ -34,21 +34,21 @@
 
       bb0: {
           StorageLive(_1);
-          _1 = OffsetOf(Gamma<T>, FieldPath([(0, 0)]));
+          _1 = FieldOffset(field_of!(Gamma<T>, x));
           StorageLive(_2);
-          _2 = OffsetOf(Gamma<T>, FieldPath([(0, 1)]));
+          _2 = FieldOffset(field_of!(Gamma<T>, y));
           StorageLive(_3);
--         _3 = OffsetOf(Delta<T>, FieldPath([(0, 1)]));
+-         _3 = FieldOffset(field_of!(Delta<T>, x));
 +         _3 = const 0_usize;
           StorageLive(_4);
--         _4 = OffsetOf(Delta<T>, FieldPath([(0, 2)]));
+-         _4 = FieldOffset(field_of!(Delta<T>, y));
 +         _4 = const 2_usize;
           StorageLive(_5);
-          _5 = OffsetOf(Zeta<T>, FieldPath([(0, 0)]));
+          _5 = FieldOffset(field_of!(Zeta<T>, 0));
           StorageLive(_6);
-          _6 = OffsetOf(Zeta<T>, FieldPath([(0, 1)]));
+          _6 = FieldOffset(field_of!(Zeta<T>, 1));
           StorageLive(_7);
-          _7 = OffsetOf(Zeta<T>, FieldPath([(1, 0)]));
+          _7 = FieldOffset(field_of!(Zeta<T>, 0));
           _0 = const ();
           StorageDead(_7);
           StorageDead(_6);

tests/mir-opt/dataflow-const-prop/offset_of.concrete.DataflowConstProp.panic-unwind.diff

@@ -22,16 +22,16 @@
 
       bb0: {
           StorageLive(_1);
--         _1 = OffsetOf(Alpha, FieldPath([(0, 0)]));
+-         _1 = FieldOffset(field_of!(Alpha, x));
 +         _1 = const 4_usize;
           StorageLive(_2);
--         _2 = OffsetOf(Alpha, FieldPath([(0, 1)]));
+-         _2 = FieldOffset(field_of!(Alpha, y));
 +         _2 = const 0_usize;
           StorageLive(_3);
--         _3 = OffsetOf(Alpha, FieldPath([(0, 2), (0, 0)]));
+-         _3 = FieldOffset(field_of!(Alpha, z.0));
 +         _3 = const 2_usize;
           StorageLive(_4);
--         _4 = OffsetOf(Alpha, FieldPath([(0, 2), (0, 1)]));
+-         _4 = FieldOffset(field_of!(Alpha, z.1));
 +         _4 = const 3_usize;
           _0 = const ();
           StorageDead(_4);

tests/mir-opt/dataflow-const-prop/offset_of.generic.DataflowConstProp.panic-unwind.diff

@@ -22,14 +22,14 @@
 
       bb0: {
           StorageLive(_1);
-          _1 = OffsetOf(Gamma<T>, FieldPath([(0, 0)]));
+          _1 = FieldOffset(field_of!(Gamma<T>, x));
           StorageLive(_2);
-          _2 = OffsetOf(Gamma<T>, FieldPath([(0, 1)]));
+          _2 = FieldOffset(field_of!(Gamma<T>, y));
           StorageLive(_3);
--         _3 = OffsetOf(Delta<T>, FieldPath([(0, 1)]));
+-         _3 = FieldOffset(field_of!(Delta<T>, x));
 +         _3 = const 0_usize;
           StorageLive(_4);
--         _4 = OffsetOf(Delta<T>, FieldPath([(0, 2)]));
+-         _4 = FieldOffset(field_of!(Delta<T>, y));
 +         _4 = const 2_usize;
           _0 = const ();
           StorageDead(_4);

tests/mir-opt/dataflow-const-prop/offset_of.rs

@@ -56,10 +56,10 @@ fn generic<T>() {
     // CHECK: debug dx => [[dx:_.*]];
     // CHECK: debug dy => [[dy:_.*]];
 
-    // CHECK: [[gx]] = OffsetOf(Gamma<T>, FieldPath([(0, 0)]));
+    // CHECK: [[gx]] = FieldOffset(field_of!(Gamma<T>, x));
     let gx = offset_of!(Gamma<T>, x);
 
-    // CHECK: [[gy]] = OffsetOf(Gamma<T>, FieldPath([(0, 1)]));
+    // CHECK: [[gy]] = FieldOffset(field_of!(Gamma<T>, y));
     let gy = offset_of!(Gamma<T>, y);
 
     // CHECK: [[dx]] = const 0_usize