# HG changeset patch # User Lukas Stadler # Date 1390916388 -3600 # Node ID d6ac7ebead358eb797393b8ce5cd1c976df3bb49 # Parent fc5e2c808a238406dbd7a918495c3f03c1b37b59 canonicalize a LoadField on a null constant object to deopt diff -r fc5e2c808a23 -r d6ac7ebead35 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadFieldNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadFieldNode.java Tue Jan 28 12:38:08 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadFieldNode.java Tue Jan 28 14:39:48 2014 +0100 @@ -74,6 +74,9 @@ return phi; } } + if (!isStatic() && object().isNullConstant()) { + return graph().add(new DeoptimizeNode(DeoptimizationAction.None, DeoptimizationReason.NullCheckException)); + } return this; }