diff --git a/compiler/src/iree/compiler/Dialect/Flow/Transforms/CollapseDimensions.cpp b/compiler/src/iree/compiler/Dialect/Flow/Transforms/CollapseDimensions.cpp
index 98084262e1c4..f44ac8f621bb 100644
--- a/compiler/src/iree/compiler/Dialect/Flow/Transforms/CollapseDimensions.cpp
+++ b/compiler/src/iree/compiler/Dialect/Flow/Transforms/CollapseDimensions.cpp
@@ -420,12 +420,12 @@ static bool collapseDimensions(IRRewriter &rewriter,
   OpBuilder::InsertionGuard g(rewriter);
   rewriter.setInsertionPoint(genericOp.value());
 
-  FailureOr<SmallVector<Value>> maybeReplacements =
+  FailureOr<linalg::CollapseResult> maybeReplacements =
       mlir::linalg::collapseOpIterationDims(genericOp.value(), collapseIndices,
                                             rewriter);
   if (failed(maybeReplacements))
     return false;
-  rewriter.replaceOp(genericOp.value(), maybeReplacements.value());
+  rewriter.replaceOp(genericOp.value(), maybeReplacements->results);
   return true;
 }
 
diff --git a/third_party/llvm-project b/third_party/llvm-project
index 80cff273906b..4df364bc93af 160000
--- a/third_party/llvm-project
+++ b/third_party/llvm-project
@@ -1 +1 @@
-Subproject commit 80cff273906b200eed2f779913f49a64cad8c0c6
+Subproject commit 4df364bc93af49ae413ec1ae8328f34ac70730c4