commit 50b35e2fd1a68cd1240e4a9d9f363e11764957d1
author Ian Rogers <irogers@google.com> Thu Oct 04 10:09:15 2012 -0700
committer Ian Rogers <irogers@google.com> Fri Oct 05 11:07:39 2012 -0700
tree 4f3c58b7b293380f19e4f33357cb352e3330772e
parent 8e9a1497f0d7da4d55f6e7ed8a7d96ba6db7222d

Explicitly pass Thread::Current to MutexLock and Alloc.

Change-Id: I8b75bc0617915465f102815b32306aa7760dcae4

src/verifier/method_verifier.cc

diff --git a/src/verifier/method_verifier.cc b/src/verifier/method_verifier.cc
index dd9aa8b..ad238b8 100644
--- a/src/verifier/method_verifier.cc
+++ b/src/verifier/method_verifier.cc
@@ -3229,7 +3229,7 @@
 
 void MethodVerifier::SetDexGcMap(Compiler::MethodReference ref, const std::vector<uint8_t>& gc_map) {
   {
-    MutexLock mu(*dex_gc_maps_lock_);
+    MutexLock mu(Thread::Current(), *dex_gc_maps_lock_);
     DexGcMapTable::iterator it = dex_gc_maps_->find(ref);
     if (it != dex_gc_maps_->end()) {
       delete it->second;
@@ -3241,7 +3241,7 @@
 }
 
 const std::vector<uint8_t>* MethodVerifier::GetDexGcMap(Compiler::MethodReference ref) {
-  MutexLock mu(*dex_gc_maps_lock_);
+  MutexLock mu(Thread::Current(), *dex_gc_maps_lock_);
   DexGcMapTable::const_iterator it = dex_gc_maps_->find(ref);
   if (it == dex_gc_maps_->end()) {
     return NULL;
@@ -3263,29 +3263,31 @@
 
 void MethodVerifier::Init() {
   dex_gc_maps_lock_ = new Mutex("verifier GC maps lock");
+  Thread* self = Thread::Current();
   {
-    MutexLock mu(*dex_gc_maps_lock_);
+    MutexLock mu(self, *dex_gc_maps_lock_);
     dex_gc_maps_ = new MethodVerifier::DexGcMapTable;
   }
 
   rejected_classes_lock_ = new Mutex("verifier rejected classes lock");
   {
-    MutexLock mu(*rejected_classes_lock_);
+    MutexLock mu(self, *rejected_classes_lock_);
     rejected_classes_ = new MethodVerifier::RejectedClassesTable;
   }
 
 #if defined(ART_USE_LLVM_COMPILER) || defined(ART_USE_GREENLAND_COMPILER)
   inferred_reg_category_maps_lock_ = new Mutex("verifier GC maps lock");
   {
-    MutexLock mu(*inferred_reg_category_maps_lock_);
+    MutexLock mu(self, *inferred_reg_category_maps_lock_);
     inferred_reg_category_maps_ = new MethodVerifier::InferredRegCategoryMapTable;
   }
 #endif
 }
 
 void MethodVerifier::Shutdown() {
+  Thread* self = Thread::Current();
   {
-    MutexLock mu(*dex_gc_maps_lock_);
+    MutexLock mu(self, *dex_gc_maps_lock_);
     STLDeleteValues(dex_gc_maps_);
     delete dex_gc_maps_;
     dex_gc_maps_ = NULL;
@@ -3294,7 +3296,7 @@
   dex_gc_maps_lock_ = NULL;
 
   {
-    MutexLock mu(*rejected_classes_lock_);
+    MutexLock mu(self, *rejected_classes_lock_);
     delete rejected_classes_;
     rejected_classes_ = NULL;
   }
@@ -3303,7 +3305,7 @@
 
 #if defined(ART_USE_LLVM_COMPILER) || defined(ART_USE_GREENLAND_COMPILER)
   {
-    MutexLock mu(*inferred_reg_category_maps_lock_);
+    MutexLock mu(self, *inferred_reg_category_maps_lock_);
     STLDeleteValues(inferred_reg_category_maps_);
     delete inferred_reg_category_maps_;
     inferred_reg_category_maps_ = NULL;
@@ -3315,14 +3317,14 @@
 
 void MethodVerifier::AddRejectedClass(Compiler::ClassReference ref) {
   {
-    MutexLock mu(*rejected_classes_lock_);
+    MutexLock mu(Thread::Current(), *rejected_classes_lock_);
     rejected_classes_->insert(ref);
   }
   CHECK(IsClassRejected(ref));
 }
 
 bool MethodVerifier::IsClassRejected(Compiler::ClassReference ref) {
-  MutexLock mu(*rejected_classes_lock_);
+  MutexLock mu(Thread::Current(), *rejected_classes_lock_);
   return (rejected_classes_->find(ref) != rejected_classes_->end());
 }
 
@@ -3374,7 +3376,7 @@
 void MethodVerifier::SetInferredRegCategoryMap(Compiler::MethodReference ref,
                                           const InferredRegCategoryMap& inferred_reg_category_map) {
   {
-    MutexLock mu(*inferred_reg_category_maps_lock_);
+    MutexLock mu(Thread::Current(), *inferred_reg_category_maps_lock_);
     InferredRegCategoryMapTable::iterator it = inferred_reg_category_maps_->find(ref);
     if (it == inferred_reg_category_maps_->end()) {
       inferred_reg_category_maps_->Put(ref, &inferred_reg_category_map);
@@ -3388,7 +3390,7 @@
 
 const greenland::InferredRegCategoryMap*
 MethodVerifier::GetInferredRegCategoryMap(Compiler::MethodReference ref) {
-  MutexLock mu(*inferred_reg_category_maps_lock_);
+  MutexLock mu(Thread::Current(), *inferred_reg_category_maps_lock_);
 
   InferredRegCategoryMapTable::const_iterator it =
       inferred_reg_category_maps_->find(ref);