1 files changed, 12 insertions, 2 deletions
diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h
index ffa16dd787..5e072cdb67 100644
--- a/compiler/optimizing/nodes.h
+++ b/compiler/optimizing/nodes.h
@@ -421,7 +421,7 @@ class HGraph : public ArenaObject<kArenaAllocGraph> {
   void SimplifyLoop(HBasicBlock* header);
 
   int32_t GetNextInstructionId() {
-    DCHECK_NE(current_instruction_id_, INT32_MAX);
+    CHECK_NE(current_instruction_id_, INT32_MAX);
     return current_instruction_id_++;
   }
 
@@ -430,7 +430,7 @@ class HGraph : public ArenaObject<kArenaAllocGraph> {
   }
 
   void SetCurrentInstructionId(int32_t id) {
-    DCHECK_GE(id, current_instruction_id_);
+    CHECK_GE(id, current_instruction_id_);
     current_instruction_id_ = id;
   }
 
@@ -2612,6 +2612,16 @@ class HPhi FINAL : public HVariableInputSizeInstruction {
         && other->AsPhi()->GetRegNumber() == GetRegNumber();
   }
 
+  bool HasEquivalentPhi() const {
+    if (GetPrevious() != nullptr && GetPrevious()->AsPhi()->GetRegNumber() == GetRegNumber()) {
+      return true;
+    }
+    if (GetNext() != nullptr && GetNext()->AsPhi()->GetRegNumber() == GetRegNumber()) {
+      return true;
+    }
+    return false;
+  }
+
   // Returns the next equivalent phi (starting from the current one) or null if there is none.
   // An equivalent phi is a phi having the same dex register and type.
   // It assumes that phis with the same dex register are adjacent.