diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
index 5a59ec7c480..8eacfe2f56b 100644
--- a/WORKSPACE.bazel
+++ b/WORKSPACE.bazel
@@ -28,9 +28,9 @@ http_archive(
     ],
 )
 
-LLVM_COMMIT = "21830c913505b1fd2cf10e454253483180c7e10b"
+LLVM_COMMIT = "98509c7f9792c79b05a41b95c24607f6dd489c5a"
 
-LLVM_SHA256 = "1c79641c844278b10e2b5b5b9c4b72ab87a184a9689e36d3689208c67366da3a"
+LLVM_SHA256 = "bf07385f957cae81f04a38ff09a2abaff13c20dc02d8773481c420208b6a0c0f"
 
 http_archive(
     name = "llvm-raw",
diff --git a/build_tools/llvm_version.txt b/build_tools/llvm_version.txt
index e3165a9db52..afcf8fb8a48 100644
--- a/build_tools/llvm_version.txt
+++ b/build_tools/llvm_version.txt
@@ -1 +1 @@
-21830c913505b1fd2cf10e454253483180c7e10b
+98509c7f9792c79b05a41b95c24607f6dd489c5a