Merge from 'main' to 'sycl-web' (93 commits)

  CONFLICT (content): Merge conflict in clang/lib/Sema/SemaType.cpp

Author: fineg74

.github/workflows/docs.yml

@@ -20,6 +20,7 @@ on:
       - 'libunwind/docs/**'
       - 'libcxx/docs/**'
       - 'libc/docs/**'
+      - 'lld/docs/**'
   pull_request:
     paths:
       - 'llvm/docs/**'
@@ -29,6 +30,7 @@ on:
       - 'libunwind/docs/**'
       - 'libcxx/docs/**'
       - 'libc/docs/**'
+      - 'lld/docs/**'
 
 jobs:
   check-docs-build:
@@ -63,6 +65,8 @@ jobs:
               - 'libcxx/docs/**'
             libc:
               - 'libc/docs/**'
+            lld:
+              - 'lld/docs/**'
       - name: Fetch LLVM sources (PR)
         if: ${{ github.event_name == 'pull_request' }}
         uses: actions/checkout@v4
@@ -116,4 +120,9 @@ jobs:
         run: |
           cmake -B libc-build -GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_RUNTIMES="libc" -DLLVM_ENABLE_SPHINX=ON ./runtimes
           TZ=UTC ninja -C docs-libc-html
+      - name: Build LLD docs
+        if: steps.docs-changed-subprojects.outputs.lld_any_changed == 'true'
+        run: |
+          cmake -B lld-build -GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS="lld" -DLLVM_ENABLE_SPHINX=ON ./llvm
+          TZ=UTC ninja -C lld-build docs-lld-html
 

clang-tools-extra/clang-tidy/bugprone/DanglingHandleCheck.cpp

