Unrolled build for rust-lang#119523

rust-timer · web-flow · commit eaab8b51f669 · 2024-01-03T15:35:52.000-05:00
Rollup merge of rust-lang#119523 - maurer:fix-sparc-llvm-18, r=nikic llvm: Allow `noundef` in codegen tests LLVM 18 will automatically infer `noundef` in some situations. Adjust codegen tests to accept this. See llvm/llvm-project#76553 for why `noundef` is being generated now. ``@rustbot`` label:+llvm-main
diff --git a/tests/codegen/abi-main-signature-32bit-c-int.rs b/tests/codegen/abi-main-signature-32bit-c-int.rs
@@ -8,4 +8,4 @@
 fn main() {
 }
 
-// CHECK: define{{( hidden)?}} i32 @main(i32{{( %0)?}}, ptr{{( %1)?}})
+// CHECK: define{{( hidden| noundef)*}} i32 @main(i32{{( %0)?}}, ptr{{( %1)?}})
diff --git a/tests/codegen/sparc-struct-abi.rs b/tests/codegen/sparc-struct-abi.rs
@@ -18,7 +18,7 @@ pub struct Bool {
     b: bool,
 }
 
-// CHECK: define i64 @structbool()
+// CHECK: define{{.*}} i64 @structbool()
 // CHECK-NEXT: start:
 // CHECK-NEXT: ret i64 72057594037927936
 #[no_mangle]

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,4 @@`
`8`	`8`	`fn main() {`
`9`	`9`	`}`
`10`	`10`
`11`		`-// CHECK: define{{( hidden)?}} i32 @main(i32{{( %0)?}}, ptr{{( %1)?}})`
	`11`	`+// CHECK: define{{( hidden\| noundef)*}} i32 @main(i32{{( %0)?}}, ptr{{( %1)?}})`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ pub struct Bool {`
`18`	`18`	`b: bool,`
`19`	`19`	`}`
`20`	`20`
`21`		`-// CHECK: define i64 @structbool()`
	`21`	`+// CHECK: define{{.*}} i64 @structbool()`
`22`	`22`	`// CHECK-NEXT: start:`
`23`	`23`	`// CHECK-NEXT: ret i64 72057594037927936`
`24`	`24`	`#[no_mangle]`