Synchronize with r15594.

src/objects.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 7449 matching lines @@
 
 enum AllocationSiteMode {
   DONT_TRACK_ALLOCATION_SITE,
   TRACK_ALLOCATION_SITE,
   LAST_ALLOCATION_SITE_MODE = TRACK_ALLOCATION_SITE
 };
 
 
 class AllocationSite: public Struct {
  public:
-  static const int kPayloadOffset = HeapObject::kHeaderSize;
-  static const int kSize = kPayloadOffset + kPointerSize;
+  static const int kTransitionInfoOffset = HeapObject::kHeaderSize;
+  static const int kSize = kTransitionInfoOffset + kPointerSize;
   static const uint32_t kMaximumArrayBytesToPretransition = 8 * 1024;
 
-  // TODO(mvstanton): rename payload to transition_info.
-  DECL_ACCESSORS(payload, Object)
+  DECL_ACCESSORS(transition_info, Object)
 
   void Initialize() {
-    SetElementsKindPayload(GetInitialFastElementsKind());
+    SetElementsKind(GetInitialFastElementsKind());
   }
 
-  ElementsKind GetElementsKindPayload() {
+  ElementsKind GetElementsKind() {
     ASSERT(!IsLiteralSite());
-    return static_cast<ElementsKind>(Smi::cast(payload())->value());
+    return static_cast<ElementsKind>(Smi::cast(transition_info())->value());
   }
 
-  void SetElementsKindPayload(ElementsKind kind) {
-    set_payload(Smi::FromInt(static_cast<int>(kind)));
+  void SetElementsKind(ElementsKind kind) {
+    set_transition_info(Smi::FromInt(static_cast<int>(kind)));
   }
 
   bool IsLiteralSite() {
-    // If the payload is a smi, then it represents an ElementsKind
+    // If transition_info is a smi, then it represents an ElementsKind
     // for a constructed array. Otherwise, it must be a boilerplate
     // for an array literal
-    return payload()->IsJSArray();
+    return transition_info()->IsJSArray();
   }
 
   DECLARE_PRINTER(AllocationSite)
   DECLARE_VERIFIER(AllocationSite)
 
   static inline AllocationSite* cast(Object* obj);
   static inline AllocationSiteMode GetMode(
       ElementsKind boilerplate_elements_kind);
   static inline AllocationSiteMode GetMode(ElementsKind from, ElementsKind to);
 
@@ skipping 2308 matching lines @@
     } else {
       value &= ~(1 << bit_position);
     }
     return value;
   }
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_OBJECTS_H_