Merge pull request #4465 from swiftwasm/main

[pull] swiftwasm from main

Author: kateinoigakukun

include/swift/AST/Decl.h

@@ -4875,12 +4875,22 @@ class AbstractStorageDecl : public ValueDecl {
     return getImplInfo().supportsMutation();
   }
 
-  /// isSettable - Determine whether references to this decl may appear
-  /// on the left-hand side of an assignment or as the operand of a
-  /// `&` or 'inout' operator.
+  /// Determine whether references to this storage declaration may appear
+  /// on the left-hand side of an assignment, as the operand of a
+  /// `&` or 'inout' operator, or as a component in a writable key path.
   bool isSettable(const DeclContext *UseDC,
                   const DeclRefExpr *base = nullptr) const;
 
+  /// Determine whether references to this storage declaration in Swift may
+  /// appear on the left-hand side of an assignment, as the operand of a
+  /// `&` or 'inout' operator, or as a component in a writable key path.
+  ///
+  /// This method is equivalent to \c isSettable with the exception of
+  /// 'optional' storage requirements, which lack support for direct writes
+  /// in Swift.
+  bool isSettableInSwift(const DeclContext *UseDC,
+                         const DeclRefExpr *base = nullptr) const;
+
   /// Does this storage declaration have explicitly-defined accessors
   /// written in the source?
   bool hasParsedAccessors() const;
@@ -7989,6 +7999,17 @@ inline bool AbstractStorageDecl::isSettable(const DeclContext *UseDC,
   return sd->supportsMutation();
 }
 
