Version 5.1.281.32 (cherry-pick)

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 901 matching lines @@
     // TODO(olivf) Since phis of spilled values are joined as registers
     // (not in the stack slot), we need to allow the goto gaps to keep one
     // x87 register alive. To ensure all other values are still spilled, we
     // insert a fpu register barrier right before.
     LClobberDoubles* clobber = new(zone()) LClobberDoubles(isolate());
     clobber->set_hydrogen_value(hydrogen_val);
     chunk_->AddInstruction(clobber, current_block_);
   }
   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) {
   LInstruction* result = new (zone()) LPrologue();
   if (info_->num_heap_slots() > 0) {
     result = MarkAsCall(result, instr);
   }
   return result;
 }
@@ skipping 1649 matching lines @@
   LOperand* index = UseTempRegister(instr->index());
   LLoadFieldByIndex* load = new(zone()) LLoadFieldByIndex(object, index);
   LInstruction* result = DefineSameAsFirst(load);
   return AssignPointerMap(result);
 }
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X87