Merge branch 'llvm:main' into gh-101657

Author: Lakshmi-Surekha

clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp

@@ -1092,6 +1092,13 @@ sizeof...($TemplateParameter[[Elements]]);
             $Field_dependentName[[waldo]];
           }
         };
+    )cpp",
+      // Pointer-to-member with nested-name-specifiers
+      R"cpp(
+      struct $Class_def[[Outer]] {
+        struct $Class_def[[Inner]] {};
+      };
+      using $Typedef_decl[[Alias]] = void ($Class[[Outer]]::$Class[[Inner]]:: *)();
     )cpp"};
   for (const auto &TestCase : TestCases)
     // Mask off scope modifiers to keep the tests manageable.

clang-tools-extra/test/clang-tidy/checkers/misc/redundant-expression.cpp

@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s misc-redundant-expression %t -- -- -fno-delayed-template-parsing
+// RUN: %check_clang_tidy %s misc-redundant-expression %t -- -- -fno-delayed-template-parsing -Wno-array-compare-cxx26
 
 typedef __INT64_TYPE__ I64;
 

clang/docs/RealtimeSanitizer.rst

@@ -187,15 +187,15 @@ A **partial** list of flags RealtimeSanitizer respects:
    * - ``abort_on_error``
      - OS dependent
      - boolean
-     - If true, the tool calls abort() instead of _exit() after printing the error report. On some OSes (OSX, for exmple) this is beneficial because a better stack trace is emitted on crash.
+     - If true, the tool calls ``abort()`` instead of ``_exit()`` after printing the error report. On some OSes (MacOS, for exmple) this is beneficial because a better stack trace is emitted on crash.
    * - ``symbolize``
      - ``true``
      - boolean
      - If set, use the symbolizer to turn virtual addresses to file/line locations. If false, can greatly speed up the error reporting.
    * - ``suppressions``
-     - ""
+     - ``""``
      - path
-     - If set to a valid suppressions file, will suppress issue reporting. See details in "Disabling", below.
+     - If set to a valid suppressions file, will suppress issue reporting. See details in `Disabling and Suppressing`_.
 
 
 Some issues with flags can be debugged using the ``verbosity=$NUM`` flag:
@@ -244,6 +244,7 @@ To register a callback which will be invoked before a RTSan kills the process:
     ...
   }
 
+.. _disabling-and-suppressing:
 
 Disabling and suppressing
 -------------------------

clang/docs/ReleaseNotes.rst

@@ -428,6 +428,9 @@ New Compiler Flags
 - The ``-Warray-compare`` warning has been added to warn about array comparison
   on versions older than C++20.
 
+- The ``-Warray-compare-cxx26`` warning has been added to warn about array comparison
+  starting from C++26, this warning is enabled as an error by default.
+
 Deprecated Compiler Flags
 -------------------------
 

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -10274,6 +10274,11 @@ def warn_array_comparison : Warning<
   "to compare array addresses, use unary '+' to decay operands to pointers">,
   InGroup<DiagGroup<"array-compare">>;
 
+def warn_array_comparison_cxx26 : Warning<
+  "comparison between two arrays is ill-formed in C++26; "
+  "to compare array addresses, use unary '+' to decay operands to pointers">,
+  InGroup<DiagGroup<"array-compare-cxx26">>, DefaultError;
+
 def warn_stringcompare : Warning<
   "result of comparison against %select{a string literal|@encode}0 is "
   "unspecified (use an explicit string comparison function instead)">,

clang/lib/CodeGen/BackendUtil.cpp

@@ -789,13 +789,12 @@ static void addSanitizers(const Triple &TargetTriple,
   }
 
   if (LowerAllowCheckPass::IsRequested()) {
-    // We can optimize after inliner, and PGO profile matching. The hook below
-    // is called at the end `buildFunctionSimplificationPipeline`, which called
-    // from `buildInlinerPipeline`, which called after profile matching.
-    PB.registerScalarOptimizerLateEPCallback(
-        [](FunctionPassManager &FPM, OptimizationLevel Level) {
-          FPM.addPass(LowerAllowCheckPass());
-        });
+    // We want to call it after inline, which is about OptimizerEarlyEPCallback.
+    PB.registerOptimizerEarlyEPCallback([](ModulePassManager &MPM,
+                                           OptimizationLevel Level,
+                                           ThinOrFullLTOPhase Phase) {
+      MPM.addPass(createModuleToFunctionPassAdaptor(LowerAllowCheckPass()));
+    });
   }
 }
 

