From 42354bc6ca1f228feea6f1026e49443ab139e1be Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Thu, 23 May 2024 04:28:37 +0000 Subject: [PATCH] Bug 1849075 - Update builders to clang 18. r=firefox-build-system-reviewers,sergesanspaille Differential Revision: https://phabricator.services.mozilla.com/D208955 --- build/build-clang/build-clang.py | 2 +- config/external/icu/data/moz.build | 3 + taskcluster/kinds/toolchain/clang-tidy.yml | 12 ++-- taskcluster/kinds/toolchain/clang.yml | 68 +++++++++---------- .../kinds/toolchain/llvm-symbolizer.yml | 40 +++++------ taskcluster/kinds/toolchain/sysroot.yml | 8 +-- tools/clang-tidy/config.yaml | 2 +- 7 files changed, 69 insertions(+), 66 deletions(-) diff --git a/build/build-clang/build-clang.py b/build/build-clang/build-clang.py index 03521a333e78..6daaa9e78af9 100755 --- a/build/build-clang/build-clang.py +++ b/build/build-clang/build-clang.py @@ -446,7 +446,7 @@ def prune_final_dir_for_clang_tidy(final_dir, target): if is_darwin(target) and name in ["libLLVM.dylib", "libclang-cpp.dylib"]: continue if is_linux(target) and ( - fnmatch.fnmatch(name, "libLLVM*.so") + fnmatch.fnmatch(name, "libLLVM*.so*") or fnmatch.fnmatch(name, "libclang-cpp.so*") ): continue diff --git a/config/external/icu/data/moz.build b/config/external/icu/data/moz.build index 88926c94fad3..9c69436d58e0 100644 --- a/config/external/icu/data/moz.build +++ b/config/external/icu/data/moz.build @@ -33,6 +33,9 @@ SOURCES += [ if CONFIG["OS_ARCH"] == "WINNT" and CONFIG["CC_TYPE"] == "clang-cl": USE_INTEGRATED_CLANGCL_AS = True + # Work around https://github.com/llvm/llvm-project/issues/92229 + # We don't need debug flags on the command line for this file anyways. + ASM_FLAGS["DEBUG"] = [] if CONFIG["TARGET_ENDIANNESS"] == "big": GeneratedFile( diff --git a/taskcluster/kinds/toolchain/clang-tidy.yml b/taskcluster/kinds/toolchain/clang-tidy.yml index 02d089eca3d6..671e8f708192 100644 --- a/taskcluster/kinds/toolchain/clang-tidy.yml +++ b/taskcluster/kinds/toolchain/clang-tidy.yml @@ -24,7 +24,7 @@ job-defaults: - 'build/build-clang/build-clang.py' fetches: fetch: - - clang-17 + - clang-18 linux64-clang-tidy: index: @@ -39,7 +39,7 @@ linux64-clang-tidy: - 'build/build-clang/clang-tidy-linux64.json' fetches: toolchain: - - linux64-clang-17 + - linux64-clang-18 - linux64-toolchain-sysroot macosx64-clang-tidy: @@ -58,7 +58,7 @@ macosx64-clang-tidy: - 'build/build-clang/macosx64.json' fetches: toolchain: - - linux64-clang-17 + - linux64-clang-18 - macosx64-sdk-toolchain macosx64-aarch64-clang-tidy: @@ -79,7 +79,7 @@ macosx64-aarch64-clang-tidy: - 'build/build-clang/macosx64-aarch64.json' fetches: toolchain: - - linux64-clang-17 + - linux64-clang-18 - macosx64-sdk-toolchain win64-clang-tidy: @@ -101,7 +101,7 @@ win64-clang-tidy: - 'build/build-clang/win64.json' fetches: toolchain: - - linux64-clang-17 + - linux64-clang-18 - vs-toolchain - win64-libxml2 @@ -124,5 +124,5 @@ linux64-clang-tidy-external: fetch: - civet-source toolchain: - - linux64-clang-17 + - linux64-clang-18 - linux64-toolchain-sysroot diff --git a/taskcluster/kinds/toolchain/clang.yml b/taskcluster/kinds/toolchain/clang.yml index a9cf04e0b9b7..95d8b5c7e0f5 100644 --- a/taskcluster/kinds/toolchain/clang.yml +++ b/taskcluster/kinds/toolchain/clang.yml @@ -122,10 +122,6 @@ linux64-clang-17-mingw-x86: - 'x86' resources: - 'taskcluster/scripts/misc/mingw-*.patch' - toolchain-alias: - by-project: - toolchains: null - default: linux64-clang-mingw-x86 toolchain-artifact: public/build/clangmingw.tar.zst fetches: fetch: @@ -148,10 +144,6 @@ linux64-clang-17-mingw-x64: - 'x64' resources: - 'taskcluster/scripts/misc/mingw-*.patch' - toolchain-alias: - by-project: - toolchains: null - default: linux64-clang-mingw-x64 toolchain-artifact: public/build/clangmingw.tar.zst fetches: fetch: @@ -177,10 +169,6 @@ linux64-clang-17-stage1: - 'build/build-clang/linux64.json' - 'build/build-clang/clang-17.json' - 'build/build-clang/1stage.json' - toolchain-alias: - by-project: - toolchains: null - default: linux64-clang-toolchain toolchain-artifact: public/build/clang.tar.zst fetches: fetch: @@ -250,10 +238,6 @@ linux64-clang-17: max-run-time: 600 run: script: repack-clang.sh - toolchain-alias: - by-project: - toolchains: null - default: linux64-clang toolchain-artifact: public/build/clang.tar.zst fetches: toolchain: @@ -316,12 +300,6 @@ macosx64-clang-17: max-run-time: 600 run: script: repack-clang.sh - toolchain-alias: - by-project: - toolchains: null - default: - - macosx64-clang - - macosx64-clang-toolchain toolchain-artifact: public/build/clang.tar.zst fetches: toolchain: @@ -386,10 +364,6 @@ macosx64-aarch64-clang-17: max-run-time: 600 run: script: repack-clang.sh - toolchain-alias: - by-project: - toolchains: null - default: macosx64-aarch64-clang toolchain-artifact: public/build/clang.tar.zst fetches: toolchain: @@ -426,10 +400,6 @@ win64-clang-17-stage1: - 'build/build-clang/win64.json' - 'build/build-clang/clang-17.json' - 'build/build-clang/1stage.json' - toolchain-alias: - by-project: - toolchains: null - default: win64-clang-toolchain toolchain-artifact: public/build/clang.tar.zst fetches: fetch: @@ -481,10 +451,6 @@ win64-clang-17: max-run-time: 600 run: script: repack-clang.sh - toolchain-alias: - by-project: - toolchains: null - default: win64-clang toolchain-artifact: public/build/clang.tar.zst fetches: toolchain: @@ -518,6 +484,10 @@ linux64-clang-18-mingw-x86: - 'x86' resources: - 'taskcluster/scripts/misc/mingw-*.patch' + toolchain-alias: + by-project: + toolchains: null + default: linux64-clang-mingw-x86 toolchain-artifact: public/build/clangmingw.tar.zst fetches: fetch: @@ -540,6 +510,10 @@ linux64-clang-18-mingw-x64: - 'x64' resources: - 'taskcluster/scripts/misc/mingw-*.patch' + toolchain-alias: + by-project: + toolchains: null + default: linux64-clang-mingw-x64 toolchain-artifact: public/build/clangmingw.tar.zst fetches: fetch: @@ -565,6 +539,10 @@ linux64-clang-18-stage1: - 'build/build-clang/linux64.json' - 'build/build-clang/clang-18.json' - 'build/build-clang/1stage.json' + toolchain-alias: + by-project: + toolchains: null + default: linux64-clang-toolchain toolchain-artifact: public/build/clang.tar.zst fetches: fetch: @@ -634,6 +612,10 @@ linux64-clang-18: max-run-time: 600 run: script: repack-clang.sh + toolchain-alias: + by-project: + toolchains: null + default: linux64-clang toolchain-artifact: public/build/clang.tar.zst fetches: toolchain: @@ -696,6 +678,12 @@ macosx64-clang-18: max-run-time: 600 run: script: repack-clang.sh + toolchain-alias: + by-project: + toolchains: null + default: + - macosx64-clang + - macosx64-clang-toolchain toolchain-artifact: public/build/clang.tar.zst fetches: toolchain: @@ -760,6 +748,10 @@ macosx64-aarch64-clang-18: max-run-time: 600 run: script: repack-clang.sh + toolchain-alias: + by-project: + toolchains: null + default: macosx64-aarch64-clang toolchain-artifact: public/build/clang.tar.zst fetches: toolchain: @@ -796,6 +788,10 @@ win64-clang-18-stage1: - 'build/build-clang/win64.json' - 'build/build-clang/clang-18.json' - 'build/build-clang/1stage.json' + toolchain-alias: + by-project: + toolchains: null + default: win64-clang-toolchain toolchain-artifact: public/build/clang.tar.zst fetches: fetch: @@ -847,6 +843,10 @@ win64-clang-18: max-run-time: 600 run: script: repack-clang.sh + toolchain-alias: + by-project: + toolchains: null + default: win64-clang toolchain-artifact: public/build/clang.tar.zst fetches: toolchain: diff --git a/taskcluster/kinds/toolchain/llvm-symbolizer.yml b/taskcluster/kinds/toolchain/llvm-symbolizer.yml index 11b63397c28f..52c91ad542c9 100644 --- a/taskcluster/kinds/toolchain/llvm-symbolizer.yml +++ b/taskcluster/kinds/toolchain/llvm-symbolizer.yml @@ -23,10 +23,6 @@ linux32-llvm-symbolizer-17: - build/build-clang/clang-17.json - build/build-clang/llvm-symbolizer-17.json - taskcluster/scripts/misc/build-llvm-common.sh - toolchain-alias: - by-project: - toolchains: null - default: linux32-llvm-symbolizer fetches: fetch: - clang-17 @@ -47,10 +43,6 @@ linux64-llvm-symbolizer-17: - build/build-clang/clang-17.json - build/build-clang/llvm-symbolizer-17.json - taskcluster/scripts/misc/build-llvm-common.sh - toolchain-alias: - by-project: - toolchains: null - default: linux64-llvm-symbolizer fetches: fetch: - clang-17 @@ -71,10 +63,6 @@ macosx64-llvm-symbolizer-17: - build/build-clang/clang-17.json - build/build-clang/llvm-symbolizer-17.json - taskcluster/scripts/misc/build-llvm-common.sh - toolchain-alias: - by-project: - toolchains: null - default: macosx64-llvm-symbolizer fetches: fetch: - clang-17 @@ -95,10 +83,6 @@ macosx64-aarch64-llvm-symbolizer-17: - build/build-clang/clang-17.json - build/build-clang/llvm-symbolizer-17.json - taskcluster/scripts/misc/build-llvm-common.sh - toolchain-alias: - by-project: - toolchains: null - default: macosx64-aarch64-llvm-symbolizer fetches: fetch: - clang-17 @@ -119,10 +103,6 @@ win64-llvm-symbolizer-17: - build/build-clang/clang-17.json - build/build-clang/llvm-symbolizer-17.json - taskcluster/scripts/misc/build-llvm-common.sh - toolchain-alias: - by-project: - toolchains: null - default: win64-llvm-symbolizer fetches: fetch: - clang-17 @@ -143,6 +123,10 @@ linux32-llvm-symbolizer-18: - build/build-clang/clang-18.json - build/build-clang/llvm-symbolizer-18.json - taskcluster/scripts/misc/build-llvm-common.sh + toolchain-alias: + by-project: + toolchains: null + default: linux32-llvm-symbolizer fetches: fetch: - clang-18 @@ -163,6 +147,10 @@ linux64-llvm-symbolizer-18: - build/build-clang/clang-18.json - build/build-clang/llvm-symbolizer-18.json - taskcluster/scripts/misc/build-llvm-common.sh + toolchain-alias: + by-project: + toolchains: null + default: linux64-llvm-symbolizer fetches: fetch: - clang-18 @@ -183,6 +171,10 @@ macosx64-llvm-symbolizer-18: - build/build-clang/clang-18.json - build/build-clang/llvm-symbolizer-18.json - taskcluster/scripts/misc/build-llvm-common.sh + toolchain-alias: + by-project: + toolchains: null + default: macosx64-llvm-symbolizer fetches: fetch: - clang-18 @@ -203,6 +195,10 @@ macosx64-aarch64-llvm-symbolizer-18: - build/build-clang/clang-18.json - build/build-clang/llvm-symbolizer-18.json - taskcluster/scripts/misc/build-llvm-common.sh + toolchain-alias: + by-project: + toolchains: null + default: macosx64-aarch64-llvm-symbolizer fetches: fetch: - clang-18 @@ -223,6 +219,10 @@ win64-llvm-symbolizer-18: - build/build-clang/clang-18.json - build/build-clang/llvm-symbolizer-18.json - taskcluster/scripts/misc/build-llvm-common.sh + toolchain-alias: + by-project: + toolchains: null + default: win64-llvm-symbolizer fetches: fetch: - clang-18 diff --git a/taskcluster/kinds/toolchain/sysroot.yml b/taskcluster/kinds/toolchain/sysroot.yml index e4479d16e091..6f273fb611a7 100644 --- a/taskcluster/kinds/toolchain/sysroot.yml +++ b/taskcluster/kinds/toolchain/sysroot.yml @@ -89,10 +89,6 @@ sysroot-wasm32-wasi-clang-17: - wasi-sdk.patch resources: - taskcluster/scripts/misc/wasi-sdk.patch - toolchain-alias: - by-project: - toolchains: null - default: sysroot-wasm32-wasi toolchain-artifact: public/build/sysroot-wasm32-wasi.tar.zst fetches: fetch: @@ -114,6 +110,10 @@ sysroot-wasm32-wasi-clang-18: - wasi-sdk.patch resources: - taskcluster/scripts/misc/wasi-sdk.patch + toolchain-alias: + by-project: + toolchains: null + default: sysroot-wasm32-wasi toolchain-artifact: public/build/sysroot-wasm32-wasi.tar.zst fetches: fetch: diff --git a/tools/clang-tidy/config.yaml b/tools/clang-tidy/config.yaml index 773e92914faf..fe2768cc606c 100644 --- a/tools/clang-tidy/config.yaml +++ b/tools/clang-tidy/config.yaml @@ -19,7 +19,7 @@ platforms: # Minimum clang-tidy version that is required for all the following checkers # to work properly. # This is also used by 'mach clang-format' -package_version: "17.0.6" +package_version: "18.1.5" clang_checkers: - name: -* publish: !!bool no