Merge "Revert "Fallback to quick in case of soft verification errors""

1 files changed, 2 insertions, 5 deletions

diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc
index 65f1ed2978..2c17a67867 100644
--- a/compiler/optimizing/inliner.cc
+++ b/compiler/optimizing/inliner.cc
@@ -31,8 +31,6 @@
 #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 {
 
@@ -116,10 +114,9 @@ bool HInliner::TryInline(HInvoke* invoke_instruction,
     return false;
   }
 
-  if (compiler_driver_->IsMethodVerifiedWithoutFailures(
-        method_index, *resolved_method->GetDexFile())) {
+  if (!resolved_method->GetDeclaringClass()->IsVerified()) {
     VLOG(compiler) << "Method " << PrettyMethod(method_index, caller_dex_file)
-                   << " has verification failures, so it cannot be inlined";
+                   << " is not inlined because its class could not be verified";
     return false;
   }