Supporting AllocationSiteInfo for Nested arrays

src/arm/full-codegen-arm.cc

 // 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 1571 matching lines @@
   __ ldr(r3, MemOperand(fp,  JavaScriptFrameConstants::kFunctionOffset));
   __ ldr(r3, FieldMemOperand(r3, JSFunction::kLiteralsOffset));
   __ mov(r2, Operand(Smi::FromInt(expr->literal_index())));
   __ mov(r1, Operand(constant_properties));
   int flags = expr->fast_elements()
       ? ObjectLiteral::kFastElements
       : ObjectLiteral::kNoFlags;
   flags |= expr->has_function()
       ? ObjectLiteral::kHasFunction
       : ObjectLiteral::kNoFlags;
+
+  if (FLAG_track_allocation_sites &&
+      (loop_depth() != 0 || !scope()->is_global_scope())) {

[danno, 2013/02/08 13:44:38]

Add this as a predicate somewhere?

[mvstanton, 2013/02/11 11:11:24]

Done.

+    // Don't track global arrays that are never re-created
+    flags |= ObjectLiteral::kAllocationSiteInfoAllowed;
+  }
+
   __ mov(r0, Operand(Smi::FromInt(flags)));
   __ Push(r3, r2, r1, r0);
   int properties_count = constant_properties->length() / 2;
   if (expr->depth() > 1) {
     __ CallRuntime(Runtime::kCreateObjectLiteral, 4);
   } else if (flags != ObjectLiteral::kFastElements ||
       properties_count > FastCloneShallowObjectStub::kMaximumClonedProperties) {
     __ CallRuntime(Runtime::kCreateObjectLiteralShallow, 4);
   } else {
     FastCloneShallowObjectStub stub(properties_count);
@@ skipping 102 matching lines @@
   ZoneList<Expression*>* subexprs = expr->values();
   int length = subexprs->length();
   Handle<FixedArray> constant_elements = expr->constant_elements();
   ASSERT_EQ(2, constant_elements->length());
   ElementsKind constant_elements_kind =
       static_cast<ElementsKind>(Smi::cast(constant_elements->get(0))->value());
   bool has_fast_elements = IsFastObjectElementsKind(constant_elements_kind);
   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 &&
+      (loop_depth() != 0 || !scope()->is_global_scope())) {

[danno, 2013/02/08 13:44:38]

Add this as a predicate somewhere?

[mvstanton, 2013/02/11 11:11:24]

Done.

+    // Don't track global arrays that are never re-created
+    flags |= ArrayLiteral::kAllocationSiteInfoAllowed;
+    allocation_site_mode = TRACK_ALLOCATION_SITE;
+  }
+
   __ ldr(r3, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset));
   __ ldr(r3, FieldMemOperand(r3, JSFunction::kLiteralsOffset));
   __ mov(r2, Operand(Smi::FromInt(expr->literal_index())));
   __ mov(r1, Operand(constant_elements));
-  __ Push(r3, r2, r1);
+
+  ASSERT(((flags & ArrayLiteral::kAllocationSiteInfoAllowed) &&
+          (allocation_site_mode == TRACK_ALLOCATION_SITE)) ||
+         (((flags & ArrayLiteral::kAllocationSiteInfoAllowed) == 0) &&
+          (allocation_site_mode == DONT_TRACK_ALLOCATION_SITE)));
+  __ mov(r0, Operand(Smi::FromInt(flags)));
+  __ Push(r3, r2, r1, r0);
   if (has_fast_elements && constant_elements_values->map() ==
       isolate()->heap()->fixed_cow_array_map()) {
     FastCloneShallowArrayStub stub(
         FastCloneShallowArrayStub::COPY_ON_WRITE_ELEMENTS,
         DONT_TRACK_ALLOCATION_SITE,
         length);

[danno, 2013/02/08 13:44:38]

With the parameterized stub, don't push the flags here.

[mvstanton, 2013/02/11 11:11:24]

Done.

     __ CallStub(&stub);
     __ IncrementCounter(
         isolate()->counters()->cow_arrays_created_stub(), 1, r1, r2);
   } else if (expr->depth() > 1) {

[danno, 2013/02/08 13:44:38]

but push them here...

[mvstanton, 2013/02/11 11:11:24]

Done.

-    __ CallRuntime(Runtime::kCreateArrayLiteral, 3);
+    __ CallRuntime(Runtime::kCreateArrayLiteral, 4);
   } else if (length > FastCloneShallowArrayStub::kMaximumClonedLength) {

[danno, 2013/02/08 13:44:38]

and here...

[mvstanton, 2013/02/11 11:11:24]

Done.

-    __ CallRuntime(Runtime::kCreateArrayLiteralShallow, 3);
+    __ CallRuntime(Runtime::kCreateArrayLiteralShallow, 4);
   } else {
     ASSERT(IsFastSmiOrObjectElementsKind(constant_elements_kind) ||

[danno, 2013/02/08 13:44:38]

But not here...

[mvstanton, 2013/02/11 11:11:24]

Done.

            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 (has_fast_elements) {
       mode = FastCloneShallowArrayStub::CLONE_ELEMENTS;
       allocation_site_mode = DONT_TRACK_ALLOCATION_SITE;
     }
 
     FastCloneShallowArrayStub stub(mode, allocation_site_mode, length);
     __ CallStub(&stub);
   }
 
@@ skipping 2813 matching lines @@
   *context_length = 0;
   return previous_;
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_ARM