Merge pull request #77212 from bnbarham/2024-rebranch-to-main

Update LLVM to stable/20240723

Author: azharudd

include/swift/AST/PluginRegistry.h

@@ -87,7 +87,7 @@ class CompilerPlugin {
 
   /// Remove "on reconnect" callback.
   void removeOnReconnect(std::function<void(void)> *fn) {
-    llvm::erase_value(onReconnect, fn);
+    llvm::erase(onReconnect, fn);
   }
 
   ArrayRef<std::function<void(void)> *> getOnReconnectCallbacks() {

include/swift/Basic/ExponentialGrowthAppendingBinaryByteStream.h

@@ -23,6 +23,7 @@
 #include "swift/Basic/LLVM.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/Support/BinaryByteStream.h"
+#include "llvm/Support/Endian.h"
 
 namespace swift {
 
@@ -34,13 +35,14 @@ class ExponentialGrowthAppendingBinaryByteStream
   SmallVector<uint8_t, 0> Data;
 
   /// Data in the stream is always encoded in little-endian byte order.
-  const llvm::support::endianness Endian = llvm::support::endianness::little;
+  const llvm::endianness Endian = llvm::endianness::little;
+
 public:
   ExponentialGrowthAppendingBinaryByteStream() = default;
 
   void reserve(size_t Size);
 
-  llvm::support::endianness getEndian() const override { return Endian; }
+  llvm::endianness getEndian() const override { return Endian; }
 
   llvm::Error readBytes(uint64_t Offset, uint64_t Size,
                         ArrayRef<uint8_t> &Buffer) override;

include/swift/Basic/StableHasher.h

@@ -133,7 +133,7 @@ class StableHasher final {
       return setBufferLength(bufLen + N);
     }
 
-    constexpr auto endian = llvm::support::endianness::little;
+    constexpr auto endian = llvm::endianness::little;
     compress(llvm::support::endian::read<uint64_t>(byteBuffer, endian));
 
     // Now reseed the buffer with the remaining bytes.
@@ -146,7 +146,7 @@ class StableHasher final {
       typename T,
       typename std::enable_if<std::is_integral<T>::value>::type * = nullptr>
   void combine(T bits) {
-    constexpr auto endian = llvm::support::endianness::little;
+    constexpr auto endian = llvm::endianness::little;
     uint8_t buf[sizeof(T)] = {0};
     bits = llvm::support::endian::byte_swap<T>(bits, endian);
     std::memcpy(buf, &bits, sizeof(T));

include/swift/ClangImporter/ClangModule.h

@@ -20,6 +20,7 @@
 #include "swift/Basic/Version.h"
 #include "swift/ClangImporter/ClangImporter.h"
 #include "clang/AST/ExternalASTSource.h"
+#include "clang/Basic/ASTSourceDescriptor.h"
 #include "clang/Basic/Module.h"
 
 namespace clang {

include/swift/ClangImporter/SwiftAbstractBasicReader.h

@@ -72,7 +72,7 @@ class DataStreamBasicReader
       return clang::Selector();
 
     unsigned numArgs = unsigned(numArgsPlusOne - 1);
-    SmallVector<clang::IdentifierInfo *, 4> chunks;
+    SmallVector<const clang::IdentifierInfo *, 4> chunks;
     for (unsigned i = 0, e = std::max(numArgs, 1U); i != e; ++i)
       chunks.push_back(asImpl().readIdentifier());
 
@@ -94,6 +94,11 @@ class DataStreamBasicReader
     llvm::report_fatal_error("Read BTFTypeTagAttr that should never have been"
                              " serialized");
   }
+
+  template<typename T>
+  T *readDeclAs() {
+    return asImpl().template readDeclAs<T>();
+  }
 };
 
 }

include/swift/DependencyScan/ModuleDependencyScanner.h

@@ -149,7 +149,7 @@ class ModuleDependencyScanner {
   /// The available pool of workers for filesystem module search
   unsigned NumThreads;
   std::list<std::unique_ptr<ModuleDependencyScanningWorker>> Workers;
-  llvm::ThreadPool ScanningThreadPool;
+  llvm::StdThreadPool ScanningThreadPool;
   /// Protect worker access.
   std::mutex WorkersLock;
 };

include/swift/Localization/LocalizationFormat.h

@@ -40,8 +40,6 @@ enum class DiagID : uint32_t;
 
 namespace diag {
 
-using namespace llvm::support;
-
 enum LocalizationProducerState : uint8_t {
   NotInitialized,
   Initialized,
@@ -77,14 +75,15 @@ class LocalizationWriterInfo {
                                                         key_type_ref key,
                                                         data_type_ref data) {
     offset_type dataLength = static_cast<offset_type>(data.size());
-    endian::write<offset_type>(out, dataLength, little);
+    llvm::support::endian::write<offset_type>(out, dataLength,
+                                              llvm::endianness::little);
     // No need to write the key length; it's constant.
     return {sizeof(key_type), dataLength};
   }
 
   void EmitKey(llvm::raw_ostream &out, key_type_ref key, unsigned len) {
     assert(len == sizeof(key_type));
-    endian::write<key_type>(out, key, little);
+    llvm::support::endian::write<key_type>(out, key, llvm::endianness::little);
   }
 
   void EmitData(llvm::raw_ostream &out, key_type_ref key, data_type_ref data,
@@ -118,12 +117,15 @@ class LocalizationReaderInfo {
   static std::pair<offset_type, offset_type>
   ReadKeyDataLength(const unsigned char *&data) {
     offset_type dataLength =
-        endian::readNext<offset_type, little, unaligned>(data);
+        llvm::support::endian::readNext<offset_type, llvm::endianness::little,
+                                        llvm::support::unaligned>(data);
     return {sizeof(uint32_t), dataLength};
   }
 
   internal_key_type ReadKey(const unsigned char *data, offset_type length) {
-    return endian::readNext<internal_key_type, little, unaligned>(data);
+    return llvm::support::endian::readNext<
+        internal_key_type, llvm::endianness::little, llvm::support::unaligned>(
+        data);
   }
 
   data_type ReadData(internal_key_type Key, const unsigned char *data,

include/swift/Option/Options.h

@@ -13,13 +13,9 @@
 #ifndef SWIFT_OPTION_OPTIONS_H
 #define SWIFT_OPTION_OPTIONS_H
 
-#include <memory>
+#include "llvm/Option/OptTable.h"
 
-namespace llvm {
-namespace opt {
-  class OptTable;
-}
-}
+#include <memory>
 
 namespace swift {
 namespace options {
@@ -47,9 +43,7 @@ namespace options {
 
   enum ID {
     OPT_INVALID = 0, // This is not an option ID.
-#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
-               HELPTEXT, METAVAR, VALUES)                                      \
-    OPT_##ID,
+#define OPTION(...) LLVM_MAKE_OPT_ID(__VA_ARGS__),
 #include "swift/Option/Options.inc"
     LastOption
 #undef OPTION

include/swift/SIL/SILInstruction.h

@@ -59,7 +59,7 @@ namespace ilist_detail {
 ///
 /// We need a custom base class to not clear the prev/next pointers when
 /// removing an instruction from the list.
-class SILInstructionListBase : public ilist_base<false> {
+class SILInstructionListBase : public ilist_base<false, void> {
 public:
   /// Remove an instruction from the list.
   ///
@@ -95,8 +95,10 @@ template <> struct compute_node_options<::swift::SILInstruction> {
 
     static const bool enable_sentinel_tracking = false;
     static const bool is_sentinel_tracking_explicit = false;
+    static const bool has_iterator_bits = false;
     typedef void tag;
-    typedef ilist_node_base<enable_sentinel_tracking> node_base_type;
+    typedef void parent_ty;
+    typedef ilist_node_base<enable_sentinel_tracking, void> node_base_type;
     typedef SILInstructionListBase list_base_type;
   };
 };

lib/AST/ASTMangler.cpp

@@ -3075,7 +3075,7 @@ void ASTMangler::appendClangType(FnType *fn, llvm::raw_svector_ostream &out) {
       fn->getASTContext().getClangModuleLoader()->getClangASTContext();
   std::unique_ptr<clang::ItaniumMangleContext> mangler{
       clang::ItaniumMangleContext::create(clangCtx, clangCtx.getDiagnostics())};
-  mangler->mangleTypeName(clang::QualType(clangType, 0), scratchOS);
+  mangler->mangleCanonicalTypeName(clang::QualType(clangType, 0), scratchOS);
   out << scratchOS.str().size() << scratchOS.str();
 }