Merge pull request #42091 from bulbazord/protocol_name_lookup_fix

[cxx-interop][ClangImporter] Fix protocol renaming issue with objc++ interop enabled

Author: bulbazord

lib/ClangImporter/ImportName.cpp

@@ -999,7 +999,11 @@ bool NameImporter::hasNamingConflict(const clang::NamedDecl *decl,
   lookupResult.setAllowHidden(true);
   lookupResult.suppressDiagnostics();
 
-  if (clangSema.LookupName(lookupResult, /*scope=*/clangSema.TUScope)) {
+  // Only force the Objective-C codepath in LookupName if clangSema.TUScope is
+  // nullptr
+  if (clangSema.LookupName(lookupResult, /*scope=*/clangSema.TUScope,
+                           /*AllowBuiltinCreation=*/false,
+                           /*ForceNoCPlusPlus=*/!clangSema.TUScope)) {
     if (std::any_of(lookupResult.begin(), lookupResult.end(), conflicts))
       return true;
   }

test/Interop/Cxx/objc-correctness/Inputs/module.modulemap

@@ -0,0 +1,4 @@
+module ProtocolNamingConflict [extern_c] {
+  header "protocol-naming-conflict.h"
+  requires objc
+}

test/Interop/Cxx/objc-correctness/Inputs/protocol-naming-conflict.h

@@ -0,0 +1,4 @@
+@protocol Foo
+@end
+@interface Foo <Foo>
+@end

test/Interop/Cxx/objc-correctness/protocol-naming-conflict.swift

@@ -0,0 +1,12 @@
+// RUN: %target-swift-ide-test -print-module -module-to-print=ProtocolNamingConflict -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop -enable-objc-interop | %FileCheck -check-prefix=CHECK-IDE-TEST %s
+// RUN: %swift-frontend -c -enable-experimental-cxx-interop -enable-objc-interop -I %S/Inputs %s -emit-sil -o - | %FileCheck %s
+
+// REQUIRES: objc_interop
+
+import ProtocolNamingConflict
+
+// CHECK: class Thing : FooProtocol
+// CHECK-IDE-TEST: protocol FooProtocol
+// CHECK-IDE-TEST: class Foo : FooProtocol
+class Thing: FooProtocol {
+}