commit a808bac971255ff4e62a6c5feadeca1ddcc4b3c0
author Mathieu Chartier <mathieuc@google.com> Thu Nov 05 16:33:15 2015 -0800
committer Mathieu Chartier <mathieuc@google.com> Mon Nov 09 09:55:52 2015 -0800
tree 9f415cf66efb68a8f138e05fd320cabf524e140c
parent ce0f43b97ffb5e4d14c5df6607d8efb46a5dc9d2

Add more image writer comments and clean up

Bug: 22858531

Change-Id: Ia3663856a7d9f67d9d9af329a54707ae2dc55a48

compiler/image_writer.h

diff --git a/compiler/image_writer.h b/compiler/image_writer.h
index 120de97..a0a785e 100644
--- a/compiler/image_writer.h
+++ b/compiler/image_writer.h
@@ -308,8 +308,11 @@
       SHARED_REQUIRES(Locks::mutator_lock_);
   void FixupDexCache(mirror::DexCache* orig_dex_cache, mirror::DexCache* copy_dex_cache)
       SHARED_REQUIRES(Locks::mutator_lock_);
-  void FixupPointerArray(mirror::Object* dst, mirror::PointerArray* arr, mirror::Class* klass,
-                         Bin array_type) SHARED_REQUIRES(Locks::mutator_lock_);
+  void FixupPointerArray(mirror::Object* dst,
+                         mirror::PointerArray* arr,
+                         mirror::Class* klass,
+                         Bin array_type)
+      SHARED_REQUIRES(Locks::mutator_lock_);
 
   // Get quick code for non-resolution/imt_conflict/abstract method.
   const uint8_t* GetQuickCode(ArtMethod* method, bool* quick_is_interpreted)
@@ -331,8 +334,12 @@
   void AssignMethodOffset(ArtMethod* method, NativeObjectRelocationType type)
       SHARED_REQUIRES(Locks::mutator_lock_);
 
+  // Return true if klass is loaded by the boot class loader but not in the boot image.
   bool IsBootClassLoaderNonImageClass(mirror::Class* klass) SHARED_REQUIRES(Locks::mutator_lock_);
 
+  // Return true if klass depends on a boot class loader non image class live. We want to prune
+  // these classes since we do not want any boot class loader classes in the image. This means that
+  // we also cannot have any classes which refer to these boot class loader non image classes.
   bool ContainsBootClassLoaderNonImageClass(mirror::Class* klass)
       SHARED_REQUIRES(Locks::mutator_lock_);
 
@@ -394,7 +401,7 @@
   const bool compile_pic_;
   const bool compile_app_image_;
 
-  // Boot image space for fast lookups.
+  // Cache the boot image space in this class for faster lookups.
   gc::space::ImageSpace* boot_image_space_;
 
   // Size of pointers on the target architecture.
@@ -432,7 +439,7 @@
   uint64_t dirty_methods_;
   uint64_t clean_methods_;
 
-  // Prune class memoization table.
+  // Prune class memoization table to speed up ContainsBootClassLoaderNonImageClass.
   std::unordered_map<mirror::Class*, bool> prune_class_memo_;
 
   friend class ContainsBootClassLoaderNonImageClassVisitor;