Merge pull request #41874 from zoecarver/find-ns-object-in-cxx-mode

[cxx-interop] Make sure to use TUScope when looking up clang decls.

Author: zoecarver

lib/ClangImporter/ImportType.cpp

@@ -3076,7 +3076,7 @@ Decl *ClangImporter::Implementation::importDeclByName(StringRef name) {
   clang::LookupResult lookupResult(sema, clangName, clang::SourceLocation(),
                                    clang::Sema::LookupOrdinaryName);
   lookupResult.setAllowHidden(true);
-  if (!sema.LookupName(lookupResult, /*Scope=*/nullptr)) {
+  if (!sema.LookupName(lookupResult, /*Scope=*/sema.TUScope)) {
     return nullptr;
   }
 

test/Interop/Cxx/class/Inputs/dictionary-of-nsstrings.h

@@ -0,0 +1,8 @@
+#ifndef TEST_INTEROP_CXX_CLASS_INPUTS_DESTRUCTORS_H
+#define TEST_INTEROP_CXX_CLASS_INPUTS_DESTRUCTORS_H
+
+#import <Foundation/Foundation.h>
+
+void takesDictionaryOfStrings(NSDictionary<NSString*, NSString*>*_Nonnull a) { }
+
+#endif // TEST_INTEROP_CXX_CLASS_INPUTS_DESTRUCTORS_H

test/Interop/Cxx/class/Inputs/module.modulemap

@@ -92,3 +92,8 @@ module ClassProtocolNameClash {
   header "class-protocol-name-clash.h"
   requires cplusplus
 }
+
+module DictionaryOfNSStrings {
+  header "dictionary-of-nsstrings.h"
+  requires cplusplus
+}

test/Interop/Cxx/class/dictionary-of-nsstrings-module-interface.swift

@@ -0,0 +1,5 @@
+// RUN: %target-swift-ide-test -print-module -module-to-print=DictionaryOfNSStrings -I %S/Inputs/ -source-filename=x -enable-cxx-interop | %FileCheck %s
+
+// REQUIRES: objc_interop
+
+// CHECK: func takesDictionaryOfStrings(_ a: [String : String])