Rename verifyError field to erroneousStateError.
The field can also contain the initializer error.
Test: test.py
Bug: 28313047
Change-Id: I7e02c03d7c46405ac2fd5512d60454f1354ab890
diff --git a/libart/src/main/java/dalvik/system/ClassExt.java b/libart/src/main/java/dalvik/system/ClassExt.java
index e523035..7acc3f3 100644
--- a/libart/src/main/java/dalvik/system/ClassExt.java
+++ b/libart/src/main/java/dalvik/system/ClassExt.java
@@ -27,6 +27,13 @@
*/
public final class ClassExt {
/**
+ * If the class is in an erroneous state, we must return the same error on subsequent tries.
+ *
+ * This field is a logical part of the 'Class' type.
+ */
+ private Throwable erroneousStateError;
+
+ /**
* A Pointer-sized-array of instance jfieldIDs in the same order as the ifields_ array.
* The jfieldID is associated with the ArtField at the corresonding index in the ifields_ array.
*/
@@ -91,14 +98,6 @@
private Object staticJfieldIDs;
/**
- * If class verify fails, we must return same error on subsequent tries. We may store either
- * the class of the error, or an actual instance of Throwable here.
- *
- * This field is a logical part of the 'Class' type.
- */
- private Object verifyError;
-
- /**
* If set, native pointer to the initial, pre-redefine, dex file associated with the related
* class. This is different from the {@code originalDexFile} which is the pre-retransform dex
* file, i.e. could contain the bytes of the dex file provided during redefine.