diff --git a/compiler/src/iree/compiler/Codegen/Common/IREEComprehensiveBufferize.cpp b/compiler/src/iree/compiler/Codegen/Common/IREEComprehensiveBufferize.cpp
index acecf04..f44c36d 100644
--- a/compiler/src/iree/compiler/Codegen/Common/IREEComprehensiveBufferize.cpp
+++ b/compiler/src/iree/compiler/Codegen/Common/IREEComprehensiveBufferize.cpp
@@ -153,16 +153,19 @@
 
   // This type converter converts tensor types to memref types when no exact
   // memref type can be inferred from the context.
-  options.unknownTypeConverterFn = [](TensorType tensorType,
-                                      Attribute memorySpace,
-                                      const BufferizationOptions &options) {
+  options.unknownTypeConverterFn =
+      [](bufferization::TensorLikeType tensorLikeType, Attribute memorySpace,
+         const BufferizationOptions &options) -> bufferization::BufferLikeType {
+    auto tensorType = cast<TensorType>(tensorLikeType);
     if (tensorType.hasStaticShape()) {
-      return bufferization::getMemRefTypeWithStaticIdentityLayout(tensorType,
-                                                                  memorySpace);
+      return cast<bufferization::BufferLikeType>(
+          bufferization::getMemRefTypeWithStaticIdentityLayout(tensorType,
+                                                               memorySpace));
     }
     // Default case: Fully dynamic layout map for best compatibility.
-    return bufferization::getMemRefTypeWithFullyDynamicLayout(tensorType,
-                                                              memorySpace);
+    return cast<bufferization::BufferLikeType>(
+        bufferization::getMemRefTypeWithFullyDynamicLayout(tensorType,
+                                                           memorySpace));
   };
 
   return options;
@@ -282,7 +285,7 @@
   // backend-specific optimizations (e.g., scalar reads on AMDGPU).
   if (isGPUBackend(IREE::HAL::ExecutableTargetAttr::lookup(funcOp))) {
     options.defaultMemorySpaceFn =
-        [](TensorType t) -> std::optional<Attribute> {
+        [](bufferization::TensorLikeType t) -> std::optional<Attribute> {
       return gpu::AddressSpaceAttr::get(t.getContext(),
                                         gpu::AddressSpace::Constant);
     };
@@ -311,7 +314,8 @@
   // Place constants in the GPU constant address space to enable
   // backend-specific optimizations (e.g., scalar reads on AMDGPU).
   if (isGPUBackend(IREE::HAL::ExecutableTargetAttr::lookup(getOperation()))) {
-    opt.defaultMemorySpaceFn = [](TensorType t) -> std::optional<Attribute> {
+    opt.defaultMemorySpaceFn =
+        [](bufferization::TensorLikeType t) -> std::optional<Attribute> {
       return gpu::AddressSpaceAttr::get(t.getContext(),
                                         gpu::AddressSpace::Constant);
     };
diff --git a/compiler/src/iree/compiler/Codegen/Common/TransformExtensions/CommonExtensions.cpp b/compiler/src/iree/compiler/Codegen/Common/TransformExtensions/CommonExtensions.cpp
index b630323..463f604 100644
--- a/compiler/src/iree/compiler/Codegen/Common/TransformExtensions/CommonExtensions.cpp
+++ b/compiler/src/iree/compiler/Codegen/Common/TransformExtensions/CommonExtensions.cpp
@@ -859,16 +859,19 @@
 
   // This type converter converts tensor types to memref types when no exact
   // memref type can be inferred from the context.
-  options.unknownTypeConverterFn = [](TensorType tensorType,
-                                      Attribute memorySpace,
-                                      const BufferizationOptions &options) {
+  options.unknownTypeConverterFn =
+      [](bufferization::TensorLikeType tensorLikeType, Attribute memorySpace,
+         const BufferizationOptions &options) -> bufferization::BufferLikeType {
+    auto tensorType = cast<TensorType>(tensorLikeType);
     if (tensorType.hasStaticShape()) {
-      return bufferization::getMemRefTypeWithStaticIdentityLayout(tensorType,
-                                                                  memorySpace);
+      return cast<bufferization::BufferLikeType>(
+          bufferization::getMemRefTypeWithStaticIdentityLayout(tensorType,
+                                                               memorySpace));
     }
     // Default case: Fully dynamic layout map for best compatibility.
-    return bufferization::getMemRefTypeWithFullyDynamicLayout(tensorType,
-                                                              memorySpace);
+    return cast<bufferization::BufferLikeType>(
+        bufferization::getMemRefTypeWithFullyDynamicLayout(tensorType,
+                                                           memorySpace));
   };
 
   return options;
@@ -933,7 +936,7 @@
 
   if (getTargetGpu()) {
     options.defaultMemorySpaceFn =
-        [&](TensorType t) -> std::optional<Attribute> {
+        [&](bufferization::TensorLikeType t) -> std::optional<Attribute> {
       Attribute addressSpaceAttr = gpu::AddressSpaceAttr::get(
           t.getContext(), gpu::GPUDialect::getWorkgroupAddressSpace());
       return addressSpaceAttr;
diff --git a/compiler/src/iree/compiler/ExternalInterfaces/TensorExtExternalModels.cpp b/compiler/src/iree/compiler/ExternalInterfaces/TensorExtExternalModels.cpp
index e3526ee..0f52315 100644
--- a/compiler/src/iree/compiler/ExternalInterfaces/TensorExtExternalModels.cpp
+++ b/compiler/src/iree/compiler/ExternalInterfaces/TensorExtExternalModels.cpp
@@ -73,7 +73,8 @@
       llvm::function_ref<mlir::InFlightDiagnostic()> emitError) const {
     auto dispatchTensorType = cast<IREE::TensorExt::DispatchTensorType>(type);
     auto tensorType = cast<TensorType>(dispatchTensorType.asRankedTensorType());
-    auto memSpace = options.defaultMemorySpaceFn(tensorType);
+    auto memSpace = options.defaultMemorySpaceFn(
+        cast<bufferization::TensorLikeType>(tensorType));
     if (!memSpace.has_value()) {
       return emitError() << "could not infer memory space";
     }
diff --git a/third_party/llvm-project b/third_party/llvm-project
index 917117c..696f4d5 160000
--- a/third_party/llvm-project
+++ b/third_party/llvm-project
@@ -1 +1 @@
-Subproject commit 917117ceeebf004dff4b0b430de133c354f236ba
+Subproject commit 696f4d5628479a828a14aa9999974d48f0aa698f