Merge remote-tracking branch 'apple/main' into katei/merge-main-2020-10-12

Author: kateinoigakukun

CHANGELOG.md

@@ -27,6 +27,20 @@ CHANGELOG
 Swift Next
 ----------
 
+* [SR-10069][]:
+
+  Function overloading now works in local contexts, making the following valid:
+
+  ```swift
+  func outer(x: Int, y: String) {
+    func doIt(_: Int) {}
+    func doIt(_: String) {}
+
+    doIt(x) // calls the first 'doIt(_:)' with an Int value
+    doIt(y) // calls the second 'doIt(_:)' with a String value
+  }
+  ```
+
 * [SE-0284][]:
 
   Functions, subscripts, and initializers may now have more than one variadic parameter, as long as all parameters which follow variadic parameters are labeled. This makes declarations like the following valid:
@@ -8196,6 +8210,7 @@ Swift 1.0
 [SR-8974]: <https://bugs.swift.org/browse/SR-8974>
 [SR-9043]: <https://bugs.swift.org/browse/SR-9043>
 [SR-9827]: <https://bugs.swift.org/browse/SR-9827>
+[SR-10069]: <https://bugs.swift.org/browse/SR-10069>
 [SR-11298]: <https://bugs.swift.org/browse/SR-11298>
 [SR-11429]: <https://bugs.swift.org/browse/SR-11429>
 [SR-11700]: <https://bugs.swift.org/browse/SR-11700>

docs/HowToGuides/GettingStarted.md

@@ -97,7 +97,7 @@ toolchain as a one-off, there are a couple of differences:
    or a specific snapshot. You can update the branch/tag for all repositories
    as follows:
    ```sh
-   utils/update-checkout --branch mybranchname
+   utils/update-checkout --scheme mybranchname
    # OR
    utils/update-checkout --tag mytagname
    ```

include/swift/AST/ASTScope.h

