[crankshaft] [turbofan] Fix environment handling when generating a tail call from inlined function.

src/crankshaft/s390/lithium-s390.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/crankshaft/s390/lithium-s390.h"
 
 #include <sstream>
 
 #include "src/crankshaft/hydrogen-osr.h"
 #include "src/crankshaft/lithium-inl.h"
@@ skipping 798 matching lines @@
     instr = AssignEnvironment(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
-      // an arguments adaptor frame on top of it (if the latter is present).
+      // all the frames on top of it that are either an arguments adaptor frame
+      // or a tail caller frame.
       hydrogen_env = hydrogen_env->outer();
-      if (hydrogen_env != nullptr &&
-          hydrogen_env->frame_type() == ARGUMENTS_ADAPTOR) {
+      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.
@@ skipping 1480 matching lines @@
 LInstruction* LChunkBuilder::DoLoadFieldByIndex(HLoadFieldByIndex* instr) {
   LOperand* object = UseRegister(instr->object());
   LOperand* index = UseTempRegister(instr->index());
   LLoadFieldByIndex* load = new (zone()) LLoadFieldByIndex(object, index);
   LInstruction* result = DefineSameAsFirst(load);
   return AssignPointerMap(result);
 }
 
 }  // namespace internal
 }  // namespace v8