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/optimizing/inliner.cc

diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc
index 2c17a67..87a8d33 100644
--- a/compiler/optimizing/inliner.cc
+++ b/compiler/optimizing/inliner.cc
@@ -31,6 +31,8 @@
 #include "ssa_phi_elimination.h"
 #include "scoped_thread_state_change.h"
 #include "thread.h"
+#include "dex/verified_method.h"
+#include "dex/verification_results.h"
 
 namespace art {
 
@@ -114,9 +116,11 @@
     return false;
   }
 
-  if (!resolved_method->GetDeclaringClass()->IsVerified()) {
+  uint16_t class_def_idx = resolved_method->GetDeclaringClass()->GetDexClassDefIndex();
+  if (!compiler_driver_->IsMethodVerifiedWithoutFailures(
+        resolved_method->GetDexMethodIndex(), class_def_idx, *resolved_method->GetDexFile())) {
     VLOG(compiler) << "Method " << PrettyMethod(method_index, caller_dex_file)
-                   << " is not inlined because its class could not be verified";
+                   << " couldn't be verified, so it cannot be inlined";
     return false;
   }