[tsan] when printing a mutex, also print its address. Properly print the deadlock report.

llvm-svn: 201675

9 files changed, 24 insertions, 22 deletions

diff --git a/compiler-rt/test/tsan/deadlock_detector_stress_test.cc b/compiler-rt/test/tsan/deadlock_detector_stress_test.cc
index f36935ffd00..30ce88d12b8 100644
--- a/compiler-rt/test/tsan/deadlock_detector_stress_test.cc
+++ b/compiler-rt/test/tsan/deadlock_detector_stress_test.cc
@@ -1,5 +1,5 @@
 // RUN: %clangxx_tsan %s -o %t
-// RUN: TSAN_OPTIONS=detect_deadlocks=1 %t 2>&1 | FileCheck %s
+// RUN: TSAN_OPTIONS=detect_deadlocks=1 not %t 2>&1 | FileCheck %s
 #include <pthread.h>
 #undef NDEBUG
 #include <assert.h>
@@ -46,9 +46,11 @@ class LockTest {
     // CHECK: Expecting lock inversion: [[A1:0x[a-f0-9]*]] [[A2:0x[a-f0-9]*]]
     L(0); L(1); U(0); U(1);
     L(1); L(0); U(0); U(1);
-    // CHECK: ThreadSanitizer: lock-order-inversion (potential deadlock)
-    // CHECK-NEXT: path: [[A1]] => [[A2]] => [[A1]]
-    // CHECK-NOT: ThreadSanitizer:
+    // CHECK: WARNING: ThreadSanitizer: lock-order-inversion (potential deadlock)
+    // CHECK: path: [[M1:M[0-9]+]] => [[M2:M[0-9]+]] => [[M1]]
+    // CHECK: Mutex [[M1]] ([[A1]]) created at:
+    // CHECK: Mutex [[M2]] ([[A2]]) created at:
+    // CHECK-NOT: WARNING: ThreadSanitizer:
   }
 
   // Simple lock order inversion with 3 locks.
@@ -57,8 +59,8 @@ class LockTest {
     // CHECK: Starting Test2
     L(0); L(1); L(2); U(2); U(0); U(1);
     L(2); L(0); U(0); U(2);
-    // CHECK: ThreadSanitizer: lock-order-inversion (potential deadlock)
-    // CHECK-NOT: ThreadSanitizer:
+    // CHECK: WARNING: ThreadSanitizer: lock-order-inversion (potential deadlock)
+    // CHECK-NOT: WARNING: ThreadSanitizer:
   }
 
   // Lock order inversion with lots of new locks created (but not used)
@@ -72,8 +74,8 @@ class LockTest {
     CreateAndDestroyManyLocks();
     U(2);
     L(1); L(0); U(0); U(1);
-    // CHECK: ThreadSanitizer: lock-order-inversion (potential deadlock)
-    // CHECK-NOT: ThreadSanitizer:
+    // CHECK: WARNING: ThreadSanitizer: lock-order-inversion (potential deadlock)
+    // CHECK-NOT: WARNING: ThreadSanitizer:
   }
 
   // lock l0=>l1; then create and use lots of locks; then lock l1=>l0.
@@ -86,7 +88,7 @@ class LockTest {
     CreateLockUnlockAndDestroyManyLocks();
     U(2);
     L(1); L(0); U(0); U(1);
-    // CHECK-NOT: ThreadSanitizer:
+    // CHECK-NOT: WARNING: ThreadSanitizer:
   }
 
  private:
diff --git a/compiler-rt/test/tsan/mutex_cycle2.c b/compiler-rt/test/tsan/mutex_cycle2.c
index cd1006d4760..32bb067567f 100644
--- a/compiler-rt/test/tsan/mutex_cycle2.c
+++ b/compiler-rt/test/tsan/mutex_cycle2.c
@@ -1,5 +1,5 @@
 // RUN: %clangxx_tsan %s -o %t
