Use the location summary to represent safepoint information.

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 66 matching lines @@
 FlowGraphCompiler::FlowGraphCompiler(Assembler* assembler,
                                      const FlowGraph& flow_graph,
                                      bool is_optimizing,
                                      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_(NULL),
+      stackmap_table_builder_(
+          is_optimizing ? new StackmapTableBuilder() : NULL),
       block_info_(block_order_.length()),
       deopt_stubs_(),
       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);
-  if (is_optimizing_) {
-    stackmap_table_builder_ = new StackmapTableBuilder(StackSize());
-  }
 }
 
 
 FlowGraphCompiler::~FlowGraphCompiler() {
   // BlockInfos are zone-allocated, so their destructors are not called.
   // Verify the labels explicitly here.
   for (int i = 0; i < block_info_.length(); ++i) {
     ASSERT(!block_info_[i]->label.IsLinked());
     ASSERT(!block_info_[i]->label.HasNear());
   }
@@ skipping 137 matching lines @@
                                              intptr_t token_pos,
                                              intptr_t try_index) {
   pc_descriptors_list()->AddDescriptor(kind,
                                        assembler()->CodeSize(),
                                        deopt_id,
                                        token_pos,
                                        try_index);
 }
 
 
+void FlowGraphCompiler::RecordSafepoint(LocationSummary* locs) {
+  if (is_optimizing()) {
+    BitmapBuilder* bitmap = locs->stack_bitmap();
+    ASSERT(bitmap != NULL);
+    bitmap->SetLength(StackSize());
+    stackmap_table_builder_->AddEntry(assembler()->CodeSize(), bitmap);
+  }
+}
+
+
 Label* FlowGraphCompiler::AddDeoptStub(intptr_t deopt_id,
                                        intptr_t try_index,
                                        DeoptReasonId reason) {
   DeoptimizationStub* stub =
       new DeoptimizationStub(deopt_id, try_index, reason);
   ASSERT(is_optimizing_);
   ASSERT(pending_deoptimization_env_ != NULL);
   stub->set_deoptimization_env(pending_deoptimization_env_);
   deopt_stubs_.Add(stub);
   return stub->entry_label();
@@ skipping 30 matching lines @@
   code.set_object_table(object_array);
 }
 
 
 void FlowGraphCompiler::FinalizeStackmaps(const Code& code) {
   if (stackmap_table_builder_ == NULL) {
     // The unoptimizing compiler has no stack maps.
     code.set_stackmaps(Array::Handle());
   } else {
     // Finalize the stack map array and add it to the code object.
+    ASSERT(is_optimizing());
     code.set_stackmaps(
         Array::Handle(stackmap_table_builder_->FinalizeStackmaps(code)));
-    ASSERT(is_optimizing());
   }
 }
 
 
 void FlowGraphCompiler::FinalizeVarDescriptors(const Code& code) {
   const LocalVarDescriptors& var_descs = LocalVarDescriptors::Handle(
           parsed_function_.node_sequence()->scope()->GetVarDescriptors(
               parsed_function_.function()));
   code.set_var_descriptors(var_descs);
 }
