summaryrefslogtreecommitdiff
path: root/deps/v8/src/compiler/js-inlining-heuristic.cc
diff options
context:
space:
mode:
Diffstat (limited to 'deps/v8/src/compiler/js-inlining-heuristic.cc')
-rw-r--r--deps/v8/src/compiler/js-inlining-heuristic.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/deps/v8/src/compiler/js-inlining-heuristic.cc b/deps/v8/src/compiler/js-inlining-heuristic.cc
index c6a223b600..aa5fe632b3 100644
--- a/deps/v8/src/compiler/js-inlining-heuristic.cc
+++ b/deps/v8/src/compiler/js-inlining-heuristic.cc
@@ -110,13 +110,13 @@ JSInliningHeuristic::Candidate JSInliningHeuristic::CollectFunctions(
return out;
}
for (int n = 0; n < value_input_count; ++n) {
- HeapObjectMatcher m(callee->InputAt(n));
- if (!m.HasResolvedValue() || !m.Ref(broker()).IsJSFunction()) {
+ HeapObjectMatcher m2(callee->InputAt(n));
+ if (!m2.HasResolvedValue() || !m2.Ref(broker()).IsJSFunction()) {
out.num_functions = 0;
return out;
}
- out.functions[n] = m.Ref(broker()).AsJSFunction();
+ out.functions[n] = m2.Ref(broker()).AsJSFunction();
JSFunctionRef function = out.functions[n].value();
if (CanConsiderForInlining(broker(), function)) {
out.bytecode[n] = function.shared().GetBytecodeArray();
@@ -602,7 +602,7 @@ bool JSInliningHeuristic::TryReuseDispatch(Node* node, Node* callee,
// frame state, and change all the uses of the callee to the constant
// callee.
Node* target = callee->InputAt(i);
- Node* effect = effect_phi->InputAt(i);
+ Node* effect_phi_effect = effect_phi->InputAt(i);
Node* control = merge->InputAt(i);
if (checkpoint) {
@@ -610,8 +610,8 @@ bool JSInliningHeuristic::TryReuseDispatch(Node* node, Node* callee,
FrameState new_checkpoint_state = DuplicateFrameStateAndRename(
FrameState{checkpoint_state}, callee, target,
(i == num_calls - 1) ? kChangeInPlace : kCloneState);
- effect = graph()->NewNode(checkpoint->op(), new_checkpoint_state, effect,
- control);
+ effect_phi_effect = graph()->NewNode(
+ checkpoint->op(), new_checkpoint_state, effect_phi_effect, control);
}
// Duplicate the call.
@@ -620,7 +620,7 @@ bool JSInliningHeuristic::TryReuseDispatch(Node* node, Node* callee,
(i == num_calls - 1) ? kChangeInPlace : kCloneState);
inputs[0] = target;
inputs[input_count - 3] = new_lazy_frame_state;
- inputs[input_count - 2] = effect;
+ inputs[input_count - 2] = effect_phi_effect;
inputs[input_count - 1] = control;
calls[i] = if_successes[i] =
graph()->NewNode(node->op(), input_count, inputs);
@@ -765,13 +765,13 @@ Reduction JSInliningHeuristic::InlineCandidate(Candidate const& candidate,
if (candidate.can_inline_function[i] &&
(small_function || total_inlined_bytecode_size_ <
max_inlined_bytecode_size_cumulative_)) {
- Node* node = calls[i];
- Reduction const reduction = inliner_.ReduceJSCall(node);
+ Node* call = calls[i];
+ Reduction const reduction = inliner_.ReduceJSCall(call);
if (reduction.Changed()) {
total_inlined_bytecode_size_ += candidate.bytecode[i]->length();
// Killing the call node is not strictly necessary, but it is safer to
// make sure we do not resurrect the node.
- node->Kill();
+ call->Kill();
}
}
}