commit f1c6d9e87cbfd27702103ccc7c7f08ce784dc872
author Calin Juravle <calin@google.com> Mon Apr 13 18:42:21 2015 +0100
committer Calin Juravle <calin@google.com> Thu Apr 16 16:28:11 2015 +0100
tree 45ad9f5bb52eb0db3857e344ab67b5aab2309472
parent e015a31e509c3f4de8a90b57b77329ba6609ce2f

Fallback to quick in case of soft verification errors

Add a regression test: using uninitialized values triggers a soft
verification error and optimizing should not crash.

Thanks to Stephen Kyle (stephenckyle@googlemail.com) for the bug report.

Bug: 19988704
Change-Id: I67174538eed853baff735694b3ae8eb34afe2a39

compiler/dex/verified_method.cc

diff --git a/compiler/dex/verified_method.cc b/compiler/dex/verified_method.cc
index ae814b4..977757f 100644
--- a/compiler/dex/verified_method.cc
+++ b/compiler/dex/verified_method.cc
@@ -40,6 +40,7 @@
 const VerifiedMethod* VerifiedMethod::Create(verifier::MethodVerifier* method_verifier,
                                              bool compile) {
   std::unique_ptr<VerifiedMethod> verified_method(new VerifiedMethod);
+  verified_method->has_verification_failures_ = method_verifier->HasFailures();
   if (compile) {
     /* Generate a register map. */
     if (!verified_method->GenerateGcMap(method_verifier)) {