[compiler] Simplify paramerters for spread call.

src/compiler/js-operator.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/compiler/js-operator.h"
 
 #include <limits>
 
 #include "src/base/lazy-instance.h"
 #include "src/compiler/opcodes.h"
@@ skipping 58 matching lines @@
 
 std::ostream& operator<<(std::ostream& os, ConstructParameters const& p) {
   return os << p.arity() << ", " << p.frequency();
 }
 
 ConstructParameters const& ConstructParametersOf(Operator const* op) {
   DCHECK_EQ(IrOpcode::kJSConstruct, op->opcode());
   return OpParameter<ConstructParameters>(op);
 }
 
-bool operator==(ConstructWithSpreadParameters const& lhs,
-                ConstructWithSpreadParameters const& rhs) {
+bool operator==(SpreadWithArityParameters const& lhs,
+                SpreadWithArityParameters const& rhs) {
   return lhs.arity() == rhs.arity();
 }
 
-bool operator!=(ConstructWithSpreadParameters const& lhs,
-                ConstructWithSpreadParameters const& rhs) {
+bool operator!=(SpreadWithArityParameters const& lhs,
+                SpreadWithArityParameters const& rhs) {
   return !(lhs == rhs);
 }
 
-size_t hash_value(ConstructWithSpreadParameters const& p) {
+size_t hash_value(SpreadWithArityParameters const& p) {
   return base::hash_combine(p.arity());
 }
 
-std::ostream& operator<<(std::ostream& os,
-                         ConstructWithSpreadParameters const& p) {
+std::ostream& operator<<(std::ostream& os, SpreadWithArityParameters const& p) {
   return os << p.arity();
 }
 
-ConstructWithSpreadParameters const& ConstructWithSpreadParametersOf(
+SpreadWithArityParameters const& SpreadWithArityParametersOf(
     Operator const* op) {
-  DCHECK_EQ(IrOpcode::kJSConstructWithSpread, op->opcode());
-  return OpParameter<ConstructWithSpreadParameters>(op);
+  DCHECK(op->opcode() == IrOpcode::kJSConstructWithSpread ||
+         op->opcode() == IrOpcode::kJSCallWithSpread);
+  return OpParameter<SpreadWithArityParameters>(op);
 }
 
 std::ostream& operator<<(std::ostream& os, CallParameters const& p) {
   os << p.arity() << ", " << p.frequency() << ", " << p.convert_mode() << ", "
      << p.tail_call_mode();
   return os;
 }
 
 const CallParameters& CallParametersOf(const Operator* op) {
   DCHECK_EQ(IrOpcode::kJSCall, op->opcode());
   return OpParameter<CallParameters>(op);
 }
 
 std::ostream& operator<<(std::ostream& os,
                          CallForwardVarargsParameters const& p) {
   return os << p.start_index() << ", " << p.tail_call_mode();
 }
 
 CallForwardVarargsParameters const& CallForwardVarargsParametersOf(
     Operator const* op) {
   DCHECK_EQ(IrOpcode::kJSCallForwardVarargs, op->opcode());
   return OpParameter<CallForwardVarargsParameters>(op);
 }
 
-bool operator==(CallWithSpreadParameters const& lhs,
-                CallWithSpreadParameters const& rhs) {
-  return lhs.arity() == rhs.arity();
-}
-
-bool operator!=(CallWithSpreadParameters const& lhs,
-                CallWithSpreadParameters const& rhs) {
-  return !(lhs == rhs);
-}
-
-size_t hash_value(CallWithSpreadParameters const& p) {
-  return base::hash_combine(p.arity());
-}
-
-std::ostream& operator<<(std::ostream& os, CallWithSpreadParameters const& p) {
-  return os << p.arity();
-}
-
-CallWithSpreadParameters const& CallWithSpreadParametersOf(Operator const* op) {
-  DCHECK_EQ(IrOpcode::kJSCallWithSpread, op->opcode());
-  return OpParameter<CallWithSpreadParameters>(op);
-}
 
 bool operator==(CallRuntimeParameters const& lhs,
                 CallRuntimeParameters const& rhs) {
   return lhs.id() == rhs.id() && lhs.arity() == rhs.arity();
 }
 
 
 bool operator!=(CallRuntimeParameters const& lhs,
                 CallRuntimeParameters const& rhs) {
   return !(lhs == rhs);
@@ skipping 600 matching lines @@
   CallParameters parameters(arity, frequency, feedback, tail_call_mode,
                             convert_mode);
   return new (zone()) Operator1<CallParameters>(   // --
       IrOpcode::kJSCall, Operator::kNoProperties,  // opcode
       "JSCall",                                    // name
       parameters.arity(), 1, 1, 1, 1, 2,           // inputs/outputs
       parameters);                                 // parameter
 }
 
 const Operator* JSOperatorBuilder::CallWithSpread(uint32_t arity) {
-  CallWithSpreadParameters parameters(arity);
-  return new (zone()) Operator1<CallWithSpreadParameters>(   // --
+  SpreadWithArityParameters parameters(arity);
+  return new (zone()) Operator1<SpreadWithArityParameters>(  // --
       IrOpcode::kJSCallWithSpread, Operator::kNoProperties,  // opcode
       "JSCallWithSpread",                                    // name
       parameters.arity(), 1, 1, 1, 1, 2,                     // counts
       parameters);                                           // parameter
 }
 
 const Operator* JSOperatorBuilder::CallRuntime(Runtime::FunctionId id) {
   const Runtime::Function* f = Runtime::FunctionForId(id);
   return CallRuntime(f, f->nargs);
 }
@@ skipping 21 matching lines @@
                                              VectorSlotPair const& feedback) {
   ConstructParameters parameters(arity, frequency, feedback);
   return new (zone()) Operator1<ConstructParameters>(   // --
       IrOpcode::kJSConstruct, Operator::kNoProperties,  // opcode
       "JSConstruct",                                    // name
       parameters.arity(), 1, 1, 1, 1, 2,                // counts
       parameters);                                      // parameter
 }
 
 const Operator* JSOperatorBuilder::ConstructWithSpread(uint32_t arity) {
-  ConstructWithSpreadParameters parameters(arity);
-  return new (zone()) Operator1<ConstructWithSpreadParameters>(   // --
+  SpreadWithArityParameters parameters(arity);
+  return new (zone()) Operator1<SpreadWithArityParameters>(       // --
       IrOpcode::kJSConstructWithSpread, Operator::kNoProperties,  // opcode
       "JSConstructWithSpread",                                    // name
       parameters.arity(), 1, 1, 1, 1, 2,                          // counts
       parameters);                                                // parameter
 }
 
 const Operator* JSOperatorBuilder::ConvertReceiver(
     ConvertReceiverMode convert_mode) {
   return new (zone()) Operator1<ConvertReceiverMode>(         // --
       IrOpcode::kJSConvertReceiver, Operator::kEliminatable,  // opcode
@@ skipping 254 matching lines @@
   return new (zone()) Operator1<Handle<ScopeInfo>>(               // --
       IrOpcode::kJSCreateScriptContext, Operator::kNoProperties,  // opcode
       "JSCreateScriptContext",                                    // name
       1, 1, 1, 1, 1, 2,                                           // counts
       scope_info);                                                // parameter
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8