Merge pull request #82929 from bnbarham/revert-allow-qual-swift-name

Revert "[cxx-interop] Allow import-as-member for types in namespaces"

Author: bnbarham

lib/ClangImporter/SwiftLookupTable.cpp

@@ -219,7 +219,7 @@ bool SwiftLookupTable::contextRequiresName(ContextKind kind) {
 
 /// Try to translate the given Clang declaration into a context.
 static std::optional<SwiftLookupTable::StoredContext>
-translateDeclToContext(const clang::NamedDecl *decl) {
+translateDeclToContext(clang::NamedDecl *decl) {
   // Tag declaration.
   if (auto tag = dyn_cast<clang::TagDecl>(decl)) {
     if (tag->getIdentifier())
@@ -324,46 +324,22 @@ SwiftLookupTable::translateContext(EffectiveClangContext context) {
 
 /// Lookup an unresolved context name and resolve it to a Clang
 /// declaration context or typedef name.
-const clang::NamedDecl *
-SwiftLookupTable::resolveContext(StringRef unresolvedName) {
-  SmallVector<StringRef, 1> nameComponents;
-  unresolvedName.split(nameComponents, '.');
-
-  EffectiveClangContext parentContext;
-
+clang::NamedDecl *SwiftLookupTable::resolveContext(StringRef unresolvedName) {
   // Look for a context with the given Swift name.
-  for (auto nameComponent : nameComponents) {
-    auto entries =
-        parentContext
-            ? lookup(SerializedSwiftName(nameComponent), parentContext)
-            : lookup(SerializedSwiftName(nameComponent),
-                     std::make_pair(ContextKind::TranslationUnit, StringRef()));
-    bool entryFound = false;
-    for (auto entry : entries) {
-      if (auto decl = entry.dyn_cast<clang::NamedDecl *>()) {
-        if (isa<clang::TagDecl>(decl) ||
-            isa<clang::ObjCInterfaceDecl>(decl) ||
-            isa<clang::NamespaceDecl>(decl)) {
-          entryFound = true;
-          parentContext = EffectiveClangContext(cast<clang::DeclContext>(decl));
-          break;
-        }
-        if (auto typedefDecl = dyn_cast<clang::TypedefNameDecl>(decl)) {
-          entryFound = true;
-          parentContext = EffectiveClangContext(typedefDecl);
-          break;
-        }
-      }
+  for (auto entry :
+       lookup(SerializedSwiftName(unresolvedName),
+              std::make_pair(ContextKind::TranslationUnit, StringRef()))) {
+    if (auto decl = entry.dyn_cast<clang::NamedDecl *>()) {
+      if (isa<clang::TagDecl>(decl) ||
+          isa<clang::ObjCInterfaceDecl>(decl) ||
+          isa<clang::TypedefNameDecl>(decl))
+        return decl;
     }
-
-    // If we could not resolve this component of the qualified name, bail.
-    if (!entryFound)
-      return nullptr;
   }
 
-  return parentContext.getAsDeclContext()
-             ? cast<clang::NamedDecl>(parentContext.getAsDeclContext())
-             : parentContext.getTypedefName();
+  // FIXME: Search imported modules to resolve the context.
+
+  return nullptr;
 }
 
 void SwiftLookupTable::addCategory(clang::ObjCCategoryDecl *category) {

lib/ClangImporter/SwiftLookupTable.h

@@ -593,7 +593,7 @@ class SwiftLookupTable {
 public:
   /// Lookup an unresolved context name and resolve it to a Clang
   /// named declaration.
-  const clang::NamedDecl *resolveContext(StringRef unresolvedName);
+  clang::NamedDecl *resolveContext(StringRef unresolvedName);
 
   /// Lookup the set of entities with the given base name.
   ///

test/APINotes/Inputs/broken-modules/BrokenAPINotes.apinotes

@@ -13,4 +13,4 @@ Functions:
   - Name: ZXSpectrumSetMisnamedRegister
     SwiftName: 'setter:ZXSpectrum.misnamedRegister(self:newValue:)'
   - Name: ZXSpectrumHelperReset
-    SwiftName: 'ZXSpectrum::Helper.reset()'
+    SwiftName: 'ZXSpectrum.Helper.reset()'

test/Interop/Cxx/namespace/Inputs/import-as-member.h

@@ -60,12 +60,6 @@ module Enums {
   requires cplusplus
 }
 
-module ImportAsMember {
-  header "import-as-member.h"
-  export *
-  requires cplusplus
-}
-
 module MembersDirect {
   header "members-direct.h"
   requires cplusplus