swiftlang · shahmishal · Aug 16, 2022 · Jul 13, 2022 · Jul 13, 2022 · Jul 13, 2022
diff --git a/include/swift/ABI/Metadata.h b/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
 };
 

diff --git a/include/swift/ABI/MetadataValues.h b/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
 };
 

@@ -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() {

@@ -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) {

@@ -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

@@ -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.

@@ -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>> {

@@ -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() {

@@ -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");
+  }
 };
 
 }

@@ -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");
+  }
 };
 
 }

@@ -23,8 +23,10 @@
 #include "swift/Demangling/NamespaceMacros.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Compiler.h"
+
 #include <cassert>
 #include <cstdint>
+#include <functional>
 #include <memory>
 #include <string>
 

@@ -68,8 +68,7 @@ struct TargetOpaqueExistentialContainer {
 
   /// Dump information about this specific box and its contents. Only intended
   /// for use in the debugger.
-  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
 };
 using OpaqueExistentialContainer = TargetOpaqueExistentialContainer<InProcess>;

@@ -21,6 +21,7 @@
 
 #include "swift/Basic/SourceManager.h"
 #include "swift/SIL/OptimizationRemark.h"
+#include "llvm/Remarks/Remark.h"
 #include "llvm/Remarks/RemarkStreamer.h"
 
 namespace swift {

@@ -200,8 +200,7 @@ class SILType {
 
 public:
   // FIXME -- Temporary until LLDB adopts getASTType()
-  LLVM_ATTRIBUTE_DEPRECATED(CanType getSwiftRValueType() const,
-                            "Please use getASTType()") {
+  [[deprecated("Please use getASTType()")]] CanType getSwiftRValueType() const {
     return getASTType();
   }
 

@@ -17,6 +17,7 @@
 #ifndef SWIFT_SIL_SILVALUE_H
 #define SWIFT_SIL_SILVALUE_H
 
+#include "swift/Basic/Debug.h"
 #include "swift/Basic/Range.h"
 #include "swift/Basic/ArrayRefView.h"
 #include "swift/Basic/STLExtras.h"
@@ -668,16 +669,15 @@ class SILValue {
   /// NOTE: This is implemented in ValueOwnership.cpp not SILValue.cpp.
   ///
   /// FIXME: remove this redundant API from SILValue.
-  LLVM_ATTRIBUTE_DEPRECATED(
-      ValueOwnershipKind getOwnershipKind()
-          const { return Value->getOwnershipKind(); },
-      "Please use ValueBase::getOwnershipKind()");
+  [[deprecated("Please use ValueBase::getOwnershipKind()")]] ValueOwnershipKind
+  getOwnershipKind() const {
+    return Value->getOwnershipKind();
+  };
 
   /// Verify that this SILValue and its uses respects ownership invariants.
   void verifyOwnership(DeadEndBlocks *DEBlocks) const;
 
-  LLVM_ATTRIBUTE_DEPRECATED(void dump() const LLVM_ATTRIBUTE_USED,
-                            "Only for use in the debugger");
+  SWIFT_DEBUG_DUMP;
 };
 
 inline SILNodePointer::SILNodePointer(SILValue value) : node(value) { }
@@ -1107,10 +1107,8 @@ class Operand {
   SILBasicBlock *getParentBlock() const;
   SILFunction *getParentFunction() const;
 
-  LLVM_ATTRIBUTE_DEPRECATED(
-      void dump() const LLVM_ATTRIBUTE_USED,
-      "Dump the operand's state. Only for use in the debugger!");
   void print(llvm::raw_ostream &os) const;
+  SWIFT_DEBUG_DUMP;
 
 private:
   void removeFromCurrent() {

@@ -29,9 +29,9 @@ namespace swift {
     SerializationOptions &operator=(SerializationOptions &&) = default;
     ~SerializationOptions() = default;
 
-    const char *OutputPath = nullptr;
-    const char *DocOutputPath = nullptr;
-    const char *SourceInfoOutputPath = nullptr;
+    StringRef OutputPath;
+    StringRef DocOutputPath;
+    StringRef SourceInfoOutputPath;
     std::string ABIDescriptorPath;
     bool emptyABIDescriptor = false;
     llvm::VersionTuple UserModuleVersion;

@@ -2103,6 +2103,8 @@ Type IntrinsicTypeDecoder::decodeImmediate() {
   case IITDescriptor::VecOfBitcastsToInt:
   case IITDescriptor::Subdivide2Argument:
   case IITDescriptor::Subdivide4Argument:
+  case IITDescriptor::PPCQuad:
+  case IITDescriptor::AnyPtrToElt:
     // These types cannot be expressed in swift yet.
     return Type();
 

@@ -260,11 +260,12 @@ std::pair<bool, bool> LangOptions::setTarget(llvm::Triple triple) {
     llvm::raw_svector_ostream osx(osxBuf);
     osx << llvm::Triple::getOSTypeName(llvm::Triple::MacOSX);
 
-    unsigned major, minor, micro;
-    triple.getMacOSXVersion(major, minor, micro);
-    osx << major << "." << minor;
-    if (micro != 0)
-      osx << "." << micro;
+    llvm::VersionTuple OSVersion;
+    triple.getMacOSXVersion(OSVersion);
+
+    osx << OSVersion.getMajor() << "." << OSVersion.getMinor().getValueOr(0);
+    if (auto Subminor = OSVersion.getSubminor())
+      osx << "." << *Subminor;
 
     triple.setOSName(osx.str());
   }

@@ -181,11 +181,14 @@ StringRef swift::getPlatformNameForTriple(const llvm::Triple &triple) {
   case llvm::Triple::Ananas:
   case llvm::Triple::CloudABI:
   case llvm::Triple::DragonFly:
+  case llvm::Triple::DriverKit:
   case llvm::Triple::Emscripten:
   case llvm::Triple::Fuchsia:
   case llvm::Triple::KFreeBSD:
   case llvm::Triple::Lv2:
   case llvm::Triple::NetBSD:
+  case llvm::Triple::PS5:
+  case llvm::Triple::ShaderModel:
   case llvm::Triple::Solaris:
   case llvm::Triple::Minix:
   case llvm::Triple::RTEMS:
@@ -395,11 +398,13 @@ llvm::Triple swift::getUnversionedTriple(const llvm::Triple &triple) {
 Optional<llvm::VersionTuple>
 swift::getSwiftRuntimeCompatibilityVersionForTarget(
     const llvm::Triple &Triple) {
-  unsigned Major, Minor, Micro;
   #define MAX(a, b) ((a) > (b) ? (a) : (b))
 
   if (Triple.isMacOSX()) {
-    Triple.getMacOSXVersion(Major, Minor, Micro);
+    llvm::VersionTuple OSVersion;
+    Triple.getMacOSXVersion(OSVersion);
+    unsigned Major = OSVersion.getMajor();
+    unsigned Minor = OSVersion.getMinor().getValueOr(0);
 
     auto floorFor64 = [&Triple](llvm::VersionTuple v) {
       if (!Triple.isAArch64()) return v;
@@ -414,7 +419,7 @@ swift::getSwiftRuntimeCompatibilityVersionForTarget(
       if (Minor <= 14) {
         return floorFor64(llvm::VersionTuple(5, 0));
       } else if (Minor <= 15) {
-        if (Micro <= 3) {
+        if (OSVersion.getSubminor().getValueOr(0) <= 3) {
           return floorFor64(llvm::VersionTuple(5, 1));
         } else {
           return floorFor64(llvm::VersionTuple(5, 2));
@@ -429,7 +434,9 @@ swift::getSwiftRuntimeCompatibilityVersionForTarget(
       return floorFor64(llvm::VersionTuple(5, 5));
     }
   } else if (Triple.isiOS()) { // includes tvOS
-    Triple.getiOSVersion(Major, Minor, Micro);
+    llvm::VersionTuple OSVersion = Triple.getiOSVersion();
+    unsigned Major = OSVersion.getMajor();
+    unsigned Minor = OSVersion.getMinor().getValueOr(0);
 
     auto floorForArchitecture = [&Triple, Major](llvm::VersionTuple v) {
       // arm64 simulators and macCatalyst are introduced in iOS 14.0/tvOS 14.0
@@ -463,13 +470,16 @@ swift::getSwiftRuntimeCompatibilityVersionForTarget(
       return floorForArchitecture(llvm::VersionTuple(5, 5));
     }
   } else if (Triple.isWatchOS()) {
+    llvm::VersionTuple OSVersion = Triple.getWatchOSVersion();
+    unsigned Major = OSVersion.getMajor();
+    unsigned Minor = OSVersion.getMinor().getValueOr(0);
+
     auto floorFor64bits = [&Triple](llvm::VersionTuple v) {
       if (!Triple.isArch64Bit()) return v;
       // 64-bit watchOS was introduced with Swift 5.3
       return MAX(v, llvm::VersionTuple(5, 3));
     };
 
-    Triple.getWatchOSVersion(Major, Minor, Micro);
     if (Major <= 5) {
       return floorFor64bits(llvm::VersionTuple(5, 0));
     } else if (Major <= 6) {