Skip to content

Commit 7cb9880

Browse files
hborlahborla
committed
[Features] Gate SE-0383 behind an upcoming feature flag.
1 parent d135ce7 commit 7cb9880

16 files changed

+62
-42
lines changed

‎include/swift/Basic/Features.def‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ SUPPRESSIBLE_LANGUAGE_FEATURE(RetroactiveAttribute, 364, "@retroactive", true)
116116
UPCOMING_FEATURE(ConciseMagicFile, 274, 6)
117117
UPCOMING_FEATURE(ForwardTrailingClosures, 286, 6)
118118
UPCOMING_FEATURE(BareSlashRegexLiterals, 354, 6)
119+
UPCOMING_FEATURE(DeprecateApplicationMain, 383, 6)
119120
UPCOMING_FEATURE(ImportObjcForwardDeclarations, 384, 6)
120121
UPCOMING_FEATURE(DisableOutwardActorInference, 401, 6)
121122
UPCOMING_FEATURE(InternalImportsByDefault, 409, 6)

‎lib/AST/ASTPrinter.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3281,6 +3281,10 @@ static bool usesFeatureStrictConcurrency(Decl *decl) {
32813281
return false;
32823282
}
32833283

3284+
static bool usesFeatureDeprecateApplicationMain(Decl *decl) {
3285+
return false;
3286+
}
3287+
32843288
static bool usesFeatureImportObjcForwardDeclarations(Decl *decl) {
32853289
ClangNode clangNode = decl->getClangNode();
32863290
if (!clangNode)

‎lib/Sema/TypeCheckAttr.cpp‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2524,15 +2524,16 @@ void AttributeChecker::checkApplicationMainAttribute(DeclAttribute *attr,
25242524
attr->setInvalid();
25252525
}
25262526

2527-
diagnose(attr->getLocation(),
2528-
diag::attr_ApplicationMain_deprecated,
2529-
applicationMainKind)
2530-
.warnUntilSwiftVersion(6);
2531-
2532-
diagnose(attr->getLocation(),
2533-
diag::attr_ApplicationMain_deprecated_use_attr_main)
2534-
.fixItReplace(attr->getRange(), "@main");
2527+
if (C.LangOpts.hasFeature(Feature::DeprecateApplicationMain)) {
2528+
diagnose(attr->getLocation(),
2529+
diag::attr_ApplicationMain_deprecated,
2530+
applicationMainKind)
2531+
.warnUntilSwiftVersion(6);
25352532

2533+
diagnose(attr->getLocation(),
2534+
diag::attr_ApplicationMain_deprecated_use_attr_main)
2535+
.fixItReplace(attr->getRange(), "@main");
2536+
}
25362537

25372538
if (attr->isInvalid())
25382539
return;

‎test/TBD/objc-entry-point.swift‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-ir -o /dev/null -validate-tbd-against-ir=all -parse-as-library -verify -enable-testing %s
22
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-ir -o /dev/null -validate-tbd-against-ir=all -parse-as-library -verify %s
33

4+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-ir -o /dev/null -validate-tbd-against-ir=all -parse-as-library -enable-upcoming-feature DeprecateApplicationMain -verify -verify-additional-prefix deprecated- -enable-testing %s
5+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-upcoming-feature DeprecateApplicationMain -emit-ir -o /dev/null -validate-tbd-against-ir=all -parse-as-library -verify -verify-additional-prefix deprecated- %s
6+
47
// REQUIRES: objc_interop
58
import AppKit
69

@@ -9,7 +12,7 @@ import AppKit
912
// present in the TBD.
1013
let globalConstantWithLazyInitializer: String = "hello, world"
1114

12-
@NSApplicationMain // expected-warning {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
13-
// expected-note@-1 {{use @main instead}} {{1-19=@main}}
15+
@NSApplicationMain // expected-deprecated-warning {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
16+
// expected-deprecated-note@-1 {{use @main instead}} {{1-19=@main}}
1417
class MyDelegate: NSObject, NSApplicationDelegate {
1518
}

‎test/attr/ApplicationMain/attr_NSApplicationMain.swift‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -verify %s
2+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -enable-upcoming-feature DeprecateApplicationMain -verify -verify-additional-prefix deprecated- %s
23

34
// REQUIRES: objc_interop
45

56
import AppKit
67

7-
@NSApplicationMain // expected-warning {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
8-
// expected-note@-1 {{use @main instead}} {{1-19=@main}}
8+
@NSApplicationMain // expected-deprecated-warning {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
9+
// expected-deprecated-note@-1 {{use @main instead}} {{1-19=@main}}
910
class MyDelegate: NSObject, NSApplicationDelegate {
1011
}

‎test/attr/ApplicationMain/attr_NSApplicationMain_inherited.swift‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -verify %s
2+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -enable-upcoming-feature DeprecateApplicationMain -verify -verify-additional-prefix deprecated- %s
23

34
// REQUIRES: objc_interop
45

56
import AppKit
67

78
class DelegateBase : NSObject, NSApplicationDelegate { }
89

9-
@NSApplicationMain // expected-warning {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
10-
// expected-note@-1 {{use @main instead}} {{1-19=@main}}
10+
@NSApplicationMain // expected-deprecated-warning {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
11+
// expected-deprecated-note@-1 {{use @main instead}} {{1-19=@main}}
1112
class MyDelegate : DelegateBase { }
1213

‎test/attr/ApplicationMain/attr_NSApplicationMain_multi_file/another_delegate.swift‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -module-name main -emit-module-path %t.swiftmodule -primary-file %s %S/delegate.swift
55
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -module-name main -parse-as-library -typecheck %t.swiftmodule -primary-file %S/delegate.swift -verify -verify-ignore-unknown
66

7+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -module-name main -parse-as-library -typecheck -enable-upcoming-feature DeprecateApplicationMain %t.swiftmodule -primary-file %S/delegate.swift -verify -verify-ignore-unknown -verify-additional-prefix deprecated-
8+
79
// REQUIRES: objc_interop
810

911
import AppKit
1012

1113
@NSApplicationMain // expected-error{{'NSApplicationMain' attribute can only apply to one class in a module}}
12-
// expected-warning@-1 {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
13-
// expected-note@-2 {{use @main instead}} {{1-19=@main}}
14+
// expected-deprecated-warning@-1 {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
15+
// expected-deprecated-note@-2 {{use @main instead}} {{1-19=@main}}
1416
class EvilDelegate: NSObject, NSApplicationDelegate {
1517
}
1618

‎test/attr/ApplicationMain/attr_NSApplicationMain_multi_file/delegate.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import AppKit
99

1010
@NSApplicationMain // expected-error{{'NSApplicationMain' attribute can only apply to one class in a module}}
11-
// expected-warning@-1 {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
12-
// expected-note@-2 {{use @main instead}} {{1-19=@main}}
11+
// expected-deprecated-warning@-1 {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
12+
// expected-deprecated-note@-2 {{use @main instead}} {{1-19=@main}}
1313
class MyDelegate: NSObject, NSApplicationDelegate {
1414
}
1515

‎test/attr/ApplicationMain/attr_NSApplicationMain_multiple.swift‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -verify %s
2+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -enable-upcoming-feature DeprecateApplicationMain -verify -verify-additional-prefix deprecated- %s
3+
24

35
// REQUIRES: objc_interop
46

57
import AppKit
68

79
@NSApplicationMain // expected-error{{'NSApplicationMain' attribute can only apply to one class in a module}}
8-
// expected-warning@-1 {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
9-
// expected-note@-2 {{use @main instead}} {{1-19=@main}}
10+
// expected-deprecated-warning@-1 {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
11+
// expected-deprecated-note@-2 {{use @main instead}} {{1-19=@main}}
1012
class MyDelegate1: NSObject, NSApplicationDelegate {
1113
}
1214

1315
@NSApplicationMain // expected-error{{'NSApplicationMain' attribute can only apply to one class in a module}}
14-
// expected-warning@-1 {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
15-
// expected-note@-2 {{use @main instead}} {{1-19=@main}}
16+
// expected-deprecated-warning@-1 {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
17+
// expected-deprecated-note@-2 {{use @main instead}} {{1-19=@main}}
1618
class MyDelegate2: NSObject, NSApplicationDelegate {
1719
}
1820

1921
@NSApplicationMain // expected-error{{'NSApplicationMain' attribute can only apply to one class in a module}}
20-
// expected-warning@-1 {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
21-
// expected-note@-2 {{use @main instead}} {{1-19=@main}}
22+
// expected-deprecated-warning@-1 {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
23+
// expected-deprecated-note@-2 {{use @main instead}} {{1-19=@main}}
2224
class MyDelegate3: NSObject, NSApplicationDelegate {
2325
}

‎test/attr/ApplicationMain/attr_NSApplicationMain_not_NSApplicationDelegate.swift‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -verify %s
2+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -parse-as-library -enable-upcoming-feature DeprecateApplicationMain -verify -verify-additional-prefix deprecated- %s
23

34
// REQUIRES: objc_interop
45

56
import AppKit
67

78
@NSApplicationMain // expected-error{{'NSApplicationMain' class must conform to the 'NSApplicationDelegate' protocol}}
8-
// expected-warning@-1 {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
9-
// expected-note@-2 {{use @main instead}} {{1-19=@main}}
9+
// expected-deprecated-warning@-1 {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
10+
// expected-deprecated-note@-2 {{use @main instead}} {{1-19=@main}}
1011
class MyNonDelegate {
1112
}

0 commit comments

Comments
 (0)