Skip to content

Commit bfbcf87

Browse files
committed
Revert "add integration tests, unwind across FFI boundary"
This reverts commit baf227e.
1 parent 3e84183 commit bfbcf87

File tree

10 files changed

+6
-166
lines changed

10 files changed

+6
-166
lines changed

src/test/run-make-fulldeps/c-unwind-abi-catch-lib-panic/Makefile

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/test/run-make-fulldeps/c-unwind-abi-catch-lib-panic/add.c

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/test/run-make-fulldeps/c-unwind-abi-catch-lib-panic/main.rs

Lines changed: 0 additions & 35 deletions
This file was deleted.

src/test/run-make-fulldeps/c-unwind-abi-catch-lib-panic/panic.rs

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/test/run-make-fulldeps/c-unwind-abi-catch-panic/Makefile

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/test/run-make-fulldeps/c-unwind-abi-catch-panic/add.c

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/test/run-make-fulldeps/c-unwind-abi-catch-panic/main.rs

Lines changed: 0 additions & 44 deletions
This file was deleted.

src/test/ui/allocator/no_std-alloc-error-handler-custom.rs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// compile-flags:-C panic=abort
88
// aux-build:helper.rs
99

10-
#![feature(start, rustc_private, new_uninit, panic_info_message, lang_items)]
10+
#![feature(start, rustc_private, new_uninit, panic_info_message)]
1111
#![feature(alloc_error_handler)]
1212
#![no_std]
1313

@@ -84,13 +84,6 @@ fn panic(panic_info: &core::panic::PanicInfo) -> ! {
8484
}
8585
}
8686

87-
// Because we are compiling this code with `-C panic=abort`, this wouldn't normally be needed.
88-
// However, `core` and `alloc` are both compiled with `-C panic=unwind`, which means that functions
89-
// in these libaries will refer to `rust_eh_personality` if LLVM can not *prove* the contents won't
90-
// unwind. So, for this test case we will define the symbol.
91-
#[lang = "eh_personality"]
92-
extern fn rust_eh_personality() {}
93-
9487
#[derive(Debug)]
9588
struct Page([[u64; 32]; 16]);
9689

src/test/ui/allocator/no_std-alloc-error-handler-default.rs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// aux-build:helper.rs
99
// gate-test-default_alloc_error_handler
1010

11-
#![feature(start, rustc_private, new_uninit, panic_info_message, lang_items)]
11+
#![feature(start, rustc_private, new_uninit, panic_info_message)]
1212
#![feature(default_alloc_error_handler)]
1313
#![no_std]
1414

@@ -71,13 +71,6 @@ fn panic(panic_info: &core::panic::PanicInfo) -> ! {
7171
}
7272
}
7373

74-
// Because we are compiling this code with `-C panic=abort`, this wouldn't normally be needed.
75-
// However, `core` and `alloc` are both compiled with `-C panic=unwind`, which means that functions
76-
// in these libaries will refer to `rust_eh_personality` if LLVM can not *prove* the contents won't
77-
// unwind. So, for this test case we will define the symbol.
78-
#[lang = "eh_personality"]
79-
extern fn rust_eh_personality() {}
80-
8174
#[derive(Debug)]
8275
struct Page([[u64; 32]; 16]);
8376

src/test/ui/symbol-names/impl1.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,7 @@ fn main() {
7474
}
7575
};
7676
}
77+
78+
// FIXME(katie): The 32-bit symbol hash probably needs updating as well, but I'm slightly unsure
79+
// about how to do that. This comment is here so that we don't break the test due to error messages
80+
// including incorrect line numbers.

0 commit comments

Comments
 (0)