diff options
Diffstat (limited to 'compiler/optimizing/inliner.cc')
| -rw-r--r-- | compiler/optimizing/inliner.cc | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc index 664126a54d..74eae430ad 100644 --- a/compiler/optimizing/inliner.cc +++ b/compiler/optimizing/inliner.cc @@ -26,8 +26,6 @@ #include "data_type-inl.h" #include "dead_code_elimination.h" #include "dex/inline_method_analyser.h" -#include "dex/verification_results.h" -#include "dex/verified_method.h" #include "driver/compiler_options.h" #include "driver/dex_compilation_unit.h" #include "instruction_simplifier.h" @@ -388,24 +386,9 @@ static bool IsMethodUnverified(const CompilerOptions& compiler_options, ArtMetho // We're at runtime, we know this is cold code if the class // is not verified, so don't bother analyzing. return true; - } - uint16_t class_def_idx = method->GetDeclaringClass()->GetDexClassDefIndex(); - - const VerifiedMethod* verified_method = - compiler_options.GetVerifiedMethod(method->GetDexFile(), method->GetDexMethodIndex()); - if (verified_method != nullptr && verified_method->HasRuntimeThrow()) { - // Compiler doesn't handle dead code as nicely as verifier. + } else if (!method->GetDeclaringClass()->IsVerifiedNeedsAccessChecks()) { return true; } - if (!compiler_options.IsMethodVerifiedWithoutFailures(method->GetDexMethodIndex(), - class_def_idx, - *method->GetDexFile())) { - if (verified_method == nullptr || - !verifier::CanCompilerHandleVerificationFailure( - verified_method->GetEncounteredVerificationFailures())) { - return true; - } - } } return false; } |