Imported Upstream version 1.6.0+dfsg1

[rustc.git] / src / compiler-rt / test / tsan / java_race.cc

diff --git a/src/compiler-rt/test/tsan/java_race.cc b/src/compiler-rt/test/tsan/java_race.cc
index 70ad8c438fb8ccbc52b5f3b3b4d5216a43c4b62a..140a2a3c19d3b34689bd2b1f1dee989b0d9fcb6b 100644 (file)
--- a/src/compiler-rt/test/tsan/java_race.cc
+++ b/src/compiler-rt/test/tsan/java_race.cc
@@ -1,23 +1,28 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && not %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %deflake %run %t | FileCheck %s
 #include "java.h"
 
 void *Thread(void *p) {
+  barrier_wait(&barrier);
   *(int*)p = 42;
   return 0;
 }
 
 int main() {
+  barrier_init(&barrier, 2);
   int const kHeapSize = 1024 * 1024;
-  void *jheap = malloc(kHeapSize);
-  __tsan_java_init((jptr)jheap, kHeapSize);
+  jptr jheap = (jptr)malloc(kHeapSize + 8) + 8;
+  __tsan_java_init(jheap, kHeapSize);
   const int kBlockSize = 16;
-  __tsan_java_alloc((jptr)jheap, kBlockSize);
+  __tsan_java_alloc(jheap, kBlockSize);
   pthread_t th;
-  pthread_create(&th, 0, Thread, jheap);
+  pthread_create(&th, 0, Thread, (void*)jheap);
   *(int*)jheap = 43;
+  barrier_wait(&barrier);
   pthread_join(th, 0);
-  __tsan_java_free((jptr)jheap, kBlockSize);
+  __tsan_java_free(jheap, kBlockSize);
+  fprintf(stderr, "DONE\n");
   return __tsan_java_fini();
 }
 
 // CHECK: WARNING: ThreadSanitizer: data race
+// CHECK: DONE