Mercurial > hg > truffle

diff graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetSuperclassNode.java @ 11202:4c0f7b396be6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added receiver null check in canonicalization of java.lang.Class macro nodes
author Doug Simon <doug.simon@oracle.com>
date Mon, 05 Aug 2013 11:24:44 +0200
parents 4b8aa6386c12
children 9a747d8e0d0f
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetSuperclassNode.java	Mon Aug 05 10:44:46 2013 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/ClassGetSuperclassNode.java	Mon Aug 05 11:24:44 2013 +0200
@@ -46,8 +46,10 @@
         ValueNode javaClass = getJavaClass();
         if (javaClass.isConstant()) {
             Class c = (Class) javaClass.asConstant().asObject();
-            Class superclass = c.getSuperclass();
-            return ConstantNode.forObject(superclass, tool.runtime(), graph());
+            if (c != null) {
+                Class superclass = c.getSuperclass();
+                return ConstantNode.forObject(superclass, tool.runtime(), graph());
+            }
         }
         return this;
     }