Mercurial > hg > truffle
changeset 18686:3f15de59df5e
Support multiple fields in StableOptionValue
author | Christian Wimmer <christian.wimmer@oracle.com> |
---|---|
date | Mon, 15 Dec 2014 17:00:11 -0800 |
parents | 18d0f83cd290 |
children | 3f38534e9a10 |
files | graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java |
diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java Mon Dec 15 13:01:47 2014 -0800 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java Mon Dec 15 17:00:11 2014 -0800 @@ -210,8 +210,7 @@ } else { Class<?> clazz = object.getClass(); if (StableOptionValue.class.isAssignableFrom(clazz)) { - if (hotspotField.isInObject(object)) { - assert hotspotField.getName().equals("value") : "Unexpected field in " + StableOptionValue.class.getName() + " hierarchy:" + this; + if (hotspotField.isInObject(object) && hotspotField.getName().equals("value")) { StableOptionValue<?> option = (StableOptionValue<?>) object; return HotSpotObjectConstantImpl.forObject(option.getValue()); }