[tsan] simplify tsan-vs-gvn test since gvn vs tsan is now fixed; fix lint

llvm-svn: 175037

diff --git a/compiler-rt/lib/asan/asan_interface_internal.h b/compiler-rt/lib/asan/asan_interface_internal.h
index 30f8d01..48220e7 100644 (file)
--- a/compiler-rt/lib/asan/asan_interface_internal.h
+++ b/compiler-rt/lib/asan/asan_interface_internal.h
@@ -23,7 +23,7 @@ extern "C" {
   // This function should be called at the very beginning of the process,
   // before any instrumented code is executed and before any call to malloc.
   // Everytime the asan ABI changes we also change the version number in this
-  // name. Objects build with incompatible asan ABI version 
+  // name. Objects build with incompatible asan ABI version
   // will not link with run-time.
   void __asan_init_v1() SANITIZER_INTERFACE_ATTRIBUTE;
   #define __asan_init __asan_init_v1

diff --git a/compiler-rt/lib/tsan/lit_tests/tsan-vs-gvn.cc b/compiler-rt/lib/tsan/lit_tests/tsan-vs-gvn.cc
index edaaef6..40ae724 100644 (file)
--- a/compiler-rt/lib/tsan/lit_tests/tsan-vs-gvn.cc
+++ b/compiler-rt/lib/tsan/lit_tests/tsan-vs-gvn.cc
@@ -1,5 +1,6 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK_O1
-// ---RUN: %clangxx_tsan -O2 %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK_O2
+// RUN: %clangxx_tsan -O1 %s -o %t && %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O2 %s -o %t && %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O3 %s -o %t && %t 2>&1 | FileCheck %s
 //
 // Check that load widening is not tsan-hostile.
 #include <pthread.h>
@@ -33,8 +34,5 @@ int main() {
   printf("PASS\n");
 }
 
-// FIXME: currently, this test fails at -O2 (reports false positive).
-// CHECK_O2: WARNING: ThreadSanitizer: data race
-
-// CHECK_O1: PASS
-// CHECK_O1-NOT: WARNING: ThreadSanitizer: data race
+// CHECK-NOT: WARNING: ThreadSanitizer: data race
+// CHECK: PASS