Convert Linkage to use MachineSignature.

src/compiler/machine-node-factory.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_MACHINE_NODE_FACTORY_H_
 #define V8_COMPILER_MACHINE_NODE_FACTORY_H_
 
 #ifdef USE_SIMULATOR
 #define MACHINE_ASSEMBLER_SUPPORTS_CALL_C 0
 #else
 #define MACHINE_ASSEMBLER_SUPPORTS_CALL_C 1
 #endif
 
 #include "src/v8.h"
 
 #include "src/compiler/machine-operator.h"
 #include "src/compiler/node.h"
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
-class MachineCallDescriptorBuilder : public ZoneObject {
- public:
-  MachineCallDescriptorBuilder(MachineType return_type, int parameter_count,
-                               const MachineType* parameter_types)
-      : return_type_(return_type),
-        parameter_count_(parameter_count),
-        parameter_types_(parameter_types) {}
-
-  int parameter_count() const { return parameter_count_; }
-  const MachineType* parameter_types() const { return parameter_types_; }
-
-  CallDescriptor* BuildCallDescriptor(Zone* zone) {
-    return Linkage::GetSimplifiedCDescriptor(zone, parameter_count_,
-                                             return_type_, parameter_types_);
-  }
-
- private:
-  const MachineType return_type_;
-  const int parameter_count_;
-  const MachineType* const parameter_types_;
-};
-
-
 #define ZONE() static_cast<NodeFactory*>(this)->zone()
 #define COMMON() static_cast<NodeFactory*>(this)->common()
 #define MACHINE() static_cast<NodeFactory*>(this)->machine()
+#define MACHINE_SIG() static_cast<NodeFactory*>(this)->machine_sig()
 #define NEW_NODE_0(op) static_cast<NodeFactory*>(this)->NewNode(op)
 #define NEW_NODE_1(op, a) static_cast<NodeFactory*>(this)->NewNode(op, a)
 #define NEW_NODE_2(op, a, b) static_cast<NodeFactory*>(this)->NewNode(op, a, b)
 #define NEW_NODE_3(op, a, b, c) \
   static_cast<NodeFactory*>(this)->NewNode(op, a, b, c)
 
 template <typename NodeFactory>
 class MachineNodeFactory {
  public:
   // Constants.
@@ skipping 303 matching lines @@
     return NEW_NODE_1(MACHINE()->TruncateFloat64ToInt32(), a);
   }
   Node* TruncateInt64ToInt32(Node* a) {
     return NEW_NODE_1(MACHINE()->TruncateInt64ToInt32(), a);
   }
 
 #ifdef MACHINE_ASSEMBLER_SUPPORTS_CALL_C
   // Call to C.
   Node* CallC(Node* function_address, MachineType return_type,
               MachineType* arg_types, Node** args, int n_args) {
-    CallDescriptor* descriptor = Linkage::GetSimplifiedCDescriptor(
-        ZONE(), n_args, return_type, arg_types);
+    CallDescriptor* descriptor =
+        Linkage::GetSimplifiedCDescriptor(ZONE(), MACHINE_SIG());
     Node** passed_args =
         static_cast<Node**>(alloca((n_args + 1) * sizeof(args[0])));
     passed_args[0] = function_address;
     for (int i = 0; i < n_args; ++i) {
       passed_args[i + 1] = args[i];
     }
     return NEW_NODE_2(COMMON()->Call(descriptor), n_args + 1, passed_args);
   }
 #endif
 };
 
 #undef NEW_NODE_0
 #undef NEW_NODE_1
 #undef NEW_NODE_2
 #undef NEW_NODE_3
 #undef MACHINE
 #undef COMMON
 #undef ZONE
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_COMPILER_MACHINE_NODE_FACTORY_H_