src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FixReadsPhase.java

rev 52509 : [mq]: graal2

*** 58,67 ****
--- 58,68 ----
  import org.graalvm.compiler.nodes.calc.ConditionalNode;
  import org.graalvm.compiler.nodes.calc.UnaryNode;
  import org.graalvm.compiler.nodes.cfg.Block;
  import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
  import org.graalvm.compiler.nodes.cfg.ControlFlowGraph.RecursiveVisitor;
+ import org.graalvm.compiler.nodes.extended.GuardingNode;
  import org.graalvm.compiler.nodes.extended.IntegerSwitchNode;
  import org.graalvm.compiler.nodes.memory.FixedAccessNode;
  import org.graalvm.compiler.nodes.memory.FloatingAccessNode;
  import org.graalvm.compiler.nodes.memory.FloatingReadNode;
  import org.graalvm.compiler.nodes.memory.MemoryAccess;
*** 112,121 ****
--- 113,127 ----
                      memoryPhi.safeDelete();
                  }
              } else if (node instanceof FloatingAccessNode) {
                  FloatingAccessNode floatingAccessNode = (FloatingAccessNode) node;
                  floatingAccessNode.setLastLocationAccess(null);
+                 GuardingNode guard = floatingAccessNode.getGuard();
+                 if (guard != null) {
+                     floatingAccessNode.setGuard(null);
+                     GraphUtil.tryKillUnused(guard.asNode());
+                 }
                  FixedAccessNode fixedAccess = floatingAccessNode.asFixedNode();
                  replaceCurrent(fixedAccess);
              } else if (node instanceof PiNode) {
                  PiNode piNode = (PiNode) node;
                  if (piNode.stamp(NodeView.DEFAULT).isCompatible(piNode.getOriginalNode().stamp(NodeView.DEFAULT))) {