cache VerifyKillCFGUnusedNodes in graph

Author: davleopo

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/Graph.java

@@ -49,6 +49,7 @@
 import jdk.graal.compiler.graph.Node.ValueNumberable;
 import jdk.graal.compiler.graph.iterators.NodeIterable;
 import jdk.graal.compiler.graph.iterators.NodePredicate;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 import jdk.graal.compiler.options.Option;
 import jdk.graal.compiler.options.OptionKey;
 import jdk.graal.compiler.options.OptionType;
@@ -83,6 +84,7 @@ private enum FreezeState {
      */
     public final boolean verifyGraphs;
     public final boolean verifyGraphEdges;
+    public final boolean verifyKillCFGUnusedNodes;
 
     /**
      * Cached actual value of {@link GraalOptions#TrackNodeInsertion} to avoid expensive map lookup
@@ -335,6 +337,7 @@ public Graph(String name, OptionValues options, DebugContext debug, boolean trac
 
         verifyGraphs = Options.VerifyGraalGraphs.getValue(options);
         verifyGraphEdges = Options.VerifyGraalGraphEdges.getValue(options);
+        verifyKillCFGUnusedNodes = GraphUtil.Options.VerifyKillCFGUnusedNodes.getValue(options);
 
         trackNodeInsertion = TrackNodeInsertion.getValue(options);
     }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/util/GraphUtil.java

@@ -281,9 +281,8 @@ public static void killCFG(FixedNode node) {
             EconomicSet<Node> unusedNodes = null;
             EconomicSet<Node> unsafeNodes = null;
             Graph.NodeEventScope nodeEventScope = null;
-            OptionValues options = node.getOptions();
             boolean verifyGraalGraphEdges = node.graph().verifyGraphEdges;
-            boolean verifyKillCFGUnusedNodes = GraphUtil.Options.VerifyKillCFGUnusedNodes.getValue(options);
+            boolean verifyKillCFGUnusedNodes = node.graph().verifyKillCFGUnusedNodes;
             if (verifyGraalGraphEdges) {
                 unsafeNodes = collectUnsafeNodes(node.graph());
             }