[Serialization] Serialize Objective-C method names for accessors.

Due to some short-circuiting in the serialization logic, we never
added @objc getters/setters to a module’s Objective-C method table.

Author: DougGregor

lib/Serialization/Serialization.cpp

@@ -4788,9 +4788,33 @@ static void collectInterestingNestedDeclarations(
   const NominalTypeDecl *nominalParent = nullptr;
 
   for (const Decl *member : members) {
+    // If there is a corresponding Objective-C method, record it.
+    auto recordObjCMethod = [&] {
+      if (isLocal)
+        return;
+
+      if (auto func = dyn_cast<AbstractFunctionDecl>(member)) {
+        if (func->isObjC()) {
+          if (auto owningClass =
+                func->getDeclContext()->getAsClassOrClassExtensionContext()) {
+            Mangle::ASTMangler mangler;
+            std::string ownerName = mangler.mangleNominalType(owningClass);
+            assert(!ownerName.empty() && "Mangled type came back empty!");
+
+            objcMethods[func->getObjCSelector()].push_back(
+              std::make_tuple(ownerName,
+                              func->isObjCInstanceMethod(),
+                              S.addDeclRef(func)));
+          }
+        }
+      }
+    };
+
     if (auto memberValue = dyn_cast<ValueDecl>(member)) {
-      if (!memberValue->hasName())
+      if (!memberValue->hasName()) {
+        recordObjCMethod();
         continue;
+      }
 
       if (memberValue->isOperator()) {
         // Add operator methods.
@@ -4826,23 +4850,7 @@ static void collectInterestingNestedDeclarations(
     }
 
     // Record Objective-C methods.
-    if (!isLocal) {
-      if (auto func = dyn_cast<AbstractFunctionDecl>(member)) {
-        if (func->isObjC()) {
-          if (auto owningClass =
-                func->getDeclContext()->getAsClassOrClassExtensionContext()) {
-            Mangle::ASTMangler mangler;
-            std::string ownerName = mangler.mangleNominalType(owningClass);
-            assert(!ownerName.empty() && "Mangled type came back empty!");
-
-            objcMethods[func->getObjCSelector()].push_back(
-              std::make_tuple(ownerName,
-                              func->isObjCInstanceMethod(),
-                              S.addDeclRef(func)));
-          }
-        }
-      }
-    }
+    recordObjCMethod();
   }
 }
 

test/expr/primary/selector/Inputs/fixits_helper.swift

@@ -0,0 +1,27 @@
+import Foundation
+
+public class Bar : Foo {
+  @objc(method2WithValue:) public override func method2(_ value: Int) { }
+
+  @objc(overloadedWithInt:) public func overloaded(_ x: Int) { }
+  @objc(overloadedWithString:) public func overloaded(_ x: String) { }
+
+  @objc(staticOverloadedWithInt:) public static func staticOverloaded(_ x: Int) { }
+  @objc(staticOverloadedWithString:) public static func staticOverloaded(_ x: String) { }
+
+  @objc(staticOrNonStatic:) public func staticOrNonStatic(_ x: Int) { }
+  @objc(staticOrNonStatic:) public static func staticOrNonStatic(_ x: Int) { }
+
+  @objc(theInstanceOne:) public func staticOrNonStatic2(_ x: Int) { }
+  @objc(theStaticOne:) public static func staticOrNonStatic2(_ x: Int) { }
+}
+
+public class Foo {
+  @objc(methodWithValue:label:) public func method(_ value: Int, label: String) { }
+
+  @objc(method2WithValue:) public func method2(_ value: Int) { }
+
+  @objc public func method3() { }
+
+  @objc public var property: String = ""
+}

test/expr/primary/selector/fixits.swift

@@ -9,6 +9,8 @@
 // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-module -o %t.overlays %clang-importer-sdk-path/swift-modules/Foundation.swift
 // FIXME: END -enable-source-import hackaround
 
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-module -o %t.overlays %S/Inputs/fixits_helper.swift -module-name Helper
+
 // Make sure we get the right diagnostics.
 // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t.overlays) -typecheck %s -verify
 
@@ -29,33 +31,7 @@
 // CHECK: warning: string literal is not a valid Objective-C selector
 
 import Foundation
-
-class Bar : Foo {
-  @objc(method2WithValue:) override func method2(_ value: Int) { }
-
-  @objc(overloadedWithInt:) func overloaded(_ x: Int) { }
-  @objc(overloadedWithString:) func overloaded(_ x: String) { }
-
-  @objc(staticOverloadedWithInt:) static func staticOverloaded(_ x: Int) { }
-  @objc(staticOverloadedWithString:) static func staticOverloaded(_ x: String) { }
-
-  @objc(staticOrNonStatic:) func staticOrNonStatic(_ x: Int) { }
-  @objc(staticOrNonStatic:) static func staticOrNonStatic(_ x: Int) { }
-
-  @objc(theInstanceOne:) func staticOrNonStatic2(_ x: Int) { }
-  @objc(theStaticOne:) static func staticOrNonStatic2(_ x: Int) { }
-}
-
-class Foo {
-  @objc(methodWithValue:label:) func method(_ value: Int, label: String) { }
-
-  @objc(method2WithValue:) func method2(_ value: Int) { }
-
-  @objc func method3() { }
-
-  @objc var property: String = ""
-}
-
+import Helper
 
 func testDeprecatedStringLiteralSelector() {
   let sel1: Selector = "methodWithValue:label:" // expected-warning{{use of string literal for Objective-C selectors is deprecated; use '#selector' instead}}{{24-48=#selector(Foo.method(_:label:))}}