Merge pull request #62151 from CodaFi/initial-orders

CodaFi · web-flow · commit 8d709c4e80e4 · 2023-04-09T14:05:13.000-06:00
Deprecate Application-Specific Main Entrypoint Attributes
diff --git a/include/swift/AST/DiagnosticsSema.def b/include/swift/AST/DiagnosticsSema.def
@@ -3601,6 +3601,11 @@ ERROR(attr_ApplicationMain_with_script,none,
       "%" SELECT_APPLICATION_MAIN "0 attribute cannot be used in a module that contains "
       "top-level code",
       (unsigned))
+ERROR(attr_ApplicationMain_deprecated,none,
+      "%" SELECT_APPLICATION_MAIN "0 is deprecated",
+      (unsigned))
+NOTE(attr_ApplicationMain_deprecated_use_attr_main,none,
+     "use @main instead", ())
 
 NOTE(attr_ApplicationMain_parse_as_library,none,
      "pass '-parse-as-library' to compiler invocation if this is intentional",
diff --git a/lib/Sema/TypeCheckAttr.cpp b/lib/Sema/TypeCheckAttr.cpp
@@ -2345,6 +2345,16 @@ void AttributeChecker::checkApplicationMainAttribute(DeclAttribute *attr,
     attr->setInvalid();
   }
 
+  diagnose(attr->getLocation(),
+           diag::attr_ApplicationMain_deprecated,
+           applicationMainKind)
+    .warnUntilSwiftVersion(6);
+
+  diagnose(attr->getLocation(),
+           diag::attr_ApplicationMain_deprecated_use_attr_main)
+    .fixItReplace(attr->getRange(), "@main");
+
+
   if (attr->isInvalid())
     return;
 
diff --git a/test/TBD/objc-entry-point.swift b/test/TBD/objc-entry-point.swift
@@ -5,10 +5,11 @@
 import AppKit
 
 // Globals in non-script mode files that still have entry points
-// (via NSApplicationMain) _do_ have lazy initializers. Ensure the symbols are
+// (via `@NSApplicationMain`) _do_ have lazy initializers. Ensure the symbols are
 // present in the TBD.
 let globalConstantWithLazyInitializer: String = "hello, world"
 
-@NSApplicationMain
+@NSApplicationMain // expected-warning {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
+// expected-note@-1 {{use @main instead}} {{1-19=@main}}
 class MyDelegate: NSObject, NSApplicationDelegate {
 }
diff --git a/test/attr/ApplicationMain/attr_NSApplicationMain.swift b/test/attr/ApplicationMain/attr_NSApplicationMain.swift
@@ -4,6 +4,7 @@
 
 import AppKit
 
-@NSApplicationMain
+@NSApplicationMain // expected-warning {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
+// expected-note@-1 {{use @main instead}} {{1-19=@main}}
 class MyDelegate: NSObject, NSApplicationDelegate {
 }
diff --git a/test/attr/ApplicationMain/attr_NSApplicationMain_inherited.swift b/test/attr/ApplicationMain/attr_NSApplicationMain_inherited.swift
@@ -6,6 +6,7 @@ import AppKit
 
 class DelegateBase : NSObject, NSApplicationDelegate { }
 
-@NSApplicationMain
+@NSApplicationMain // expected-warning {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
+// expected-note@-1 {{use @main instead}} {{1-19=@main}}
 class MyDelegate : DelegateBase { }
 
diff --git a/test/attr/ApplicationMain/attr_NSApplicationMain_multi_file/another_delegate.swift b/test/attr/ApplicationMain/attr_NSApplicationMain_multi_file/another_delegate.swift
@@ -9,6 +9,8 @@
 import AppKit
 
 @NSApplicationMain // expected-error{{'NSApplicationMain' attribute can only apply to one class in a module}}
+// expected-warning@-1 {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
+// expected-note@-2 {{use @main instead}} {{1-19=@main}}
 class EvilDelegate: NSObject, NSApplicationDelegate {
 }
 
diff --git a/test/attr/ApplicationMain/attr_NSApplicationMain_multi_file/delegate.swift b/test/attr/ApplicationMain/attr_NSApplicationMain_multi_file/delegate.swift
@@ -8,6 +8,8 @@
 import AppKit
 
 @NSApplicationMain // expected-error{{'NSApplicationMain' attribute can only apply to one class in a module}}
+// expected-warning@-1 {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
+// expected-note@-2 {{use @main instead}} {{1-19=@main}}
 class MyDelegate: NSObject, NSApplicationDelegate {
 }
 
diff --git a/test/attr/ApplicationMain/attr_NSApplicationMain_multiple.swift b/test/attr/ApplicationMain/attr_NSApplicationMain_multiple.swift
@@ -5,13 +5,19 @@
 import AppKit
 
 @NSApplicationMain // expected-error{{'NSApplicationMain' attribute can only apply to one class in a module}}
+// expected-warning@-1 {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
+// expected-note@-2 {{use @main instead}} {{1-19=@main}}
 class MyDelegate1: NSObject, NSApplicationDelegate {
 }
 
 @NSApplicationMain // expected-error{{'NSApplicationMain' attribute can only apply to one class in a module}}
+// expected-warning@-1 {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
+// expected-note@-2 {{use @main instead}} {{1-19=@main}}
 class MyDelegate2: NSObject, NSApplicationDelegate {
 }
 
 @NSApplicationMain // expected-error{{'NSApplicationMain' attribute can only apply to one class in a module}}
+// expected-warning@-1 {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
+// expected-note@-2 {{use @main instead}} {{1-19=@main}}
 class MyDelegate3: NSObject, NSApplicationDelegate {
 }
diff --git a/test/attr/ApplicationMain/attr_NSApplicationMain_not_NSApplicationDelegate.swift b/test/attr/ApplicationMain/attr_NSApplicationMain_not_NSApplicationDelegate.swift
@@ -5,5 +5,7 @@
 import AppKit
 
 @NSApplicationMain // expected-error{{'NSApplicationMain' class must conform to the 'NSApplicationDelegate' protocol}}
+// expected-warning@-1 {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
+// expected-note@-2 {{use @main instead}} {{1-19=@main}}
 class MyNonDelegate {
 }
diff --git a/test/attr/ApplicationMain/attr_NSApplicationMain_swift6.swift b/test/attr/ApplicationMain/attr_NSApplicationMain_swift6.swift
@@ -0,0 +1,10 @@
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -swift-version 6 -typecheck -parse-as-library -verify %s
+
+// REQUIRES: objc_interop
+
+import AppKit
+
+@NSApplicationMain // expected-error {{'NSApplicationMain' is deprecated}}
+// expected-note@-1 {{use @main instead}} {{1-19=@main}}
+class MyDelegate: NSObject, NSApplicationDelegate {
+}
diff --git a/test/attr/ApplicationMain/attr_NSApplicationMain_with_main/delegate.swift b/test/attr/ApplicationMain/attr_NSApplicationMain_with_main/delegate.swift
@@ -8,6 +8,8 @@
 import AppKit
 
 @NSApplicationMain // expected-error{{'NSApplicationMain' attribute cannot be used in a module that contains top-level code}}
+// expected-warning@-1 {{'NSApplicationMain' is deprecated; this is an error in Swift 6}}
+// expected-note@-2 {{use @main instead}} {{1-19=@main}}
 class MyDelegate: NSObject, NSApplicationDelegate {
 }
 
diff --git a/test/attr/ApplicationMain/attr_UIApplicationMain.swift b/test/attr/ApplicationMain/attr_UIApplicationMain.swift
@@ -4,6 +4,7 @@
 
 import UIKit
 
-@UIApplicationMain
+@UIApplicationMain // expected-warning {{'UIApplicationMain' is deprecated; this is an error in Swift 6}}
+// expected-note@-1 {{use @main instead}} {{1-19=@main}}
 class MyDelegate: NSObject, UIApplicationDelegate {
 }
diff --git a/test/attr/ApplicationMain/attr_UIApplicationMain_inherited.swift b/test/attr/ApplicationMain/attr_UIApplicationMain_inherited.swift
@@ -6,6 +6,7 @@ import UIKit
 
 class DelegateBase : NSObject, UIApplicationDelegate { }
 
-@UIApplicationMain
+@UIApplicationMain // expected-warning {{'UIApplicationMain' is deprecated; this is an error in Swift 6}}
+// expected-note@-1 {{use @main instead}} {{1-19=@main}}
 class MyDelegate : DelegateBase { }
 
diff --git a/test/attr/ApplicationMain/attr_UIApplicationMain_multiple.swift b/test/attr/ApplicationMain/attr_UIApplicationMain_multiple.swift
@@ -5,13 +5,19 @@
 import UIKit
 
 @UIApplicationMain // expected-error{{'UIApplicationMain' attribute can only apply to one class in a module}}
+// expected-warning@-1 {{'UIApplicationMain' is deprecated; this is an error in Swift 6}}
+// expected-note@-2 {{use @main instead}} {{1-19=@main}}
 class MyDelegate1: NSObject, UIApplicationDelegate {
 }
 
 @UIApplicationMain // expected-error{{'UIApplicationMain' attribute can only apply to one class in a module}}
+// expected-warning@-1 {{'UIApplicationMain' is deprecated; this is an error in Swift 6}}
+// expected-note@-2 {{use @main instead}} {{1-19=@main}}
 class MyDelegate2: NSObject, UIApplicationDelegate {
 }
 
 @UIApplicationMain // expected-error{{'UIApplicationMain' attribute can only apply to one class in a module}}
+// expected-warning@-1 {{'UIApplicationMain' is deprecated; this is an error in Swift 6}}
+// expected-note@-2 {{use @main instead}} {{1-19=@main}}
 class MyDelegate3: NSObject, UIApplicationDelegate {
 }
diff --git a/test/attr/ApplicationMain/attr_UIApplicationMain_not_UIApplicationDelegate.swift b/test/attr/ApplicationMain/attr_UIApplicationMain_not_UIApplicationDelegate.swift
@@ -5,5 +5,7 @@
 import UIKit
 
 @UIApplicationMain // expected-error{{'UIApplicationMain' class must conform to the 'UIApplicationDelegate' protocol}}
+// expected-warning@-1 {{'UIApplicationMain' is deprecated; this is an error in Swift 6}}
+// expected-note@-2 {{use @main instead}} {{1-19=@main}}
 class MyNonDelegate {
 }
diff --git a/test/attr/ApplicationMain/attr_UIApplicationMain_swift6.swift b/test/attr/ApplicationMain/attr_UIApplicationMain_swift6.swift
@@ -0,0 +1,10 @@
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -swift-version 6 -typecheck -parse-as-library -verify %s
+
+// REQUIRES: objc_interop
+
+import UIKit
+
+@UIApplicationMain // expected-error {{'UIApplicationMain' is deprecated}}
+// expected-note@-1 {{use @main instead}} {{1-19=@main}}
+class MyDelegate: NSObject, UIApplicationDelegate {
+}
diff --git a/test/attr/ApplicationMain/attr_UIApplicationMain_with_main/delegate.swift b/test/attr/ApplicationMain/attr_UIApplicationMain_with_main/delegate.swift
@@ -8,6 +8,8 @@
 import UIKit
 
 @UIApplicationMain // expected-error{{'UIApplicationMain' attribute cannot be used in a module that contains top-level code}}
+// expected-warning@-1 {{'UIApplicationMain' is deprecated; this is an error in Swift 6}}
+// expected-note@-2 {{use @main instead}} {{1-19=@main}}
 class MyDelegate: NSObject, UIApplicationDelegate {
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`import AppKit`
`6`	`6`
`7`		`-@NSApplicationMain`
	`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`	`9`	`class MyDelegate: NSObject, NSApplicationDelegate {`
`9`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@`
`9`	`9`	`import AppKit`
`10`	`10`
`11`	`11`	`@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}}`
`12`	`14`	`class EvilDelegate: NSObject, NSApplicationDelegate {`
`13`	`15`	`}`
`14`	`16`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@`
`8`	`8`	`import AppKit`
`9`	`9`
`10`	`10`	`@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`	`13`	`class MyDelegate: NSObject, NSApplicationDelegate {`
`12`	`14`	`}`
`13`	`15`
Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,19 @@`
`5`	`5`	`import AppKit`
`6`	`6`
`7`	`7`	`@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}}`
`8`	`10`	`class MyDelegate1: NSObject, NSApplicationDelegate {`
`9`	`11`	`}`
`10`	`12`
`11`	`13`	`@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}}`
`12`	`16`	`class MyDelegate2: NSObject, NSApplicationDelegate {`
`13`	`17`	`}`
`14`	`18`
`15`	`19`	`@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}}`
`16`	`22`	`class MyDelegate3: NSObject, NSApplicationDelegate {`
`17`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,7 @@`
`5`	`5`	`import AppKit`
`6`	`6`
`7`	`7`	`@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}}`
`8`	`10`	`class MyNonDelegate {`
`9`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`import UIKit`
`6`	`6`
`7`		`-@UIApplicationMain`
	`7`	`+@UIApplicationMain // expected-warning {{'UIApplicationMain' is deprecated; this is an error in Swift 6}}`
	`8`	`+// expected-note@-1 {{use @main instead}} {{1-19=@main}}`
`8`	`9`	`class MyDelegate: NSObject, UIApplicationDelegate {`
`9`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,19 @@`
`5`	`5`	`import UIKit`
`6`	`6`
`7`	`7`	`@UIApplicationMain // expected-error{{'UIApplicationMain' attribute can only apply to one class in a module}}`
	`8`	`+// expected-warning@-1 {{'UIApplicationMain' is deprecated; this is an error in Swift 6}}`
	`9`	`+// expected-note@-2 {{use @main instead}} {{1-19=@main}}`
`8`	`10`	`class MyDelegate1: NSObject, UIApplicationDelegate {`
`9`	`11`	`}`
`10`	`12`
`11`	`13`	`@UIApplicationMain // expected-error{{'UIApplicationMain' attribute can only apply to one class in a module}}`
	`14`	`+// expected-warning@-1 {{'UIApplicationMain' is deprecated; this is an error in Swift 6}}`
	`15`	`+// expected-note@-2 {{use @main instead}} {{1-19=@main}}`
`12`	`16`	`class MyDelegate2: NSObject, UIApplicationDelegate {`
`13`	`17`	`}`
`14`	`18`
`15`	`19`	`@UIApplicationMain // expected-error{{'UIApplicationMain' attribute can only apply to one class in a module}}`
	`20`	`+// expected-warning@-1 {{'UIApplicationMain' is deprecated; this is an error in Swift 6}}`
	`21`	`+// expected-note@-2 {{use @main instead}} {{1-19=@main}}`
`16`	`22`	`class MyDelegate3: NSObject, UIApplicationDelegate {`
`17`	`23`	`}`