diff options
| author | Vladimir Marko <vmarko@google.com> | 2014-10-13 15:18:34 +0000 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2014-10-13 15:18:34 +0000 |
| commit | cb46ee13a5683c2973244da964887a448e61b6ec (patch) | |
| tree | ad82945f47b3f5256eb0440e9a398443a6e401a8 /compiler | |
| parent | 504b7882fbb841787e350f2da54b1fa9171ce82a (diff) | |
| download | art-cb46ee13a5683c2973244da964887a448e61b6ec.zip art-cb46ee13a5683c2973244da964887a448e61b6ec.tar.gz art-cb46ee13a5683c2973244da964887a448e61b6ec.tar.bz2 | |
Revert "ART: fix NullCheckElimination to preserve MIR_IGNORE_NULL_CHECK"
This reverts commit 504b7882fbb841787e350f2da54b1fa9171ce82a.
Change-Id: I41c7a03c49f7904370a64c6ececc89146ff735c8
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/dex/mir_optimization.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/dex/mir_optimization.cc b/compiler/dex/mir_optimization.cc index fda6ef8..dac71f6 100644 --- a/compiler/dex/mir_optimization.cc +++ b/compiler/dex/mir_optimization.cc @@ -936,7 +936,7 @@ bool MIRGraph::EliminateNullChecksAndInferTypes(BasicBlock* bb) { mir->optimization_flags |= MIR_IGNORE_NULL_CHECK; } else { // Do the null check. - // Do not clear MIR_IGNORE_NULL_CHECK flag as it may be set by another optimization + mir->optimization_flags &= ~MIR_IGNORE_NULL_CHECK; // Mark s_reg as null-checked ssa_regs_to_check->ClearBit(src_sreg); } |