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

Vitaly Buka via llvm-commits llvm-commits at lists.llvm.org
Tue Apr 28 23:57:14 PDT 2020


Author: Vitaly Buka
Date: 2020-04-28T23:57:03-07:00
New Revision: d1fafa40b8db022e8601c076aa2485a45365187e

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

LOG: [tsan] Relax stack trace check

With GCC 8 stack is different.

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/aligned_alloc-alignment.cpp b/compiler-rt/test/sanitizer_common/TestCases/Linux/aligned_alloc-alignment.cpp
index 7b119e6a706b..ef7f1cb44e60 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/aligned_alloc-alignment.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/aligned_alloc-alignment.cpp
@@ -31,7 +31,7 @@ int main(int argc, char **argv) {
   // CHECK: {{ERROR: .*Sanitizer: invalid alignment requested in aligned_alloc}}
   // Handle a case when aligned_alloc is aliased by memalign.
   // CHECK: {{#0 .*}}{{aligned_alloc|memalign}}
-  // CHECK: {{#1 .*main .*aligned_alloc-alignment.cpp:}}[[@LINE-4]]
+  // CHECK: {{#[12] .*main .*aligned_alloc-alignment.cpp:}}[[@LINE-4]]
   // CHECK: {{SUMMARY: .*Sanitizer: invalid-aligned-alloc-alignment}}
 
   // The NULL pointer is printed 
diff erently on 
diff erent systems, while (long)0

diff  --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/pvalloc-overflow.cpp b/compiler-rt/test/sanitizer_common/TestCases/Linux/pvalloc-overflow.cpp
index c64624389e67..f0e556e9b24c 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/pvalloc-overflow.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/pvalloc-overflow.cpp
@@ -35,7 +35,7 @@ int main(int argc, char *argv[]) {
   }
   // CHECK: {{ERROR: .*Sanitizer: pvalloc parameters overflow: size .* rounded up to system page size .* cannot be represented in type size_t}}
   // CHECK: {{#0 .*pvalloc}}
-  // CHECK: {{#1 .*main .*pvalloc-overflow.cpp:}}
+  // CHECK: {{#[12] .*main .*pvalloc-overflow.cpp:}}
   // CHECK: {{SUMMARY: .*Sanitizer: pvalloc-overflow}}
 
   // The NULL pointer is printed 
diff erently on 
diff erent systems, while (long)0

diff  --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/posix_memalign-alignment.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/posix_memalign-alignment.cpp
index 0b8e366d2473..70fba25f59b8 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/posix_memalign-alignment.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/posix_memalign-alignment.cpp
@@ -35,7 +35,7 @@ int main(int argc, char **argv) {
   int res = posix_memalign(&p, alignment, 100);
   // CHECK: {{ERROR: .*Sanitizer: invalid alignment requested in posix_memalign}}
   // CHECK: {{#0 .*posix_memalign}}
-  // CHECK: {{#1 .*main .*posix_memalign-alignment.cpp:}}[[@LINE-3]]
+  // CHECK: {{#[12] .*main .*posix_memalign-alignment.cpp:}}[[@LINE-3]]
   // CHECK: {{SUMMARY: .*Sanitizer: invalid-posix-memalign-alignment}}
 
   // The NULL pointer is printed 
diff erently on 
diff erent systems, while (long)0


        


More information about the llvm-commits mailing list