# HG changeset patch # User Bernhard Urban # Date 1380031606 -7200 # Node ID c2d8e5813925a155403190ab4430faf51f6037c6 # Parent 5814f30f0baf1903dd88388f269cdfcbeffbf4a8 PiNode: fix NPE in assertion diff -r 5814f30f0baf -r c2d8e5813925 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PiNode.java --- 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) {