Merge "Avoid creating verified methods for non quickening filters"

1 files changed, 5 insertions, 0 deletions

diff --git a/compiler/dex/verification_results.cc b/compiler/dex/verification_results.cc
index 04ceca0513..183c955821 100644
--- a/compiler/dex/verification_results.cc
+++ b/compiler/dex/verification_results.cc
@@ -46,6 +46,10 @@ VerificationResults::~VerificationResults() {
 
 void VerificationResults::ProcessVerifiedMethod(verifier::MethodVerifier* method_verifier) {
   DCHECK(method_verifier != nullptr);
+  if (!compiler_options_->IsAnyCompilationEnabled()) {
+    // Verified methods are only required for quickening and compilation.
+    return;
+  }
   MethodReference ref = method_verifier->GetMethodReference();
   std::unique_ptr<const VerifiedMethod> verified_method(VerifiedMethod::Create(method_verifier));
   if (verified_method == nullptr) {
@@ -98,6 +102,7 @@ void VerificationResults::ProcessVerifiedMethod(verifier::MethodVerifier* method
 
 const VerifiedMethod* VerificationResults::GetVerifiedMethod(MethodReference ref) {
   const VerifiedMethod* ret = nullptr;
+  DCHECK(compiler_options_->IsAnyCompilationEnabled());
   if (atomic_verified_methods_.Get(ref, &ret)) {
     return ret;
   }