diff --git a/mlir/lib/Rewrite/ByteCode.cpp b/mlir/lib/Rewrite/ByteCode.cpp
--- a/mlir/lib/Rewrite/ByteCode.cpp
+++ b/mlir/lib/Rewrite/ByteCode.cpp
@@ -137,6 +137,8 @@
   GetValueRangeTypes,
   /// Check if a generic value is not null.
   IsNotNull,
+  /// No operation, used in the debug mode to consume the line number.
+  NoOp,
   /// Record a successful pattern match.
   RecordMatch,
   /// Replace an operation.
@@ -689,6 +691,12 @@
 }
 
 void Generator::generate(Operation *op, ByteCodeWriter &writer) {
+  LLVM_DEBUG({
+    if (auto loc = op->getLoc().dyn_cast<FileLineColLoc>())
+      writer.append(ByteCodeAddr(loc.getLine()));
+    else
+      writer.append(ByteCodeAddr(0));
+  });
   TypeSwitch<Operation *>(op)
       .Case<pdl_interp::ApplyConstraintOp, pdl_interp::ApplyRewriteOp,
             pdl_interp::AreEqualOp, pdl_interp::BranchOp,
@@ -797,6 +805,7 @@
                          ByteCodeWriter &writer) {
   // Simply repoint the memory index of the result to the constant.
   getMemIndex(op.attribute()) = getMemIndex(op.value());
+  LLVM_DEBUG(writer.append(OpCode::NoOp));
 }
 void Generator::generate(pdl_interp::CreateOperationOp op,
                          ByteCodeWriter &writer) {
@@ -817,6 +826,7 @@
 void Generator::generate(pdl_interp::CreateTypeOp op, ByteCodeWriter &writer) {
   // Simply repoint the memory index of the result to the constant.
   getMemIndex(op.result()) = getMemIndex(op.value());
+  LLVM_DEBUG(writer.append(OpCode::NoOp));
 }
 void Generator::generate(pdl_interp::CreateTypesOp op, ByteCodeWriter &writer) {
   writer.append(OpCode::CreateTypes, op.result(),
@@ -904,6 +914,7 @@
                          ByteCodeWriter &writer) {
   // InferType maps to a null type as a marker for inferring result types.
   getMemIndex(op.type()) = getMemIndex(Type());
+  LLVM_DEBUG(writer.append(OpCode::NoOp));
 }
 void Generator::generate(pdl_interp::IsNotNullOp op, ByteCodeWriter &writer) {
   writer.append(OpCode::IsNotNull, op.value(), op.getSuccessors());
@@ -1062,6 +1073,7 @@
   void executeGetValueType();
   void executeGetValueRangeTypes();
   void executeIsNotNull();
+  void executeNoOp();
   void executeRecordMatch(PatternRewriter &rewriter,
                           SmallVectorImpl<PDLByteCode::MatchResult> &matches);
   void executeReplaceOp(PatternRewriter &rewriter);
@@ -1506,6 +1518,8 @@
   LLVM_DEBUG(llvm::dbgs() << "Executing ForEach:\n");
   // Subtract 1 for the op code.
   const ByteCodeField *it = curCodeIt - 1;
+  // Subtract 2 for the line number.
+  LLVM_DEBUG(it -= 2);
   unsigned rangeIndex = read();
   unsigned memIndex = read();
   const void *value = nullptr;
@@ -1831,6 +1845,10 @@
   selectJump(value != nullptr);
 }
 
+void ByteCodeExecutor::executeNoOp() {
+  LLVM_DEBUG(llvm::dbgs() << "Executing NoOp\n");
+}
+
 void ByteCodeExecutor::executeRecordMatch(
     PatternRewriter &rewriter,
     SmallVectorImpl<PDLByteCode::MatchResult> &matches) {
@@ -1983,6 +2001,10 @@
     SmallVectorImpl<PDLByteCode::MatchResult> *matches,
     Optional<Location> mainRewriteLoc) {
   while (true) {
+    LLVM_DEBUG({
+      if (unsigned line = read<uint32_t>())
+        llvm::dbgs() << line << ": ";
+    });
     OpCode opCode = static_cast<OpCode>(read());
     switch (opCode) {
     case ApplyConstraint:
@@ -2084,6 +2106,9 @@
     case IsNotNull:
       executeIsNotNull();
       break;
+    case NoOp:
+      executeNoOp();
+      break;
     case RecordMatch:
       assert(matches &&
              "expected matches to be provided when executing the matcher");