# HG changeset patch
# User Lukas Stadler <lukas.stadler@oracle.com>
# Date 1397466759 -7200
# Node ID 5ffcd28b934081ac8b8830d8f07bf134373777c6
# Parent  0bc5f99bf9d2e5942e5a119a7fe271c60ba8884c
do not drop null check in ReadNode.canonical

diff -r 0bc5f99bf9d2 -r 5ffcd28b9340 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java	Mon Apr 14 11:12:39 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java	Mon Apr 14 11:12:39 2014 +0200
@@ -62,7 +62,10 @@
     @Override
     public Node canonical(CanonicalizerTool tool) {
         if (object() instanceof PiNode && ((PiNode) object()).getGuard() == getGuard()) {
-            return graph().add(new ReadNode(((PiNode) object()).getOriginalNode(), location(), stamp(), getGuard(), getBarrierType(), isCompressible()));
+            ReadNode readNode = graph().add(new ReadNode(((PiNode) object()).getOriginalNode(), location(), stamp(), getGuard(), getBarrierType(), isCompressible()));
+            readNode.setNullCheck(getNullCheck());
+            readNode.setStateBefore(stateBefore());
+            return readNode;
         }
         return canonicalizeRead(this, location(), object(), tool, isCompressible());
     }