-// RUN: TSAN_OPTIONS=detect_deadlocks=1 %t 2>&1 | FileCheck %s
+// RUN: TSAN_OPTIONS=detect_deadlocks=1 not %t 2>&1 | FileCheck %s
 #include <pthread.h>
 
 int main() {
diff --git a/compiler-rt/test/tsan/mutexset1.cc b/compiler-rt/test/tsan/mutexset1.cc
index ca87a7ba047..acba2f33e02 100644
--- a/compiler-rt/test/tsan/mutexset1.cc
+++ b/compiler-rt/test/tsan/mutexset1.cc
@@ -24,7 +24,7 @@ int main() {
   // CHECK:   Write of size 4 at {{.*}} by thread T1
   // CHECK:                         (mutexes: write [[M1:M[0-9]+]]):
   // CHECK:   Previous write of size 4 at {{.*}} by thread T2:
-  // CHECK:   Mutex [[M1]] created at:
+  // CHECK:   Mutex [[M1]] (0x{{.*}}) created at:
   // CHECK:     #0 pthread_mutex_init
   // CHECK:     #1 main {{.*}}/mutexset1.cc:[[@LINE+1]]
   pthread_mutex_init(&mtx, 0);
diff --git a/compiler-rt/test/tsan/mutexset2.cc b/compiler-rt/test/tsan/mutexset2.cc
index 9ccf952b005..4bc25b736cd 100644
--- a/compiler-rt/test/tsan/mutexset2.cc
+++ b/compiler-rt/test/tsan/mutexset2.cc
@@ -24,7 +24,7 @@ int main() {
   // CHECK:   Write of size 4 at {{.*}} by thread T2:
   // CHECK:   Previous write of size 4 at {{.*}} by thread T1
   // CHECK:                     (mutexes: write [[M1:M[0-9]+]]):
-  // CHECK:   Mutex [[M1]] created at:
+  // CHECK:   Mutex [[M1]] (0x{{.*}}) created at:
   // CHECK:     #0 pthread_mutex_init
   // CHECK:     #1 main {{.*}}/mutexset2.cc:[[@LINE+1]]
   pthread_mutex_init(&mtx, 0);
diff --git a/compiler-rt/test/tsan/mutexset3.cc b/compiler-rt/test/tsan/mutexset3.cc
index 272ddafb3c4..57393bbf43c 100644
--- a/compiler-rt/test/tsan/mutexset3.cc
+++ b/compiler-rt/test/tsan/mutexset3.cc
@@ -27,10 +27,10 @@ int main() {
   // CHECK: Write of size 4 at {{.*}} by thread T1
   // CHECK:               (mutexes: write [[M1:M[0-9]+]], write [[M2:M[0-9]+]]):
   // CHECK:   Previous write of size 4 at {{.*}} by thread T2:
-  // CHECK:   Mutex [[M1]] created at:
+  // CHECK:   Mutex [[M1]] (0x{{.*}}) created at:
   // CHECK:     #0 pthread_mutex_init
   // CHECK:     #1 main {{.*}}/mutexset3.cc:[[@LINE+4]]
-  // CHECK:   Mutex [[M2]] created at:
+  // CHECK:   Mutex [[M2]] (0x{{.*}}) created at:
   // CHECK:     #0 pthread_mutex_init
   // CHECK:     #1 main {{.*}}/mutexset3.cc:[[@LINE+2]]
   pthread_mutex_init(&mtx1, 0);
diff --git a/compiler-rt/test/tsan/mutexset4.cc b/compiler-rt/test/tsan/mutexset4.cc
index be751fa92bf..26c95cac720 100644
--- a/compiler-rt/test/tsan/mutexset4.cc
+++ b/compiler-rt/test/tsan/mutexset4.cc
@@ -27,10 +27,10 @@ int main() {
   // CHECK:   Write of size 4 at {{.*}} by thread T2:
   // CHECK:   Previous write of size 4 at {{.*}} by thread T1
   // CHECK:                 (mutexes: write [[M1:M[0-9]+]], write [[M2:M[0-9]+]]):
-  // CHECK:   Mutex [[M1]] created at:
+  // CHECK:   Mutex [[M1]] (0x{{.*}}) created at:
   // CHECK:     #0 pthread_mutex_init
   // CHECK:     #1 main {{.*}}/mutexset4.cc:[[@LINE+4]]
-  // CHECK:   Mutex [[M2]] created at:
+  // CHECK:   Mutex [[M2]] (0x{{.*}}) created at:
   // CHECK:     #0 pthread_mutex_init
   // CHECK:     #1 main {{.*}}/mutexset4.cc:[[@LINE+2]]
   pthread_mutex_init(&mtx1, 0);
diff --git a/compiler-rt/test/tsan/mutexset5.cc b/compiler-rt/test/tsan/mutexset5.cc
index e013edb4656..45ae8bb5e4f 100644
--- a/compiler-rt/test/tsan/mutexset5.cc
+++ b/compiler-rt/test/tsan/mutexset5.cc
@@ -28,10 +28,10 @@ int main() {
   // CHECK:                              (mutexes: write [[M1:M[0-9]+]]):
   // CHECK:   Previous write of size 4 at {{.*}} by thread T2
   // CHECK:                              (mutexes: write [[M2:M[0-9]+]]):
-  // CHECK:   Mutex [[M1]] created at:
+  // CHECK:   Mutex [[M1]] (0x{{.*}}) created at:
   // CHECK:     #0 pthread_mutex_init
   // CHECK:     #1 main {{.*}}/mutexset5.cc:[[@LINE+4]]
-  // CHECK:   Mutex [[M2]] created at:
+  // CHECK:   Mutex [[M2]] (0x{{.*}}) created at:
   // CHECK:     #0 pthread_mutex_init
   // CHECK:     #1 main {{.*}}/mutexset5.cc:[[@LINE+5]]
   pthread_mutex_init(&mtx1, 0);
diff --git a/compiler-rt/test/tsan/mutexset6.cc b/compiler-rt/test/tsan/mutexset6.cc
index f5e6e66becf..c8392d89931 100644
--- a/compiler-rt/test/tsan/mutexset6.cc
+++ b/compiler-rt/test/tsan/mutexset6.cc
@@ -33,11 +33,11 @@ int main() {
   // CHECK:                          (mutexes: write [[M1:M[0-9]+]]):
   // CHECK:   Previous write of size 4 at {{.*}} by thread T2
   // CHECK:               (mutexes: write [[M2:M[0-9]+]], read [[M3:M[0-9]+]]):
-  // CHECK:   Mutex [[M1]] created at:
+  // CHECK:   Mutex [[M1]] (0x{{.*}}) created at:
   // CHECK:     #1 main {{.*}}/mutexset6.cc:[[@LINE+5]]
-  // CHECK:   Mutex [[M2]] created at:
+  // CHECK:   Mutex [[M2]] (0x{{.*}}) created at:
   // CHECK:     #1 main {{.*}}/mutexset6.cc:[[@LINE+4]]
-  // CHECK:   Mutex [[M3]] created at:
+  // CHECK:   Mutex [[M3]] (0x{{.*}}) created at:
   // CHECK:     #1 main {{.*}}/mutexset6.cc:[[@LINE+3]]
   pthread_mutex_init(&mtx1, 0);
   pthread_spin_init(&mtx2, 0);
diff --git a/compiler-rt/test/tsan/mutexset8.cc b/compiler-rt/test/tsan/mutexset8.cc
index 8822b050e93..afc064c5e09 100644
--- a/compiler-rt/test/tsan/mutexset8.cc
+++ b/compiler-rt/test/tsan/mutexset8.cc
@@ -24,7 +24,7 @@ int main() {
   // CHECK:   Write of size 4 at {{.*}} by thread T1
   // CHECK:                         (mutexes: write [[M1:M[0-9]+]]):
   // CHECK:   Previous write of size 4 at {{.*}} by thread T2:
-  // CHECK:   Mutex [[M1]] created at:
+  // CHECK:   Mutex [[M1]] (0x{{.*}}) created at:
   // CHECK:     #0 pthread_mutex_init
   // CHECK:     #1 main {{.*}}/mutexset8.cc
   mtx = new pthread_mutex_t;