Convert Linkage to use MachineSignature.

src/compiler/structured-machine-assembler.h

Index: src/compiler/structured-machine-assembler.h
diff --git a/src/compiler/structured-machine-assembler.h b/src/compiler/structured-machine-assembler.h
index 7fe34a1db6c43679cf4dc417463af3afed8003c9..b344673196e37db4f9d19a5ad9cdee78c64e65ff 100644
--- a/src/compiler/structured-machine-assembler.h
+++ b/src/compiler/structured-machine-assembler.h
@@ -61,24 +61,17 @@ class StructuredMachineAssembler
   class LoopBuilder;
   friend class LoopBuilder;
 
-  StructuredMachineAssembler(
-      Graph* graph, MachineCallDescriptorBuilder* call_descriptor_builder,
-      MachineType word = kMachPtr);
+  StructuredMachineAssembler(Graph* graph, MachineSignature* machine_sig,
+                             MachineType word = kMachPtr);
   virtual ~StructuredMachineAssembler() {}
 
   Isolate* isolate() const { return zone()->isolate(); }
   Zone* zone() const { return graph()->zone(); }
   MachineOperatorBuilder* machine() { return &machine_; }
   CommonOperatorBuilder* common() { return &common_; }
-  CallDescriptor* call_descriptor() const {
-    return call_descriptor_builder_->BuildCallDescriptor(zone());
-  }
-  int parameter_count() const {
-    return call_descriptor_builder_->parameter_count();
-  }
-  const MachineType* parameter_types() const {
-    return call_descriptor_builder_->parameter_types();
-  }
+  CallDescriptor* call_descriptor() const { return call_descriptor_; }
+  int parameter_count() { return machine_sig_->ParamCount(); }

[Benedikt Meurer, 2014/09/02 08:37:42]

Nit: size_t + const

[titzer, 2014/09/02 12:13:53]

Done.

+  MachineSignature* machine_sig() const { return machine_sig_; }
 
   // Parameters.
   Node* Parameter(int index);
@@ -126,7 +119,8 @@ class StructuredMachineAssembler
   Schedule* schedule_;
   MachineOperatorBuilder machine_;
   CommonOperatorBuilder common_;
-  MachineCallDescriptorBuilder* call_descriptor_builder_;
+  MachineSignature* machine_sig_;
+  CallDescriptor* call_descriptor_;
   Node** parameters_;
   Environment* current_environment_;
   int number_of_variables_;