Merge pull request #4352 from swiftwasm/main

[pull] swiftwasm from main

Author: kateinoigakukun

include/swift-c/StaticMirror/BinaryScan.h

@@ -25,7 +25,7 @@
 /// SWIFTSTATICMIRROR_VERSION_MINOR should increase when there are API additions.
 /// SWIFTSTATICMIRROR_VERSION_MAJOR is intended for "major" source/ABI breaking changes.
 #define SWIFTSTATICMIRROR_VERSION_MAJOR 0
-#define SWIFTSTATICMIRROR_VERSION_MINOR 2 // Added associated-type gather
+#define SWIFTSTATICMIRROR_VERSION_MINOR 3 // Added filed type info gather
 
 SWIFTSTATICMIRROR_BEGIN_DECLS
 
@@ -42,6 +42,18 @@ typedef void *swift_static_mirror_t;
 typedef struct swift_static_mirror_conformance_info_s
     *swift_static_mirror_conformance_info_t;
 
+/// Opaque container to a field info (property type or enum case)
+typedef struct swift_static_mirror_field_info_s
+    *swift_static_mirror_field_info_t;
+
+/// Opaque container to a property type info
+typedef struct swift_static_mirror_property_info_s
+    *swift_static_mirror_property_info_t;
+
+/// Opaque container to an enum case info
+typedef struct swift_static_mirror_enum_case_info_s
+    *swift_static_mirror_enum_case_info_t;
+
 /// Opaque container to details of an associated type specification.
 typedef struct swift_static_mirror_type_alias_s
     *swift_static_mirror_type_alias_t;
@@ -55,7 +67,6 @@ typedef struct {
   size_t count;
 } swift_static_mirror_type_alias_set_t;
 
