Fix more tests

Author: nbdd0121

tests/assembly/asm/aarch64-modifiers.rs

@@ -1,5 +1,5 @@
 // assembly-output: emit-asm
-// compile-flags: -O
+// compile-flags: -O -C panic=abort
 // compile-flags: --target aarch64-unknown-linux-gnu
 // needs-llvm-components: aarch64
 

tests/assembly/asm/arm-modifiers.rs

@@ -1,5 +1,5 @@
 // assembly-output: emit-asm
-// compile-flags: -O
+// compile-flags: -O -C panic=abort
 // compile-flags: --target armv7-unknown-linux-gnueabihf
 // compile-flags: -C target-feature=+neon
 // needs-llvm-components: arm

tests/assembly/asm/x86-modifiers.rs

@@ -1,6 +1,6 @@
 // revisions: x86_64 i686
 // assembly-output: emit-asm
-// compile-flags: -O
+// compile-flags: -O -C panic=abort
 //[x86_64] compile-flags: --target x86_64-unknown-linux-gnu
 //[x86_64] needs-llvm-components: x86
 //[i686] compile-flags: --target i686-unknown-linux-gnu

tests/codegen/avr/avr-func-addrspace.rs

@@ -1,4 +1,4 @@
-// compile-flags: -O --target=avr-unknown-gnu-atmega328 --crate-type=rlib
+// compile-flags: -O --target=avr-unknown-gnu-atmega328 --crate-type=rlib -C panic=abort
 // needs-llvm-components: avr
 
 // This test validates that function pointers can be stored in global variables

tests/codegen/debuginfo-inline-callsite-location.rs

@@ -20,7 +20,7 @@
 #![crate_type = "lib"]
 
 #[no_mangle]
-extern "C" fn add_numbers(x: &Option<i32>, y: &Option<i32>) -> i32 {
+extern "C-unwind" fn add_numbers(x: &Option<i32>, y: &Option<i32>) -> i32 {
     let x1 = x.unwrap();
     let y1 = y.unwrap();
 

tests/codegen/unwind-abis/nounwind-on-stable-panic-unwind.rs

@@ -1,5 +1,5 @@
 Function name: abort::main
-Raw bytes (105): 0x[01, 01, 12, 01, 47, 05, 09, 03, 0d, 42, 11, 03, 0d, 11, 3e, 42, 11, 03, 0d, 3b, 15, 11, 3e, 42, 11, 03, 0d, 15, 36, 3b, 15, 11, 3e, 42, 11, 03, 0d, 05, 09, 0d, 01, 0d, 01, 01, 1b, 03, 02, 0b, 00, 18, 42, 01, 0c, 00, 19, 11, 00, 1a, 02, 0a, 3e, 02, 0a, 00, 0b, 3b, 02, 0c, 00, 19, 15, 00, 1a, 00, 31, 36, 00, 31, 00, 32, 33, 04, 0c, 00, 19, 05, 00, 1a, 00, 31, 09, 00, 31, 00, 32, 47, 01, 09, 00, 17, 0d, 02, 05, 01, 02]
+Raw bytes (105): 0x[01, 01, 12, 01, 47, 05, 09, 03, 0d, 42, 11, 03, 0d, 11, 3e, 42, 11, 03, 0d, 3b, 15, 11, 3e, 42, 11, 03, 0d, 15, 36, 3b, 15, 11, 3e, 42, 11, 03, 0d, 05, 09, 0d, 01, 0c, 01, 01, 1b, 03, 02, 0b, 00, 18, 42, 01, 0c, 00, 19, 11, 00, 1a, 02, 0a, 3e, 02, 0a, 00, 0b, 3b, 02, 0c, 00, 19, 15, 00, 1a, 00, 31, 36, 00, 31, 00, 32, 33, 04, 0c, 00, 19, 05, 00, 1a, 00, 31, 09, 00, 31, 00, 32, 47, 01, 09, 00, 17, 0d, 02, 05, 01, 02]
 Number of files: 1
 - file 0 => global file 1
 Number of expressions: 18
@@ -22,7 +22,7 @@ Number of expressions: 18
 - expression 16 operands: lhs = Expression(0, Add), rhs = Counter(3)
 - expression 17 operands: lhs = Counter(1), rhs = Counter(2)
 Number of file 0 mappings: 13
-- Code(Counter(0)) at (prev + 13, 1) to (start + 1, 27)
+- Code(Counter(0)) at (prev + 12, 1) to (start + 1, 27)
 - Code(Expression(0, Add)) at (prev + 2, 11) to (start + 0, 24)
     = (c0 + (c1 + c2))
 - Code(Expression(16, Sub)) at (prev + 1, 12) to (start + 0, 25)
@@ -44,13 +44,13 @@ Number of file 0 mappings: 13
 - Code(Counter(3)) at (prev + 2, 5) to (start + 1, 2)
 
 Function name: abort::might_abort
-Raw bytes (21): 0x[01, 01, 01, 01, 05, 03, 01, 04, 01, 01, 14, 05, 02, 09, 01, 24, 02, 02, 0c, 03, 02]
+Raw bytes (21): 0x[01, 01, 01, 01, 05, 03, 01, 03, 01, 01, 14, 05, 02, 09, 01, 24, 02, 02, 0c, 03, 02]
 Number of files: 1
 - file 0 => global file 1
 Number of expressions: 1
 - expression 0 operands: lhs = Counter(0), rhs = Counter(1)
 Number of file 0 mappings: 3
-- Code(Counter(0)) at (prev + 4, 1) to (start + 1, 20)
+- Code(Counter(0)) at (prev + 3, 1) to (start + 1, 20)
 - Code(Counter(1)) at (prev + 2, 9) to (start + 1, 36)
 - Code(Expression(0, Sub)) at (prev + 2, 12) to (start + 3, 2)
     = (c0 - c1)