Skip to content

Revert "Speculative fix for asan/TestCases/Darwin/cstring_section.c" #105600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conversation

vitalybuka
Copy link
Collaborator

This fix is not enough, and the breaking patch was reverted with 2704b80.

This reverts commit bf71c64.

Created using spr 1.3.4
@llvmbot
Copy link
Member

llvmbot commented Aug 22, 2024

@llvm/pr-subscribers-compiler-rt-sanitizer

Author: Vitaly Buka (vitalybuka)

Changes

This fix is not enough, and the breaking patch was reverted with 2704b80.

This reverts commit bf71c64.


Full diff: https://github.com/llvm/llvm-project/pull/105600.diff

1 Files Affected:

  • (modified) compiler-rt/test/asan/TestCases/Darwin/cstring_section.c (+2-2)
diff --git a/compiler-rt/test/asan/TestCases/Darwin/cstring_section.c b/compiler-rt/test/asan/TestCases/Darwin/cstring_section.c
index e40c4b1b8ed6ba..d72b0ba8a8bb33 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/cstring_section.c
+++ b/compiler-rt/test/asan/TestCases/Darwin/cstring_section.c
@@ -6,10 +6,10 @@
 // Check that "Hello.\n" is in __asan_cstring and not in __cstring.
 // CHECK: Contents of section {{.*}}__asan_cstring:
 // CHECK: 48656c6c {{.*}} Hello.
-// CHECK: Contents of section {{.*}}__cstring:
-// CHECK-NOT: 48656c6c {{.*}} Hello.
 // CHECK: Contents of section {{.*}}__const:
 // CHECK-NOT: 48656c6c {{.*}} Hello.
+// CHECK: Contents of section {{.*}}__cstring:
+// CHECK-NOT: 48656c6c {{.*}} Hello.
 
 int main(int argc, char *argv[]) {
   argv[0] = "Hello.\n";

@vitalybuka
Copy link
Collaborator Author

vitalybuka commented Aug 22, 2024

Landed with e2b97f3

@vitalybuka vitalybuka closed this Aug 22, 2024
@nunoplopes nunoplopes deleted the users/vitalybuka/spr/revert-speculative-fix-for-asantestcasesdarwincstring_sectionc branch December 28, 2024 09:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants