Merge pull request swiftlang#40907 from apple/rebranch

Update swift:main to support llvm-project:stable/20211026 changes (Rebranch merge)

Author: shahmishal

include/swift/Basic/APIntMap.h

@@ -38,11 +38,11 @@ struct WidthPreservingAPIntDenseMapInfo {
   }
 
   static unsigned getHashValue(const APInt &Key) {
-    return static_cast<unsigned>(hash_value(Key));
+    return llvm::DenseMapInfo<APInt>::getHashValue(Key);
   }
 
   static bool isEqual(const APInt &LHS, const APInt &RHS) {
-    return LHS.getBitWidth() == RHS.getBitWidth() && LHS == RHS;
+    return llvm::DenseMapInfo<APInt>::isEqual(LHS, RHS);
   }
 };
 

include/swift/Basic/ExponentialGrowthAppendingBinaryByteStream.h

@@ -42,29 +42,29 @@ class ExponentialGrowthAppendingBinaryByteStream
 
   llvm::support::endianness getEndian() const override { return Endian; }
 
-  llvm::Error readBytes(uint32_t Offset, uint32_t Size,
+  llvm::Error readBytes(uint64_t Offset, uint64_t Size,
                         ArrayRef<uint8_t> &Buffer) override;
 
-  llvm::Error readLongestContiguousChunk(uint32_t Offset,
+  llvm::Error readLongestContiguousChunk(uint64_t Offset,
                                          ArrayRef<uint8_t> &Buffer) override;
 
   MutableArrayRef<uint8_t> data() { return Data; }
 
-  uint32_t getLength() override { return Data.size(); }
+  uint64_t getLength() override { return Data.size(); }
 
-  llvm::Error writeBytes(uint32_t Offset, ArrayRef<uint8_t> Buffer) override;
+  llvm::Error writeBytes(uint64_t Offset, ArrayRef<uint8_t> Buffer) override;
 
   /// This is an optimized version of \c writeBytes specifically for integers.
   /// Integers are written in little-endian byte order.
   template<typename T>
-  llvm::Error writeInteger(uint32_t Offset, T Value) {
+  llvm::Error writeInteger(uint64_t Offset, T Value) {
     static_assert(std::is_integral<T>::value, "Integer required.");
     if (auto Error = checkOffsetForWrite(Offset, sizeof(T))) {
       return Error;
     }
 
     // Resize the internal buffer if needed.
-    uint32_t RequiredSize = Offset + sizeof(T);
+    uint64_t RequiredSize = Offset + sizeof(T);
     if (RequiredSize > Data.size()) {
       Data.resize(RequiredSize);
     }

include/swift/Basic/ExternalUnion.h

@@ -24,8 +24,9 @@
 
 #include "llvm/Support/ErrorHandling.h"
 #include "swift/Basic/type_traits.h"
+#include <cassert>
+#include <cstdint>
 #include <utility>
-#include <assert.h>
 
 namespace swift {
 

include/swift/Demangling/TypeLookupError.h

@@ -20,7 +20,8 @@
 
 #include "swift/Basic/TaggedUnion.h"
 #include "swift/Runtime/Portability.h"
-#include <string.h>
+#include <cstring>
+#include <string>
 
 namespace swift {
 

lib/AST/Availability.cpp

@@ -506,6 +506,7 @@ ASTContext::getSwift5PlusAvailability(llvm::VersionTuple swiftVersion) {
     default: break;
     }
   }
-  llvm::report_fatal_error("Missing call to getSwiftXYAvailability for Swift " +
-                           swiftVersion.getAsString());
+  llvm::report_fatal_error(
+      Twine("Missing call to getSwiftXYAvailability for Swift ") +
+      swiftVersion.getAsString());
 }

lib/AST/Builtins.cpp

@@ -2208,18 +2208,17 @@ getSwiftFunctionTypeForIntrinsic(llvm::Intrinsic::ID ID,
       return false;
     ArgElts.push_back(ArgTy);
   }
-  
+
   // Translate LLVM function attributes to Swift function attributes.
   IntrinsicInfo II;
   II.ID = ID;
   auto attrs = II.getOrCreateAttributes(Context);
-  if (attrs.hasAttribute(llvm::AttributeList::FunctionIndex,
-                         llvm::Attribute::NoReturn)) {
+  if (attrs.hasFnAttr(llvm::Attribute::NoReturn)) {
     ResultTy = Context.getNeverType();
     if (!ResultTy)
       return false;
   }
-  
+
   return true;
 }
 

lib/Basic/ExponentialGrowthAppendingBinaryByteStream.cpp

@@ -16,7 +16,7 @@ using namespace llvm;
 using namespace swift;
 
 Error ExponentialGrowthAppendingBinaryByteStream::readBytes(
-    uint32_t Offset, uint32_t Size, ArrayRef<uint8_t> &Buffer) {
+    uint64_t Offset, uint64_t Size, ArrayRef<uint8_t> &Buffer) {
   if (auto Error = checkOffsetForRead(Offset, Size)) {
     return Error;
   }
@@ -26,7 +26,7 @@ Error ExponentialGrowthAppendingBinaryByteStream::readBytes(
 }
 
 Error ExponentialGrowthAppendingBinaryByteStream::readLongestContiguousChunk(
-    uint32_t Offset, ArrayRef<uint8_t> &Buffer) {
+    uint64_t Offset, ArrayRef<uint8_t> &Buffer) {
   if (auto Error = checkOffsetForRead(Offset, 0)) {
     return Error;
   }
@@ -40,7 +40,7 @@ void ExponentialGrowthAppendingBinaryByteStream::reserve(size_t Size) {
 }
 
 Error ExponentialGrowthAppendingBinaryByteStream::writeBytes(
-    uint32_t Offset, ArrayRef<uint8_t> Buffer) {
+    uint64_t Offset, ArrayRef<uint8_t> Buffer) {
   if (Buffer.empty())
     return Error::success();
 
@@ -49,7 +49,7 @@ Error ExponentialGrowthAppendingBinaryByteStream::writeBytes(
   }
 
   // Resize the internal buffer if needed.
-  uint32_t RequiredSize = Offset + Buffer.size();
+  uint64_t RequiredSize = Offset + Buffer.size();
   if (RequiredSize > Data.size()) {
     Data.resize(RequiredSize);
   }

lib/ClangImporter/CFTypeInfo.h

@@ -14,9 +14,10 @@
 //
 //===----------------------------------------------------------------------===//
 #ifndef SWIFT_IMPORTER_CFTYPEINFO_H
-#define SWIFT_IMPORTER_CFTYPEINFO_H 
+#define SWIFT_IMPORTER_CFTYPEINFO_H
 
 #include "llvm/ADT/PointerUnion.h"
+#include "llvm/ADT/StringRef.h"
 
 namespace clang {
   class RecordDecl;

lib/ClangImporter/ClangAdapter.cpp

@@ -396,6 +396,7 @@ OmissionTypeName importer::getClangTypeNameForOmission(clang::ASTContext &ctx,
     case clang::BuiltinType::Float16:
     case clang::BuiltinType::Float128:
     case clang::BuiltinType::NullPtr:
+    case clang::BuiltinType::Ibm128:
       return OmissionTypeName();
 
     // Objective-C types that aren't mapped directly; rather, pointers to

lib/ClangImporter/ClangImporter.cpp

@@ -1130,6 +1130,10 @@ ClangImporter::create(ASTContext &ctx,
 
   // Create a compiler instance.
   {
+    // The Clang modules produced by ClangImporter are always embedded in an
+    // ObjectFilePCHContainer and contain -gmodules debug info.
+    importer->Impl.Invocation->getCodeGenOpts().DebugTypeExtRefs = true;
+
     auto PCHContainerOperations =
       std::make_shared<clang::PCHContainerOperations>();
     PCHContainerOperations->registerWriter(