FlowGraphCompiler is not a visitor any longer. Start consolidating shared code between the x64 and …

runtime/vm/flow_graph_compiler_ia32.h

Index: runtime/vm/flow_graph_compiler_ia32.h
===================================================================
--- runtime/vm/flow_graph_compiler_ia32.h	(revision 8206)
+++ runtime/vm/flow_graph_compiler_ia32.h	(working copy)
@@ -13,6 +13,7 @@
 #include "vm/assembler_macros.h"
 #include "vm/code_descriptors.h"
 #include "vm/code_generator.h"
+#include "vm/flow_graph_compiler_shared.h"
 #include "vm/intermediate_language.h"
 
 namespace dart {
@@ -26,36 +27,21 @@
 
 // Stubbed out implementation of graph compiler, bails out immediately if
 // CompileGraph is called. The rest of the public API is UNIMPLEMENTED.
-class FlowGraphCompiler : public FlowGraphVisitor {
+class FlowGraphCompiler : public FlowGraphCompilerShared {
  public:
   FlowGraphCompiler(Assembler* assembler,
                     const ParsedFunction& parsed_function,
                     const GrowableArray<BlockEntryInstr*>& block_order,
                     bool is_optimizing);
 
-  virtual ~FlowGraphCompiler();
-
   void CompileGraph();
 
-  // Infrastructure copied from class CodeGenerator or stubbed out.
-  void FinalizePcDescriptors(const Code& code);
-  void FinalizeStackmaps(const Code& code);
-  void FinalizeVarDescriptors(const Code& code);
-  void FinalizeExceptionHandlers(const Code& code);
   void FinalizeComments(const Code& code);
 
-  Assembler* assembler() const { return assembler_; }
-  bool is_optimizing() const { return is_optimizing_; }
-  const ParsedFunction& parsed_function() const { return parsed_function_; }
-
   void GenerateCallRuntime(intptr_t cid,
                            intptr_t token_index,
                            intptr_t try_index,
                            const RuntimeEntry& entry);
-  void AddCurrentDescriptor(PcDescriptors::Kind kind,
-                            intptr_t cid,
-                            intptr_t token_index,
-                            intptr_t try_index);
 
   void EmitInstanceCall(intptr_t cid,
                         intptr_t token_index,
@@ -82,47 +68,17 @@
 
   virtual void VisitBlocks();
 
-  BlockEntryInstr* current_block() const { return current_block_; }
-
-  // Constructor is lighweight, major initialization work should occur here.
-  // This makes it easier to measure time spent in the compiler.
-  void InitCompiler();
-
-  struct BlockInfo : public ZoneAllocated {
-   public:
-    BlockInfo() : label() { }
-
-    Label label;
-  };
-
   void CopyParameters();
   void EmitInstructionPrologue(Instruction* instr);
 
-  intptr_t StackSize() const;
-
   bool CanOptimize();
   bool TryIntrinsify();
   void IntrinsifyGetter();
   void IntrinsifySetter();
 
-  void GenerateDeferredCode();
   void EmitComment(Instruction* instr);
   void BailoutOnInstruction(Instruction* instr);
 
-  Assembler* assembler_;
-  const ParsedFunction& parsed_function_;
-
-  // Compiler specific per-block state.  Indexed by postorder block number
-  // for convenience.  This is not the block's index in the block order,
-  // which is reverse postorder.
-  GrowableArray<BlockInfo*> block_info_;
-  BlockEntryInstr* current_block_;
-  DescriptorList* pc_descriptors_list_;
-  StackmapBuilder* stackmap_builder_;
-  ExceptionHandlerList* exception_handlers_list_;
-  GrowableArray<DeoptimizationStub*> deopt_stubs_;
-  const bool is_optimizing_;
-
   DISALLOW_COPY_AND_ASSIGN(FlowGraphCompiler);
 };