diff --git a/WORKSPACE b/WORKSPACE
index 7be25ac6b..3ec8fd10a 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -26,9 +26,9 @@ http_archive(
     ],
 )
 
-LLVM_COMMIT = "5932f3f861f84305bd01050d0af8e0dcb232a8b3"
+LLVM_COMMIT = "d592c8ec8f7138dcbde6f0890d048e59cba95041"
 
-LLVM_SHA256 = "ffbb065b6b9c2aef72949e84484ce5db3a86f682e7f4910a79eb5236856d259a"
+LLVM_SHA256 = "23a59fb74f8a2747ca1361b84624da4403b56bd908037c03585194a7a44225f4"
 
 http_archive(
     name = "llvm-raw",
diff --git a/build_tools/llvm_version.txt b/build_tools/llvm_version.txt
index 5abec0271..6faa2128e 100644
--- a/build_tools/llvm_version.txt
+++ b/build_tools/llvm_version.txt
@@ -1,2 +1,2 @@
-5932f3f861f84305bd01050d0af8e0dcb232a8b3
+d592c8ec8f7138dcbde6f0890d048e59cba95041
 
diff --git a/lhlo/transforms/lhlo_legalize_to_parallel_loops/lhlo_legalize_to_parallel_loops.cc b/lhlo/transforms/lhlo_legalize_to_parallel_loops/lhlo_legalize_to_parallel_loops.cc
index 81adcc7e9..f3c6b3940 100644
--- a/lhlo/transforms/lhlo_legalize_to_parallel_loops/lhlo_legalize_to_parallel_loops.cc
+++ b/lhlo/transforms/lhlo_legalize_to_parallel_loops/lhlo_legalize_to_parallel_loops.cc
@@ -453,12 +453,14 @@ class ReduceWindowOpConverter
         loc, inputType.getElementType(), mappedIvs.inBounds,
         /*withElseRegion=*/true);
 
-    OpBuilder thenBuilder = elemOrInit.getThenBodyBuilder(rewriter);
+    OpBuilder thenBuilder =
+        elemOrInit.getThenBodyBuilder(rewriter->getListener());
     Value elem =
         thenBuilder.create<mlir::memref::LoadOp>(loc, input, mappedIvs.ivs);
     thenBuilder.create<scf::YieldOp>(loc, elem);
 
-    OpBuilder elseBuilder = elemOrInit.getElseBodyBuilder(rewriter);
+    OpBuilder elseBuilder =
+        elemOrInit.getElseBodyBuilder(rewriter->getListener());
     elseBuilder.create<scf::YieldOp>(loc, *windowLoop.getInitVals().begin());
 
     return rewriter->create<scf::ReduceOp>(loc,
diff --git a/stablehlo/build_tools/llvm_version.txt b/stablehlo/build_tools/llvm_version.txt
index 0bb06f37e..4c0b7707c 100644
--- a/stablehlo/build_tools/llvm_version.txt
+++ b/stablehlo/build_tools/llvm_version.txt
@@ -1 +1 @@
-5932f3f861f84305bd01050d0af8e0dcb232a8b3
+d592c8ec8f7138dcbde6f0890d048e59cba95041