diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2012-12-21 11:30:14 +0000 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2012-12-21 11:30:14 +0000 |
| commit | 22be55e47e79ee5cb90aadbd2fb8e20594534a2d (patch) | |
| tree | a24075201f343e09454eaa3a559425f73d33af9e /compiler-rt/lib/tsan/rtl/tsan_mutex.cc | |
| parent | 4fbc0d08bfe929f2d968e2120908c98eeb974072 (diff) | |
| download | bcm5719-llvm-22be55e47e79ee5cb90aadbd2fb8e20594534a2d.tar.gz bcm5719-llvm-22be55e47e79ee5cb90aadbd2fb8e20594534a2d.zip | |
tsan: update mutex table for java
llvm-svn: 170884
Diffstat (limited to 'compiler-rt/lib/tsan/rtl/tsan_mutex.cc')
| -rw-r--r-- | compiler-rt/lib/tsan/rtl/tsan_mutex.cc | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/compiler-rt/lib/tsan/rtl/tsan_mutex.cc b/compiler-rt/lib/tsan/rtl/tsan_mutex.cc index a02d3ed640a..335ca2211d1 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_mutex.cc +++ b/compiler-rt/lib/tsan/rtl/tsan_mutex.cc @@ -28,16 +28,18 @@ namespace __tsan { #if TSAN_DEBUG && !TSAN_GO const MutexType MutexTypeLeaf = (MutexType)-1; static MutexType CanLockTab[MutexTypeCount][MutexTypeCount] = { - /*0 MutexTypeInvalid*/ {}, - /*1 MutexTypeTrace*/ {MutexTypeLeaf}, - /*2 MutexTypeThreads*/ {MutexTypeReport}, - /*3 MutexTypeReport*/ {MutexTypeSyncTab, MutexTypeMBlock}, - /*4 MutexTypeSyncVar*/ {}, - /*5 MutexTypeSyncTab*/ {MutexTypeSyncVar}, - /*6 MutexTypeSlab*/ {MutexTypeLeaf}, - /*7 MutexTypeAnnotations*/ {}, - /*8 MutexTypeAtExit*/ {MutexTypeSyncTab}, - /*9 MutexTypeMBlock*/ {MutexTypeSyncVar}, + /*0 MutexTypeInvalid*/ {}, + /*1 MutexTypeTrace*/ {MutexTypeLeaf}, + /*2 MutexTypeThreads*/ {MutexTypeReport}, + /*3 MutexTypeReport*/ {MutexTypeSyncTab, MutexTypeMBlock, + MutexTypeJavaMBlock}, + /*4 MutexTypeSyncVar*/ {}, + /*5 MutexTypeSyncTab*/ {MutexTypeSyncVar}, + /*6 MutexTypeSlab*/ {MutexTypeLeaf}, + /*7 MutexTypeAnnotations*/ {}, + /*8 MutexTypeAtExit*/ {MutexTypeSyncTab}, + /*9 MutexTypeMBlock*/ {MutexTypeSyncVar}, + /*10 MutexTypeJavaMBlock*/ {MutexTypeSyncVar}, }; static bool CanLockAdj[MutexTypeCount][MutexTypeCount]; |
