--- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/Fields.java	2019-03-28 07:36:43.256452755 +0100
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/Fields.java	2019-03-28 07:36:42.876450214 +0100
@@ -24,7 +24,7 @@
 
 package org.graalvm.compiler.core.common;
 
-import static org.graalvm.compiler.core.common.UnsafeAccess.UNSAFE;
+import static org.graalvm.compiler.serviceprovider.GraalUnsafeAccess.getUnsafe;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -38,6 +38,8 @@
  */
 public class Fields {
 
+    private static final Unsafe UNSAFE = getUnsafe();
+
     /**
      * Offsets used with {@link Unsafe} to access the fields.
      */