# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1400344962 -7200
# Node ID ca19a71c8566580bc850faa36753d20c11d3d434
# Parent  08f131535f9a9ea1e0dcb40f4fbb1183a15fd9ec
In MethodCallTargetNode.canonicalize, uniqueConcreteType.resolveMethod can return null in some cases

diff -r 08f131535f9a -r ca19a71c8566 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MethodCallTargetNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MethodCallTargetNode.java	Sat May 17 18:08:57 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MethodCallTargetNode.java	Sat May 17 18:42:42 2014 +0200
@@ -154,11 +154,12 @@
                     ResolvedJavaType uniqueConcreteType = type.findUniqueConcreteSubtype();
                     if (uniqueConcreteType != null) {
                         ResolvedJavaMethod methodFromUniqueType = uniqueConcreteType.resolveMethod(targetMethod, invoke().getContextType());
-                        assert methodFromUniqueType != null;
-                        tool.assumptions().recordConcreteSubtype(type, uniqueConcreteType);
-                        invokeKind = InvokeKind.Special;
-                        targetMethod = methodFromUniqueType;
-                        return this;
+                        if (methodFromUniqueType != null) {
+                            tool.assumptions().recordConcreteSubtype(type, uniqueConcreteType);
+                            invokeKind = InvokeKind.Special;
+                            targetMethod = methodFromUniqueType;
+                            return this;
+                        }
                     }
 
                     ResolvedJavaMethod uniqueConcreteMethod = type.findUniqueConcreteMethod(targetMethod);