Turn definitions that do not produce results (e.g. Checks) into instructions.

runtime/vm/flow_graph_optimizer.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_OPTIMIZER_H_
 #define VM_FLOW_GRAPH_OPTIMIZER_H_
 
 #include "vm/intermediate_language.h"
 #include "vm/flow_graph.h"
 
@@ skipping 18 matching lines @@
   void SelectRepresentations();
 
   void PropagateSminess();
 
   virtual void VisitStaticCall(StaticCallInstr* instr);
   virtual void VisitInstanceCall(InstanceCallInstr* instr);
   virtual void VisitRelationalOp(RelationalOpInstr* instr);
   virtual void VisitEqualityCompare(EqualityCompareInstr* instr);
   virtual void VisitBranch(BranchInstr* instr);
 
-  // TODO(fschneider): Once we get rid of the distinction between Instruction
-  // and computation, this can be made private again.
-  void InsertBefore(Instruction* instr,
-                    Definition* defn,
+  void InsertBefore(Instruction* next,
+                    Instruction* instr,
                     Environment* env,
                     Definition::UseKind use_kind);
 
  private:
   bool TryReplaceWithArrayOp(InstanceCallInstr* call, Token::Kind op_kind);
   bool TryReplaceWithBinaryOp(InstanceCallInstr* call, Token::Kind op_kind);
   bool TryReplaceWithUnaryOp(InstanceCallInstr* call, Token::Kind op_kind);
 
   bool TryInlineInstanceGetter(InstanceCallInstr* call);
   bool TryInlineInstanceSetter(InstanceCallInstr* call);
 
   bool TryInlineInstanceMethod(InstanceCallInstr* call);
 
   void AddCheckClass(InstanceCallInstr* call, Value* value);
 
-  void InsertAfter(Instruction* instr,
-                   Definition* defn,
+  void InsertAfter(Instruction* prev,
+                   Instruction* instr,
                    Environment* env,
                    Definition::UseKind use_kind);
 
   void InsertConversionsFor(Definition* def);
 
   bool InstanceCallNeedsClassCheck(InstanceCallInstr* call) const;
 
   FlowGraph* flow_graph_;
 
   DISALLOW_COPY_AND_ASSIGN(FlowGraphOptimizer);
@@ skipping 57 matching lines @@
 
 
 // Loop invariant code motion.
 class LICM : public AllStatic {
  public:
   static void Optimize(FlowGraph* flow_graph);
 
  private:
   static void Hoist(ForwardInstructionIterator* it,
                     BlockEntryInstr* pre_header,
-                    Definition* current);
+                    Instruction* current);
 
   static void TryHoistCheckSmiThroughPhi(ForwardInstructionIterator* it,
                                          BlockEntryInstr* header,
                                          BlockEntryInstr* pre_header,
-                                         Definition* current);
+                                         Instruction* current);
 };
 
 
 // A simple common subexpression elimination based
 // on the dominator tree.
 class DominatorBasedCSE : public AllStatic {
  public:
   static void Optimize(FlowGraph* graph);
 
  private:
   static void OptimizeRecursive(
       BlockEntryInstr* entry,
-      DirectChainedHashMap<Definition*>* map);
+      DirectChainedHashMap<Instruction*>* map);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_OPTIMIZER_H_