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

runtime/mirror/class-inl.h

diff --git a/runtime/mirror/class-inl.h b/runtime/mirror/class-inl.h
index b15747f..ac9cb09 100644
--- a/runtime/mirror/class-inl.h
+++ b/runtime/mirror/class-inl.h
@@ -93,8 +93,8 @@
   auto* methods = GetDirectMethodsPtrUnchecked();
   DCHECK(methods != nullptr);
   return &methods->At(i,
-                      ArtMethod::ObjectSize(pointer_size),
-                      ArtMethod::ObjectAlignment(pointer_size));
+                      ArtMethod::Size(pointer_size),
+                      ArtMethod::Alignment(pointer_size));
 }
 
 inline ArtMethod* Class::GetDirectMethod(size_t i, size_t pointer_size) {
@@ -102,8 +102,8 @@
   auto* methods = GetDirectMethodsPtr();
   DCHECK(methods != nullptr);
   return &methods->At(i,
-                      ArtMethod::ObjectSize(pointer_size),
-                      ArtMethod::ObjectAlignment(pointer_size));
+                      ArtMethod::Size(pointer_size),
+                      ArtMethod::Alignment(pointer_size));
 }
 
 template<VerifyObjectFlags kVerifyFlags>
@@ -138,8 +138,8 @@
   LengthPrefixedArray<ArtMethod>* methods = GetVirtualMethodsPtrUnchecked();
   DCHECK(methods != nullptr);
   return &methods->At(i,
-                      ArtMethod::ObjectSize(pointer_size),
-                      ArtMethod::ObjectAlignment(pointer_size));
+                      ArtMethod::Size(pointer_size),
+                      ArtMethod::Alignment(pointer_size));
 }
 
 inline PointerArray* Class::GetVTable() {
@@ -843,15 +843,15 @@
 inline IterationRange<StrideIterator<ArtMethod>> Class::GetDirectMethods(size_t pointer_size) {
   CheckPointerSize(pointer_size);
   return MakeIterationRangeFromLengthPrefixedArray(GetDirectMethodsPtrUnchecked(),
-                                                   ArtMethod::ObjectSize(pointer_size),
-                                                   ArtMethod::ObjectAlignment(pointer_size));
+                                                   ArtMethod::Size(pointer_size),
+                                                   ArtMethod::Alignment(pointer_size));
 }
 
 inline IterationRange<StrideIterator<ArtMethod>> Class::GetVirtualMethods(size_t pointer_size) {
   CheckPointerSize(pointer_size);
   return MakeIterationRangeFromLengthPrefixedArray(GetVirtualMethodsPtrUnchecked(),
-                                                   ArtMethod::ObjectSize(pointer_size),
-                                                   ArtMethod::ObjectAlignment(pointer_size));
+                                                   ArtMethod::Size(pointer_size),
+                                                   ArtMethod::Alignment(pointer_size));
 }
 
 inline IterationRange<StrideIterator<ArtField>> Class::GetIFields() {