Skip to content

Commit dd13b64

Browse files
committed
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>. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@331491 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 4abc204 commit dd13b64

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

test/tsan/Darwin/gcd-groups-destructor.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx_tsan %s -o %t -framework Foundation -D__ALLOW_STDC_ATOMICS_IN_CXX__
1+
// RUN: %clangxx_tsan %s -o %t -framework Foundation
22
// RUN: %run %t 2>&1 | FileCheck %s
33

44
#import <Foundation/Foundation.h>

test/tsan/Darwin/libcxx-shared-ptr-stress.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx_tsan %s -o %t -framework Foundation -D__ALLOW_STDC_ATOMICS_IN_CXX__
1+
// RUN: %clangxx_tsan %s -o %t -framework Foundation
22
// RUN: %run %t 2>&1 | FileCheck %s
33

44
#import <Foundation/Foundation.h>

test/tsan/Darwin/xpc-race.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx_tsan %s -o %t -framework Foundation -D__ALLOW_STDC_ATOMICS_IN_CXX__
1+
// RUN: %clangxx_tsan %s -o %t -framework Foundation
22
// RUN: %deflake %run %t 2>&1 | FileCheck %s
33

44
// UNSUPPORTED: ios

0 commit comments

Comments
 (0)