[4.1] Merge pull request #13422 from jrose-apple/newer-and-improveder (#13433)
[PrintAsObjC] More tweaks to +new unavailability
rdar://problem/35942058
diff --git a/lib/PrintAsObjC/PrintAsObjC.cpp b/lib/PrintAsObjC/PrintAsObjC.cpp
index 9d64c74..845e199 100644
--- a/lib/PrintAsObjC/PrintAsObjC.cpp
+++ b/lib/PrintAsObjC/PrintAsObjC.cpp
@@ -679,7 +679,14 @@
if (makeNewUnavailable) {
assert(!makeNewExplicitlyAvailable);
- os << "+ (nonnull instancetype)new SWIFT_UNAVAILABLE;\n";
+ // Downgrade this to a warning in pre-Swift-5 mode. This isn't perfect
+ // because it's a diagnostic inflicted on /clients/, but it's close
+ // enough. It really is invalid to call +new when -init is unavailable.
+ StringRef annotationName = "SWIFT_UNAVAILABLE_MSG";
+ if (!M.getASTContext().isSwiftVersionAtLeast(5))
+ annotationName = "SWIFT_DEPRECATED_MSG";
+ os << "+ (nonnull instancetype)new " << annotationName
+ << "(\"-init is unavailable\");\n";
} else if (makeNewExplicitlyAvailable) {
os << "+ (nonnull instancetype)new;\n";
}
diff --git a/validation-test/PrintAsObjC/Inputs/reintroduced-new.swift b/test/PrintAsObjC/Inputs/reintroduced-new.swift
similarity index 100%
rename from validation-test/PrintAsObjC/Inputs/reintroduced-new.swift
rename to test/PrintAsObjC/Inputs/reintroduced-new.swift
diff --git a/test/PrintAsObjC/availability.swift b/test/PrintAsObjC/availability.swift
index bf61fde..6c50df3 100644
--- a/test/PrintAsObjC/availability.swift
+++ b/test/PrintAsObjC/availability.swift
@@ -57,7 +57,7 @@
// CHECK-LABEL: @interface AvailabilitySub
// CHECK-NEXT: - (nonnull instancetype)init SWIFT_UNAVAILABLE;
-// CHECK-NEXT: + (nonnull instancetype)new SWIFT_UNAVAILABLE;
+// CHECK-NEXT: + (nonnull instancetype)new SWIFT_DEPRECATED_MSG("-init is unavailable");
// CHECK-NEXT: - (nonnull instancetype)initWithX:(NSInteger)_ SWIFT_UNAVAILABLE;
// CHECK-NEXT: @end
diff --git a/test/PrintAsObjC/classes.swift b/test/PrintAsObjC/classes.swift
index 663bd60..1b7acd4 100644
--- a/test/PrintAsObjC/classes.swift
+++ b/test/PrintAsObjC/classes.swift
@@ -178,7 +178,7 @@
// CHECK-LABEL: @interface InheritedInitializersRequired
// CHECK-NEXT: - (nonnull instancetype)initWithEvenMoreFun OBJC_DESIGNATED_INITIALIZER;
// CHECK-NEXT: - (nonnull instancetype)init SWIFT_UNAVAILABLE;
-// CHECK-NEXT: + (nonnull instancetype)new SWIFT_UNAVAILABLE;
+// CHECK-NEXT: + (nonnull instancetype)new SWIFT_DEPRECATED_MSG("-init is unavailable");
// CHECK-NEXT: @end
@objc class InheritedInitializersRequired : InheritedInitializers {
@objc required init(evenMoreFun: ()) { super.init() }
@@ -436,7 +436,7 @@
// CHECK-LABEL: @interface NewBanned
// CHECK-NEXT: - (nonnull instancetype)initWithArbitraryArgument:(NSInteger)arbitraryArgument OBJC_DESIGNATED_INITIALIZER;
// CHECK-NEXT: - (nonnull instancetype)init SWIFT_UNAVAILABLE;
-// CHECK-NEXT: + (nonnull instancetype)new SWIFT_UNAVAILABLE;
+// CHECK-NEXT: + (nonnull instancetype)new SWIFT_DEPRECATED_MSG("-init is unavailable");
// CHECK-NEXT: @end
@objc class NewBanned : NSObject {
init(arbitraryArgument: Int) { super.init() }
diff --git a/test/PrintAsObjC/protocols.swift b/test/PrintAsObjC/protocols.swift
index 60642f9..0542287 100644
--- a/test/PrintAsObjC/protocols.swift
+++ b/test/PrintAsObjC/protocols.swift
@@ -55,7 +55,7 @@
// CHECK-LABEL: @interface MyObject : NSObject <NSCoding, Fungible>
// CHECK-NEXT: initWithCoder
// CHECK-NEXT: init SWIFT_UNAVAILABLE
-// CHECK-NEXT: new SWIFT_UNAVAILABLE
+// CHECK-NEXT: new SWIFT_DEPRECATED
// CHECK-NEXT: @end
// NEGATIVE-NOT: @protocol NSCoding
class MyObject : NSObject, NSCoding, Fungible {
diff --git a/test/PrintAsObjC/reintroduced-new.m b/test/PrintAsObjC/reintroduced-new.m
new file mode 100644
index 0000000..d6a0342
--- /dev/null
+++ b/test/PrintAsObjC/reintroduced-new.m
@@ -0,0 +1,31 @@
+// REQUIRES: objc_interop
+
+// RUN: %empty-directory(%t)
+
+// FIXME: BEGIN -enable-source-import hackaround
+// RUN: %target-swift-frontend(mock-sdk: -sdk %S/../../test/Inputs/clang-importer-sdk -I %t) -emit-module -o %t %S/../../test/Inputs/clang-importer-sdk/swift-modules/ObjectiveC.swift
+// FIXME: END -enable-source-import hackaround
+
+// RUN: %target-swift-frontend(mock-sdk: -sdk %S/../../test/Inputs/clang-importer-sdk -I %t) -emit-module -o %t %S/Inputs/reintroduced-new.swift -swift-version 4 -disable-objc-attr-requires-foundation-module -module-name main
+// RUN: %target-swift-frontend(mock-sdk: -sdk %S/../../test/Inputs/clang-importer-sdk -I %t) -parse-as-library %t/main.swiftmodule -typecheck -emit-objc-header-path %t/generated.h -disable-objc-attr-requires-foundation-module -swift-version 4
+// RUN: not %clang -fsyntax-only -x objective-c %s -include %t/generated.h -fobjc-arc -fmodules -Werror -isysroot %S/../../test/Inputs/clang-importer-sdk 2>&1 | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-4 %s
+
+// RUN: %target-swift-frontend(mock-sdk: -sdk %S/../../test/Inputs/clang-importer-sdk -I %t) -emit-module -o %t %S/Inputs/reintroduced-new.swift -disable-objc-attr-requires-foundation-module -module-name main -swift-version 5
+// RUN: %target-swift-frontend(mock-sdk: -sdk %S/../../test/Inputs/clang-importer-sdk -I %t) -parse-as-library %t/main.swiftmodule -typecheck -emit-objc-header-path %t/generated.h -disable-objc-attr-requires-foundation-module -swift-version 5
+// RUN: not %clang -fsyntax-only -x objective-c %s -include %t/generated.h -fobjc-arc -fmodules -Werror -isysroot %S/../../test/Inputs/clang-importer-sdk 2>&1 | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-5 %s
+
+// CHECK-NOT: error:
+
+void test() {
+ // CHECK: :[[@LINE+1]]:{{[0-9]+}}: error: 'init' is unavailable
+ (void)[[Base alloc] init];
+ // CHECK-NOT: error:
+ (void)[[Sub alloc] init];
+ // CHECK-4: :[[@LINE+2]]:{{[0-9]+}}: error: 'new' is deprecated: -init is unavailable
+ // CHECK-5: :[[@LINE+1]]:{{[0-9]+}}: error: 'new' is unavailable: -init is unavailable
+ (void)[Base new];
+ // CHECK-NOT: error:
+ (void)[Sub new];
+}
+
+// CHECK-NOT: error:
\ No newline at end of file
diff --git a/validation-test/PrintAsObjC/reintroduced-new.m b/validation-test/PrintAsObjC/reintroduced-new.m
deleted file mode 100644
index a595e79..0000000
--- a/validation-test/PrintAsObjC/reintroduced-new.m
+++ /dev/null
@@ -1,26 +0,0 @@
-// REQUIRES: objc_interop
-
-// RUN: %empty-directory(%t)
-
-// FIXME: BEGIN -enable-source-import hackaround
-// RUN: %target-swift-frontend(mock-sdk: -sdk %S/../../test/Inputs/clang-importer-sdk -I %t) -emit-module -o %t %S/../../test/Inputs/clang-importer-sdk/swift-modules/ObjectiveC.swift
-// FIXME: END -enable-source-import hackaround
-
-// RUN: %target-swift-frontend(mock-sdk: -sdk %S/../../test/Inputs/clang-importer-sdk -I %t) -emit-module -o %t %S/Inputs/reintroduced-new.swift -disable-objc-attr-requires-foundation-module -module-name main
-// RUN: %target-swift-frontend(mock-sdk: -sdk %S/../../test/Inputs/clang-importer-sdk -I %t) -parse-as-library %t/main.swiftmodule -typecheck -emit-objc-header-path %t/generated.h -disable-objc-attr-requires-foundation-module
-// RUN: not %clang -fsyntax-only -x objective-c %s -include %t/generated.h -fobjc-arc -fmodules -Werror -isysroot %S/../../test/Inputs/clang-importer-sdk 2>&1 | %FileCheck %s
-
-// CHECK-NOT: error:
-
-void test() {
- // CHECK: :[[@LINE+1]]:{{[0-9]+}}: error: 'init' is unavailable
- (void)[[Base alloc] init];
- // CHECK-NOT: error:
- (void)[[Sub alloc] init];
- // CHECK: :[[@LINE+1]]:{{[0-9]+}}: error: 'new' is unavailable
- (void)[Base new];
- // CHECK-NOT: error:
- (void)[Sub new];
-}
-
-// CHECK-NOT: error:
\ No newline at end of file
