Mercurial > hg > truffle

changeset 7762:43201885d400

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow null return values for ArrayLengthProvider.length()
author Lukas Stadler <lukas.stadler@jku.at>
date Fri, 08 Feb 2013 10:31:54 +0100
parents eaecd7c187ad
children ebba355f5605
files graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ArrayLengthNode.java
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ArrayLengthNode.java	Fri Feb 08 10:26:30 2013 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ArrayLengthNode.java	Fri Feb 08 10:31:54 2013 +0100
@@ -47,8 +47,9 @@
     public ValueNode canonical(CanonicalizerTool tool) {
         if (array() instanceof ArrayLengthProvider) {
             ValueNode length = ((ArrayLengthProvider) array()).length();
-            assert length != null;
-            return length;
+            if (length != null) {
+                return length;
+            }
         }
         MetaAccessProvider runtime = tool.runtime();
         if (runtime != null && array().isConstant() && !array().isNullConstant()) {