test/compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java

*** 51,61 ****
  
  package compiler.jvmci.compilerToVM;
  
  import jdk.internal.misc.Unsafe;
  import jdk.test.lib.Asserts;
- import jdk.test.lib.unsafe.UnsafeHelper;
  import jdk.vm.ci.hotspot.CompilerToVMHelper;
  import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
  import jdk.vm.ci.hotspot.HotSpotResolvedObjectType;
  import jdk.vm.ci.hotspot.PublicMetaspaceWrapperObject;
  import jdk.vm.ci.meta.ConstantPool;
--- 51,60 ----
*** 152,162 ****
          },
          ;
          abstract HotSpotResolvedObjectType getResolvedJavaType();
      }
  
!     private static final Unsafe UNSAFE = UnsafeHelper.getUnsafe();
      private static final WhiteBox WB = WhiteBox.getWhiteBox();
      private static final Class TEST_CLASS = GetResolvedJavaTypeTest.class;
      /* a compressed parameter for tested method is set to false because
         unsafe.getKlassPointer always returns uncompressed pointer */
      private static final boolean COMPRESSED = false;
--- 151,161 ----
          },
          ;
          abstract HotSpotResolvedObjectType getResolvedJavaType();
      }
  
!     private static final Unsafe UNSAFE = Unsafe.getUnsafe();
      private static final WhiteBox WB = WhiteBox.getWhiteBox();
      private static final Class TEST_CLASS = GetResolvedJavaTypeTest.class;
      /* a compressed parameter for tested method is set to false because
         unsafe.getKlassPointer always returns uncompressed pointer */
      private static final boolean COMPRESSED = false;