Merge pull request #2652 from swiftwasm/main

[pull] swiftwasm from main

Author: pull[bot]

.mailmap

@@ -9,7 +9,10 @@ Ankit Aggarwal <[email protected]> <[email protected]>
 Argyrios Kyrtzidis <[email protected]> <[email protected]>
 Arsen Gasparyan <[email protected]> <[email protected]>
 Ashley Garland <[email protected]> <[email protected]>
-Becca Royal-Gordon <[email protected]> <[email protected]> <[email protected]> <[email protected]> <[email protected]>
+Becca Royal-Gordon <[email protected]> <[email protected]>
+Becca Royal-Gordon <[email protected]> <[email protected]>
+Becca Royal-Gordon <[email protected]> <[email protected]>
+Becca Royal-Gordon <[email protected]> <[email protected]>
 Ben Cohen <[email protected]>
 Ben Cohen <[email protected]> <[email protected]>
 Ben Cohen <[email protected]> <[email protected]>
@@ -81,12 +84,13 @@ John Regner <[email protected]> <[email protected]>
 Karoy Lorentey <[email protected]> <[email protected]>
 Kavon Farvardin <[email protected]> <[email protected]>
 Keith Smiley <[email protected]> <[email protected]>
-Kevin Ballard <[email protected]> <[email protected]>
 Kevin Saldaña <[email protected]>
 Kim Topley <[email protected]>
 Kosuke Ogawa <[email protected]> <[email protected]>
 Kuba Mracek <[email protected]> <[email protected]>
 Kuba Mracek <[email protected]>
+Lily Ballard <[email protected]> <[email protected]>
+Lily Ballard <[email protected]> <[email protected]>
 Luiz Fernando Silva <[email protected]>
 Luqman Aden <[email protected]> <[email protected]>
 Marcelo Fabri <[email protected]> <[email protected]>

include/swift/ABI/MetadataValues.h

@@ -1186,7 +1186,7 @@ namespace SpecialPointerAuthDiscriminators {
   const uint16_t EscalationNotificationFunction = 0x5be4; // = 23524
 
   /// Swift async context parameter stored in the extended frame info.
-  const uint16_t SwiftAsyncContextExtendedFrameEntry = 0xc31a;
+  const uint16_t SwiftAsyncContextExtendedFrameEntry = 0xc31a; // = 49946
 }
 
 /// The number of arguments that will be passed directly to a generic

include/swift/AST/ASTMangler.h

