Index: src/compiler/raw-machine-assembler.cc |
diff --git a/src/compiler/raw-machine-assembler.cc b/src/compiler/raw-machine-assembler.cc |
index 3b4a9aca3ccfd2acf8ea89bfc914f65d6b6eda1c..f978f9c24fc54e1c723ec4217b003b8a8f0235f4 100644 |
--- a/src/compiler/raw-machine-assembler.cc |
+++ b/src/compiler/raw-machine-assembler.cc |
@@ -10,14 +10,16 @@ namespace v8 { |
namespace internal { |
namespace compiler { |
-RawMachineAssembler::RawMachineAssembler( |
- Graph* graph, MachineCallDescriptorBuilder* call_descriptor_builder, |
- MachineType word) |
+RawMachineAssembler::RawMachineAssembler(Graph* graph, |
+ MachineSignature* machine_sig, |
+ MachineType word) |
: GraphBuilder(graph), |
schedule_(new (zone()) Schedule(zone())), |
machine_(zone(), word), |
common_(zone()), |
- call_descriptor_builder_(call_descriptor_builder), |
+ machine_sig_(machine_sig), |
+ call_descriptor_( |
+ Linkage::GetSimplifiedCDescriptor(graph->zone(), machine_sig)), |
parameters_(NULL), |
exit_label_(schedule()->end()), |
current_block_(schedule()->start()) { |
@@ -95,17 +97,18 @@ Node* RawMachineAssembler::CallFunctionStub0(Node* function, Node* receiver, |
Node* RawMachineAssembler::CallJS0(Node* function, Node* receiver, |
- Node* frame_state) { |
+ Node* context, Node* frame_state) { |
CallDescriptor* descriptor = Linkage::GetJSCallDescriptor(1, zone()); |
Node* call = graph()->NewNode(common()->Call(descriptor), function, receiver, |
- frame_state); |
+ context, frame_state); |
schedule()->AddNode(CurrentBlock(), call); |
return call; |
} |
Node* RawMachineAssembler::CallRuntime1(Runtime::FunctionId function, |
- Node* arg0, Node* frame_state) { |
+ Node* arg0, Node* context, |
+ Node* frame_state) { |
CallDescriptor* descriptor = Linkage::GetRuntimeCallDescriptor( |
function, 1, Operator::kNoProperties, CallDescriptor::kNeedsFrameState, |
zone()); |
@@ -114,7 +117,6 @@ Node* RawMachineAssembler::CallRuntime1(Runtime::FunctionId function, |
Node* ref = NewNode( |
common()->ExternalConstant(ExternalReference(function, isolate()))); |
Node* arity = Int32Constant(1); |
- Node* context = Parameter(1); |
Node* call = graph()->NewNode(common()->Call(descriptor), centry, arg0, ref, |
arity, context, frame_state); |