diff options
author | Serguei Katkov <serguei.i.katkov@intel.com> | 2015-07-14 19:04:48 +0600 |
---|---|---|
committer | Vladimir Marko <vmarko@google.com> | 2015-07-16 13:41:44 +0100 |
commit | 3b7660dea62f2940c8ade2cbc26792d341284dfe (patch) | |
tree | b594d24045c14241e82e2cec7715a07ff0260d1f /compiler/dex/gvn_dead_code_elimination.cc | |
parent | 22ee090292e9f2ab0326600a467294ecb8b0e2ad (diff) | |
download | art-3b7660dea62f2940c8ade2cbc26792d341284dfe.zip art-3b7660dea62f2940c8ade2cbc26792d341284dfe.tar.gz art-3b7660dea62f2940c8ade2cbc26792d341284dfe.tar.bz2 |
ART: DCE should know that array-length can throw NPE
array-length can throw NPE so it should be taking into account.
Bug: 22521944
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
(cherry picked from commit b016c6dd3c30b04104a0a43dc294ce93e5f63874)
Change-Id: I6232430a02f9e6d156ad2aae0eb5a630118c0e79
Diffstat (limited to 'compiler/dex/gvn_dead_code_elimination.cc')
-rw-r--r-- | compiler/dex/gvn_dead_code_elimination.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/compiler/dex/gvn_dead_code_elimination.cc b/compiler/dex/gvn_dead_code_elimination.cc index b1f5d87..044989e 100644 --- a/compiler/dex/gvn_dead_code_elimination.cc +++ b/compiler/dex/gvn_dead_code_elimination.cc @@ -1192,7 +1192,6 @@ bool GvnDeadCodeElimination::RecordMIR(MIR* mir) { case Instruction::CONST_WIDE_32: case Instruction::CONST_WIDE: case Instruction::CONST_WIDE_HIGH16: - case Instruction::ARRAY_LENGTH: case Instruction::CMPL_FLOAT: case Instruction::CMPG_FLOAT: case Instruction::CMPL_DOUBLE: @@ -1316,6 +1315,13 @@ bool GvnDeadCodeElimination::RecordMIR(MIR* mir) { } break; + case Instruction::ARRAY_LENGTH: + if ((mir->optimization_flags & MIR_IGNORE_NULL_CHECK) == 0) { + must_keep = true; + uses_all_vregs = true; + } + break; + case Instruction::AGET_OBJECT: case Instruction::AGET: case Instruction::AGET_WIDE: |