Merge pull request #60531 from apple/pull-request-rebranch

Merge `rebranch` into  `main` to support llvm-project `stable/20220421`

Author: shahmishal

include/swift/ABI/Metadata.h

@@ -429,8 +429,7 @@ struct TargetMetadata {
 #endif
 
 #ifndef NDEBUG
-  LLVM_ATTRIBUTE_DEPRECATED(void dump() const,
-                            "Only meant for use in the debugger");
+  [[deprecated("Only meant for use in the debugger")]] void dump() const;
 #endif
 
 protected:
@@ -2710,8 +2709,7 @@ struct TargetContextDescriptor {
   }
 
 #ifndef NDEBUG
-  LLVM_ATTRIBUTE_DEPRECATED(void dump() const,
-                            "only for use in the debugger");
+  [[deprecated("Only meant for use in the debugger")]] void dump() const;
 #endif
 
 private:
@@ -2976,8 +2974,7 @@ struct TargetProtocolDescriptor final
   }
 
 #ifndef NDEBUG
-  LLVM_ATTRIBUTE_DEPRECATED(void dump() const,
-                            "only for use in the debugger");
+  [[deprecated("Only meant for use in the debugger")]] void dump() const;
 #endif
 
   static bool classof(const TargetContextDescriptor<Runtime> *cd) {
@@ -4449,8 +4446,7 @@ class TargetEnumDescriptor final
   }
 
 #ifndef NDEBUG
-  LLVM_ATTRIBUTE_DEPRECATED(void dump() const,
-                            "Only meant for use in the debugger");
+  [[deprecated("Only meant for use in the debugger")]] void dump() const;
 #endif
 };
 

include/swift/ABI/MetadataValues.h

@@ -22,6 +22,7 @@
 #include "swift/ABI/KeyPath.h"
 #include "swift/ABI/ProtocolDispatchStrategy.h"
 #include "swift/AST/Ownership.h"
+#include "swift/Basic/Debug.h"
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/FlagSet.h"
 #include "llvm/ADT/ArrayRef.h"
@@ -531,8 +532,7 @@ class ProtocolDescriptorFlags {
   }
 
 #ifndef NDEBUG
-  LLVM_ATTRIBUTE_DEPRECATED(void dump() const LLVM_ATTRIBUTE_USED,
-                            "Only for use in the debugger");
+  SWIFT_DEBUG_DUMP;
 #endif
 };
 

include/swift/AST/AutoDiff.h

@@ -705,7 +705,7 @@ using swift::SILFunctionType;
 using swift::DifferentiabilityKind;
 using swift::SILDifferentiabilityWitnessKey;
 
-template <typename T> struct DenseMapInfo;
+template <typename T, typename Enable> struct DenseMapInfo;
 
 template <> struct DenseMapInfo<AutoDiffConfig> {
   static AutoDiffConfig getEmptyKey() {

include/swift/AST/Identifier.h

@@ -778,8 +778,7 @@ class DeclNameRef {
   llvm::raw_ostream &printPretty(llvm::raw_ostream &os) const;
 
   /// Dump this name to standard error.
-  LLVM_ATTRIBUTE_DEPRECATED(void dump() const LLVM_ATTRIBUTE_USED,
-                            "only for use within the debugger");
+  SWIFT_DEBUG_DUMP;
 };
 
 inline DeclNameRef DeclNameRef::getFromOpaqueValue(void *p) {

include/swift/Basic/Debug.h

@@ -20,8 +20,7 @@
 /// This deprecates the method so it won't be called directly and marks it as
 /// used so it won't be eliminated as dead code.
 #define SWIFT_DEBUG_HELPER(method) \
-  LLVM_ATTRIBUTE_DEPRECATED(method LLVM_ATTRIBUTE_USED, \
-                            "only for use in the debugger")
+  [[deprecated("only for use in the debugger")]] method LLVM_ATTRIBUTE_USED
 
 /// Declares a const void instance method with the name and parameters provided.
 /// Methods declared with this macro should never be called except in the

include/swift/Basic/LangOptions.h

@@ -535,15 +535,16 @@ namespace swift {
     /// This is only implemented on certain OSs. If no target has been
     /// configured, returns v0.0.0.
     llvm::VersionTuple getMinPlatformVersion() const {
-      unsigned major = 0, minor = 0, revision = 0;
       if (Target.isMacOSX()) {
-        Target.getMacOSXVersion(major, minor, revision);
+        llvm::VersionTuple OSVersion;
+        Target.getMacOSXVersion(OSVersion);
+        return OSVersion;
       } else if (Target.isiOS()) {
-        Target.getiOSVersion(major, minor, revision);
+        return Target.getiOSVersion();
       } else if (Target.isWatchOS()) {
-        Target.getOSVersion(major, minor, revision);
+        return Target.getOSVersion();
       }
-      return llvm::VersionTuple(major, minor, revision);
+      return llvm::VersionTuple(/*Major=*/0, /*Minor=*/0, /*Subminor=*/0);
     }
 
     /// Sets an implicit platform condition.

include/swift/Basic/Located.h

@@ -55,7 +55,7 @@ bool operator ==(const Located<T> &lhs, const Located<T> &rhs) {
 
 namespace llvm {
 
-template <typename T> struct DenseMapInfo;
+template <typename T, typename Enable> struct DenseMapInfo;
 
 template<typename T>
 struct DenseMapInfo<swift::Located<T>> {

include/swift/Basic/SourceLoc.h

@@ -248,7 +248,7 @@ class CharSourceRange {
 } // end namespace swift
 
 namespace llvm {
-template <typename T> struct DenseMapInfo;
+template <typename T, typename Enable> struct DenseMapInfo;
 
 template <> struct DenseMapInfo<swift::SourceLoc> {
   static swift::SourceLoc getEmptyKey() {

include/swift/ClangImporter/SwiftAbstractBasicReader.h

@@ -89,6 +89,11 @@ class DataStreamBasicReader
     clang::QualType type = asImpl().readTypeRef();
     return getASTContext().getQualifiedType(type, quals);
   }
+
+  const clang::BTFTypeTagAttr *readBTFTypeTagAttr() {
+    llvm::report_fatal_error("Read BTFTypeTagAttr that should never have been"
+                             " serialized");
+  }
 };
 
 }

include/swift/ClangImporter/SwiftAbstractBasicWriter.h

@@ -21,6 +21,7 @@
 #define SWIFT_CLANGIMPORTER_SWIFTABSTRACTBASICWRITER_H
 
 #include "clang/AST/AbstractTypeWriter.h"
+#include "clang/AST/Type.h"
 
 namespace swift {
 
@@ -80,11 +81,24 @@ class DataStreamBasicWriter
     assert(!type.isNull());
 
     auto split = type.split();
-    asImpl().writeQualifiers(split.Quals);
+    auto qualifiers = split.Quals;
 
+    // Unwrap BTFTagAttributeType and merge any of its qualifiers.
+    while (auto btfType = dyn_cast<clang::BTFTagAttributedType>(split.Ty)) {
+      split = btfType->getWrappedType().split();
+      qualifiers.addQualifiers(split.Quals);
+    }
+
+    asImpl().writeQualifiers(qualifiers);
     // Just recursively visit the given type.
     asImpl().writeTypeRef(split.Ty);
   }
+
+  void writeBTFTypeTagAttr(const clang::BTFTypeTagAttr *attr) {
+    // BTFTagAttributeType is explicitly unwrapped above, so we should never
+    // hit any of its attributes.
+    llvm::report_fatal_error("Should never hit BTFTypeTagAttr serialization");
+  }
 };
 
 }