mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #132777 - durin42:llvm-20-poison-prop, r=nikic

Browse Source 
try_question_mark_nop: update test for LLVM 20

llvm/llvm-project@dd116369f6 changes the IR of this test in a way that I don't think is bad, but needs adjusting.

r? `@nikic`
`@rustbot` label: +llvm-main
This commit is contained in:
Matthias Krüger 2024-11-09 10:52:04 +01:00 committed by GitHub
commit 2829c2725a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/codegen/try_question_mark_nop.rs
View File

@ -1,6 +1,10 @@
//@ compile-flags: -O -Z merge-functions=disabled --edition=2021 //@ compile-flags: -O -Z merge-functions=disabled --edition=2021
//@ only-x86_64 //@ only-x86_64
// FIXME: Remove the `min-llvm-version`. // FIXME: Remove the `min-llvm-version`.
//@ revisions: NINETEEN TWENTY
//@[NINETEEN] min-llvm-version: 19
//@[NINETEEN] ignore-llvm-version: 20-99
//@[TWENTY] min-llvm-version: 20
//@ min-llvm-version: 19 //@ min-llvm-version: 19
#![crate_type = "lib"] #![crate_type = "lib"]
@ -13,8 +17,11 @@
#[no_mangle] #[no_mangle]
pub fn option_nop_match_32(x: Option<u32>) -> Option<u32> { pub fn option_nop_match_32(x: Option<u32>) -> Option<u32> {
// CHECK: start: // CHECK: start:
// TWENTY-NEXT: %trunc = trunc nuw i32 %0 to i1
// TWENTY-NEXT: %.2 = select i1 %trunc, i32 %1, i32 undef
// CHECK-NEXT: [[REG1:%.*]] = insertvalue { i32, i32 } poison, i32 %0, 0 // CHECK-NEXT: [[REG1:%.*]] = insertvalue { i32, i32 } poison, i32 %0, 0
// CHECK-NEXT: [[REG2:%.*]] = insertvalue { i32, i32 } [[REG1]], i32 %1, 1 // NINETEEN-NEXT: [[REG2:%.*]] = insertvalue { i32, i32 } [[REG1]], i32 %1, 1
// TWENTY-NEXT: [[REG2:%.*]] = insertvalue { i32, i32 } [[REG1]], i32 %.2, 1
// CHECK-NEXT: ret { i32, i32 } [[REG2]] // CHECK-NEXT: ret { i32, i32 } [[REG2]]
match x { match x {
Some(x) => Some(x), Some(x) => Some(x),
@ -26,6 +33,8 @@ pub fn option_nop_match_32(x: Option<u32>) -> Option<u32> {
#[no_mangle] #[no_mangle]
pub fn option_nop_traits_32(x: Option<u32>) -> Option<u32> { pub fn option_nop_traits_32(x: Option<u32>) -> Option<u32> {
// CHECK: start: // CHECK: start:
// TWENTY-NEXT: %trunc = trunc nuw i32 %0 to i1
// TWENTY-NEXT: %.1 = select i1 %trunc, i32 %1, i32 undef
// CHECK-NEXT: insertvalue { i32, i32 } // CHECK-NEXT: insertvalue { i32, i32 }
// CHECK-NEXT: insertvalue { i32, i32 } // CHECK-NEXT: insertvalue { i32, i32 }
// CHECK-NEXT: ret { i32, i32 } // CHECK-NEXT: ret { i32, i32 }