@@ -33,14 +33,20 @@ handleFrom(const ast_matchers::internal::Matcher<RecordDecl> &IsAHandle,
 
 ast_matchers::internal::Matcher<Stmt> handleFromTemporaryValue(
     const ast_matchers::internal::Matcher<RecordDecl> &IsAHandle) {
+
+  const auto TemporaryExpr = anyOf(
+      cxxBindTemporaryExpr(),
+      cxxFunctionalCastExpr(
+          hasCastKind(CK_ConstructorConversion),
+          hasSourceExpression(ignoringParenImpCasts(cxxBindTemporaryExpr()))));
   // If a ternary operator returns a temporary value, then both branches hold a
   // temporary value. If one of them is not a temporary then it must be copied
   // into one to satisfy the type of the operator.
   const auto TemporaryTernary = conditionalOperator(
-      hasTrueExpression(ignoringParenImpCasts(cxxBindTemporaryExpr())),
-      hasFalseExpression(ignoringParenImpCasts(cxxBindTemporaryExpr())));
+      hasTrueExpression(ignoringParenImpCasts(TemporaryExpr)),
+      hasFalseExpression(ignoringParenImpCasts(TemporaryExpr)));
 
-  return handleFrom(IsAHandle, anyOf(cxxBindTemporaryExpr(), TemporaryTernary));
+  return handleFrom(IsAHandle, anyOf(TemporaryExpr, TemporaryTernary));
 }
 
 ast_matchers::internal::Matcher<RecordDecl> isASequence() {

clang-tools-extra/clang-tidy/cppcoreguidelines/NarrowingConversionsCheck.cpp

@@ -14,6 +14,7 @@
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "llvm/ADT/APSInt.h"
+#include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/SmallVector.h"
 
@@ -23,6 +24,26 @@ using namespace clang::ast_matchers;
 
 namespace clang::tidy::cppcoreguidelines {
 
+namespace {
+
+AST_MATCHER_P(QualType, hasAnyType, std::vector<StringRef>, Names) {
+  if (Names.empty())
+    return false;
+
+  std::string Name = Node.getLocalUnqualifiedType().getAsString();
+  return llvm::any_of(Names, [&Name](StringRef Ref) { return Ref == Name; });
+}
+
+AST_MATCHER(FieldDecl, hasIntBitwidth) {
+  assert(Node.isBitField());
+  const ASTContext &Ctx = Node.getASTContext();
+  unsigned IntBitWidth = Ctx.getIntWidth(Ctx.IntTy);
+  unsigned CurrentBitWidth = Node.getBitWidthValue(Ctx);
+  return IntBitWidth == CurrentBitWidth;
+}
+
+} // namespace
+
 NarrowingConversionsCheck::NarrowingConversionsCheck(StringRef Name,
                                                      ClangTidyContext *Context)
     : ClangTidyCheck(Name, Context),
@@ -53,25 +74,22 @@ void NarrowingConversionsCheck::storeOptions(
   Options.store(Opts, "PedanticMode", PedanticMode);
 }
 
-AST_MATCHER(FieldDecl, hasIntBitwidth) {
-  assert(Node.isBitField());
-  const ASTContext &Ctx = Node.getASTContext();
-  unsigned IntBitWidth = Ctx.getIntWidth(Ctx.IntTy);
-  unsigned CurrentBitWidth = Node.getBitWidthValue(Ctx);
-  return IntBitWidth == CurrentBitWidth;
-}
-
 void NarrowingConversionsCheck::registerMatchers(MatchFinder *Finder) {
   // ceil() and floor() are guaranteed to return integers, even though the type
   // is not integral.
   const auto IsCeilFloorCallExpr = expr(callExpr(callee(functionDecl(
       hasAnyName("::ceil", "::std::ceil", "::floor", "::std::floor")))));
 
+  std::vector<StringRef> IgnoreConversionFromTypesVec =
+      utils::options::parseStringList(IgnoreConversionFromTypes);
+
   // We may want to exclude other types from the checks, such as `size_type`
   // and `difference_type`. These are often used to count elements, represented
   // in 64 bits and assigned to `int`. Rarely are people counting >2B elements.
-  const auto IsConversionFromIgnoredType = hasType(namedDecl(
-      hasAnyName(utils::options::parseStringList(IgnoreConversionFromTypes))));
+  const auto IsConversionFromIgnoredType =
+      anyOf(hasType(namedDecl(hasAnyName(IgnoreConversionFromTypesVec))),
+            allOf(unless(hasType(namedDecl())),
+                  hasType(qualType(hasAnyType(IgnoreConversionFromTypesVec)))));
 
   // `IsConversionFromIgnoredType` will ignore narrowing calls from those types,
   // but not expressions that are promoted to an ignored type as a result of a

clang-tools-extra/clang-tidy/cppcoreguidelines/PreferMemberInitializerCheck.cpp

@@ -178,140 +178,140 @@ void PreferMemberInitializerCheck::check(
     const FieldDecl *Field = nullptr;
     const Expr *InitValue = nullptr;
     std::tie(Field, InitValue) = isAssignmentToMemberOf(Class, S, Ctor);
-    if (Field) {
-      if (IsUseDefaultMemberInitEnabled && getLangOpts().CPlusPlus11 &&
-          Ctor->isDefaultConstructor() &&
-          (getLangOpts().CPlusPlus20 || !Field->isBitField()) &&
-          !Field->hasInClassInitializer() &&
-          (!isa<RecordDecl>(Class->getDeclContext()) ||
-           !cast<RecordDecl>(Class->getDeclContext())->isUnion()) &&
-          shouldBeDefaultMemberInitializer(InitValue)) {
-
-        bool InvalidFix = false;
-        SourceLocation FieldEnd =
-            Lexer::getLocForEndOfToken(Field->getSourceRange().getEnd(), 0,
-                                       *Result.SourceManager, getLangOpts());
-        InvalidFix |= FieldEnd.isInvalid() || FieldEnd.isMacroID();
-        SourceLocation SemiColonEnd;
-        if (auto NextToken = Lexer::findNextToken(
-                S->getEndLoc(), *Result.SourceManager, getLangOpts()))
-          SemiColonEnd = NextToken->getEndLoc();
-        else
-          InvalidFix = true;
-        auto Diag =
-            diag(S->getBeginLoc(), "%0 should be initialized in an in-class"
-                                   " default member initializer")
-            << Field;
-        if (InvalidFix)
+    if (!Field)
+      continue;
+    const bool IsInDefaultMemberInitializer =
+        IsUseDefaultMemberInitEnabled && getLangOpts().CPlusPlus11 &&
+        Ctor->isDefaultConstructor() &&
+        (getLangOpts().CPlusPlus20 || !Field->isBitField()) &&
+        !Field->hasInClassInitializer() &&
+        (!isa<RecordDecl>(Class->getDeclContext()) ||
+         !cast<RecordDecl>(Class->getDeclContext())->isUnion()) &&
+        shouldBeDefaultMemberInitializer(InitValue);
+    if (IsInDefaultMemberInitializer) {
+      bool InvalidFix = false;
+      SourceLocation FieldEnd =
+          Lexer::getLocForEndOfToken(Field->getSourceRange().getEnd(), 0,
+                                     *Result.SourceManager, getLangOpts());
+      InvalidFix |= FieldEnd.isInvalid() || FieldEnd.isMacroID();
+      SourceLocation SemiColonEnd;
+      if (auto NextToken = Lexer::findNextToken(
+              S->getEndLoc(), *Result.SourceManager, getLangOpts()))
+        SemiColonEnd = NextToken->getEndLoc();
+      else
+        InvalidFix = true;
+      auto Diag =
+          diag(S->getBeginLoc(), "%0 should be initialized in an in-class"
+                                 " default member initializer")
+          << Field;
+      if (InvalidFix)
+        continue;
+      CharSourceRange StmtRange =
+          CharSourceRange::getCharRange(S->getBeginLoc(), SemiColonEnd);
+
+      SmallString<128> Insertion(
+          {UseAssignment ? " = " : "{",
+           Lexer::getSourceText(
+               CharSourceRange(InitValue->getSourceRange(), true),
+               *Result.SourceManager, getLangOpts()),
+           UseAssignment ? "" : "}"});
+
+      Diag << FixItHint::CreateInsertion(FieldEnd, Insertion)
+           << FixItHint::CreateRemoval(StmtRange);
+
+    } else {
+      StringRef InsertPrefix = "";
+      bool HasInitAlready = false;
+      SourceLocation InsertPos;
+      SourceRange ReplaceRange;
+      bool AddComma = false;
+      bool InvalidFix = false;
+      unsigned Index = Field->getFieldIndex();
+      const CXXCtorInitializer *LastInListInit = nullptr;
+      for (const CXXCtorInitializer *Init : Ctor->inits()) {
+        if (!Init->isWritten() || Init->isInClassMemberInitializer())
           continue;
-        CharSourceRange StmtRange =
-            CharSourceRange::getCharRange(S->getBeginLoc(), SemiColonEnd);
-
-        SmallString<128> Insertion(
-            {UseAssignment ? " = " : "{",
-             Lexer::getSourceText(
-                 CharSourceRange(InitValue->getSourceRange(), true),
-                 *Result.SourceManager, getLangOpts()),
-             UseAssignment ? "" : "}"});
-
-        Diag << FixItHint::CreateInsertion(FieldEnd, Insertion)
-             << FixItHint::CreateRemoval(StmtRange);
-
-      } else {
-        StringRef InsertPrefix = "";
-        bool HasInitAlready = false;
-        SourceLocation InsertPos;
-        SourceRange ReplaceRange;
-        bool AddComma = false;
-        bool InvalidFix = false;
-        unsigned Index = Field->getFieldIndex();
-        const CXXCtorInitializer *LastInListInit = nullptr;
-        for (const CXXCtorInitializer *Init : Ctor->inits()) {
-          if (!Init->isWritten() || Init->isInClassMemberInitializer())
-            continue;
-          if (Init->getMember() == Field) {
-            HasInitAlready = true;
-            if (isa<ImplicitValueInitExpr>(Init->getInit()))
-              InsertPos = Init->getRParenLoc();
-            else {
-              ReplaceRange = Init->getInit()->getSourceRange();
-            }
-            break;
-          }
-          if (Init->isMemberInitializer() &&
-              Index < Init->getMember()->getFieldIndex()) {
-            InsertPos = Init->getSourceLocation();
-            // There are initializers after the one we are inserting, so add a
-            // comma after this insertion in order to not break anything.
-            AddComma = true;
-            break;
+        if (Init->getMember() == Field) {
+          HasInitAlready = true;
+          if (isa<ImplicitValueInitExpr>(Init->getInit()))
+            InsertPos = Init->getRParenLoc();
+          else {
+            ReplaceRange = Init->getInit()->getSourceRange();
           }
-          LastInListInit = Init;
+          break;
         }
-        if (HasInitAlready) {
-          if (InsertPos.isValid())
-            InvalidFix |= InsertPos.isMacroID();
-          else
-            InvalidFix |= ReplaceRange.getBegin().isMacroID() ||
-                          ReplaceRange.getEnd().isMacroID();
-        } else {
-          if (InsertPos.isInvalid()) {
-            if (LastInListInit) {
-              InsertPos = Lexer::getLocForEndOfToken(
-                  LastInListInit->getRParenLoc(), 0, *Result.SourceManager,
-                  getLangOpts());
-              // Inserting after the last constructor initializer, so we need a
-              // comma.
-              InsertPrefix = ", ";
-            } else {
-              InsertPos = Lexer::getLocForEndOfToken(
-                  Ctor->getTypeSourceInfo()
-                      ->getTypeLoc()
-                      .getAs<clang::FunctionTypeLoc>()
-                      .getLocalRangeEnd(),
-                  0, *Result.SourceManager, getLangOpts());
-
-              // If this is first time in the loop, there are no initializers so
-              // `:` declares member initialization list. If this is a
-              // subsequent pass then we have already inserted a `:` so continue
-              // with a comma.
-              InsertPrefix = FirstToCtorInits ? " : " : ", ";
-            }
-          }
+        if (Init->isMemberInitializer() &&
+            Index < Init->getMember()->getFieldIndex()) {
+          InsertPos = Init->getSourceLocation();
+          // There are initializers after the one we are inserting, so add a
+          // comma after this insertion in order to not break anything.
+          AddComma = true;
+          break;
+        }
+        LastInListInit = Init;
+      }
+      if (HasInitAlready) {
+        if (InsertPos.isValid())
           InvalidFix |= InsertPos.isMacroID();
+        else
+          InvalidFix |= ReplaceRange.getBegin().isMacroID() ||
+                        ReplaceRange.getEnd().isMacroID();
+      } else {
+        if (InsertPos.isInvalid()) {
+          if (LastInListInit) {
+            InsertPos = Lexer::getLocForEndOfToken(
+                LastInListInit->getRParenLoc(), 0, *Result.SourceManager,
+                getLangOpts());
+            // Inserting after the last constructor initializer, so we need a
+            // comma.
+            InsertPrefix = ", ";
+          } else {
+            InsertPos = Lexer::getLocForEndOfToken(
+                Ctor->getTypeSourceInfo()
+                    ->getTypeLoc()
+                    .getAs<clang::FunctionTypeLoc>()
+                    .getLocalRangeEnd(),
+                0, *Result.SourceManager, getLangOpts());
+
+            // If this is first time in the loop, there are no initializers so
+            // `:` declares member initialization list. If this is a
+            // subsequent pass then we have already inserted a `:` so continue
+            // with a comma.
+            InsertPrefix = FirstToCtorInits ? " : " : ", ";
+          }
         }
+        InvalidFix |= InsertPos.isMacroID();
+      }
 
-        SourceLocation SemiColonEnd;
-        if (auto NextToken = Lexer::findNextToken(
-                S->getEndLoc(), *Result.SourceManager, getLangOpts()))
-          SemiColonEnd = NextToken->getEndLoc();
+      SourceLocation SemiColonEnd;
+      if (auto NextToken = Lexer::findNextToken(
+              S->getEndLoc(), *Result.SourceManager, getLangOpts()))
+        SemiColonEnd = NextToken->getEndLoc();
+      else
+        InvalidFix = true;
+
+      auto Diag = diag(S->getBeginLoc(), "%0 should be initialized in a member"
+                                         " initializer of the constructor")
+                  << Field;
+      if (InvalidFix)
+        continue;
+      StringRef NewInit = Lexer::getSourceText(
+          CharSourceRange(InitValue->getSourceRange(), true),
+          *Result.SourceManager, getLangOpts());
+      if (HasInitAlready) {
+        if (InsertPos.isValid())
+          Diag << FixItHint::CreateInsertion(InsertPos, NewInit);
         else
-          InvalidFix = true;
-
-        auto Diag =
-            diag(S->getBeginLoc(), "%0 should be initialized in a member"
-                                   " initializer of the constructor")
-            << Field;
-        if (InvalidFix)
-          continue;
-        StringRef NewInit = Lexer::getSourceText(
-            CharSourceRange(InitValue->getSourceRange(), true),
-            *Result.SourceManager, getLangOpts());
-        if (HasInitAlready) {
-          if (InsertPos.isValid())
-            Diag << FixItHint::CreateInsertion(InsertPos, NewInit);
-          else
-            Diag << FixItHint::CreateReplacement(ReplaceRange, NewInit);
-        } else {
-          SmallString<128> Insertion({InsertPrefix, Field->getName(), "(",
-                                      NewInit, AddComma ? "), " : ")"});
-          Diag << FixItHint::CreateInsertion(InsertPos, Insertion,
-                                             FirstToCtorInits);
-          FirstToCtorInits = areDiagsSelfContained();
-        }
-        Diag << FixItHint::CreateRemoval(
-            CharSourceRange::getCharRange(S->getBeginLoc(), SemiColonEnd));
+          Diag << FixItHint::CreateReplacement(ReplaceRange, NewInit);
+      } else {
+        SmallString<128> Insertion({InsertPrefix, Field->getName(), "(",
+                                    NewInit, AddComma ? "), " : ")"});
+        Diag << FixItHint::CreateInsertion(InsertPos, Insertion,
+                                           FirstToCtorInits);
+        FirstToCtorInits = areDiagsSelfContained();
       }
+      Diag << FixItHint::CreateRemoval(
+          CharSourceRange::getCharRange(S->getBeginLoc(), SemiColonEnd));
     }
   }
 }