Revert "[cxx-interop] Look up NSNotificationName in C++ language mode properly"

egorzhdan · egorzhdan · commit 80448d2f1cf6 · 2023-09-25T20:14:00.000+01:00
This reverts commit e956e8a.
diff --git a/lib/ClangImporter/ClangAdapter.cpp b/lib/ClangImporter/ClangAdapter.cpp
@@ -555,9 +555,7 @@ clang::TypedefNameDecl *importer::findSwiftNewtype(const clang::NamedDecl *decl,
     clang::LookupResult lookupResult(clangSema, notificationName,
                                      clang::SourceLocation(),
                                      clang::Sema::LookupOrdinaryName);
-    if (!clangSema.LookupQualifiedName(
-            lookupResult,
-            /*LookupCtx*/ clangSema.getASTContext().getTranslationUnitDecl()))
+    if (!clangSema.LookupName(lookupResult, clangSema.TUScope))
       return nullptr;
     auto nsDecl = lookupResult.getAsSingle<clang::TypedefNameDecl>();
     if (!nsDecl)
diff --git a/test/Interop/Cxx/objc-correctness/Inputs/nsnotification-bridging.h b/test/Interop/Cxx/objc-correctness/Inputs/nsnotification-bridging.h
@@ -1,4 +1,3 @@
 #import <Foundation/Foundation.h>
 
 extern NSString * const SpaceShipNotification;
-extern "C" NSString * const CExternNotification;
diff --git a/test/Interop/Cxx/objc-correctness/nsnotification-bridging-ide-test.swift b/test/Interop/Cxx/objc-correctness/nsnotification-bridging-ide-test.swift
@@ -5,4 +5,3 @@
 // CHECK: import Foundation
 
 // CHECK: let SpaceShipNotification: String
-// CHECK: let CExternNotification: String
diff --git a/test/Interop/Cxx/objc-correctness/nsnotification-typechecker.swift b/test/Interop/Cxx/objc-correctness/nsnotification-typechecker.swift

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`	`1`	`#import <Foundation/Foundation.h>`
`2`	`2`
`3`	`3`	`extern NSString * const SpaceShipNotification;`
`4`		`-extern "C" NSString * const CExternNotification;`
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,3 @@`
`5`	`5`	`// CHECK: import Foundation`
`6`	`6`
`7`	`7`	`// CHECK: let SpaceShipNotification: String`
`8`		`-// CHECK: let CExternNotification: String`