X87: [crankshaft] Always generate lazy bailout points for tail calls ...

src/crankshaft/x87/lithium-x87.cc

 // Copyright 2012 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/x87/lithium-x87.h"
 
 #include <sstream>
 
 #if V8_TARGET_ARCH_X87
 
@@ skipping 917 matching lines @@
       // an arguments adaptor frame on top of it (if the latter is present).
       hydrogen_env = hydrogen_env->outer();
       if (hydrogen_env != nullptr &&
           hydrogen_env->frame_type() == ARGUMENTS_ADAPTOR) {
         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;
       }
     }
-    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_);
   }
 }
 
 
 LInstruction* LChunkBuilder::DoPrologue(HPrologue* instr) {
   LInstruction* result = new (zone()) LPrologue();
   if (info_->num_heap_slots() > 0) {
     result = MarkAsCall(result, instr);
   }
   return result;
@@ skipping 1657 matching lines @@
 LInstruction* LChunkBuilder::DoStoreFrameContext(HStoreFrameContext* instr) {
   LOperand* context = UseRegisterAtStart(instr->context());
   return new(zone()) LStoreFrameContext(context);
 }
 
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X87