--- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ControlFlowOptimizer.java	2017-07-07 09:30:36.000000000 -0700
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/ControlFlowOptimizer.java	2017-07-07 09:30:36.000000000 -0700
@@ -27,8 +27,8 @@
 import java.util.ArrayList;
 
 import org.graalvm.compiler.core.common.cfg.AbstractBlockBase;
-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.lir.gen.LIRGenerationResult;
 import org.graalvm.compiler.lir.phases.PostAllocationOptimizationPhase;
 
@@ -56,7 +56,7 @@
             this.lir = lir;
         }
 
-        private static final DebugCounter BLOCKS_DELETED = Debug.counter("BlocksDeleted");
+        private static final CounterKey BLOCKS_DELETED = DebugContext.counter("BlocksDeleted");
 
         /**
          * Checks whether a block can be deleted. Only blocks with exactly one successor and an
@@ -105,7 +105,7 @@
                         alignBlock(other);
                     }
 
-                    BLOCKS_DELETED.increment();
+                    BLOCKS_DELETED.increment(lir.getDebug());
                     blocks[i] = null;
                 }
             }