commit b016c6dd3c30b04104a0a43dc294ce93e5f63874
author Serguei Katkov <serguei.i.katkov@intel.com> Tue Jul 14 19:04:48 2015 +0600
committer Vladimir Marko <vmarko@google.com> Thu Jul 16 13:36:36 2015 +0100
tree bee1f9c28f402033882906d3210b0bcd5af3a25f
parent 76ca82063ac62488fefb0b12d40026f4ebb2e198

ART: DCE should know that array-length can throw NPE

array-length can throw NPE so it should be taking into account.

Bug: 22521944
Change-Id: I6f961560ccbbf81f57f1c597828f2ee18e2c3054
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>

compiler/dex/gvn_dead_code_elimination.cc

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 @@
     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 @@
       }
       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: