Mercurial > hg > truffle

changeset 18715:ba61e58aafbc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Handle NULL_POINTER when converting HubGetClassNode
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Thu, 18 Dec 2014 01:32:15 -0800
parents b56e88144e0a
children d1826470d1ec
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HubGetClassNode.java
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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();