Index: lib/Transforms/Scalar/ConstantProp.cpp
===================================================================
--- lib/Transforms/Scalar/ConstantProp.cpp
+++ lib/Transforms/Scalar/ConstantProp.cpp
@@ -26,6 +26,7 @@
 #include "llvm/IR/InstIterator.h"
 #include "llvm/IR/Instruction.h"
 #include "llvm/Pass.h"
+#include "llvm/Support/DebugCounter.h"
 #include "llvm/Transforms/Scalar.h"
 #include <set>
 using namespace llvm;
@@ -33,6 +34,8 @@
 #define DEBUG_TYPE "constprop"
 
 STATISTIC(NumInstKilled, "Number of instructions killed");
+DEBUG_COUNTER(CPCounter, "constprop-transform",
+              "Controls which instructions are killed");
 
 namespace {
   struct ConstantPropagation : public FunctionPass {
@@ -81,6 +84,9 @@
 
     if (!I->use_empty())                 // Don't muck with dead instructions...
       if (Constant *C = ConstantFoldInstruction(I, DL, TLI)) {
+        if (!DebugCounter::shouldExecute(CPCounter))
+          continue;
+
         // Add all of the users of this instruction to the worklist, they might
         // be constant propagatable now...
         for (User *U : I->users())
Index: test/Other/debugcounter-constprop.ll
===================================================================
--- /dev/null
+++ test/Other/debugcounter-constprop.ll
@@ -0,0 +1,19 @@
+; RUN: opt < %s -constprop -S -debug-counter=constprop-transform-skip=1,constprop-transform-count=1 | FileCheck %s
+;; Test that, with debug counters on, we will skip the first constprop optimization opportunity, perform next 1,
+;; and ignore all the others left.
+
+; CHECK-LABEL: @test(
+; CHECK-NEXT:  %add1 = add i32 1, 2
+; CHECK-NEXT:  %add2 = add i32 %add1, 2
+; CHECK-NEXT:  %add4 = add i32 4, 2
+; CHECK-NEXT:  %add5 = add i32 3, 2
+; CHECK-NEXT:  %add6 = add i32 %add5, 2
+define void @test() {
+    %add1 = add i32 1, 2
+    %add2 = add i32 %add1, 2
+    %add3 = add i32 2, 2
+    %add4 = add i32 %add3, 2
+    %add5 = add i32 3, 2
+    %add6 = add i32 %add5, 2
+    ret void
+}
\ No newline at end of file