diff options
Diffstat (limited to 'compiler/optimizing/inliner.cc')
| -rw-r--r-- | compiler/optimizing/inliner.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc index 2c17a67867..87a8d33193 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 @@ bool HInliner::TryInline(HInvoke* invoke_instruction, 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; } |