Skip to content

Commit 80448d2

Browse files
committed
Revert "[cxx-interop] Look up NSNotificationName in C++ language mode properly"
This reverts commit e956e8a.
1 parent 1cd423d commit 80448d2

File tree

4 files changed

+1
-15
lines changed

4 files changed

+1
-15
lines changed

lib/ClangImporter/ClangAdapter.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -555,9 +555,7 @@ clang::TypedefNameDecl *importer::findSwiftNewtype(const clang::NamedDecl *decl,
555555
clang::LookupResult lookupResult(clangSema, notificationName,
556556
clang::SourceLocation(),
557557
clang::Sema::LookupOrdinaryName);
558-
if (!clangSema.LookupQualifiedName(
559-
lookupResult,
560-
/*LookupCtx*/ clangSema.getASTContext().getTranslationUnitDecl()))
558+
if (!clangSema.LookupName(lookupResult, clangSema.TUScope))
561559
return nullptr;
562560
auto nsDecl = lookupResult.getAsSingle<clang::TypedefNameDecl>();
563561
if (!nsDecl)
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
#import <Foundation/Foundation.h>
22

33
extern NSString * const SpaceShipNotification;
4-
extern "C" NSString * const CExternNotification;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@
55
// CHECK: import Foundation
66

77
// CHECK: let SpaceShipNotification: String
8-
// CHECK: let CExternNotification: String

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

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)