+inline bool
+AbstractStorageDecl::isSettableInSwift(const DeclContext *UseDC,
+                                       const DeclRefExpr *base) const {
+  // TODO: Writing to an optional storage requirement is not supported in Swift.
+  if (getAttrs().hasAttribute<OptionalAttr>()) {
+    return false;
+  }
+
+  return isSettable(UseDC, base);
+}
+
 inline void
 AbstractStorageDecl::overwriteSetterAccess(AccessLevel accessLevel) {
   Accessors.setInt(accessLevel);

include/swift/AST/DiagnosticsSema.def

@@ -1160,7 +1160,7 @@ NOTE(unwrap_with_guard,none,
 ERROR(optional_base_not_unwrapped,none,
       "value of optional type %0 must be unwrapped to refer to member %1 of "
       "wrapped base type %2", (Type, DeclNameRef, Type))
-ERROR(invalid_optional_infered_keypath_root, none,
+ERROR(invalid_optional_inferred_keypath_root, none,
       "key path root inferred as optional type %0 must be unwrapped to refer to member %1 "
       "of unwrapped type %2", (Type, DeclNameRef, Type))
 NOTE(optional_base_chain,none,
@@ -4028,7 +4028,7 @@ ERROR(passing_noattrfunc_to_attrfunc,none,
       "passing %select{non-escaping|non-sendable}0 parameter %1 to function "
       "expecting %select{an @escaping|a @Sendable}0 closure",
       (unsigned, Identifier))
-ERROR(converting_noespace_param_to_generic_type,none,
+ERROR(converting_noescape_param_to_generic_type,none,
       "converting non-escaping parameter %0 to generic parameter %1 may allow it to escape",
       (Identifier, Type))
 ERROR(assigning_noattrfunc_to_attrfunc,none,
@@ -5654,7 +5654,7 @@ ERROR(attr_requires_availability_for_platform,none,
 // This doesn't display as an availability diagnostic, but it's
 // implemented there and fires when these subscripts are marked
 // unavailable, so it seems appropriate to put it here.
-ERROR(availabilty_string_subscript_migration, none,
+ERROR(availability_string_subscript_migration, none,
       "subscripts returning String were obsoleted in Swift 4; explicitly "
       "construct a String from subscripted result", ())
 

include/swift/AST/ExtInfo.h

@@ -358,8 +358,6 @@ class ASTExtInfoBuilder {
 
   constexpr Representation getRepresentation() const {
     unsigned rawRep = bits & RepresentationMask;
-    assert(rawRep <= unsigned(Representation::Last) &&
-           "unexpected SIL representation");
     return Representation(rawRep);
   }
 

include/swift/AST/NameLookup.h

@@ -548,6 +548,11 @@ SmallVector<InheritedNominalEntry, 4> getDirectlyInheritedNominalTypeDecls(
 SelfBounds getSelfBoundsFromWhereClause(
     llvm::PointerUnion<const TypeDecl *, const ExtensionDecl *> decl);
 
+/// Retrieve the set of nominal type declarations that appear as the
+/// constraint type of any "Self" constraints in the generic signature of the
+/// given protocol or protocol extension.
+SelfBounds getSelfBoundsFromGenericSignature(const ExtensionDecl *extDecl);
+
 /// Retrieve the TypeLoc at the given \c index from among the set of
 /// type declarations that are directly "inherited" by the given declaration.
 inline const TypeLoc &getInheritedTypeLocAtIndex(

include/swift/AST/NameLookupRequests.h

@@ -270,6 +270,22 @@ class SelfBoundsFromWhereClauseRequest
            llvm::PointerUnion<const TypeDecl *, const ExtensionDecl *>) const;
 };
 
+/// Request the nominal types that occur as the right-hand side of "Self: Foo"
+/// constraints in the generic signature of a protocol extension.
+class SelfBoundsFromGenericSignatureRequest
+    : public SimpleRequest<SelfBoundsFromGenericSignatureRequest,
+                           SelfBounds(const ExtensionDecl *),
+                           RequestFlags::Uncached> {
+public:
+  using SimpleRequest::SimpleRequest;
+
+private:
+  friend SimpleRequest;
+
+  // Evaluation.
+  SelfBounds evaluate(Evaluator &evaluator, const ExtensionDecl *extDecl) const;
+};
+
 /// Request all type aliases and nominal types that appear in the "where"
 /// clause of an extension.
 class TypeDeclsFromWhereClauseRequest :

include/swift/AST/NameLookupTypeIDZone.def

@@ -68,6 +68,9 @@ SWIFT_REQUEST(NameLookup, SelfBoundsFromWhereClauseRequest,
               SelfBounds(llvm::PointerUnion<const TypeDecl *,
                                             const ExtensionDecl *>),
               Uncached, NoLocationInfo)
+SWIFT_REQUEST(NameLookup, SelfBoundsFromGenericSignatureRequest,
+              SelfBounds(const ExtensionDecl * extDecl),
+              Uncached, NoLocationInfo)
 SWIFT_REQUEST(NameLookup, SuperclassDeclRequest, ClassDecl *(NominalTypeDecl *),
               SeparatelyCached, NoLocationInfo)
 SWIFT_REQUEST(NameLookup, HasMissingDesignatedInitializersRequest,

include/swift/Basic/LangOptions.h

@@ -759,10 +759,6 @@ namespace swift {
     /// parameters of closures.
     bool EnableOneWayClosureParameters = false;
 
-    /// Enable experimental support for type inference through multi-statement
-    /// closures.
-    bool EnableMultiStatementClosureInference = true;
-
     /// See \ref FrontendOptions.PrintFullConvention
     bool PrintFullConvention = false;
   };

include/swift/Frontend/Frontend.h

@@ -606,7 +606,7 @@ class CompilerInstance {
   void setupStatsReporter();
   void setupDependencyTrackerIfNeeded();
 
-  /// \return false if successsful, true on error.
+  /// \return false if successful, true on error.
   bool setupDiagnosticVerifierIfNeeded();
 
   Optional<unsigned> setUpCodeCompletionBuffer();

include/swift/Frontend/FrontendInputsAndOutputs.h

@@ -142,7 +142,7 @@ class FrontendInputsAndOutputs {
   assertMustNotBeMoreThanOnePrimaryInputUnlessBatchModeChecksHaveBeenBypassed()
       const;
 
-  // Count-dependend readers:
+  // Count-dependent readers:
 
   /// \return the unique primary input, if one exists.
   const InputFile *getUniquePrimaryInput() const;

include/swift/Frontend/FrontendOptions.h

@@ -444,8 +444,8 @@ class FrontendOptions {
   bool IncludeSPISymbolsInSymbolGraph = false;
 
   /// Whether to reuse a frontend (i.e. compiler instance) for multiple
-  /// compiletions. This prevents ASTContext being freed.
-  bool ReuseFrontendForMutipleCompilations = false;
+  /// compilations. This prevents ASTContext being freed.
+  bool ReuseFrontendForMultipleCompilations = false;
 
   /// This is used to obfuscate the serialized search paths so we don't have
   /// to encode the actual paths into the .swiftmodule file.