test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodTest.java

*** 43,53 ****
  
  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.PublicMetaspaceWrapperObject;
  import sun.hotspot.WhiteBox;
  
--- 43,52 ----
*** 112,122 ****
          }
          ;
          abstract HotSpotResolvedJavaMethod getResolvedJavaMethod();
      }
  
!     private static final Unsafe UNSAFE = UnsafeHelper.getUnsafe();
      private static final WhiteBox WB = WhiteBox.getWhiteBox();
      private static final Field METASPACE_METHOD_FIELD;
      private static final Class<?> TEST_CLASS = GetResolvedJavaMethodTest.class;
      private static final long PTR;
      static  {
--- 111,121 ----
          }
          ;
          abstract HotSpotResolvedJavaMethod getResolvedJavaMethod();
      }
  
!     private static final Unsafe UNSAFE = Unsafe.getUnsafe();
      private static final WhiteBox WB = WhiteBox.getWhiteBox();
      private static final Field METASPACE_METHOD_FIELD;
      private static final Class<?> TEST_CLASS = GetResolvedJavaMethodTest.class;
      private static final long PTR;
      static  {