diff --git a/mlir/lib/IR/PatternMatch.cpp b/mlir/lib/IR/PatternMatch.cpp
--- a/mlir/lib/IR/PatternMatch.cpp
+++ b/mlir/lib/IR/PatternMatch.cpp
@@ -272,9 +272,8 @@
          "incorrect # of replacement values");
   op->replaceAllUsesWith(newValues);
 
-  if (auto *rewriteListener = dyn_cast_if_present<Listener>(listener))
-    rewriteListener->notifyOperationRemoved(op);
-  op->erase();
+  // Erase op and notify listener.
+  eraseOp(op);
 }
 
 /// This method erases an operation that is known to have no uses. The uses of
@@ -282,7 +281,8 @@
 void RewriterBase::eraseOp(Operation *op) {
   assert(op->use_empty() && "expected 'op' to have no uses");
   if (auto *rewriteListener = dyn_cast_if_present<Listener>(listener))
-    rewriteListener->notifyOperationRemoved(op);
+    op->walk<WalkOrder::PostOrder, ReverseIterator>(
+        [&](Operation *op) { rewriteListener->notifyOperationRemoved(op); });
   op->erase();
 }
 
diff --git a/mlir/lib/Transforms/Utils/FoldUtils.cpp b/mlir/lib/Transforms/Utils/FoldUtils.cpp
--- a/mlir/lib/Transforms/Utils/FoldUtils.cpp
+++ b/mlir/lib/Transforms/Utils/FoldUtils.cpp
@@ -165,7 +165,8 @@
 void OperationFolder::eraseOp(Operation *op) {
   notifyRemoval(op);
   if (listener)
-    listener->notifyOperationRemoved(op);
+    op->walk<WalkOrder::PostOrder, ReverseIterator>(
+        [&](Operation *op) { listener->notifyOperationRemoved(op); });
   op->erase();
 }
 
diff --git a/mlir/lib/Transforms/Utils/GreedyPatternRewriteDriver.cpp b/mlir/lib/Transforms/Utils/GreedyPatternRewriteDriver.cpp
--- a/mlir/lib/Transforms/Utils/GreedyPatternRewriteDriver.cpp
+++ b/mlir/lib/Transforms/Utils/GreedyPatternRewriteDriver.cpp
@@ -187,8 +187,7 @@
 
     // If the operation is trivially dead - remove it.
     if (isOpTriviallyDead(op)) {
-      notifyOperationRemoved(op);
-      op->erase();
+      eraseOp(op);
       changed = true;
 
       LLVM_DEBUG(logResultWithLine("success", "operation is trivially dead"));
@@ -340,10 +339,8 @@
   if (config.listener)
     config.listener->notifyOperationRemoved(op);
 
-  op->walk([this](Operation *operation) {
-    removeFromWorklist(operation);
-    folder.notifyRemoval(operation);
-  });
+  removeFromWorklist(op);
+  folder.notifyRemoval(op);
 
   if (config.strictMode != GreedyRewriteStrictness::AnyOp)
     strictModeFilteredOps.erase(op);