Chromium Code Reviews| Index: src/compiler/js-inlining.cc |
| diff --git a/src/compiler/js-inlining.cc b/src/compiler/js-inlining.cc |
| index e1d3fcbc0465dfd47ddea53208adff2b53025188..2d6299fa299e6ab03c583bc1a7113280a032338f 100644 |
| --- a/src/compiler/js-inlining.cc |
| +++ b/src/compiler/js-inlining.cc |
| @@ -14,6 +14,7 @@ |
| #include "src/compiler/js-operator.h" |
| #include "src/compiler/node-matchers.h" |
| #include "src/compiler/node-properties.h" |
| +#include "src/compiler/operator-properties.h" |
| #include "src/compiler/simplified-operator.h" |
| #include "src/compiler/typer.h" |
| #include "src/full-codegen.h" |
| @@ -49,7 +50,7 @@ class JSCallFunctionAccessor { |
| return value_inputs - 2; |
| } |
| - Node* frame_state() { return NodeProperties::GetFrameStateInput(call_); } |
| + Node* frame_state() { return NodeProperties::GetFrameStateInput(call_, 0); } |
| private: |
| Node* call_; |
| @@ -375,8 +376,9 @@ Reduction JSInliner::Reduce(Node* node) { |
| for (Node* node : visitor.copies()) { |
| if (node && node->opcode() == IrOpcode::kFrameState) { |
| + DCHECK(OperatorProperties::GetFrameStateInputCount(node->op()) == 1); |
|
Benedikt Meurer
2015/03/09 05:32:34
DCHECK_EQ?
Jarin
2015/03/09 07:47:11
Done.
|
| AddClosureToFrameState(node, function); |
| - NodeProperties::ReplaceFrameStateInput(node, outer_frame_state); |
| + NodeProperties::ReplaceFrameStateInput(node, 0, outer_frame_state); |
| } |
| } |
| } |