src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java

*** 25,35 ****
  package org.graalvm.compiler.graph;
  
  import static org.graalvm.compiler.graph.Edges.Type.Inputs;
  import static org.graalvm.compiler.graph.Edges.Type.Successors;
  import static org.graalvm.compiler.graph.Graph.isModificationCountsEnabled;
! import static org.graalvm.compiler.graph.UnsafeAccess.UNSAFE;
  
  import java.lang.annotation.ElementType;
  import java.lang.annotation.RetentionPolicy;
  import java.util.Arrays;
  import java.util.Collections;
--- 25,35 ----
  package org.graalvm.compiler.graph;
  
  import static org.graalvm.compiler.graph.Edges.Type.Inputs;
  import static org.graalvm.compiler.graph.Edges.Type.Successors;
  import static org.graalvm.compiler.graph.Graph.isModificationCountsEnabled;
! import static org.graalvm.compiler.serviceprovider.GraalUnsafeAccess.getUnsafe;
  
  import java.lang.annotation.ElementType;
  import java.lang.annotation.RetentionPolicy;
  import java.util.Arrays;
  import java.util.Collections;
*** 59,68 ****
--- 59,69 ----
  import org.graalvm.compiler.nodeinfo.NodeInfo;
  import org.graalvm.compiler.nodeinfo.NodeSize;
  import org.graalvm.compiler.nodeinfo.Verbosity;
  import org.graalvm.compiler.options.OptionValues;
  
+ import jdk.vm.ci.services.Services;
  import sun.misc.Unsafe;
  
  /**
   * This class is the base class for all nodes. It represents a node that can be inserted in a
   * {@link Graph}.
*** 84,96 ****
   * only performed if assertions are enabled.
   */
  @NodeInfo
  public abstract class Node implements Cloneable, Formattable, NodeInterface {
  
      public static final NodeClass<?> TYPE = null;
  
!     public static final boolean TRACK_CREATION_POSITION = Boolean.getBoolean("debug.graal.TrackNodeCreationPosition");
  
      static final int DELETED_ID_START = -1000000000;
      static final int INITIAL_ID = -1;
      static final int ALIVE_ID_START = 0;
  
--- 85,99 ----
   * only performed if assertions are enabled.
   */
  @NodeInfo
  public abstract class Node implements Cloneable, Formattable, NodeInterface {
  
+     private static final Unsafe UNSAFE = getUnsafe();
+ 
      public static final NodeClass<?> TYPE = null;
  
!     public static final boolean TRACK_CREATION_POSITION = Boolean.parseBoolean(Services.getSavedProperties().get("debug.graal.TrackNodeCreationPosition"));
  
      static final int DELETED_ID_START = -1000000000;
      static final int INITIAL_ID = -1;
      static final int ALIVE_ID_START = 0;