commit cd05a6274782c50a2b990c18b5f8d5ae5e44d509
author Shih-wei Liao <sliao@google.com> Wed Aug 15 00:02:05 2012 -0700
committer TDYa127 <tdy@google.com> Wed Aug 15 04:01:15 2012 -0700
tree 1a202f979454f8b6a1e4294776d52d20c526efc0
parent ef0a2ca1f719f64af59db08861edb73739bf5220

Global lock levels for the LLVM side.

Change-Id: Id2807c8775686bc38f79e13c097fadda2d96d042

src/verifier/method_verifier.cc

diff --git a/src/verifier/method_verifier.cc b/src/verifier/method_verifier.cc
index 167e1e5..c6c61b9 100644
--- a/src/verifier/method_verifier.cc
+++ b/src/verifier/method_verifier.cc
@@ -3474,16 +3474,16 @@
 
 void MethodVerifier::SetInferredRegCategoryMap(Compiler::MethodReference ref,
                                           const InferredRegCategoryMap& inferred_reg_category_map) {
-  MutexLock mu(*inferred_reg_category_maps_lock_);
-  const InferredRegCategoryMap* existing_inferred_reg_category_map = GetInferredRegCategoryMap(ref);
-
-  if (existing_inferred_reg_category_map == NULL) {
-    inferred_reg_category_maps_->Put(ref, &inferred_reg_category_map);
-  } else {
-    CHECK(*existing_inferred_reg_category_map == inferred_reg_category_map);
-    delete &inferred_reg_category_map;
+  {
+    MutexLock mu(*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);
+    } else {
+      CHECK(*(it->second) == inferred_reg_category_map);
+      delete &inferred_reg_category_map;
+    }
   }
-
   CHECK(GetInferredRegCategoryMap(ref) != NULL);
 }