# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1370366481 -7200
# Node ID 49fb2675c66579157b6ee5455da0baa9f66fecdb
# Parent  2d5c0f7ce7a19d30f82fe39a787279470754d6bb
UnsafeLoadNode should not assume that 'type' is non-null in an object stamp

diff -r 2d5c0f7ce7a1 -r 49fb2675c665 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java	Tue Jun 04 17:30:19 2013 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java	Tue Jun 04 19:21:21 2013 +0200
@@ -83,8 +83,8 @@
                                                                   // UnsafeAccess only have an
                                                                   // object base
                 ObjectStamp receiverStamp = object().objectStamp();
-                if (receiverStamp.nonNull()) {
-                    ResolvedJavaType receiverType = receiverStamp.type();
+                ResolvedJavaType receiverType = receiverStamp.type();
+                if (receiverStamp.nonNull() && receiverType != null) {
                     ResolvedJavaField field = receiverType.findInstanceFieldWithOffset(displacement());
                     if (field != null) {
                         return this.graph().add(new LoadFieldNode(object(), field));