Split deopt-after and deopt-before handling:

runtime/vm/flow_graph_compiler.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_XXX.
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
@@ skipping 12 matching lines @@
 
 DEFINE_FLAG(bool, print_scopes, false, "Print scopes of local variables.");
 DEFINE_FLAG(bool, trace_functions, false, "Trace entry of each function.");
 DECLARE_FLAG(bool, code_comments);
 DECLARE_FLAG(bool, enable_type_checks);
 DECLARE_FLAG(bool, intrinsify);
 DECLARE_FLAG(bool, report_usage_count);
 DECLARE_FLAG(bool, trace_functions);
 DECLARE_FLAG(int, optimization_counter_threshold);
 
-RawDeoptInfo* DeoptimizationStub::CreateDeoptInfo(FlowGraphCompiler* compiler) {
+
+void CompilerDeoptInfo::BuildReturnAddress(DeoptInfoBuilder* builder,
+                                           const Function& function,
+                                           intptr_t slot_ix) {
+  builder->AddReturnAddressAfter(function, deopt_id(), slot_ix);
+}
+
+
+void CompilerDeoptInfoWithStub::BuildReturnAddress(DeoptInfoBuilder* builder,
+                                                   const Function& function,
+                                                   intptr_t slot_ix) {
+  builder->AddReturnAddressBefore(function, deopt_id(), slot_ix);
+}
+
+
+RawDeoptInfo* CompilerDeoptInfo::CreateDeoptInfo(FlowGraphCompiler* compiler) {
   if (deoptimization_env_ == NULL) return DeoptInfo::null();
   const Function& function = compiler->parsed_function().function();
   // For functions with optional arguments, all incoming are copied to local
   // area below FP, deoptimization environment does not track them.
   const intptr_t num_args = (function.num_optional_parameters() > 0) ?
       0 : function.num_fixed_parameters();
   const intptr_t fixed_parameter_count =
       deoptimization_env_->fixed_parameter_count();
   DeoptInfoBuilder builder(compiler->object_table(), num_args);
 
   intptr_t slot_ix = 0;
-  builder.AddReturnAddress(function, deopt_id_, slot_ix++);
+  BuildReturnAddress(&builder, function, slot_ix++);
 
   // All locals between TOS and PC-marker.
   const GrowableArray<Value*>& values = deoptimization_env_->values();
 
   // Assign locations to values pushed above spill slots with PushArgument.
   intptr_t height = compiler->StackSize();
   for (intptr_t i = 0; i < values.length(); i++) {
     if (deoptimization_env_->LocationAt(i).IsInvalid()) {
       ASSERT(values[i]->definition()->IsPushArgument());
       *deoptimization_env_->LocationSlotAt(i) = Location::StackSlot(height++);
@@ skipping 24 matching lines @@
                                      bool is_leaf)
     : assembler_(assembler),
       parsed_function_(flow_graph.parsed_function()),
       block_order_(flow_graph.reverse_postorder()),
       current_block_(NULL),
       exception_handlers_list_(NULL),
       pc_descriptors_list_(NULL),
       stackmap_table_builder_(
           is_optimizing ? new StackmapTableBuilder() : NULL),
       block_info_(block_order_.length()),
-      deopt_stubs_(),
+      deopt_infos_(),
       object_table_(GrowableObjectArray::Handle(GrowableObjectArray::New())),
       is_optimizing_(is_optimizing),
       is_dart_leaf_(is_leaf),
       bool_true_(Bool::ZoneHandle(Bool::True())),
       bool_false_(Bool::ZoneHandle(Bool::False())),
       double_class_(Class::ZoneHandle(
           Isolate::Current()->object_store()->double_class())),
       parallel_move_resolver_(this) {
   ASSERT(assembler != NULL);
 }
@@ skipping 101 matching lines @@
 
 void FlowGraphCompiler::AddSlowPathCode(SlowPathCode* code) {
   slow_path_code_.Add(code);
 }
 
 
 void FlowGraphCompiler::GenerateDeferredCode() {
   for (intptr_t i = 0; i < slow_path_code_.length(); i++) {
     slow_path_code_[i]->EmitNativeCode(this);
   }
-  for (intptr_t i = 0; i < deopt_stubs_.length(); i++) {
-    deopt_stubs_[i]->GenerateCode(this, i);
+  for (intptr_t i = 0; i < deopt_infos_.length(); i++) {
+    deopt_infos_[i]->GenerateCode(this, i);
   }
 }
 
 
 void FlowGraphCompiler::AddExceptionHandler(intptr_t try_index,
                                             intptr_t pc_offset) {
   exception_handlers_list_->AddHandler(try_index, pc_offset);
 }
 
 
 // Uses current pc position and try-index.
 void FlowGraphCompiler::AddCurrentDescriptor(PcDescriptors::Kind kind,
                                              intptr_t deopt_id,
                                              intptr_t token_pos) {
   pc_descriptors_list()->AddDescriptor(kind,
                                        assembler()->CodeSize(),
                                        deopt_id,
                                        token_pos,
                                        CurrentTryIndex());
 }
 
 
 void FlowGraphCompiler::AddDeoptIndexAtCall(intptr_t deopt_id,
                                             intptr_t token_pos) {
-  // TODO(srdjan): Temporary use deopt stubs to maintain deopt-indexes.
-  // kDeoptAtCall will not emit code, but will only generate deoptimization
-  // information.
   ASSERT(is_optimizing());
-  const intptr_t deopt_index = deopt_stubs_.length();
-  AddDeoptStub(deopt_id, kDeoptAtCall);
+  const intptr_t deopt_index = deopt_infos_.length();
+  CompilerDeoptInfo* info = new CompilerDeoptInfo(deopt_id, kDeoptAtCall);
+  ASSERT(pending_deoptimization_env_ != NULL);
+  info->set_deoptimization_env(pending_deoptimization_env_);
+  deopt_infos_.Add(info);
   pc_descriptors_list()->AddDeoptIndex(assembler()->CodeSize(),
                                        deopt_id,
                                        kDeoptAtCall,
                                        deopt_index);
 }
 
 
 void FlowGraphCompiler::RecordSafepoint(LocationSummary* locs) {
   if (is_optimizing()) {
     BitmapBuilder* bitmap = locs->stack_bitmap();
@@ skipping 40 matching lines @@
     intptr_t register_bit_count = bitmap->Length() - StackSize();
     stackmap_table_builder_->AddEntry(assembler()->CodeSize(),
                                       bitmap,
                                       register_bit_count);
   }
 }
 
 
 Label* FlowGraphCompiler::AddDeoptStub(intptr_t deopt_id,
                                        DeoptReasonId reason) {
-  DeoptimizationStub* stub = new DeoptimizationStub(deopt_id, reason);
+  CompilerDeoptInfoWithStub* stub =
+      new CompilerDeoptInfoWithStub(deopt_id, reason);
   ASSERT(is_optimizing_);
   ASSERT(pending_deoptimization_env_ != NULL);
   stub->set_deoptimization_env(pending_deoptimization_env_);
-  deopt_stubs_.Add(stub);
+  deopt_infos_.Add(stub);
   return stub->entry_label();
 }
 
 
 void FlowGraphCompiler::FinalizeExceptionHandlers(const Code& code) {
   ASSERT(exception_handlers_list_ != NULL);
   const ExceptionHandlers& handlers = ExceptionHandlers::Handle(
       exception_handlers_list_->FinalizeExceptionHandlers(code.EntryPoint()));
   code.set_exception_handlers(handlers);
 }
 
 
 void FlowGraphCompiler::FinalizePcDescriptors(const Code& code) {
   ASSERT(pc_descriptors_list_ != NULL);
   const PcDescriptors& descriptors = PcDescriptors::Handle(
       pc_descriptors_list_->FinalizePcDescriptors(code.EntryPoint()));
   descriptors.Verify(parsed_function_.function().is_optimizable());
   code.set_pc_descriptors(descriptors);
 }
 
 
 void FlowGraphCompiler::FinalizeDeoptInfo(const Code& code) {
   const Array& array =
-      Array::Handle(Array::New(deopt_stubs_.length(), Heap::kOld));
+      Array::Handle(Array::New(deopt_infos_.length(), Heap::kOld));
   DeoptInfo& info = DeoptInfo::Handle();
-  for (intptr_t i = 0; i < deopt_stubs_.length(); i++) {
-    info = deopt_stubs_[i]->CreateDeoptInfo(this);
+  for (intptr_t i = 0; i < deopt_infos_.length(); i++) {
+    info = deopt_infos_[i]->CreateDeoptInfo(this);
     array.SetAt(i, info);
   }
   code.set_deopt_info_array(array);
   const Array& object_array = Array::Handle(Array::MakeArray(object_table_));
   code.set_object_table(object_array);
 }
 
 
 void FlowGraphCompiler::FinalizeStackmaps(const Code& code) {
   if (stackmap_table_builder_ == NULL) {
@@ skipping 438 matching lines @@
       return;
     }
   }
 
   // This move is not blocked.
   EmitMove(index);
 }
 
 
 }  // namespace dart