Mercurial > hg > truffle

changeset 11391:f34b01673b6a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix NPE in MethodCallTargetNode.canonicalize
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 21 Aug 2013 19:33:06 +0200
parents a313367eb5c2
children 66251d9f62ab
files graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MethodCallTargetNode.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/java/MethodCallTargetNode.java	Wed Aug 21 18:45:45 2013 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MethodCallTargetNode.java	Wed Aug 21 19:33:06 2013 +0200
@@ -128,7 +128,7 @@
     public ValueNode canonical(CanonicalizerTool tool) {
         if (!isStatic()) {
             ValueNode receiver = receiver();
-            if (receiver != null && ObjectStamp.isExactType(receiver)) {
+            if (receiver != null && ObjectStamp.isExactType(receiver) && ObjectStamp.typeOrNull(receiver) != null) {
                 if (invokeKind == InvokeKind.Interface || invokeKind == InvokeKind.Virtual) {
                     ResolvedJavaMethod method = ObjectStamp.typeOrNull(receiver).resolveMethod(targetMethod);
                     if (method != null) {