# HG changeset patch
# User Tom Rodriguez <tom.rodriguez@oracle.com>
# Date 1418895135 28800
# Node ID ba61e58aafbc41049ff1b878c24ae7a972397515
# Parent  b56e88144e0a003e86b8d63fab9679e6a7589996
Handle NULL_POINTER when converting HubGetClassNode

diff -r b56e88144e0a -r ba61e58aafbc graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HubGetClassNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HubGetClassNode.java	Wed Dec 17 20:00:44 2014 -0800
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HubGetClassNode.java	Thu Dec 18 01:32:15 2014 -0800
@@ -99,11 +99,17 @@
 
     @Override
     public Constant convert(Constant c) {
+        if (JavaConstant.NULL_POINTER.equals(c)) {
+            return c;
+        }
         return runtime.getHostProviders().getConstantReflection().asJavaType(c).getJavaClass();
     }
 
     @Override
     public Constant reverse(Constant c) {
+        if (JavaConstant.NULL_POINTER.equals(c)) {
+            return c;
+        }
         ResolvedJavaType type = runtime.getHostProviders().getConstantReflection().asJavaType(c);
         if (type instanceof HotSpotResolvedObjectType) {
             return ((HotSpotResolvedObjectType) type).getObjectHub();