Rebase change to latest

Author: cachemeifyoucan

llvm/include/llvm/CAS/BuiltinObjectHasher.h

@@ -67,7 +67,7 @@ template <class HasherT> class BuiltinObjectHasher {
   }
 
   void updateSize(uint64_t Size) {
-    Size = support::endian::byte_swap(Size, support::endianness::little);
+    Size = support::endian::byte_swap(Size, endianness::little);
     Hasher.update(
         ArrayRef(reinterpret_cast<const uint8_t *>(&Size), sizeof(Size)));
   }

llvm/lib/CAS/TreeSchema.cpp

@@ -195,7 +195,7 @@ TreeProxy::Builder::build(ArrayRef<NamedTreeEntry> Entries) {
   Sorted.erase(std::unique(Sorted.begin(), Sorted.end()), Sorted.end());
 
   raw_svector_ostream OS(Data);
-  support::endian::Writer Writer(OS, support::endianness::little);
+  support::endian::Writer Writer(OS, endianness::little);
   // Encode the entires in the Data. The layout of the tree schema object is:
   // * Name offset table: The offset of in the data blob for where to find the
   //   string. It has N + 1 entries and you can find the name of n-th entry at

llvm/lib/CAS/UnifiedOnDiskCache.cpp

@@ -134,7 +134,7 @@ static Error getAllDBDirs(StringRef Path,
     if (DirI->type() != sys::fs::file_type::directory_file)
       continue;
     StringRef SubDir = sys::path::filename(DirI->path());
-    if (!SubDir.startswith(DBDirPrefix))
+    if (!SubDir.starts_with(DBDirPrefix))
       continue;
     uint64_t Order;
     if (SubDir.substr(DBDirPrefix.size()).getAsInteger(10, Order))
@@ -156,7 +156,7 @@ static Error getAllDBDirs(StringRef Path,
 /// \returns Given a sub-directory named 'v<version>.<x>', it outputs the
 /// 'v<version>.<x+1>' name.
 static void getNextDBDirName(StringRef DBDir, llvm::raw_ostream &OS) {
-  assert(DBDir.startswith(DBDirPrefix));
+  assert(DBDir.starts_with(DBDirPrefix));
   uint64_t Count;
   bool Failed = DBDir.substr(DBDirPrefix.size()).getAsInteger(10, Count);
   assert(!Failed);

llvm/tools/libCASPluginTest/libCASPluginTest.cpp

@@ -112,7 +112,7 @@ struct CASWrapper {
   /// Used for testing the \c globally parameter of action cache APIs. Simulates
   /// "uploading"/"downloading" objects from/to the primary on-disk path.
   std::unique_ptr<UnifiedOnDiskCache> UpstreamDB;
-  ThreadPool Pool{llvm::hardware_concurrency()};
+  StdThreadPool Pool{llvm::hardware_concurrency()};
 
   std::mutex Lock{};
 

llvm/unittests/ADT/TrieRawHashMapTest.cpp

@@ -8,6 +8,7 @@
 
 #include "llvm/ADT/TrieRawHashMap.h"
 #include "llvm/ADT/Twine.h"
+#include "llvm/ADT/bit.h"
 #include "llvm/Support/Endian.h"
 #include "llvm/Support/SHA1.h"
 #include "gtest/gtest.h"
@@ -72,7 +73,8 @@ class SimpleTrieHashMapTest : public TrieRawHashMapTestHelper,
 
   // Use the number itself as hash to test the pathological case.
   static HashType hash(uint64_t Num) {
-    uint64_t HashN = llvm::support::endian::byte_swap(Num, llvm::support::big);
+    uint64_t HashN =
+        llvm::support::endian::byte_swap(Num, llvm::endianness::big);
     HashType Hash;
     memcpy(&Hash[0], &HashN, sizeof(HashType));
     return Hash;

llvm/unittests/CAS/ObjectStoreTest.cpp

@@ -330,7 +330,7 @@ static void testBlobsParallel(ObjectStore &Read1, ObjectStore &Read2,
     EXPECT_EQ(Node->getData(), Blobs[I]);
   };
 
-  ThreadPool Threads;
+  StdThreadPool Threads;
   for (unsigned I = 0; I < BlobCount; ++I) {
     Threads.async(Consumer, I, &Read1);
     Threads.async(Consumer, I, &Read2);
@@ -432,15 +432,15 @@ TEST(OnDiskCASTest, DiskSize) {
     std::error_code EC;
     for (sys::fs::directory_iterator I(Temp.path(), EC), E; I != E && !EC;
          I.increment(EC)) {
-      if (StringRef(I->path()).endswith(".index")) {
+      if (StringRef(I->path()).ends_with(".index")) {
         FoundIndex = true;
         ASSERT_TRUE(I->status());
         if (Mapped)
           EXPECT_EQ(I->status()->getSize(), MaxSize);
         else
           EXPECT_LT(I->status()->getSize(), MaxSize);
       }
-      if (StringRef(I->path()).endswith(".data")) {
+      if (StringRef(I->path()).ends_with(".data")) {
         FoundData = true;
         ASSERT_TRUE(I->status());
         if (Mapped)