commit 16f257075ec7ef2cd4ca13a02e0e6c94b00f8046
author Brian Carlstrom <bdc@google.com> Fri Mar 30 01:10:45 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 30 01:10:45 2012 -0700
tree 8be3daf3ee10f3de28d65a48f0e923bda688990b
parent a963e1c5e1f229623cfb74f11e0ccc9325090b08
parent e77be401064117032b7c4bbad3f897f5c0b23a26

Merge "More ClassHelper class validation" into ics-mr1-plus-art

src/object_utils.h

diff --git a/src/object_utils.h b/src/object_utils.h
index cb963cc..99768de 100644
--- a/src/object_utils.h
+++ b/src/object_utils.h
@@ -67,11 +67,15 @@
         dex_cache_(NULL),
         dex_file_(NULL),
         interface_type_list_(NULL),
-        klass_(c) {
+        klass_(NULL) {
+    if (c != NULL) {
+      ChangeClass(c);
+    }
   }
 
   void ChangeClass(const Class* new_c) {
-    CHECK(new_c != NULL) << "klass_=" << HexDump(klass_, sizeof(Class), true);
+    CHECK(new_c != NULL) << "klass_=" << klass_ << " " << HexDump(klass_, sizeof(Class), true);
+    CHECK(new_c->IsClass()) << "klass_=" << klass_ << " " << HexDump(klass_, sizeof(Class), true);
     if (dex_cache_ != NULL) {
       DexCache* new_c_dex_cache = new_c->GetDexCache();
       if (new_c_dex_cache != dex_cache_) {