@@ skipping 46 matching lines @@
 
 
 void FlowGraphCompiler::GenerateInstanceCall(
     intptr_t deopt_id,
     intptr_t token_pos,
     intptr_t try_index,
     const String& function_name,
     intptr_t argument_count,
     const Array& argument_names,
     intptr_t checked_argument_count,
-    BitmapBuilder* stack_bitmap) {
+    LocationSummary* locs) {
   ASSERT(!IsLeaf());
   ICData& ic_data =
       ICData::ZoneHandle(ICData::New(parsed_function().function(),
                                      function_name,
                                      deopt_id,
                                      checked_argument_count));
   const Array& arguments_descriptor =
       DartEntry::ArgumentsDescriptor(argument_count, argument_names);
   uword label_address = 0;
   switch (checked_argument_count) {
     case 1:
       label_address = StubCode::OneArgCheckInlineCacheEntryPoint();
       break;
     case 2:
       label_address = StubCode::TwoArgsCheckInlineCacheEntryPoint();
       break;
     default:
       UNIMPLEMENTED();
   }
   ExternalLabel target_label("InlineCache", label_address);
 
-  const intptr_t descr_offset = EmitInstanceCall(&target_label,
-                                                 ic_data,
-                                                 arguments_descriptor,
-                                                 argument_count);
-  if (is_optimizing() && (stack_bitmap != NULL)) {
-    stackmap_table_builder_->AddEntry(descr_offset, stack_bitmap);
-  }
-  pc_descriptors_list()->AddDescriptor(PcDescriptors::kIcCall,
-                                       descr_offset,
-                                       deopt_id,
-                                       token_pos,
-                                       try_index);
+  EmitInstanceCall(&target_label, ic_data, arguments_descriptor, argument_count,
+                   deopt_id, token_pos, try_index, locs);
 }
 
 
 void FlowGraphCompiler::GenerateStaticCall(intptr_t deopt_id,
                                            intptr_t token_pos,
                                            intptr_t try_index,
                                            const Function& function,
                                            intptr_t argument_count,
                                            const Array& argument_names,
-                                           BitmapBuilder* stack_bitmap) {
+                                           LocationSummary* locs) {
   const Array& arguments_descriptor =
       DartEntry::ArgumentsDescriptor(argument_count, argument_names);
-  const intptr_t descr_offset = EmitStaticCall(function,
-                                               arguments_descriptor,
-                                               argument_count);
-  if (is_optimizing() && (stack_bitmap != NULL)) {
-    stackmap_table_builder_->AddEntry(descr_offset, stack_bitmap);
-  }
-  pc_descriptors_list()->AddDescriptor(PcDescriptors::kFuncCall,
-                                       descr_offset,
-                                       deopt_id,
-                                       token_pos,
-                                       try_index);
+  EmitStaticCall(function, arguments_descriptor, argument_count,
+                 deopt_id, token_pos, try_index, locs);
 }
 
 
 void FlowGraphCompiler::GenerateNumberTypeCheck(Register kClassIdReg,
                                                 const AbstractType& type,
                                                 Label* is_instance_lbl,
                                                 Label* is_not_instance_lbl) {
   GrowableArray<intptr_t> args;
   if (type.IsNumberInterface()) {
     args.Add(kDoubleCid);
@@ skipping 45 matching lines @@
 
 void FlowGraphCompiler::EmitTestAndCall(const ICData& ic_data,
                                         Register class_id_reg,
                                         intptr_t arg_count,
                                         const Array& arg_names,
                                         Label* deopt,
                                         Label* done,
                                         intptr_t deopt_id,
                                         intptr_t token_index,
                                         intptr_t try_index,
-                                        BitmapBuilder* stack_bitmap) {
+                                        LocationSummary* locs) {
   ASSERT(!ic_data.IsNull() && (ic_data.NumberOfChecks() > 0));
   Label match_found;
   for (intptr_t i = 0; i < ic_data.NumberOfChecks(); i++) {
     const bool is_last_check = (i == (ic_data.NumberOfChecks() - 1));
     Label next_test;
     assembler()->cmpl(class_id_reg, Immediate(ic_data.GetReceiverClassIdAt(i)));
     if (is_last_check) {
       assembler()->j(NOT_EQUAL, deopt);
     } else {
       assembler()->j(NOT_EQUAL, &next_test);
     }
     const Function& target = Function::ZoneHandle(ic_data.GetTargetAt(i));
     GenerateStaticCall(deopt_id,
                        token_index,
                        try_index,
                        target,
                        arg_count,
                        arg_names,
-                       stack_bitmap);
+                       locs);
     if (!is_last_check) {
       assembler()->jmp(&match_found);
     }
     assembler()->Bind(&next_test);
   }
   assembler()->Bind(&match_found);
   if (done != NULL) {
     assembler()->jmp(done);
   }
 }
@@ skipping 237 matching lines @@
       return;
     }
   }
 
   // This move is not blocked.
   EmitMove(index);
 }
 
 
 }  // namespace dart