Merge pull request #4330 from swiftwasm/main

[pull] swiftwasm from main

Author: kateinoigakukun

include/swift/AST/Attr.def

@@ -494,7 +494,7 @@ SIMPLE_DECL_ATTR(_implementationOnly, ImplementationOnly,
   ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIStableToRemove,
   84)
 DECL_ATTR(_custom, Custom,
-  OnAnyDecl | UserInaccessible |
+  OnAnyDecl | RejectByParser |
   ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIStableToRemove,
   85)
 SIMPLE_DECL_ATTR(propertyWrapper, PropertyWrapper,
@@ -718,7 +718,7 @@ DECL_ATTR(exclusivity, Exclusivity,
   128)
 
 DECL_ATTR(_backDeploy, BackDeploy,
-  OnAbstractFunction |
+  OnAbstractFunction | OnAccessor | OnSubscript | OnVar |
   AllowMultipleAttributes | LongAttribute | UserInaccessible |
   ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIBreakingToRemove,
   129)

include/swift/AST/Decl.h

@@ -825,6 +825,11 @@ class alignas(1 << DeclAlignInBits) Decl : public ASTAllocated<Decl> {
   /// This function won't consider the parent context to get the information.
   Optional<llvm::VersionTuple> getIntroducedOSVersion(PlatformKind Kind) const;
 
+  /// Returns the OS version in which the decl became ABI as specified by the
+  /// @_backDeploy attribute.
+  Optional<llvm::VersionTuple>
+  getBackDeployBeforeOSVersion(PlatformKind Kind) const;
+
   /// Returns the starting location of the entire declaration.
   SourceLoc getStartLoc() const { return getSourceRange().Start; }
 
@@ -998,12 +1003,10 @@ class alignas(1 << DeclAlignInBits) Decl : public ASTAllocated<Decl> {
   /// deployment target.
   bool isWeakImported(ModuleDecl *fromModule) const;
 
-  /// Returns true if the nature of this declaration allows overrides.
-  /// Note that this does not consider whether it is final or whether
-  /// the class it's on is final.
+  /// Returns true if the nature of this declaration allows overrides syntactically.
   ///
   /// If this returns true, the decl can be safely casted to ValueDecl.
-  bool isPotentiallyOverridable() const;
+  bool isSyntacticallyOverridable() const;
 
   /// Retrieve the global actor attribute that applies to this declaration,
   /// if any.
@@ -7930,13 +7933,16 @@ inline unsigned ValueDecl::getNumCurryLevels() const {
   return curryLevels;
 }
 
-inline bool Decl::isPotentiallyOverridable() const {
+inline bool Decl::isSyntacticallyOverridable() const {
   if (isa<VarDecl>(this) ||
       isa<SubscriptDecl>(this) ||
       isa<FuncDecl>(this) ||
       isa<DestructorDecl>(this)) {
+    if (static_cast<const ValueDecl*>(this)->isFinal()) {
+      return false;
+    }
     auto classDecl = getDeclContext()->getSelfClassDecl();
-    return classDecl && !classDecl->isActor();
+    return classDecl && !classDecl->isActor() && !classDecl->isFinal();
   } else {
     return false;
   }

include/swift/AST/DiagnosticsSema.def

@@ -1599,26 +1599,12 @@ WARNING(option_set_zero_constant,none,
 NOTE(option_set_empty_set_init,none,
      "use [] to silence this warning", ())
 
-// FIXME(backDeploy): Refactor to share with back deployment attr
-ERROR(originally_defined_in_dupe_platform,none,
-      "duplicate version number for platform %0", (StringRef))
-
 ERROR(originally_definedin_topleve_decl,none,
       "@%0 is only applicable to top-level decl", (StringRef))
 
-// FIXME(backDeploy): Refactor to share with back deployment attr
-ERROR(originally_definedin_need_available,none,
-      "need @available attribute for @%0", (StringRef))
-
 ERROR(originally_definedin_must_not_before_available_version,none,
       "symbols are moved to the current module before they were available in the OSs", (StringRef))
 
-// FIXME(backDeploy): Refactor to share with back deployment attr
-WARNING(originally_defined_in_on_non_public,
-       none, "@%0 does not have any effect on "
-       "%select{private|fileprivate|internal|%error|%error}1 declarations",
-       (StringRef, AccessLevel))
-
 // Alignment attribute
 ERROR(alignment_not_power_of_two,none,
       "alignment value must be a power of two", ())
@@ -3139,10 +3125,28 @@ ERROR(attr_not_on_variadic_parameters,none,
       "'%0' must not be used on variadic parameters", (StringRef))
 ERROR(attr_not_on_subscript_parameters,none,
       "'%0' must not be used on subscript parameters", (StringRef))
+ERROR(attr_not_on_stored_properties,none,
+      "'%0' must not be used on stored properties", (DeclAttribute))
+
+WARNING(attr_has_no_effect_on_decl_with_access_level,none,
+       "'%0' does not have any effect on "
+       "%select{private|fileprivate|internal|%error|%error}1 declarations",
+       (DeclAttribute, AccessLevel))
+ERROR(attr_not_on_decl_with_invalid_access_level,none,
+      "'%0' may not be used on "
+      "%select{private|fileprivate|internal|%error|%error}1 declarations",
+      (DeclAttribute, AccessLevel))
+
+ERROR(attr_has_no_effect_decl_not_available_before,none,
+      "'%0' has no effect because %1 is not available before %2 %3",
+      (DeclAttribute, DeclName, StringRef, llvm::VersionTuple))
 
 ERROR(attr_ambiguous_reference_to_decl,none,
       "ambiguous reference to %0 in '@%1' attribute", (DeclNameRef, StringRef))
 
+ERROR(attr_contains_multiple_versions_for_platform,none,
+      "'%0' contains multiple versions for %1", (DeclAttribute, StringRef))
+
 ERROR(override_final,none,
       "%0 overrides a 'final' %1", (DescriptiveDeclKind, DescriptiveDeclKind))
 
@@ -3157,6 +3161,10 @@ ERROR(final_not_allowed_here,none,
       "'final' may only be applied to classes, properties, methods, and "
       "subscripts", ())
 
+ERROR(attr_incompatible_with_non_final,none,
+      "'%0' cannot be applied to a non-final %1",
+      (DeclAttribute, DescriptiveDeclKind))
+
 ERROR(final_not_on_accessors,none,
       "'final' cannot be applied to accessors, it must be put on the "
       "%select{var|let|subscript}0", (unsigned))
@@ -5615,6 +5623,14 @@ ERROR(availability_macro_in_inlinable, none,
       "availability macro cannot be used in inlinable %0",
       (DescriptiveDeclKind))
 
+ERROR(attr_requires_decl_availability_for_platform,none,
+      "'%0' requires that %1 have explicit availability for %2",
+      (DeclAttribute, DeclName, StringRef))
+
+ERROR(attr_requires_availability_for_platform,none,
+      "'%0' requires explicit availability for %1",
+      (DeclAttribute, StringRef))
+
 // 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.
@@ -6164,6 +6180,10 @@ ERROR(differentiable_programming_attr_used_without_required_module, none,
       "'@%0' attribute used without importing module %1",
       (StringRef, Identifier))
 
+//------------------------------------------------------------------------------
+// MARK: OSLog
+//------------------------------------------------------------------------------
+
 ERROR(oslog_arg_must_be_bool_literal, none,
       "argument must be a bool literal", ())
 ERROR(oslog_arg_must_be_integer_literal, none,
@@ -6271,5 +6291,13 @@ ERROR(cannot_convert_default_value_type_to_argument_type, none,
       "cannot convert default value of type %0 to expected argument type %1 for parameter #%2",
       (Type, Type, unsigned))
 
+//------------------------------------------------------------------------------
+// MARK: Back deployment
+//------------------------------------------------------------------------------
+
+ERROR(attr_incompatible_with_back_deploy,none,
+      "'%0' cannot be applied to a back deployed %1",
+      (DeclAttribute, DescriptiveDeclKind))
+
 #define UNDEFINE_DIAGNOSTIC_MACROS
 #include "DefineDiagnosticMacros.h"

include/swift/AST/SILOptions.h

@@ -172,6 +172,8 @@ class SILOptions {
   /// Emit a mapping of profile counters for use in coverage.
   bool EmitProfileCoverageMapping = false;
 
+  bool emitTBD = false;
+
   /// Should we use a pass pipeline passed in via a json file? Null by default.
   llvm::StringRef ExternalPassPipelineFilename;
 

include/swift/IDE/DotExprCompletion.h

@@ -33,24 +33,17 @@ class DotExprTypeCheckCompletionCallback : public TypeCheckCompletionCallback {
     bool IsImplicitSingleExpressionReturn;
   };
 
-  DeclContext *DC;
   CodeCompletionExpr *CompletionExpr;
   SmallVector<Result, 4> Results;
   llvm::DenseMap<std::pair<Type, Decl *>, size_t> BaseToSolutionIdx;
-  bool GotCallback = false;
 
 public:
-  DotExprTypeCheckCompletionCallback(DeclContext *DC,
-                                     CodeCompletionExpr *CompletionExpr)
-      : DC(DC), CompletionExpr(CompletionExpr) {}
-
-  /// True if at least one solution was passed via the \c sawSolution
-  /// callback.
-  bool gotCallback() const { return GotCallback; }
+  DotExprTypeCheckCompletionCallback(CodeCompletionExpr *CompletionExpr)
+      : CompletionExpr(CompletionExpr) {}
 
   /// Typecheck the code completion expression in isolation, calling
   /// \c sawSolution for each solution formed.
-  void fallbackTypeCheck();
+  void fallbackTypeCheck(DeclContext *DC) override;
 
   void sawSolution(const constraints::Solution &solution) override;
 

include/swift/IDE/UnresolvedMemberCompletion.h

@@ -33,21 +33,12 @@ class UnresolvedMemberTypeCheckCompletionCallback
   CodeCompletionExpr *CompletionExpr;
   SmallVector<ExprResult, 4> ExprResults;
   SmallVector<Type, 1> EnumPatternTypes;
-  bool GotCallback = false;
 
 public:
   UnresolvedMemberTypeCheckCompletionCallback(
       CodeCompletionExpr *CompletionExpr)
       : CompletionExpr(CompletionExpr) {}
 
-  /// True if at least one solution was passed via the \c sawSolution
-  /// callback.
-  bool gotCallback() const { return GotCallback; }
-
-  /// Typecheck the code completion expression in its outermost expression
-  /// context, calling \c sawSolution for each solution formed.
-  void fallbackTypeCheck(DeclContext *DC);
-
   void sawSolution(const constraints::Solution &solution) override;
 
   void deliverResults(DeclContext *DC, SourceLoc DotLoc,

include/swift/Sema/CodeCompletionTypeChecking.h

@@ -36,11 +36,24 @@ namespace swift {
   }
 
   class TypeCheckCompletionCallback {
+    bool GotCallback = false;
+
   public:
+    virtual ~TypeCheckCompletionCallback() {}
+
     /// Called for each solution produced while  type-checking an expression
     /// that the code completion expression participates in.
-    virtual void sawSolution(const constraints::Solution &solution) = 0;
-    virtual ~TypeCheckCompletionCallback() {}
+    virtual void sawSolution(const constraints::Solution &solution) {
+      GotCallback = true;
+    };
+
+    /// True if at least one solution was passed via the \c sawSolution
+    /// callback.
+    bool gotCallback() const { return GotCallback; }
+
+    /// Typecheck the code completion expression in its outermost expression
+    /// context, calling \c sawSolution for each solution formed.
+    virtual void fallbackTypeCheck(DeclContext *DC);
   };
 }