Convert Linkage to use MachineSignature.

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/v8.h"
 
 #include "src/compiler/common-operator.h"
@@ skipping 27 matching lines @@
     explicit Label(BasicBlock* block)
         : block_(block), used_(false), bound_(false) {}
 
     BasicBlock* block_;
     bool used_;
     bool bound_;
     friend class RawMachineAssembler;
     DISALLOW_COPY_AND_ASSIGN(Label);
   };
 
-  RawMachineAssembler(Graph* graph,
-                      MachineCallDescriptorBuilder* call_descriptor_builder,
+  RawMachineAssembler(Graph* graph, MachineSignature* machine_sig,
                       MachineType word = kMachPtr);
   virtual ~RawMachineAssembler() {}
 
   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);
 
   // Control flow.
   Label* Exit();
   void Goto(Label* label);
   void Branch(Node* condition, Label* true_val, Label* false_val);
   // Call through CallFunctionStub with lazy deopt and frame-state.
   Node* CallFunctionStub0(Node* function, Node* receiver, Node* context,
                           Node* frame_state, CallFunctionFlags flags);
   // Call to a JS function with zero parameters.
-  Node* CallJS0(Node* function, Node* receiver, Node* frame_state);
+  Node* CallJS0(Node* function, Node* receiver, Node* context,
+                Node* frame_state);
   // Call to a runtime function with zero parameters.
-  Node* CallRuntime1(Runtime::FunctionId function, Node* arg0,
+  Node* CallRuntime1(Runtime::FunctionId function, Node* arg0, Node* context,
                      Node* frame_state);
   void Return(Node* value);
   void Bind(Label* label);
   void Deoptimize(Node* state);
 
   // Variables.
   Node* Phi(Node* n1, Node* n2) { return NewNode(common()->Phi(2), n1, n2); }
   Node* Phi(Node* n1, Node* n2, Node* n3) {
     return NewNode(common()->Phi(3), n1, n2, n3);
   }
@@ skipping 15 matching lines @@
  private:
   bool ScheduleValid() { return schedule_ != NULL; }
 
   BasicBlock* Use(Label* label);
   BasicBlock* EnsureBlock(Label* label);
   BasicBlock* CurrentBlock();
 
   Schedule* schedule_;
   MachineOperatorBuilder machine_;
   CommonOperatorBuilder common_;
-  MachineCallDescriptorBuilder* call_descriptor_builder_;
+  MachineSignature* machine_sig_;
+  CallDescriptor* call_descriptor_;
   Node** parameters_;
   Label exit_label_;
   BasicBlock* current_block_;
 
   DISALLOW_COPY_AND_ASSIGN(RawMachineAssembler);
 };
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_COMPILER_RAW_MACHINE_ASSEMBLER_H_