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

Author: haonanya1

bolt/include/bolt/Core/BinaryBasicBlock.h

@@ -985,7 +985,7 @@ class BinaryBasicBlock {
 #if defined(LLVM_ON_UNIX)
 /// Keep the size of the BinaryBasicBlock within a reasonable size class
 /// (jemalloc bucket) on Linux
-static_assert(sizeof(BinaryBasicBlock) <= 256, "");
+static_assert(sizeof(BinaryBasicBlock) <= 256);
 #endif
 
 bool operator<(const BinaryBasicBlock &LHS, const BinaryBasicBlock &RHS);

bolt/lib/Core/BinaryFunction.cpp

@@ -4419,12 +4419,14 @@ void BinaryFunction::printLoopInfo(raw_ostream &OS) const {
   OS << "\n";
 
   std::stack<BinaryLoop *> St;
-  for_each(*BLI, [&](BinaryLoop *L) { St.push(L); });
+  for (BinaryLoop *L : *BLI)
+    St.push(L);
   while (!St.empty()) {
     BinaryLoop *L = St.top();
     St.pop();
 
-    for_each(*L, [&](BinaryLoop *Inner) { St.push(Inner); });
+    for (BinaryLoop *Inner : *L)
+      St.push(Inner);
 
     if (!hasValidProfile())
       continue;

bolt/lib/Core/DebugData.cpp

@@ -1183,11 +1183,9 @@ void DebugAbbrevWriter::addUnitAbbreviations(DWARFUnit &Unit) {
       // FIXME: if we had a full access to DWARFDebugAbbrev::AbbrDeclSets
       // we wouldn't have to build our own sorted list for the quick lookup.
       if (AbbrevSetOffsets.empty()) {
-        for_each(
-            *Unit.getContext().getDebugAbbrev(),
-            [&](const std::pair<uint64_t, DWARFAbbreviationDeclarationSet> &P) {
-              AbbrevSetOffsets.push_back(P.first);
-            });
+        for (const std::pair<const uint64_t, DWARFAbbreviationDeclarationSet>
+                 &P : *Unit.getContext().getDebugAbbrev())
+          AbbrevSetOffsets.push_back(P.first);
         sort(AbbrevSetOffsets);
       }
       auto It = upper_bound(AbbrevSetOffsets, StartOffset);

bolt/lib/Core/FunctionLayout.cpp

@@ -151,8 +151,9 @@ void FunctionLayout::eraseBasicBlocks(
   };
   const FragmentListType::iterator EmptyTailBegin =
       llvm::find_if_not(reverse(Fragments), IsEmpty).base();
-  std::for_each(EmptyTailBegin, Fragments.end(),
-                [](FunctionFragment *const FF) { delete FF; });
+  for (FunctionFragment *const FF :
+       llvm::make_range(EmptyTailBegin, Fragments.end()))
+    delete FF;
   Fragments.erase(EmptyTailBegin, Fragments.end());
 
   updateLayoutIndices();
@@ -208,8 +209,8 @@ void FunctionLayout::clear() {
   // be written to the output stream at its original file offset (see
   // `RewriteInstance::rewriteFile`). Hence, when the layout is cleared, retain
   // the main fragment, so that this information is not lost.
-  std::for_each(Fragments.begin() + 1, Fragments.end(),
-                [](FunctionFragment *const FF) { delete FF; });
+  for (FunctionFragment *const FF : llvm::drop_begin(Fragments))
+    delete FF;
   Fragments = FragmentListType{Fragments.front()};
   getMainFragment().Size = 0;
 }

bolt/lib/Passes/FrameOptimizer.cpp

@@ -336,8 +336,8 @@ void FrameOptimizerPass::performShrinkWrapping(const RegAnalysis &RA,
 
   std::vector<std::pair<uint64_t, const BinaryFunction *>> Top10Funcs;
   auto LogFunc = [&](BinaryFunction &BF) {
-    auto Lower = std::lower_bound(
-        Top10Funcs.begin(), Top10Funcs.end(), BF.getKnownExecutionCount(),
+    auto Lower = llvm::lower_bound(
+        Top10Funcs, BF.getKnownExecutionCount(),
         [](const std::pair<uint64_t, const BinaryFunction *> &Elmt,
            uint64_t Value) { return Elmt.first > Value; });
     if (Lower == Top10Funcs.end() && Top10Funcs.size() >= 10)

bolt/lib/Passes/SplitFunctions.cpp

@@ -129,11 +129,11 @@ struct SplitProfile2 {
   }
 
   template <typename It> void partition(const It Start, const It End) const {
-    std::for_each(Start, End, [](BinaryBasicBlock *const BB) {
+    for (BinaryBasicBlock *const BB : llvm::make_range(Start, End)) {
       assert(BB->canOutline() &&
              "Moving a block that is not outlineable to cold fragment");
       BB->setFragmentNum(FragmentNum::cold());
-    });
+    }
   }
 };
 
@@ -155,9 +155,8 @@ struct SplitRandom2 {
     std::uniform_int_distribution<DiffT> Dist(MinimumSplit,
                                               NumOutlineableBlocks);
     const DiffT NumColdBlocks = Dist(*Gen);
-    std::for_each(End - NumColdBlocks, End, [](BinaryBasicBlock *BB) {
+    for (BinaryBasicBlock *BB : llvm::make_range(End - NumColdBlocks, End))
       BB->setFragmentNum(FragmentNum::cold());
-    });
 
     LLVM_DEBUG(dbgs() << formatv("BOLT-DEBUG: randomly chose last {0} (out of "
                                  "{1} possible) blocks to split\n",
@@ -216,11 +215,11 @@ struct SplitAll {
 
   template <typename It> void partition(It Start, It End) const {
     unsigned Fragment = 1;
-    std::for_each(Start, End, [&](BinaryBasicBlock *const BB) {
+    for (BinaryBasicBlock *const BB : llvm::make_range(Start, End)) {
       assert(BB->canOutline() &&
              "Moving a block that is not outlineable to cold fragment");
       BB->setFragmentNum(FragmentNum(Fragment++));
-    });
+    }
   }
 };
 } // namespace

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

@@ -87,9 +87,7 @@ static bool isMaxValAllBitSetLiteral(const EnumDecl *EnumDec) {
 }
 
 static int countNonPowOfTwoLiteralNum(const EnumDecl *EnumDec) {
-  return std::count_if(
-      EnumDec->enumerator_begin(), EnumDec->enumerator_end(),
-      [](const EnumConstantDecl *E) { return isNonPowerOf2NorNullLiteral(E); });
+  return llvm::count_if(EnumDec->enumerators(), isNonPowerOf2NorNullLiteral);
 }
 
 /// Check if there is one or two enumerators that are not a power of 2 and are

clang-tools-extra/clang-tidy/misc/ConfusableIdentifierCheck.cpp

@@ -68,10 +68,9 @@ std::string ConfusableIdentifierCheck::skeleton(StringRef Name) {
     }
 
     StringRef Key(Prev, Curr - Prev);
-    auto Where = std::lower_bound(std::begin(ConfusableEntries),
-                                  std::end(ConfusableEntries), CodePoint,
-                                  [](decltype(ConfusableEntries[0]) x,
-                                     UTF32 y) { return x.codepoint < y; });
+    auto Where = llvm::lower_bound(ConfusableEntries, CodePoint,
+                                   [](decltype(ConfusableEntries[0]) x,
+                                      UTF32 y) { return x.codepoint < y; });
     if (Where == std::end(ConfusableEntries) || CodePoint != Where->codepoint) {
       Skeleton.append(Prev, Curr);
     } else {

clang-tools-extra/clang-tidy/readability/SuspiciousCallArgumentCheck.cpp

@@ -90,7 +90,7 @@ struct AllHeuristicsBoundsWellConfigured {
                                   1>::Value;
 };
 
-static_assert(AllHeuristicsBoundsWellConfigured::Value, "");
+static_assert(AllHeuristicsBoundsWellConfigured::Value);
 } // namespace
 
 static constexpr llvm::StringLiteral DefaultAbbreviations = "addr=address;"

clang-tools-extra/clangd/Quality.cpp

@@ -591,7 +591,7 @@ evaluateDecisionForest(const SymbolQualitySignals &Quality,
 // Produces an integer that sorts in the same order as F.
 // That is: a < b <==> encodeFloat(a) < encodeFloat(b).
 static uint32_t encodeFloat(float F) {
-  static_assert(std::numeric_limits<float>::is_iec559, "");
+  static_assert(std::numeric_limits<float>::is_iec559);
   constexpr uint32_t TopBit = ~(~uint32_t{0} >> 1);
 
   // Get the bits of the float. Endianness is the same as for integers.