# HG changeset patch
# User Christian Wimmer <christian.wimmer@oracle.com>
# Date 1418691611 28800
# Node ID 3f15de59df5e6276a6188dc1fa85b2afd1d31379
# Parent  18d0f83cd290707e9728146700e7a5eced98c61e
Support multiple fields in StableOptionValue

diff -r 18d0f83cd290 -r 3f15de59df5e graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java
--- 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());
                         }