Merge pull request #4525 from swiftwasm/main

kateinoigakukun · web-flow · commit 81a52f567436 · 2022-05-08T20:56:27.000+09:00
[pull] swiftwasm from main
diff --git a/include/swift/AST/DiagnosticsSema.def b/include/swift/AST/DiagnosticsSema.def
@@ -5575,10 +5575,16 @@ NOTE(note_deprecated_rename, none,
      "use '%0' instead", (StringRef))
 
 ERROR(availability_decl_more_than_enclosing, none,
-      "declaration cannot be more available than enclosing scope", ())
+      "%0 cannot be more available than enclosing scope",
+      (DescriptiveDeclKind))
+
+NOTE(availability_implicit_decl_here, none,
+     "%0 implicitly declared here with availability of %1 %2 or newer",
+     (DescriptiveDeclKind, StringRef, llvm::VersionTuple))
 
 NOTE(availability_decl_more_than_enclosing_enclosing_here, none,
-     "enclosing scope here", ())
+     "enclosing scope requires availability of %0 %1 or newer",
+     (StringRef, llvm::VersionTuple))
 
 ERROR(availability_decl_only_version_newer, none,
       "%0 is only available in %1 %2 or newer",
diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp
@@ -1906,6 +1906,12 @@ Expr *AutoClosureExpr::getUnwrappedCurryThunkExpr() const {
     return expr;
   };
 
+  auto maybeUnwrapConversions = [](Expr *expr) {
+    if (auto *covariantReturn = dyn_cast<CovariantReturnConversionExpr>(expr))
+      expr = covariantReturn->getSubExpr();
+    return expr;
+  };
+
   switch (getThunkKind()) {
   case AutoClosureExpr::Kind::None:
   case AutoClosureExpr::Kind::AsyncLet:
@@ -1916,6 +1922,7 @@ Expr *AutoClosureExpr::getUnwrappedCurryThunkExpr() const {
     body = body->getSemanticsProvidingExpr();
     body = maybeUnwrapOpenExistential(body);
     body = maybeUnwrapOptionalEval(body);
+    body = maybeUnwrapConversions(body);
 
     if (auto *outerCall = dyn_cast<ApplyExpr>(body)) {
       return outerCall->getFn();
@@ -1934,6 +1941,7 @@ Expr *AutoClosureExpr::getUnwrappedCurryThunkExpr() const {
       innerBody = innerBody->getSemanticsProvidingExpr();
       innerBody = maybeUnwrapOpenExistential(innerBody);
       innerBody = maybeUnwrapOptionalEval(innerBody);
+      innerBody = maybeUnwrapConversions(innerBody);
 
       if (auto *outerCall = dyn_cast<ApplyExpr>(innerBody)) {
         if (auto *innerCall = dyn_cast<ApplyExpr>(outerCall->getFn())) {
diff --git a/lib/ClangImporter/ClangImporter.cpp b/lib/ClangImporter/ClangImporter.cpp
@@ -2224,9 +2224,10 @@ bool PlatformAvailability::isPlatformRelevant(StringRef name) const {
     return name == "ios" || name == "ios_app_extension";
 
   case PlatformKind::macCatalyst:
+    return name == "ios" || name == "maccatalyst";
   case PlatformKind::macCatalystApplicationExtension:
-    // ClangImporter does not yet support macCatalyst.
-    return false;
+    return name == "ios" || name == "ios_app_extension" ||
+           name == "maccatalyst" || name == "maccatalyst_app_extension";
 
   case PlatformKind::tvOS:
     return name == "tvos";
diff --git a/lib/ClangImporter/ImportDecl.cpp b/lib/ClangImporter/ImportDecl.cpp
@@ -9083,9 +9083,12 @@ void ClangImporter::Implementation::importAttributes(
         llvm::StringSwitch<Optional<PlatformKind>>(Platform)
           .Case("ios", PlatformKind::iOS)
           .Case("macos", PlatformKind::macOS)
+          .Case("maccatalyst", PlatformKind::macCatalyst)
           .Case("tvos", PlatformKind::tvOS)
           .Case("watchos", PlatformKind::watchOS)
           .Case("ios_app_extension", PlatformKind::iOSApplicationExtension)
+          .Case("maccatalyst_app_extension",
+                PlatformKind::macCatalystApplicationExtension)
           .Case("macos_app_extension",
                 PlatformKind::macOSApplicationExtension)
           .Case("tvos_app_extension",
diff --git a/lib/Sema/TypeCheckAttr.cpp b/lib/Sema/TypeCheckAttr.cpp
@@ -1710,9 +1710,19 @@ void AttributeChecker::visitAvailableAttr(AvailableAttr *attr) {
 
   if (EnclosingDecl) {
     if (!AttrRange.isContainedIn(EnclosingAnnotatedRange.getValue())) {
-      diagnose(attr->getLocation(), diag::availability_decl_more_than_enclosing);
+      diagnose(D->isImplicit() ? EnclosingDecl->getLoc() : attr->getLocation(),
+               diag::availability_decl_more_than_enclosing,
+               D->getDescriptiveKind());
+      if (D->isImplicit())
+        diagnose(EnclosingDecl->getLoc(),
+                 diag::availability_implicit_decl_here,
+                 D->getDescriptiveKind(),
+                 prettyPlatformString(targetPlatform(Ctx.LangOpts)),
+                 AttrRange.getOSVersion().getLowerEndpoint());
       diagnose(EnclosingDecl->getLoc(),
-               diag::availability_decl_more_than_enclosing_enclosing_here);
+               diag::availability_decl_more_than_enclosing_enclosing_here,
+               prettyPlatformString(targetPlatform(Ctx.LangOpts)),
+               EnclosingAnnotatedRange->getOSVersion().getLowerEndpoint());
     }
   }
 
diff --git a/test/ClangImporter/objc_parse.swift b/test/ClangImporter/objc_parse.swift
@@ -315,7 +315,7 @@ func ivars(_ hive: Hive) {
   hive.queen.description() // expected-error{{value of type 'Hive' has no member 'queen'}}
 }
 
-class NSObjectable : NSObjectProtocol {
+class NSObjectable : NSObjectProtocol { // expected-error {{cannot declare conformance to 'NSObjectProtocol' in Swift; 'NSObjectable' should inherit 'NSObject' instead}}
   @objc var description : String { return "" }
   @objc(conformsToProtocol:) func conforms(to _: Protocol) -> Bool { return false }
   @objc(isKindOfClass:) func isKind(of aClass: AnyClass) -> Bool { return false }
diff --git a/test/Distributed/Runtime/distributed_actor_init_local.swift b/test/Distributed/Runtime/distributed_actor_init_local.swift
@@ -8,6 +8,8 @@
 // UNSUPPORTED: use_os_stdlib
 // UNSUPPORTED: back_deployment_runtime
 
+// REQUIRES: rdar92910719
+
 import Distributed
 
 enum MyError: Error {
diff --git a/test/Index/index_curry_thunk_objc.swift b/test/Index/index_curry_thunk_objc.swift
@@ -0,0 +1,15 @@
+// RUN: %target-swift-ide-test(mock-sdk: %clang-importer-sdk) -enable-objc-interop -print-indexed-symbols -source-filename %s | %FileCheck %s
+// REQUIRES: objc_interop
+
+import Foundation
+
+@objc
+class Foo: NSObject {
+  // CHECK-DAG: constructor/Swift | init(object:)
+  init(object: Any?) {}
+}
+
+extension Foo {
+  // CHECK-DAG: static-property/Swift | boom
+  static let boom = Foo(object: self)
+}
diff --git a/test/Inputs/clang-importer-sdk/usr/include/objc/NSObject.h b/test/Inputs/clang-importer-sdk/usr/include/objc/NSObject.h
@@ -6,6 +6,7 @@
 @class NSString;
 
 @protocol NSObject
+- (instancetype)self;
 @property (readonly, copy) NSString *description;
 - (instancetype)retain OBJC_ARC_UNAVAILABLE;
 - (Class)class;
diff --git a/test/PrintAsObjC/classes.swift b/test/PrintAsObjC/classes.swift
@@ -113,22 +113,6 @@ class ClassWithCustomName2 {}
 @objc(CustomNameSub)
 class ClassWithCustomNameSub : ClassWithCustomName {}
 
-
-// CHECK-LABEL: @interface ClassWithNSObjectProtocol <NSObject>
-// CHECK-NEXT: @property (nonatomic, readonly, copy) NSString * _Nonnull description;
-// CHECK-NEXT: - (BOOL)conformsToProtocol:(Protocol * _Nonnull)_ SWIFT_WARN_UNUSED_RESULT;
-// CHECK-NEXT: - (BOOL)isKindOfClass:(Class _Nonnull)aClass SWIFT_WARN_UNUSED_RESULT;
-// CHECK-NEXT: - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
-// CHECK-NEXT: @end
-@objc @objcMembers class ClassWithNSObjectProtocol : NSObjectProtocol {
-  @objc var description: String { return "me" }
-  @objc(conformsToProtocol:)
-  func conforms(to _: Protocol) -> Bool { return false }
-
-  @objc(isKindOfClass:)
-  func isKind(of aClass: AnyClass) -> Bool { return false }
-}
-
 // CHECK-LABEL: @interface DiscardableResult : NSObject
 // CHECK-NEXT: - (NSInteger)nonDiscardable:(NSInteger)x SWIFT_WARN_UNUSED_RESULT;
 // CHECK-NEXT: - (NSInteger)discardable:(NSInteger)x;
diff --git a/test/Sema/availability_versions.swift b/test/Sema/availability_versions.swift
@@ -615,19 +615,19 @@ class ClassAvailableOn10_9 {
 }
 
 @available(OSX, introduced: 10.51)
-class ClassAvailableOn10_51 { // expected-note {{enclosing scope here}}
+class ClassAvailableOn10_51 { // expected-note {{enclosing scope requires availability of macOS 10.51 or newer}}
   func someMethod() {}
   class func someClassMethod() {
     let _ = ClassAvailableOn10_51()
   }
   var someProp : Int = 22
 
-  @available(OSX, introduced: 10.9) // expected-error {{declaration cannot be more available than enclosing scope}}
+  @available(OSX, introduced: 10.9) // expected-error {{instance method cannot be more available than enclosing scope}}
   func someMethodAvailableOn10_9() { }
 
   @available(OSX, introduced: 10.52)
-  var propWithGetter: Int { // expected-note{{enclosing scope here}}
-    @available(OSX, introduced: 10.51) // expected-error {{declaration cannot be more available than enclosing scope}}
+  var propWithGetter: Int { // expected-note{{enclosing scope requires availability of macOS 10.52 or newer}}
+    @available(OSX, introduced: 10.51) // expected-error {{getter cannot be more available than enclosing scope}}
     get { return 0 }
   }
 }
@@ -1022,8 +1022,8 @@ extension ClassToExtend : ProtocolAvailableOn10_51 {
 }
 
 @available(OSX, introduced: 10.51)
-extension ClassToExtend { // expected-note {{enclosing scope here}}
-  @available(OSX, introduced: 10.9) // expected-error {{declaration cannot be more available than enclosing scope}}
+extension ClassToExtend { // expected-note {{enclosing scope requires availability of macOS 10.51 or newer}}
+  @available(OSX, introduced: 10.9) // expected-error {{instance method cannot be more available than enclosing scope}}
   func extensionMethod10_9() { }
 }
 
diff --git a/test/attr/Inputs/custom-modules/available_nsobject.h b/test/attr/Inputs/custom-modules/available_nsobject.h
@@ -0,0 +1,16 @@
+@import Foundation;
+
+__attribute__((availability(macosx,introduced=10.0)))
+__attribute__((availability(ios,introduced=2.0)))
+__attribute__((availability(tvos,introduced=1.0)))
+__attribute__((availability(watchos,introduced=2.0)))
+__attribute__((availability(maccatalyst,introduced=13.1)))
+@interface NSBaseClass : NSObject
+- (instancetype) init
+  __attribute__((objc_designated_initializer))
+  __attribute__((availability(macosx,introduced=10.0)))
+  __attribute__((availability(ios,introduced=2.0)))
+  __attribute__((availability(tvos,introduced=1.0)))
+  __attribute__((availability(watchos,introduced=2.0)))
+  __attribute__((availability(maccatalyst,introduced=13.1)));
+@end
diff --git a/test/attr/Inputs/custom-modules/module.map b/test/attr/Inputs/custom-modules/module.map
@@ -1,3 +1,4 @@
 module AttrObjc_FooClangModule { header "attr_objc_foo_clang_module.h" }
 module Testable_ClangModule { header "testable_clang.h" }
 module ObjcAsync { header "objc_async.h" }
+module Available_NSObject { header "available_nsobject.h" }
diff --git a/test/attr/attr_availability_maccatalyst_implicit.swift b/test/attr/attr_availability_maccatalyst_implicit.swift
@@ -0,0 +1,13 @@
+// RUN: %target-swift-frontend -I %t -I %S/Inputs/custom-modules -parse-stdlib -parse-as-library -typecheck -verify -target x86_64-apple-ios15.4-macabi %s
+
+// REQUIRES: objc_interop
+// REQUIRES: maccatalyst_support
+
+import Available_NSObject
+
+@available(iOS 15.0, *)
+open class OverAvailableClass: NSBaseClass {}
+// expected-error@-1 {{initializer cannot be more available than enclosing scope}}
+// expected-note@-2 {{initializer implicitly declared here with availability of Mac Catalyst 13.1 or newer}}
+// expected-note@-3 {{enclosing scope requires availability of Mac Catalyst 15.0 or newer}}
+
diff --git a/test/attr/attr_availability_osx.swift b/test/attr/attr_availability_osx.swift
@@ -84,11 +84,11 @@ doSomethingDeprecatedOniOS() // okay
 struct TestStruct {}
 
 @available(macOS 10.10, *)
-extension TestStruct { // expected-note {{enclosing scope here}}
+extension TestStruct { // expected-note {{enclosing scope requires availability of macOS 10.10 or newer}}
   @available(swift 400)
   func doTheThing() {} // expected-note {{'doTheThing()' was introduced in Swift 400}}
 
-  @available(macOS 10.9, *) // expected-error {{declaration cannot be more available than enclosing scope}}
+  @available(macOS 10.9, *) // expected-error {{instance method cannot be more available than enclosing scope}}
   @available(swift 400)
   func doAnotherThing() {} // expected-note {{'doAnotherThing()' was introduced in Swift 400}}
 
diff --git a/utils/build_swift/build_swift/shell.py b/utils/build_swift/build_swift/shell.py
@@ -206,7 +206,7 @@ def quote(command):
     if isinstance(command, (str,)):
         return _quote(command)
 
-    if isinstance(command, collections.Iterable):
+    if isinstance(command, collections.abc.Iterable):
         return ' '.join([_quote(arg) for arg in _normalize_args(command)])
 
     raise ValueError('Invalid command type: {}'.format(type(command).__name__))
diff --git a/utils/build_swift/tests/build_swift/test_shell.py b/utils/build_swift/tests/build_swift/test_shell.py
@@ -65,7 +65,7 @@ def duplicate(x):
 
         result = shell._flatmap(duplicate, [1, 2, 3])
 
-        self.assertIsInstance(result, collections.Iterable)
+        self.assertIsInstance(result, collections.abc.Iterable)
         self.assertEqual(list(result), [1, 1, 2, 2, 3, 3])
 
     # -------------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ func ivars(_ hive: Hive) {`
`315`	`315`	`hive.queen.description() // expected-error{{value of type 'Hive' has no member 'queen'}}`
`316`	`316`	`}`
`317`	`317`
`318`		`-class NSObjectable : NSObjectProtocol {`
	`318`	`+class NSObjectable : NSObjectProtocol { // expected-error {{cannot declare conformance to 'NSObjectProtocol' in Swift; 'NSObjectable' should inherit 'NSObject' instead}}`
`319`	`319`	`@objc var description : String { return "" }`
`320`	`320`	`@objc(conformsToProtocol:) func conforms(to _: Protocol) -> Bool { return false }`
`321`	`321`	`@objc(isKindOfClass:) func isKind(of aClass: AnyClass) -> Bool { return false }`