*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConvertDeoptimizeToGuardPhase.java	Fri Jul  7 09:31:29 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConvertDeoptimizeToGuardPhase.java	Fri Jul  7 09:31:29 2017

*** 24,35 ****
--- 24,35 ----
  
  import static org.graalvm.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Optional;
  
  import java.util.List;
  
  import org.graalvm.compiler.debug.Debug;
  import org.graalvm.compiler.debug.DebugCloseable;
+ import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.graph.spi.SimplifierTool;
  import org.graalvm.compiler.nodeinfo.InputType;
  import org.graalvm.compiler.nodes.AbstractBeginNode;
  import org.graalvm.compiler.nodes.AbstractEndNode;

*** 167,179 ****
--- 167,180 ----
               */
              visitDeoptBegin((AbstractBeginNode) deoptBegin.predecessor(), deoptAction, deoptReason, speculation, graph, loweringProvider);
              return;
          }
  
+         DebugContext debug = deoptBegin.getDebug();
          if (deoptBegin instanceof AbstractMergeNode) {
              AbstractMergeNode mergeNode = (AbstractMergeNode) deoptBegin;
!             Debug.log("Visiting %s", mergeNode);
!             debug.log("Visiting %s", mergeNode);
              FixedNode next = mergeNode.next();
              while (mergeNode.isAlive()) {
                  AbstractEndNode end = mergeNode.forwardEnds().first();
                  AbstractBeginNode newBeginNode = AbstractBeginNode.prevBegin(end);
                  visitDeoptBegin(newBeginNode, deoptAction, deoptReason, speculation, graph, loweringProvider);

*** 199,209 ****
--- 200,210 ----
              if (survivingSuccessor instanceof LoopExitNode) {
                  newGuard = ProxyNode.forGuard(guard, (LoopExitNode) survivingSuccessor, graph);
              }
              survivingSuccessor.replaceAtUsages(InputType.Guard, newGuard);
  
!             Debug.log("Converting deopt on %-5s branch of %s to guard for remaining branch %s.", deoptBegin == ifNode.trueSuccessor() ? "true" : "false", ifNode, survivingSuccessor);
!             debug.log("Converting deopt on %-5s branch of %s to guard for remaining branch %s.", deoptBegin == ifNode.trueSuccessor() ? "true" : "false", ifNode, survivingSuccessor);
              FixedNode next = pred.next();
              pred.setNext(guard);
              guard.setNext(next);
              SimplifierTool simplifierTool = GraphUtil.getDefaultSimplifier(null, null, null, false, graph.getAssumptions(), graph.getOptions(), loweringProvider);
              survivingSuccessor.simplify(simplifierTool);