# HG changeset patch # User Thomas Wuerthinger # Date 1397827146 -7200 # Node ID d49a8fe10727d7b28004fcf8b6efef8bc58152c1 # Parent c8d4ace5b78c8c3b2dd6269f661c142960c3c62d Fix a regression in ArrayLengthNode. diff -r c8d4ace5b78c -r d49a8fe10727 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 Apr 18 14:14:48 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ArrayLengthNode.java Fri Apr 18 15:19:06 2014 +0200 @@ -63,11 +63,16 @@ public static ValueNode readArrayLength(StructuredGraph graph, ValueNode originalArray, ConstantReflectionProvider constantReflection) { ArrayLengthProvider foundArrayLengthProvider = null; ValueNode result = originalArray; - while (result instanceof ValueProxy) { + while (true) { if (result instanceof ArrayLengthProvider) { foundArrayLengthProvider = (ArrayLengthProvider) result; + break; } - result = ((ValueProxy) result).getOriginalNode(); + if (result instanceof ValueProxy) { + result = ((ValueProxy) result).getOriginalNode(); + } else { + break; + } } if (foundArrayLengthProvider != null) {