commit 890da29d279c44923f9271450b8a4423b1267655
author Andreas Gampe <agampe@google.com> Mon Jul 06 17:20:18 2015 -0700
committer Andreas Gampe <agampe@google.com> Mon Jul 06 17:20:18 2015 -0700
tree 3c1c990a1ce8bfd0a245fb748956ca4ed92955c3
parent e7ea17b726ab415a0dc98c0a3901497bbcf3a4c3

ART: Avoid soft- after hard-fail in verifier

Follow-up to 414000ec4d728b5c85f8c6dee4f867fecde59b01.

Bug: 21886894
Bug: 22245124
Change-Id: I3728187bd8526cdf84f95b123e6fad5d6c5a8b3c

runtime/verifier/method_verifier.cc

diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index 92c9eb8..09db7cd 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -4133,7 +4133,9 @@
                     << " to be compatible with type '" << insn_type
                     << "' but found type '" << *field_type
                     << "' in get-object";
-        work_line_->SetRegisterType(this, vregA, reg_types_.Conflict());
+        if (error != VERIFY_ERROR_BAD_CLASS_HARD) {
+          work_line_->SetRegisterType(this, vregA, reg_types_.Conflict());
+        }
         return;
       }
     }