Second set of changes for implementation of stack map support.

vm/code_generator_x64.h

 // 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.
 
 #ifndef VM_CODE_GENERATOR_X64_H_
 #define VM_CODE_GENERATOR_X64_H_
 
 #ifndef VM_CODE_GENERATOR_H_
 #error Do not include code_generator_x64.h directly; use code_generator.h.
 #endif
 
 #include "vm/assembler.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
 #include "vm/parser.h"
 
 namespace dart {
 
 // Forward declarations.
 class Assembler;
 class AstNode;
 class CodeGenerator;
+class DescriptorList;
 class SourceLabel;
+class StackmapBuilder;
 
 
 class CodeGeneratorState : public StackResource {
  public:
   explicit CodeGeneratorState(CodeGenerator* codegen);
   virtual ~CodeGeneratorState();
 
   CodeGeneratorState* parent() const { return parent_; }
 
   AstNode* root_node() const { return root_node_; }
@@ skipping 23 matching lines @@
   // We store the 'try index' of the block of code that we are
   // currently generating code for in the current_try_index_ variable.
   int current_try_index_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(CodeGeneratorState);
 };
 
 
 class CodeGenerator : public AstNodeVisitor {
  public:
-  // Forward declarations.
-  class DescriptorList;
-
   CodeGenerator(Assembler* assembler, const ParsedFunction& parsed_function);
   virtual ~CodeGenerator() { }
 
   // Accessors.
   Assembler* assembler() const { return assembler_; }
 
   const ParsedFunction& parsed_function() const { return parsed_function_; }
 
   void GenerateCode();
   virtual void GenerateDeferredCode();
 
-  // Add local variable descriptors to code.
-  void FinalizeVarDescriptors(const Code& code);
-
 #define DEFINE_VISITOR_FUNCTION(type, name)                                    \
   virtual void Visit##type(type* node);
 NODE_LIST(DEFINE_VISITOR_FUNCTION)
 #undef DEFINE_VISITOR_FUNCTION
 
   CodeGeneratorState* state() const { return state_; }
   void set_state(CodeGeneratorState* state) { state_ = state; }
 
   // Add exception handler table to code.
   void FinalizeExceptionHandlers(const Code& code);
 
   // Add pc descriptors to code.
   void FinalizePcDescriptors(const Code& code);
 
+  // Add stack maps to code.
+  void FinalizeStackmaps(const Code& code);
+
+  // Add local variable descriptors to code.
+  void FinalizeVarDescriptors(const Code& code);
+
   // Allocate and return an arguments descriptor.
   // Let 'num_names' be the length of 'optional_arguments_names'.
   // Treat the first 'num_arguments - num_names' arguments as positional and
   // treat the following 'num_names' arguments as named optional arguments.
   static const Array& ArgumentsDescriptor(
       int num_arguments,
       const Array& optional_arguments_names);
 
   virtual bool IsOptimizing() const {
     return false;
@@ skipping 98 matching lines @@
   void CopyParameters();
 
   void set_context_level(intptr_t value) { context_level_ = value; }
   intptr_t context_level() const { return context_level_; }
 
   Assembler* assembler_;
   const ParsedFunction& parsed_function_;
   intptr_t locals_space_size_;
   CodeGeneratorState* state_;
   DescriptorList* pc_descriptors_list_;
+  StackmapBuilder* stackmap_builder_;
   HandlerList* exception_handlers_list_;
   int try_index_;
   // The runtime context level is only incremented when a new context is
   // allocated and chained to the list of contexts.
   intptr_t context_level_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(CodeGenerator);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_CODE_GENERATOR_X64_H_