commit a9e285a3c79b090fcb3a1c625bc21147fbccea7d
author Vladimir Marko <vmarko@google.com> Wed Feb 16 15:56:06 2022 +0000
committer Vladimir Marko <vmarko@google.com> Thu Feb 17 15:06:26 2022 +0000
tree ba8517341966ccc32638b6bf5a6374a4b69eb130
parent b6a2907d5fd837e50f5d7ea27e7665191f12fbc5

Cache `IsImageClass()` result in `InitImageMethodVisitor`.

Test: m test-art-host-gtest
Test: testrunner.py -host --optimizing
Bug: 181943478
Change-Id: Ie0f6c61ba5a5f7c37b76ed8a30b0e2b361184f80

dex2oat/linker/oat_writer.cc

diff --git a/dex2oat/linker/oat_writer.cc b/dex2oat/linker/oat_writer.cc
index 229322c..5e037c4 100644
--- a/dex2oat/linker/oat_writer.cc
+++ b/dex2oat/linker/oat_writer.cc
@@ -1539,7 +1539,8 @@
         pointer_size_(GetInstructionSetPointerSize(writer_->compiler_options_.GetInstructionSet())),
         class_loader_(writer->HasImage() ? writer->image_writer_->GetAppClassLoader() : nullptr),
         dex_files_(dex_files),
-        class_linker_(Runtime::Current()->GetClassLinker()) {}
+        class_linker_(Runtime::Current()->GetClassLinker()),
+        is_image_class_(false) {}
 
   // Handle copied methods here. Copy pointer to quick code from
   // an origin method to a copied method only if they are
@@ -1550,7 +1551,11 @@
       REQUIRES_SHARED(Locks::mutator_lock_) {
     OatDexMethodVisitor::StartClass(dex_file, class_def_index);
     // Skip classes that are not in the image.
-    if (!IsImageClass()) {
+    const dex::TypeId& type_id =
+        dex_file_->GetTypeId(dex_file->GetClassDef(class_def_index).class_idx_);
+    const char* class_descriptor = dex_file->GetTypeDescriptor(type_id);
+    is_image_class_ = writer_->GetCompilerOptions().IsImageClass(class_descriptor);
+    if (!is_image_class_) {
       return true;
     }
     ObjPtr<mirror::DexCache> dex_cache = class_linker_->FindDexCache(Thread::Current(), *dex_file);
@@ -1588,7 +1593,7 @@
   bool VisitMethod(size_t class_def_method_index, const ClassAccessor::Method& method) override
       REQUIRES_SHARED(Locks::mutator_lock_) {
     // Skip methods that are not in the image.
-    if (!IsImageClass()) {
+    if (!is_image_class_) {
       return true;
     }
 
@@ -1632,14 +1637,6 @@
     return true;
   }
 
-  // Check whether current class is image class
-  bool IsImageClass() {
-    const dex::TypeId& type_id =
-        dex_file_->GetTypeId(dex_file_->GetClassDef(class_def_index_).class_idx_);
-    const char* class_descriptor = dex_file_->GetTypeDescriptor(type_id);
-    return writer_->GetCompilerOptions().IsImageClass(class_descriptor);
-  }
-
   // Check whether specified dex file is in the compiled oat file.
   bool IsInOatFile(const DexFile* dex_file) {
     return ContainsElement(*dex_files_, dex_file);
@@ -1661,9 +1658,10 @@
 
  private:
   const PointerSize pointer_size_;
-  ObjPtr<mirror::ClassLoader> class_loader_;
+  const ObjPtr<mirror::ClassLoader> class_loader_;
   const std::vector<const DexFile*>* dex_files_;
   ClassLinker* const class_linker_;
+  bool is_image_class_;  // Updated in `StartClass()`.
   std::vector<std::pair<ArtMethod*, ArtMethod*>> methods_to_process_;
 };