Allocation Info Tracking, continued.

src/objects.cc

 // Copyright 2013 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 9332 matching lines @@
   }
 
   if (IsJSArray()) {
     JSArray::cast(this)->set_length(Smi::FromInt(length));
   }
 
   return this;
 }
 
 
-MaybeObject* JSArray::Initialize(int capacity) {
-  Heap* heap = GetHeap();
+MaybeObject* JSArray::Initialize(int capacity, int length) {
   ASSERT(capacity >= 0);
-  set_length(Smi::FromInt(0));
-  FixedArrayBase* new_elements;
-  if (capacity == 0) {
-    new_elements = heap->empty_fixed_array();
-  } else {
-    ElementsKind elements_kind = GetElementsKind();
-    MaybeObject* maybe_obj;
-    if (IsFastDoubleElementsKind(elements_kind)) {
-      maybe_obj = heap->AllocateFixedDoubleArrayWithHoles(capacity);
-    } else {
-      maybe_obj = heap->AllocateFixedArrayWithHoles(capacity);
-    }
-    if (!maybe_obj->To(&new_elements)) return maybe_obj;
-  }
-  set_elements(new_elements);
-  return this;
+  return GetHeap()->AllocateJSArrayStorage(this, length, capacity,
+                                           INITIALIZE_ARRAY_ELEMENTS_WITH_HOLE);
 }
 
 
 void JSArray::Expand(int required_size) {
   GetIsolate()->factory()->SetElementsCapacityAndLength(
       Handle<JSArray>(this), required_size, required_size);
 }
 
 
 // Returns false if the passed-in index is marked non-configurable,
@@ skipping 659 matching lines @@
                                   check_prototype);
     }
   }
   // Convert to fast double elements if appropriate.
   if (HasFastSmiElements() && !value->IsSmi() && value->IsNumber()) {
     // Consider fixing the boilerplate as well if we have one.
     ElementsKind to_kind = IsHoleyElementsKind(elements_kind)
         ? FAST_HOLEY_DOUBLE_ELEMENTS
         : FAST_DOUBLE_ELEMENTS;
 
-    MaybeObject* trans = PossiblyTransitionArrayBoilerplate(to_kind);
+    MaybeObject* trans = UpdateAllocationSiteInfo(to_kind);
     if (trans->IsFailure()) return trans;

[Toon Verwaest, 2013/02/21 12:13:03]

MaybeObject* maybe_failure = ...;
if (maybe_failure->IsFailure()) return maybe_failure;

 
     MaybeObject* maybe =
         SetFastDoubleElementsCapacityAndLength(new_capacity, array_length);
     if (maybe->IsFailure()) return maybe;
     FixedDoubleArray::cast(elements())->set(index, value->Number());
     ValidateElements();
     return value;
   }
   // Change elements kind from Smi-only to generic FAST if necessary.
   if (HasFastSmiElements() && !value->IsSmi()) {
     Map* new_map;
     ElementsKind kind = HasFastHoleyElements()
         ? FAST_HOLEY_ELEMENTS
         : FAST_ELEMENTS;
 
-    MaybeObject* trans = PossiblyTransitionArrayBoilerplate(kind);
+    MaybeObject* trans = UpdateAllocationSiteInfo(kind);

[Toon Verwaest, 2013/02/21 12:13:03]

MaybeObject* maybe_failure = ...;
if (maybe_failure->IsFailure()) return maybe_failure;

     if (trans->IsFailure()) return trans;
 
     MaybeObject* maybe_new_map = GetElementsTransitionMap(GetIsolate(),
                                                           kind);
     if (!maybe_new_map->To(&new_map)) return maybe_new_map;
 
     set_map(new_map);
   }
   // Increase backing store capacity if that's been decided previously.
   if (new_capacity != capacity) {
@@ skipping 527 matching lines @@
 
 
 Handle<Object> JSObject::TransitionElementsKind(Handle<JSObject> object,
                                                 ElementsKind to_kind) {
   CALL_HEAP_FUNCTION(object->GetIsolate(),
                      object->TransitionElementsKind(to_kind),
                      Object);
 }
 
 
-// TODO(mvstanton): rename this method to reflect what it actually does.
-// If a boilerplate object is discovered, then it will transition it.
-// If instead there is a elements kind, then update it as long as the
-// to_kind variable is more general than what we find, but don't
-// ever take the double->fastobject transition (that represents poisoning),
-// just ignore that case.
-MaybeObject* JSObject::PossiblyTransitionArrayBoilerplate(
-    ElementsKind to_kind) {
-  MaybeObject* ret = NULL;
+MaybeObject* JSObject::UpdateAllocationSiteInfo(ElementsKind to_kind) {
   if (!FLAG_track_allocation_sites || !IsJSArray()) {
-    return ret;
+    return NULL;

[Toon Verwaest, 2013/02/21 12:13:03]

return this;

[mvstanton, 2013/02/27 14:37:07]

Done.

   }
 
   AllocationSiteInfo* info = AllocationSiteInfo::FindForJSObject(this);
   if (info == NULL) {
-    return ret;
+    return NULL;

[Toon Verwaest, 2013/02/21 12:13:03]

return this;

[mvstanton, 2013/02/27 14:37:07]

Done.

   }
 
   if (info->payload()->IsJSArray()) {
     JSArray* payload = JSArray::cast(info->payload());
     ElementsKind kind = payload->GetElementsKind();
-    if (IsMoreGeneralElementsKindTransition(kind, to_kind)) {
+    if (AllocationSiteInfo::GetMode(kind, to_kind) == TRACK_ALLOCATION_SITE) {
       // If the array is huge, it's not likely to be defined in a local
       // function, so we shouldn't make new instances of it very often.
       uint32_t length = 0;
       CHECK(payload->length()->ToArrayIndex(&length));
-      if (length <= 8*1024) {
-        ret = payload->TransitionElementsKind(to_kind);
+      if (length <= AllocationSiteInfo::kMaximumArrayBytesToPretransition) {
         if (FLAG_trace_track_allocation_sites) {
           PrintF(
               "AllocationSiteInfo: JSArray %p boilerplate updated %s->%s\n",
               reinterpret_cast<void*>(this),
               ElementsKindToString(kind),
               ElementsKindToString(to_kind));
         }
+        return payload->TransitionElementsKind(to_kind);
       }
     }
   } else if (info->payload()->IsJSGlobalPropertyCell()) {
     JSGlobalPropertyCell* cell = JSGlobalPropertyCell::cast(info->payload());
     Object* cell_contents = cell->value();
     if (cell_contents->IsSmi()) {
       ElementsKind kind = static_cast<ElementsKind>(
           Smi::cast(cell_contents)->value());
-      // Specifically exclude DOUBLE(HOLEY) -> FAST(HOLEY)
-      bool double_to_fast = IsFastDoubleElementsKind(kind) &&
-          IsFastObjectElementsKind(to_kind);
-      if (IsMoreGeneralElementsKindTransition(kind, to_kind) &&
-          !double_to_fast) {
+      if (AllocationSiteInfo::GetMode(kind, to_kind) == TRACK_ALLOCATION_SITE) {
         if (FLAG_trace_track_allocation_sites) {
           PrintF("AllocationSiteInfo: JSArray %p info updated %s->%s\n",
                  reinterpret_cast<void*>(this),
                  ElementsKindToString(kind),
                  ElementsKindToString(to_kind));
         }
         cell->set_value(Smi::FromInt(to_kind));
       }
     }
   }
-  return ret;
+  return this;
 }
 
 
 MaybeObject* JSObject::TransitionElementsKind(ElementsKind to_kind) {
   ASSERT(!map()->is_observed());
   ElementsKind from_kind = map()->elements_kind();
 
   if (IsFastHoleyElementsKind(from_kind)) {
     to_kind = GetHoleyElementsKind(to_kind);
   }
 
   if (from_kind == to_kind) return this;
 
-  MaybeObject* trans = PossiblyTransitionArrayBoilerplate(to_kind);
+  MaybeObject* trans = UpdateAllocationSiteInfo(to_kind);
   if (trans->IsFailure()) return trans;

[Toon Verwaest, 2013/02/21 12:13:03]

MaybeObject* maybe_failure = ...;
if (maybe_failure->IsFailure()) return maybe_failure;

[mvstanton, 2013/02/27 14:37:07]

Done.

 
   Isolate* isolate = GetIsolate();
   if (elements() == isolate->heap()->empty_fixed_array() ||
       (IsFastSmiOrObjectElementsKind(from_kind) &&
        IsFastSmiOrObjectElementsKind(to_kind)) ||
       (from_kind == FAST_DOUBLE_ELEMENTS &&
        to_kind == FAST_HOLEY_DOUBLE_ELEMENTS)) {
     ASSERT(from_kind != TERMINAL_FAST_ELEMENTS_KIND);
     // No change is needed to the elements() buffer, the transition
     // only requires a map change.
@@ skipping 3332 matching lines @@
   set_year(Smi::FromInt(year), SKIP_WRITE_BARRIER);
   set_month(Smi::FromInt(month), SKIP_WRITE_BARRIER);
   set_day(Smi::FromInt(day), SKIP_WRITE_BARRIER);
   set_weekday(Smi::FromInt(weekday), SKIP_WRITE_BARRIER);
   set_hour(Smi::FromInt(hour), SKIP_WRITE_BARRIER);
   set_min(Smi::FromInt(min), SKIP_WRITE_BARRIER);
   set_sec(Smi::FromInt(sec), SKIP_WRITE_BARRIER);
 }
 
 } }  // namespace v8::internal