summaryrefslogtreecommitdiff
path: root/test/asan/TestCases
diff options
context:
space:
mode:
authorKuba Mracek <mracek@apple.com>2018-03-08 17:31:31 +0000
committerKuba Mracek <mracek@apple.com>2018-03-08 17:31:31 +0000
commitbc85606fd81617dd6dc21200c73d00ccb58b6566 (patch)
treec1950bfb64723bd9c258c3039af4d196f500fed6 /test/asan/TestCases
parente9572d640f9be27f781c4e2ceb4d8773fc470e70 (diff)
Revert r327031
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@327032 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/asan/TestCases')
-rw-r--r--test/asan/TestCases/Darwin/odr-lto.cc12
-rw-r--r--test/asan/TestCases/lto-constmerge-odr.cc14
2 files changed, 9 insertions, 17 deletions
diff --git a/test/asan/TestCases/Darwin/odr-lto.cc b/test/asan/TestCases/Darwin/odr-lto.cc
index 56dd89b16..40abec582 100644
--- a/test/asan/TestCases/Darwin/odr-lto.cc
+++ b/test/asan/TestCases/Darwin/odr-lto.cc
@@ -3,10 +3,15 @@
// REQUIRES: lto
+// RUN: %clangxx_asan -DPART=0 -c %s -o %t-1.o -flto
+// RUN: %clangxx_asan -DPART=1 -c %s -o %t-2.o -flto
+// RUN: %clangxx_asan %t-1.o %t-2.o -o %t -flto
+// RUN: not %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-ODR
+
// RUN: %clangxx_asan -DPART=0 -c %s -o %t-1.o -flto -mllvm -asan-use-private-alias
// RUN: %clangxx_asan -DPART=1 -c %s -o %t-2.o -flto -mllvm -asan-use-private-alias
// RUN: %clangxx_asan %t-1.o %t-2.o -o %t -flto
-// RUN: %env_asan_opts=use_odr_indicator=1 %run %t 2>&1 | FileCheck %s
+// RUN: %env_asan_opts=use_odr_indicator=1 %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ODR
#include <stdio.h>
#include <stdlib.h>
@@ -35,5 +40,6 @@ void putstest()
#endif // PART == 1
-// CHECK-NOT: ERROR: AddressSanitizer: odr-violation
-// CHECK: Done.
+// CHECK-ODR: ERROR: AddressSanitizer: odr-violation
+// CHECK-NO-ODR-NOT: ERROR: AddressSanitizer: odr-violation
+// CHECK-NO-ODR: Done.
diff --git a/test/asan/TestCases/lto-constmerge-odr.cc b/test/asan/TestCases/lto-constmerge-odr.cc
index 11f4ad0c1..e69de29bb 100644
--- a/test/asan/TestCases/lto-constmerge-odr.cc
+++ b/test/asan/TestCases/lto-constmerge-odr.cc
@@ -1,14 +0,0 @@
-// RUN: %clangxx_asan -O3 -flto %s -o %t
-// RUN: %run %t 2>&1
-
-// REQUIRES: lto
-
-int main(int argc, const char * argv[]) {
- struct { long width, height; } a = {16, 16};
- struct { long width, height; } b = {16, 16};
-
- // Just to make sure 'a' and 'b' don't get optimized out.
- asm volatile ("" : : "r" (&a), "r" (&b) );
-
- return 0;
-}