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

*** 25,34 ****
--- 25,35 ----
  import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayBaseOffset;
  import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider.getArrayIndexScale;
  
  import java.lang.reflect.Array;
  
+ import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.Option;
  import jdk.vm.ci.meta.Constant;
  import jdk.vm.ci.meta.ConstantReflectionProvider;
  import jdk.vm.ci.meta.JavaConstant;
  import jdk.vm.ci.meta.JavaKind;
  import jdk.vm.ci.meta.JavaType;
*** 43,53 ****
  public class HotSpotConstantReflectionProvider implements ConstantReflectionProvider, HotSpotProxified {
  
      /**
       * Determines whether to treat {@code final} fields with default values as constant.
       */
!     private static final boolean TrustFinalDefaultFields = HotSpotJVMCIRuntime.getBooleanProperty("TrustFinalDefaultFields", true);
  
      protected final HotSpotJVMCIRuntimeProvider runtime;
      protected final HotSpotMethodHandleAccessProvider methodHandleAccess;
      protected final HotSpotMemoryAccessProviderImpl memoryAccess;
  
--- 44,54 ----
  public class HotSpotConstantReflectionProvider implements ConstantReflectionProvider, HotSpotProxified {
  
      /**
       * Determines whether to treat {@code final} fields with default values as constant.
       */
!     private static final boolean TrustFinalDefaultFields = HotSpotJVMCIRuntime.getBooleanProperty(Option.TrustFinalDefaultFields, true);
  
      protected final HotSpotJVMCIRuntimeProvider runtime;
      protected final HotSpotMethodHandleAccessProvider methodHandleAccess;
      protected final HotSpotMemoryAccessProviderImpl memoryAccess;