From cff8dc5fd64b64c46ece8c96e2daf4fcf30ae3da Mon Sep 17 00:00:00 2001 From: Ryan Macnak Date: Wed, 28 Jan 2026 11:33:12 -0800 Subject: [PATCH] Roll Clang from f77ce52b56d0 to b153f17b8aeb. Change-Id: Ie6b115b09c3376cd5b5720e17a99d2d66ffe1a3a Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/476085 Reviewed-by: Alexander Aprelev Commit-Queue: Ryan Macnak --- DEPS | 2 +- build/config/compiler/BUILD.gn | 12 ++++++------ tools/bots/test_matrix.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/DEPS b/DEPS index f9b17fb4619..611795f93da 100644 --- a/DEPS +++ b/DEPS @@ -80,7 +80,7 @@ vars = { "jsc_tag": "version:305906", # https://chrome-infra-packages.appspot.com/p/fuchsia/third_party/clang - "clang_version": "git_revision:f77ce52b56d025399f489a8c0aad8c18c4b06045", + "clang_version": "git_revision:b153f17b8aeb23ae45b05d8f5e6b4dfd76442dc4", # https://chrome-infra-packages.appspot.com/p/gn/gn "gn_version": "git_revision:103f8b437f5e791e0aef9d5c372521a5d675fabb", diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn index 6adf5b460a7..696cbc7e5d0 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -40,7 +40,7 @@ config("default_include_dirs") { if (is_win && (is_asan || is_ubsan)) { copy("copy_sanitizer_runtime") { - sources = [ "//buildtools/win-x64/clang/lib/clang/22/lib/x86_64-pc-windows-msvc/clang_rt.asan_dynamic.dll" ] + sources = [ "//buildtools/win-x64/clang/lib/clang/23/lib/x86_64-pc-windows-msvc/clang_rt.asan_dynamic.dll" ] outputs = [ "$root_out_dir/{{source_file_part}}" ] } } @@ -133,7 +133,7 @@ config("compiler") { # linking. Hence, pass the runtime libraries instead of -fsanitize=address # or -fsanitize=fuzzer. _clang_lib_dir = - "//buildtools/win-x64/clang/lib/clang/22/lib/x86_64-pc-windows-msvc" + "//buildtools/win-x64/clang/lib/clang/23/lib/x86_64-pc-windows-msvc" libs = [ "$_clang_lib_dir/clang_rt.asan_dynamic.lib" ] ldflags += [ "-libpath:" + rebase_path("$_clang_lib_dir") ] if (is_shared_library) { @@ -174,7 +174,7 @@ config("compiler") { # linking. Hence, pass the runtime libraries instead of # -fsanitize=undefined. _clang_lib_dir = - "//buildtools/win-x64/clang/lib/clang/22/lib/x86_64-pc-windows-msvc" + "//buildtools/win-x64/clang/lib/clang/23/lib/x86_64-pc-windows-msvc" libs = [ "$_clang_lib_dir/clang_rt.ubsan_standalone.lib" ] ldflags += [ "-libpath:" + rebase_path("$_clang_lib_dir") ] } else { @@ -189,15 +189,15 @@ config("compiler") { if (is_mac && (is_asan || is_lsan || is_tsan || is_ubsan)) { ldflags += [ "-rpath", - "buildtools/mac-$host_cpu/clang/lib/clang/22/lib/darwin", + "buildtools/mac-$host_cpu/clang/lib/clang/23/lib/darwin", # Back from xcodebuild/ReleaseTSAN/dart "-rpath", - "@loader_path/../../buildtools/mac-$host_cpu/clang/lib/clang/22/lib/darwin", + "@loader_path/../../buildtools/mac-$host_cpu/clang/lib/clang/23/lib/darwin", # Back from xcodebuild/ReleaseTSAN/dart-sdk/bin/dart "-rpath", - "@loader_path/../../../../buildtools/mac-$host_cpu/clang/lib/clang/22/lib/darwin", + "@loader_path/../../../../buildtools/mac-$host_cpu/clang/lib/clang/23/lib/darwin", ] } } diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json index 759d443ae14..effe4310472 100644 --- a/tools/bots/test_matrix.json +++ b/tools/bots/test_matrix.json @@ -136,9 +136,9 @@ "buildtools/linux-arm64/clang/bin/", "buildtools/linux-x64/clang/bin/", "buildtools/mac-arm64/clang/bin/", - "buildtools/mac-arm64/clang/lib/clang/22/lib/darwin/", + "buildtools/mac-arm64/clang/lib/clang/23/lib/darwin/", "buildtools/mac-x64/clang/bin/", - "buildtools/mac-x64/clang/lib/clang/22/lib/darwin/", + "buildtools/mac-x64/clang/lib/clang/23/lib/darwin/", "buildtools/win-x64/clang/bin/clang.exe", "buildtools/win-x64/clang/bin/lld-link.exe", "buildtools/win-x64/clang/bin/llvm-strip.exe",