diff options
| author | Volodymyr Sapsai <vsapsai@apple.com> | 2018-05-03 23:06:37 +0000 |
|---|---|---|
| committer | Volodymyr Sapsai <vsapsai@apple.com> | 2018-05-03 23:06:37 +0000 |
| commit | 3835320617d7c37e8ac545b0b7828db2a57d46a4 (patch) | |
| tree | 4188c8c9764b6f945119558aed587472b2f06e23 | |
| parent | b03c98d1a34ee582680a6b475d7eca52c19ccc99 (diff) | |
| download | bcm5719-llvm-3835320617d7c37e8ac545b0b7828db2a57d46a4.tar.gz bcm5719-llvm-3835320617d7c37e8ac545b0b7828db2a57d46a4.zip | |
Revert "Follow-up to r331378. Update tests to allow to use C atomics in C++."
It reverts commit r331484 because it caused test failures
ThreadSanitizer-x86_64 :: Darwin/gcd-groups-destructor.mm
ThreadSanitizer-x86_64 :: Darwin/libcxx-shared-ptr-stress.mm
ThreadSanitizer-x86_64 :: Darwin/xpc-race.mm
Foundation.h transitively includes <atomic>, so we have a case of benign mixing
<stdatomic.h> and <atomic>.
llvm-svn: 331491
| -rw-r--r-- | compiler-rt/test/tsan/Darwin/gcd-groups-destructor.mm | 2 | ||||
| -rw-r--r-- | compiler-rt/test/tsan/Darwin/libcxx-shared-ptr-stress.mm | 2 | ||||
| -rw-r--r-- | compiler-rt/test/tsan/Darwin/xpc-race.mm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/compiler-rt/test/tsan/Darwin/gcd-groups-destructor.mm b/compiler-rt/test/tsan/Darwin/gcd-groups-destructor.mm index 60b8f3a0a48..05c65c04b66 100644 --- a/compiler-rt/test/tsan/Darwin/gcd-groups-destructor.mm +++ b/compiler-rt/test/tsan/Darwin/gcd-groups-destructor.mm @@ -1,4 +1,4 @@ -// RUN: %clangxx_tsan %s -o %t -framework Foundation -D__ALLOW_STDC_ATOMICS_IN_CXX__ +// RUN: %clangxx_tsan %s -o %t -framework Foundation // RUN: %run %t 2>&1 | FileCheck %s #import <Foundation/Foundation.h> diff --git a/compiler-rt/test/tsan/Darwin/libcxx-shared-ptr-stress.mm b/compiler-rt/test/tsan/Darwin/libcxx-shared-ptr-stress.mm index 9e4c142e83e..e5cd7edc6bb 100644 --- a/compiler-rt/test/tsan/Darwin/libcxx-shared-ptr-stress.mm +++ b/compiler-rt/test/tsan/Darwin/libcxx-shared-ptr-stress.mm @@ -1,4 +1,4 @@ -// RUN: %clangxx_tsan %s -o %t -framework Foundation -D__ALLOW_STDC_ATOMICS_IN_CXX__ +// RUN: %clangxx_tsan %s -o %t -framework Foundation // RUN: %run %t 2>&1 | FileCheck %s #import <Foundation/Foundation.h> diff --git a/compiler-rt/test/tsan/Darwin/xpc-race.mm b/compiler-rt/test/tsan/Darwin/xpc-race.mm index 77d39ac92ea..872c9ee73e1 100644 --- a/compiler-rt/test/tsan/Darwin/xpc-race.mm +++ b/compiler-rt/test/tsan/Darwin/xpc-race.mm @@ -1,4 +1,4 @@ -// RUN: %clangxx_tsan %s -o %t -framework Foundation -D__ALLOW_STDC_ATOMICS_IN_CXX__ +// RUN: %clangxx_tsan %s -o %t -framework Foundation // RUN: %deflake %run %t 2>&1 | FileCheck %s // UNSUPPORTED: ios |
