am c39eb4ae: Merge "Add regression test for null check elimination."

* commit 'c39eb4aef19b7fe64283fb3ae7ce6d13cd6c8294':
  Add regression test for null check elimination.

1 files changed, 2 insertions, 0 deletions

diff --git a/compiler/dex/mir_optimization.cc b/compiler/dex/mir_optimization.cc
index 2ac0b51a89..84c056daf3 100644
--- a/compiler/dex/mir_optimization.cc
+++ b/compiler/dex/mir_optimization.cc
@@ -929,6 +929,8 @@ bool MIRGraph::EliminateNullChecks(BasicBlock* bb) {
         mir->optimization_flags |= MIR_IGNORE_NULL_CHECK;
       } else {
         // Do the null check.
+        // TODO: Rewrite the pass to converge first before doing any modifications so that
+        // we don't lose the MIR_IGNORE_NULL_CHECK here if previously set by some other pass.
         mir->optimization_flags &= ~MIR_IGNORE_NULL_CHECK;
         // Mark s_reg as null-checked
         ssa_regs_to_check->ClearBit(src_sreg);