[compiler-rt] r331491 - Revert "Follow-up to r331378. Update tests to allow to use C atomics in C++."

[Volodymyr Sapsai via llvm-commits]

Author: vsapsai
Date: Thu May  3 16:06:37 2018
New Revision: 331491

URL: http://llvm.org/viewvc/llvm-project?rev=331491&view=rev
Log:
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>.

Modified:
    compiler-rt/trunk/test/tsan/Darwin/gcd-groups-destructor.mm
    compiler-rt/trunk/test/tsan/Darwin/libcxx-shared-ptr-stress.mm
    compiler-rt/trunk/test/tsan/Darwin/xpc-race.mm

Modified: compiler-rt/trunk/test/tsan/Darwin/gcd-groups-destructor.mm
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/Darwin/gcd-groups-destructor.mm?rev=331491&r1=331490&r2=331491&view=diff
==============================================================================
--- compiler-rt/trunk/test/tsan/Darwin/gcd-groups-destructor.mm (original)
+++ compiler-rt/trunk/test/tsan/Darwin/gcd-groups-destructor.mm Thu May  3 16:06:37 2018
@@ -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>

Modified: compiler-rt/trunk/test/tsan/Darwin/libcxx-shared-ptr-stress.mm
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/Darwin/libcxx-shared-ptr-stress.mm?rev=331491&r1=331490&r2=331491&view=diff
==============================================================================
--- compiler-rt/trunk/test/tsan/Darwin/libcxx-shared-ptr-stress.mm (original)
+++ compiler-rt/trunk/test/tsan/Darwin/libcxx-shared-ptr-stress.mm Thu May  3 16:06:37 2018
@@ -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>

Modified: compiler-rt/trunk/test/tsan/Darwin/xpc-race.mm
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/Darwin/xpc-race.mm?rev=331491&r1=331490&r2=331491&view=diff
==============================================================================
--- compiler-rt/trunk/test/tsan/Darwin/xpc-race.mm (original)
+++ compiler-rt/trunk/test/tsan/Darwin/xpc-race.mm Thu May  3 16:06:37 2018
@@ -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