Mercurial > hg > truffle
changeset 18505:3356ea593672
Add missing null check in readConstantArrayElement
author | Andreas Woess <andreas.woess@jku.at> |
---|---|
date | Wed, 26 Nov 2014 00:53:50 +0100 |
parents | c2b23f6e4603 |
children | 97026ca2a86e |
files | graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java Tue Nov 25 12:25:51 2014 -0800 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java Wed Nov 26 00:53:50 2014 +0100 @@ -90,7 +90,7 @@ public JavaConstant readConstantArrayElement(JavaConstant array, int index) { if (array instanceof HotSpotObjectConstantImpl && ((HotSpotObjectConstantImpl) array).getStableDimension() > 0) { JavaConstant element = readArrayElement(array, index); - if (((HotSpotObjectConstantImpl) array).isDefaultStable() || !element.isDefaultForKind()) { + if (element != null && (((HotSpotObjectConstantImpl) array).isDefaultStable() || !element.isDefaultForKind())) { return element; } }