Fix a bunch of rust_eh_personality signatures

Author: bjorn3

scripts/test_rustc_tests.sh

@@ -51,6 +51,8 @@ rm tests/ui/asm/x86_64/issue-96797.rs # const and sym inline asm operands don't
 rm tests/ui/asm/global-asm-mono-sym-fn.rs # same
 rm tests/ui/asm/naked-asm-mono-sym-fn.rs # same
 rm tests/ui/asm/x86_64/goto.rs # inline asm labels not supported
+rm tests/ui/asm/aarch64/may_unwind.rs # inline asm unwind not supported
+rm tests/ui/asm/may_unwind.rs # same
 rm tests/ui/simd/simd-bitmask-notpow2.rs # non-pow-of-2 simd vector sizes
 rm -r tests/run-make/embed-source-dwarf # embedding sources in debuginfo
 
@@ -71,6 +73,7 @@ rm -r tests/ui/instrument-coverage/
 # ==================
 rm tests/ui/codegen/issue-28950.rs # depends on stack size optimizations
 rm tests/ui/codegen/init-large-type.rs # same
+rm tests/ui/codegen/StackColoring-not-blowup-stack-issue-40883.rs # same
 rm -r tests/run-make/fmt-write-bloat/ # tests an optimization
 rm tests/ui/statics/const_generics.rs # same
 rm tests/ui/linking/executable-no-mangle-strip.rs # requires --gc-sections to work for statics
@@ -130,11 +133,13 @@ rm -r tests/run-make/export # same
 # ============
 rm -r tests/run-make/extern-fn-explicit-align # argument alignment not yet supported
 rm -r tests/run-make/panic-abort-eh_frame # .eh_frame emitted with panic=abort
+rm -r tests/run-make/forced-unwind-terminate-pof # adding wrong terminate guard
 
 # bugs in the test suite
 # ======================
 rm tests/ui/process/nofile-limit.rs # TODO some AArch64 linking issue
 rm -r tests/ui/codegen/equal-pointers-unequal # make incorrect assumptions about the location of stack variables
+rm tests/incremental/extern_static/issue-49153.rs # references undefined symbol
 
 rm tests/ui/stdio-is-blocking.rs # really slow with unoptimized libstd
 rm tests/ui/intrinsics/panic-uninitialized-zeroed.rs # same
@@ -155,8 +160,205 @@ index 073116933bd..c3e4578204d 100644
              .arg("-o")
              .arg(&recipe_bin)
              // Specify library search paths for \`run_make_support\`.
