commit b677affde680c730aa22fab4d7eeb9fabb38d3c0
author Nicolas Geoffray <ngeoffray@google.com> Wed Dec 23 17:07:10 2020 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Tue Jan 05 13:06:18 2021 +0000
tree 92b8a23ee7a5f05c81d34f555dd13d196101aee7
parent ef28d24d7625943cc2b53e10bbece86a305b3ffd

Support VERIFY_ERROR_CLASS_CHANGE in nterp and compiler.

They were always supported.

Test: test.py
Change-Id: I2ef6ee279ad14740e1a59adc486ef078ad511d83

runtime/verifier/method_verifier.cc

diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index 6c0d794..e11b2ec 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -5175,6 +5175,7 @@
 // The AOT/JIT compiled code is not affected.
 static inline bool CanRuntimeHandleVerificationFailure(uint32_t encountered_failure_types) {
   constexpr uint32_t unresolved_mask =
+      verifier::VerifyError::VERIFY_ERROR_CLASS_CHANGE |
       verifier::VerifyError::VERIFY_ERROR_ACCESS_CLASS |
       verifier::VerifyError::VERIFY_ERROR_ACCESS_FIELD |
       verifier::VerifyError::VERIFY_ERROR_ACCESS_METHOD;