Skip to content

Commit eb07d98

Browse files
authored
Rollup merge of #106002 - krasimirgg:v0sym, r=tmiasko
codegen tests: adapt patterns to also work with v0 symbol mangling No functional changes intended. These tests were failing under `new-symbol-mangling = true`, cf. https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/a.20few.20panic-abort.20tests.20fail.20under.20.60new-symbol-mangling.60. This adapts the patterns to work in this case.
2 parents 6a215ab + 9c9fa56 commit eb07d98

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/test/codegen/unwind-abis/c-unwind-abi-panic-abort.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
// CHECK: @rust_item_that_can_unwind() unnamed_addr [[ATTR0:#[0-9]+]]
1010
#[no_mangle]
1111
pub unsafe extern "C-unwind" fn rust_item_that_can_unwind() {
12-
// CHECK: call void @_ZN4core9panicking15panic_no_unwind
12+
// Handle both legacy and v0 symbol mangling.
13+
// CHECK: call void @{{.*core9panicking15panic_no_unwind}}
1314
may_unwind();
1415
}
1516

src/test/codegen/unwind-and-panic-abort.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ extern "C-unwind" {
99

1010
// CHECK: Function Attrs:{{.*}}nounwind
1111
// CHECK-NEXT: define{{.*}}void @foo
12-
// CHECK: call void @_ZN4core9panicking15panic_no_unwind
12+
// Handle both legacy and v0 symbol mangling.
13+
// CHECK: call void @{{.*core9panicking15panic_no_unwind}}
1314
#[no_mangle]
1415
pub unsafe extern "C" fn foo() {
1516
bar();

0 commit comments

Comments
 (0)