Build and use stack maps in the SSA compiler.

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 59 matching lines @@
     const GrowableArray<BlockEntryInstr*>& block_order,
     bool is_optimizing,
     bool is_ssa,
     bool is_leaf)
     : assembler_(assembler),
       parsed_function_(parsed_function),
       block_order_(block_order),
       current_block_(NULL),
       exception_handlers_list_(NULL),
       pc_descriptors_list_(NULL),
-      stackmap_table_builder_(NULL),
+      stackmap_table_builder_(is_ssa ? new StackmapTableBuilder() : NULL),
       block_info_(block_order.length()),
       deopt_stubs_(),
       object_table_(GrowableObjectArray::Handle(GrowableObjectArray::New())),
       is_optimizing_(is_optimizing),
       is_ssa_(is_ssa),
       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())),
@@ skipping 45 matching lines @@
 
 void FlowGraphCompiler::VisitBlocks() {
   for (intptr_t i = 0; i < block_order().length(); ++i) {
     ASSERT(frame_register_allocator()->IsSpilled());
     assembler()->Comment("B%d", i);
     // Compile the block entry.
     BlockEntryInstr* entry = block_order()[i];
     set_current_block(entry);
     entry->PrepareEntry(this);
     // Compile all successors until an exit, branch, or a block entry.
-    Instruction* instr = entry;
     for (ForwardInstructionIterator it(entry); !it.Done(); it.Advance()) {
-      instr = it.Current();
+      Instruction* instr = it.Current();
       if (FLAG_code_comments) EmitComment(instr);
       if (instr->IsParallelMove()) {
         parallel_move_resolver_.EmitNativeCode(instr->AsParallelMove());
       } else {
         ASSERT(instr->locs() != NULL);
         EmitInstructionPrologue(instr);
         pending_deoptimization_env_ = instr->env();
         instr->EmitNativeCode(this);
       }
     }
-    if (instr->next() != NULL) {
-      BlockEntryInstr* successor = instr->next()->AsBlockEntry();
-      ASSERT(successor != NULL);
-      frame_register_allocator()->Spill();
-      if (!IsNextBlock(successor)) {
-        assembler()->jmp(GetBlockLabel(successor));
-      }
-    }
   }
 }
 
 
 void FlowGraphCompiler::Bailout(const char* reason) {
   const char* kFormat = "FlowGraphCompiler Bailout: %s %s.";
   const char* function_name = parsed_function().function().ToCString();
   intptr_t len = OS::SNPrint(NULL, 0, kFormat, function_name, reason) + 1;
   char* chars = Isolate::Current()->current_zone()->Alloc<char>(len);
   OS::SNPrint(chars, len, kFormat, function_name, reason);
@@ skipping 110 matching lines @@
 
 
 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.
     code.set_stackmaps(
         Array::Handle(stackmap_table_builder_->FinalizeStackmaps(code)));
+    ASSERT(is_ssa() && 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 45 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) {
+    intptr_t checked_argument_count,
+    BitmapBuilder* stack_bitmap) {
   ASSERT(!IsLeaf());
   ASSERT(frame_register_allocator()->IsSpilled());
   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_ssa() && (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);
 }
 
 
 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) {
+                                           const Array& argument_names,
+                                           BitmapBuilder* stack_bitmap) {
   ASSERT(frame_register_allocator()->IsSpilled());
 
   const Array& arguments_descriptor =
       DartEntry::ArgumentsDescriptor(argument_count, argument_names);
   const intptr_t descr_offset = EmitStaticCall(function,
                                                arguments_descriptor,
                                                argument_count);
+  if (is_ssa() && (stack_bitmap != NULL)) {

[Vyacheslav Egorov (Google), 2012/08/13 12:54:46]

we should make as hard as possible to pass NULLs from ssa pipeline here so that
instructions with no bitmap will not easily come here.

[Kevin Millikin (Google), 2012/08/13 15:10:37]

Agreed.  I think we'll actually want to just make it non-NULL, even if we have a
few special (constant or nearly so) bitmaps describing the prologue etc.

+    stackmap_table_builder_->AddEntry(descr_offset, stack_bitmap);
+  }
   pc_descriptors_list()->AddDescriptor(PcDescriptors::kFuncCall,
                                        descr_offset,
                                        deopt_id,
                                        token_pos,
                                        try_index);
 }
 
 
 void FlowGraphCompiler::GenerateNumberTypeCheck(Register kClassIdReg,
                                                 const AbstractType& type,
@@ skipping 58 matching lines @@
                        comp->try_index());
 
   const intptr_t kNumArguments = 2;
   const intptr_t kNumArgsChecked = 1;  // Type-feedback.
   GenerateInstanceCall(comp->deopt_id(),
                        comp->token_pos(),
                        comp->try_index(),
                        function_name,
                        kNumArguments,
                        Array::ZoneHandle(),  // No optional arguments.
-                       kNumArgsChecked);
+                       kNumArgsChecked,
+                       comp->locs()->stack_bitmap());
 }
 
 
 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) {
+                                        intptr_t try_index,
+                                        BitmapBuilder* stack_bitmap) {
   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);
+                       arg_names,
+                       stack_bitmap);
     if (!is_last_check) {
       assembler()->jmp(&match_found);
     }
     assembler()->Bind(&next_test);
   }
   assembler()->Bind(&match_found);
   if (done != NULL) {
     assembler()->jmp(done);
   }
 }
@@ skipping 326 matching lines @@
       return;
     }
   }
 
   // This move is not blocked.
   EmitMove(index);
 }
 
 
 }  // namespace dart