Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(147)

Unified Diff: src/crankshaft/x64/lithium-x64.cc

Issue 1816113002: [crankshaft] Always generate lazy bailout points for tail calls ... (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/crankshaft/mips64/lithium-mips64.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/crankshaft/x64/lithium-x64.cc
diff --git a/src/crankshaft/x64/lithium-x64.cc b/src/crankshaft/x64/lithium-x64.cc
index c45ecd65efcbc9fc6a5a1e23b8824f207c90fa7a..96e8b38f62190c1a7b0d865d63f12ab54cdac81d 100644
--- a/src/crankshaft/x64/lithium-x64.cc
+++ b/src/crankshaft/x64/lithium-x64.cc
@@ -912,6 +912,11 @@ void LChunkBuilder::AddInstruction(LInstruction* instr,
// Push return value on top of outer environment.
hydrogen_env = hydrogen_env->Copy();
hydrogen_env->Push(hydrogen_val);
+ } else {
+ // Although we don't need this lazy bailout for normal execution
+ // (because when we tail call from the outermost function we should pop
+ // its frame) we still need it when debugger is on.
+ hydrogen_env = current_block_->last_environment();
}
} else {
if (hydrogen_val->HasObservableSideEffects()) {
@@ -920,16 +925,10 @@ void LChunkBuilder::AddInstruction(LInstruction* instr,
hydrogen_value_for_lazy_bailout = sim;
}
}
- if (hydrogen_env != nullptr) {
- // The |hydrogen_env| can be null at this point only if we are generating
- // a syntactic tail call from the outermost function but in this case
- // it would be a real tail call which will pop function's frame and
- // therefore this lazy bailout can be skipped.
- LInstruction* bailout = LChunkBuilderBase::AssignEnvironment(
- new (zone()) LLazyBailout(), hydrogen_env);
- bailout->set_hydrogen_value(hydrogen_value_for_lazy_bailout);
- chunk_->AddInstruction(bailout, current_block_);
- }
+ LInstruction* bailout = LChunkBuilderBase::AssignEnvironment(
+ new (zone()) LLazyBailout(), hydrogen_env);
+ bailout->set_hydrogen_value(hydrogen_value_for_lazy_bailout);
+ chunk_->AddInstruction(bailout, current_block_);
}
}
« no previous file with comments | « src/crankshaft/mips64/lithium-mips64.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698