# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1426240337 -3600
# Node ID ab1e960217efa9e30a5cddbede347bca506e3604
# Parent  a5b09092003af9c7740fc5cfc60102589bde77fd
fixed NPE when creating an InstanceOfDynamicNode during parsing

diff -r a5b09092003a -r ab1e960217ef graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfDynamicNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfDynamicNode.java	Thu Mar 12 18:04:30 2015 -0700
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfDynamicNode.java	Fri Mar 13 10:52:17 2015 +0100
@@ -42,6 +42,15 @@
     @Input ValueNode object;
     @Input ValueNode mirror;
 
+    public static LogicNode create(ConstantReflectionProvider constantReflection, ValueNode mirror, ValueNode object) {
+        LogicNode synonym = findSynonym(constantReflection, object, mirror);
+        if (synonym != null) {
+            return synonym;
+        }
+        return new InstanceOfDynamicNode(mirror, object);
+
+    }
+
     public InstanceOfDynamicNode(ValueNode mirror, ValueNode object) {
         super(TYPE);
         this.mirror = mirror;
@@ -56,9 +65,9 @@
         tool.getLowerer().lower(this, tool);
     }
 
-    public LogicNode canonical(CanonicalizerTool tool, ValueNode forObject, ValueNode forMirror) {
+    private static LogicNode findSynonym(ConstantReflectionProvider constantReflection, ValueNode forObject, ValueNode forMirror) {
         if (forMirror.isConstant()) {
-            ResolvedJavaType t = tool.getConstantReflection().asJavaType(forMirror.asConstant());
+            ResolvedJavaType t = constantReflection.asJavaType(forMirror.asConstant());
             if (t != null) {
                 if (t.isPrimitive()) {
                     return LogicConstantNode.contradiction();
@@ -67,7 +76,15 @@
                 }
             }
         }
-        return this;
+        return null;
+    }
+
+    public LogicNode canonical(CanonicalizerTool tool, ValueNode forObject, ValueNode forMirror) {
+        LogicNode res = findSynonym(tool.getConstantReflection(), forObject, forMirror);
+        if (res == null) {
+            res = this;
+        }
+        return res;
     }
 
     public ValueNode object() {
diff -r a5b09092003a -r ab1e960217ef graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/StandardGraphBuilderPlugins.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/StandardGraphBuilderPlugins.java	Thu Mar 12 18:04:30 2015 -0700
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/StandardGraphBuilderPlugins.java	Fri Mar 13 10:52:17 2015 +0100
@@ -359,7 +359,7 @@
         r.register2("isInstance", Receiver.class, Object.class, new InvocationPlugin() {
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, ValueNode type, ValueNode object) {
                 ValueNode nullCheckedType = nullCheckedValue(b, type);
-                LogicNode condition = b.append(new InstanceOfDynamicNode(nullCheckedType, object).canonical(null, nullCheckedType, object));
+                LogicNode condition = b.append(InstanceOfDynamicNode.create(b.getConstantReflection(), nullCheckedType, object));
                 b.push(Kind.Boolean.getStackKind(), b.append(new ConditionalNode(condition).canonical(null)));
                 return true;
             }