commit 4d9716c19cc25911e639272048abd0d6702bb082
author Brian Carlstrom <bdc@google.com> Mon Jan 30 01:49:33 2012 -0800
committer Brian Carlstrom <bdc@google.com> Tue Jan 31 12:01:50 2012 -0800
tree fdd9d47f7ebb3bcbb19224a34eb7216f3d212821
parent 0f09676a8f61809c474e71b4a677093615bfba19

Class::SetStatus(kStatusError) now checks that an exception is pending and uses it to SetVerifyErrorClass

Change-Id: I02f4adc51ac6da88d4969655fa828f93941c4c0a

src/object.h

diff --git a/src/object.h b/src/object.h
index 3cbe9d6..1841042 100644
--- a/src/object.h
+++ b/src/object.h
@@ -1708,10 +1708,6 @@
     return GetFieldObject<Class*>(OFFSET_OF_OBJECT_MEMBER(Class, verify_error_class_), false);
   }
 
-  void SetVerifyErrorClass(Class* klass) {
-    SetFieldObject(OFFSET_OF_OBJECT_MEMBER(Class, verify_error_class_), klass, false);
-  }
-
   uint16_t GetDexTypeIndex() const {
     return GetField32(OFFSET_OF_OBJECT_MEMBER(Class, dex_type_idx_), false);
   }
@@ -1721,6 +1717,11 @@
   }
 
  private:
+  void SetVerifyErrorClass(Class* klass) {
+    CHECK(klass != NULL) << PrettyClass(this);
+    SetFieldObject(OFFSET_OF_OBJECT_MEMBER(Class, verify_error_class_), klass, false);
+  }
+
   bool Implements(const Class* klass) const;
   bool IsArrayAssignableFromArray(const Class* klass) const;
   bool IsAssignableFromArray(const Class* klass) const;