test/compiler/jvmci/compilerToVM/ResolveFieldInPoolTest.java

*** 51,61 ****
  import compiler.jvmci.compilerToVM.ConstantPoolTestCase.Validator;
  import compiler.jvmci.compilerToVM.ConstantPoolTestsHelper.DummyClasses;
  import jdk.internal.misc.Unsafe;
  import jdk.internal.org.objectweb.asm.Opcodes;
  import jdk.test.lib.Asserts;
- import jdk.test.lib.unsafe.UnsafeHelper;
  import jdk.vm.ci.hotspot.CompilerToVMHelper;
  import jdk.vm.ci.hotspot.HotSpotResolvedObjectType;
  import jdk.vm.ci.meta.ConstantPool;
  
  import java.lang.reflect.Field;
--- 51,60 ----
*** 67,77 ****
  /**
   * Test for {@code jdk.vm.ci.hotspot.CompilerToVM.resolveFieldInPool} method
   */
  public class ResolveFieldInPoolTest {
  
!     private static final Unsafe UNSAFE = UnsafeHelper.getUnsafe();
  
      public static void main(String[] args) throws Exception {
          Map<ConstantTypes, Validator> typeTests = new HashMap<>();
          typeTests.put(CONSTANT_FIELDREF, ResolveFieldInPoolTest::validate);
          ConstantPoolTestCase testCase = new ConstantPoolTestCase(typeTests);
--- 66,76 ----
  /**
   * Test for {@code jdk.vm.ci.hotspot.CompilerToVM.resolveFieldInPool} method
   */
  public class ResolveFieldInPoolTest {
  
!     private static final Unsafe UNSAFE = Unsafe.getUnsafe();
  
      public static void main(String[] args) throws Exception {
          Map<ConstantTypes, Validator> typeTests = new HashMap<>();
          typeTests.put(CONSTANT_FIELDREF, ResolveFieldInPoolTest::validate);
          ConstantPoolTestCase testCase = new ConstantPoolTestCase(typeTests);