Repository: envoyproxy/envoy
Pull request #38571: deps: Bump build images -> `cb86d91`, llvm -> 18
Author: login: dependency-envoy[bot]
Labels: name: workflows:untested
Created: 2025-02-26T10:46:46Z | Merged: 2025-03-25T18:12:56Z

Created by Envoy dependency bot


Signed-off-by: dependency-envoy[bot] <148525496+dependency-envoy[bot]@users.noreply.github.com>


Diff:
diff --git a/.bazelrc b/.bazelrc
index 1f87e527fd4cb..51f693e143510 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -310,7 +310,7 @@ build:rbe-toolchain-asan --linkopt -fuse-ld=lld
 build:rbe-toolchain-asan --action_env=ENVOY_UBSAN_VPTR=1
 build:rbe-toolchain-asan --copt=-fsanitize=vptr,function
 build:rbe-toolchain-asan --linkopt=-fsanitize=vptr,function
-build:rbe-toolchain-asan --linkopt='-L/opt/llvm/lib/clang/14.0.0/lib/x86_64-unknown-linux-gnu'
+build:rbe-toolchain-asan --linkopt='-L/opt/llvm/lib/clang/18/lib/x86_64-unknown-linux-gnu'
 build:rbe-toolchain-asan --linkopt=-l:libclang_rt.ubsan_standalone.a
 build:rbe-toolchain-asan --linkopt=-l:libclang_rt.ubsan_standalone_cxx.a
 
@@ -397,7 +397,7 @@ build:compile-time-options --@envoy//source/extensions/filters/http/kill_request
 
 # Docker sandbox
 # NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/main/toolchains/rbe_toolchains_config.bzl#L8
-build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:506aa20d3a216fa2f5677c1f13d2b1656b000b86@sha256:63598080c3cccb6d7c9f3eeaa16fffd72f13f4c799d08ef891cd3f02978b6284
+build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:cb86d91cf406995012e330ab58830e6ee10240cb@sha256:d38457962937370aa867620a5cc7d01c568621fc0d1a57e044847599372a8571
 build:docker-sandbox --spawn_strategy=docker
 build:docker-sandbox --strategy=Javac=docker
 build:docker-sandbox --strategy=Closure=docker
@@ -560,13 +560,14 @@ common:common-envoy-engflow --grpc_keepalive_timeout=30s
 
 common:cache-envoy-engflow --remote_cache=grpcs://mordenite.cluster.engflow.com
 common:cache-envoy-engflow --remote_timeout=3600s
+# common:cache-envoy-engflow --remote_instance_name=llvm-18
 common:bes-envoy-engflow --bes_backend=grpcs://mordenite.cluster.engflow.com/
 common:bes-envoy-engflow --bes_results_url=https://mordenite.cluster.engflow.com/invocation/
 common:bes-envoy-engflow --bes_timeout=3600s
 common:bes-envoy-engflow --bes_upload_mode=fully_async
 common:bes-envoy-engflow --nolegacy_important_outputs
 common:rbe-envoy-engflow --remote_executor=grpcs://mordenite.cluster.engflow.com
-common:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://gcr.io/envoy-ci/envoy-build@sha256:b4bc62cde8bc10ebc7e91e93fcf92e6e0737b705363478bfd14d86c92d80db2c
+common:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://gcr.io/envoy-ci/envoy-build@sha256:56b66cc84065c88a141963cedbbe4198850ffae0dacad769f516d0e9081439da
 common:rbe-envoy-engflow --jobs=200
 common:rbe-envoy-engflow --define=engflow_rbe=true
 
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 3779e15942faa..7dd0a164394b1 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/envoy-ci/envoy-build:506aa20d3a216fa2f5677c1f13d2b1656b000b86@sha256:b4bc62cde8bc10ebc7e91e93fcf92e6e0737b705363478bfd14d86c92d80db2c
+FROM gcr.io/envoy-ci/envoy-build:cb86d91cf406995012e330ab58830e6ee10240cb@sha256:56b66cc84065c88a141963cedbbe4198850ffae0dacad769f516d0e9081439da
 
 ARG USERNAME=vscode
 ARG USER_UID=501
diff --git a/.github/config.yml b/.github/config.yml
index ff4deb97455c5..beab755813478 100644
--- a/.github/config.yml
+++ b/.github/config.yml
@@ -2,11 +2,11 @@ agent-ubuntu: ubuntu-24.04
 build-image:
   # Authoritative configuration for build image/s
   repo: envoyproxy/envoy-build-ubuntu
-  sha: 63598080c3cccb6d7c9f3eeaa16fffd72f13f4c799d08ef891cd3f02978b6284
-  mobile-sha: 67fa99e90cbc9a238ff7ad558993d68732a4ab59d3ef8d95b8e4373e24ea390b
+  sha: d38457962937370aa867620a5cc7d01c568621fc0d1a57e044847599372a8571
+  mobile-sha: 5ff2c9ce8f3abdb89d305095a39fd0e7ee97422cc017d9578e738f9a56bc33d8
   # this is authoritative, but is not currently used in github ci
-  gcr-sha: b4bc62cde8bc10ebc7e91e93fcf92e6e0737b705363478bfd14d86c92d80db2c
-  tag: 506aa20d3a216fa2f5677c1f13d2b1656b000b86
+  gcr-sha: 56b66cc84065c88a141963cedbbe4198850ffae0dacad769f516d0e9081439da
+  tag: cb86d91cf406995012e330ab58830e6ee10240cb
 
 config:
   envoy:
