Skip to content

Soften min version for objcImpl early adopters #74161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 7, 2024
Merged

Soften min version for objcImpl early adopters #74161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/Sema/TypeCheckAttr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1674,10 +1674,13 @@ visitObjCImplementationAttr(ObjCImplementationAttr *attr) {
// supported.
auto deploymentAvailability = AvailabilityContext::forDeploymentTarget(Ctx);
if (!deploymentAvailability.isContainedIn(Ctx.getSwift50Availability())) {
diagnose(attr->getLocation(),
auto diag = diagnose(attr->getLocation(),
diag::attr_objc_implementation_raise_minimum_deployment_target,
prettyPlatformString(targetPlatform(Ctx.LangOpts)),
Ctx.getSwift50Availability().getOSVersion().getLowerEndpoint());
if (attr->isEarlyAdopter()) {
diag.wrapIn(diag::wrap_objc_implementation_will_become_error);
}
}
}
else if (auto AFD = dyn_cast<AbstractFunctionDecl>(D)) {
Expand Down
11 changes: 8 additions & 3 deletions test/decl/ext/objc_implementation_deployment_target.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
// Hardcode x86_64 macOS because Apple Silicon was born ABI-stable
// RUN: %target-typecheck-verify-swift -import-objc-header %S/Inputs/objc_implementation.h -target x86_64-apple-macosx10.14.3
// RUN: %target-typecheck-verify-swift -import-objc-header %S/Inputs/objc_implementation.h -target x86_64-apple-macosx10.14.3 -enable-experimental-feature ObjCImplementation
// REQUIRES: objc_interop
// REQUIRES: OS=macosx

@_objcImplementation extension ObjCImplSubclass {
@objc @implementation extension ObjCImplSubclass {
// expected-error@-1 {{'@implementation' of an Objective-C class requires a minimum deployment target of at least macOS 10.14.4}}
}

@_objcImplementation(Conformance) extension ObjCClass {
@objc(Conformance) @implementation extension ObjCClass {
// expected-error@-1 {{'@implementation' of an Objective-C class requires a minimum deployment target of at least macOS 10.14.4}}
func requiredMethod1() {}
func requiredMethod2() {}
}

@_objcImplementation(EmptyCategory) extension ObjCClass {
// expected-warning@-1 {{'@implementation' of an Objective-C class requires a minimum deployment target of at least macOS 10.14.4; this will become an error after adopting '@implementation'}}
// expected-warning@-2 {{'@_objcImplementation' is deprecated; use '@implementation' instead}}
}