test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderData.java

*** 21,60 ****
   * questions.
   */
  
  package jdk.vm.ci.hotspot.test;
  
  import jdk.internal.misc.Unsafe;
  import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider;
  import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider;
  import jdk.vm.ci.hotspot.HotSpotResolvedObjectType;
  import jdk.vm.ci.hotspot.HotSpotVMConfigAccess;
  import jdk.vm.ci.meta.Constant;
  import jdk.vm.ci.meta.JavaConstant;
  import jdk.vm.ci.meta.JavaKind;
  import jdk.vm.ci.runtime.JVMCI;
- import org.testng.annotations.DataProvider;
- 
- import java.lang.reflect.Field;
  
  public class MemoryAccessProviderData {
!     private static final Unsafe UNSAFE = getUnsafe();
      private static final HotSpotConstantReflectionProvider CONSTANT_REFLECTION = (HotSpotConstantReflectionProvider) JVMCI.getRuntime().getHostJVMCIBackend().getConstantReflection();
      private static final TestClass TEST_OBJECT = new TestClass();
      private static final JavaConstant TEST_CONSTANT = CONSTANT_REFLECTION.forObject(TEST_OBJECT);
      private static final JavaConstant TEST_CLASS_CONSTANT = CONSTANT_REFLECTION.forObject(TestClass.class);
  
-     private static Unsafe getUnsafe() {
-         try {
-             Field f = Unsafe.class.getDeclaredField("theUnsafe");
-             f.setAccessible(true);
-             return (Unsafe) f.get(null);
-         } catch (NoSuchFieldException | IllegalAccessException e) {
-             throw new RuntimeException("Unable to get Unsafe instance.", e);
-         }
-     }
- 
      @DataProvider(name = "positiveObject")
      public static Object[][] getPositiveObjectJavaKind() {
          HotSpotJVMCIRuntimeProvider runtime = (HotSpotJVMCIRuntimeProvider) JVMCI.getRuntime();
          int offset = new HotSpotVMConfigAccess(runtime.getConfigStore()).getFieldOffset("Klass::_java_mirror", Integer.class, "oop");
          Constant wrappedKlassPointer = ((HotSpotResolvedObjectType) runtime.fromClass(TestClass.class)).klass();
--- 21,51 ----
   * questions.
   */
  
  package jdk.vm.ci.hotspot.test;
  
+ import java.lang.reflect.Field;
+ 
+ import org.testng.annotations.DataProvider;
+ 
  import jdk.internal.misc.Unsafe;
  import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider;
  import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider;
  import jdk.vm.ci.hotspot.HotSpotResolvedObjectType;
  import jdk.vm.ci.hotspot.HotSpotVMConfigAccess;
  import jdk.vm.ci.meta.Constant;
  import jdk.vm.ci.meta.JavaConstant;
  import jdk.vm.ci.meta.JavaKind;
  import jdk.vm.ci.runtime.JVMCI;
  
  public class MemoryAccessProviderData {
!     private static final Unsafe UNSAFE = Unsafe.getUnsafe();
      private static final HotSpotConstantReflectionProvider CONSTANT_REFLECTION = (HotSpotConstantReflectionProvider) JVMCI.getRuntime().getHostJVMCIBackend().getConstantReflection();
      private static final TestClass TEST_OBJECT = new TestClass();
      private static final JavaConstant TEST_CONSTANT = CONSTANT_REFLECTION.forObject(TEST_OBJECT);
      private static final JavaConstant TEST_CLASS_CONSTANT = CONSTANT_REFLECTION.forObject(TestClass.class);
  
      @DataProvider(name = "positiveObject")
      public static Object[][] getPositiveObjectJavaKind() {
          HotSpotJVMCIRuntimeProvider runtime = (HotSpotJVMCIRuntimeProvider) JVMCI.getRuntime();
          int offset = new HotSpotVMConfigAccess(runtime.getConfigStore()).getFieldOffset("Klass::_java_mirror", Integer.class, "oop");
          Constant wrappedKlassPointer = ((HotSpotResolvedObjectType) runtime.fromClass(TestClass.class)).klass();