Skip to content

Commit

Permalink
Bug 1758780 - Update builders to clang 14. r=firefox-build-system-rev…
Browse files Browse the repository at this point in the history
…iewers,mhentges,andi

Differential Revision: https://phabricator.services.mozilla.com/D143175
  • Loading branch information
glandium committed Apr 13, 2022
1 parent 5122f70 commit 50ac550
Show file tree
Hide file tree
Showing 28 changed files with 668 additions and 890 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,9 @@
"Remove-FlushViewOfFile-when-unmaping-gcda-files.patch",
"fuzzing_ccov_build_clang_12.patch",
"win64-no-symlink.patch",
"revert-llvmorg-13-init-8182-gc2297544c047.patch",
"revert-llvmorg-12-init-7827-g2a078c307204.patch",
"llvmorg-14-init-3166-gd9ab62ca3d29.patch",
"llvmorg-14-init-4465-g22ea0cea595e-v2.patch",
"llvmorg-14-init-10524-g1ad7de9e92bc.patch",
"llvmorg-14-init-12719-gc4b45eeb44fd.patch",
"llvmorg-14-init-13305-g319181f76718.patch",
"llvmorg-14-init-13854-g782791ee84d2.patch"
"revert-llvmorg-14-init-14141-gd6d3000a2f6d.patch",
"revert-llvmorg-14-init-11890-gf86deb18cab6.patch",
"llvmorg-15-init-283-g4db89e23190d.patch",
"llvmorg-15-init-7469-gcfa4fe7c5187.patch"
]
}
22 changes: 15 additions & 7 deletions build/build-clang/clang-tidy-ci.patch
Original file line number Diff line number Diff line change
@@ -1,23 +1,31 @@
diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp
index 73d66b980a5e..3b18de2176ba 100644
index 7de313ad4da6..697f98c362d1 100644
--- a/clang-tools-extra/clang-tidy/ClangTidy.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -432,6 +432,7 @@ ClangTidyASTConsumerFactory::CreateASTConsumer(

@@ -432,6 +432,7 @@ ClangTidyASTConsumerFactory::createASTConsumer(
for (auto &Check : Checks) {
Check->registerMatchers(&*Finder);
+ Check->registerPPCallbacks(Compiler);
Check->registerPPCallbacks(*SM, PP, ModuleExpanderPP);
}

diff --git a/clang-tools-extra/clang-tidy/ClangTidyCheck.h b/clang-tools-extra/clang-tidy/ClangTidyCheck.h
index 20e9b8e47e6f..aded1f2e196c 100644
index 9b41e5836de7..d8938b8fe05e 100644
--- a/clang-tools-extra/clang-tidy/ClangTidyCheck.h
+++ b/clang-tools-extra/clang-tidy/ClangTidyCheck.h
@@ -70,6 +70,9 @@ public:
@@ -20,6 +20,7 @@

namespace clang {

+class CompilerInstance;
class SourceManager;

namespace tidy {
@@ -69,6 +70,9 @@ public:
return true;
}

+ /// This has been deprecated in clang 9 - needed by mozilla-must-override
+ virtual void registerPPCallbacks(CompilerInstance &Compiler) {}
+
Expand Down
40 changes: 0 additions & 40 deletions build/build-clang/llvmorg-14-init-10524-g1ad7de9e92bc.patch

This file was deleted.

86 changes: 0 additions & 86 deletions build/build-clang/llvmorg-14-init-12719-gc4b45eeb44fd.patch

This file was deleted.

141 changes: 0 additions & 141 deletions build/build-clang/llvmorg-14-init-13305-g319181f76718.patch

This file was deleted.

60 changes: 0 additions & 60 deletions build/build-clang/llvmorg-14-init-13854-g782791ee84d2.patch

This file was deleted.

Loading

0 comments on commit 50ac550

Please sign in to comment.