Commit b0596e9e authored by sigurds@chromium.org's avatar sigurds@chromium.org

Add control input to LoadField.

BUG=
R=bmeurer@chromium.org

Review URL: https://codereview.chromium.org/649183003

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@24588 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 75d15894
......@@ -241,7 +241,7 @@ void Inlinee::InlineAtCall(JSGraph* jsgraph, Node* call) {
Node* context = jsgraph->graph()->NewNode(
simplified.LoadField(AccessBuilder::ForJSFunctionContext()),
NodeProperties::GetValueInput(call, 0),
NodeProperties::GetEffectInput(call));
NodeProperties::GetEffectInput(call), control);
// Context is last argument.
int inlinee_context_index = static_cast<int>(total_parameters()) - 1;
......
......@@ -118,6 +118,7 @@ inline int OperatorProperties::GetControlInputCount(const Operator* op) {
case IrOpcode::kEffectPhi:
case IrOpcode::kLoad:
case IrOpcode::kLoadElement:
case IrOpcode::kLoadField:
return 1;
#define OPCODE_CASE(x) case IrOpcode::k##x:
CONTROL_OP_LIST(OPCODE_CASE)
......
......@@ -947,7 +947,6 @@ void SimplifiedLowering::DoLoadField(Node* node) {
node->set_op(machine()->Load(access.machine_type));
Node* offset = jsgraph()->Int32Constant(access.offset - access.tag());
node->InsertInput(zone(), 1, offset);
node->AppendInput(zone(), graph()->start());
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment