Second set of changes for implementation of stack map support.

vm/code_generator_ia32.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_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/code_generator.h"
 
 #include "lib/error.h"
 #include "vm/ast_printer.h"
 #include "vm/class_finalizer.h"
+#include "vm/code_descriptors.h"
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
 #include "vm/longjump.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/parser.h"
 #include "vm/resolver.h"
 #include "vm/stub_code.h"
 
 namespace dart {
@@ skipping 78 matching lines @@
 };
 
 
 CodeGenerator::CodeGenerator(Assembler* assembler,
                              const ParsedFunction& parsed_function)
     : assembler_(assembler),
       parsed_function_(parsed_function),
       locals_space_size_(-1),
       state_(NULL),
       pc_descriptors_list_(NULL),
+      stackmap_builder_(NULL),
       exception_handlers_list_(NULL),
       try_index_(CatchClauseNode::kInvalidTryIndex),
       context_level_(0) {
   ASSERT(assembler_ != NULL);
   ASSERT(parsed_function.node_sequence() != NULL);
   ASSERT(Isolate::Current()->long_jump_base()->IsSafeToJump());
-  pc_descriptors_list_ = new CodeGenerator::DescriptorList();
+  pc_descriptors_list_ = new DescriptorList();
+  // We do not build any stack maps in the unoptimizing compiler.
   exception_handlers_list_ = new CodeGenerator::HandlerList();
 }
 
 
 bool CodeGenerator::IsResultNeeded(AstNode* node) const {
   return !state()->IsRootNode(node);
 }
 
 
 // NOTE: First 5 bytes of the code may be patched with a jump instruction. Do
@@ skipping 79 matching lines @@
 
 void CodeGenerator::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 CodeGenerator::FinalizeStackmaps(const Code& code) {
+  if (stackmap_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_builder_->FinalizeStackmaps(code)));
+  }
+}
+
+
 void CodeGenerator::FinalizeVarDescriptors(const Code& code) {
   const LocalVarDescriptors& var_descs = LocalVarDescriptors::Handle(
           parsed_function_.node_sequence()->scope()->GetVarDescriptors());
   code.set_var_descriptors(var_descs);
 }
 
 
 void CodeGenerator::FinalizeExceptionHandlers(const Code& code) {
   ASSERT(exception_handlers_list_ != NULL);
   const ExceptionHandlers& handlers = ExceptionHandlers::Handle(
@@ skipping 2460 matching lines @@
   const Error& error = Error::Handle(
       Parser::FormatError(script, token_index, "Error", format, args));
   va_end(args);
   Isolate::Current()->long_jump_base()->Jump(1, error);
   UNREACHABLE();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32