Merge "Revert "ART: Use the bitstring type check for AOT app compilation.""

1 files changed, 0 insertions, 11 deletions

diff --git a/compiler/driver/compiler_driver.h b/compiler/driver/compiler_driver.h
index fc77656761..18b1e0ea3c 100644
--- a/compiler/driver/compiler_driver.h
+++ b/compiler/driver/compiler_driver.h
@@ -385,17 +385,12 @@ class CompilerDriver {
     return dex_to_dex_compiler_;
   }
 
-  bool IsBootImageClassWithAssignedBitstring(ObjPtr<mirror::Class> klass)
-      REQUIRES_SHARED(Locks::mutator_lock_);
-
  private:
   void PreCompile(jobject class_loader,
                   const std::vector<const DexFile*>& dex_files,
                   TimingLogger* timings)
       REQUIRES(!Locks::mutator_lock_);
 
-  void RecordBootImageClassesWithAssignedBitstring() REQUIRES(!Locks::mutator_lock_);
-
   void LoadImageClasses(TimingLogger* timings) REQUIRES(!Locks::mutator_lock_);
 
   // Attempt to resolve all type, methods, fields, and strings
@@ -518,12 +513,6 @@ class CompilerDriver {
   // This option may be restricted to the boot image, depending on a flag in the implementation.
   std::unique_ptr<std::unordered_set<std::string>> methods_to_compile_;
 
-  // For AOT app compilation, we keep the set of boot image classes with assigned type check
-  // bitstring. We need to retrieve this set before we initialize app image classes as the
-  // initialization can cause more boot image bitstrings to be assigned.
-  // Note that boot image classes are non-moveable, so it's OK to keep raw pointers.
-  std::unique_ptr<std::unordered_set<mirror::Class*>> boot_image_classes_with_assigned_bitstring_;
-
   std::atomic<uint32_t> number_of_soft_verifier_failures_;
   bool had_hard_verifier_failure_;