@@ -194,10 +194,6 @@ class ASTScopeImpl {
 #pragma mark - source ranges
 
 public:
-  /// Return signum of ranges. Centralize the invariant that ASTScopes use ends.
-  static int compare(SourceRange, SourceRange, const SourceManager &,
-                     bool ensureDisjoint);
-
   CharSourceRange getCharSourceRangeOfScope(SourceManager &SM,
                                             bool omitAssertions = false) const;
   bool isCharSourceRangeCached() const;
@@ -224,7 +220,6 @@ class ASTScopeImpl {
   virtual NullablePtr<DeclAttribute> getDeclAttributeIfAny() const {
     return nullptr;
   }
-  virtual NullablePtr<const void> getReferrent() const { return nullptr; }
 
 #pragma mark - debugging and printing
 
@@ -402,7 +397,6 @@ class ASTSourceFileScope final : public ASTScopeImpl {
 public:
   SourceFile *const SF;
   ScopeCreator *const scopeCreator;
-  ASTScopeImpl *insertionPoint;
 
   ASTSourceFileScope(SourceFile *SF, ScopeCreator *scopeCreator);
 
@@ -470,9 +464,6 @@ class Portion {
   virtual NullablePtr<const ASTScopeImpl>
   getLookupLimitFor(const GenericTypeOrExtensionScope *) const;
 
-  virtual const Decl *
-  getReferrentOfScope(const GenericTypeOrExtensionScope *s) const;
-
   virtual NullablePtr<ASTScopeImpl>
   insertionPointForDeferredExpansion(IterableTypeScope *) const = 0;
   };
@@ -493,9 +484,6 @@ class Portion {
     NullablePtr<const ASTScopeImpl>
     getLookupLimitFor(const GenericTypeOrExtensionScope *) const override;
 
-    const Decl *
-    getReferrentOfScope(const GenericTypeOrExtensionScope *s) const override;
-
     NullablePtr<ASTScopeImpl>
     insertionPointForDeferredExpansion(IterableTypeScope *) const override;
   };
@@ -570,7 +558,6 @@ class GenericTypeOrExtensionScope : public ASTScopeImpl {
 
   virtual Decl *getDecl() const = 0;
   NullablePtr<Decl> getDeclIfAny() const override { return getDecl(); }
-  NullablePtr<const void> getReferrent() const override;
 
 private:
   AnnotatedInsertionPoint
@@ -745,7 +732,6 @@ class GenericParamScope final : public ASTScopeImpl {
 
   /// Actually holder is always a GenericContext, need to test if
   /// ProtocolDecl or SubscriptDecl but will refactor later.
-  NullablePtr<const void> getReferrent() const override;
   std::string getClassName() const override;
   SourceRange
   getSourceRangeOfThisASTNode(bool omitAssertions = false) const override;
@@ -788,8 +774,6 @@ class AbstractFunctionDeclScope final : public ASTScopeImpl {
   virtual NullablePtr<Decl> getDeclIfAny() const override { return decl; }
   Decl *getDecl() const { return decl; }
 
-  NullablePtr<const void> getReferrent() const override;
-
 protected:
   NullablePtr<const GenericParamList> genericParams() const override;
 };
@@ -813,7 +797,6 @@ class ParameterListScope final : public ASTScopeImpl {
 
 private:
   void expandAScopeThatDoesNotCreateANewInsertionPoint(ScopeCreator &);
-  SourceLoc fixupEndForBadInput(SourceRange) const;
 
 public:
   std::string getClassName() const override;
@@ -902,7 +885,6 @@ class AttachedPropertyWrapperScope final : public ASTScopeImpl {
   NullablePtr<DeclAttribute> getDeclAttributeIfAny() const override {
     return attr;
   }
-  NullablePtr<const void> getReferrent() const override;
 
 private:
   void expandAScopeThatDoesNotCreateANewInsertionPoint(ScopeCreator &);
@@ -970,8 +952,6 @@ class PatternEntryDeclScope final : public AbstractPatternEntryScope {
   SourceRange
   getSourceRangeOfThisASTNode(bool omitAssertions = false) const override;
 
-  NullablePtr<const void> getReferrent() const override;
-
 protected:
   bool lookupLocalsOrMembers(DeclConsumer) const override;
   bool isLabeledStmtLookupTerminator() const override;
@@ -1072,7 +1052,6 @@ class CaptureListScope final : public ASTScopeImpl {
   getSourceRangeOfThisASTNode(bool omitAssertions = false) const override;
   NullablePtr<Expr> getExprIfAny() const override { return expr; }
   Expr *getExpr() const { return expr; }
-  NullablePtr<const void> getReferrent() const override;
   bool lookupLocalsOrMembers(DeclConsumer) const override;
 };
 
@@ -1094,7 +1073,6 @@ class ClosureParametersScope final : public ASTScopeImpl {
   }
   NullablePtr<Expr> getExprIfAny() const override { return closureExpr; }
   Expr *getExpr() const { return closureExpr; }
-  NullablePtr<const void> getReferrent() const override;
 
 protected:
   ASTScopeImpl *expandSpecifically(ScopeCreator &scopeCreator) override;
@@ -1128,7 +1106,6 @@ class TopLevelCodeScope final : public ASTScopeImpl {
   getSourceRangeOfThisASTNode(bool omitAssertions = false) const override;
   virtual NullablePtr<Decl> getDeclIfAny() const override { return decl; }
   Decl *getDecl() const { return decl; }
-  NullablePtr<const void> getReferrent() const override;
 };
 
 /// The \c _@specialize attribute.
@@ -1153,7 +1130,6 @@ class SpecializeAttributeScope final : public ASTScopeImpl {
   NullablePtr<DeclAttribute> getDeclAttributeIfAny() const override {
     return specializeAttr;
   }
-  NullablePtr<const void> getReferrent() const override;
 
 protected:
   ASTScopeImpl *expandSpecifically(ScopeCreator &) override;
@@ -1183,7 +1159,6 @@ class DifferentiableAttributeScope final : public ASTScopeImpl {
   NullablePtr<DeclAttribute> getDeclAttributeIfAny() const override {
     return differentiableAttr;
   }
-  NullablePtr<const void> getReferrent() const override;
 
 protected:
   ASTScopeImpl *expandSpecifically(ScopeCreator &) override;
@@ -1214,7 +1189,6 @@ class SubscriptDeclScope final : public ASTScopeImpl {
 public:
   virtual NullablePtr<Decl> getDeclIfAny() const override { return decl; }
   Decl *getDecl() const { return decl; }
-  NullablePtr<const void> getReferrent() const override;
 
 protected:
   NullablePtr<const GenericParamList> genericParams() const override;
@@ -1244,7 +1218,6 @@ class AbstractStmtScope : public ASTScopeImpl {
   getSourceRangeOfThisASTNode(bool omitAssertions = false) const override;
   virtual Stmt *getStmt() const = 0;
   NullablePtr<Stmt> getStmtIfAny() const override { return getStmt(); }
-  NullablePtr<const void> getReferrent() const override;
 
 protected:
   bool isLabeledStmtLookupTerminator() const override;
@@ -1559,11 +1532,11 @@ class BraceStmtScope final : public AbstractStmtScope {
   BraceStmt *const stmt;
 
   /// Declarations which are in scope from the beginning of the statement.
-  SmallVector<ValueDecl *, 2> localFuncsAndTypes;
+  ArrayRef<ValueDecl *> localFuncsAndTypes;
 
   /// Declarations that are normally in scope only after their
   /// definition.
-  SmallVector<VarDecl *, 2> localVars;
+  ArrayRef<VarDecl *> localVars;
 
   /// The end location for bindings introduced in this scope. This can
   /// extend past the actual end of the BraceStmt in top-level code,
@@ -1573,8 +1546,8 @@ class BraceStmtScope final : public AbstractStmtScope {
 
 public:
   BraceStmtScope(BraceStmt *e,
-                 SmallVector<ValueDecl *, 2> localFuncsAndTypes,
-                 SmallVector<VarDecl *, 2> localVars,
+                 ArrayRef<ValueDecl *> localFuncsAndTypes,
+                 ArrayRef<VarDecl *> localVars,
                  SourceLoc endLoc)
       : stmt(e),
         localFuncsAndTypes(localFuncsAndTypes),

include/swift/AST/ASTTypeIDZone.def

@@ -22,7 +22,7 @@ SWIFT_TYPEID(BodyInitKindAndExpr)
 SWIFT_TYPEID(CtorInitializerKind)
 SWIFT_TYPEID(FunctionBuilderBodyPreCheck)
 SWIFT_TYPEID(GenericSignature)
-SWIFT_TYPEID(ImplicitImport)
+SWIFT_TYPEID(ImplicitImportList)
 SWIFT_TYPEID(ImplicitMemberAction)
 SWIFT_TYPEID(ParamSpecifier)
 SWIFT_TYPEID(PropertyWrapperBackingPropertyInfo)

include/swift/AST/ASTTypeIDs.h

@@ -42,7 +42,7 @@ class GenericTypeParamType;
 class InfixOperatorDecl;
 class IterableDeclContext;
 class ModuleDecl;
-struct ImplicitImport;
+struct ImplicitImportList;
 class NamedPattern;
 class NominalTypeDecl;
 class OperatorDecl;

include/swift/AST/ActorIsolation.h

@@ -24,6 +24,11 @@ class raw_ostream;
 
 namespace swift {
 class ClassDecl;
+class Type;
+
+/// Determine whether the given types are (canonically) equal, declared here
+/// to avoid having to include Types.h.
+bool areTypesEqual(Type type1, Type type2);
 
 /// Describes the actor isolation of a given declaration, which determines
 /// the actors with which it can interact.
@@ -37,20 +42,26 @@ class ActorIsolation {
     /// For example, a mutable stored property or synchronous function within
     /// the actor is isolated to the instance of that actor.
     ActorInstance,
-    /// The declaration can refer to actor-isolated state, but can also be
-    //// referenced from outside the actor.
-    ActorPrivileged,
     /// The declaration is explicitly specified to be independent of any actor,
     /// meaning that it can be used from any actor but is also unable to
     /// refer to the isolated state of any given actor.
     Independent,
+    /// The declaration is isolated to a global actor. It can refer to other
+    /// entities with the same global actor.
+    GlobalActor,
   };
 
 private:
   Kind kind;
-  ClassDecl *actor;
+  union {
+    ClassDecl *actor;
+    Type globalActor;
+    void *pointer;
+  };
 
   ActorIsolation(Kind kind, ClassDecl *actor) : kind(kind), actor(actor) { }
+  ActorIsolation(Kind kind, Type globalActor)
+      : kind(kind), globalActor(globalActor) { }
 
 public:
   static ActorIsolation forUnspecified() {
@@ -61,23 +72,28 @@ class ActorIsolation {
     return ActorIsolation(Independent, nullptr);
   }
 
-  static ActorIsolation forActorPrivileged(ClassDecl *actor) {
-    return ActorIsolation(ActorPrivileged, actor);
-  }
-
   static ActorIsolation forActorInstance(ClassDecl *actor) {
     return ActorIsolation(ActorInstance, actor);
   }
 
+  static ActorIsolation forGlobalActor(Type globalActor) {
+    return ActorIsolation(GlobalActor, globalActor);
+  }
+
   Kind getKind() const { return kind; }
 
   operator Kind() const { return getKind(); }
 
   ClassDecl *getActor() const {
-    assert(getKind() == ActorInstance || getKind() == ActorPrivileged);
+    assert(getKind() == ActorInstance);
     return actor;
   }
 
+  Type getGlobalActor() const {
+    assert(getKind() == GlobalActor);
+    return globalActor;
+  }
+
   friend bool operator==(const ActorIsolation &lhs,
                          const ActorIsolation &rhs) {
     if (lhs.kind != rhs.kind)
@@ -89,8 +105,10 @@ class ActorIsolation {
       return true;
 
     case ActorInstance:
-    case ActorPrivileged:
       return lhs.actor == rhs.actor;
+
+    case GlobalActor:
+      return areTypesEqual(lhs.globalActor, rhs.globalActor);
     }
   }
 
@@ -100,7 +118,7 @@ class ActorIsolation {
   }
 
   friend llvm::hash_code hash_value(const ActorIsolation &state) {
-    return llvm::hash_combine(state.kind, state.actor);
+    return llvm::hash_combine(state.kind, state.pointer);
   }
 };
 

include/swift/AST/Attr.def

@@ -578,6 +578,12 @@ SIMPLE_DECL_ATTR(actorIndependent, ActorIndependent,
   APIStableToAdd | APIBreakingToRemove,
   103)
 
+SIMPLE_DECL_ATTR(globalActor, GlobalActor,
+  OnClass | OnStruct | OnEnum | ConcurrencyOnly |
+  ABIStableToAdd | ABIBreakingToRemove |
+  APIStableToAdd | APIBreakingToRemove,
+  104)
+
 #undef TYPE_ATTR
 #undef DECL_ATTR_ALIAS
 #undef CONTEXTUAL_DECL_ATTR_ALIAS

include/swift/AST/AvailabilitySpec.h

@@ -85,6 +85,9 @@ class PlatformVersionConstraintAvailabilitySpec : public AvailabilitySpec {
 
   SourceRange VersionSrcRange;
 
+  // Location of the macro expanded to create this spec.
+  SourceLoc MacroLoc;
+
 public:
   PlatformVersionConstraintAvailabilitySpec(PlatformKind Platform,
                                             SourceLoc PlatformLoc,
@@ -117,6 +120,10 @@ class PlatformVersionConstraintAvailabilitySpec : public AvailabilitySpec {
 
   SourceRange getSourceRange() const;
 
+  // Location of the macro expanded to create this spec.
+  SourceLoc getMacroLoc() const { return MacroLoc; }
+  void setMacroLoc(SourceLoc loc) { MacroLoc = loc; }
+
   void print(raw_ostream &OS, unsigned Indent) const;
 
   static bool classof(const AvailabilitySpec *Spec) {