diff --git a/tensorflow/compiler/mlir/tools/kernel_gen/transforms/embed_tf_framework.cc b/tensorflow/compiler/mlir/tools/kernel_gen/transforms/embed_tf_framework.cc
index 73fa264ec4f..2eab43485c5 100644
--- a/tensorflow/compiler/mlir/tools/kernel_gen/transforms/embed_tf_framework.cc
+++ b/tensorflow/compiler/mlir/tools/kernel_gen/transforms/embed_tf_framework.cc
@@ -73,7 +73,7 @@ class TFAllocOpConverter : public OpConversionPattern<AllocOp> {
     }
     // Symbolic operands that bind to the symbols of the memref's layout map are
     // not supported by TFAllocOp.
-    if (alloc.getNumSymbolicOperands() != 0) {
+    if (!alloc.symbolOperands().empty()) {
       return failure();
     }
     rewriter.replaceOpWithNewOp<TFAllocOp>(alloc, alloc.getType(), ctx,
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 133f0f057df..41d06cb6418 100755
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -686,8 +686,8 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""):
     )
 
     # Check out LLVM and MLIR from llvm-project.
-    LLVM_COMMIT = "c8d73d939fa4fda9c87b3979225d02d63062bd68"
-    LLVM_SHA256 = "beab4e0f54edc24e4a0ebaf807d2ab87471644e595bb0f40a92ef07c20c96a21"
+    LLVM_COMMIT = "a7b65741441556d295079fc4f2391d99fd1c1111"
+    LLVM_SHA256 = "7a08492e3190b8d9b804e2fc0ab06b13970ba52ef87317f21c357a9388a91563"
     LLVM_URLS = [
         "https://storage.googleapis.com/mirror.tensorflow.org/github.com/llvm/llvm-project/archive/{commit}.tar.gz".format(commit = LLVM_COMMIT),
         "https://github.com/llvm/llvm-project/archive/{commit}.tar.gz".format(commit = LLVM_COMMIT),
diff --git a/third_party/mlir/BUILD b/third_party/mlir/BUILD
index fb43cfd3636..2e8beac628e 100644
--- a/third_party/mlir/BUILD
+++ b/third_party/mlir/BUILD
@@ -286,6 +286,7 @@ filegroup(
     srcs = [
         "include/mlir/Dialect/Async/IR/AsyncBase.td",
         "include/mlir/Dialect/Async/IR/AsyncOps.td",
+        "include/mlir/Interfaces/ControlFlowInterfaces.td",
         "include/mlir/Interfaces/SideEffectInterfaces.td",
         ":OpBaseTdFiles",
     ],
@@ -596,6 +597,7 @@ cc_library(
     includes = ["include"],
     deps = [
         ":AsyncOpsIncGen",
+        ":ControlFlowInterfaces",
         ":Dialect",
         ":IR",
         ":SideEffectInterfaces",