Mercurial > hg > truffle

changeset 18571:966081b8e830

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
guard against null element in HotSpotConstantReflectionProvider.readStableFieldValue
author Doug Simon <doug.simon@oracle.com>
date Thu, 27 Nov 2014 11:45:13 +0100
parents e43065342bab
children c4da2e160178
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java	Wed Nov 26 23:25:56 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java	Thu Nov 27 11:45:13 2014 +0100
@@ -249,10 +249,12 @@
 
     public JavaConstant readStableFieldValue(JavaField field, JavaConstant receiver, boolean isDefaultStable) {
         JavaConstant fieldValue = readNonStableFieldValue(field, receiver);
-        JavaType declaredType = field.getType();
-        if (declaredType.getComponentType() != null) {
-            int stableDimension = getArrayDimension(declaredType);
-            return HotSpotObjectConstantImpl.forStableArray(((HotSpotObjectConstantImpl) fieldValue).object(), stableDimension, isDefaultStable);
+        if (fieldValue.isNonNull()) {
+            JavaType declaredType = field.getType();
+            if (declaredType.getComponentType() != null) {
+                int stableDimension = getArrayDimension(declaredType);
+                return HotSpotObjectConstantImpl.forStableArray(((HotSpotObjectConstantImpl) fieldValue).object(), stableDimension, isDefaultStable);
+            }
         }
         return fieldValue;
     }