src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java

*** 177,191 ****
      public JavaConstant readFieldValue(ResolvedJavaField field, JavaConstant receiver) {
          HotSpotResolvedJavaField hotspotField = (HotSpotResolvedJavaField) field;
          if (hotspotField.isStatic()) {
              HotSpotResolvedJavaType holder = (HotSpotResolvedJavaType) hotspotField.getDeclaringClass();
              if (holder.isInitialized()) {
!                 return memoryAccess.readUnsafeConstant(hotspotField.getJavaKind(), HotSpotObjectConstantImpl.forObject(holder.mirror()), hotspotField.offset());
              }
          } else {
!             if (receiver.isNonNull() && hotspotField.isInObject(((HotSpotObjectConstantImpl) receiver).object())) {
!                 return memoryAccess.readUnsafeConstant(hotspotField.getJavaKind(), receiver, hotspotField.offset());
              }
          }
          return null;
      }
  
--- 177,194 ----
      public JavaConstant readFieldValue(ResolvedJavaField field, JavaConstant receiver) {
          HotSpotResolvedJavaField hotspotField = (HotSpotResolvedJavaField) field;
          if (hotspotField.isStatic()) {
              HotSpotResolvedJavaType holder = (HotSpotResolvedJavaType) hotspotField.getDeclaringClass();
              if (holder.isInitialized()) {
!                 return memoryAccess.readFieldValue(hotspotField, holder.mirror());
              }
          } else {
!             if (receiver.isNonNull()) {
!                 Object object = ((HotSpotObjectConstantImpl) receiver).object();
!                 if (hotspotField.isInObject(object)) {
!                     return memoryAccess.readFieldValue(hotspotField, object);
!                 }
              }
          }
          return null;
      }