Reapply "Inlining of static calls with trivial function bodies."

runtime/vm/flow_graph.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_H_
 #define VM_FLOW_GRAPH_H_
 
 #include "vm/growable_array.h"
 #include "vm/parser.h"
 
 namespace dart {
 
+class BindInstr;
 class BlockEntryInstr;
+class StaticCallComp;
 class Definition;
 class FlowGraphBuilder;
 class GraphEntryInstr;
 class PhiInstr;
+class ReturnInstr;
 
 // Class to incapsulate the construction and manipulation of the flow graph.
 class FlowGraph: public ZoneAllocated {
  public:
   FlowGraph(const FlowGraphBuilder& builder, GraphEntryInstr* graph_entry);
 
   // Function properties.
   const ParsedFunction& parsed_function() const {
     return parsed_function_;
   }
@@ skipping 25 matching lines @@
   }
 
   intptr_t max_virtual_register_number() const {
     return current_ssa_temp_index();
   }
 
   GraphEntryInstr* graph_entry() const {
     return graph_entry_;
   }
 
+  ZoneGrowableArray<ReturnInstr*>* exits() const { return exits_; }
+  void set_exits(ZoneGrowableArray<ReturnInstr*>* exits) { exits_ = exits; }
+
   intptr_t alloc_ssa_temp_index() { return current_ssa_temp_index_++; }
 
   // Operations on the flow graph.
-  void ComputeSSA();
+  void ComputeSSA(intptr_t next_virtual_register_number = 0);

[srdjan, 2012/09/05 17:40:05]

Avoid using default arguments. There is only one call site where you have to
specify 0.

[zerny-google, 2012/09/07 14:08:43]

Done. (In next CL for inlining monomorphic calls.)

   void ComputeUseLists();
 
+  void InlineCall(BindInstr* caller_instr,
+                  StaticCallComp* caller_comp,
+                  FlowGraph* callee_graph);
+
   // TODO(zerny): Once the SSA is feature complete this should be removed.
   void Bailout(const char* reason) const;
 
 #ifdef DEBUG
   // Validation methods for debugging.
   bool ResetUseLists();
   bool ValidateUseLists();
 #endif  // DEBUG
 
  private:
@@ skipping 35 matching lines @@
 
   // Flow graph fields.
   const ParsedFunction& parsed_function_;
   const intptr_t copied_parameter_count_;
   const intptr_t non_copied_parameter_count_;
   const intptr_t stack_local_count_;
   GraphEntryInstr* graph_entry_;
   GrowableArray<BlockEntryInstr*> preorder_;
   GrowableArray<BlockEntryInstr*> postorder_;
   GrowableArray<BlockEntryInstr*> reverse_postorder_;
+  ZoneGrowableArray<ReturnInstr*>* exits_;
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_H_