Second set of changes for implementation of stack map support.

vm/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/compiler.h"
 
 #include "vm/assembler.h"
 #include "vm/ast_printer.h"
 #include "vm/code_generator.h"
 #include "vm/code_index_table.h"
@@ skipping 172 matching lines @@
           ExtractTypeFeedback(
               Code::Handle(parsed_function.function().unoptimized_code()),
               parsed_function.node_sequence());
         }
         OptimizingCodeGenerator code_gen(&assembler, parsed_function);
         code_gen.GenerateCode();
         Code& code = Code::Handle(
             Code::FinalizeCode(function_fullname, &assembler));
         code.set_is_optimized(true);
         code_gen.FinalizePcDescriptors(code);
+        code_gen.FinalizeStackmaps(code);
         code_gen.FinalizeExceptionHandlers(code);
         function.SetCode(code);
         code_index_table->AddCode(code);
         CodePatcher::PatchEntry(Code::Handle(function.unoptimized_code()));
         if (FLAG_trace_compiler) {
           OS::Print("--> patching entry 0x%x\n",
                     Code::Handle(function.unoptimized_code()).EntryPoint());
         }
       } else {
         // Unoptimized code.
         if (Code::Handle(function.unoptimized_code()).IsNull()) {
           ASSERT(!function.HasCode());
           // Compiling first time.
           CodeGenerator code_gen(&assembler, parsed_function);
           code_gen.GenerateCode();
           const Code& code =
               Code::Handle(Code::FinalizeCode(function_fullname, &assembler));
           code.set_is_optimized(false);
           code_gen.FinalizePcDescriptors(code);
+          code_gen.FinalizeStackmaps(code);
           code_gen.FinalizeVarDescriptors(code);
           code_gen.FinalizeExceptionHandlers(code);
           function.set_unoptimized_code(code);
           function.SetCode(code);
           ASSERT(CodePatcher::CodeIsPatchable(code));
           code_index_table->AddCode(code);
         } else {
           // Disable optimized code.
           ASSERT(function.HasOptimizedCode());
           // Patch entry of optimized code.
@@ skipping 157 matching lines @@
     const Code& code = Code::Handle(Code::FinalizeCode(kEvalConst, &assembler));
 
     func.SetCode(code);
     CodeIndexTable* code_index_table = isolate->code_index_table();
     ASSERT(code_index_table != NULL);
     code_index_table->AddCode(code);
     // TODO(hausner): We need a way to remove these one-time execution
     // functions from the global code description (PC mapping) tables so
     // we don't pollute the system unnecessarily with stale data.
     code_gen.FinalizePcDescriptors(code);
+    code_gen.FinalizeStackmaps(code);
     code_gen.FinalizeExceptionHandlers(code);
 
     GrowableArray<const Object*> arguments;  // no arguments.
     const Array& kNoArgumentNames = Array::Handle();
     result = DartEntry::InvokeStatic(func,
                                      arguments,
                                      kNoArgumentNames);
   } else {
     result = isolate->object_store()->sticky_error();
     isolate->object_store()->clear_sticky_error();
   }
   isolate->set_long_jump_base(base);
   return result.raw();
 }
 
 
 }  // namespace dart