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

src/ia32/lithium-codegen-ia32.cc

 // Copyright 2012 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 72 matching lines @@
   // the frame (that is done in GeneratePrologue).
   FrameScope frame_scope(masm_, StackFrame::MANUAL);
 
   support_aligned_spilled_doubles_ = info()->IsOptimizing();
 
   dynamic_frame_alignment_ = info()->IsOptimizing() &&
       ((chunk()->num_double_slots() > 2 &&
         !chunk()->graph()->is_recursive()) ||
        !info()->osr_ast_id().IsNone());
 
+  handler_table_ = isolate()->factory()->NewFixedArray(
+      info()->function() != NULL ? info()->function()->handler_count() : 0,
+      TENURED);
+
+
   return GeneratePrologue() &&
       GenerateBody() &&
       GenerateDeferredCode() &&
       GenerateJumpTable() &&
       GenerateSafepointTable();
 }
 
 
 void LCodeGen::FinishCode(Handle<Code> code) {
   ASSERT(is_done());
   code->set_stack_slots(GetStackSlotCount());
   code->set_safepoint_table_offset(safepoints_.GetCodeOffset());
+  code->set_handler_table(*handler_table_);
   if (FLAG_weak_embedded_maps_in_optimized_code) {
     RegisterDependentCodeForEmbeddedMaps(code);
   }
   PopulateDeoptimizationData(code);
   if (!info()->IsStub()) {
     Deoptimizer::EnsureRelocSpaceForLazyDeoptimization(code);
   }
   info()->CommitDependentMaps(code);
 }
 
@@ skipping 508 matching lines @@
   int height = translation_size - environment->parameter_count();
 
   WriteTranslation(environment->outer(), translation);
   bool has_closure_id = !info()->closure().is_null() &&
       !info()->closure().is_identical_to(environment->closure());
   int closure_id = has_closure_id
       ? DefineDeoptimizationLiteral(environment->closure())
       : Translation::kSelfLiteralId;
   switch (environment->frame_type()) {
     case JS_FUNCTION:
-      translation->BeginJSFrame(environment->ast_id(), closure_id, height);
+      translation->BeginJSFrame(environment->ast_id(), closure_id, height,
+                                environment->handler_count());
       break;
     case JS_CONSTRUCT:
       translation->BeginConstructStubFrame(closure_id, translation_size);
       break;
     case JS_GETTER:
       ASSERT(translation_size == 1);
       ASSERT(height == 0);
       translation->BeginGetterStubFrame(closure_id);
       break;
     case JS_SETTER:
@@ skipping 357 matching lines @@
   data->SetOsrAstId(Smi::FromInt(info_->osr_ast_id().ToInt()));
   data->SetOsrPcOffset(Smi::FromInt(osr_pc_offset_));
 
   // Populate the deoptimization entries.
   for (int i = 0; i < length; i++) {
     LEnvironment* env = deoptimizations_[i];
     data->SetAstId(i, env->ast_id());
     data->SetTranslationIndex(i, Smi::FromInt(env->translation_index()));
     data->SetArgumentsStackHeight(i,
                                   Smi::FromInt(env->arguments_stack_height()));
+    // Write the total handler count to the deoptimization data, used to
+    // determine the stack sizes.
+    int handler_count = 0;
+    LEnvironment* current = env;
+    do {
+      handler_count += current->handler_count();
+      current = current->outer();
+    } while (current != NULL);
+    data->SetHandlerCount(i, Smi::FromInt(handler_count));
+
     data->SetPc(i, Smi::FromInt(env->pc_offset()));
   }
   code->set_deoptimization_data(*data);
 }
 
 
 int LCodeGen::DefineDeoptimizationLiteral(Handle<Object> literal) {
   int result = deoptimization_literals_.length();
   for (int i = 0; i < deoptimization_literals_.length(); ++i) {
     if (deoptimization_literals_[i].is_identical_to(literal)) return i;
@@ skipping 109 matching lines @@
     if (move != NULL) DoParallelMove(move);
   }
 }
 
 
 void LCodeGen::DoInstructionGap(LInstructionGap* instr) {
   DoGap(instr);
 }
 
 
+void LCodeGen::DoEnterTry(LEnterTry* instr) {
+  Label try_entry, handler_entry;
+  __ jmp(&try_entry);
+  __ bind(&handler_entry);
+  handler_table_->set(instr->hydrogen()->index(),
+                      Smi::FromInt(handler_entry.pos()));
+  // Save code object.
+  __ push(edi);
+  // Pass code object as argument.
+  __ push(edi);
+  // Call Runtime_CatchInOptimizedCode which patches the code with the call to
+  // the deopt stub and returns the offset to the address we must jump to.
+  __ CallRuntime(Runtime::kCatchInOptimizedCode, 1);
+  // Get actual offset.
+  __ SmiUntag(eax);
+  // Restore code object.
+  __ pop(edi);
+  // Compute the target PC adding the offset to the code object.
+  __ add(edi, eax);
+  // Jump to target PC.
+  __ jmp(edi);
+  __ Abort("Unreachable (the exception should have been caught).");
+  __ bind(&try_entry);
+  __ PushTryHandler(StackHandler::OPTIMIZED_CATCH, instr->index());
+}
+
+
+void LCodeGen::DoLeaveTry(LLeaveTry* instr) {
+  __ PopTryHandler();
+}
+
+
 void LCodeGen::DoParameter(LParameter* instr) {
   // Nothing to do.
 }
 
 
 void LCodeGen::DoCallStub(LCallStub* instr) {
   ASSERT(ToRegister(instr->context()).is(esi));
   ASSERT(ToRegister(instr->result()).is(eax));
   switch (instr->hydrogen()->major_key()) {
     case CodeStub::RegExpConstructResult: {
@@ skipping 769 matching lines @@
   ASSERT(input->Equals(instr->result()));
   __ not_(ToRegister(input));
 }
 
 
 void LCodeGen::DoThrow(LThrow* instr) {
   __ push(ToOperand(instr->value()));
   ASSERT(ToRegister(instr->context()).is(esi));
   CallRuntime(Runtime::kThrow, 1, instr);
 
+  // Code after a throw now is reachable...
+#if false
   if (FLAG_debug_code) {
-    Comment("Unreachable code.");
+    Comment("Code after a throw should be unreachable.");
     __ int3();
   }
+#endif
 }
 
 
 void LCodeGen::DoAddI(LAddI* instr) {
   LOperand* left = instr->left();
   LOperand* right = instr->right();
 
   if (LAddI::UseLea(instr->hydrogen()) && !left->Equals(instr->result())) {
     if (right->IsConstantOperand()) {
       int32_t offset = ToInteger32(LConstantOperand::cast(right));
@@ skipping 4617 matching lines @@
                               FixedArray::kHeaderSize - kPointerSize));
   __ bind(&done);
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_IA32