# HG changeset patch # User Lukas Stadler # Date 1360315914 -3600 # Node ID 43201885d40009cb0005d0b8805d82a93e3be9dc # Parent eaecd7c187ad6cfac851a1d49cd504c33fe6b60b allow null return values for ArrayLengthProvider.length() diff -r eaecd7c187ad -r 43201885d400 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ArrayLengthNode.java --- 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()) {