[compiler-rt] a3b942e - [tsan] Relax stack trace check

[Vitaly Buka via llvm-commits]

Author: Vitaly Buka
Date: 2020-04-28T14:06:00-07:00
New Revision: a3b942edc8074dce139bac0643b568f840d7a6a0

URL: https://github.com/llvm/llvm-project/commit/a3b942edc8074dce139bac0643b568f840d7a6a0
DIFF: https://github.com/llvm/llvm-project/commit/a3b942edc8074dce139bac0643b568f840d7a6a0.diff

LOG: [tsan] Relax stack trace check

With GCC 8 stack is different.

Added: 
    

Modified: 
    compiler-rt/test/hwasan/TestCases/Linux/aligned_alloc-alignment.cpp
    compiler-rt/test/hwasan/TestCases/Linux/pvalloc-overflow.cpp
    compiler-rt/test/hwasan/TestCases/Posix/posix_memalign-alignment.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/hwasan/TestCases/Linux/aligned_alloc-alignment.cpp b/compiler-rt/test/hwasan/TestCases/Linux/aligned_alloc-alignment.cpp
index 1a1acb2b8833..9a151f4740aa 100644
--- a/compiler-rt/test/hwasan/TestCases/Linux/aligned_alloc-alignment.cpp
+++ b/compiler-rt/test/hwasan/TestCases/Linux/aligned_alloc-alignment.cpp
@@ -17,7 +17,7 @@ int main() {
   void *p = aligned_alloc(17, 100);
   // CHECK: ERROR: HWAddressSanitizer: invalid alignment requested in aligned_alloc: 17
   // CHECK: {{#0 0x.* in .*}}{{aligned_alloc|memalign}}
-  // CHECK: {{#1 0x.* in main .*aligned_alloc-alignment.cpp:}}[[@LINE-3]]
+  // CHECK: {{#[12] 0x.* in main .*aligned_alloc-alignment.cpp:}}[[@LINE-3]]
   // CHECK: SUMMARY: HWAddressSanitizer: invalid-aligned-alloc-alignment
 
   untag_printf("pointer after failed aligned_alloc: %zd\n", (size_t)p);

diff  --git a/compiler-rt/test/hwasan/TestCases/Linux/pvalloc-overflow.cpp b/compiler-rt/test/hwasan/TestCases/Linux/pvalloc-overflow.cpp
index 2a203028aef8..7fbe582601ed 100644
--- a/compiler-rt/test/hwasan/TestCases/Linux/pvalloc-overflow.cpp
+++ b/compiler-rt/test/hwasan/TestCases/Linux/pvalloc-overflow.cpp
@@ -42,7 +42,7 @@ int main(int argc, char *argv[]) {
 
 // CHECK: {{ERROR: HWAddressSanitizer: pvalloc parameters overflow: size .* rounded up to system page size .* cannot be represented in type size_t}}
 // CHECK: {{#0 0x.* in .*pvalloc}}
-// CHECK: {{#1 0x.* in main .*pvalloc-overflow.cpp:}}
+// CHECK: {{#[12] 0x.* in main .*pvalloc-overflow.cpp:}}
 // CHECK: SUMMARY: HWAddressSanitizer: pvalloc-overflow
 
 // CHECK-NULL: errno: 12

diff  --git a/compiler-rt/test/hwasan/TestCases/Posix/posix_memalign-alignment.cpp b/compiler-rt/test/hwasan/TestCases/Posix/posix_memalign-alignment.cpp
index 5224dcb0ab1f..6540dfb3751d 100644
--- a/compiler-rt/test/hwasan/TestCases/Posix/posix_memalign-alignment.cpp
+++ b/compiler-rt/test/hwasan/TestCases/Posix/posix_memalign-alignment.cpp
@@ -14,7 +14,7 @@ int main() {
   int res = posix_memalign(&p, 17, 100);
   // CHECK: ERROR: HWAddressSanitizer: invalid alignment requested in posix_memalign: 17
   // CHECK: {{#0 0x.* in .*posix_memalign}}
-  // CHECK: {{#1 0x.* in main .*posix_memalign-alignment.cpp:}}[[@LINE-3]]
+  // CHECK: {{#[12] 0x.* in main .*posix_memalign-alignment.cpp:}}[[@LINE-3]]
   // CHECK: SUMMARY: HWAddressSanitizer: invalid-posix-memalign-alignment
 
   untag_printf("pointer after failed posix_memalign: %zd\n", (size_t)p);