diff options
| author | Michaël Zasso <targos@protonmail.com> | 2017-02-14 11:27:26 +0100 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2017-02-22 15:55:42 +0100 |
| commit | 7a77daf24344db7942e34c962b0f1ee729ab7af5 (patch) | |
| tree | e7cbe7bf4e2f4b802a8f5bc18336c546cd6a0d7f /deps/v8/src/compiler/common-operator-reducer.cc | |
| parent | 5f08871ee93ea739148cc49e0f7679e33c70295a (diff) | |
| download | node-new-7a77daf24344db7942e34c962b0f1ee729ab7af5.tar.gz | |
deps: update V8 to 5.6.326.55
PR-URL: https://github.com/nodejs/node/pull/10992
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/v8/src/compiler/common-operator-reducer.cc')
| -rw-r--r-- | deps/v8/src/compiler/common-operator-reducer.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/deps/v8/src/compiler/common-operator-reducer.cc b/deps/v8/src/compiler/common-operator-reducer.cc index c5ced20373..9a368162ef 100644 --- a/deps/v8/src/compiler/common-operator-reducer.cc +++ b/deps/v8/src/compiler/common-operator-reducer.cc @@ -284,7 +284,7 @@ Reduction CommonOperatorReducer::ReducePhi(Node* node) { Reduction CommonOperatorReducer::ReduceReturn(Node* node) { DCHECK_EQ(IrOpcode::kReturn, node->opcode()); - Node* const value = node->InputAt(0); + Node* const value = node->InputAt(1); Node* effect = NodeProperties::GetEffectInput(node); Node* const control = NodeProperties::GetControlInput(node); bool changed = false; @@ -311,8 +311,9 @@ Reduction CommonOperatorReducer::ReduceReturn(Node* node) { // {end} as revisit, because we mark {node} as {Dead} below, which was // previously connected to {end}, so we know for sure that at some point // the reducer logic will visit {end} again. - Node* ret = graph()->NewNode(common()->Return(), value->InputAt(i), - effect->InputAt(i), control->InputAt(i)); + Node* ret = graph()->NewNode(common()->Return(), node->InputAt(0), + value->InputAt(i), effect->InputAt(i), + control->InputAt(i)); NodeProperties::MergeControlToEnd(graph(), common(), ret); } // Mark the merge {control} and return {node} as {dead}. |