[compiler-rt] r329226 - [asan] Fix aligned_alloc test case

Kostya Kortchinsky via llvm-commits llvm-commits at lists.llvm.org
Wed Apr 4 13:03:16 PDT 2018


Author: cryptoad
Date: Wed Apr  4 13:03:16 2018
New Revision: 329226

URL: http://llvm.org/viewvc/llvm-project?rev=329226&view=rev
Log:
[asan] Fix aligned_alloc test case

Summary:
Under some circumstances (that I haven't dug further into), the first stack
frame for the test looks like:
`#0 0x4e6038 in __interceptor_memalign.localalias.1 ...compiler-rt/lib/asan/asan_malloc_linux.cc:113`
which isn't matched by the current CHECK.

Expand the CHECK to match aligned_alloc or memalign. Hopefully this should fix
the PowerPC issue as well, otherwise we'll bring back the FIXME.

Reviewers: alekseyshl

Reviewed By: alekseyshl

Subscribers: srhines, kubamracek, delcypher, #sanitizers, llvm-commits

Differential Revision: https://reviews.llvm.org/D45281

Modified:
    compiler-rt/trunk/test/asan/TestCases/Linux/aligned_alloc-alignment.cc

Modified: compiler-rt/trunk/test/asan/TestCases/Linux/aligned_alloc-alignment.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Linux/aligned_alloc-alignment.cc?rev=329226&r1=329225&r2=329226&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Linux/aligned_alloc-alignment.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Linux/aligned_alloc-alignment.cc Wed Apr  4 13:03:16 2018
@@ -2,8 +2,7 @@
 // RUN: %env_asan_opts=allocator_may_return_null=0 not %run %t 2>&1 | FileCheck %s
 // RUN: %env_asan_opts=allocator_may_return_null=1 %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-NULL
 
-// FIXME(alekseyshl): #0 frame does not look as expected on ppc64be, fix it.
-// UNSUPPORTED: android,powerpc64
+// UNSUPPORTED: android
 
 // REQUIRES: stable-runtime
 
@@ -15,7 +14,7 @@ extern void *aligned_alloc(size_t alignm
 int main() {
   void *p = aligned_alloc(17, 100);
   // CHECK: ERROR: AddressSanitizer: invalid allocation alignment: 17
-  // CHECK: {{#0 0x.* in .*aligned_alloc}}
+  // CHECK: {{#0 0x.* in .*}}{{aligned_alloc|memalign}}
   // CHECK: {{#1 0x.* in main .*aligned_alloc-alignment.cc:}}[[@LINE-3]]
   // CHECK: SUMMARY: AddressSanitizer: invalid-allocation-alignment
 




More information about the llvm-commits mailing list