Merge pull request #4276 from swiftwasm/main

Author: MaxDesiatov

README.md

@@ -26,8 +26,7 @@ to track the status of our builds, please refer to our [GitHub Actions page](htt
 | | **Architecture** | **main** | **Package** |
 |---|:---:|:---:|:---:|
 | **macOS**        | x86_64 |[![Build Status](https://ci.swift.org/job/oss-swift-incremental-RA-macos/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-incremental-RA-macos)|[![Build Status](https://ci.swift.org/job/oss-swift-package-macos/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-macos)|
-| **Ubuntu 16.04** | x86_64 | [![Build Status](https://ci.swift.org/job/oss-swift-incremental-RA-linux-ubuntu-16_04/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-incremental-RA-linux-ubuntu-16_04)|[![Build Status](https://ci.swift.org/job/oss-swift-package-linux-ubuntu-16_04/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-linux-ubuntu-16_04)|
-| **Ubuntu 18.04** | x86_64 | [![Build Status](https://ci.swift.org/job/oss-swift-incremental-RA-linux-ubuntu-18_04/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-incremental-RA-linux-ubuntu-18_04)|[![Build Status](https://ci.swift.org/job/oss-swift-package-linux-ubuntu-18_04/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-linux-ubuntu-18_04)|
+| **Ubuntu 18.04** | x86_64 | [![Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-18_04/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-ubuntu-18_04)|[![Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-18_04/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-ubuntu-18_04)|
 | **Ubuntu 20.04** | x86_64 | [![Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-20_04/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-ubuntu-20_04)|[![Build Status](https://ci.swift.org/job/oss-swift-package-ubuntu-20_04/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-ubuntu-20_04)|
 | **CentOS 8** | x86_64 | [![Build Status](https://ci.swift.org/job/oss-swift-package-centos-8/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-centos-8)|[![Build Status](https://ci.swift.org/job/oss-swift-package-centos-8/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-centos-8)|
 | **CentOS 7** | x86_64 | [![Build Status](https://ci.swift.org/job/oss-swift-package-centos-7/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-centos-7)|[![Build Status](https://ci.swift.org/job/oss-swift-package-centos-7/lastCompletedBuild/badge/icon)](https://ci.swift.org/job/oss-swift-package-centos-7)|

include/swift/ABI/ObjectFile.h

@@ -14,15 +14,9 @@ namespace swift {
 
 /// Represents the nine reflection sections used by Swift
 enum ReflectionSectionKind : uint8_t {
-  fieldmd,
-  assocty,
-  builtin,
-  capture,
-  typeref,
-  reflstr,
-  conform,
-  protocs,
-  acfuncs,
+#define HANDLE_SWIFT_SECTION(KIND, MACHO, ELF, COFF) KIND,
+#include "llvm/BinaryFormat/Swift.def"
+#undef HANDLE_SWIFT_SECTION
 };
 
 /// Abstract base class responsible for providing the correct reflection section
@@ -43,24 +37,11 @@ class SwiftObjectFileFormatMachO : public SwiftObjectFileFormat {
 public:
   llvm::StringRef getSectionName(ReflectionSectionKind section) override {
     switch (section) {
-    case fieldmd:
-      return "__swift5_fieldmd";
-    case assocty:
-      return "__swift5_assocty";
-    case builtin:
-      return "__swift5_builtin";
-    case capture:
-      return "__swift5_capture";
-    case typeref:
-      return "__swift5_typeref";
-    case reflstr:
-      return "__swift5_reflstr";
-    case conform:
-      return "__swift5_proto";
-    case protocs:
-      return "__swift5_protos";
-    case acfuncs:
-      return "__swift5_acfuncs";
+#define HANDLE_SWIFT_SECTION(KIND, MACHO, ELF, COFF)                           \
+  case KIND:                                                                   \
+    return MACHO;
+#include "llvm/BinaryFormat/Swift.def"
+#undef HANDLE_SWIFT_SECTION
     }
     llvm_unreachable("Section type not found.");
   }
@@ -78,24 +59,11 @@ class SwiftObjectFileFormatELF : public SwiftObjectFileFormat {
 public:
   llvm::StringRef getSectionName(ReflectionSectionKind section) override {
     switch (section) {
-    case fieldmd:
-      return "swift5_fieldmd";
-    case assocty:
-      return "swift5_assocty";
-    case builtin:
-      return "swift5_builtin";
-    case capture:
-      return "swift5_capture";
-    case typeref:
-      return "swift5_typeref";
-    case reflstr:
-      return "swift5_reflstr";
-    case conform:
-      return "swift5_protocol_conformances";
-    case protocs:
-      return "swift5_protocols";
-    case acfuncs:
-      return "swift5_accessible_functions";
+#define HANDLE_SWIFT_SECTION(KIND, MACHO, ELF, COFF)                           \
+  case KIND:                                                                   \
+    return ELF;
+#include "llvm/BinaryFormat/Swift.def"
+#undef HANDLE_SWIFT_SECTION
     }
     llvm_unreachable("Section type not found.");
   }
@@ -110,24 +78,11 @@ class SwiftObjectFileFormatCOFF : public SwiftObjectFileFormat {
 public:
   llvm::StringRef getSectionName(ReflectionSectionKind section) override {
     switch (section) {
-    case fieldmd:
-      return ".sw5flmd";
-    case assocty:
-      return ".sw5asty";
-    case builtin:
-      return ".sw5bltn";
-    case capture:
-      return ".sw5cptr";
-    case typeref:
-      return ".sw5tyrf";
-    case reflstr:
-      return ".sw5rfst";
-    case conform:
-      return ".sw5prtc$B";
-    case protocs:
-      return ".sw5prt$B";
-    case acfuncs:
-      return ".sw5acfn$B";
+#define HANDLE_SWIFT_SECTION(KIND, MACHO, ELF, COFF)                           \
+  case KIND:                                                                   \
+    return COFF;
+#include "llvm/BinaryFormat/Swift.def"
+#undef HANDLE_SWIFT_SECTION
     }
     llvm_unreachable("Section  not found.");
   }

include/swift/AST/Decl.h

@@ -2159,9 +2159,9 @@ class PoundDiagnosticDecl : public Decl {
 class OpaqueTypeDecl;
 
 /// Describes the least favorable positions at which a requirement refers
-/// to 'Self' in terms of variance, for use in the is-inheritable and
-/// is-available-existential checks.
-class SelfReferenceInfo final {
+/// to a given generic parameter in terms of variance, for use in the
+/// is-inheritable and is-available-existential checks.
+class GenericParameterReferenceInfo final {
   using OptionalTypePosition = OptionalEnum<decltype(TypePosition::Covariant)>;
 
 public:
@@ -2171,27 +2171,27 @@ class SelfReferenceInfo final {
   OptionalTypePosition assocTypeRef;
 
   /// A reference to 'Self'.
-  static SelfReferenceInfo forSelfRef(TypePosition position) {
-    return SelfReferenceInfo(false, position, llvm::None);
+  static GenericParameterReferenceInfo forSelfRef(TypePosition position) {
+    return GenericParameterReferenceInfo(false, position, llvm::None);
   }
 
   /// A reference to 'Self' through an associated type.
-  static SelfReferenceInfo forAssocTypeRef(TypePosition position) {
-    return SelfReferenceInfo(false, llvm::None, position);
+  static GenericParameterReferenceInfo forAssocTypeRef(TypePosition position) {
+    return GenericParameterReferenceInfo(false, llvm::None, position);
   }
 
-  SelfReferenceInfo &operator|=(const SelfReferenceInfo &other);
+  GenericParameterReferenceInfo &operator|=(const GenericParameterReferenceInfo &other);
 
   explicit operator bool() const {
     return hasCovariantSelfResult || selfRef || assocTypeRef;
   }
 
-  SelfReferenceInfo()
+  GenericParameterReferenceInfo()
       : hasCovariantSelfResult(false), selfRef(llvm::None),
         assocTypeRef(llvm::None) {}
 
 private:
-  SelfReferenceInfo(bool hasCovariantSelfResult, OptionalTypePosition selfRef,
+  GenericParameterReferenceInfo(bool hasCovariantSelfResult, OptionalTypePosition selfRef,
                     OptionalTypePosition assocTypeRef)
       : hasCovariantSelfResult(hasCovariantSelfResult), selfRef(selfRef),
         assocTypeRef(assocTypeRef) {}
@@ -2682,7 +2682,7 @@ class ValueDecl : public Decl {
   /// is considered covariant only when it appears as the immediate type of a
   /// property, or the uncurried result type of a method/subscript, e.g.
   /// '() -> () -> Self'.
-  SelfReferenceInfo findExistentialSelfReferences(
+  GenericParameterReferenceInfo findExistentialSelfReferences(
       Type baseTy, bool treatNonResultCovariantSelfAsInvariant) const;
 };
 
@@ -7800,6 +7800,14 @@ class MissingMemberDecl : public Decl {
   }
 };
 
+/// Find references to the given generic paramaeter in the generic signature
+/// and the type of the given value.
+GenericParameterReferenceInfo findGenericParameterReferences(
+    const ValueDecl *value,
+    CanGenericSignature sig, GenericTypeParamType *genericParam,
+    bool treatNonResultCovarianceAsInvariant,
+    Optional<unsigned> skipParamIndex);
+
 inline bool AbstractStorageDecl::isSettable(const DeclContext *UseDC,
                                             const DeclRefExpr *base) const {
   if (auto vd = dyn_cast<VarDecl>(this))

include/swift/AST/DiagnosticsSema.def

@@ -4794,8 +4794,8 @@ ERROR(global_actor_on_actor_class,none,
 ERROR(global_actor_on_local_variable,none,
       "local variable %0 cannot have a global actor", (DeclName))
 ERROR(global_actor_on_storage_of_value_type,none,
-      "stored property %0 within %1 cannot have a global actor",
-      (DeclName, DescriptiveDeclKind))
+      "stored property %0 within struct cannot have a global actor",
+      (DeclName))
 ERROR(global_actor_non_unsafe_init,none,
       "global actor attribute %0 argument can only be '(unsafe)'", (Type))
 ERROR(global_actor_non_final_class,none,

include/swift/Basic/LangOptions.h

@@ -313,6 +313,10 @@ namespace swift {
     /// `func f() -> <T> T`.
     bool EnableExperimentalNamedOpaqueTypes = false;
 
+    /// Enable support for implicitly opening existential argument types
+    /// in calls to generic functions.
+    bool EnableOpenedExistentialTypes = false;
+
     /// Enable support for protocol types parameterized by primary
     /// associated type.
     bool EnableParameterizedProtocolTypes = false;

include/swift/Basic/StringExtras.h

@@ -52,12 +52,16 @@ namespace swift {
   /// Determine the part of speech for the given word.
   PartOfSpeech getPartOfSpeech(StringRef word);
 
+  /// Copy \p string to \p Allocator and return it as a null terminated C
+  /// string.
+  const char *copyCString(StringRef string, llvm::BumpPtrAllocator &Allocator);
+
   /// Scratch space used for returning a set of StringRefs.
   class StringScratchSpace {
     llvm::BumpPtrAllocator Allocator;
 
   public:
-    StringRef copyString(StringRef string);
+    StringRef copyString(StringRef string) { return string.copy(Allocator); }
 
     llvm::BumpPtrAllocator &getAllocator() { return Allocator; }
   };
@@ -465,6 +469,52 @@ bool omitNeedlessWords(StringRef &baseName,
 /// If the name has a completion-handler suffix, strip off that suffix.
 Optional<StringRef> stripWithCompletionHandlerSuffix(StringRef name);
 
+/// Represents a string that can be efficiently retrieved either as a StringRef
+/// or as a null-terminated C string.
+class NullTerminatedStringRef {
+  StringRef Ref;
+
+public:
+  /// Create a \c NullTerminatedStringRef from a null-terminated C string with
+  /// size \p Size (excluding the null character).
+  NullTerminatedStringRef(const char *Data, size_t Size) : Ref(Data, Size) {
+    assert(Data != nullptr && Data[Size] == '\0' &&
+           "Data should be null-terminated");
+  }
+
+  /// Create an empty null-terminated string. \c data() is not a \c nullptr.
+  constexpr NullTerminatedStringRef() : Ref("") {}
+
+  /// Create an null terminated string with a C string.
+  constexpr NullTerminatedStringRef(const char *Data) : Ref(Data) {}
+
+  /// Create a null-terminated string, copying \p Str into \p A .
+  template <typename Allocator>
+  NullTerminatedStringRef(StringRef Str, Allocator &A) : Ref("") {
+    if (Str.empty())
+      return;
+
+    size_t size = Str.size();
+    char *memory = A.template Allocate<char>(size + 1);
+    memcpy(memory, Str.data(), size);
+    memory[size] = '\0';
+    Ref = {memory, size};
+  }
+
+  /// Returns the string as a `StringRef`. The `StringRef` does not include the
+  /// null character.
+  operator StringRef() const { return Ref; }
+
+  /// Returns the string as a null-terminated C string.
+  const char *data() const { return Ref.data(); }
+
+  /// The size of the string, excluding the null character.
+  size_t size() const { return Ref.size(); }
+
+  bool empty() const { return Ref.empty(); }
+  int compare(NullTerminatedStringRef RHS) const { return Ref.compare(RHS); }
+};
+
 } // end namespace swift
 
 #endif // SWIFT_BASIC_STRINGEXTRAS_H

include/swift/ClangImporter/ClangImporter.h

@@ -110,9 +110,12 @@ class DWARFImporterDelegate {
   virtual void anchor();
 };
 
+// ⚠️ DANGER ⚠️
+// Putting more than four types in this `PointerUnion` will break the build for
+// 32-bit hosts. If we need five or more types in the future, we'll need to
+// design a proper larger-than-word-sized type.
 typedef llvm::PointerUnion<const clang::Decl *, const clang::MacroInfo *,
-                           const clang::ModuleMacro *, const clang::Type *,
-                           const clang::Token *>
+                           const clang::Type *, const clang::Token *>
     ImportDiagnosticTarget;
 
 /// Class that imports Clang modules into Swift, mapping directly