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

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

Issue 1936043002: [es6] Properly handle the case when an inlined getter/setter/constructor does a tail call. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Removed too much, fixing Created 4 years, 7 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/ppc/lithium-ppc.cc ('k') | src/crankshaft/x64/lithium-x64.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/crankshaft/s390/lithium-s390.cc
diff --git a/src/crankshaft/s390/lithium-s390.cc b/src/crankshaft/s390/lithium-s390.cc
index 3f906c84bd4eedad6567f8572f2b6d1a21dfac92..facf257f927b71815306bbd9396166b4cb8d3081 100644
--- a/src/crankshaft/s390/lithium-s390.cc
+++ b/src/crankshaft/s390/lithium-s390.cc
@@ -810,42 +810,7 @@ void LChunkBuilder::AddInstruction(LInstruction* instr,
}
chunk_->AddInstruction(instr, current_block_);
- if (instr->IsCall()) {
- HEnvironment* hydrogen_env = current_block_->last_environment();
- HValue* hydrogen_value_for_lazy_bailout = hydrogen_val;
- DCHECK_NOT_NULL(hydrogen_env);
- if (instr->IsSyntacticTailCall()) {
- // If it was a syntactic tail call we need to drop the current frame and
- // all the frames on top of it that are either an arguments adaptor frame
- // or a tail caller frame.
- hydrogen_env = hydrogen_env->outer();
- while (hydrogen_env != nullptr &&
- (hydrogen_env->frame_type() == ARGUMENTS_ADAPTOR ||
- hydrogen_env->frame_type() == TAIL_CALLER_FUNCTION)) {
- hydrogen_env = hydrogen_env->outer();
- }
- if (hydrogen_env != nullptr) {
- // 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()) {
- HSimulate* sim = HSimulate::cast(hydrogen_val->next());
- sim->ReplayEnvironment(hydrogen_env);
- hydrogen_value_for_lazy_bailout = sim;
- }
- }
- LInstruction* bailout = LChunkBuilderBase::AssignEnvironment(
- new (zone()) LLazyBailout(), hydrogen_env);
- bailout->set_hydrogen_value(hydrogen_value_for_lazy_bailout);
- chunk_->AddInstruction(bailout, current_block_);
- }
+ CreateLazyBailoutForCall(current_block_, instr, hydrogen_val);
}
LInstruction* LChunkBuilder::DoPrologue(HPrologue* instr) {
« no previous file with comments | « src/crankshaft/ppc/lithium-ppc.cc ('k') | src/crankshaft/x64/lithium-x64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698