commit f169e27100acbec024f699de9ef842a27c0b2036
author Mathieu Chartier <mathieuc@google.com> Tue Mar 28 12:59:38 2017 -0700
committer Mathieu Chartier <mathieuc@google.com> Tue Mar 28 13:40:41 2017 -0700
tree 2d82abce1f923863f023cb8ee12409ad82809dad
parent ae60e48f1077a2221549c733623c25f79733caf0

Fix lock order for jvmti kTaggingLockLevel

Add test for duplicate env free order.

Bug: 36648696

Test: ./test.py --host

Change-Id: I76fc8187b29f5e66cc29674320e887dbc508fe19

runtime/openjdkjvmti/jvmti_weak_table.h

diff --git a/runtime/openjdkjvmti/jvmti_weak_table.h b/runtime/openjdkjvmti/jvmti_weak_table.h
index ae36122..eeea75a 100644
--- a/runtime/openjdkjvmti/jvmti_weak_table.h
+++ b/runtime/openjdkjvmti/jvmti_weak_table.h
@@ -53,7 +53,7 @@
 class JvmtiWeakTable : public art::gc::SystemWeakHolder {
  public:
   JvmtiWeakTable()
-      : art::gc::SystemWeakHolder(kTaggingLockLevel),
+      : art::gc::SystemWeakHolder(art::kTaggingLockLevel),
         update_since_last_sweep_(false) {
   }
 
@@ -200,10 +200,6 @@
     }
   };
 
-  // The tag table is used when visiting roots. So it needs to have a low lock level.
-  static constexpr art::LockLevel kTaggingLockLevel =
-      static_cast<art::LockLevel>(art::LockLevel::kAbortLock + 1);
-
   std::unordered_map<art::GcRoot<art::mirror::Object>,
                      T,
                      HashGcRoot,