[turbofan] Combine family of TailCallRuntime() methods into single implementation.

src/compiler/raw-machine-assembler.h

 // 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.
 
 #ifndef V8_COMPILER_RAW_MACHINE_ASSEMBLER_H_
 #define V8_COMPILER_RAW_MACHINE_ASSEMBLER_H_
 
 #include "src/assembler.h"
-#include "src/code-factory.h"
 #include "src/compiler/common-operator.h"
 #include "src/compiler/graph.h"
 #include "src/compiler/linkage.h"
 #include "src/compiler/machine-operator.h"
 #include "src/compiler/node.h"
 #include "src/compiler/operator.h"
 #include "src/factory.h"
 #include "src/globals.h"
 
 namespace v8 {
@@ skipping 680 matching lines @@
   Node* StringConstant(const char* string) {
     return HeapConstant(isolate()->factory()->InternalizeUtf8String(string));
   }
 
   // Call a given call descriptor and the given arguments.
   Node* CallN(CallDescriptor* desc, Node* function, Node** args);
   // Call a given call descriptor and the given arguments and frame-state.
   Node* CallNWithFrameState(CallDescriptor* desc, Node* function, Node** args,
                             Node* frame_state);
 
-  // Call to a runtime function with given arguments.
+  // Call a given call descriptor and the given arguments.
   template <class... TArgs>
-  Node* CallRuntime(Runtime::FunctionId function, Node* context,
-                    TArgs... args) {
-    int argc = static_cast<int>(sizeof...(args));
-    CallDescriptor* descriptor = Linkage::GetRuntimeCallDescriptor(
-        zone(), function, argc, Operator::kNoProperties,
-        CallDescriptor::kNoFlags);
-    int return_count = static_cast<int>(descriptor->ReturnCount());
+  Node* CallV(CallDescriptor* desc, Node* target, TArgs... args) {

[Igor Sheludko, 2016/12/15 23:34:07]

I added suffix V to avoid conflicts in tests with CallHelper<R>::Call() methods.

+    int input_count = static_cast<int>(sizeof...(args)) + 1;
+    Node* nodes[] = {target, args...};
+    return AddNode(common()->Call(desc), input_count, nodes);
+  }
 
-    Node* centry =
-        HeapConstant(CodeFactory::RuntimeCEntry(isolate(), return_count));
-    Node* ref = AddNode(
-        common()->ExternalConstant(ExternalReference(function, isolate())));
-    Node* arity = Int32Constant(argc);
-
-    return AddNode(common()->Call(descriptor), centry, args..., ref, arity,
-                   context);
+  // Tail call a given call descriptor and the given arguments.
+  template <class... TArgs>
+  Node* TailCallV(CallDescriptor* desc, Node* target, TArgs... args) {
+    int input_count = static_cast<int>(sizeof...(args)) + 1;
+    Node* nodes[] = {target, args...};
+    return TailCallN(desc, input_count, nodes);
   }
 
   // Call to a C function with zero arguments.
   Node* CallCFunction0(MachineType return_type, Node* function);
   // Call to a C function with one parameter.
   Node* CallCFunction1(MachineType return_type, MachineType arg0_type,
                        Node* function, Node* arg0);
   // Call to a C function with two arguments.
   Node* CallCFunction2(MachineType return_type, MachineType arg0_type,
                        MachineType arg1_type, Node* function, Node* arg0,
                        Node* arg1);
   // Call to a C function with eight arguments.
   Node* CallCFunction8(MachineType return_type, MachineType arg0_type,
                        MachineType arg1_type, MachineType arg2_type,
                        MachineType arg3_type, MachineType arg4_type,
                        MachineType arg5_type, MachineType arg6_type,
                        MachineType arg7_type, Node* function, Node* arg0,
                        Node* arg1, Node* arg2, Node* arg3, Node* arg4,
                        Node* arg5, Node* arg6, Node* arg7);
 
   // Tail call the given call descriptor and the given arguments.
   Node* TailCallN(CallDescriptor* call_descriptor, Node* function, Node** args);
-  // Tail call to a runtime function with zero arguments.
-  Node* TailCallRuntime0(Runtime::FunctionId function, Node* context);
-  // Tail call to a runtime function with one argument.
-  Node* TailCallRuntime1(Runtime::FunctionId function, Node* arg0,
-                         Node* context);
-  // Tail call to a runtime function with two arguments.
-  Node* TailCallRuntime2(Runtime::FunctionId function, Node* arg1, Node* arg2,
-                         Node* context);
-  // Tail call to a runtime function with three arguments.
-  Node* TailCallRuntime3(Runtime::FunctionId function, Node* arg1, Node* arg2,
-                         Node* arg3, Node* context);
-  // Tail call to a runtime function with four arguments.
-  Node* TailCallRuntime4(Runtime::FunctionId function, Node* arg1, Node* arg2,
-                         Node* arg3, Node* arg4, Node* context);
-  // Tail call to a runtime function with five arguments.
-  Node* TailCallRuntime5(Runtime::FunctionId function, Node* arg1, Node* arg2,
-                         Node* arg3, Node* arg4, Node* arg5, Node* context);
-  // Tail call to a runtime function with six arguments.
-  Node* TailCallRuntime6(Runtime::FunctionId function, Node* arg1, Node* arg2,
-                         Node* arg3, Node* arg4, Node* arg5, Node* arg6,
-                         Node* context);
 
   // ===========================================================================
   // The following utility methods deal with control flow, hence might switch
   // the current basic block or create new basic blocks for labels.
 
   // Control flow.
   void Goto(RawMachineLabel* label);
   void Branch(Node* condition, RawMachineLabel* true_val,
               RawMachineLabel* false_val);
   void Switch(Node* index, RawMachineLabel* default_label,
@@ skipping 44 matching lines @@
     Node* buffer[] = {n1, args...};
     return AddNode(op, sizeof...(args) + 1, buffer);
   }
 
  private:
   Node* MakeNode(const Operator* op, int input_count, Node* const* inputs);
   BasicBlock* Use(RawMachineLabel* label);
   BasicBlock* EnsureBlock(RawMachineLabel* label);
   BasicBlock* CurrentBlock();
 
+  Node* TailCallN(CallDescriptor* desc, int input_count, Node* const* inputs);
+
   Schedule* schedule() { return schedule_; }
   size_t parameter_count() const { return call_descriptor_->ParameterCount(); }
 
   Isolate* isolate_;
   Graph* graph_;
   Schedule* schedule_;
   MachineOperatorBuilder machine_;
   CommonOperatorBuilder common_;
   CallDescriptor* call_descriptor_;
   NodeVector parameters_;
@@ skipping 17 matching lines @@
   bool deferred_;
   friend class RawMachineAssembler;
   DISALLOW_COPY_AND_ASSIGN(RawMachineLabel);
 };
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_COMPILER_RAW_MACHINE_ASSEMBLER_H_