Adapt hydrogen-based Array constructor to also support InternalArray and function call

src/hydrogen.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 1874 matching lines @@
   HInstruction* array_function = AddInstruction(new(zone())
       HLoadNamedField(native_context, true, Representation::Tagged(), offset));
   return array_function;
 }
 
 
 HGraphBuilder::JSArrayBuilder::JSArrayBuilder(HGraphBuilder* builder,
                                               ElementsKind kind,
                                               HValue* allocation_site_payload,
                                               AllocationSiteMode mode) :
         builder_(builder),

[Michael Starzinger, 2013/05/23 09:16:49]

nit: Indentation is off.

[mvstanton, 2013/05/23 14:46:05]

Done.

         kind_(kind),
-        allocation_site_payload_(allocation_site_payload) {
+        allocation_site_payload_(allocation_site_payload),
+        constructor_function_(NULL) {
   if (mode == DONT_TRACK_ALLOCATION_SITE) {
     mode_ = mode;
   } else {
     mode_ = AllocationSiteInfo::GetMode(kind);
   }
 }
 
 
+HGraphBuilder::JSArrayBuilder::JSArrayBuilder(HGraphBuilder* builder,
+                                              ElementsKind kind,
+                                              HValue* constructor_function) :
+        builder_(builder),

[Michael Starzinger, 2013/05/23 09:16:49]

nit: Indentation is off.

[mvstanton, 2013/05/23 14:46:05]

Done.

+        kind_(kind),
+        mode_(DONT_TRACK_ALLOCATION_SITE),
+        allocation_site_payload_(NULL),
+        constructor_function_(constructor_function) {
+}
+
+
 HValue* HGraphBuilder::JSArrayBuilder::EmitMapCode(HValue* context) {
   HInstruction* native_context = builder()->BuildGetNativeContext(context);
   int offset = Context::kHeaderSize +
       kPointerSize * Context::JS_ARRAY_MAPS_INDEX;
   HInstruction* map_array = AddInstruction(new(zone())
       HLoadNamedField(native_context, true, Representation::Tagged(), offset));
   offset = kind_ * kPointerSize + FixedArrayBase::kHeaderSize;
   return AddInstruction(new(zone()) HLoadNamedField(
       map_array, true, Representation::Tagged(), offset));
 }
 
 
+HValue* HGraphBuilder::JSArrayBuilder::InternalEmitMapCode() {
+  // Find the map near the constructor function
+  HValue* initial_map = AddInstruction(new(zone())
+      HLoadNamedField(constructor_function_, true, Representation::Tagged(),
+                      JSFunction::kPrototypeOrInitialMapOffset));
+  return initial_map;
+}
+
+
 HValue* HGraphBuilder::JSArrayBuilder::EstablishAllocationSize(
     HValue* length_node) {
   HValue* context = builder()->environment()->LookupContext();
   ASSERT(length_node != NULL);
 
   int base_size = JSArray::kSize;
   if (mode_ == TRACK_ALLOCATION_SITE) {
     base_size += AllocationSiteInfo::kSize;
   }
 
@@ skipping 66 matching lines @@
                                                      bool fill_with_hole) {
   HValue* context = builder()->environment()->LookupContext();
 
   // Allocate (dealing with failure appropriately)
   HAllocate::Flags flags = HAllocate::DefaultFlags(kind_);
   HAllocate* new_object = new(zone()) HAllocate(context, size_in_bytes,
                                                 HType::JSArray(), flags);
   AddInstruction(new_object);
 
   // Fill in the fields: map, properties, length
-  HValue* map = EmitMapCode(context);
+  HValue* map;
+  if (constructor_function_ != NULL) {
+    map = InternalEmitMapCode();
+  } else {
+    map = EmitMapCode(context);
+  }
   elements_location_ = builder()->BuildJSArrayHeader(new_object,
                                                      map,
                                                      mode_,
                                                      allocation_site_payload_,
                                                      length_field);
 
   // Initialize the elements
   builder()->BuildInitializeElements(elements_location_, kind_, capacity);
 
   if (fill_with_hole) {
@@ skipping 10444 matching lines @@
     }
   }
 
 #ifdef DEBUG
   if (graph_ != NULL) graph_->Verify(false);  // No full verify.
   if (allocator_ != NULL) allocator_->Verify();
 #endif
 }
 
 } }  // namespace v8::internal