Index: src/compiler/raw-machine-assembler.h |
diff --git a/src/compiler/raw-machine-assembler.h b/src/compiler/raw-machine-assembler.h |
index 04e0fee704e9c7904c2aefc3f44732a67cd32e27..5e08d40dbb9b3e9e307d925c65cb53d52d1576ef 100644 |
--- a/src/compiler/raw-machine-assembler.h |
+++ b/src/compiler/raw-machine-assembler.h |
@@ -45,8 +45,7 @@ class RawMachineAssembler : public GraphBuilder, |
DISALLOW_COPY_AND_ASSIGN(Label); |
}; |
- RawMachineAssembler(Graph* graph, |
- MachineCallDescriptorBuilder* call_descriptor_builder, |
+ RawMachineAssembler(Graph* graph, MachineSignature* machine_sig, |
MachineType word = kMachPtr); |
virtual ~RawMachineAssembler() {} |
@@ -54,18 +53,12 @@ class RawMachineAssembler : public GraphBuilder, |
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_; } |
+ size_t parameter_count() const { return machine_sig_->parameter_count(); } |
+ MachineSignature* machine_sig() const { return machine_sig_; } |
// Parameters. |
- Node* Parameter(int index); |
+ Node* Parameter(size_t index); |
// Control flow. |
Label* Exit(); |
@@ -75,9 +68,10 @@ class RawMachineAssembler : public GraphBuilder, |
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); |
@@ -113,7 +107,8 @@ class RawMachineAssembler : public GraphBuilder, |
Schedule* schedule_; |
MachineOperatorBuilder machine_; |
CommonOperatorBuilder common_; |
- MachineCallDescriptorBuilder* call_descriptor_builder_; |
+ MachineSignature* machine_sig_; |
+ CallDescriptor* call_descriptor_; |
Node** parameters_; |
Label exit_label_; |
BasicBlock* current_block_; |