diff --git a/.github/workflows/ci-gpu.yaml b/.github/workflows/ci-gpu.yaml
index 5ac34c1fc..bf766f12e 100644
--- a/.github/workflows/ci-gpu.yaml
+++ b/.github/workflows/ci-gpu.yaml
@@ -24,7 +24,7 @@ concurrency:
 
 env:
   LLVM_SHA_FILE: llvm-sha.txt
-  LLVM_CACHE_NUMBER: 1  # Increase to reset cache
+  LLVM_CACHE_NUMBER: 2  # Increase to reset cache
 
 jobs:
   # Water uses its own LLVM version independent of the one used by IREE and
diff --git a/water/lib/Dialect/Wave/IR/WaveOps.cpp b/water/lib/Dialect/Wave/IR/WaveOps.cpp
index 06b243c04..c238c6ce1 100644
--- a/water/lib/Dialect/Wave/IR/WaveOps.cpp
+++ b/water/lib/Dialect/Wave/IR/WaveOps.cpp
@@ -112,7 +112,7 @@ bool wave::IterateOp::areTypesCompatible(mlir::Type lhs, mlir::Type rhs) {
 }
 
 mlir::OperandRange
-wave::IterateOp::getEntrySuccessorOperands(mlir::RegionBranchPoint point) {
+wave::IterateOp::getEntrySuccessorOperands(mlir::RegionSuccessor successor) {
   return getIterArgs();
 }
 
@@ -120,7 +120,7 @@ void wave::IterateOp::getSuccessorRegions(
     mlir::RegionBranchPoint point,
     ::llvm::SmallVectorImpl<::mlir::RegionSuccessor> &regions) {
   // May branch into the region or bypass it regardless of the source.
-  regions.emplace_back(mlir::RegionSuccessor(getResults()));
+  regions.emplace_back(mlir::RegionSuccessor(getOperation(), getResults()));
   regions.emplace_back(
       mlir::RegionSuccessor(&getBody(), getBody().front().getArguments()));
 }
@@ -533,6 +533,6 @@ LogicalResult WriteOp::verify() {
 //-----------------------------------------------------------------------------
 
 mlir::MutableOperandRange
-wave::YieldOp::getMutableSuccessorOperands(mlir::RegionBranchPoint) {
+wave::YieldOp::getMutableSuccessorOperands(mlir::RegionSuccessor) {
   return getValuesMutable();
 }
diff --git a/water/llvm-sha.txt b/water/llvm-sha.txt
index f94b55e73..b3e9aa173 100644
--- a/water/llvm-sha.txt
+++ b/water/llvm-sha.txt
@@ -1 +1 @@
-ec3cf67434ba361124cfbb548e93589acd0d3cf2
+1e3a1ce911d1e5e3804b63e3ba3059c36eb697e5