Convert Linkage to use MachineSignature.

src/compiler/structured-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_STRUCTURED_MACHINE_ASSEMBLER_H_
 #define V8_COMPILER_STRUCTURED_MACHINE_ASSEMBLER_H_
 
 #include "src/v8.h"
 
 #include "src/compiler/common-operator.h"
@@ skipping 43 matching lines @@
     bool is_dead_;
     friend class StructuredMachineAssembler;
     DISALLOW_COPY_AND_ASSIGN(Environment);
   };
 
   class IfBuilder;
   friend class IfBuilder;
   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);
   // Variables.
   Variable NewVariable(Node* initial_value);
   // Control flow.
   void Return(Node* value);
 
   // MachineAssembler is invalid after export.
   Schedule* Export();
@@ skipping 27 matching lines @@
   }
   Environment* Copy(Environment* environment, int truncate_at);
   void Merge(EnvironmentVector* environments, int truncate_at);
   Environment* CopyForLoopHeader(Environment* environment);
   void MergeBackEdgesToLoopHeader(Environment* header,
                                   EnvironmentVector* environments);
 
   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_;
 
   friend class Variable;
   // For testing only.
   friend class StructuredMachineAssemblerFriend;
   DISALLOW_COPY_AND_ASSIGN(StructuredMachineAssembler);
 };
 
@@ skipping 156 matching lines @@
   EnvironmentVector pending_header_merges_;
   EnvironmentVector pending_exit_merges_;
   DISALLOW_COPY_AND_ASSIGN(LoopBuilder);
 };
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_COMPILER_STRUCTURED_MACHINE_ASSEMBLER_H_