diff --git a/compiler/src/iree/compiler/Codegen/Common/CPU/CPUPrepareUkernels.cpp b/compiler/src/iree/compiler/Codegen/Common/CPU/CPUPrepareUkernels.cpp
index ca91e34af134..0f8c38bebdd3 100644
--- a/compiler/src/iree/compiler/Codegen/Common/CPU/CPUPrepareUkernels.cpp
+++ b/compiler/src/iree/compiler/Codegen/Common/CPU/CPUPrepareUkernels.cpp
@@ -140,7 +140,13 @@ static LogicalResult reduceDefiningOp(PatternRewriter &rewriter, Value input) {
   options.controlFn = [](Operation *op) -> SmallVector<unsigned> {
     return {0};
   };
-  return linalg::dropUnitDims(rewriter, producer, options);
+  FailureOr<linalg::DropUnitDimsResult> result =
+      linalg::dropUnitDims(rewriter, producer, options);
+  if (failed(result)) {
+    return failure();
+  }
+  rewriter.replaceOp(producer, result->replacements);
+  return success();
 }
 
 /// Drops the first element from all the tile sizes list. The first element is
diff --git a/third_party/llvm-project b/third_party/llvm-project
index a71fa258ab8e..085448c918aa 160000
--- a/third_party/llvm-project
+++ b/third_party/llvm-project
@@ -1 +1 @@
-Subproject commit a71fa258ab8e457b2ff0e7b2ce60da5c1ee591e9
+Subproject commit 085448c918aa3b730cdd3e497892cfeff0ed60a6