src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/FieldsScanner.java

*** 22,32 ****
   */
  
  
  package org.graalvm.compiler.core.common;
  
! import static org.graalvm.compiler.core.common.UnsafeAccess.UNSAFE;
  
  import java.lang.reflect.Field;
  import java.lang.reflect.Modifier;
  import java.util.ArrayList;
  
--- 22,32 ----
   */
  
  
  package org.graalvm.compiler.core.common;
  
! import static org.graalvm.compiler.serviceprovider.GraalUnsafeAccess.getUnsafe;
  
  import java.lang.reflect.Field;
  import java.lang.reflect.Modifier;
  import java.util.ArrayList;
  
*** 48,57 ****
--- 48,59 ----
      /**
       * Determines the offset (in bytes) of a field using {@link Unsafe#objectFieldOffset(Field)}.
       */
      public static class DefaultCalcOffset implements CalcOffset {
  
+         private static final Unsafe UNSAFE = getUnsafe();
+ 
          @Override
          public long getOffset(Field field) {
              return UNSAFE.objectFieldOffset(field);
          }
      }