From f71bc57aa5364d25503ebc98108fe0f4ebddba67 Mon Sep 17 00:00:00 2001 From: oth Date: Tue, 15 Sep 2015 01:18:23 -0700 Subject: [PATCH] [Interpreter] Avoid shadowing variables in the bytecode graph builder. Reported by Bruce Dawson. BUG=v8:4280 LOG=N Review URL: https://codereview.chromium.org/1346453002 Cr-Commit-Position: refs/heads/master@{#30732} --- src/compiler/bytecode-graph-builder.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/compiler/bytecode-graph-builder.cc b/src/compiler/bytecode-graph-builder.cc index 3dbc0b240b..10f44a677a 100644 --- a/src/compiler/bytecode-graph-builder.cc +++ b/src/compiler/bytecode-graph-builder.cc @@ -395,8 +395,8 @@ Node* BytecodeGraphBuilder::MakeNode(const Operator* op, int value_input_count, } // Add implicit success continuation for throwing nodes. if (!result->op()->HasProperty(Operator::kNoThrow)) { - const Operator* op = common()->IfSuccess(); - Node* on_success = graph()->NewNode(op, result); + const Operator* if_success = common()->IfSuccess(); + Node* on_success = graph()->NewNode(if_success, result); environment_->UpdateControlDependency(on_success); } } @@ -421,8 +421,8 @@ Node* BytecodeGraphBuilder::MergeControl(Node* control, Node* other) { } else { // Control node is a singleton, introduce a merge. const Operator* op = common()->Merge(inputs); - Node* inputs[] = {control, other}; - control = graph()->NewNode(op, arraysize(inputs), inputs, true); + Node* merge_inputs[] = {control, other}; + control = graph()->NewNode(op, arraysize(merge_inputs), merge_inputs, true); } return control; }