tighten up code related to TrackedUnsafeAccess

Author: dougxc

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/StructuredGraph.java

@@ -1120,15 +1120,14 @@ public boolean hasUnsafeAccess() {
     }
 
     /**
-     * HotSpot requires compilations with unsafe accesses to set a flag and uses that information to
-     * modify the behavior of its signal handling. In Graal we label nodes which require this flag
-     * with the marker interface {@link TrackedUnsafeAccess}.
+     * Records that this graph encodes a memory access via the {@code Unsafe} class.
      *
-     * @param nodeClass The class from which a node is created that requires unsafe access to be
-     *            set.
+     * HotSpot requires this information to modify the behavior of its signal handling for compiled
+     * code that contains an unsafe memory access.
+     *
+     * @param nodeClass the type of the node encoding the unsafe access
      */
-    public void markUnsafeAccess(Class<?> nodeClass) {
-        assert TrackedUnsafeAccess.class.isAssignableFrom(nodeClass) : Assertions.errorMessage("%s does not implement MarkedUnsafeAccess", nodeClass);
+    public void markUnsafeAccess(Class<? extends TrackedUnsafeAccess> nodeClass) {
         markUnsafeAccess();
     }
 
@@ -1195,6 +1194,7 @@ protected void afterRegister(Node node) {
         if (inliningLog != null && node instanceof Invokable) {
             ((Invokable) node).updateInliningLogAfterRegister(this);
         }
+        assert !(node instanceof TrackedUnsafeAccess) || hasUnsafeAccess() : "must call markUnsafeAccess before adding " + node;
     }
 
     public OptimizationLog getOptimizationLog() {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/TrackedUnsafeAccess.java

@@ -27,8 +27,8 @@
 import jdk.graal.compiler.nodes.StructuredGraph;
 
 /**
- * Marker interface to denote a node requires {@link StructuredGraph#markUnsafeAccess(Class)} to be
- * set.
+ * Marker interface for a node that requires {@link StructuredGraph#markUnsafeAccess(Class)} to be
+ * called prior to being added to a graph.
  */
 public interface TrackedUnsafeAccess {
 }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/StandardGraphBuilderPlugins.java

@@ -49,6 +49,7 @@
 import java.util.Objects;
 import java.util.function.BiFunction;
 
+import jdk.graal.compiler.nodes.spi.TrackedUnsafeAccess;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.graal.compiler.api.directives.GraalDirectives;
@@ -1445,7 +1446,7 @@ private void setAccessNodeResult(FixedWithNextNode node, GraphBuilderContext b)
             }
         }
 
-        protected final void createUnsafeAccess(ValueNode value, GraphBuilderContext b, UnsafeNodeConstructor nodeConstructor, Class<?> constructorClass) {
+        protected final void createUnsafeAccess(ValueNode value, GraphBuilderContext b, UnsafeNodeConstructor nodeConstructor, Class<? extends TrackedUnsafeAccess> constructorClass) {
             StructuredGraph graph = b.getGraph();
             graph.markUnsafeAccess(constructorClass);
             /* For unsafe access object pointers can only be stored in the heap */