Merge pull request #68279 from apple/egorzhdan/5.9-nsnotification

🍒[cxx-interop] Look up `NSNotificationName` in C++ language mode properly

Author: egorzhdan

lib/ClangImporter/ClangAdapter.cpp

@@ -555,7 +555,9 @@ clang::TypedefNameDecl *importer::findSwiftNewtype(const clang::NamedDecl *decl,
     clang::LookupResult lookupResult(clangSema, notificationName,
                                      clang::SourceLocation(),
                                      clang::Sema::LookupOrdinaryName);
-    if (!clangSema.LookupName(lookupResult, clangSema.TUScope))
+    if (!clangSema.LookupQualifiedName(
+            lookupResult,
+            /*LookupCtx*/ clangSema.getASTContext().getTranslationUnitDecl()))
       return nullptr;
     auto nsDecl = lookupResult.getAsSingle<clang::TypedefNameDecl>();
     if (!nsDecl)

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

@@ -17,7 +17,7 @@ module NSOptionsMangling {
   header "NSOptionsMangling.h"
 }
 
-module NSNofiticationBridging {
+module NSNotificationBridging {
   header "nsnotification-bridging.h"
   requires objc
   requires cplusplus

test/Interop/Cxx/objc-correctness/Inputs/nsnotification-bridging.h

@@ -1,3 +1,4 @@
 #import <Foundation/Foundation.h>
 
 extern NSString * const SpaceShipNotification;
+extern "C" NSString * const CExternNotification;

test/Interop/Cxx/objc-correctness/nsnotification-bridging-ide-test.swift

@@ -1,7 +1,8 @@
-// RUN: %target-swift-ide-test -print-module -module-to-print=NSNofiticationBridging -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop -enable-objc-interop | %FileCheck %s
+// RUN: %target-swift-ide-test -print-module -module-to-print=NSNotificationBridging -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop -enable-objc-interop | %FileCheck %s
 
 // REQUIRES: objc_interop
 
 // CHECK: import Foundation
 
 // CHECK: let SpaceShipNotification: String
+// CHECK: let CExternNotification: String

test/Interop/Cxx/objc-correctness/nsnotification-typechecker.swift

@@ -0,0 +1,10 @@
+// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -enable-objc-interop -enable-experimental-cxx-interop
+// REQUIRES: objc_interop
+
+import Foundation
+import NSNotificationBridging
+
+func test(_ n: NSNotification.Name) {}
+
+test(NSNotification.Name.SpaceShip)
+test(NSNotification.Name.CExtern)