Merge branch 'main' into fix-boolean-expr-check

Author: Anshul200677

.ci/generate_test_report_lib.py

@@ -298,6 +298,7 @@ def plural(num_tests):
             title,
             return_code,
             junit_objects,
+            ninja_logs,
             size_limit,
             list_failures=False,
         )

.ci/generate_test_report_lib_test.py

@@ -408,36 +408,6 @@ def test_no_failures_build_failed_ninja_log(self):
         )
 
     def test_no_failures_multiple_build_failed_ninja_log(self):
-        test = generate_test_report_lib.generate_report(
-            "Foo",
-            1,
-            [
-                junit_from_xml(
-                    dedent(
-                        """\
-          <?xml version="1.0" encoding="UTF-8"?>
-          <testsuites time="0.00">
-          <testsuite name="Passed" tests="1" failures="0" skipped="0" time="0.00">
-          <testcase classname="Bar/test_1" name="test_1" time="0.00"/>
-          </testsuite>
-          </testsuites>"""
-                    )
-                )
-            ],
-            [
-                [
-                    "[1/5] test/1.stamp",
-                    "[2/5] test/2.stamp",
-                    "FAILED: touch test/2.stamp",
-                    "Wow! Be Kind!",
-                    "[3/5] test/3.stamp",
-                    "[4/5] test/4.stamp",
-                    "FAILED: touch test/4.stamp",
-                    "Wow! I Dare You!",
-                    "[5/5] test/5.stamp",
-                ]
-            ],
-        )
         self.assertEqual(
             generate_test_report_lib.generate_report(
                 "Foo",

.github/workflows/commit-access-review.py

@@ -266,7 +266,7 @@ def count_prs(gh: github.Github, triage_list: dict, start_date: datetime.datetim
 
 def main():
     token = sys.argv[1]
-    gh = github.Github(login_or_token=token)
+    gh = github.Github(auth=github.Auth.Token(token))
     org = gh.get_organization("llvm")
     repo = org.get_repo("llvm-project")
     one_year_ago = datetime.datetime.now() - datetime.timedelta(days=365)

.github/workflows/containers/github-action-ci-windows/Dockerfile

@@ -39,16 +39,13 @@ RUN regsvr32 /S "C:\BuildTools\DIA SDK\bin\amd64\msdia140.dll" & \
 
 # install tools as described in https://llvm.org/docs/GettingStartedVS.html
 # and a few more that were not documented...
-# Pin an older version of Python; the current Python 3.10 fails when
-# doing "pip install" for the other dependencies, as it fails to find libxml
-# while compiling some package.
 # We version pin the other packages as well to ensure the container build is as
 # reproducible as possible to prevent issues when upgrading only part of the
 # container.
 RUN choco install -y ninja --version 1.13.1 && \
     choco install -y git --version 2.50.1 && \
     choco install -y sccache --version 0.10.0 && \
-    choco install -y python3 --version 3.9.7
+    choco install -y python3 --version 3.12.3
 
 # Testing requires psutil
 RUN pip install psutil

.github/workflows/release-asset-audit.py

@@ -80,7 +80,7 @@ def _write_comment_and_exit_with_error(comment):
 def main():
     token = sys.argv[1]
 
-    gh = github.Github(login_or_token=token)
+    gh = github.Github(auth=github.Auth.Token(token))
     repo = gh.get_repo("llvm/llvm-project")
 
     for release in repo.get_releases():

clang-tools-extra/clang-tidy/.clang-tidy

@@ -15,6 +15,7 @@ Checks: >
   cppcoreguidelines-virtual-class-destructor,
   google-readability-casting,
   misc-const-correctness,
+  misc-include-cleaner,
   modernize-*,
   -modernize-avoid-c-arrays,
   -modernize-pass-by-value,
@@ -42,3 +43,5 @@ Checks: >
 CheckOptions:
   - key:             performance-move-const-arg.CheckTriviallyCopyableMove
     value:           false
+  - key:             misc-include-cleaner.MissingIncludes
+    value:           false

clang-tools-extra/clang-tidy/ClangTidy.cpp

@@ -33,7 +33,7 @@
 #include "clang/Lex/PreprocessorOptions.h"
 #include "clang/Rewrite/Frontend/FixItRewriter.h"
 #include "clang/Tooling/Core/Diagnostic.h"
-#include "clang/Tooling/DiagnosticsYaml.h"
+#include "clang/Tooling/DiagnosticsYaml.h" // IWYU pragma: keep
 #include "clang/Tooling/Refactoring.h"
 #include "clang/Tooling/Tooling.h"
 #include "llvm/Support/Process.h"
@@ -586,6 +586,24 @@ runClangTidy(clang::tidy::ClangTidyContext &Context,
         return AdjustedArgs;
       };
 
+  // Remove unwanted arguments passed to the compiler
+  const ArgumentsAdjuster PerFileArgumentRemover =
+      [&Context](const CommandLineArguments &Args, StringRef Filename) {
+        ClangTidyOptions Opts = Context.getOptionsForFile(Filename);
+        CommandLineArguments AdjustedArgs = Args;
+
+        if (Opts.RemovedArgs) {
+          for (const StringRef ArgToRemove : *Opts.RemovedArgs) {
+            AdjustedArgs.erase(std::remove(AdjustedArgs.begin(),
+                                           AdjustedArgs.end(), ArgToRemove),
+                               AdjustedArgs.end());
+          }
+        }
+
+        return AdjustedArgs;
+      };
+
+  Tool.appendArgumentsAdjuster(PerFileArgumentRemover);
   Tool.appendArgumentsAdjuster(PerFileExtraArgumentsInserter);
   Tool.appendArgumentsAdjuster(getStripPluginsAdjuster());
   Context.setEnableProfiling(EnableCheckProfile);

clang-tools-extra/clang-tidy/ClangTidyForceLinker.h

@@ -1,4 +1,4 @@
-//===- ClangTidyForceLinker.h - clang-tidy --------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -10,7 +10,6 @@
 #define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_CLANGTIDYFORCELINKER_H
 
 #include "clang-tidy-config.h"
-#include "llvm/Support/Compiler.h"
 
 namespace clang::tidy {
 

clang-tools-extra/clang-tidy/ClangTidyModule.cpp

@@ -23,9 +23,9 @@ void ClangTidyCheckFactories::registerCheckFactory(StringRef Name,
 std::vector<std::unique_ptr<ClangTidyCheck>>
 ClangTidyCheckFactories::createChecks(ClangTidyContext *Context) const {
   std::vector<std::unique_ptr<ClangTidyCheck>> Checks;
-  for (const auto &Factory : Factories) {
-    if (Context->isCheckEnabled(Factory.getKey()))
-      Checks.emplace_back(Factory.getValue()(Factory.getKey(), Context));
+  for (const auto &[CheckName, Factory] : Factories) {
+    if (Context->isCheckEnabled(CheckName))
+      Checks.emplace_back(Factory(CheckName, Context));
   }
   return Checks;
 }
@@ -35,11 +35,10 @@ ClangTidyCheckFactories::createChecksForLanguage(
     ClangTidyContext *Context) const {
   std::vector<std::unique_ptr<ClangTidyCheck>> Checks;
   const LangOptions &LO = Context->getLangOpts();
-  for (const auto &Factory : Factories) {
-    if (!Context->isCheckEnabled(Factory.getKey()))
+  for (const auto &[CheckName, Factory] : Factories) {
+    if (!Context->isCheckEnabled(CheckName))
       continue;
-    std::unique_ptr<ClangTidyCheck> Check =
-        Factory.getValue()(Factory.getKey(), Context);
+    std::unique_ptr<ClangTidyCheck> Check = Factory(CheckName, Context);
     if (Check->isLanguageVersionSupported(LO))
       Checks.push_back(std::move(Check));
   }

clang-tools-extra/clang-tidy/ClangTidyOptions.cpp

@@ -232,6 +232,7 @@ template <> struct MappingTraits<ClangTidyOptions> {
     IO.mapOptional("CheckOptions", Options.CheckOptions);
     IO.mapOptional("ExtraArgs", Options.ExtraArgs);
     IO.mapOptional("ExtraArgsBefore", Options.ExtraArgsBefore);
+    IO.mapOptional("RemovedArgs", Options.RemovedArgs);
     IO.mapOptional("InheritParentConfig", Options.InheritParentConfig);
     IO.mapOptional("UseColor", Options.UseColor);
     IO.mapOptional("SystemHeaders", Options.SystemHeaders);
@@ -254,6 +255,7 @@ ClangTidyOptions ClangTidyOptions::getDefaults() {
   Options.SystemHeaders = false;
   Options.FormatStyle = "none";
   Options.User = std::nullopt;
+  Options.RemovedArgs = std::nullopt;
   for (const ClangTidyModuleRegistry::entry &Module :
        ClangTidyModuleRegistry::entries())
     Options.mergeWith(Module.instantiate()->getModuleOptions(), 0);
@@ -297,6 +299,7 @@ ClangTidyOptions &ClangTidyOptions::mergeWith(const ClangTidyOptions &Other,
   overrideValue(UseColor, Other.UseColor);
   mergeVectors(ExtraArgs, Other.ExtraArgs);
   mergeVectors(ExtraArgsBefore, Other.ExtraArgsBefore);
+  mergeVectors(RemovedArgs, Other.RemovedArgs);
   // FIXME: how to handle duplicate names check?
   mergeVectors(CustomChecks, Other.CustomChecks);
   for (const auto &KeyValue : Other.CheckOptions) {