Remove the instruction pointer from computations.

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"
 
 namespace dart {
 
 template <typename T> class GrowableArray;
 
 class FlowGraphOptimizer : public FlowGraphVisitor {
  public:
   explicit FlowGraphOptimizer(const GrowableArray<BlockEntryInstr*>& blocks)
       : FlowGraphVisitor(blocks) {}
   virtual ~FlowGraphOptimizer() {}
 
   void ApplyICData();
 
-  virtual void VisitStaticCall(StaticCallComp* comp);
-  virtual void VisitInstanceCall(InstanceCallComp* comp);
-  virtual void VisitInstanceSetter(InstanceSetterComp* comp);
-  virtual void VisitLoadIndexed(LoadIndexedComp* comp);
-  virtual void VisitStoreIndexed(StoreIndexedComp* comp);
-  virtual void VisitRelationalOp(RelationalOpComp* comp);
+  virtual void VisitStaticCall(StaticCallComp* comp, BindInstr* instr);
+  virtual void VisitInstanceCall(InstanceCallComp* comp, BindInstr* instr);
+  virtual void VisitInstanceSetter(InstanceSetterComp* comp, BindInstr* instr);
+  virtual void VisitLoadIndexed(LoadIndexedComp* comp, BindInstr* instr);
+  virtual void VisitStoreIndexed(StoreIndexedComp* comp, BindInstr* instr);
+  virtual void VisitRelationalOp(RelationalOpComp* comp, BindInstr* instr);
 
-  virtual void VisitStrictCompare(StrictCompareComp* comp);
-  virtual void VisitEqualityCompare(EqualityCompareComp* comp);
+  virtual void VisitStrictCompare(StrictCompareComp* comp, BindInstr* instr);
+  virtual void VisitEqualityCompare(EqualityCompareComp* comp,
+                                    BindInstr* instr);
 
   virtual void VisitBind(BindInstr* instr);
 
  private:
   void VisitBlocks();
 
-  bool TryReplaceWithBinaryOp(InstanceCallComp* comp, Token::Kind op_kind);
-  bool TryReplaceWithUnaryOp(InstanceCallComp* comp, Token::Kind op_kind);
+  bool TryReplaceWithBinaryOp(BindInstr* instr,
+                              InstanceCallComp* comp,
+                              Token::Kind op_kind);
+  bool TryReplaceWithUnaryOp(BindInstr* instr,
+                             InstanceCallComp* comp,
+                             Token::Kind op_kind);
 
-  bool TryInlineInstanceGetter(InstanceCallComp* comp);
-  bool TryInlineInstanceSetter(InstanceSetterComp* comp);
+  bool TryInlineInstanceGetter(BindInstr* instr,
+                               InstanceCallComp* comp);
+  bool TryInlineInstanceSetter(BindInstr* instr, InstanceSetterComp* comp);
 
-  bool TryInlineInstanceMethod(InstanceCallComp* comp);
+  bool TryInlineInstanceMethod(BindInstr* instr, InstanceCallComp* comp);
 
   DISALLOW_COPY_AND_ASSIGN(FlowGraphOptimizer);
 };
 
 
 // Analyze the generated flow graph. Currently only if it is a leaf
 // method, i.e., does not contain any calls to runtime or other Dart code.
 class FlowGraphAnalyzer : public ValueObject {
  public:
   explicit FlowGraphAnalyzer(const GrowableArray<BlockEntryInstr*>& blocks);
   virtual ~FlowGraphAnalyzer() {}
 
   void Analyze();
 
   bool is_leaf() const { return is_leaf_; }
 
  private:
   const GrowableArray<BlockEntryInstr*>& blocks_;
   bool is_leaf_;
 
   DISALLOW_COPY_AND_ASSIGN(FlowGraphAnalyzer);
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_OPTIMIZER_H_