commit f94404ead1f2e4a1b5a2ff8bbdb65c5e4d4a77ea
author Shih-wei Liao <sliao@google.com> Wed Jun 27 11:49:13 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 27 11:49:13 2012 -0700
tree ab88c6506b3ef4ed829a6be58237c2b32f8be14d
parent 6613de3585d726a246b5ee2597ddaef8b3c3a621
parent 6d657bfcd28980a12f7971a87e603174af248700

Merge "Ignore the redundant InferredRegCategoryMap." into ics-mr1-plus-art

src/verifier/method_verifier.cc

diff --git a/src/verifier/method_verifier.cc b/src/verifier/method_verifier.cc
index ccc83da..178c2a9 100644
--- a/src/verifier/method_verifier.cc
+++ b/src/verifier/method_verifier.cc
@@ -3436,12 +3436,13 @@
   MutexLock mu(*inferred_reg_category_maps_lock_);
   const InferredRegCategoryMap* existing_inferred_reg_category_map = GetInferredRegCategoryMap(ref);
 
-  if (existing_inferred_reg_category_map != NULL) {
+  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 existing_inferred_reg_category_map;
+    delete &inferred_reg_category_map;
   }
 
-  inferred_reg_category_maps_->Put(ref, &inferred_reg_category_map);
   CHECK(GetInferredRegCategoryMap(ref) != NULL);
 }