commit 5647d189c3ea5324e569d96cef67c87879d6cd05
author Mathieu Chartier <mathieuc@google.com> Fri Mar 07 15:00:39 2014 -0800
committer Mathieu Chartier <mathieuc@google.com> Fri Mar 07 15:28:43 2014 -0800
tree bdf872592ef681147d9b28af2c38b11f603fe910
parent aa00fe010eb7b61c2de82611ce3f6fc0918a4f9e

Fix tests to pass with VerifyObject.

A SIRT ref with a null class was causing object verification problems
in space_test.

Change-Id: I95cfc3da5e0fec0155387f75612b0a3f26f6d3c9

runtime/indirect_reference_table.cc

diff --git a/runtime/indirect_reference_table.cc b/runtime/indirect_reference_table.cc
index ed3fb5f..bbad884 100644
--- a/runtime/indirect_reference_table.cc
+++ b/runtime/indirect_reference_table.cc
@@ -360,7 +360,9 @@
     return kInvalidIndirectRefObject;
   }
   mirror::Object* obj = table_[ExtractIndex(iref)];;
-  VerifyObject(obj);
+  if (obj != kClearedJniWeakGlobal) {
+    VerifyObject(obj);
+  }
   return obj;
 }