commit 14632857428b7e37761e6e811c19021715a400f8
author Vladimir Marko <vmarko@google.com> Mon Aug 17 12:07:23 2015 +0100
committer Vladimir Marko <vmarko@google.com> Mon Aug 17 14:49:34 2015 +0100
tree 1774ef3ed5b973ce661b761814bd86bdbfa8fdbc
parent 8ecc1357e2c682165467ca8e10c7a748f7554df2

ART: Rename ArtMethod's size and alignment methods.

Remove the historical prefix "Object" to avoid confusion
with Java objects.

Change-Id: Ib36422c9a24878d8d4bd757977d99cbf66b3d567

compiler/image_writer.cc

diff --git a/compiler/image_writer.cc b/compiler/image_writer.cc
index c4fe2cb..3a3410c 100644
--- a/compiler/image_writer.cc
+++ b/compiler/image_writer.cc
@@ -866,8 +866,8 @@
         }
         bool any_dirty = false;
         size_t count = 0;
-        const size_t method_alignment = ArtMethod::ObjectAlignment(target_ptr_size_);
-        const size_t method_size = ArtMethod::ObjectSize(target_ptr_size_);
+        const size_t method_alignment = ArtMethod::Alignment(target_ptr_size_);
+        const size_t method_size = ArtMethod::Size(target_ptr_size_);
         auto iteration_range =
             MakeIterationRangeFromLengthPrefixedArray(array, method_size, method_alignment);
         for (auto& m : iteration_range) {
@@ -914,7 +914,7 @@
       << PrettyMethod(method);
   size_t& offset = bin_slot_sizes_[BinTypeForNativeRelocationType(type)];
   native_object_relocations_.emplace(method, NativeObjectRelocation { offset, type });
-  offset += ArtMethod::ObjectSize(target_ptr_size_);
+  offset += ArtMethod::Size(target_ptr_size_);
 }
 
 void ImageWriter::WalkFieldsCallback(mirror::Object* obj, void* arg) {
@@ -976,9 +976,9 @@
   size_t& offset = bin_slot_sizes_[BinTypeForNativeRelocationType(image_method_type)];
   native_object_relocations_.emplace(&image_method_array_,
                                      NativeObjectRelocation { offset, image_method_type });
-  size_t method_alignment = ArtMethod::ObjectAlignment(target_ptr_size_);
+  size_t method_alignment = ArtMethod::Alignment(target_ptr_size_);
   const size_t array_size = LengthPrefixedArray<ArtMethod>::ComputeSize(
-      0, ArtMethod::ObjectSize(target_ptr_size_), method_alignment);
+      0, ArtMethod::Size(target_ptr_size_), method_alignment);
   CHECK_ALIGNED_PARAM(array_size, method_alignment);
   offset += array_size;
   for (auto* m : image_methods_) {
@@ -1045,7 +1045,7 @@
   CHECK_EQ(bin_slot_offsets_[kBinArtField], field_section->Offset());
   cur_pos = field_section->End();
   // Round up to the alignment the required by the method section.
-  cur_pos = RoundUp(cur_pos, ArtMethod::ObjectAlignment(target_ptr_size_));
+  cur_pos = RoundUp(cur_pos, ArtMethod::Alignment(target_ptr_size_));
   // Add method section.
   auto* methods_section = &sections[ImageHeader::kSectionArtMethods];
   *methods_section = ImageSection(cur_pos, bin_slot_sizes_[kBinArtMethodClean] +
@@ -1150,8 +1150,8 @@
       case kNativeObjectRelocationTypeArtMethodArrayDirty: {
         memcpy(dest, pair.first, LengthPrefixedArray<ArtMethod>::ComputeSize(
             0,
-            ArtMethod::ObjectSize(target_ptr_size_),
-            ArtMethod::ObjectAlignment(target_ptr_size_)));
+            ArtMethod::Size(target_ptr_size_),
+            ArtMethod::Alignment(target_ptr_size_)));
         break;
       }
     }
@@ -1460,7 +1460,7 @@
 }
 
 void ImageWriter::CopyAndFixupMethod(ArtMethod* orig, ArtMethod* copy) {
-  memcpy(copy, orig, ArtMethod::ObjectSize(target_ptr_size_));
+  memcpy(copy, orig, ArtMethod::Size(target_ptr_size_));
 
   copy->SetDeclaringClass(GetImageAddress(orig->GetDeclaringClassUnchecked()));
   copy->SetDexCacheResolvedMethods(GetImageAddress(orig->GetDexCacheResolvedMethods()));