Do not emit duplicate deoptimization entries for GotoInstr.

runtime/vm/intermediate_language.h

 // Copyright (c) 2013, 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_INTERMEDIATE_LANGUAGE_H_
 #define VM_INTERMEDIATE_LANGUAGE_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ skipping 624 matching lines @@
       : deopt_id_(Isolate::Current()->GetNextDeoptId()),
         lifetime_position_(-1),
         previous_(NULL),
         next_(NULL),
         env_(NULL),
         expr_id_(kNoExprId) { }
 
   virtual Tag tag() const = 0;
 
   intptr_t deopt_id() const {
-    ASSERT(CanDeoptimize() || CanBeDeoptimizationTarget());
+    ASSERT(CanDeoptimize() || CanBecomeDeoptimizationTarget());
     return deopt_id_;
   }
 
   ICData* GetICData(const Array& ic_data_array) const;
 
   bool IsBlockEntry() { return (AsBlockEntry() != NULL); }
   virtual BlockEntryInstr* AsBlockEntry() { return NULL; }
 
   bool IsDefinition() { return (AsDefinition() != NULL); }
   virtual Definition* AsDefinition() { return NULL; }
@@ skipping 183 matching lines @@
   // All instructions that participate in CSE have to override this function.
   // This function can assume that the argument has the same type as this.
   virtual bool AttributesEqual(Instruction* other) const {
     UNREACHABLE();
     return false;
   }
 
   virtual void InheritDeoptTarget(Instruction* other);
 
   bool NeedsEnvironment() const {
-    return CanDeoptimize() || CanBeDeoptimizationTarget();
+    return CanDeoptimize() || CanBecomeDeoptimizationTarget();
   }
 
-  virtual bool CanBeDeoptimizationTarget() const {
+  virtual bool CanBecomeDeoptimizationTarget() const {
     return false;
   }
 
   void InheritDeoptTargetAfter(Instruction* other);
 
   virtual bool MayThrow() const = 0;
 
  protected:
   // Fetch deopt id without checking if this computation can deoptimize.
   intptr_t GetDeoptId() const {
@@ skipping 282 matching lines @@
       intptr_t fixed_parameter_count);
 
   virtual intptr_t InputCount() const { return 0; }
   virtual Value* InputAt(intptr_t i) const {
     UNREACHABLE();
     return NULL;
   }
 
   virtual intptr_t ArgumentCount() const { return 0; }
 
-  virtual bool CanBeDeoptimizationTarget() const {
+  virtual bool CanBecomeDeoptimizationTarget() const {
     // BlockEntry environment is copied to Goto and Branch instructions
     // when we insert new blocks targeting this block.
     return true;
   }
 
   virtual bool CanDeoptimize() const { return false; }
 
   virtual EffectSet Effects() const { return EffectSet::None(); }
   virtual EffectSet Dependencies() const { return EffectSet::None(); }
 
@@ skipping 687 matching lines @@
     SetInputAt(0, value);
   }
 
   DECLARE_INSTRUCTION(Return)
 
   virtual intptr_t ArgumentCount() const { return 0; }
 
   intptr_t token_pos() const { return token_pos_; }
   Value* value() const { return inputs_[0]; }
 
-  virtual bool CanBeDeoptimizationTarget() const {
+  virtual bool CanBecomeDeoptimizationTarget() const {
     // Return instruction might turn into a Goto instruction after inlining.
     // Every Goto must have an environment.
     return true;
   }
 
   virtual bool CanDeoptimize() const { return false; }
 
   virtual EffectSet Effects() const { return EffectSet::None(); }
 
   virtual bool MayThrow() const { return false; }
@@ skipping 59 matching lines @@
 
   DECLARE_INSTRUCTION(Goto)
 
   virtual intptr_t ArgumentCount() const { return 0; }
 
   JoinEntryInstr* successor() const { return successor_; }
   void set_successor(JoinEntryInstr* successor) { successor_ = successor; }
   virtual intptr_t SuccessorCount() const;
   virtual BlockEntryInstr* SuccessorAt(intptr_t index) const;
 
-  virtual bool CanBeDeoptimizationTarget() const {
+  virtual bool CanBecomeDeoptimizationTarget() const {
     // Goto instruction can be used as a deoptimization target when LICM
     // hoists instructions out of the loop.
     return true;
   }
 
   virtual bool CanDeoptimize() const { return false; }
 
   virtual EffectSet Effects() const { return EffectSet::None(); }
 
   ParallelMoveInstr* parallel_move() const {
@@ skipping 55 matching lines @@
 class BranchInstr : public ControlInstruction {
  public:
   explicit BranchInstr(ComparisonInstr* comparison, bool is_checked = false);
 
   DECLARE_INSTRUCTION(Branch)
 
   virtual intptr_t ArgumentCount() const;
   intptr_t InputCount() const;
   Value* InputAt(intptr_t i) const;
   virtual bool CanDeoptimize() const;
-  virtual bool CanBeDeoptimizationTarget() const;
+  virtual bool CanBecomeDeoptimizationTarget() const;
 
   virtual EffectSet Effects() const;
 
   ComparisonInstr* comparison() const { return comparison_; }
   void SetComparison(ComparisonInstr* comp);
 
   bool is_checked() const { return is_checked_; }
 
   virtual LocationSummary* locs();
   virtual intptr_t DeoptimizationTarget() const;
@@ skipping 725 matching lines @@
 }
 
 
 inline bool BranchInstr::CanDeoptimize() const {
   // Branches need a deoptimization info in checked mode if they
   // can throw a type check error.
   return comparison()->CanDeoptimize() || is_checked();
 }
 
 
-inline bool BranchInstr::CanBeDeoptimizationTarget() const {
-  return comparison()->CanBeDeoptimizationTarget();
+inline bool BranchInstr::CanBecomeDeoptimizationTarget() const {
+  return comparison()->CanBecomeDeoptimizationTarget();
 }
 
 
 inline EffectSet BranchInstr::Effects() const {
   return comparison()->Effects();
 }
 
 
 inline LocationSummary* BranchInstr::locs() {
   if (comparison()->locs_ == NULL) {
@@ skipping 27 matching lines @@
   StrictCompareInstr(intptr_t token_pos,
                      Token::Kind kind,
                      Value* left,
                      Value* right);
 
   DECLARE_INSTRUCTION(StrictCompare)
   virtual CompileType ComputeType() const;
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
-  virtual bool CanBeDeoptimizationTarget() const {
+  virtual bool CanBecomeDeoptimizationTarget() const {
     // StrictCompare can be merged into Branch and thus needs an environment.
     return true;
   }
 
   virtual bool CanDeoptimize() const { return false; }
 
   virtual Definition* Canonicalize(FlowGraph* flow_graph);
 
   virtual void EmitBranchCode(FlowGraphCompiler* compiler,
                               BranchInstr* branch);
@@ skipping 3585 matching lines @@
   ForwardInstructionIterator* current_iterator_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_