Skip to content

Commit

Permalink
Rollup merge of rust-lang#137038 - maurer:tolerate-captures, r=nikic
Browse files Browse the repository at this point in the history
llvm: Tolerate captures in tests

llvm/llvm-project@7e3735d introduces `captures` annotations. Adjust regexes to be tolerant of these.

`@rustbot` label:+llvm-main
  • Loading branch information
workingjubilee authored Feb 14, 2025
2 parents db5238a + db4c09c commit 9d659fc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tests/codegen/common_prim_int_ptr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
Expand Down

0 comments on commit 9d659fc

Please sign in to comment.