Update master to build with Xcode 11 beta, macOS 10.15, iOS 13, tvOS 13, and watchOS 6 SDKs

Author: shahmishal

Diff for: apinotes/Accelerate.apinotes

@@ -1,7 +1,5 @@
 set(sources
-  Accelerate.apinotes
   Dispatch.apinotes
-  ScriptingBridge.apinotes
   os.apinotes
 )
 

Diff for: apinotes/CMakeLists.txt

@@ -394,6 +394,7 @@ DECL_ATTR(_private, PrivateImport,
 SIMPLE_DECL_ATTR(_alwaysEmitIntoClient, AlwaysEmitIntoClient,
   OnVar | OnSubscript | OnAbstractFunction | UserInaccessible,
   83)
+
 SIMPLE_DECL_ATTR(_implementationOnly, ImplementationOnly,
   OnImport | UserInaccessible,
   84)
@@ -407,6 +408,10 @@ SIMPLE_DECL_ATTR(_disfavoredOverload, DisfavoredOverload,
   OnAbstractFunction | OnVar | OnSubscript | UserInaccessible,
   87)
 
+SIMPLE_DECL_ATTR(IBSegueAction, IBSegueAction,
+  OnFunc,
+  95)
+
 #undef TYPE_ATTR
 #undef DECL_ATTR_ALIAS
 #undef CONTEXTUAL_DECL_ATTR_ALIAS

Diff for: apinotes/ScriptingBridge.apinotes

@@ -83,7 +83,12 @@ class PlatformVersionConstraintAvailabilitySpec : public AvailabilitySpec {
   /// The required platform.
   PlatformKind getPlatform() const { return Platform; }
   SourceLoc getPlatformLoc() const { return PlatformLoc; }
-  
+
+  /// Returns true when the constraint is for a platform that was not
+  /// recognized. This enables better recovery during parsing but should never
+  /// be true after parsing is completed.
+  bool isUnrecognizedPlatform() const { return Platform == PlatformKind::none; }
+
   // The platform version to compare against.
   llvm::VersionTuple getVersion() const { return Version; }
   SourceRange getVersionSrcRange() const { return VersionSrcRange; }

Diff for: include/swift/AST/Attr.def

@@ -6069,8 +6069,8 @@ class FuncDecl : public AbstractFunctionDecl {
   /// True if the function is a defer body.
   bool isDeferBody() const;
 
-  /// Perform basic checking to determine whether the @IBAction attribute can
-  /// be applied to this function.
+  /// Perform basic checking to determine whether the @IBAction or
+  /// @IBSegueAction attribute can be applied to this function.
   bool isPotentialIBActionTarget() const;
 };
 

Diff for: include/swift/AST/AvailabilitySpec.h

@@ -1575,8 +1575,8 @@ ERROR(avail_query_expected_version_number,PointsToFirstBadToken,
 ERROR(avail_query_expected_rparen,PointsToFirstBadToken,
       "expected ')' in availability query", ())
 
-ERROR(avail_query_unrecognized_platform_name,
-      PointsToFirstBadToken, "unrecognized platform name %0", (Identifier))
+WARNING(avail_query_unrecognized_platform_name,
+        PointsToFirstBadToken, "unrecognized platform name %0", (Identifier))
 
 ERROR(avail_query_disallowed_operator, PointsToFirstBadToken,
       "'%0' cannot be used in an availability condition", (StringRef))

Diff for: include/swift/AST/Decl.h

@@ -1169,17 +1169,25 @@ ERROR(invalid_ibdesignable_extension,none,
 ERROR(invalid_ibinspectable,none,
       "only instance properties can be declared @%0", (StringRef))
 ERROR(invalid_ibaction_decl,none,
-      "only instance methods can be declared @IBAction", ())
+      "only instance methods can be declared @%0", (StringRef))
 ERROR(invalid_ibaction_result,none,
-      "methods declared @IBAction must return 'Void' (not %0)", (Type))
+      "methods declared @%0 must %select{|not }1return a value", (StringRef, bool))
 ERROR(invalid_ibaction_argument_count,none,
-      "@IBAction methods %select{must have a single argument"
-      "|can only have up to 2 arguments}0", (bool))
-ERROR(ibaction_nonobjc_class_argument,none,
-      "argument to @IBAction method cannot have non-'@objc' class type %0",
-      (Type))
-ERROR(ibaction_nonobject_argument,none,
-      "argument to @IBAction method cannot have non-object type %0", (Type))
+      "@%0 methods must have %1 to %2 arguments",
+      (StringRef, int, int))
+ERROR(invalid_ibaction_argument_count_exact,none,
+      "@%0 methods must have %2 argument%s2",
+      (StringRef, int, int))
+ERROR(invalid_ibaction_argument_count_max,none,
+      "@%0 methods must have at most %2 argument%s2",
+      (StringRef, int, int))
+ERROR(ibsegueaction_objc_method_family,none,
+      "@%0 method cannot have selector %1 because it has special memory "
+      "management behavior", (StringRef, ObjCSelector))
+NOTE(fixit_rename_in_swift,none,
+     "change Swift name to %0", (DeclName))
+NOTE(fixit_rename_in_objc,none,
+     "change Objective-C selector to %0", (ObjCSelector))
 ERROR(no_objc_tagged_pointer_not_class_protocol,none,
       "@unsafe_no_objc_tagged_pointer can only be applied to class protocols",
       ())
@@ -3664,8 +3672,8 @@ ERROR(objc_in_generic_extension,none,
       "extensions of %select{classes from generic context|generic classes}0 "
       "cannot contain '@objc' members", (bool))
 ERROR(objc_in_resilient_extension,none,
-      "extensions of classes built with library evolution support "
-      "cannot contain '@objc' members", ())
+      "'@objc' %0 in extension of subclass of %1 requires %2 %3",
+      (DescriptiveDeclKind, Identifier, StringRef, llvm::VersionTuple))
 ERROR(objc_operator, none,
       "operator methods cannot be declared @objc", ())
 ERROR(objc_operator_proto, none,
@@ -3687,9 +3695,8 @@ ERROR(objc_for_generic_class,none,
       "generic subclasses of '@objc' classes cannot have an explicit '@objc' "
       "because they are not directly visible from Objective-C", ())
 ERROR(objc_for_resilient_class,none,
-      "classes built with library evolution support cannot have explicit "
-      "'@objc' subclasses because they are not directly "
-      "visible from Objective-C", ())
+      "explicit '@objc' on subclass of %0 requires %1 %2",
+      (Identifier, StringRef, llvm::VersionTuple))
 ERROR(objc_getter_for_nonobjc_property,none,
       "'@objc' getter for non-'@objc' property", ())
 ERROR(objc_getter_for_nonobjc_subscript,none,
@@ -3730,7 +3737,7 @@ ERROR(objc_extension_not_class,none,
       "'@objc' can only be applied to an extension of a class", ())
 
 // If you change this, also change enum ObjCReason
-#define OBJC_ATTR_SELECT "select{marked @_cdecl|marked dynamic|marked @objc|marked @IBOutlet|marked @IBAction|marked @NSManaged|a member of an @objc protocol|implicitly @objc|an @objc override|an implementation of an @objc requirement|marked @IBInspectable|marked @GKInspectable|in an @objc extension of a class (without @nonobjc)}"
+#define OBJC_ATTR_SELECT "select{marked @_cdecl|marked dynamic|marked @objc|marked @IBOutlet|marked @IBAction|marked @IBSegueAction|marked @NSManaged|a member of an @objc protocol|implicitly @objc|an @objc override|an implementation of an @objc requirement|marked @IBInspectable|marked @GKInspectable|in an @objc extension of a class (without @nonobjc)}"
 
 WARNING(attribute_meaningless_when_nonobjc,none,
         "'@%0' attribute is meaningless on a property that cannot be "

Diff for: include/swift/AST/DiagnosticsParse.def

@@ -305,11 +305,6 @@ namespace swift {
     /// set to true.
     bool ExperimentalDependenciesIncludeIntrafileOnes = false;
 
-    /// Enable experimental support for emitting Objective-C resilient class
-    /// stubs. This is a language option since it also determines if we admit
-    /// @objc members in extensions of classes with resilient ancestry.
-    bool EnableObjCResilientClassStubs = false;
-
     /// Sets the target we are building for and updates platform conditions
     /// to match.
     ///
@@ -403,6 +398,15 @@ namespace swift {
     // - watchOS 5.2
     bool doesTargetSupportObjCGetClassHook() const;
 
+    // The following deployment targets ship an Objective-C runtime supporting
+    // the objc_loadClassref() entry point:
+    //
+    // - macOS 10.15
+    // - iOS 13
+    // - tvOS 13
+    // - watchOS 6
+    bool doesTargetSupportObjCClassStubs() const;
+
     /// Returns true if the given platform condition argument represents
     /// a supported target operating system.
     ///

Diff for: include/swift/AST/DiagnosticsSema.def

@@ -220,13 +220,16 @@ AvailabilityContext AvailabilityInference::inferForType(Type t) {
 AvailabilityContext ASTContext::getOpaqueTypeAvailability() {
   auto target = LangOpts.Target;
 
-  if (target.isMacOSX()
-      || target.isiOS()
-      || target.isWatchOS()) {
-    // TODO: Update with OS versions that ship with runtime support
+  if (target.isMacOSX()) {
     return AvailabilityContext(
-                            VersionRange::allGTE(llvm::VersionTuple(9999,0,0)));
+                            VersionRange::allGTE(llvm::VersionTuple(10,15,0)));
+  } else if (target.isiOS()) {
+    return AvailabilityContext(
+                            VersionRange::allGTE(llvm::VersionTuple(13,0,0)));
+  } else if (target.isWatchOS()) {
+    return AvailabilityContext(
+                            VersionRange::allGTE(llvm::VersionTuple(6,0,0)));
+  } else {
+    return AvailabilityContext::alwaysAvailable();
   }
-  
-  return AvailabilityContext::alwaysAvailable();
 }

Diff for: include/swift/Basic/LangOptions.h

@@ -284,11 +284,24 @@ bool LangOptions::doesTargetSupportObjCMetadataUpdateCallback() const {
   if (Target.isWatchOS())
     return !Target.isOSVersionLT(5, 2);
 
-  // If we're running on a non-Apple platform, we still want to allow running
-  // tests that -enable-objc-interop.
+  // Don't assert if we're running on a non-Apple platform; we still
+  // want to allow running tests that -enable-objc-interop.
   return false;
 }
 
 bool LangOptions::doesTargetSupportObjCGetClassHook() const {
   return doesTargetSupportObjCMetadataUpdateCallback();
 }
+
+bool LangOptions::doesTargetSupportObjCClassStubs() const {
+  if (Target.isMacOSX())
+    return !Target.isMacOSXVersionLT(10, 15);
+  if (Target.isiOS()) // also returns true on tvOS
+    return !Target.isOSVersionLT(13);
+  if (Target.isWatchOS())
+    return !Target.isOSVersionLT(6);
+
+  // Don't assert if we're running on a non-Apple platform; we still
+  // want to allow running tests that -enable-objc-interop.
+  return false;
+}

Diff for: lib/AST/Availability.cpp

@@ -4169,6 +4169,8 @@ namespace {
             new (Impl.SwiftContext) IBActionAttr(/*IsImplicit=*/false));
       }
 
+      // FIXME: Is there an IBSegueAction equivalent?
+
       // Check whether there's some special method to import.
       if (!forceClassMethod) {
         if (dc == Impl.importDeclContextOf(decl, decl->getDeclContext()) &&

Diff for: lib/Basic/LangOptions.cpp

@@ -484,9 +484,6 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
   Opts.DisableConstraintSolverPerformanceHacks |=
       Args.hasArg(OPT_disable_constraint_solver_performance_hacks);
 
-  Opts.EnableObjCResilientClassStubs =
-      Args.hasArg(OPT_enable_objc_resilient_class_stubs);
-
   // Must be processed after any other language options that could affect
   // platform conditions.
   bool UnsupportedOS, UnsupportedArch;

Diff for: lib/ClangImporter/ImportDecl.cpp

@@ -1244,17 +1244,24 @@ bool IndexSwiftASTWalker::initFuncDeclIndexSymbol(FuncDecl *D,
     Info.roles |= (SymbolRoleSet)SymbolRole::Dynamic;
   }
 
-  if (D->getAttrs().hasAttribute<IBActionAttr>()) {
-    // Relate with type of the first parameter using RelationIBTypeOf.
-    if (D->hasImplicitSelfDecl()) {
-      auto paramList = D->getParameters();
-      if (!paramList->getArray().empty()) {
-        auto param = paramList->get(0);
-        if (auto nominal = param->getType()->getAnyNominal()) {
-          addRelation(Info, (SymbolRoleSet) SymbolRole::RelationIBTypeOf, nominal);
-        }
-      }
+  if (D->hasImplicitSelfDecl()) {
+    // If this is an @IBAction or @IBSegueAction method, find the sender
+    // parameter (if present) and relate the method to its type.
+    ParamDecl *senderParam = nullptr;
+
+    auto paramList = D->getParameters();
+    if (D->getAttrs().hasAttribute<IBActionAttr>()) {
+      if (paramList->size() > 0)
+        senderParam = paramList->get(0);
+    } else if (D->getAttrs().hasAttribute<IBSegueActionAttr>()) {
+      if (paramList->size() > 1)
+        senderParam = paramList->get(1);
     }
+
+    if (senderParam)
+      if (auto nominal = senderParam->getType()->getAnyNominal())
+        addRelation(Info, (SymbolRoleSet) SymbolRole::RelationIBTypeOf,
+                    nominal);
   }
 
   if (auto Group = D->getGroupName())

Diff for: lib/Frontend/CompilerInvocation.cpp

@@ -84,7 +84,8 @@ static bool isUnitTest(const ValueDecl *D) {
 static void setFuncSymbolInfo(const FuncDecl *FD, SymbolInfo &sym) {
   sym.Kind = SymbolKind::Function;
 
-  if (FD->getAttrs().hasAttribute<IBActionAttr>())
+  if (FD->getAttrs().hasAttribute<IBActionAttr>() ||
+      FD->getAttrs().hasAttribute<IBSegueActionAttr>())
     sym.Properties |= SymbolProperty::IBAnnotated;
 
   if (isUnitTest(FD))

Diff for: lib/Index/Index.cpp

@@ -3649,7 +3649,7 @@ Parser::parsePlatformVersionConstraintSpec() {
   if (!Platform.hasValue() || Platform.getValue() == PlatformKind::none) {
     diagnose(Tok, diag::avail_query_unrecognized_platform_name,
              PlatformIdentifier);
-    return nullptr;
+    Platform = PlatformKind::none;
   }
 
   // Register the platform name as a keyword token.

Diff for: lib/Index/IndexSymbol.cpp

@@ -1214,9 +1214,10 @@ static void parseGuardedPattern(Parser &P, GuardedPattern &result,
   }
 }
 
-/// Validate availability spec list, emitting diagnostics if necessary.
+/// Validate availability spec list, emitting diagnostics if necessary and removing
+/// specs for unrecognized platforms.
 static void validateAvailabilitySpecList(Parser &P,
-                                         ArrayRef<AvailabilitySpec *> Specs) {
+    SmallVectorImpl<AvailabilitySpec *> &Specs) {
   llvm::SmallSet<PlatformKind, 4> Platforms;
   bool HasOtherPlatformSpec = false;
 
@@ -1228,7 +1229,9 @@ static void validateAvailabilitySpecList(Parser &P,
     return;
   }
 
+  SmallVector<AvailabilitySpec *, 5> RecognizedSpecs;
   for (auto *Spec : Specs) {
+    RecognizedSpecs.push_back(Spec);
     if (isa<OtherPlatformAvailabilitySpec>(Spec)) {
       HasOtherPlatformSpec = true;
       continue;
@@ -1243,6 +1246,13 @@ static void validateAvailabilitySpecList(Parser &P,
     }
 
     auto *VersionSpec = cast<PlatformVersionConstraintAvailabilitySpec>(Spec);
+    // We keep specs for unrecognized platforms around for error recovery
+    // during parsing but remove them once parsing is completed.
+    if (VersionSpec->isUnrecognizedPlatform()) {
+      RecognizedSpecs.pop_back();
+      continue;
+    }
+
     bool Inserted = Platforms.insert(VersionSpec->getPlatform()).second;
     if (!Inserted) {
       // Rule out multiple version specs referring to the same platform.
@@ -1260,6 +1270,8 @@ static void validateAvailabilitySpecList(Parser &P,
     P.diagnose(InsertWildcardLoc, diag::availability_query_wildcard_required)
         .fixItInsertAfter(InsertWildcardLoc, ", *");
   }
+
+  Specs = RecognizedSpecs;
 }
 
 // #available(...)