tsan: fix internal deadlock detector for external deadlock detector

we must go deeper!

llvm-svn: 202365

compiler-rt/lib/tsan/rtl/tsan_mutex.cc

@@ -33,13 +33,14 @@ static MutexType CanLockTab[MutexTypeCount][MutexTypeCount] = {
   /*2  MutexTypeThreads*/     {MutexTypeReport},
   /*3  MutexTypeReport*/      {MutexTypeSyncTab, MutexTypeSyncVar,
                                MutexTypeMBlock, MutexTypeJavaMBlock},
-  /*4  MutexTypeSyncVar*/     {},
+  /*4  MutexTypeSyncVar*/     {MutexTypeDDetector},
   /*5  MutexTypeSyncTab*/     {MutexTypeSyncVar},
   /*6  MutexTypeSlab*/        {MutexTypeLeaf},
   /*7  MutexTypeAnnotations*/ {},
   /*8  MutexTypeAtExit*/      {MutexTypeSyncTab},
   /*9  MutexTypeMBlock*/      {MutexTypeSyncVar},
   /*10 MutexTypeJavaMBlock*/  {MutexTypeSyncVar},
+  /*11 MutexTypeDDetector*/   {},
 };
 
 static bool CanLockAdj[MutexTypeCount][MutexTypeCount];

compiler-rt/lib/tsan/rtl/tsan_mutex.h

@@ -31,7 +31,7 @@ enum MutexType {
   MutexTypeAtExit,
   MutexTypeMBlock,
   MutexTypeJavaMBlock,
-  MutexTypeDeadlockDetector,
+  MutexTypeDDetector,
 
   // This must be the last.
   MutexTypeCount

compiler-rt/lib/tsan/rtl/tsan_rtl.cc

@@ -83,7 +83,7 @@ Context::Context()
   , racy_stacks(MBlockRacyStacks)
   , racy_addresses(MBlockRacyAddresses)
   , fired_suppressions(8)
-  , dd_mtx(MutexTypeDeadlockDetector, StatMtxDeadlockDetector) {
+  , dd_mtx(MutexTypeDDetector, StatMtxDeadlockDetector) {
   dd.clear();
 }