Skip to content

Commit 3655784

Browse files
committedOct 11, 2022
Auto merge of #102724 - pcc:scs-fix-test, r=Mark-Simulacrum
Fix the sanitizer_scs_attr_check.rs test The test is failing when targeting aarch64 Android. The intent appears to have been to look for a function attributes comment (or the absence of one) on the line preceding the function declaration. But this isn't quite possible with FileCheck and the test as written was looking for a line with `no_scs` after a line with `scs`, which doesn't appear in the output. Instead, match on the function attributes comment on the line following the demangled function name comment.
2 parents 518263d + 5f3a424 commit 3655784

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed
 

‎src/test/codegen/sanitizer_scs_attr_check.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
#![crate_type = "lib"]
88
#![feature(no_sanitize)]
99

10-
// CHECK: ; Function Attrs:{{.*}}shadowcallstack
11-
// CHECK-NEXT: scs
10+
// CHECK: ; sanitizer_scs_attr_check::scs
11+
// CHECK-NEXT: ; Function Attrs:{{.*}}shadowcallstack
1212
pub fn scs() {}
1313

14+
// CHECK: ; sanitizer_scs_attr_check::no_scs
1415
// CHECK-NOT: ; Function Attrs:{{.*}}shadowcallstack
15-
// CHECK-NEXT: no_scs
1616
#[no_sanitize(shadow_call_stack)]
1717
pub fn no_scs() {}

0 commit comments

Comments
 (0)