changeset 11765:c2d8e5813925

PiNode: fix NPE in assertion
author Bernhard Urban <bernhard.urban@jku.at>
date Tue, 24 Sep 2013 16:06:46 +0200
parents 5814f30f0baf
children c9c3f8efe6a9
files graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PiNode.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PiNode.java	Tue Sep 24 12:14:45 2013 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PiNode.java	Tue Sep 24 16:06:46 2013 +0200
@@ -61,7 +61,7 @@
     @Override
     public void generate(LIRGeneratorTool generator) {
         assert kind() == Kind.Object && object.kind() == Kind.Object;
-        assert ObjectStamp.typeOrNull(object) == null || ObjectStamp.typeOrNull(this).isInterface() || ObjectStamp.typeOrNull(object).isInterface() ||
+        assert ObjectStamp.typeOrNull(this) == null || ObjectStamp.typeOrNull(object) == null || ObjectStamp.typeOrNull(this).isInterface() || ObjectStamp.typeOrNull(object).isInterface() ||
                         ObjectStamp.typeOrNull(object).isAssignableFrom(ObjectStamp.typeOrNull(this));
 
         if (object.kind() != Kind.Void && object.kind() != Kind.Illegal) {