Merge "Revert "Support class unloading in dex2oat for quicken multidex""

1 files changed, 0 insertions, 14 deletions

diff --git a/compiler/dex/quick_compiler_callbacks.cc b/compiler/dex/quick_compiler_callbacks.cc
index c7e9f4fc07..872f7ea15d 100644
--- a/compiler/dex/quick_compiler_callbacks.cc
+++ b/compiler/dex/quick_compiler_callbacks.cc
@@ -16,7 +16,6 @@
 
 #include "quick_compiler_callbacks.h"
 
-#include "driver/compiler_driver.h"
 #include "verification_results.h"
 #include "verifier/method_verifier-inl.h"
 
@@ -34,17 +33,4 @@ void QuickCompilerCallbacks::ClassRejected(ClassReference ref) {
   }
 }
 
-bool QuickCompilerCallbacks::CanAssumeVerified(ClassReference ref) {
-  // If we don't have class unloading enabled in the compiler, we will never see class that were
-  // previously verified. Return false to avoid overhead from the lookup in the compiler driver.
-  if (!does_class_unloading_) {
-    return false;
-  }
-  DCHECK(compiler_driver_ != nullptr);
-  // In the case of the quicken filter: avoiding verification of quickened instructions, which the
-  // verifier doesn't currently support.
-  // In the case of the verify filter, avoiding verifiying twice.
-  return compiler_driver_->CanAssumeVerified(ref);
-}
-
 }  // namespace art