Rollup merge of rust-lang#137038 - maurer:tolerate-captures, r=nikic

workingjubilee · web-flow · commit 9d659fc2bec2 · 2025-02-14T14:05:28.000-08:00
llvm: Tolerate captures in tests llvm/llvm-project@7e3735d introduces `captures` annotations. Adjust regexes to be tolerant of these. `@rustbot` label:+llvm-main
diff --git a/tests/codegen/common_prim_int_ptr.rs b/tests/codegen/common_prim_int_ptr.rs
@@ -40,7 +40,7 @@ pub unsafe fn extract_int(x: Result<usize, Box<()>>) -> usize {
 }
 
 // CHECK-LABEL: @extract_box
-// CHECK-SAME: (i{{[0-9]+}} {{[^%]+}} [[DISCRIMINANT:%[0-9]+]], ptr {{[^,]+}} [[PAYLOAD:%[0-9]+]])
+// CHECK-SAME: (i{{[0-9]+}} {{[^%]+}} [[DISCRIMINANT:%[0-9]+]], ptr {{[^%]+}} [[PAYLOAD:%[0-9]+]])
 #[no_mangle]
 pub unsafe fn extract_box(x: Result<usize, Box<i32>>) -> Box<i32> {
     // CHECK: ret ptr [[PAYLOAD]]

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ pub unsafe fn extract_int(x: Result<usize, Box<()>>) -> usize {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`// CHECK-LABEL: @extract_box`
`43`		`-// CHECK-SAME: (i{{[0-9]+}} {{[^%]+}} [[DISCRIMINANT:%[0-9]+]], ptr {{[^,]+}} [[PAYLOAD:%[0-9]+]])`
	`43`	`+// CHECK-SAME: (i{{[0-9]+}} {{[^%]+}} [[DISCRIMINANT:%[0-9]+]], ptr {{[^%]+}} [[PAYLOAD:%[0-9]+]])`
`44`	`44`	`#[no_mangle]`
`45`	`45`	`pub unsafe fn extract_box(x: Result<usize, Box<i32>>) -> Box<i32> {`
`46`	`46`	`// CHECK: ret ptr [[PAYLOAD]]`