@@ -68,6 +68,14 @@ class ASTMangler : public Mangler {
   std::function<bool (SymbolicReferent)> CanSymbolicReference;
 
   bool canSymbolicReference(SymbolicReferent referent) {
+    // Marker protocols cannot ever be symbolically referenced.
+    if (auto nominal = referent.dyn_cast<const NominalTypeDecl *>()) {
+      if (auto proto = dyn_cast<ProtocolDecl>(nominal)) {
+        if (proto->isMarkerProtocol())
+          return false;
+      }
+    }
+
     return AllowSymbolicReferences
       && (!CanSymbolicReference || CanSymbolicReference(referent));
   }

include/swift/AST/AbstractSourceFileDepGraphFactory.h

@@ -87,6 +87,12 @@ class AbstractSourceFileDepGraphFactory {
 
   void addAUsedDecl(const DependencyKey &def, const DependencyKey &use);
 
+  /// Add an external dependency node to the graph. If the provided fingerprint
+  /// is not \c None, it is added to the def key.
+  void addAnExternalDependency(const DependencyKey &def,
+                               const DependencyKey &use,
+                               Optional<Fingerprint> dependencyFingerprint);
+
   static Optional<Fingerprint>
   getFingerprintIfAny(std::pair<const NominalTypeDecl *, const ValueDecl *>) {
     return None;

include/swift/AST/Attr.def

@@ -606,6 +606,12 @@ SIMPLE_DECL_ATTR(concurrent, Concurrent,
   APIBreakingToAdd | APIBreakingToRemove,
   107)
 
+SIMPLE_DECL_ATTR(_marker, Marker,
+  OnProtocol | UserInaccessible |
+  ABIBreakingToAdd | ABIBreakingToRemove |
+  APIBreakingToAdd | APIBreakingToRemove,
+  108)
+
 #undef TYPE_ATTR
 #undef DECL_ATTR_ALIAS
 #undef CONTEXTUAL_DECL_ATTR_ALIAS

include/swift/AST/Decl.h

@@ -4162,6 +4162,10 @@ class ProtocolDecl final : public NominalTypeDecl {
   ProtocolRethrowsRequirementList getRethrowingRequirements() const;
   bool isRethrowingProtocol() const;
 
+  /// Determine whether this is a "marker" protocol, meaning that is indicates
+  /// semantics but has no corresponding witness table.
+  bool isMarkerProtocol() const;
+
 private:
   void computeKnownProtocolKind() const;
 

include/swift/AST/DiagnosticsRefactoring.def

@@ -54,5 +54,23 @@ WARNING(mismatched_rename, none, "the name at the given location cannot be renam
 
 ERROR(no_insert_position, none, "cannot find inserting position", ())
 
+ERROR(missing_callback_arg, none, "cannot refactor as callback closure argument missing", ())
+
+ERROR(mismatched_callback_args, none, "cannot refactor as callback arguments do not match declaration", ())
+
+ERROR(unknown_callback_conditions, none, "cannot refactor complex if conditions", ())
+
+ERROR(mixed_callback_conditions, none, "cannot refactor mixed nil and not-nil conditions", ())
+
+ERROR(callback_multiple_bound_names, none, "cannot refactor when multiple names bound to single declaration, had '%0' and found '%1'", (StringRef, StringRef))
+
+ERROR(callback_with_fallthrough, none, "cannot refactor switch with fallthrough", ())
+
+ERROR(callback_with_default, none, "cannot refactor switch with default case", ())
+
+ERROR(callback_multiple_case_items, none, "cannot refactor switch using a case with multiple items", ())
+
+ERROR(callback_where_case_item, none, "cannot refactor switch using a case with where clause", ())
+
 #define UNDEFINE_DIAGNOSTIC_MACROS
 #include "DefineDiagnosticMacros.h"

include/swift/AST/DiagnosticsSema.def

@@ -5581,6 +5581,17 @@ NOTE(result_builder_missing_build_limited_availability, none,
         "expression shuffles the elements of this tuple; "
         "this behavior is deprecated", ())
 
+//------------------------------------------------------------------------------
+// MARK: marker protocol diagnostics
+//------------------------------------------------------------------------------
+ERROR(marker_protocol_requirement, none,
+      "marker protocol %0 cannot have any requirements", (DeclName))
+ERROR(marker_protocol_inherit_nonmarker, none,
+      "marker protocol %0 cannot inherit non-marker protocol %1",
+      (DeclName, DeclName))
+ERROR(marker_protocol_value,none,
+      "marker protocol %0 can only be used in generic constraints", (DeclName))
+
 //------------------------------------------------------------------------------
 // MARK: differentiable programming diagnostics
 //------------------------------------------------------------------------------

include/swift/AST/KnownStdlibTypes.def

@@ -91,4 +91,6 @@ KNOWN_STDLIB_TYPE_DECL(KeyedEncodingContainer, NominalTypeDecl, 1)
 KNOWN_STDLIB_TYPE_DECL(KeyedDecodingContainer, NominalTypeDecl, 1)
 KNOWN_STDLIB_TYPE_DECL(RangeReplaceableCollection, ProtocolDecl, 1)
 
+KNOWN_STDLIB_TYPE_DECL(Result, NominalTypeDecl, 2)
+
 #undef KNOWN_STDLIB_TYPE_DECL

include/swift/AST/Module.h

@@ -734,7 +734,20 @@ class ModuleDecl : public DeclContext, public TypeDecl {
 
   /// Calls \p callback for each source file of the module.
   void collectBasicSourceFileInfo(
-      llvm::function_ref<void(const BasicSourceFileInfo &)> callback);
+      llvm::function_ref<void(const BasicSourceFileInfo &)> callback) const;
+
+public:
+  /// Retrieve a fingerprint value that summarizes the contents of this module.
+  ///
+  /// This interface hash a of a module is guaranteed to change if the interface
+  /// hash of any of its (primary) source files changes. For example, when
+  /// building incrementally, the interface hash of this module will change when
+  /// the primaries contributing to its content changes. In contrast, when
+  /// a module is deserialized, the hash of every source file contributes to
+  /// the module's interface hash. It therefore serves as an effective, if
+  /// coarse-grained, way of determining when top-level changes to a module's
+  /// contents have been made.
+  Fingerprint getFingerprint() const;
 
   SourceRange getSourceRange() const { return SourceRange(); }