mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-26 08:44:35 +00:00
Rollup merge of #109394 - krasimirgg:llvm-17-vec-panic, r=nikic
adapt tests/codegen/vec-shrink-panik for LLVM 17
After 0d4a709bb8
LLVM now doesn't generate references to panic_cannot_unwind:
https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/17978#0186ff55-ca6f-4bc5-b1ec-2622c77d0ed5/744-746
Adapted as suggested by ````@nikic```` on Zulip:
https://rust-lang.zulipchat.com/#narrow/stream/187780-t-compiler.2Fwg-llvm/topic/a.20couple.20codegen.20test.20failures.20after.20llvm.200d4a709bb876824a/near/342664944
>Okay, so LLVM now realizes that double panic is not possible, so that's fine.
This commit is contained in:
commit
44942ad10f
@ -1,3 +1,8 @@
|
||||
// revisions: old new
|
||||
// LLVM 17 realizes double panic is not possible and doesn't generate calls
|
||||
// to panic_cannot_unwind.
|
||||
// [old]ignore-llvm-version: 17 - 99
|
||||
// [new]min-llvm-version: 17
|
||||
// compile-flags: -O
|
||||
// ignore-debug: the debug assertions get in the way
|
||||
#![crate_type = "lib"]
|
||||
@ -18,11 +23,11 @@ pub fn shrink_to_fit(vec: &mut Vec<u32>) {
|
||||
pub fn issue71861(vec: Vec<u32>) -> Box<[u32]> {
|
||||
// CHECK-NOT: panic
|
||||
|
||||
// Call to panic_cannot_unwind in case of double-panic is expected,
|
||||
// but other panics are not.
|
||||
// Call to panic_cannot_unwind in case of double-panic is expected
|
||||
// on LLVM 16 and older, but other panics are not.
|
||||
// CHECK: cleanup
|
||||
// CHECK-NEXT: ; call core::panicking::panic_cannot_unwind
|
||||
// CHECK-NEXT: panic_cannot_unwind
|
||||
// old-NEXT: ; call core::panicking::panic_cannot_unwind
|
||||
// old-NEXT: panic_cannot_unwind
|
||||
|
||||
// CHECK-NOT: panic
|
||||
vec.into_boxed_slice()
|
||||
@ -34,14 +39,14 @@ pub fn issue75636<'a>(iter: &[&'a str]) -> Box<[&'a str]> {
|
||||
// CHECK-NOT: panic
|
||||
|
||||
// Call to panic_cannot_unwind in case of double-panic is expected,
|
||||
// but other panics are not.
|
||||
// on LLVM 16 and older, but other panics are not.
|
||||
// CHECK: cleanup
|
||||
// CHECK-NEXT: ; call core::panicking::panic_cannot_unwind
|
||||
// CHECK-NEXT: panic_cannot_unwind
|
||||
// old-NEXT: ; call core::panicking::panic_cannot_unwind
|
||||
// old-NEXT: panic_cannot_unwind
|
||||
|
||||
// CHECK-NOT: panic
|
||||
iter.iter().copied().collect()
|
||||
}
|
||||
|
||||
// CHECK: ; core::panicking::panic_cannot_unwind
|
||||
// CHECK: declare void @{{.*}}panic_cannot_unwind
|
||||
// old: ; core::panicking::panic_cannot_unwind
|
||||
// old: declare void @{{.*}}panic_cannot_unwind
|
||||
|
Loading…
Reference in New Issue
Block a user