Rebase of partial ia32 implementation of optimized try/catch (started by Kevin Millikin, continued …

src/deoptimizer.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 137 matching lines @@
   int commit_page_size = static_cast<int>(OS::CommitPageSize());
   int page_count = ((kDeoptTableMaxEpilogueCodeSize + entries_size - 1) /
                     commit_page_size) + 1;
   return static_cast<size_t>(commit_page_size * page_count);
 }
 
 
 Deoptimizer* Deoptimizer::Grab(Isolate* isolate) {
   Deoptimizer* result = isolate->deoptimizer_data()->current_;
   ASSERT(result != NULL);
+  if (isolate->optimized_handler_patch_buffer() != NULL) {
+    ASSERT(result->bailout_type_ == LAZY);
+    // Before allowing allocation, patch the optimized code back.  The
+    // patched code has relocation info that does not agree with the code,
+    // so the patched code should not be seen by the garbage collector.
+    Code* code = result->compiled_code_;
+    DeoptimizationInputData* deopt_data =
+        DeoptimizationInputData::cast(code->deoptimization_data());
+    int deopt_index = isolate->optimized_handler_deopt_index();
+    byte* patch_address =
+        code->instruction_start() + deopt_data->Pc(deopt_index)->value();
+    memcpy(patch_address, isolate->optimized_handler_patch_buffer(),
+           patch_size());
+    // FIXME(mmassi): why doesn't it clear immediately also the patch buffer?
+    isolate->ClearOptimizedHandlerByDeopt(code);
+  }
   result->DeleteFrameDescriptions();
   isolate->deoptimizer_data()->current_ = NULL;
   return result;
 }
 
 
 int Deoptimizer::ConvertJSFrameIndexToFrameIndex(int jsframe_index) {
   if (jsframe_index == 0) return 0;
 
   int frame_index = 0;
@@ skipping 20 matching lines @@
   // Get the function and code from the frame.
   JSFunction* function = JSFunction::cast(frame->function());
   Code* code = frame->LookupCode();
 
   // Locate the deoptimization point in the code. As we are at a call the
   // return address must be at a place in the code with deoptimization support.
   SafepointEntry safepoint_entry = code->GetSafepointEntry(frame->pc());
   int deoptimization_index = safepoint_entry.deoptimization_index();
   ASSERT(deoptimization_index != Safepoint::kNoDeoptimizationIndex);
 
+  // Find the size of exception handlers.
+  DeoptimizationInputData* deoptimization_data =
+      DeoptimizationInputData::cast(code->deoptimization_data());
+  unsigned handler_count =
+      deoptimization_data->HandlerCount(deoptimization_index)->value();
+  unsigned handler_size = handler_count * StackHandlerConstants::kSize;
+
   // Always use the actual stack slots when calculating the fp to sp
   // delta adding two for the function and context.
   unsigned stack_slots = code->stack_slots();
-  unsigned fp_to_sp_delta = ((stack_slots + 2) * kPointerSize);
+  unsigned fp_to_sp_delta = ((stack_slots + 2) * kPointerSize) + handler_size;
 
   Deoptimizer* deoptimizer = new Deoptimizer(isolate,
                                              function,
                                              Deoptimizer::DEBUGGER,
                                              deoptimization_index,
                                              frame->pc(),
                                              fp_to_sp_delta,
                                              code);
   Address tos = frame->fp() - fp_to_sp_delta;
   deoptimizer->FillInputFrame(tos, frame);
@@ skipping 528 matching lines @@
   TranslationIterator iterator(translations, translation_index);
   Translation::Opcode opcode =
       static_cast<Translation::Opcode>(iterator.Next());
   ASSERT(Translation::BEGIN == opcode);
   USE(opcode);
   // Read the number of output frames and allocate an array for their
   // descriptions.
   int count = iterator.Next();
   iterator.Next();  // Drop JS frames count.
   ASSERT(output_ == NULL);
+
+  // If this deoptimization is needed to transfer control to a catch clause
+  // only the first frame is relevant.
+  if (isolate_->optimized_handler_patch_buffer() != NULL) {
+    count = 1;
+  }
+
   output_ = new FrameDescription*[count];
   for (int i = 0; i < count; ++i) {
     output_[i] = NULL;
   }
   output_count_ = count;
 
   // Translate each output frame.
   for (int i = 0; i < count; ++i) {
     // Read the ast node id, function, and frame height for this output frame.
     Translation::Opcode opcode =
@@ skipping 64 matching lines @@
   BailoutId node_id = BailoutId(iterator->Next());
   JSFunction* function;
   if (frame_index != 0) {
     function = JSFunction::cast(ComputeLiteral(iterator->Next()));
   } else {
     int closure_id = iterator->Next();
     USE(closure_id);
     ASSERT_EQ(Translation::kSelfLiteralId, closure_id);
     function = function_;
   }
+  Code* non_optimized_code = function->shared()->code();
   unsigned height = iterator->Next();
   unsigned height_in_bytes = height * kPointerSize;
-  if (trace_) {
-    PrintF("  translating ");
-    function->PrintName();
-    PrintF(" => node=%d, height=%d\n", node_id.ToInt(), height_in_bytes);
+  int handler_count = iterator->Next();
+  // If we are doing lazy deoptimization for catching in an optimized frame,
+  // one of the handlers in the frame description has already been dropped
+  // by throwing to it.
+  if (isolate_->optimized_handler_patch_buffer() != NULL) {
+    ASSERT(frame_index == 0 && output_count_ == 1);
+    ASSERT(bailout_type_ == LAZY);
+    ASSERT(handler_count > 0);
+    --handler_count;
   }
+  int handlers_size = handler_count * StackHandlerConstants::kSize;
 
   // The 'fixed' part of the frame consists of the incoming parameters and
   // the part described by JavaScriptFrameConstants.
   unsigned fixed_frame_size = ComputeFixedSize(function);
-  unsigned input_frame_size = input_->GetFrameSize();
+  //TODO(mmassi): what's this for?
+  //unsigned input_frame_size = input_->GetFrameSize();
   unsigned output_frame_size = height_in_bytes + fixed_frame_size;
+  if (FLAG_trace_deopt) {
+    PrintF("  translating ");
+    function->PrintName();
+    PrintF(" => node=%d, height=%d\n",
+           node_id.ToInt(), height_in_bytes + handlers_size);
+  }
+
 
   // Allocate and store the output frame description.
   FrameDescription* output_frame =
       new(output_frame_size) FrameDescription(output_frame_size, function);
   output_frame->SetFrameType(StackFrame::JAVA_SCRIPT);
 
   bool is_bottommost = (0 == frame_index);
+  ASSERT(is_bottommost || handler_count == 0);  // We do not inline try-catch.
   bool is_topmost = (output_count_ - 1 == frame_index);
   ASSERT(frame_index >= 0 && frame_index < output_count_);
   ASSERT(output_[frame_index] == NULL);
   output_[frame_index] = output_frame;
 
   // The top address for the bottommost output frame can be computed from
   // the input frame pointer and the output frame's height.  For all
   // subsequent output frames, it can be computed from the previous one's
   // top address and the current frame's size.
   Register fp_reg = JavaScriptFrame::fp_register();
   intptr_t top_address;
   if (is_bottommost) {
     // Determine whether the input frame contains alignment padding.
     has_alignment_padding_ = HasAlignmentPadding(function) ? 1 : 0;
     // 2 = context and function in the frame.
     // If the optimized frame had alignment padding, adjust the frame pointer
     // to point to the new position of the old frame pointer after padding
     // is removed. Subtract 2 * kPointerSize for the context and function slots.
     top_address = input_->GetRegister(fp_reg.code()) - (2 * kPointerSize) -
         height_in_bytes + has_alignment_padding_ * kPointerSize;
+    //TODO(mmassi): Is height_in_bytes the right value?
   } else {
     top_address = output_[frame_index - 1]->GetTop() - output_frame_size;
   }
   output_frame->SetTop(top_address);
 
   // Compute the incoming parameter translation.
   int parameter_count = function->shared()->formal_parameter_count() + 1;
   unsigned output_offset = output_frame_size;
-  unsigned input_offset = input_frame_size;
+  unsigned input_offset = input_->GetFrameSize();
   for (int i = 0; i < parameter_count; ++i) {
     output_offset -= kPointerSize;
     DoTranslateCommand(iterator, frame_index, output_offset);
   }
   input_offset -= (parameter_count * kPointerSize);
 
   // There are no translation commands for the caller's pc and fp, the
   // context, and the function.  Synthesize their values and set them up
   // explicitly.
   //
@@ skipping 68 matching lines @@
   // The function for the bottommost output frame should also agree with the
   // input frame.
   ASSERT(!is_bottommost || input_->GetFrameSlot(input_offset) == value);
   output_frame->SetFrameSlot(output_offset, value);
   if (trace_) {
     PrintF("    0x%08" V8PRIxPTR ": [top + %d] <- 0x%08"
            V8PRIxPTR "; function\n",
            top_address + output_offset, output_offset, value);
   }
 
+  // Translate the stack-allocated locals.
+  int stack_slot_count = function->shared()->scope_info()->StackSlotCount();
+  for (int i = 0; i < stack_slot_count; ++i) {
+    output_offset -= kPointerSize;
+    DoTranslateCommand(iterator, frame_index, output_offset);
+  }
+
+  // If there are any exception handlers, translate them.
+  if (handler_count > 0) {
+    // Translate the handler blocks.  The output frame needs:
+    //
+    // incoming args | fixed part | locals | handlers | expression stack
+    //
+    // because try occurs as a statement, i.e., with the expression stack
+    // empty.  The input frame has:
+    //
+    // incoming args | fixed part | spill slots | handlers | outgoing args
+    //
+    // also because try is a statement, i.e., there is no pending call to
+    // interleave handlers and args.  This would change if we began inlining
+    // functions containing try/catch.
+    //
+    // TODO(kmillikin): Begin inlining functions containing try/catch.
+    input_offset = ComputeOutgoingArgumentSize() + ComputeHandlersSize();
+    intptr_t next_handler = 0;
+    for (int i = 0; i < handler_count; ++i) {
+      // The first two fields (fp and context) are invariant under
+      // deoptimization.
+      output_offset -= kPointerSize;
+      input_offset -= kPointerSize;
+      value = input_->GetFrameSlot(input_offset);
+      ASSERT(value == fp_value);
+      output_frame->SetFrameSlot(output_offset, value);
+      if (FLAG_trace_deopt) {
+        PrintF("    0x%08x: [top + %d] <- 0x%08x ; handler[%d] fp\n",
+               top_address + output_offset, output_offset, value, i);
+      }
+
+      output_offset -= kPointerSize;
+      input_offset -= kPointerSize;
+      value = input_->GetFrameSlot(input_offset);
+      output_frame->SetFrameSlot(output_offset, value);
+      if (FLAG_trace_deopt) {
+        PrintF("    0x%08x: [top + %d] <- 0x%08x ; handler[%d] context\n",
+               top_address + output_offset, output_offset, value, i);
+      }
+
+      // The state is the same except that the kind is unoptimized.
+      output_offset -= kPointerSize;
+      input_offset -= kPointerSize;
+      value =
+          input_->GetFrameSlot(input_offset) & ~StackHandler::kIsOptimizedMask;
+      output_frame->SetFrameSlot(output_offset, value);
+      if (FLAG_trace_deopt) {
+        PrintF("    0x%08x: [top + %d] <- 0x%08x ; handler[%d] index + kind\n",
+               top_address + output_offset, output_offset, value, i);
+      }
+
+      // For all handlers in the frame, the code is the unoptimized code.
+      output_offset -= kPointerSize;
+      input_offset -= kPointerSize;
+      value = reinterpret_cast<uint32_t>(non_optimized_code);
+      output_frame->SetFrameSlot(output_offset, value);
+      if (FLAG_trace_deopt) {
+          PrintF("    0x%08x: [top + %d] <- 0x%08x ; handler[%d] code\n",
+                 top_address + output_offset, output_offset, value, i);
+      }
+
+      output_offset -= kPointerSize;
+      input_offset -= kPointerSize;
+      if (i == 0) {
+        // Bottommost handler's next link is deoptimization invariant.
+        value = input_->GetFrameSlot(input_offset);
+      } else {
+        value = next_handler;
+      }
+      output_frame->SetFrameSlot(output_offset, value);
+      next_handler = top_address + output_offset;
+      if (FLAG_trace_deopt) {
+          PrintF("    0x%08x: [top + %d] <- 0x%08x ; handler[%d] next\n",
+                 top_address + output_offset, output_offset, value, i);
+      }
+    }
+    *reinterpret_cast<intptr_t*>(isolate_->handler_address()) = next_handler;
+  }
+
   // Translate the rest of the frame.
-  for (unsigned i = 0; i < height; ++i) {
+  while (output_offset > 0) {
     output_offset -= kPointerSize;
     DoTranslateCommand(iterator, frame_index, output_offset);
   }
   ASSERT(0 == output_offset);
 
   // Compute this frame's PC, state, and continuation.
-  Code* non_optimized_code = function->shared()->code();
-  FixedArray* raw_data = non_optimized_code->deoptimization_data();
-  DeoptimizationOutputData* data = DeoptimizationOutputData::cast(raw_data);
-  Address start = non_optimized_code->instruction_start();
-  unsigned pc_and_state = GetOutputInfo(data, node_id, function->shared());
-  unsigned pc_offset = FullCodeGenerator::PcField::decode(pc_and_state);
-  intptr_t pc_value = reinterpret_cast<intptr_t>(start + pc_offset);
-  output_frame->SetPc(pc_value);
-
-  FullCodeGenerator::State state =
-      FullCodeGenerator::StateField::decode(pc_and_state);
+  //TODO(mmassi): Where is non_optimized_code needed?
+  //Code* non_optimized_code = function->shared()->code();
+  int pc_offset;
+  FullCodeGenerator::State state;
+  Builtins::Name continuation;
+  if (isolate_->optimized_handler_patch_buffer() != NULL) {
+    ASSERT(frame_index == 0 && output_count_ == 1);
+    // Catching in optimized code.  Deopt to the corresponding unoptimized
+    // catch handler (not to the instruction following the one that threw).
+    FixedArray* handler_table = non_optimized_code->handler_table();
+    int handler_index = isolate_->optimized_handler_handler_index();
+    pc_offset = Smi::cast(handler_table->get(handler_index))->value();
+    state = FullCodeGenerator::NO_REGISTERS;
+    continuation = Builtins::kNotifyLazyDeoptimized;
+    // The exception value is needed in eax.
+    output_frame->SetRegister(
+        eax.code(),
+        reinterpret_cast<intptr_t>(isolate_->optimized_pending_exception()));
+    isolate_->clear_optimized_pending_exception();
+  } else {
+    FixedArray* raw_data = non_optimized_code->deoptimization_data();
+    DeoptimizationOutputData* data = DeoptimizationOutputData::cast(raw_data);
+    unsigned pc_and_state = GetOutputInfo(data, node_id, function->shared());
+    pc_offset = FullCodeGenerator::PcField::decode(pc_and_state);
+    state = FullCodeGenerator::StateField::decode(pc_and_state);
+    continuation = (bailout_type_ == EAGER)
+        ? Builtins::kNotifyDeoptimized
+        : Builtins::kNotifyLazyDeoptimized;
+    // For lazy deopt we preserve eax in the stack.  Ensure that it is not
+    // the zap value (a probably-invalid HeapObject*).
+    // TODO(mmassi): According to Kevin the test should be "!= EAGER"...
+    if (bailout_type_ == EAGER && is_topmost) {
+      output_frame->SetRegister(eax.code(),
+                                reinterpret_cast<intptr_t>(Smi::FromInt(0)));
+    }
+  }
+  byte* code_start = non_optimized_code->instruction_start();
+  output_frame->SetPc(reinterpret_cast<uint32_t>(code_start + pc_offset));
+  
   output_frame->SetState(Smi::FromInt(state));
 
   // Set the continuation for the topmost frame.
   if (is_topmost && bailout_type_ != DEBUGGER) {
     Builtins* builtins = isolate_->builtins();
-    Code* continuation = builtins->builtin(Builtins::kNotifyDeoptimized);
-    if (bailout_type_ == LAZY) {
-      continuation = builtins->builtin(Builtins::kNotifyLazyDeoptimized);
-    } else if (bailout_type_ == SOFT) {
-      continuation = builtins->builtin(Builtins::kNotifySoftDeoptimized);
-    } else {
-      ASSERT(bailout_type_ == EAGER);
-    }
-    output_frame->SetContinuation(
-        reinterpret_cast<intptr_t>(continuation->entry()));
+    byte* entry = builtins->builtin(continuation)->entry();
+    output_frame->SetContinuation(reinterpret_cast<uint32_t>(entry));
   }
 }
 
 
 void Deoptimizer::DoComputeArgumentsAdaptorFrame(TranslationIterator* iterator,
                                                  int frame_index) {
   JSFunction* function = JSFunction::cast(ComputeLiteral(iterator->Next()));
   unsigned height = iterator->Next();
   unsigned height_in_bytes = height * kPointerSize;
   if (trace_) {
@@ skipping 1025 matching lines @@
       // We save the untagged value on the side and store a GC-safe
       // temporary placeholder in the frame.
       AddDoubleValue(output_[frame_index]->GetTop() + output_offset, value);
       output_[frame_index]->SetFrameSlot(output_offset, kPlaceholder);
       return;
     }
 
     case Translation::STACK_SLOT: {
       int input_slot_index = iterator->Next();
       unsigned input_offset = input_->GetOffsetFromSlotIndex(input_slot_index);
-      intptr_t input_value = input_->GetFrameSlot(input_offset);
+      intptr_t input_value;
+      if (isolate_->optimized_handler_patch_buffer() != NULL &&
+          input_offset >= input_->frame_size()) {
+        // Skip stack slots that were above the handler (they must be
+        // arguments that must be thrown away because try is a statement).
+        input_value = static_cast<intptr_t>(NULL);
+        if (FLAG_trace_deopt) {
+          PrintF("                SKIPPING SLOT ABOVE HANDLER (ARGUMENT)\n");
+        }
+      } else {
+        input_value = input_->GetFrameSlot(input_offset);
+      }
       if (trace_) {
         PrintF("    0x%08" V8PRIxPTR ": ",
                output_[frame_index]->GetTop() + output_offset);
         PrintF("[top + %d] <- 0x%08" V8PRIxPTR " ; [sp + %d] ",
                output_offset,
                input_value,
                input_offset);
         reinterpret_cast<Object*>(input_value)->ShortPrint();
         PrintF("\n");
       }
@@ skipping 144 matching lines @@
   switch (opcode) {
     case Translation::BEGIN:
     case Translation::JS_FRAME:
     case Translation::ARGUMENTS_ADAPTOR_FRAME:
     case Translation::CONSTRUCT_STUB_FRAME:
     case Translation::GETTER_STUB_FRAME:
     case Translation::SETTER_STUB_FRAME:
     case Translation::COMPILED_STUB_FRAME:
     case Translation::DUPLICATE:
       UNREACHABLE();  // Malformed input.
-       return false;
+      return false;
 
      case Translation::REGISTER: {
        int output_reg = iterator->Next();
        if (FLAG_trace_osr) {
          PrintF("    %s <- 0x%08" V8PRIxPTR " ; [sp + %d]\n",
                 converter.NameOfCPURegister(output_reg),
                 input_value,
                 *input_offset);
        }
        output->SetRegister(output_reg, input_value);
@@ skipping 235 matching lines @@
                                     pc_after,
                                     interrupt_code,
                                     replacement_code));
     back_edge_cursor += FullCodeGenerator::kBackEdgeEntrySize;
   }
 }
 #endif  // DEBUG
 
 
 unsigned Deoptimizer::ComputeInputFrameSize() const {
+  // This is the size of the frame that is the same for both optimized and
+  // unoptimized frames---the incoming parameters and the fixed part of the
+  // frame.
   unsigned fixed_size = ComputeFixedSize(function_);
+
   // The fp-to-sp delta already takes the context and the function
   // into account so we have to avoid double counting them (-2).
   unsigned result = fixed_size + fp_to_sp_delta_ - (2 * kPointerSize);
+
 #ifdef DEBUG
   if (bailout_type_ == OSR) {
     // TODO(kasperl): It would be nice if we could verify that the
     // size matches with the stack height we can compute based on the
     // environment at the OSR entry. The code for that his built into
     // the DoComputeOsrOutputFrame function for now.
   } else if (compiled_code_->kind() == Code::OPTIMIZED_FUNCTION) {
-    unsigned stack_slots = compiled_code_->stack_slots();
-    unsigned outgoing_size = ComputeOutgoingArgumentSize();
-    ASSERT(result == fixed_size + (stack_slots * kPointerSize) + outgoing_size);
+    // Verify the actual frame size matches the expected (fixed part +
+    // spill slots + exception handlers + outgoing arguments).
+    unsigned spill_slots_size = compiled_code_->stack_slots() * kPointerSize;
+    unsigned handlers_size = ComputeHandlersSize();
+    // If we are doing lazy deoptimization for catching in an optimized
+    // frame, one of the handlers in the frame description has already been
+    // dropped by throwing to it.
+    if (isolate_->optimized_handler_patch_buffer() != NULL) {
+      ASSERT(bailout_type_ == LAZY);
+      ASSERT(static_cast<int>(handlers_size) >= StackHandlerConstants::kSize);
+      handlers_size -= StackHandlerConstants::kSize;
+    }
+    unsigned outgoing_arg_size = ComputeOutgoingArgumentSize();
+    ASSERT(result ==
+           fixed_size + spill_slots_size + handlers_size + outgoing_arg_size);
   }
 #endif
   return result;
 }
 
 
 unsigned Deoptimizer::ComputeFixedSize(JSFunction* function) const {
   // The fixed part of the frame consists of the return address, frame
   // pointer, function, context, and all the incoming arguments.
   return ComputeIncomingArgumentSize(function) +
       StandardFrameConstants::kFixedFrameSize;
 }
 
 
 unsigned Deoptimizer::ComputeIncomingArgumentSize(JSFunction* function) const {
   // The incoming arguments is the values for formal parameters and
   // the receiver. Every slot contains a pointer.
   if (function->IsSmi()) {
     ASSERT(Smi::cast(function) == Smi::FromInt(StackFrame::STUB));
     return 0;
   }
   unsigned arguments = function->shared()->formal_parameter_count() + 1;
   return arguments * kPointerSize;
 }
 
 
 unsigned Deoptimizer::ComputeOutgoingArgumentSize() const {
+  // Since try is a statement there will not be arguments left on the stack
+  // once we have popped the handler.
+  if (isolate_->optimized_handler_patch_buffer() != NULL) {
+    return 0;
+  }
+
   DeoptimizationInputData* data = DeoptimizationInputData::cast(
       compiled_code_->deoptimization_data());
   unsigned height = data->ArgumentsStackHeight(bailout_id_)->value();
   return height * kPointerSize;
 }
 
 
+unsigned Deoptimizer::ComputeHandlersSize() const {
+  DeoptimizationInputData* data = DeoptimizationInputData::cast(
+      compiled_code_->deoptimization_data());
+  unsigned handler_count = data->HandlerCount(bailout_id_)->value();
+  return handler_count * StackHandlerConstants::kSize;
+}
+
+
 Object* Deoptimizer::ComputeLiteral(int index) const {
   DeoptimizationInputData* data = DeoptimizationInputData::cast(
       compiled_code_->deoptimization_data());
   FixedArray* literals = data->LiteralArray();
   return literals->get(index);
 }
 
 
 void Deoptimizer::AddObjectStart(intptr_t slot_address, int length) {
   ObjectMaterializationDescriptor object_desc(
@@ skipping 214 matching lines @@
 
 void Translation::BeginArgumentsAdaptorFrame(int literal_id, unsigned height) {
   buffer_->Add(ARGUMENTS_ADAPTOR_FRAME, zone());
   buffer_->Add(literal_id, zone());
   buffer_->Add(height, zone());
 }
 
 
 void Translation::BeginJSFrame(BailoutId node_id,
                                int literal_id,
-                               unsigned height) {
+                               unsigned height,
+                               int handler_count) {
   buffer_->Add(JS_FRAME, zone());
   buffer_->Add(node_id.ToInt(), zone());
   buffer_->Add(literal_id, zone());
   buffer_->Add(height, zone());
+  buffer_->Add(handler_count, zone());
 }
 
 
 void Translation::BeginCompiledStubFrame() {
   buffer_->Add(COMPILED_STUB_FRAME, zone());
 }
 
 
 void Translation::BeginArgumentsObject(int args_length) {
   buffer_->Add(ARGUMENTS_OBJECT, zone());
@@ skipping 76 matching lines @@
     case UINT32_STACK_SLOT:
     case DOUBLE_STACK_SLOT:
     case LITERAL:
     case COMPILED_STUB_FRAME:
       return 1;
     case BEGIN:
     case ARGUMENTS_ADAPTOR_FRAME:
     case CONSTRUCT_STUB_FRAME:
       return 2;
     case JS_FRAME:
-      return 3;
+      return 4;
   }
   UNREACHABLE();
   return -1;
 }
 
 
 #if defined(OBJECT_PRINT) || defined(ENABLE_DISASSEMBLER)
 
 const char* Translation::StringFor(Opcode opcode) {
   switch (opcode) {
@@ skipping 246 matching lines @@
 
 void DeoptimizedFrameInfo::Iterate(ObjectVisitor* v) {
   v->VisitPointer(BitCast<Object**>(&function_));
   v->VisitPointers(parameters_, parameters_ + parameters_count_);
   v->VisitPointers(expression_stack_, expression_stack_ + expression_count_);
 }
 
 #endif  // ENABLE_DEBUGGER_SUPPORT
 
 } }  // namespace v8::internal