-
 typedef struct {
   swift_static_mirror_associated_type_info_t *associated_type_infos;
   size_t count;
@@ -66,26 +77,35 @@ typedef struct {
   size_t count;
 } swift_static_mirror_conformances_set_t;
 
+typedef struct {
+  swift_static_mirror_property_info_t *properties;
+  size_t count;
+} swift_static_mirror_property_info_set_t;
 
-// swift_static_mirror_conformance_info query methods
+typedef struct {
+  swift_static_mirror_enum_case_info_t *enum_cases;
+  size_t count;
+} swift_static_mirror_enum_case_info_set_t;
+
+typedef struct {
+  swift_static_mirror_field_info_t *field_infos;
+  size_t count;
+} swift_static_mirror_field_info_set_t;
 
+// swift_static_mirror_conformance_info query methods
 SWIFTSTATICMIRROR_PUBLIC swift_static_mirror_string_ref_t
     swift_static_mirror_conformance_info_get_type_name(
         swift_static_mirror_conformance_info_t);
-
 SWIFTSTATICMIRROR_PUBLIC swift_static_mirror_string_ref_t
     swift_static_mirror_conformance_info_get_protocol_name(
         swift_static_mirror_conformance_info_t);
-
 SWIFTSTATICMIRROR_PUBLIC swift_static_mirror_string_ref_t
     swift_static_mirror_conformance_info_get_mangled_type_name(
         swift_static_mirror_conformance_info_t);
+SWIFTSTATICMIRROR_PUBLIC void swift_static_mirror_conformance_info_dispose(
+    swift_static_mirror_conformance_info_t);
 
-SWIFTSTATICMIRROR_PUBLIC void
-    swift_static_mirror_conformance_info_dispose(
-        swift_static_mirror_conformance_info_t);
-
-// swift_static_mirror_associated_type query methods
+// swift_static_mirror_associated_type_info query methods
 SWIFTSTATICMIRROR_PUBLIC swift_static_mirror_string_ref_t
     swift_static_mirror_type_alias_get_type_alias_name(
         swift_static_mirror_type_alias_t);
@@ -100,41 +120,77 @@ SWIFTSTATICMIRROR_PUBLIC swift_static_mirror_string_ref_t
 SWIFTSTATICMIRROR_PUBLIC swift_static_mirror_string_ref_t
     swift_static_mirror_associated_type_info_get_mangled_type_name(
         swift_static_mirror_associated_type_info_t);
-SWIFTSTATICMIRROR_PUBLIC swift_static_mirror_type_alias_set_t*
+SWIFTSTATICMIRROR_PUBLIC swift_static_mirror_type_alias_set_t *
     swift_static_mirror_associated_type_info_get_type_alias_set(
         swift_static_mirror_associated_type_info_t);
 
+// swift_static_mirror_field_info query methods
+SWIFTSTATICMIRROR_PUBLIC swift_static_mirror_string_ref_t
+    swift_static_mirror_field_info_get_mangled_type_name(
+        swift_static_mirror_field_info_t);
+SWIFTSTATICMIRROR_PUBLIC swift_static_mirror_property_info_set_t *
+    swift_static_mirror_field_info_get_property_info_set(
+        swift_static_mirror_field_info_t);
+SWIFTSTATICMIRROR_PUBLIC swift_static_mirror_enum_case_info_set_t *
+    swift_static_mirror_field_info_get_enum_case_info_set(
+        swift_static_mirror_field_info_t);
+SWIFTSTATICMIRROR_PUBLIC swift_static_mirror_string_ref_t
+    swift_static_mirror_property_info_get_label(
+        swift_static_mirror_property_info_t);
+SWIFTSTATICMIRROR_PUBLIC swift_static_mirror_string_ref_t
+    swift_static_mirror_property_info_get_type_name(
+        swift_static_mirror_property_info_t);
+SWIFTSTATICMIRROR_PUBLIC swift_static_mirror_string_ref_t
+    swift_static_mirror_property_info_get_mangled_type_name(
+        swift_static_mirror_property_info_t);
+SWIFTSTATICMIRROR_PUBLIC swift_static_mirror_string_ref_t
+    swift_static_mirror_enum_case_info_get_label(
+        swift_static_mirror_enum_case_info_t);
+
 /// Create an \c swift_static_mirror_t instance.
 /// The returned \c swift_static_mirror_t is owned by the caller and must be
 /// disposed of using \c swift_static_mirror_dispose .
 SWIFTSTATICMIRROR_PUBLIC swift_static_mirror_t
 swift_static_mirror_create(int, const char **, const char *);
 
 SWIFTSTATICMIRROR_PUBLIC void
-swift_static_mirror_dispose(swift_static_mirror_t);
+    swift_static_mirror_dispose(swift_static_mirror_t);
 
 /// Identify and collect all types conforming to any of the protocol names
 /// specified as arguments
 SWIFTSTATICMIRROR_PUBLIC swift_static_mirror_conformances_set_t *
-swift_static_mirror_conformances_set_create(
-    swift_static_mirror_t, int, const char **);
+swift_static_mirror_conformances_set_create(swift_static_mirror_t, int,
+                                            const char **);
 
 SWIFTSTATICMIRROR_PUBLIC void swift_static_mirror_conformances_set_dispose(
     swift_static_mirror_conformances_set_t *);
 
-/// Identify and collect all associated types of a given input type (by mangled name)
+/// Identify and collect all associated types of a given input type (by mangled
+/// name)
 SWIFTSTATICMIRROR_PUBLIC swift_static_mirror_associated_type_info_set_t *
-swift_static_mirror_associated_type_info_set_create(
-    swift_static_mirror_t, const char *);
+swift_static_mirror_associated_type_info_set_create(swift_static_mirror_t,
+                                                    const char *);
 
 /// Identify and collect associated types of all discovered types.
 SWIFTSTATICMIRROR_PUBLIC swift_static_mirror_associated_type_info_set_t *
-swift_static_mirror_all_associated_type_info_set_create(
-    swift_static_mirror_t);
+    swift_static_mirror_all_associated_type_info_set_create(
+        swift_static_mirror_t);
 
-SWIFTSTATICMIRROR_PUBLIC void swift_static_mirror_associated_type_info_set_dispose(
+SWIFTSTATICMIRROR_PUBLIC void
+swift_static_mirror_associated_type_info_set_dispose(
     swift_static_mirror_associated_type_info_set_t *);
 
+/// Identify and collect all field types of a given input type (by mangled name)
+SWIFTSTATICMIRROR_PUBLIC swift_static_mirror_field_info_set_t *
+swift_static_mirror_field_info_set_create(swift_static_mirror_t, const char *);
+
+/// Identify and collect field types of all discovered types.
+SWIFTSTATICMIRROR_PUBLIC swift_static_mirror_field_info_set_t *
+    swift_static_mirror_all_field_info_set_create(swift_static_mirror_t);
+
+SWIFTSTATICMIRROR_PUBLIC void swift_static_mirror_field_info_set_dispose(
+    swift_static_mirror_field_info_set_t *);
+
 SWIFTSTATICMIRROR_END_DECLS
 
 #endif // SWIFT_C_BINARY_SCAN_H

include/swift/AST/ASTContext.h

@@ -1298,8 +1298,17 @@ class ASTContext final {
   CanGenericSignature getSingleGenericParameterSignature() const;
 
   /// Retrieve a generic signature with a single type parameter conforming
-  /// to the given protocol or composition type, like <T: type>.
-  CanGenericSignature getOpenedArchetypeSignature(Type type);
+  /// to the given protocol or composition type, like <T: P>.
+  ///
+  /// The opened archetype may have a different set of conformances from the
+  /// corresponding existential. The opened archetype conformances are dictated
+  /// by the ABI for generic arguments, while the existential value conformances
+  /// are dictated by their layout (see \c Type::getExistentialLayout()). In
+  /// particular, the opened archetype signature does not have requirements for
+  /// conformances inherited from superclass constraints while existential
+  /// values do.
+  CanGenericSignature getOpenedArchetypeSignature(Type type,
+                                                  GenericSignature parentSig);
 
   GenericSignature getOverrideGenericSignature(const ValueDecl *base,
                                                const ValueDecl *derived);

include/swift/AST/Decl.h

@@ -2693,7 +2693,8 @@ class ValueDecl : public Decl {
   /// property, or the uncurried result type of a method/subscript, e.g.
   /// '() -> () -> Self'.
   GenericParameterReferenceInfo findExistentialSelfReferences(
-      Type baseTy, bool treatNonResultCovariantSelfAsInvariant) const;
+      Type baseTy, const DeclContext *useDC,
+      bool treatNonResultCovariantSelfAsInvariant) const;
 };
 
 /// This is a common base class for declarations which declare a type.

include/swift/AST/DiagnosticsParse.def

@@ -804,6 +804,8 @@ ERROR(expected_dynamic_func_attr,none,
 ERROR(async_after_throws,none,
       "%select{'async'|'reasync'}0 must precede %select{'throws'|'rethrows'}1",
       (bool, bool))
+ERROR(await_in_function_type,none,
+      "expected async specifier; did you mean 'async'?", ())
 ERROR(duplicate_effects_specifier,none,
       "'%0' has already been specified", (StringRef))
 

include/swift/AST/GenericEnvironment.h

@@ -157,7 +157,29 @@ class alignas(1 << DeclAlignInBits) GenericEnvironment final
   GenericEnvironment *getIncomplete(GenericSignature signature);
 
   /// Create a new generic environment for an opened existential.
-  static GenericEnvironment *forOpenedExistential(Type existential, UUID uuid);
+  ///
+  /// This function uses the provided parent signature to construct a new
+  /// signature suitable for use with an opened archetype. If you have an
+  /// existing generic signature from e.g. deserialization use
+  /// \c GenericEnvironment::forOpenedArchetypeSignature instead.
+  ///
+  /// \param existential The subject existential type
+  /// \param parentSig The signature of the context where this existential type is being opened
+  /// \param uuid The unique identifier for this opened existential
+  static GenericEnvironment *
+  forOpenedExistential(Type existential, GenericSignature parentSig, UUID uuid);
+
+  /// Create a new generic environment for an opened existential.
+  ///
+  /// It is unlikely you want to use this function.
+  /// Call \c GenericEnvironment::forOpenedExistential instead.
+  ///
+  /// \param existential The subject existential type
+  /// \param signature The signature of the opened archetype
+  /// \param uuid The unique identifier for this opened existential
+  static GenericEnvironment *
+  forOpenedArchetypeSignature(Type existential,
+                              GenericSignature signature, UUID uuid);
 
   /// Create a new generic environment for an opaque type with the given set of
   /// outer substitutions.

include/swift/AST/Types.h

@@ -507,7 +507,7 @@ class alignas(1 << TypeAlignInBits) TypeBase
   /// Canonical protocol composition types are minimized only to a certain
   /// degree to preserve ABI compatibility. This routine enables performing
   /// slower, but stricter minimization at need (e.g. redeclaration checking).
-  CanType getMinimalCanonicalType() const;
+  CanType getMinimalCanonicalType(const DeclContext *useDC) const;
 
   /// Reconstitute type sugar, e.g., for array types, dictionary
   /// types, optionals, etc.
@@ -648,7 +648,8 @@ class alignas(1 << TypeAlignInBits) TypeBase
 
   /// Replace opened archetypes with the given root with their most
   /// specific non-dependent upper bounds throughout this type.
-  Type typeEraseOpenedArchetypesWithRoot(const OpenedArchetypeType *root) const;
+  Type typeEraseOpenedArchetypesWithRoot(const OpenedArchetypeType *root,
+                                         const DeclContext *useDC) const;
 
   /// Given a declaration context, returns a function type with the 'self'
   /// type curried as the input if the declaration context describes a type.
@@ -763,7 +764,8 @@ class alignas(1 << TypeAlignInBits) TypeBase
   bool isClassExistentialType();
 
   /// Opens an existential instance or meta-type and returns the opened type.
-  Type openAnyExistentialType(OpenedArchetypeType *&opened);
+  Type openAnyExistentialType(OpenedArchetypeType *&opened,
+                              GenericSignature parentSig);
 
   /// Break an existential down into a set of constraints.
   ExistentialLayout getExistentialLayout();
@@ -5189,7 +5191,7 @@ class ProtocolCompositionType final : public TypeBase,
   /// Canonical protocol composition types are minimized only to a certain
   /// degree to preserve ABI compatibility. This routine enables performing
   /// slower, but stricter minimization at need (e.g. redeclaration checking).
-  CanType getMinimalCanonicalType() const;
+  CanType getMinimalCanonicalType(const DeclContext *useDC) const;
 
   /// Retrieve the set of members composed to create this type.
   ///
@@ -5272,7 +5274,6 @@ class ParameterizedProtocolType final : public TypeBase,
   friend TrailingObjects;
 
   ProtocolType *Base;
-  Type Arg;
 
 public:
   /// Retrieve an instance of a protocol composition type with the
@@ -5745,40 +5746,69 @@ class OpenedArchetypeType final : public ArchetypeType,
          ArrayRef<ProtocolDecl *> conformsTo, Type superclass,
          LayoutConstraint layout);
 
+public:
+  /// Compute the parameter that serves as the \c Self type for an opened
+  /// archetype from the given outer generic signature.
+  ///
+  /// This type is a generic parameter one level deeper
+  /// than the deepest generic context depth.
+  static Type getSelfInterfaceTypeFromContext(GenericSignature parentSig,
+                                              ASTContext &ctx);
+
 public:
   /// Get or create an archetype that represents the opened type
   /// of an existential value.
   ///
   /// \param existential The existential type to open.
+  /// \param parentSig The generic signature of the context opening
+  /// this existential.
   ///
   /// \param knownID When non-empty, the known ID of the archetype. When empty,
   /// a fresh archetype with a unique ID will be opened.
-  static CanTypeWrapper<OpenedArchetypeType> get(
-      CanType existential, Optional<UUID> knownID = None);
+  static CanTypeWrapper<OpenedArchetypeType> get(CanType existential,
+                                                 GenericSignature parentSig,
+                                                 Optional<UUID> knownID = None);
 
   /// Get or create an archetype that represents the opened type
   /// of an existential value.
   ///
   /// \param existential The existential type to open.
   /// \param interfaceType The interface type represented by this archetype.
+  /// \param parentSig The generic signature of the context opening
+  /// this existential.
   ///
   /// \param knownID When non-empty, the known ID of the archetype. When empty,
   /// a fresh archetype with a unique ID will be opened.
-  static CanTypeWrapper<OpenedArchetypeType> get(
-      CanType existential, Type interfaceType, Optional<UUID> knownID = None);
+  static CanTypeWrapper<OpenedArchetypeType> get(CanType existential,
+                                                 Type interfaceType,
+                                                 GenericSignature parentSig,
+                                                 Optional<UUID> knownID = None);
 
   /// Create a new archetype that represents the opened type
   /// of an existential value.
   ///
+  /// Use this function when you are unsure of whether the
+  /// \c existential type is a metatype or an instance type. This function
+  /// will unwrap any existential metatype containers.
+  ///
   /// \param existential The existential type or existential metatype to open.
   /// \param interfaceType The interface type represented by this archetype.
-  static CanType getAny(CanType existential, Type interfaceType);
+  /// \param parentSig The generic signature of the context opening
+  /// this existential.
+  static CanType getAny(CanType existential, Type interfaceType,
+                        GenericSignature parentSig);
 
   /// Create a new archetype that represents the opened type
   /// of an existential value.
   ///
+  /// Use this function when you are unsure of whether the
+  /// \c existential type is a metatype or an instance type. This function
+  /// will unwrap any existential metatype containers.
+  ///
   /// \param existential The existential type or existential metatype to open.
-  static CanType getAny(CanType existential);
+  /// \param parentSig The generic signature of the context opening
+  /// this existential.
+  static CanType getAny(CanType existential, GenericSignature parentSig);
 
   /// Retrieve the ID number of this opened existential.
   UUID getOpenedExistentialID() const;

include/swift/LLVMPasses/Passes.h

@@ -102,7 +102,6 @@ namespace swift {
     static char ID;
     InlineTreePrinter() : llvm::ModulePass(ID) {}
   };
-
 } // end namespace swift
 
 #endif

include/swift/LLVMPasses/PassesFwd.h

@@ -25,6 +25,7 @@ namespace llvm {
   void initializeSwiftARCContractPass(PassRegistry &);
   void initializeInlineTreePrinterPass(PassRegistry &);
   void initializeSwiftMergeFunctionsPass(PassRegistry &);
+  void initializeSwiftDbgAddrBlockSplitterPass(PassRegistry &);
 }
 
 namespace swift {
@@ -33,6 +34,7 @@ namespace swift {
   llvm::ModulePass *createInlineTreePrinterPass();
   llvm::ModulePass *createSwiftMergeFunctionsPass(bool ptrAuthEnabled,
                                                   unsigned ptrAuthKey);
+  llvm::FunctionPass *createSwiftDbgAddrBlockSplitter();
   llvm::ImmutablePass *createSwiftAAWrapperPass();
   llvm::ImmutablePass *createSwiftRCIdentityPass();
 } // end namespace swift