Remove unused VERIFY_ERROR_NO_FIELD.
Test: test.py
Change-Id: I72f547c4336e5f60aa762f205323ee8aef023c5f
diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index e11b2ec..1ea2c8c 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -5531,7 +5531,6 @@
if (pending_exc) {
switch (error) {
case VERIFY_ERROR_NO_CLASS:
- case VERIFY_ERROR_NO_FIELD:
case VERIFY_ERROR_NO_METHOD:
case VERIFY_ERROR_ACCESS_CLASS:
case VERIFY_ERROR_ACCESS_FIELD:
diff --git a/runtime/verifier/verifier_enums.h b/runtime/verifier/verifier_enums.h
index e3420f0..2a6de3a 100644
--- a/runtime/verifier/verifier_enums.h
+++ b/runtime/verifier/verifier_enums.h
@@ -79,21 +79,20 @@
// runtime.
VERIFY_ERROR_NO_CLASS = 1 << 2, // NoClassDefFoundError.
- VERIFY_ERROR_NO_FIELD = 1 << 3, // NoSuchFieldError.
- VERIFY_ERROR_NO_METHOD = 1 << 4, // NoSuchMethodError.
- VERIFY_ERROR_ACCESS_CLASS = 1 << 5, // IllegalAccessError.
- VERIFY_ERROR_ACCESS_FIELD = 1 << 6, // IllegalAccessError.
- VERIFY_ERROR_ACCESS_METHOD = 1 << 7, // IllegalAccessError.
- VERIFY_ERROR_CLASS_CHANGE = 1 << 8, // IncompatibleClassChangeError.
- VERIFY_ERROR_INSTANTIATION = 1 << 9, // InstantiationError.
+ VERIFY_ERROR_NO_METHOD = 1 << 3, // NoSuchMethodError.
+ VERIFY_ERROR_ACCESS_CLASS = 1 << 4, // IllegalAccessError.
+ VERIFY_ERROR_ACCESS_FIELD = 1 << 5, // IllegalAccessError.
+ VERIFY_ERROR_ACCESS_METHOD = 1 << 6, // IllegalAccessError.
+ VERIFY_ERROR_CLASS_CHANGE = 1 << 7, // IncompatibleClassChangeError.
+ VERIFY_ERROR_INSTANTIATION = 1 << 8, // InstantiationError.
// For opcodes that don't have complete verifier support, we need a way to continue
// execution at runtime without attempting to re-verify (since we know it will fail no
// matter what). Instead, run as the interpreter in a special "do access checks" mode
// which will perform verifier-like checking on the fly.
- VERIFY_ERROR_FORCE_INTERPRETER = 1 << 10, // Skip the verification phase at runtime;
+ VERIFY_ERROR_FORCE_INTERPRETER = 1 << 9, // Skip the verification phase at runtime;
// force the interpreter to do access checks.
// (sets a soft fail at compile time).
- VERIFY_ERROR_LOCKING = 1 << 11, // Could not guarantee balanced locking. This should be
+ VERIFY_ERROR_LOCKING = 1 << 10, // Could not guarantee balanced locking. This should be
// punted to the interpreter with access checks.
VERIFY_ERROR_SKIP_COMPILER = 1u << 31, // Flag to note that the failure should preclude
// optimization. Meant as a signal from the verifier