Reviewers: Benedikt Meurer,
Message:
Please take a look :)
Description:
Add control input to LoadField.
BUG=
Please review this at https://codereview.chromium.org/649183003/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+2, -2 lines):
M src/compiler/js-inlining.cc
M src/compiler/operator-properties-inl.h
M src/compiler/simplified-lowering.cc
Index: src/compiler/js-inlining.cc
diff --git a/src/compiler/js-inlining.cc b/src/compiler/js-inlining.cc
index
00e4011b416665c8c1b318b2913f7df253614d51..5e868e9bd1ee9310f7e9c757c9c0bff34a0bf2c4
100644
--- a/src/compiler/js-inlining.cc
+++ b/src/compiler/js-inlining.cc
@@ -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;
Index: src/compiler/operator-properties-inl.h
diff --git a/src/compiler/operator-properties-inl.h
b/src/compiler/operator-properties-inl.h
index
1c9ef009f32c2aeff6b4090d29ddf0b82c970dc3..2ddaeca145c8163f3232cdbcd8c4408807b2ed55
100644
--- a/src/compiler/operator-properties-inl.h
+++ b/src/compiler/operator-properties-inl.h
@@ -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)
Index: src/compiler/simplified-lowering.cc
diff --git a/src/compiler/simplified-lowering.cc
b/src/compiler/simplified-lowering.cc
index
fe0280b393c03cd6bf4d2b3c79f48eb4fdd6fcec..7a0f32493239279bb25136f23e1fbd7c76a1c4b3
100644
--- a/src/compiler/simplified-lowering.cc
+++ b/src/compiler/simplified-lowering.cc
@@ -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());
}
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