+diff --git a/tests/run-make/bin-emit-no-symbols/app.rs b/tests/run-make/bin-emit-no-symbols/app.rs
+index e9dc1e9744f..ad74fcc43dc 100644
+--- a/tests/run-make/bin-emit-no-symbols/app.rs
++++ b/tests/run-make/bin-emit-no-symbols/app.rs
+@@ -12,7 +12,15 @@ fn panic(_: &PanicInfo) -> ! {
+ }
+
+ #[lang = "eh_personality"]
+-fn eh() {}
++fn eh(
++    _version: i32,
++    _actions: i32,
++    _exception_class: u64,
++    _exception_object: *mut (),
++    _context: *mut (),
++) -> i32 {
++    loop {}
++}
+
+ #[alloc_error_handler]
+ fn oom(_: Layout) -> ! {
+diff --git a/tests/run-make/crate-circular-deps-link/a.rs b/tests/run-make/crate-circular-deps-link/a.rs
+index a54f429550e..99b2b65049d 100644
+--- a/tests/run-make/crate-circular-deps-link/a.rs
++++ b/tests/run-make/crate-circular-deps-link/a.rs
+@@ -21,6 +21,12 @@ extern "C" fn __rust_foreign_exception() -> ! {
+ }
+
+ #[lang = "eh_personality"]
+-fn eh_personality() {
++fn eh_personality(
++    _version: i32,
++    _actions: i32,
++    _exception_class: u64,
++    _exception_object: *mut (),
++    _context: *mut (),
++) -> i32 {
+     loop {}
+ }
+diff --git a/tests/run-make/no-alloc-shim/foo.rs b/tests/run-make/no-alloc-shim/foo.rs
+index b5d0d394d2b..a22307f41b3 100644
+--- a/tests/run-make/no-alloc-shim/foo.rs
++++ b/tests/run-make/no-alloc-shim/foo.rs
+@@ -12,7 +12,13 @@ fn panic_handler(_: &core::panic::PanicInfo) -> ! {
+ }
+
+ #[no_mangle]
+-extern "C" fn rust_eh_personality() {
++extern "C" fn rust_eh_personality(
++    _version: i32,
++    _actions: i32,
++    _exception_class: u64,
++    _exception_object: *mut (),
++    _context: *mut (),
++) -> i32 {
+     loop {}
+ }
+
+diff --git a/tests/ui/allocator/no_std-alloc-error-handler-custom.rs b/tests/ui/allocator/no_std-alloc-error-handler-custom.rs
+index 6bbfb72510d..d65d65643e5 100644
+--- a/tests/ui/allocator/no_std-alloc-error-handler-custom.rs
++++ b/tests/ui/allocator/no_std-alloc-error-handler-custom.rs
+@@ -6,13 +6,14 @@
+ //@ compile-flags:-C panic=abort
+ //@ aux-build:helper.rs
+
+-#![feature(rustc_private, lang_items)]
++#![feature(rustc_private, lang_items, panic_unwind)]
+ #![feature(alloc_error_handler)]
+ #![no_std]
+ #![no_main]
+
+ extern crate alloc;
+ extern crate libc;
++extern crate unwind;
+
+ // ARM targets need these symbols
+ #[no_mangle]
+@@ -70,7 +71,15 @@ fn panic(panic_info: &core::panic::PanicInfo) -> ! {
+ // in these libraries will refer to \`rust_eh_personality\` if LLVM can not *prove* the contents won't
+ // unwind. So, for this test case we will define the symbol.
+ #[lang = "eh_personality"]
+-extern "C" fn rust_eh_personality() {}
++extern "C" fn rust_eh_personality(
++    _version: i32,
++    _actions: i32,
++    _exception_class: u64,
++    _exception_object: *mut (),
++    _context: *mut (),
++) -> i32 {
++    loop {}
++}
+
+ #[derive(Default, Debug)]
+ struct Page(#[allow(dead_code)] [[u64; 32]; 16]);
+diff --git a/tests/ui/allocator/no_std-alloc-error-handler-default.rs b/tests/ui/allocator/no_std-alloc-error-handler-default.rs
+index 8bcf054ac85..2ff3394484b 100644
+--- a/tests/ui/allocator/no_std-alloc-error-handler-default.rs
++++ b/tests/ui/allocator/no_std-alloc-error-handler-default.rs
+@@ -6,12 +6,13 @@
+ //@ compile-flags:-C panic=abort
+ //@ aux-build:helper.rs
+
+-#![feature(rustc_private, lang_items)]
++#![feature(rustc_private, lang_items, panic_unwind)]
+ #![no_std]
+ #![no_main]
+
+ extern crate alloc;
+ extern crate libc;
++extern crate unwind;
+
+ // ARM targets need these symbols
+ #[no_mangle]
+@@ -57,7 +58,15 @@ fn panic(panic_info: &core::panic::PanicInfo) -> ! {
+ // in these libraries will refer to \`rust_eh_personality\` if LLVM can not *prove* the contents won't
+ // unwind. So, for this test case we will define the symbol.
+ #[lang = "eh_personality"]
+-extern "C" fn rust_eh_personality() {}
++extern "C" fn rust_eh_personality(
++    _version: i32,
++    _actions: i32,
++    _exception_class: u64,
++    _exception_object: *mut (),
++    _context: *mut (),
++) -> i32 {
++    loop {}
++}
+
+ #[derive(Default, Debug)]
+ struct Page(#[allow(dead_code)] [[u64; 32]; 16]);
+diff --git a/tests/ui/extern-flag/auxiliary/panic_handler.rs b/tests/ui/extern-flag/auxiliary/panic_handler.rs
+index 9140ceed229..9607f0ed013 100644
+--- a/tests/ui/extern-flag/auxiliary/panic_handler.rs
++++ b/tests/ui/extern-flag/auxiliary/panic_handler.rs
+@@ -12,4 +12,12 @@ pub fn begin_panic_handler(_info: &core::panic::PanicInfo<'_>) -> ! {
+ }
+
+ #[lang = "eh_personality"]
+-extern "C" fn eh_personality() {}
++extern "C" fn eh_personality(
++    _version: i32,
++    _actions: i32,
++    _exception_class: u64,
++    _exception_object: *mut (),
++    _context: *mut (),
++) -> i32 {
++    loop {}
++}
+diff --git a/tests/ui/no_std/simple-runs.rs b/tests/ui/no_std/simple-runs.rs
+index 8931ac7ed11..566aa8763b8 100644
+--- a/tests/ui/no_std/simple-runs.rs
++++ b/tests/ui/no_std/simple-runs.rs
+@@ -4,6 +4,7 @@
+ //@ compile-flags: -Cpanic=abort
+ //@ ignore-wasm different \`main\` convention
+
++#![feature(lang_items)]
+ #![no_std]
+ #![no_main]
+
+@@ -35,6 +36,17 @@ fn panic_handler(_info: &PanicInfo<'_>) -> ! {
+     loop {}
+ }
+
++#[lang = "eh_personality"]
++extern "C" fn eh_personality(
++    _version: i32,
++    _actions: i32,
++    _exception_class: u64,
++    _exception_object: *mut (),
++    _context: *mut (),
++) -> i32 {
++    loop {}
++}
++
+ #[no_mangle]
+ extern "C" fn main(_argc: c_int, _argv: *const *const c_char) -> c_int {
+     0
+diff --git a/tests/ui/panic-runtime/incompatible-type.rs b/tests/ui/panic-runtime/incompatible-type.rs
+index 4cbcfec11c9..f82c23d68c2 100644
+--- a/tests/ui/panic-runtime/incompatible-type.rs
++++ b/tests/ui/panic-runtime/incompatible-type.rs
+@@ -21,4 +21,12 @@ pub fn test(_: DropMe) {
+ }
+
+ #[rustc_std_internal_symbol]
+-pub unsafe extern "C" fn rust_eh_personality() {}
++pub unsafe extern "C" fn rust_eh_personality(
++    _version: i32,
++    _actions: i32,
++    _exception_class: u64,
++    _exception_object: *mut (),
++    _context: *mut (),
++) -> i32 {
++    loop {}
++}
 EOF
 
 echo "[TEST] rustc test suite"
-COMPILETEST_FORCE_STAGE0=1 ./x.py test --stage 0 tests/{codegen-units,ui,incremental}
+COMPILETEST_FORCE_STAGE0=1 ./x.py test --stage 0 tests/{codegen-units,run-make,ui,incremental}
 popd