src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/SchedulePhase.java

*** 28,38 ****
  import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.Formatter;
  import java.util.List;
  
- import org.graalvm.compiler.core.common.GraalOptions;
  import org.graalvm.compiler.core.common.SuppressFBWarnings;
  import org.graalvm.compiler.core.common.cfg.AbstractControlFlowGraph;
  import org.graalvm.compiler.core.common.cfg.BlockMap;
  import org.graalvm.compiler.debug.Assertions;
  import org.graalvm.compiler.graph.Graph.NodeEvent;
--- 28,37 ----
*** 105,115 ****
          this.selectedStrategy = strategy;
          this.immutableGraph = immutableGraph;
      }
  
      private NodeEventScope verifyImmutableGraph(StructuredGraph graph) {
!         if (immutableGraph && Assertions.ENABLED) {
              return graph.trackNodeEvents(new NodeEventListener() {
                  @Override
                  public void event(NodeEvent e, Node node) {
                      assert false : "graph changed: " + e + " on node " + node;
                  }
--- 104,114 ----
          this.selectedStrategy = strategy;
          this.immutableGraph = immutableGraph;
      }
  
      private NodeEventScope verifyImmutableGraph(StructuredGraph graph) {
!         if (immutableGraph && Assertions.assertionsEnabled()) {
              return graph.trackNodeEvents(new NodeEventListener() {
                  @Override
                  public void event(NodeEvent e, Node node) {
                      assert false : "graph changed: " + e + " on node " + node;
                  }
*** 176,186 ****
  
                  BlockMap<ArrayList<FloatingReadNode>> watchListMap = calcLatestBlocks(selectedStrategy, currentNodeMap, earliestBlockToNodesMap, visited, latestBlockToNodesMap, immutableGraph);
                  sortNodesLatestWithinBlock(cfg, earliestBlockToNodesMap, latestBlockToNodesMap, currentNodeMap, watchListMap, visited);
  
                  assert verifySchedule(cfg, latestBlockToNodesMap, currentNodeMap);
!                 assert (!GraalOptions.DetailedAsserts.getValue(graph.getOptions())) || MemoryScheduleVerification.check(cfg.getStartBlock(), latestBlockToNodesMap);
  
                  this.blockToNodesMap = latestBlockToNodesMap;
  
                  cfg.setNodeToBlock(currentNodeMap);
              }
--- 175,185 ----
  
                  BlockMap<ArrayList<FloatingReadNode>> watchListMap = calcLatestBlocks(selectedStrategy, currentNodeMap, earliestBlockToNodesMap, visited, latestBlockToNodesMap, immutableGraph);
                  sortNodesLatestWithinBlock(cfg, earliestBlockToNodesMap, latestBlockToNodesMap, currentNodeMap, watchListMap, visited);
  
                  assert verifySchedule(cfg, latestBlockToNodesMap, currentNodeMap);
!                 assert (!Assertions.detailedAssertionsEnabled(graph.getOptions())) || MemoryScheduleVerification.check(cfg.getStartBlock(), latestBlockToNodesMap);
  
                  this.blockToNodesMap = latestBlockToNodesMap;
  
                  cfg.setNodeToBlock(currentNodeMap);
              }
*** 878,888 ****
  
                      current = ((FixedWithNextNode) current).next();
                  }
              }
  
!             assert (!GraalOptions.DetailedAsserts.getValue(cfg.graph.getOptions())) || MemoryScheduleVerification.check(cfg.getStartBlock(), blockToNodes);
          }
  
          private static void processStackPhi(NodeStack stack, PhiNode phiNode, NodeMap<MicroBlock> nodeToBlock, NodeBitMap visited) {
              stack.pop();
              if (visited.checkAndMarkInc(phiNode)) {
--- 877,887 ----
  
                      current = ((FixedWithNextNode) current).next();
                  }
              }
  
!             assert (!Assertions.detailedAssertionsEnabled(cfg.graph.getOptions())) || MemoryScheduleVerification.check(cfg.getStartBlock(), blockToNodes);
          }
  
          private static void processStackPhi(NodeStack stack, PhiNode phiNode, NodeMap<MicroBlock> nodeToBlock, NodeBitMap visited) {
              stack.pop();
              if (visited.checkAndMarkInc(phiNode)) {