diff --git a/bazel/rbe/toolchains/configs/linux/clang/cc/BUILD b/bazel/rbe/toolchains/configs/linux/clang/cc/BUILD
index 23ec2989b0f96..64f355bd4ebd0 100755
--- a/bazel/rbe/toolchains/configs/linux/clang/cc/BUILD
+++ b/bazel/rbe/toolchains/configs/linux/clang/cc/BUILD
@@ -95,11 +95,11 @@ cc_toolchain_config(
     coverage_link_flags = ["-fprofile-instr-generate"],
     cpu = "k8",
     cxx_builtin_include_directories = [
-        "/opt/llvm/lib/clang/14.0.0/include",
+        "/opt/llvm/lib/clang/18/include",
         "/usr/local/include",
         "/usr/include/x86_64-linux-gnu",
         "/usr/include",
-        "/opt/llvm/lib/clang/14.0.0/share",
+        "/opt/llvm/lib/clang/18/share",
         "/usr/include/c++/11",
         "/usr/include/x86_64-linux-gnu/c++/11",
         "/usr/include/c++/11/backward",
@@ -136,7 +136,7 @@ cc_toolchain_config(
         "llvm-cov": "/opt/llvm/bin/llvm-cov",
         "llvm-profdata": "/opt/llvm/bin/llvm-profdata",
         "cpp": "/usr/bin/cpp",
-        "gcc": "/opt/llvm/bin/clang-14",
+        "gcc": "/opt/llvm/bin/clang",
         "dwp": "/usr/bin/dwp",
         "gcov": "/opt/llvm/bin/llvm-profdata",
         "nm": "/usr/bin/nm",
diff --git a/bazel/rbe/toolchains/configs/linux/clang/cc/builtin_include_directory_paths b/bazel/rbe/toolchains/configs/linux/clang/cc/builtin_include_directory_paths
index 5baa4190d081e..d4388870571e8 100755
--- a/bazel/rbe/toolchains/configs/linux/clang/cc/builtin_include_directory_paths
+++ b/bazel/rbe/toolchains/configs/linux/clang/cc/builtin_include_directory_paths
@@ -1,14 +1,14 @@
 This file is generated by cc_configure and contains builtin include directories
-that /opt/llvm/bin/clang-14 reported. This file is a dependency of every compilation action and
+that /opt/llvm/bin/clang reported. This file is a dependency of every compilation action and
 changes to it will be reflected in the action cache key. When some of these
 paths change, Bazel will make sure to rerun the action, even though none of
 declared action inputs or the action commandline changes.
 
-/opt/llvm/lib/clang/14.0.0/include
+/opt/llvm/lib/clang/18/include
 /usr/local/include
 /usr/include/x86_64-linux-gnu
 /usr/include
-/opt/llvm/lib/clang/14.0.0/share
+/opt/llvm/lib/clang/18/share
 /usr/include/c++/11
 /usr/include/x86_64-linux-gnu/c++/11
 /usr/include/c++/11/backward
diff --git a/bazel/rbe/toolchains/configs/linux/clang/cc/cc_wrapper.sh b/bazel/rbe/toolchains/configs/linux/clang/cc/cc_wrapper.sh
index fb34ce88c37b8..2bfd4862a8ff8 100755
--- a/bazel/rbe/toolchains/configs/linux/clang/cc/cc_wrapper.sh
+++ b/bazel/rbe/toolchains/configs/linux/clang/cc/cc_wrapper.sh
@@ -22,4 +22,4 @@ set -eu
 
 
 # Call the C++ compiler
-/opt/llvm/bin/clang-14 "$@"
+/opt/llvm/bin/clang "$@"
diff --git a/bazel/rbe/toolchains/configs/linux/clang/cc/module.modulemap b/bazel/rbe/toolchains/configs/linux/clang/cc/module.modulemap
index a19420cd33d7c..30f88aa70faff 100755
--- a/bazel/rbe/toolchains/configs/linux/clang/cc/module.modulemap
+++ b/bazel/rbe/toolchains/configs/linux/clang/cc/module.modulemap
@@ -1,196 +1,196 @@
 module "crosstool" [system] {
-  textual header "/opt/llvm/lib/clang/14.0.0/include/adxintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/altivec.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ammintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/amxintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm64intr.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_acle.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_bf16.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_cde.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_cmse.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_fp16.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/armintr.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_mve.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_neon.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_sve.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx2intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512bf16intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512bitalgintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512bwintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512cdintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512dqintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512erintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512fintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512fp16intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512ifmaintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512ifmavlintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512pfintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vbmi2intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vbmiintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vbmivlintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlbf16intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlbitalgintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlbwintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlcdintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vldqintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlfp16intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlvbmi2intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlvnniintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlvp2intersectintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vnniintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vp2intersectintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vpopcntdqintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vpopcntdqvlintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avxintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avxvnniintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/bmi2intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/bmiintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/builtins.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cet.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cetintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_builtin_vars.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_cmath.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_complex_builtins.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_device_functions.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_intrinsics.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_libdevice_declares.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_math_forward_declares.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_math.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_runtime_wrapper.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_texture_intrinsics.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_hip_cmath.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_hip_libdevice_declares.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_hip_math.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_hip_runtime_wrapper.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cldemoteintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/clflushoptintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/clwbintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/clzerointrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cpuid.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/crc32intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cuda_wrappers/algorithm"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cuda_wrappers/complex"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cuda_wrappers/new"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/emmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/enqcmdintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/f16cintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/float.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/fma4intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/fmaintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/fuzzer/FuzzedDataProvider.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/fxsrintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/gfniintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/hexagon_circ_brev_intrinsics.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/hexagon_protos.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/hexagon_types.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/hresetintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/htmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/htmxlintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/hvx_hexagon_protos.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ia32intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/immintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/inttypes.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/invpcidintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/iso646.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/keylockerintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/limits.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/lwpintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/lzcntintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/mm3dnow.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/mmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/mm_malloc.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/module.modulemap"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/movdirintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/msa.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/mwaitxintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/nmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/omp.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ompt.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/omp-tools.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/opencl-c-base.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/opencl-c.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/__clang_openmp_device_functions.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/cmath"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/complex"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/complex_cmath.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/complex.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/math.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/new"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/pconfigintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/pkuintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/pmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/popcntintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/emmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/mmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/mm_malloc.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/pmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/smmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/tmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/xmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/prfchwintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/profile/InstrProfData.inc"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ptwriteintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/rdseedintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/riscv_vector.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/rtmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/s390intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/allocator_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/asan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/common_interface_defs.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/coverage_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/dfsan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/hwasan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/linux_syscall_hooks.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/lsan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/msan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/netbsd_syscall_hooks.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/scudo_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/tsan_interface_atomic.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/tsan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/ubsan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/serializeintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sgxintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/shaintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/smmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stdalign.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stdarg.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stdatomic.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stdbool.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stddef.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__stddef_max_align_t.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stdint.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stdnoreturn.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/tbmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/tgmath.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/tmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/tsxldtrkintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/uintrintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/unwind.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/vadefs.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/vaesintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/varargs.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/vecintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/vpclmulqdqintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/waitpkgintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/wasm_simd128.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/wbnoinvdintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__wmmintrin_aes.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/wmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__wmmintrin_pclmul.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/x86gprintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/x86intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xopintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xray/xray_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xray/xray_log_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xray/xray_records.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xsavecintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xsaveintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xsaveoptintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xsavesintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xtestintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/adxintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/altivec.h"
+  textual header "/opt/llvm/lib/clang/18/include/ammintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/amxintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm64intr.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_acle.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_bf16.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_cde.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_cmse.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_fp16.h"
+  textual header "/opt/llvm/lib/clang/18/include/armintr.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_mve.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_neon.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_sve.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx2intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512bf16intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512bitalgintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512bwintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512cdintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512dqintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512erintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512fintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512fp16intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512ifmaintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512ifmavlintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512pfintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vbmi2intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vbmiintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vbmivlintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlbf16intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlbitalgintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlbwintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlcdintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vldqintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlfp16intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlvbmi2intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlvnniintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlvp2intersectintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vnniintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vp2intersectintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vpopcntdqintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vpopcntdqvlintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avxintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avxvnniintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/bmi2intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/bmiintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/builtins.h"
+  textual header "/opt/llvm/lib/clang/18/include/cet.h"
+  textual header "/opt/llvm/lib/clang/18/include/cetintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_builtin_vars.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_cmath.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_complex_builtins.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_device_functions.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_intrinsics.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_libdevice_declares.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_math_forward_declares.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_math.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_runtime_wrapper.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_texture_intrinsics.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_hip_cmath.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_hip_libdevice_declares.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_hip_math.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_hip_runtime_wrapper.h"
+  textual header "/opt/llvm/lib/clang/18/include/cldemoteintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/clflushoptintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/clwbintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/clzerointrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/cpuid.h"
+  textual header "/opt/llvm/lib/clang/18/include/crc32intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/cuda_wrappers/algorithm"
+  textual header "/opt/llvm/lib/clang/18/include/cuda_wrappers/complex"
+  textual header "/opt/llvm/lib/clang/18/include/cuda_wrappers/new"
+  textual header "/opt/llvm/lib/clang/18/include/emmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/enqcmdintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/f16cintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/float.h"
+  textual header "/opt/llvm/lib/clang/18/include/fma4intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/fmaintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/fuzzer/FuzzedDataProvider.h"
+  textual header "/opt/llvm/lib/clang/18/include/fxsrintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/gfniintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/hexagon_circ_brev_intrinsics.h"
+  textual header "/opt/llvm/lib/clang/18/include/hexagon_protos.h"
+  textual header "/opt/llvm/lib/clang/18/include/hexagon_types.h"
+  textual header "/opt/llvm/lib/clang/18/include/hresetintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/htmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/htmxlintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/hvx_hexagon_protos.h"
+  textual header "/opt/llvm/lib/clang/18/include/ia32intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/immintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/inttypes.h"
+  textual header "/opt/llvm/lib/clang/18/include/invpcidintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/iso646.h"
+  textual header "/opt/llvm/lib/clang/18/include/keylockerintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/limits.h"
+  textual header "/opt/llvm/lib/clang/18/include/lwpintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/lzcntintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/mm3dnow.h"
+  textual header "/opt/llvm/lib/clang/18/include/mmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/mm_malloc.h"
+  textual header "/opt/llvm/lib/clang/18/include/module.modulemap"
+  textual header "/opt/llvm/lib/clang/18/include/movdirintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/msa.h"
+  textual header "/opt/llvm/lib/clang/18/include/mwaitxintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/nmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/omp.h"
+  textual header "/opt/llvm/lib/clang/18/include/ompt.h"
+  textual header "/opt/llvm/lib/clang/18/include/omp-tools.h"
+  textual header "/opt/llvm/lib/clang/18/include/opencl-c-base.h"
+  textual header "/opt/llvm/lib/clang/18/include/opencl-c.h"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/__clang_openmp_device_functions.h"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/cmath"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/complex"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/complex_cmath.h"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/complex.h"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/math.h"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/new"
+  textual header "/opt/llvm/lib/clang/18/include/pconfigintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/pkuintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/pmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/popcntintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/emmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/mmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/mm_malloc.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/pmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/smmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/tmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/xmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/prfchwintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/profile/InstrProfData.inc"
+  textual header "/opt/llvm/lib/clang/18/include/ptwriteintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/rdseedintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/riscv_vector.h"
+  textual header "/opt/llvm/lib/clang/18/include/rtmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/s390intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/allocator_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/asan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/common_interface_defs.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/coverage_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/dfsan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/hwasan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/linux_syscall_hooks.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/lsan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/msan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/netbsd_syscall_hooks.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/scudo_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/tsan_interface_atomic.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/tsan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/ubsan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/serializeintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/sgxintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/shaintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/smmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/stdalign.h"
+  textual header "/opt/llvm/lib/clang/18/include/stdarg.h"
+  textual header "/opt/llvm/lib/clang/18/include/stdatomic.h"
+  textual header "/opt/llvm/lib/clang/18/include/stdbool.h"
+  textual header "/opt/llvm/lib/clang/18/include/stddef.h"
+  textual header "/opt/llvm/lib/clang/18/include/__stddef_max_align_t.h"
+  textual header "/opt/llvm/lib/clang/18/include/stdint.h"
+  textual header "/opt/llvm/lib/clang/18/include/stdnoreturn.h"
+  textual header "/opt/llvm/lib/clang/18/include/tbmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/tgmath.h"
+  textual header "/opt/llvm/lib/clang/18/include/tmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/tsxldtrkintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/uintrintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/unwind.h"
+  textual header "/opt/llvm/lib/clang/18/include/vadefs.h"
+  textual header "/opt/llvm/lib/clang/18/include/vaesintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/varargs.h"
+  textual header "/opt/llvm/lib/clang/18/include/vecintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/vpclmulqdqintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/waitpkgintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/wasm_simd128.h"
+  textual header "/opt/llvm/lib/clang/18/include/wbnoinvdintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/__wmmintrin_aes.h"
+  textual header "/opt/llvm/lib/clang/18/include/wmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/__wmmintrin_pclmul.h"
+  textual header "/opt/llvm/lib/clang/18/include/x86gprintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/x86intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xopintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xray/xray_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/xray/xray_log_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/xray/xray_records.h"
+  textual header "/opt/llvm/lib/clang/18/include/xsavecintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xsaveintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xsaveoptintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xsavesintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xtestintrin.h"
   textual header "/usr/include/x86_64-linux-gnu/a.out.h"
   textual header "/usr/include/x86_64-linux-gnu/asm/a.out.h"
   textual header "/usr/include/x86_64-linux-gnu/asm/auxvec.h"
@@ -2946,11 +2946,11 @@ module "crosstool" [system] {
   textual header "/usr/include/xen/gntalloc.h"
   textual header "/usr/include/xen/gntdev.h"
   textual header "/usr/include/xen/privcmd.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/share/asan_ignorelist.txt"
-  textual header "/opt/llvm/lib/clang/14.0.0/share/cfi_ignorelist.txt"
-  textual header "/opt/llvm/lib/clang/14.0.0/share/dfsan_abilist.txt"
-  textual header "/opt/llvm/lib/clang/14.0.0/share/hwasan_ignorelist.txt"
-  textual header "/opt/llvm/lib/clang/14.0.0/share/msan_ignorelist.txt"
+  textual header "/opt/llvm/lib/clang/18/share/asan_ignorelist.txt"
+  textual header "/opt/llvm/lib/clang/18/share/cfi_ignorelist.txt"
+  textual header "/opt/llvm/lib/clang/18/share/dfsan_abilist.txt"
+  textual header "/opt/llvm/lib/clang/18/share/hwasan_ignorelist.txt"
+  textual header "/opt/llvm/lib/clang/18/share/msan_ignorelist.txt"
   textual header "/usr/include/c++/11/algorithm"
   textual header "/usr/include/c++/11/any"
   textual header "/usr/include/c++/11/array"
diff --git a/bazel/rbe/toolchains/configs/linux/clang/config/BUILD b/bazel/rbe/toolchains/configs/linux/clang/config/BUILD
index 7333f9255b68f..611122b2cb039 100755
--- a/bazel/rbe/toolchains/configs/linux/clang/config/BUILD
+++ b/bazel/rbe/toolchains/configs/linux/clang/config/BUILD
@@ -19,6 +19,8 @@ licenses(["notice"])  # Apache 2
 
 package(default_visibility = ["//visibility:public"])
 
+CACHE_SILO_KEY = "llvm-18"
+
 toolchain(
     name = "cc-toolchain",
     exec_compatible_with = [
@@ -42,7 +44,8 @@ platform(
         "@bazel_tools//tools/cpp:clang",
     ],
     exec_properties = {
-        "container-image": "docker://gcr.io/envoy-ci/envoy-build@sha256:b4bc62cde8bc10ebc7e91e93fcf92e6e0737b705363478bfd14d86c92d80db2c",
+        "cache-silo-key": CACHE_SILO_KEY,
+        "container-image": "docker://gcr.io/envoy-ci/envoy-build@sha256:56b66cc84065c88a141963cedbbe4198850ffae0dacad769f516d0e9081439da",
         "OSFamily": "Linux",
     },
     parents = ["@local_config_platform//:host"],
diff --git a/bazel/rbe/toolchains/configs/linux/clang_libcxx/cc/BUILD b/bazel/rbe/toolchains/configs/linux/clang_libcxx/cc/BUILD
index ac63bbbe62706..f796444b272a3 100755
--- a/bazel/rbe/toolchains/configs/linux/clang_libcxx/cc/BUILD
+++ b/bazel/rbe/toolchains/configs/linux/clang_libcxx/cc/BUILD
@@ -106,11 +106,11 @@ cc_toolchain_config(
     coverage_link_flags = ["-fprofile-instr-generate"],
     cpu = "k8",
     cxx_builtin_include_directories = [
-        "/opt/llvm/lib/clang/14.0.0/include",
+        "/opt/llvm/lib/clang/18/include",
         "/usr/local/include",
         "/usr/include/x86_64-linux-gnu",
         "/usr/include",
-        "/opt/llvm/lib/clang/14.0.0/share",
+        "/opt/llvm/lib/clang/18/share",
         "/opt/llvm/include/x86_64-unknown-linux-gnu/c++/v1",
         "/opt/llvm/include/c++/v1",
     ],
@@ -148,7 +148,7 @@ cc_toolchain_config(
         "llvm-cov": "/opt/llvm/bin/llvm-cov",
         "llvm-profdata": "/opt/llvm/bin/llvm-profdata",
         "cpp": "/usr/bin/cpp",
-        "gcc": "/opt/llvm/bin/clang-14",
+        "gcc": "/opt/llvm/bin/clang",
         "dwp": "/usr/bin/dwp",
         "gcov": "/opt/llvm/bin/llvm-profdata",
         "nm": "/usr/bin/nm",
@@ -206,12 +206,12 @@ aarch64_cc_toolchain_config(
     coverage_link_flags = ["-fprofile-instr-generate"],
     cpu = "aarch64",
     cxx_builtin_include_directories = [
-        "/opt/llvm/lib/clang/14.0.0/include",
+        "/opt/llvm/lib/clang/18/include",
         "/usr/local/include",
         "/usr/include/aarch64-linux-gnu",
         "/usr/include",
-        "/opt/llvm/lib/clang/14.0.0/share",
-        # "/opt/llvm/include/aarch64-unknown-linux-gnu/c++/v1",
+        "/opt/llvm/lib/clang/18/share",
+        "/opt/llvm/include/aarch64-unknown-linux-gnu/c++/v1",
         "/opt/llvm/include/c++/v1",
     ],
 
@@ -249,7 +249,7 @@ aarch64_cc_toolchain_config(
         "llvm-cov": "/opt/llvm/bin/llvm-cov",
         "llvm-profdata": "/opt/llvm/bin/llvm-profdata",
         "cpp": "/usr/bin/cpp",
-        "gcc": "/opt/llvm/bin/clang-14",
+        "gcc": "/opt/llvm/bin/clang",
         "dwp": "/usr/bin/dwp",
         "gcov": "/opt/llvm/bin/llvm-profdata",
         "nm": "/usr/bin/nm",
diff --git a/bazel/rbe/toolchains/configs/linux/clang_libcxx/cc/arm64.module.modulemap b/bazel/rbe/toolchains/configs/linux/clang_libcxx/cc/arm64.module.modulemap
index 7d1c560a7a8dd..2836b197b400b 100755
--- a/bazel/rbe/toolchains/configs/linux/clang_libcxx/cc/arm64.module.modulemap
+++ b/bazel/rbe/toolchains/configs/linux/clang_libcxx/cc/arm64.module.modulemap
@@ -1,196 +1,196 @@
 module "crosstool" [system] {
-  textual header "/opt/llvm/lib/clang/14.0.0/include/adxintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/altivec.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ammintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/amxintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm64intr.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_acle.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_bf16.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_cde.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_cmse.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_fp16.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/armintr.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_mve.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_neon.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_sve.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx2intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512bf16intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512bitalgintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512bwintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512cdintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512dqintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512erintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512fintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512fp16intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512ifmaintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512ifmavlintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512pfintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vbmi2intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vbmiintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vbmivlintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlbf16intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlbitalgintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlbwintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlcdintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vldqintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlfp16intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlvbmi2intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlvnniintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlvp2intersectintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vnniintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vp2intersectintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vpopcntdqintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vpopcntdqvlintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avxintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avxvnniintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/bmi2intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/bmiintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/builtins.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cet.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cetintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_builtin_vars.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_cmath.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_complex_builtins.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_device_functions.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_intrinsics.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_libdevice_declares.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_math_forward_declares.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_math.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_runtime_wrapper.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_texture_intrinsics.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_hip_cmath.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_hip_libdevice_declares.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_hip_math.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_hip_runtime_wrapper.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cldemoteintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/clflushoptintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/clwbintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/clzerointrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cpuid.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/crc32intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cuda_wrappers/algorithm"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cuda_wrappers/complex"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cuda_wrappers/new"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/emmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/enqcmdintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/f16cintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/float.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/fma4intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/fmaintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/fuzzer/FuzzedDataProvider.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/fxsrintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/gfniintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/hexagon_circ_brev_intrinsics.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/hexagon_protos.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/hexagon_types.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/hresetintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/htmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/htmxlintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/hvx_hexagon_protos.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ia32intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/immintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/inttypes.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/invpcidintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/iso646.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/keylockerintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/limits.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/lwpintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/lzcntintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/mm3dnow.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/mmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/mm_malloc.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/module.modulemap"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/movdirintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/msa.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/mwaitxintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/nmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/omp.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ompt.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/omp-tools.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/opencl-c-base.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/opencl-c.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/__clang_openmp_device_functions.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/cmath"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/complex"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/complex_cmath.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/complex.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/math.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/new"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/pconfigintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/pkuintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/pmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/popcntintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/emmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/mmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/mm_malloc.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/pmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/smmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/tmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/xmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/prfchwintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/profile/InstrProfData.inc"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ptwriteintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/rdseedintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/riscv_vector.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/rtmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/s390intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/allocator_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/asan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/common_interface_defs.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/coverage_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/dfsan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/hwasan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/linux_syscall_hooks.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/lsan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/msan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/netbsd_syscall_hooks.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/scudo_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/tsan_interface_atomic.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/tsan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/ubsan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/serializeintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sgxintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/shaintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/smmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stdalign.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stdarg.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stdatomic.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stdbool.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stddef.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__stddef_max_align_t.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stdint.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stdnoreturn.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/tbmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/tgmath.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/tmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/tsxldtrkintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/uintrintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/unwind.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/vadefs.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/vaesintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/varargs.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/vecintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/vpclmulqdqintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/waitpkgintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/wasm_simd128.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/wbnoinvdintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__wmmintrin_aes.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/wmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__wmmintrin_pclmul.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/x86gprintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/x86intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xopintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xray/xray_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xray/xray_log_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xray/xray_records.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xsavecintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xsaveintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xsaveoptintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xsavesintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xtestintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/adxintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/altivec.h"
+  textual header "/opt/llvm/lib/clang/18/include/ammintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/amxintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm64intr.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_acle.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_bf16.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_cde.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_cmse.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_fp16.h"
+  textual header "/opt/llvm/lib/clang/18/include/armintr.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_mve.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_neon.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_sve.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx2intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512bf16intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512bitalgintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512bwintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512cdintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512dqintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512erintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512fintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512fp16intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512ifmaintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512ifmavlintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512pfintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vbmi2intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vbmiintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vbmivlintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlbf16intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlbitalgintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlbwintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlcdintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vldqintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlfp16intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlvbmi2intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlvnniintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlvp2intersectintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vnniintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vp2intersectintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vpopcntdqintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vpopcntdqvlintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avxintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avxvnniintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/bmi2intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/bmiintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/builtins.h"
+  textual header "/opt/llvm/lib/clang/18/include/cet.h"
+  textual header "/opt/llvm/lib/clang/18/include/cetintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_builtin_vars.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_cmath.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_complex_builtins.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_device_functions.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_intrinsics.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_libdevice_declares.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_math_forward_declares.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_math.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_runtime_wrapper.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_texture_intrinsics.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_hip_cmath.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_hip_libdevice_declares.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_hip_math.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_hip_runtime_wrapper.h"
+  textual header "/opt/llvm/lib/clang/18/include/cldemoteintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/clflushoptintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/clwbintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/clzerointrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/cpuid.h"
+  textual header "/opt/llvm/lib/clang/18/include/crc32intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/cuda_wrappers/algorithm"
+  textual header "/opt/llvm/lib/clang/18/include/cuda_wrappers/complex"
+  textual header "/opt/llvm/lib/clang/18/include/cuda_wrappers/new"
+  textual header "/opt/llvm/lib/clang/18/include/emmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/enqcmdintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/f16cintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/float.h"
+  textual header "/opt/llvm/lib/clang/18/include/fma4intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/fmaintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/fuzzer/FuzzedDataProvider.h"
+  textual header "/opt/llvm/lib/clang/18/include/fxsrintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/gfniintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/hexagon_circ_brev_intrinsics.h"
+  textual header "/opt/llvm/lib/clang/18/include/hexagon_protos.h"
+  textual header "/opt/llvm/lib/clang/18/include/hexagon_types.h"
+  textual header "/opt/llvm/lib/clang/18/include/hresetintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/htmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/htmxlintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/hvx_hexagon_protos.h"
+  textual header "/opt/llvm/lib/clang/18/include/ia32intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/immintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/inttypes.h"
+  textual header "/opt/llvm/lib/clang/18/include/invpcidintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/iso646.h"
+  textual header "/opt/llvm/lib/clang/18/include/keylockerintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/limits.h"
+  textual header "/opt/llvm/lib/clang/18/include/lwpintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/lzcntintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/mm3dnow.h"
+  textual header "/opt/llvm/lib/clang/18/include/mmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/mm_malloc.h"
+  textual header "/opt/llvm/lib/clang/18/include/module.modulemap"
+  textual header "/opt/llvm/lib/clang/18/include/movdirintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/msa.h"
+  textual header "/opt/llvm/lib/clang/18/include/mwaitxintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/nmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/omp.h"
+  textual header "/opt/llvm/lib/clang/18/include/ompt.h"
+  textual header "/opt/llvm/lib/clang/18/include/omp-tools.h"
+  textual header "/opt/llvm/lib/clang/18/include/opencl-c-base.h"
+  textual header "/opt/llvm/lib/clang/18/include/opencl-c.h"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/__clang_openmp_device_functions.h"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/cmath"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/complex"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/complex_cmath.h"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/complex.h"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/math.h"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/new"
+  textual header "/opt/llvm/lib/clang/18/include/pconfigintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/pkuintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/pmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/popcntintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/emmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/mmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/mm_malloc.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/pmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/smmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/tmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/xmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/prfchwintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/profile/InstrProfData.inc"
+  textual header "/opt/llvm/lib/clang/18/include/ptwriteintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/rdseedintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/riscv_vector.h"
+  textual header "/opt/llvm/lib/clang/18/include/rtmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/s390intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/allocator_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/asan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/common_interface_defs.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/coverage_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/dfsan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/hwasan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/linux_syscall_hooks.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/lsan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/msan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/netbsd_syscall_hooks.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/scudo_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/tsan_interface_atomic.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/tsan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/ubsan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/serializeintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/sgxintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/shaintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/smmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/stdalign.h"
+  textual header "/opt/llvm/lib/clang/18/include/stdarg.h"
+  textual header "/opt/llvm/lib/clang/18/include/stdatomic.h"
+  textual header "/opt/llvm/lib/clang/18/include/stdbool.h"
+  textual header "/opt/llvm/lib/clang/18/include/stddef.h"
+  textual header "/opt/llvm/lib/clang/18/include/__stddef_max_align_t.h"
+  textual header "/opt/llvm/lib/clang/18/include/stdint.h"
+  textual header "/opt/llvm/lib/clang/18/include/stdnoreturn.h"
+  textual header "/opt/llvm/lib/clang/18/include/tbmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/tgmath.h"
+  textual header "/opt/llvm/lib/clang/18/include/tmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/tsxldtrkintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/uintrintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/unwind.h"
+  textual header "/opt/llvm/lib/clang/18/include/vadefs.h"
+  textual header "/opt/llvm/lib/clang/18/include/vaesintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/varargs.h"
+  textual header "/opt/llvm/lib/clang/18/include/vecintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/vpclmulqdqintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/waitpkgintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/wasm_simd128.h"
+  textual header "/opt/llvm/lib/clang/18/include/wbnoinvdintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/__wmmintrin_aes.h"
+  textual header "/opt/llvm/lib/clang/18/include/wmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/__wmmintrin_pclmul.h"
+  textual header "/opt/llvm/lib/clang/18/include/x86gprintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/x86intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xopintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xray/xray_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/xray/xray_log_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/xray/xray_records.h"
+  textual header "/opt/llvm/lib/clang/18/include/xsavecintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xsaveintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xsaveoptintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xsavesintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xtestintrin.h"
   textual header "/usr/include/aarch64-linux-gnu/a.out.h"
   textual header "/usr/include/aarch64-linux-gnu/asm/a.out.h"
   textual header "/usr/include/aarch64-linux-gnu/asm/auxvec.h"
@@ -2945,11 +2945,11 @@ module "crosstool" [system] {
   textual header "/usr/include/xen/gntalloc.h"
   textual header "/usr/include/xen/gntdev.h"
   textual header "/usr/include/xen/privcmd.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/share/asan_ignorelist.txt"
-  textual header "/opt/llvm/lib/clang/14.0.0/share/cfi_ignorelist.txt"
-  textual header "/opt/llvm/lib/clang/14.0.0/share/dfsan_abilist.txt"
-  textual header "/opt/llvm/lib/clang/14.0.0/share/hwasan_ignorelist.txt"
-  textual header "/opt/llvm/lib/clang/14.0.0/share/msan_ignorelist.txt"
+  textual header "/opt/llvm/lib/clang/18/share/asan_ignorelist.txt"
+  textual header "/opt/llvm/lib/clang/18/share/cfi_ignorelist.txt"
+  textual header "/opt/llvm/lib/clang/18/share/dfsan_abilist.txt"
+  textual header "/opt/llvm/lib/clang/18/share/hwasan_ignorelist.txt"
+  textual header "/opt/llvm/lib/clang/18/share/msan_ignorelist.txt"
   textual header "/opt/llvm/include/aarch64-unknown-linux-gnu/c++/v1/__config_site"
   textual header "/opt/llvm/include/c++/v1/algorithm"
   textual header "/opt/llvm/include/c++/v1/__algorithm/adjacent_find.h"
diff --git a/bazel/rbe/toolchains/configs/linux/clang_libcxx/cc/builtin_include_directory_paths b/bazel/rbe/toolchains/configs/linux/clang_libcxx/cc/builtin_include_directory_paths
index a2de6afbf7d81..ee046aba03ea1 100755
--- a/bazel/rbe/toolchains/configs/linux/clang_libcxx/cc/builtin_include_directory_paths
+++ b/bazel/rbe/toolchains/configs/linux/clang_libcxx/cc/builtin_include_directory_paths
@@ -1,13 +1,13 @@
 This file is generated by cc_configure and contains builtin include directories
-that /opt/llvm/bin/clang-14 reported. This file is a dependency of every compilation action and
+that /opt/llvm/bin/clang reported. This file is a dependency of every compilation action and
 changes to it will be reflected in the action cache key. When some of these
 paths change, Bazel will make sure to rerun the action, even though none of
 declared action inputs or the action commandline changes.
 
-/opt/llvm/lib/clang/14.0.0/include
+/opt/llvm/lib/clang/18/include
 /usr/local/include
 /usr/include/x86_64-linux-gnu
 /usr/include
-/opt/llvm/lib/clang/14.0.0/share
+/opt/llvm/lib/clang/18/share
 /opt/llvm/include/x86_64-unknown-linux-gnu/c++/v1
 /opt/llvm/include/c++/v1
diff --git a/bazel/rbe/toolchains/configs/linux/clang_libcxx/cc/builtin_include_directory_paths_aarch64 b/bazel/rbe/toolchains/configs/linux/clang_libcxx/cc/builtin_include_directory_paths_aarch64
index 3d7cd04c55b12..e1f962abfe248 100755
--- a/bazel/rbe/toolchains/configs/linux/clang_libcxx/cc/builtin_include_directory_paths_aarch64
+++ b/bazel/rbe/toolchains/configs/linux/clang_libcxx/cc/builtin_include_directory_paths_aarch64
@@ -1,13 +1,13 @@
 This file is generated by cc_configure and contains builtin include directories
-that /opt/llvm/bin/clang-14 reported. This file is a dependency of every compilation action and
+that /opt/llvm/bin/clang reported. This file is a dependency of every compilation action and
 changes to it will be reflected in the action cache key. When some of these
 paths change, Bazel will make sure to rerun the action, even though none of
 declared action inputs or the action commandline changes.
 
-/opt/llvm/lib/clang/14.0.0/include
+/opt/llvm/lib/clang/18/include
 /usr/local/include
 /usr/include-/aarch64-linux-gnu
 /usr/include
-/opt/llvm/lib/clang/14.0.0/share
+/opt/llvm/lib/clang/18/share
 /opt/llvm/include/aarch64-unknown-linux-gnu/c++/v1
 /opt/llvm/include/c++/v1
diff --git a/bazel/rbe/toolchains/configs/linux/clang_libcxx/cc/cc_wrapper.sh b/bazel/rbe/toolchains/configs/linux/clang_libcxx/cc/cc_wrapper.sh
index fb34ce88c37b8..2bfd4862a8ff8 100755
--- a/bazel/rbe/toolchains/configs/linux/clang_libcxx/cc/cc_wrapper.sh
+++ b/bazel/rbe/toolchains/configs/linux/clang_libcxx/cc/cc_wrapper.sh
@@ -22,4 +22,4 @@ set -eu
 
 
 # Call the C++ compiler
-/opt/llvm/bin/clang-14 "$@"
+/opt/llvm/bin/clang "$@"
diff --git a/bazel/rbe/toolchains/configs/linux/clang_libcxx/cc/module.modulemap b/bazel/rbe/toolchains/configs/linux/clang_libcxx/cc/module.modulemap
index 69a1b14dc495d..8900cf940ca3c 100755
--- a/bazel/rbe/toolchains/configs/linux/clang_libcxx/cc/module.modulemap
+++ b/bazel/rbe/toolchains/configs/linux/clang_libcxx/cc/module.modulemap
@@ -1,196 +1,196 @@
 module "crosstool" [system] {
-  textual header "/opt/llvm/lib/clang/14.0.0/include/adxintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/altivec.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ammintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/amxintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm64intr.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_acle.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_bf16.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_cde.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_cmse.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_fp16.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/armintr.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_mve.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_neon.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_sve.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx2intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512bf16intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512bitalgintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512bwintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512cdintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512dqintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512erintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512fintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512fp16intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512ifmaintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512ifmavlintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512pfintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vbmi2intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vbmiintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vbmivlintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlbf16intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlbitalgintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlbwintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlcdintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vldqintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlfp16intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlvbmi2intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlvnniintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlvp2intersectintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vnniintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vp2intersectintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vpopcntdqintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vpopcntdqvlintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avxintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avxvnniintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/bmi2intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/bmiintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/builtins.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cet.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cetintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_builtin_vars.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_cmath.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_complex_builtins.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_device_functions.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_intrinsics.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_libdevice_declares.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_math_forward_declares.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_math.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_runtime_wrapper.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_texture_intrinsics.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_hip_cmath.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_hip_libdevice_declares.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_hip_math.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_hip_runtime_wrapper.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cldemoteintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/clflushoptintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/clwbintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/clzerointrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cpuid.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/crc32intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cuda_wrappers/algorithm"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cuda_wrappers/complex"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cuda_wrappers/new"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/emmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/enqcmdintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/f16cintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/float.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/fma4intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/fmaintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/fuzzer/FuzzedDataProvider.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/fxsrintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/gfniintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/hexagon_circ_brev_intrinsics.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/hexagon_protos.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/hexagon_types.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/hresetintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/htmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/htmxlintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/hvx_hexagon_protos.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ia32intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/immintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/inttypes.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/invpcidintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/iso646.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/keylockerintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/limits.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/lwpintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/lzcntintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/mm3dnow.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/mmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/mm_malloc.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/module.modulemap"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/movdirintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/msa.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/mwaitxintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/nmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/omp.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ompt.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/omp-tools.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/opencl-c-base.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/opencl-c.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/__clang_openmp_device_functions.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/cmath"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/complex"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/complex_cmath.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/complex.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/math.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/new"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/pconfigintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/pkuintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/pmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/popcntintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/emmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/mmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/mm_malloc.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/pmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/smmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/tmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/xmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/prfchwintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/profile/InstrProfData.inc"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ptwriteintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/rdseedintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/riscv_vector.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/rtmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/s390intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/allocator_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/asan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/common_interface_defs.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/coverage_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/dfsan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/hwasan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/linux_syscall_hooks.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/lsan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/msan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/netbsd_syscall_hooks.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/scudo_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/tsan_interface_atomic.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/tsan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/ubsan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/serializeintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sgxintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/shaintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/smmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stdalign.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stdarg.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stdatomic.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stdbool.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stddef.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__stddef_max_align_t.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stdint.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stdnoreturn.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/tbmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/tgmath.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/tmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/tsxldtrkintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/uintrintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/unwind.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/vadefs.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/vaesintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/varargs.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/vecintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/vpclmulqdqintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/waitpkgintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/wasm_simd128.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/wbnoinvdintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__wmmintrin_aes.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/wmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__wmmintrin_pclmul.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/x86gprintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/x86intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xopintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xray/xray_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xray/xray_log_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xray/xray_records.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xsavecintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xsaveintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xsaveoptintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xsavesintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xtestintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/adxintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/altivec.h"
+  textual header "/opt/llvm/lib/clang/18/include/ammintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/amxintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm64intr.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_acle.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_bf16.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_cde.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_cmse.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_fp16.h"
+  textual header "/opt/llvm/lib/clang/18/include/armintr.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_mve.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_neon.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_sve.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx2intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512bf16intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512bitalgintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512bwintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512cdintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512dqintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512erintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512fintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512fp16intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512ifmaintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512ifmavlintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512pfintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vbmi2intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vbmiintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vbmivlintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlbf16intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlbitalgintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlbwintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlcdintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vldqintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlfp16intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlvbmi2intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlvnniintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlvp2intersectintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vnniintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vp2intersectintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vpopcntdqintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vpopcntdqvlintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avxintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avxvnniintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/bmi2intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/bmiintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/builtins.h"
+  textual header "/opt/llvm/lib/clang/18/include/cet.h"
+  textual header "/opt/llvm/lib/clang/18/include/cetintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_builtin_vars.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_cmath.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_complex_builtins.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_device_functions.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_intrinsics.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_libdevice_declares.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_math_forward_declares.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_math.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_runtime_wrapper.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_texture_intrinsics.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_hip_cmath.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_hip_libdevice_declares.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_hip_math.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_hip_runtime_wrapper.h"
+  textual header "/opt/llvm/lib/clang/18/include/cldemoteintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/clflushoptintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/clwbintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/clzerointrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/cpuid.h"
+  textual header "/opt/llvm/lib/clang/18/include/crc32intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/cuda_wrappers/algorithm"
+  textual header "/opt/llvm/lib/clang/18/include/cuda_wrappers/complex"
+  textual header "/opt/llvm/lib/clang/18/include/cuda_wrappers/new"
+  textual header "/opt/llvm/lib/clang/18/include/emmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/enqcmdintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/f16cintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/float.h"
+  textual header "/opt/llvm/lib/clang/18/include/fma4intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/fmaintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/fuzzer/FuzzedDataProvider.h"
+  textual header "/opt/llvm/lib/clang/18/include/fxsrintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/gfniintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/hexagon_circ_brev_intrinsics.h"
+  textual header "/opt/llvm/lib/clang/18/include/hexagon_protos.h"
+  textual header "/opt/llvm/lib/clang/18/include/hexagon_types.h"
+  textual header "/opt/llvm/lib/clang/18/include/hresetintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/htmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/htmxlintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/hvx_hexagon_protos.h"
+  textual header "/opt/llvm/lib/clang/18/include/ia32intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/immintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/inttypes.h"
+  textual header "/opt/llvm/lib/clang/18/include/invpcidintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/iso646.h"
+  textual header "/opt/llvm/lib/clang/18/include/keylockerintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/limits.h"
+  textual header "/opt/llvm/lib/clang/18/include/lwpintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/lzcntintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/mm3dnow.h"
+  textual header "/opt/llvm/lib/clang/18/include/mmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/mm_malloc.h"
+  textual header "/opt/llvm/lib/clang/18/include/module.modulemap"
+  textual header "/opt/llvm/lib/clang/18/include/movdirintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/msa.h"
+  textual header "/opt/llvm/lib/clang/18/include/mwaitxintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/nmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/omp.h"
+  textual header "/opt/llvm/lib/clang/18/include/ompt.h"
+  textual header "/opt/llvm/lib/clang/18/include/omp-tools.h"
+  textual header "/opt/llvm/lib/clang/18/include/opencl-c-base.h"
+  textual header "/opt/llvm/lib/clang/18/include/opencl-c.h"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/__clang_openmp_device_functions.h"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/cmath"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/complex"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/complex_cmath.h"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/complex.h"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/math.h"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/new"
+  textual header "/opt/llvm/lib/clang/18/include/pconfigintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/pkuintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/pmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/popcntintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/emmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/mmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/mm_malloc.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/pmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/smmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/tmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/xmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/prfchwintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/profile/InstrProfData.inc"
+  textual header "/opt/llvm/lib/clang/18/include/ptwriteintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/rdseedintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/riscv_vector.h"
+  textual header "/opt/llvm/lib/clang/18/include/rtmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/s390intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/allocator_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/asan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/common_interface_defs.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/coverage_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/dfsan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/hwasan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/linux_syscall_hooks.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/lsan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/msan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/netbsd_syscall_hooks.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/scudo_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/tsan_interface_atomic.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/tsan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/ubsan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/serializeintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/sgxintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/shaintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/smmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/stdalign.h"
+  textual header "/opt/llvm/lib/clang/18/include/stdarg.h"
+  textual header "/opt/llvm/lib/clang/18/include/stdatomic.h"
+  textual header "/opt/llvm/lib/clang/18/include/stdbool.h"
+  textual header "/opt/llvm/lib/clang/18/include/stddef.h"
+  textual header "/opt/llvm/lib/clang/18/include/__stddef_max_align_t.h"
+  textual header "/opt/llvm/lib/clang/18/include/stdint.h"
+  textual header "/opt/llvm/lib/clang/18/include/stdnoreturn.h"
+  textual header "/opt/llvm/lib/clang/18/include/tbmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/tgmath.h"
+  textual header "/opt/llvm/lib/clang/18/include/tmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/tsxldtrkintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/uintrintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/unwind.h"
+  textual header "/opt/llvm/lib/clang/18/include/vadefs.h"
+  textual header "/opt/llvm/lib/clang/18/include/vaesintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/varargs.h"
+  textual header "/opt/llvm/lib/clang/18/include/vecintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/vpclmulqdqintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/waitpkgintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/wasm_simd128.h"
+  textual header "/opt/llvm/lib/clang/18/include/wbnoinvdintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/__wmmintrin_aes.h"
+  textual header "/opt/llvm/lib/clang/18/include/wmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/__wmmintrin_pclmul.h"
+  textual header "/opt/llvm/lib/clang/18/include/x86gprintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/x86intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xopintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xray/xray_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/xray/xray_log_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/xray/xray_records.h"
+  textual header "/opt/llvm/lib/clang/18/include/xsavecintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xsaveintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xsaveoptintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xsavesintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xtestintrin.h"
   textual header "/usr/include/x86_64-linux-gnu/a.out.h"
   textual header "/usr/include/x86_64-linux-gnu/asm/a.out.h"
   textual header "/usr/include/x86_64-linux-gnu/asm/auxvec.h"
@@ -2946,11 +2946,11 @@ module "crosstool" [system] {
   textual header "/usr/include/xen/gntalloc.h"
   textual header "/usr/include/xen/gntdev.h"
   textual header "/usr/include/xen/privcmd.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/share/asan_ignorelist.txt"
-  textual header "/opt/llvm/lib/clang/14.0.0/share/cfi_ignorelist.txt"
-  textual header "/opt/llvm/lib/clang/14.0.0/share/dfsan_abilist.txt"
-  textual header "/opt/llvm/lib/clang/14.0.0/share/hwasan_ignorelist.txt"
-  textual header "/opt/llvm/lib/clang/14.0.0/share/msan_ignorelist.txt"
+  textual header "/opt/llvm/lib/clang/18/share/asan_ignorelist.txt"
+  textual header "/opt/llvm/lib/clang/18/share/cfi_ignorelist.txt"
+  textual header "/opt/llvm/lib/clang/18/share/dfsan_abilist.txt"
+  textual header "/opt/llvm/lib/clang/18/share/hwasan_ignorelist.txt"
+  textual header "/opt/llvm/lib/clang/18/share/msan_ignorelist.txt"
   textual header "/opt/llvm/include/x86_64-unknown-linux-gnu/c++/v1/__config_site"
   textual header "/opt/llvm/include/c++/v1/algorithm"
   textual header "/opt/llvm/include/c++/v1/__algorithm/adjacent_find.h"
diff --git a/bazel/rbe/toolchains/configs/linux/clang_libcxx/config/BUILD b/bazel/rbe/toolchains/configs/linux/clang_libcxx/config/BUILD
index be360e0f6b2ec..f0ec522f2d988 100755
--- a/bazel/rbe/toolchains/configs/linux/clang_libcxx/config/BUILD
+++ b/bazel/rbe/toolchains/configs/linux/clang_libcxx/config/BUILD
@@ -19,6 +19,8 @@ licenses(["notice"])  # Apache 2
 
 package(default_visibility = ["//visibility:public"])
 
+CACHE_SILO_KEY = "llvm-18"
+
 toolchain(
     name = "cc-toolchain",
     exec_compatible_with = [
@@ -42,7 +44,8 @@ platform(
         "@bazel_tools//tools/cpp:clang",
     ],
     exec_properties = {
-        "container-image": "docker://gcr.io/envoy-ci/envoy-build@sha256:b4bc62cde8bc10ebc7e91e93fcf92e6e0737b705363478bfd14d86c92d80db2c",
+        "cache-silo-key": CACHE_SILO_KEY,
+        "container-image": "docker://gcr.io/envoy-ci/envoy-build@sha256:56b66cc84065c88a141963cedbbe4198850ffae0dacad769f516d0e9081439da",
         "OSFamily": "Linux",
     },
     parents = ["@local_config_platform//:host"],
@@ -71,7 +74,7 @@ platform(
         "@bazel_tools//tools/cpp:clang",
     ],
     exec_properties = {
-        "container-image": "docker://gcr.io/envoy-ci/envoy-build@sha256:b4bc62cde8bc10ebc7e91e93fcf92e6e0737b705363478bfd14d86c92d80db2c",
+        "container-image": "docker://gcr.io/envoy-ci/envoy-build@sha256:56b66cc84065c88a141963cedbbe4198850ffae0dacad769f516d0e9081439da",
         "OSFamily": "Linux",
         "Pool": "arm",
     },
diff --git a/bazel/rbe/toolchains/configs/linux/gcc/config/BUILD b/bazel/rbe/toolchains/configs/linux/gcc/config/BUILD
index 16f98b13eed07..496ba319d412e 100755
--- a/bazel/rbe/toolchains/configs/linux/gcc/config/BUILD
+++ b/bazel/rbe/toolchains/configs/linux/gcc/config/BUILD
@@ -42,7 +42,7 @@ platform(
         "@bazel_tools//tools/cpp:clang",
     ],
     exec_properties = {
-        "container-image": "docker://gcr.io/envoy-ci/envoy-build@sha256:b4bc62cde8bc10ebc7e91e93fcf92e6e0737b705363478bfd14d86c92d80db2c",
+        "container-image": "docker://gcr.io/envoy-ci/envoy-build@sha256:56b66cc84065c88a141963cedbbe4198850ffae0dacad769f516d0e9081439da",
         "OSFamily": "Linux",
     },
     parents = ["@local_config_platform//:host"],
diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
index c2003d43dde60..8435cea9b6745 100644
--- a/bazel/repository_locations.bzl
+++ b/bazel/repository_locations.bzl
@@ -1348,12 +1348,12 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         #  - .github/workflows/codeql-daily.yml
         #  - .github/workflows/codeql-push.yml
         #  - https://github.com/envoyproxy/envoy-build-tools/blob/main/build_container/build_container_ubuntu.sh#L84
-        version = "14.0.0",
-        sha256 = "27ab7fcfb21d108093c0be766a9ed5fe18c04e4f74f936069711a312c8ae0377",
+        version = "18.1.8",
+        sha256 = "e054e99a9c9240720616e927cb52363abbc8b4f1ef0286bad3df79ec8fdf892f",
         # Only allow peeking at fuzzer related files for now.
         strip_prefix = "compiler-rt-{version}.src",
         urls = ["https://github.com/llvm/llvm-project/releases/download/llvmorg-{version}/compiler-rt-{version}.src.tar.xz"],
-        release_date = "2022-03-23",
+        release_date = "2024-06-19",
         use_category = ["test_only"],
         cpe = "cpe:2.3:a:llvm:compiler-rt:*",
         license = "Apache-2.0",
diff --git a/mobile/third_party/rbe_configs/cc/BUILD b/mobile/third_party/rbe_configs/cc/BUILD
index 9c50a3630cfdf..c401b41b0449b 100644
--- a/mobile/third_party/rbe_configs/cc/BUILD
+++ b/mobile/third_party/rbe_configs/cc/BUILD
@@ -80,10 +80,10 @@ cc_toolchain_config(
     abi_version = "local",
     abi_libc_version = "local",
     cxx_builtin_include_directories = ["/usr/local/include",
-    "/opt/llvm/lib/clang/14.0.0/include",
+    "/opt/llvm/lib/clang/18/include",
     "/usr/include/x86_64-linux-gnu",
     "/usr/include",
-    "/opt/llvm/lib/clang/14.0.0/share",
+    "/opt/llvm/lib/clang/18/share",
     "/usr/include/c++/11",
     "/usr/include/x86_64-linux-gnu/c++/11",
     "/usr/include/c++/11/backward",
@@ -93,7 +93,7 @@ cc_toolchain_config(
         "ld": "/usr/bin/ld",
         "llvm-cov": "/opt/llvm/bin/llvm-cov",
         "cpp": "/usr/bin/cpp",
-        "gcc": "/opt/llvm/bin/clang-14",
+        "gcc": "/opt/llvm/bin/clang",
         "dwp": "/usr/bin/dwp",
         "gcov": "/opt/llvm/bin/llvm-cov",
         "nm": "/usr/bin/nm",
diff --git a/mobile/third_party/rbe_configs/cc/builtin_include_directory_paths b/mobile/third_party/rbe_configs/cc/builtin_include_directory_paths
index 4b05ac9206dc5..304b0fa732b26 100644
--- a/mobile/third_party/rbe_configs/cc/builtin_include_directory_paths
+++ b/mobile/third_party/rbe_configs/cc/builtin_include_directory_paths
@@ -1,14 +1,14 @@
 This file is generated by cc_configure and contains builtin include directories
-that /opt/llvm/bin/clang-14 reported. This file is a dependency of every compilation action and
+that /opt/llvm/bin/clang reported. This file is a dependency of every compilation action and
 changes to it will be reflected in the action cache key. When some of these
 paths change, Bazel will make sure to rerun the action, even though none of
 declared action inputs or the action commandline changes.
 
 /usr/local/include
-/opt/llvm/lib/clang/14.0.0/include
+/opt/llvm/lib/clang/18/include
 /usr/include/x86_64-linux-gnu
 /usr/include
-/opt/llvm/lib/clang/14.0.0/share
+/opt/llvm/lib/clang/18/share
 /usr/include/c++/11
 /usr/include/x86_64-linux-gnu/c++/11
 /usr/include/c++/11/backward
diff --git a/mobile/third_party/rbe_configs/cc/cc_wrapper.sh b/mobile/third_party/rbe_configs/cc/cc_wrapper.sh
index 02b92a1444a2d..cdaf4f884f21c 100644
--- a/mobile/third_party/rbe_configs/cc/cc_wrapper.sh
+++ b/mobile/third_party/rbe_configs/cc/cc_wrapper.sh
@@ -22,4 +22,4 @@ set -eu
 
 
 # Call the C++ compiler
-/opt/llvm/bin/clang-14 "$@"
+/opt/llvm/bin/clang "$@"
diff --git a/mobile/third_party/rbe_configs/cc/module.modulemap b/mobile/third_party/rbe_configs/cc/module.modulemap
index a19420cd33d7c..30f88aa70faff 100644
--- a/mobile/third_party/rbe_configs/cc/module.modulemap
+++ b/mobile/third_party/rbe_configs/cc/module.modulemap
@@ -1,196 +1,196 @@
 module "crosstool" [system] {
-  textual header "/opt/llvm/lib/clang/14.0.0/include/adxintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/altivec.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ammintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/amxintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm64intr.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_acle.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_bf16.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_cde.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_cmse.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_fp16.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/armintr.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_mve.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_neon.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/arm_sve.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx2intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512bf16intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512bitalgintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512bwintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512cdintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512dqintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512erintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512fintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512fp16intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512ifmaintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512ifmavlintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512pfintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vbmi2intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vbmiintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vbmivlintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlbf16intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlbitalgintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlbwintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlcdintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vldqintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlfp16intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlvbmi2intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlvnniintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vlvp2intersectintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vnniintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vp2intersectintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vpopcntdqintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avx512vpopcntdqvlintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avxintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/avxvnniintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/bmi2intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/bmiintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/builtins.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cet.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cetintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_builtin_vars.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_cmath.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_complex_builtins.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_device_functions.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_intrinsics.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_libdevice_declares.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_math_forward_declares.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_math.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_runtime_wrapper.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_cuda_texture_intrinsics.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_hip_cmath.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_hip_libdevice_declares.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_hip_math.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__clang_hip_runtime_wrapper.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cldemoteintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/clflushoptintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/clwbintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/clzerointrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cpuid.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/crc32intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cuda_wrappers/algorithm"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cuda_wrappers/complex"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/cuda_wrappers/new"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/emmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/enqcmdintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/f16cintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/float.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/fma4intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/fmaintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/fuzzer/FuzzedDataProvider.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/fxsrintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/gfniintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/hexagon_circ_brev_intrinsics.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/hexagon_protos.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/hexagon_types.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/hresetintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/htmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/htmxlintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/hvx_hexagon_protos.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ia32intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/immintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/inttypes.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/invpcidintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/iso646.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/keylockerintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/limits.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/lwpintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/lzcntintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/mm3dnow.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/mmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/mm_malloc.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/module.modulemap"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/movdirintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/msa.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/mwaitxintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/nmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/omp.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ompt.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/omp-tools.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/opencl-c-base.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/opencl-c.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/__clang_openmp_device_functions.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/cmath"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/complex"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/complex_cmath.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/complex.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/math.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/openmp_wrappers/new"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/pconfigintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/pkuintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/pmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/popcntintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/emmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/mmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/mm_malloc.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/pmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/smmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/tmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ppc_wrappers/xmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/prfchwintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/profile/InstrProfData.inc"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/ptwriteintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/rdseedintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/riscv_vector.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/rtmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/s390intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/allocator_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/asan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/common_interface_defs.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/coverage_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/dfsan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/hwasan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/linux_syscall_hooks.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/lsan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/msan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/netbsd_syscall_hooks.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/scudo_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/tsan_interface_atomic.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/tsan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sanitizer/ubsan_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/serializeintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/sgxintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/shaintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/smmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stdalign.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stdarg.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stdatomic.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stdbool.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stddef.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__stddef_max_align_t.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stdint.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/stdnoreturn.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/tbmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/tgmath.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/tmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/tsxldtrkintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/uintrintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/unwind.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/vadefs.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/vaesintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/varargs.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/vecintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/vpclmulqdqintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/waitpkgintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/wasm_simd128.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/wbnoinvdintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__wmmintrin_aes.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/wmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/__wmmintrin_pclmul.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/x86gprintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/x86intrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xmmintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xopintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xray/xray_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xray/xray_log_interface.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xray/xray_records.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xsavecintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xsaveintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xsaveoptintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xsavesintrin.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/include/xtestintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/adxintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/altivec.h"
+  textual header "/opt/llvm/lib/clang/18/include/ammintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/amxintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm64intr.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_acle.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_bf16.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_cde.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_cmse.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_fp16.h"
+  textual header "/opt/llvm/lib/clang/18/include/armintr.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_mve.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_neon.h"
+  textual header "/opt/llvm/lib/clang/18/include/arm_sve.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx2intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512bf16intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512bitalgintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512bwintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512cdintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512dqintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512erintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512fintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512fp16intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512ifmaintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512ifmavlintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512pfintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vbmi2intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vbmiintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vbmivlintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlbf16intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlbitalgintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlbwintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlcdintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vldqintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlfp16intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlvbmi2intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlvnniintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vlvp2intersectintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vnniintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vp2intersectintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vpopcntdqintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avx512vpopcntdqvlintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avxintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/avxvnniintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/bmi2intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/bmiintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/builtins.h"
+  textual header "/opt/llvm/lib/clang/18/include/cet.h"
+  textual header "/opt/llvm/lib/clang/18/include/cetintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_builtin_vars.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_cmath.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_complex_builtins.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_device_functions.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_intrinsics.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_libdevice_declares.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_math_forward_declares.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_math.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_runtime_wrapper.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_cuda_texture_intrinsics.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_hip_cmath.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_hip_libdevice_declares.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_hip_math.h"
+  textual header "/opt/llvm/lib/clang/18/include/__clang_hip_runtime_wrapper.h"
+  textual header "/opt/llvm/lib/clang/18/include/cldemoteintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/clflushoptintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/clwbintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/clzerointrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/cpuid.h"
+  textual header "/opt/llvm/lib/clang/18/include/crc32intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/cuda_wrappers/algorithm"
+  textual header "/opt/llvm/lib/clang/18/include/cuda_wrappers/complex"
+  textual header "/opt/llvm/lib/clang/18/include/cuda_wrappers/new"
+  textual header "/opt/llvm/lib/clang/18/include/emmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/enqcmdintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/f16cintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/float.h"
+  textual header "/opt/llvm/lib/clang/18/include/fma4intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/fmaintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/fuzzer/FuzzedDataProvider.h"
+  textual header "/opt/llvm/lib/clang/18/include/fxsrintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/gfniintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/hexagon_circ_brev_intrinsics.h"
+  textual header "/opt/llvm/lib/clang/18/include/hexagon_protos.h"
+  textual header "/opt/llvm/lib/clang/18/include/hexagon_types.h"
+  textual header "/opt/llvm/lib/clang/18/include/hresetintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/htmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/htmxlintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/hvx_hexagon_protos.h"
+  textual header "/opt/llvm/lib/clang/18/include/ia32intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/immintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/inttypes.h"
+  textual header "/opt/llvm/lib/clang/18/include/invpcidintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/iso646.h"
+  textual header "/opt/llvm/lib/clang/18/include/keylockerintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/limits.h"
+  textual header "/opt/llvm/lib/clang/18/include/lwpintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/lzcntintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/mm3dnow.h"
+  textual header "/opt/llvm/lib/clang/18/include/mmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/mm_malloc.h"
+  textual header "/opt/llvm/lib/clang/18/include/module.modulemap"
+  textual header "/opt/llvm/lib/clang/18/include/movdirintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/msa.h"
+  textual header "/opt/llvm/lib/clang/18/include/mwaitxintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/nmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/omp.h"
+  textual header "/opt/llvm/lib/clang/18/include/ompt.h"
+  textual header "/opt/llvm/lib/clang/18/include/omp-tools.h"
+  textual header "/opt/llvm/lib/clang/18/include/opencl-c-base.h"
+  textual header "/opt/llvm/lib/clang/18/include/opencl-c.h"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/__clang_openmp_device_functions.h"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/cmath"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/complex"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/complex_cmath.h"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/complex.h"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/math.h"
+  textual header "/opt/llvm/lib/clang/18/include/openmp_wrappers/new"
+  textual header "/opt/llvm/lib/clang/18/include/pconfigintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/pkuintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/pmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/popcntintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/emmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/mmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/mm_malloc.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/pmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/smmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/tmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/ppc_wrappers/xmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/prfchwintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/profile/InstrProfData.inc"
+  textual header "/opt/llvm/lib/clang/18/include/ptwriteintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/rdseedintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/riscv_vector.h"
+  textual header "/opt/llvm/lib/clang/18/include/rtmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/s390intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/allocator_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/asan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/common_interface_defs.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/coverage_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/dfsan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/hwasan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/linux_syscall_hooks.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/lsan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/msan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/netbsd_syscall_hooks.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/scudo_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/tsan_interface_atomic.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/tsan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/sanitizer/ubsan_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/serializeintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/sgxintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/shaintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/smmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/stdalign.h"
+  textual header "/opt/llvm/lib/clang/18/include/stdarg.h"
+  textual header "/opt/llvm/lib/clang/18/include/stdatomic.h"
+  textual header "/opt/llvm/lib/clang/18/include/stdbool.h"
+  textual header "/opt/llvm/lib/clang/18/include/stddef.h"
+  textual header "/opt/llvm/lib/clang/18/include/__stddef_max_align_t.h"
+  textual header "/opt/llvm/lib/clang/18/include/stdint.h"
+  textual header "/opt/llvm/lib/clang/18/include/stdnoreturn.h"
+  textual header "/opt/llvm/lib/clang/18/include/tbmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/tgmath.h"
+  textual header "/opt/llvm/lib/clang/18/include/tmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/tsxldtrkintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/uintrintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/unwind.h"
+  textual header "/opt/llvm/lib/clang/18/include/vadefs.h"
+  textual header "/opt/llvm/lib/clang/18/include/vaesintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/varargs.h"
+  textual header "/opt/llvm/lib/clang/18/include/vecintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/vpclmulqdqintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/waitpkgintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/wasm_simd128.h"
+  textual header "/opt/llvm/lib/clang/18/include/wbnoinvdintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/__wmmintrin_aes.h"
+  textual header "/opt/llvm/lib/clang/18/include/wmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/__wmmintrin_pclmul.h"
+  textual header "/opt/llvm/lib/clang/18/include/x86gprintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/x86intrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xmmintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xopintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xray/xray_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/xray/xray_log_interface.h"
+  textual header "/opt/llvm/lib/clang/18/include/xray/xray_records.h"
+  textual header "/opt/llvm/lib/clang/18/include/xsavecintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xsaveintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xsaveoptintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xsavesintrin.h"
+  textual header "/opt/llvm/lib/clang/18/include/xtestintrin.h"
   textual header "/usr/include/x86_64-linux-gnu/a.out.h"
   textual header "/usr/include/x86_64-linux-gnu/asm/a.out.h"
   textual header "/usr/include/x86_64-linux-gnu/asm/auxvec.h"
@@ -2946,11 +2946,11 @@ module "crosstool" [system] {
   textual header "/usr/include/xen/gntalloc.h"
   textual header "/usr/include/xen/gntdev.h"
   textual header "/usr/include/xen/privcmd.h"
-  textual header "/opt/llvm/lib/clang/14.0.0/share/asan_ignorelist.txt"
-  textual header "/opt/llvm/lib/clang/14.0.0/share/cfi_ignorelist.txt"
-  textual header "/opt/llvm/lib/clang/14.0.0/share/dfsan_abilist.txt"
-  textual header "/opt/llvm/lib/clang/14.0.0/share/hwasan_ignorelist.txt"
-  textual header "/opt/llvm/lib/clang/14.0.0/share/msan_ignorelist.txt"
+  textual header "/opt/llvm/lib/clang/18/share/asan_ignorelist.txt"
+  textual header "/opt/llvm/lib/clang/18/share/cfi_ignorelist.txt"
+  textual header "/opt/llvm/lib/clang/18/share/dfsan_abilist.txt"
+  textual header "/opt/llvm/lib/clang/18/share/hwasan_ignorelist.txt"
+  textual header "/opt/llvm/lib/clang/18/share/msan_ignorelist.txt"
   textual header "/usr/include/c++/11/algorithm"
   textual header "/usr/include/c++/11/any"
   textual header "/usr/include/c++/11/array"
diff --git a/mobile/third_party/rbe_configs/config/BUILD b/mobile/third_party/rbe_configs/config/BUILD
index 135f95d390f24..667dd20220cdd 100644
--- a/mobile/third_party/rbe_configs/config/BUILD
+++ b/mobile/third_party/rbe_configs/config/BUILD
@@ -42,7 +42,7 @@ platform(
         "@bazel_tools//tools/cpp:clang",
     ],
     exec_properties = {
-        "container-image": "docker://envoyproxy/envoy-build-ubuntu:mobile-506aa20d3a216fa2f5677c1f13d2b1656b000b86@sha256:67fa99e90cbc9a238ff7ad558993d68732a4ab59d3ef8d95b8e4373e24ea390b",
+        "container-image": "docker://envoyproxy/envoy-build-ubuntu:mobile-cb86d91cf406995012e330ab58830e6ee10240cb@sha256:5ff2c9ce8f3abdb89d305095a39fd0e7ee97422cc017d9578e738f9a56bc33d8",
         "OSFamily": "Linux",
         "Pool": "linux",
     },
@@ -57,7 +57,7 @@ platform(
         "@bazel_tools//tools/cpp:clang",
     ],
     exec_properties = {
-        "container-image": "docker://envoyproxy/envoy-build-ubuntu:mobile-506aa20d3a216fa2f5677c1f13d2b1656b000b86@sha256:67fa99e90cbc9a238ff7ad558993d68732a4ab59d3ef8d95b8e4373e24ea390b",
+        "container-image": "docker://envoyproxy/envoy-build-ubuntu:mobile-cb86d91cf406995012e330ab58830e6ee10240cb@sha256:5ff2c9ce8f3abdb89d305095a39fd0e7ee97422cc017d9578e738f9a56bc33d8",
         "OSFamily": "Linux",
         "Pool": "linux",
         # Necessary to workaround https://github.com/google/sanitizers/issues/916, otherwise, dangling threads in the
diff --git a/test/common/router/BUILD b/test/common/router/BUILD
index 8d3b359b9d890..8d56dbcc7b7fa 100644
--- a/test/common/router/BUILD
+++ b/test/common/router/BUILD
@@ -18,7 +18,7 @@ envoy_package()
 
 envoy_cc_test(
     name = "config_impl_test",
-    rbe_pool = "6gig",
+    size = "large",
     deps = [":config_impl_test_lib"],
 )
 
diff --git a/test/run_envoy_bazel_coverage.sh b/test/run_envoy_bazel_coverage.sh
index 819739e532a3e..1c436572de3ed 100755
--- a/test/run_envoy_bazel_coverage.sh
+++ b/test/run_envoy_bazel_coverage.sh
@@ -2,7 +2,7 @@
 
 set -e -o pipefail
 
-LLVM_VERSION=${LLVM_VERSION:-"14.0.0"}
+LLVM_VERSION=${LLVM_VERSION:-"18.1.8"}
 CLANG_VERSION=$(clang --version | grep version | sed -e 's/\ *clang version \([0-9.]*\).*/\1/')
 LLVM_COV_VERSION=$(llvm-cov --version | grep version | sed -e 's/\ *LLVM version \([0-9.]*\).*/\1/')
 LLVM_PROFDATA_VERSION=$(llvm-profdata show --version | grep version | sed -e 's/\ *LLVM version \(.*\)/\1/')


Reviews:
user: login: krinkinmu
state: COMMENTED
author_association: CONTRIBUTOR
submitted_at: 2025-03-06T18:05:45Z
user: login: krinkinmu
state: COMMENTED
author_association: CONTRIBUTOR
submitted_at: 2025-03-06T18:08:19Z
user: login: phlax
state: COMMENTED
author_association: MEMBER
submitted_at: 2025-03-06T18:16:16Z
user: login: phlax
state: COMMENTED
author_association: MEMBER
submitted_at: 2025-03-25T15:00:19Z
user: login: phlax
body: thanks again @krinkinmu for your many contributions - they were invaluable in getting this across the line - really appreciated
state: DISMISSED
author_association: MEMBER
submitted_at: 2025-03-25T15:43:15Z
user: login: phlax
state: APPROVED
author_association: MEMBER
submitted_at: 2025-03-25T18:12:15Z

Review comments:
diff_hunk: @@ -18,7 +18,8 @@ envoy_package()
 
 envoy_cc_test(
     name = "config_impl_test",
-    rbe_pool = "6gig",
+    rbe_pool = "4core",
path: test/common/router/BUILD
user: login: krinkinmu
body: We discussed it in the chat, my understanding was that using sharding instead of different pool type was more preferable because the pool of large machines is smaller, do I remember it incorrectly?

Specifically this test is rather large and when it runs under various sanitizers it will accumulate memory over time (that appear to be a common feature of MSAN/ASAN memory allocators or a consequence of the algorithms they use). Sharding helps to deal with that, essentially, by splitting one large tests in multiple smaller tests, so the "memory leak" is more tolerable this way.

Also you mentioned that we may consider making it conditional, do you want me to try and implement something like that (e.g., use sharding when under sanitizer/coverage and skip it otherwise)?
created_at: 2025-03-06T17:58:47Z
author_association: CONTRIBUTOR
diff_hunk: @@ -18,7 +18,8 @@ envoy_package()
 
 envoy_cc_test(
     name = "config_impl_test",
-    rbe_pool = "6gig",
+    rbe_pool = "4core",
path: test/common/router/BUILD
user: login: krinkinmu
body: I guess the same also applies to changes in test/common/tls/BUILD and test/common/upstream/BUILD. I'm not going to leave a separate comment for each of those, to keep discussion in one place.
created_at: 2025-03-06T18:00:05Z
author_association: CONTRIBUTOR
diff_hunk: @@ -2,7 +2,7 @@
 
 set -e -o pipefail
 
-LLVM_VERSION=${LLVM_VERSION:-"14.0.0"}
+LLVM_VERSION=${LLVM_VERSION:-"18.1.8"}
path: test/run_envoy_bazel_coverage.sh
user: login: krinkinmu
body: It's just a nit, but maybe we can make the Envoy CI docker image expose LLVM_VERSION that it comes with. And when it's not provided rely on llvm-config to get the default value (i.e., use `llvm-config --version` here instead of hardcoding a particular version, similarly to what is done below for clang, llvm-cov, etc)? 
created_at: 2025-03-06T18:04:22Z
author_association: CONTRIBUTOR
diff_hunk: @@ -2,7 +2,7 @@
 
 set -e -o pipefail
 
-LLVM_VERSION=${LLVM_VERSION:-"14.0.0"}
+LLVM_VERSION=${LLVM_VERSION:-"18.1.8"}
path: test/run_envoy_bazel_coverage.sh
user: login: krinkinmu
body: Actually, forget about exposing LLVM_VERSION from Envoy CI docker image, as long as we can call the llvm-config, I think it should be good enough.
created_at: 2025-03-06T18:08:19Z
author_association: CONTRIBUTOR
diff_hunk: @@ -2,7 +2,7 @@
 
 set -e -o pipefail
 
-LLVM_VERSION=${LLVM_VERSION:-"14.0.0"}
+LLVM_VERSION=${LLVM_VERSION:-"18.1.8"}
path: test/run_envoy_bazel_coverage.sh
user: login: phlax
body: yeah - ive never been comfortable with this check - not sure why it was added but my guess is that a realization that coverage can be different with different llvm versions - lets deal with this one separately
created_at: 2025-03-06T18:16:16Z
author_association: MEMBER
diff_hunk: @@ -18,7 +18,8 @@ envoy_package()
 
 envoy_cc_test(
     name = "config_impl_test",
-    rbe_pool = "6gig",
+    rbe_pool = "4core",
path: test/common/router/BUILD
user: login: phlax
body: i removed all the mem workarounds - hopefully no longer required
created_at: 2025-03-25T15:00:19Z
author_association: MEMBER

PR comments:
user: login: repokitteh-read-only[bot]
created_at: 2025-02-26T10:58:54Z
body: CC @envoyproxy/dependency-shepherds: Your approval is needed for changes made to `(bazel/.*repos.*\.bzl)|(bazel/dependency_imports\.bzl)|(api/bazel/.*\.bzl)|(.*/requirements\.txt)|(.*\.patch)`.
envoyproxy/dependency-shepherds assignee is @mattklein123


<details>
	<summary>:cat:</summary>

Caused by: https://github.com/envoyproxy/envoy/pull/38571 was synchronize by phlax.

see: [more](https://github.com/envoyproxy/envoy/pull/38571), [trace](https://prod.repokitteh.app/traces/ui/envoyproxy/envoy/a74e7880-f430-11ef-90bb-a340a28e516c).
</details>
author_association: NONE
user: login: phlax
created_at: 2025-02-26T10:59:04Z
body: cc @krinkinmu 
author_association: MEMBER
user: login: phlax
created_at: 2025-02-26T11:11:30Z
body: /retest
author_association: MEMBER
user: login: phlax
created_at: 2025-02-27T15:30:07Z
body: /retest
author_association: MEMBER
user: login: phlax
created_at: 2025-02-28T13:57:09Z
body: /retest
author_association: MEMBER
user: login: phlax
created_at: 2025-03-18T14:54:51Z
body: /wait
author_association: MEMBER
user: login: phlax
created_at: 2025-03-25T15:34:05Z
body: /retest
author_association: MEMBER
user: login: phlax
created_at: 2025-03-25T16:02:30Z
body: /retest
author_association: MEMBER