Move code around in preparation for better inlining.

runtime/vm/flow_graph_builder.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_FLOW_GRAPH_BUILDER_H_
 #define VM_FLOW_GRAPH_BUILDER_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
 #include "vm/intermediate_language.h"
 
 namespace dart {
 
 class FlowGraph;
 class Instruction;
 class ParsedFunction;
 
 // An abstraction of the graph context in which an inlined call occurs.
 class InliningContext: public ZoneAllocated {
  public:
+  // Create the appropriate inlining context for the flow graph context of a
+  // call.
+  static InliningContext* Create(Definition* call);
+
   virtual void AddExit(ReturnInstr* exit) = 0;
+
+  // Inline a flow graph at a call site.
+  //
+  // Assumes the callee graph was computed by BuildGraph with an inlining
+  // context and transformed to SSA with ComputeSSA with a correct virtual
+  // register number, and that the use lists have been correctly computed.
+  //
+  // After inlining the caller graph will correctly have adjusted the
+  // pre/post orders, the dominator tree and the use lists.
+  virtual void ReplaceCall(FlowGraph* caller_graph,
+                           Definition* call,
+                           FlowGraph* callee_graph) = 0;
+
+ protected:
+  static void PrepareGraphs(FlowGraph* caller_graph,
+                            Definition* call,
+                            FlowGraph* callee_graph);
 };
 
 
 // The context of a call inlined for its value (including calls inlined for
 // their effects, i.e., when the value is ignored).  Collects normal exit
 // blocks and return values.
 class ValueInliningContext: public InliningContext {
  public:
   ValueInliningContext() : exits_(4) { }
 
+  virtual void AddExit(ReturnInstr* exit);
+
+  virtual void ReplaceCall(FlowGraph* caller_graph,
+                           Definition* call,
+                           FlowGraph* callee_graph);
+
+ private:
+  struct Data {
+    BlockEntryInstr* exit_block;
+    ReturnInstr* exit_return;
+  };
+
   BlockEntryInstr* ExitBlockAt(intptr_t i) const {
     ASSERT(exits_[i].exit_block != NULL);
     return exits_[i].exit_block;
   }
   Instruction* LastInstructionAt(intptr_t i) const {
     return exits_[i].exit_return->previous();
   }
   Value* ValueAt(intptr_t i) const {
     return exits_[i].exit_return->value();
   }
 
-  intptr_t NumExits() { return exits_.length(); }
-  virtual void AddExit(ReturnInstr* exit);
+  static int LowestBlockIdFirst(const Data* a, const Data* b);
   void SortExits();
 
- private:
-  struct Data {
-    BlockEntryInstr* exit_block;
-    ReturnInstr* exit_return;
-  };
-
-  static int LowestBlockIdFirst(const Data* a, const Data* b);
-
   GrowableArray<Data> exits_;
 };
 
 
 // Build a flow graph from a parsed function's AST.
 class FlowGraphBuilder: public ValueObject {
  public:
   // The inlining context is NULL if not inlining.
   FlowGraphBuilder(const ParsedFunction& parsed_function,
                    InliningContext* inlining_context);
@@ skipping 371 matching lines @@
   // Output parameters.
   GrowableArray<TargetEntryInstr**> true_successor_addresses_;
   GrowableArray<TargetEntryInstr**> false_successor_addresses_;
 
   intptr_t condition_token_pos_;
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_BUILDER_H_