Merge pull request #11446 from CodaFi/like-a-bridge-over-troubled-decls

Reject member lookups that require bridging metatypes

Author: CodaFi

lib/Sema/CSSimplify.cpp

@@ -3263,7 +3263,7 @@ performMemberLookup(ConstraintKind constraintKind, DeclName memberName,
 
   // If the instance type is a bridged to an Objective-C type, perform
   // a lookup into that Objective-C type.
-  if (bridgedType) {
+  if (bridgedType && !isMetatype) {
     LookupResult &bridgedLookup = lookupMember(bridgedClass, memberName);
     ModuleDecl *foundationModule = nullptr;
     for (auto result : bridgedLookup) {

test/ClangImporter/objc_bridge_categories.swift

@@ -9,7 +9,7 @@ import AppKit
 
 func testStringBridge(_ str: String) {
   var str2 = str.nsStringMethod()!
-  var int = String.nsStringClassMethod()
+  var int = NSString.nsStringClassMethod()
   var str3 = str.nsStringProperty!
 
   // Make sure the types worked out as expected

test/Constraints/Inputs/invalid_metatype_bridging_header.h

@@ -0,0 +1,7 @@
+@import Foundation;
+
+// rdar://problem/33830526: Constraint system should not add static methods
+// to the overload search space if it would require bridging unrelated metatypes.
+@interface NSString (Extension)
++ (void) meth;
+@end

test/Constraints/invalid_metatype_bridging_header.swift

@@ -0,0 +1,12 @@
+// RUN: %target-swift-frontend -typecheck -import-objc-header %S/Inputs/invalid_metatype_bridging_header.h %s -verify
+
+// REQUIRES: objc_interop
+
+// rdar://problem/33830526: Constraint system should not add static methods
+// to the overload search space if it would require bridging unrelated metatypes.
+class Crasher {
+  static func called(argument: String) {}
+}
+
+Crasher.called(argument: .meth) // expected-error {{type 'String' has no member 'meth'}}
+Crasher.called(argument: String.meth) // expected-error {{type 'String' has no member 'meth'}}