[runtime] Optimize and unify rest parameters.

src/compiler/js-typed-lowering.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/code-factory.h"
 #include "src/compilation-dependencies.h"
 #include "src/compiler/access-builder.h"
 #include "src/compiler/js-graph.h"
 #include "src/compiler/js-typed-lowering.h"
 #include "src/compiler/linkage.h"
@@ skipping 1499 matching lines @@
   return outer_state_info.type() == FrameStateType::kArgumentsAdaptor
              ? outer_state
              : frame_state;
 }
 
 }  // namespace
 
 
 Reduction JSTypedLowering::ReduceJSCreateArguments(Node* node) {
   DCHECK_EQ(IrOpcode::kJSCreateArguments, node->opcode());
-  CreateArgumentsParameters const& p = CreateArgumentsParametersOf(node->op());
+  CreateArgumentsType type = CreateArgumentsTypeOf(node->op());
   Node* const frame_state = NodeProperties::GetFrameStateInput(node, 0);
   Node* const outer_state = frame_state->InputAt(kFrameStateOuterStateInput);
   FrameStateInfo state_info = OpParameter<FrameStateInfo>(frame_state);
 
   // Use the ArgumentsAccessStub for materializing both mapped and unmapped
   // arguments object, but only for non-inlined (i.e. outermost) frames.
   if (outer_state->opcode() != IrOpcode::kFrameState) {
-    Isolate* isolate = jsgraph()->isolate();
-    int parameter_count = state_info.parameter_count() - 1;
-    int parameter_offset = parameter_count * kPointerSize;
-    int offset = StandardFrameConstants::kCallerSPOffset + parameter_offset;
-    Node* parameter_pointer = graph()->NewNode(
-        machine()->IntAdd(), graph()->NewNode(machine()->LoadFramePointer()),
-        jsgraph()->IntPtrConstant(offset));
-
-    if (p.type() != CreateArgumentsParameters::kRestArray) {
+    if (type != CreateArgumentsType::kRestParameter) {
+      // TODO(bmeurer): Cleanup this mess at some point.
+      Isolate* isolate = jsgraph()->isolate();
+      int parameter_count = state_info.parameter_count() - 1;
+      int parameter_offset = parameter_count * kPointerSize;
+      int offset = StandardFrameConstants::kCallerSPOffset + parameter_offset;
+      Node* parameter_pointer = graph()->NewNode(
+          machine()->IntAdd(), graph()->NewNode(machine()->LoadFramePointer()),
+          jsgraph()->IntPtrConstant(offset));
       Handle<SharedFunctionInfo> shared;
       if (!state_info.shared_info().ToHandle(&shared)) return NoChange();
-      bool unmapped = p.type() == CreateArgumentsParameters::kUnmappedArguments;
+      bool unmapped = type == CreateArgumentsType::kUnmappedArguments;
       Callable callable = CodeFactory::ArgumentsAccess(
           isolate, unmapped, shared->has_duplicate_parameters());
       CallDescriptor* desc = Linkage::GetStubCallDescriptor(
           isolate, graph()->zone(), callable.descriptor(), 0,
           CallDescriptor::kNeedsFrameState);
       const Operator* new_op = common()->Call(desc);
       Node* stub_code = jsgraph()->HeapConstant(callable.code());
       node->InsertInput(graph()->zone(), 0, stub_code);
       node->InsertInput(graph()->zone(), 2,
                         jsgraph()->Constant(parameter_count));
       node->InsertInput(graph()->zone(), 3, parameter_pointer);
       NodeProperties::ChangeOp(node, new_op);
       return Changed(node);
     } else {
-      Callable callable = CodeFactory::RestArgumentsAccess(isolate);
+      Callable callable = CodeFactory::FastNewRestParameter(isolate());
       CallDescriptor* desc = Linkage::GetStubCallDescriptor(
-          isolate, graph()->zone(), callable.descriptor(), 0,
+          isolate(), graph()->zone(), callable.descriptor(), 0,
           CallDescriptor::kNeedsFrameState);
       const Operator* new_op = common()->Call(desc);
       Node* stub_code = jsgraph()->HeapConstant(callable.code());
       node->InsertInput(graph()->zone(), 0, stub_code);
-      node->ReplaceInput(1, jsgraph()->Constant(parameter_count));
-      node->InsertInput(graph()->zone(), 2, parameter_pointer);
-      node->InsertInput(graph()->zone(), 3,
-                        jsgraph()->Constant(p.start_index()));
       NodeProperties::ChangeOp(node, new_op);
       return Changed(node);
     }
   } else if (outer_state->opcode() == IrOpcode::kFrameState) {
     // Use inline allocation for all mapped arguments objects within inlined
     // (i.e. non-outermost) frames, independent of the object size.
-    if (p.type() == CreateArgumentsParameters::kMappedArguments) {
+    if (type == CreateArgumentsType::kMappedArguments) {
       Handle<SharedFunctionInfo> shared;
       if (!state_info.shared_info().ToHandle(&shared)) return NoChange();
       Node* const callee = NodeProperties::GetValueInput(node, 0);
       Node* const control = NodeProperties::GetControlInput(node);
       Node* const context = NodeProperties::GetContextInput(node);
       Node* effect = NodeProperties::GetEffectInput(node);
       // TODO(mstarzinger): Duplicate parameters are not handled yet.
       if (shared->has_duplicate_parameters()) return NoChange();
       // Choose the correct frame state and frame state info depending on
       // whether there conceptually is an arguments adaptor frame in the call
@@ skipping 21 matching lines @@
       STATIC_ASSERT(Heap::kSloppyArgumentsObjectSize == 5 * kPointerSize);
       a.Allocate(Heap::kSloppyArgumentsObjectSize);
       a.Store(AccessBuilder::ForMap(), load_arguments_map);
       a.Store(AccessBuilder::ForJSObjectProperties(), properties);
       a.Store(AccessBuilder::ForJSObjectElements(), elements);
       a.Store(AccessBuilder::ForArgumentsLength(), jsgraph()->Constant(length));
       a.Store(AccessBuilder::ForArgumentsCallee(), callee);
       RelaxControls(node);
       a.FinishAndChange(node);
       return Changed(node);
-    } else if (p.type() == CreateArgumentsParameters::kUnmappedArguments) {
+    } else if (type == CreateArgumentsType::kUnmappedArguments) {
       // Use inline allocation for all unmapped arguments objects within inlined
       // (i.e. non-outermost) frames, independent of the object size.
       Node* const control = NodeProperties::GetControlInput(node);
       Node* const context = NodeProperties::GetContextInput(node);
       Node* effect = NodeProperties::GetEffectInput(node);
       // Choose the correct frame state and frame state info depending on
       // whether there conceptually is an arguments adaptor frame in the call
       // chain.
       Node* const args_state = GetArgumentsFrameState(frame_state);
       FrameStateInfo args_state_info = OpParameter<FrameStateInfo>(args_state);
@@ skipping 14 matching lines @@
       int length = args_state_info.parameter_count() - 1;  // Minus receiver.
       STATIC_ASSERT(Heap::kStrictArgumentsObjectSize == 4 * kPointerSize);
       a.Allocate(Heap::kStrictArgumentsObjectSize);
       a.Store(AccessBuilder::ForMap(), load_arguments_map);
       a.Store(AccessBuilder::ForJSObjectProperties(), properties);
       a.Store(AccessBuilder::ForJSObjectElements(), elements);
       a.Store(AccessBuilder::ForArgumentsLength(), jsgraph()->Constant(length));
       RelaxControls(node);
       a.FinishAndChange(node);
       return Changed(node);
-    } else if (p.type() == CreateArgumentsParameters::kRestArray) {
+    } else if (type == CreateArgumentsType::kRestParameter) {
+      Handle<SharedFunctionInfo> shared;
+      if (!state_info.shared_info().ToHandle(&shared)) return NoChange();
+      int start_index = shared->internal_formal_parameter_count();
       // Use inline allocation for all unmapped arguments objects within inlined
       // (i.e. non-outermost) frames, independent of the object size.
       Node* const control = NodeProperties::GetControlInput(node);
       Node* const context = NodeProperties::GetContextInput(node);
       Node* effect = NodeProperties::GetEffectInput(node);
       // Choose the correct frame state and frame state info depending on
       // whether there conceptually is an arguments adaptor frame in the call
       // chain.
       Node* const args_state = GetArgumentsFrameState(frame_state);
       FrameStateInfo args_state_info = OpParameter<FrameStateInfo>(args_state);
       // Prepare element backing store to be used by the rest array.
       Node* const elements =
-          AllocateRestArguments(effect, control, args_state, p.start_index());
+          AllocateRestArguments(effect, control, args_state, start_index);
       effect = elements->op()->EffectOutputCount() > 0 ? elements : effect;
       // Load the JSArray object map from the current native context.
       Node* const load_native_context = effect = graph()->NewNode(
           javascript()->LoadContext(0, Context::NATIVE_CONTEXT_INDEX, true),
           context, context, effect);
       Node* const load_jsarray_map = effect = graph()->NewNode(
           simplified()->LoadField(AccessBuilder::ForContextSlot(
               Context::JS_ARRAY_FAST_ELEMENTS_MAP_INDEX)),
           load_native_context, effect, control);
       // Actually allocate and initialize the jsarray.
       AllocationBuilder a(jsgraph(), effect, control);
       Node* properties = jsgraph()->EmptyFixedArrayConstant();
 
       // -1 to minus receiver
       int argument_count = args_state_info.parameter_count() - 1;
-      int length = std::max(0, argument_count - p.start_index());
+      int length = std::max(0, argument_count - start_index);
       STATIC_ASSERT(JSArray::kSize == 4 * kPointerSize);
       a.Allocate(JSArray::kSize);
       a.Store(AccessBuilder::ForMap(), load_jsarray_map);
       a.Store(AccessBuilder::ForJSObjectProperties(), properties);
       a.Store(AccessBuilder::ForJSObjectElements(), elements);
       a.Store(AccessBuilder::ForJSArrayLength(FAST_ELEMENTS),
               jsgraph()->Constant(length));
       RelaxControls(node);
       a.FinishAndChange(node);
       return Changed(node);
@@ skipping 830 matching lines @@
 }
 
 
 CompilationDependencies* JSTypedLowering::dependencies() const {
   return dependencies_;
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8