clang/lib/Format/CMakeLists.txt

@@ -48,26 +48,39 @@ foreach(file IN LISTS files)
     COMMENT "Checking format of ${file}"
     )
   list(APPEND check_format_depends check_format_depend_${i})
-
   math(EXPR i ${i}+1)
 endforeach()
-
 add_custom_target(clang-format-check-format DEPENDS ${check_format_depends})
 
-set(style_options_depends ${CMAKE_CURRENT_BINARY_DIR}/dummy_output)
 set(docs_tools_dir ${CLANG_SOURCE_DIR}/docs/tools)
+
+set(format_style_depend ${CMAKE_CURRENT_BINARY_DIR}/format_style_depend)
+set(dump_style dump_format_style.py)
 set(style_options_rst ${CLANG_SOURCE_DIR}/docs/ClangFormatStyleOptions.rst)
-add_custom_command(OUTPUT ${style_options_depends}
-  COMMAND ${Python3_EXECUTABLE} dump_format_style.py &&
-          touch ${style_options_depends}
+add_custom_command(OUTPUT ${format_style_depend}
+  COMMAND ${Python3_EXECUTABLE} ${dump_style} && touch ${format_style_depend}
   WORKING_DIRECTORY ${docs_tools_dir}
   VERBATIM
   COMMENT "Updating ${style_options_rst}"
   DEPENDS ${CLANG_SOURCE_DIR}/include/clang/Format/Format.h
           ${CLANG_SOURCE_DIR}/include/clang/Tooling/Inclusions/IncludeStyle.h
           ${style_options_rst}
           ${docs_tools_dir}/plurals.txt
-          ${docs_tools_dir}/dump_format_style.py
+          ${docs_tools_dir}/${dump_style}
   )
+add_custom_target(clang-format-style DEPENDS ${format_style_depend})
 
-add_custom_target(clang-format-style-options DEPENDS ${style_options_depends})
+set(format_help_depend ${CMAKE_CURRENT_BINARY_DIR}/format_help_depend)
+set(dump_help dump_format_help.py)
+set(clang_format_rst ${CLANG_SOURCE_DIR}/docs/ClangFormat.rst)
+add_custom_command(OUTPUT ${format_help_depend}
+  COMMAND ${Python3_EXECUTABLE} ${dump_help} -d ${CMAKE_BINARY_DIR}/bin &&
+          touch ${format_help_depend}
+  WORKING_DIRECTORY ${docs_tools_dir}
+  VERBATIM
+  COMMENT "Updating ${clang_format_rst}"
+  DEPENDS clang-format
+          ${clang_format_rst}
+          ${docs_tools_dir}/${dump_help}
+  )
+add_custom_target(clang-format-help DEPENDS ${format_help_depend})

clang/lib/Format/TokenAnnotator.cpp

@@ -3901,6 +3901,11 @@ bool TokenAnnotator::mustBreakForReturnType(const AnnotatedLine &Line) const {
 }
 
 void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) const {
+  if (Line.Computed)
+    return;
+
+  Line.Computed = true;
+
   for (AnnotatedLine *ChildLine : Line.Children)
     calculateFormattingInformation(*ChildLine);
 

clang/lib/Format/TokenAnnotator.h

@@ -182,6 +182,9 @@ class AnnotatedLine {
   /// \c True if this line contains a macro call for which an expansion exists.
   bool ContainsMacroCall = false;
 
+  /// \c True if calculateFormattingInformation() has been called on this line.
+  bool Computed = false;
+
   /// \c True if this line should be formatted, i.e. intersects directly or
   /// indirectly with one of the input ranges.
   bool Affected;

clang/lib/Sema/SemaExpr.cpp

@@ -11843,7 +11843,9 @@ static void diagnoseTautologicalComparison(Sema &S, SourceLocation Loc,
       RHSStripped->getType()->isArrayType()) {
     auto IsDeprArrayComparionIgnored =
         S.getDiagnostics().isIgnored(diag::warn_depr_array_comparison, Loc);
-    auto DiagID = !S.getLangOpts().CPlusPlus20 || IsDeprArrayComparionIgnored
+    auto DiagID = S.getLangOpts().CPlusPlus26
+                      ? diag::warn_array_comparison_cxx26
+                  : !S.getLangOpts().CPlusPlus20 || IsDeprArrayComparionIgnored
                       ? diag::warn_array_comparison
                       : diag::warn_depr_array_comparison;
     S.Diag(Loc, DiagID) << LHS->getSourceRange() << RHS->getSourceRange()