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

*** 22,52 ****
--- 22,52 ----
   */
  package org.graalvm.compiler.phases.graph;
  
  import java.util.function.ToDoubleFunction;
  
! import org.graalvm.compiler.debug.Debug;
! import org.graalvm.compiler.debug.DebugCounter;
! import org.graalvm.compiler.debug.CounterKey;
! import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.graph.NodeInputList;
  import org.graalvm.compiler.nodes.AbstractBeginNode;
  import org.graalvm.compiler.nodes.AbstractEndNode;
  import org.graalvm.compiler.nodes.AbstractMergeNode;
  import org.graalvm.compiler.nodes.ControlSplitNode;
  import org.graalvm.compiler.nodes.EndNode;
  import org.graalvm.compiler.nodes.FixedNode;
  import org.graalvm.compiler.nodes.LoopBeginNode;
  import org.graalvm.compiler.nodes.StartNode;
  import org.graalvm.util.Equivalence;
  import org.graalvm.util.EconomicMap;
+ import org.graalvm.util.Equivalence;
  
  /**
   * Compute probabilities for fixed nodes on the fly and cache them at {@link AbstractBeginNode}s.
   */
  public class FixedNodeProbabilityCache implements ToDoubleFunction<FixedNode> {
  
!     private static final DebugCounter computeNodeProbabilityCounter = Debug.counter("ComputeNodeProbability");
!     private static final CounterKey computeNodeProbabilityCounter = DebugContext.counter("ComputeNodeProbability");
  
      private final EconomicMap<FixedNode, Double> cache = EconomicMap.create(Equivalence.IDENTITY);
  
      /**
       * <p>

*** 80,90 ****
--- 80,90 ----
       *
       */
      @Override
      public double applyAsDouble(FixedNode node) {
          assert node != null;
!         computeNodeProbabilityCounter.increment(node.getDebug());
  
          FixedNode current = findBegin(node);
          if (current == null) {
              // this should only appear for dead code
              return 1D;