Supporting AllocationSiteInfo for Nested arrays

src/ia32/full-codegen-ia32.cc

Index: src/ia32/full-codegen-ia32.cc
diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc
index 23b8c66eeaabbfbe28c2a4fd40ce4ca44478e5f4..a0d0d2a13045e74d301224ac15ff10bfbe1efec3 100644
--- a/src/ia32/full-codegen-ia32.cc
+++ b/src/ia32/full-codegen-ia32.cc
@@ -1530,12 +1530,19 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) {
   __ push(FieldOperand(edi, JSFunction::kLiteralsOffset));
   __ push(Immediate(Smi::FromInt(expr->literal_index())));
   __ push(Immediate(constant_properties));
+
   int flags = expr->fast_elements()
       ? ObjectLiteral::kFastElements
       : ObjectLiteral::kNoFlags;
   flags |= expr->has_function()
       ? ObjectLiteral::kHasFunction
       : ObjectLiteral::kNoFlags;
+
+  if (FLAG_track_allocation_sites && !IsOneTimeCode()) {
+    // Don't track global arrays that are never re-created
+    flags |= ObjectLiteral::kAllocationSiteInfoAllowed;
+  }
+
   __ push(Immediate(Smi::FromInt(flags)));
   int properties_count = constant_properties->length() / 2;
   if (expr->depth() > 1) {
@@ -1652,6 +1659,19 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) {
   Handle<FixedArrayBase> constant_elements_values(
       FixedArrayBase::cast(constant_elements->get(1)));
 
+  AllocationSiteMode allocation_site_mode = DONT_TRACK_ALLOCATION_SITE;
+  int flags = ArrayLiteral::kNoFlags;
+  if (FLAG_track_allocation_sites && !IsOneTimeCode()) {
+    // Don't track global arrays that are never re-created
+    flags |= ArrayLiteral::kAllocationSiteInfoAllowed;
+    allocation_site_mode = TRACK_ALLOCATION_SITE;
+  }
+
+  ASSERT(((flags & ArrayLiteral::kAllocationSiteInfoAllowed) &&
+          (allocation_site_mode == TRACK_ALLOCATION_SITE)) ||
+         (((flags & ArrayLiteral::kAllocationSiteInfoAllowed) == 0) &&
+          (allocation_site_mode == DONT_TRACK_ALLOCATION_SITE)));
+
   __ mov(ebx, Operand(ebp, JavaScriptFrameConstants::kFunctionOffset));
   __ push(FieldOperand(ebx, JSFunction::kLiteralsOffset));
   __ push(Immediate(Smi::FromInt(expr->literal_index())));
@@ -1668,16 +1688,16 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) {
         length);
     __ CallStub(&stub);
   } else if (expr->depth() > 1) {
-    __ CallRuntime(Runtime::kCreateArrayLiteral, 3);
+    __ push(Immediate(Smi::FromInt(flags)));
+    __ CallRuntime(Runtime::kCreateArrayLiteral, 4);
   } else if (length > FastCloneShallowArrayStub::kMaximumClonedLength) {
-    __ CallRuntime(Runtime::kCreateArrayLiteralShallow, 3);
+    __ push(Immediate(Smi::FromInt(flags)));
+    __ CallRuntime(Runtime::kCreateArrayLiteralShallow, 4);
   } else {
     ASSERT(IsFastSmiOrObjectElementsKind(constant_elements_kind) ||
            FLAG_smi_only_arrays);
     FastCloneShallowArrayStub::Mode mode =
         FastCloneShallowArrayStub::CLONE_ANY_ELEMENTS;
-    AllocationSiteMode allocation_site_mode = FLAG_track_allocation_sites
-        ? TRACK_ALLOCATION_SITE : DONT_TRACK_ALLOCATION_SITE;
 
     // If the elements are already FAST_*_ELEMENTS, the boilerplate cannot
     // change, so it's possible to specialize the stub in advance.