commit edc34c88b8f8abd04f9c4668787403608cf0b2d4
author Bill Buzbee <buzbee@android.com> Wed Oct 08 17:20:31 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 08 17:20:31 2014 +0000
tree fac880a131b35baecf0a4582b9ca34a100bcd19b
parent 254aa0d3f58b56b227077ef32b4606ebc25eaae4
parent 504b7882fbb841787e350f2da54b1fa9171ce82a

Merge "ART: fix NullCheckElimination to preserve MIR_IGNORE_NULL_CHECK"

compiler/dex/mir_optimization.cc

diff --git a/compiler/dex/mir_optimization.cc b/compiler/dex/mir_optimization.cc
index 20bc220..35dae00 100644
--- a/compiler/dex/mir_optimization.cc
+++ b/compiler/dex/mir_optimization.cc
@@ -940,7 +940,7 @@
         mir->optimization_flags |= MIR_IGNORE_NULL_CHECK;
       } else {
         // Do the null check.
-        mir->optimization_flags &= ~MIR_IGNORE_NULL_CHECK;
+        // Do not clear MIR_IGNORE_NULL_CHECK flag as it may be set by another optimization
         // Mark s_reg as null-checked
         ssa_regs_to_check->ClearBit(src_sreg);
       }