Merge pull request #5285 from jrose-apple/modern-API-notes

[APINotes] Replace old FactoryAsInit annotation with equivalent SwiftNames.

Author: jrose-apple

apinotes/Foundation.apinotes

@@ -157,7 +157,7 @@ Classes:
   Methods:
   - Selector: 'notificationCenterForType:'
     MethodKind: Class
-    FactoryAsInit: C
+    SwiftName: 'forType(_:)'
 - Name: NSHTTPCookie
   SwiftName: HTTPCookie
 - Name: NSHTTPCookieStorage
@@ -209,10 +209,6 @@ Classes:
 - Name: NSProcessInfo
   SwiftName: ProcessInfo
   Methods:
-  - Selector: processInfo
-    MethodKind: Class
-    NullabilityOfRet: N
-    FactoryAsInit: C
   - Selector: 'isOperatingSystemAtLeastVersion:'
     SwiftName: isOperatingSystemAtLeast(_:)
     MethodKind: Instance

apinotes/GameKit.apinotes

@@ -5,7 +5,7 @@ Classes:
     Methods:
       - Selector:        'localPlayer'
         MethodKind:      Class
-        FactoryAsInit:   C
+        SwiftName:       'localPlayer()'
 Tags:
 - Name: GKErrorCode
   NSErrorDomain: GKErrorDomain

apinotes/NotificationCenter.apinotes

@@ -4,4 +4,4 @@ Classes:
     Methods:
       - Selector:        'widgetController'
         MethodKind:      Class
-        FactoryAsInit:   C
+        SwiftName:       'widgetController()'

apinotes/UIKit.apinotes

@@ -10,7 +10,7 @@ Classes:
   Methods:
   - Selector: printInfo
     MethodKind: Class
-    FactoryAsInit: C
+    SwiftName: 'printInfo()'
 - Name: UIPrintInteractionController
   Properties:
   - Name: 'sharedPrintController'

test/ClangModules/objc_factory_method.swift

@@ -93,7 +93,6 @@ func testNonsplittableFactoryMethod() {
 
 func testFactoryMethodBlacklist() {
   _ = NCWidgetController.widgetController()
-  _ = ProcessInfo.processInfo()
 }
 
 func test17261609() {

test/Inputs/clang-importer-sdk/usr/include/Foundation.h

@@ -740,7 +740,7 @@ NSSet *setToSet(NSSet *dict);
 @end
 
 @interface NSProcessInfo : NSObject
-+ (nonnull NSProcessInfo *)processInfo;
+@property (class, readonly, strong, nonnull) NSProcessInfo *processInfo;
 @end
 
 @interface NSString(FoundationExts)