Merge pull request #82579 from swiftlang/egorzhdan/import-as-member-from-namespace

[cxx-interop] Allow import-as-member for functions declared within a namespace

Author: egorzhdan

lib/ClangImporter/ImportDecl.cpp

@@ -10300,9 +10300,11 @@ ClangImporter::Implementation::importDeclContextOf(
   if (!importedDC) return nullptr;
 
   // If the declaration was not global to start with, we're done.
-  bool isGlobal =
-    decl->getDeclContext()->getRedeclContext()->isTranslationUnit();
-  if (!isGlobal) return importedDC;
+  bool isRenamedGlobal =
+      decl->getDeclContext()->getRedeclContext()->isTranslationUnit() ||
+      (context.getKind() == EffectiveClangContext::UnresolvedContext &&
+          decl->getDeclContext()->getRedeclContext()->isNamespace());
+  if (!isRenamedGlobal) return importedDC;
 
   // If the resulting declaration context is not a nominal type,
   // we're done.

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

@@ -25,3 +25,8 @@ typedef MyNS::MyDeepNS::DeepNestedStruct DeepNestedStructTypedef;
 
 int deepNestedStructTypedef_method(DeepNestedStructTypedef p) SWIFT_NAME("DeepNestedStructTypedef.methodTypedef(self:)") { return p.value + 3; }
 int deepNestedStructTypedef_methodQualName(MyNS::MyDeepNS::DeepNestedStruct p) SWIFT_NAME("DeepNestedStructTypedef.methodTypedefQualName(self:)") { return p.value + 4; }
+
+namespace MyNS {
+int nestedStruct_nestedMethod(MyNS::NestedStruct p) SWIFT_NAME("MyNS.NestedStruct.nestedMethod(self:)") { return p.value + 3; }
+inline int nestedStruct_nestedMethodInline(MyNS::NestedStruct p) SWIFT_NAME("MyNS.NestedStruct.nestedMethodInline(self:)") { return p.value + 4; }
+}

test/Interop/Cxx/namespace/import-as-member-module-interface.swift

@@ -4,6 +4,8 @@
 // CHECK-NEXT:   func method() -> Int32
 // CHECK-NEXT:   func methodConstRef() -> Int32
 // CHECK-NEXT:   func methodInline() -> Int32
+// CHECK-NEXT:   func nestedMethod() -> Int32
+// CHECK-NEXT:   func nestedMethodInline() -> Int32
 // CHECK-NEXT: }
 
 // CHECK:      extension MyNS.MyDeepNS.DeepNestedStruct {

test/Interop/Cxx/namespace/import-as-member-typechecker.swift

@@ -5,6 +5,8 @@ import ImportAsMember
 func takesNestedStruct(_ s: MyNS.NestedStruct) {
   _ = s.method()
   _ = s.methodConstRef()
+  _ = s.nestedMethod()
+  _ = s.nestedMethodInline()
 
   _ = nestedStruct_method(s) // expected-error {{'nestedStruct_method' has been replaced by instance method 'MyNS.NestedStruct.method()'}}
 }
@@ -17,3 +19,6 @@ func takesDeepNestedStruct(_ s: MyNS.MyDeepNS.DeepNestedStruct) {
 
   _ = deepNestedStruct_method(s) // expected-error {{'deepNestedStruct_method' has been replaced by instance method 'MyNS.MyDeepNS.DeepNestedStruct.method()'}}
 }
+
+MyNS.method() // expected-error {{type 'MyNS' has no member 'method'}}
+MyNS.nestedMethod() // expected-error {{type 'MyNS' has no member 'nestedMethod'}}

test/Interop/Cxx/namespace/import-as-member.swift

@@ -22,4 +22,10 @@ NamespacesTestSuite.test("Struct in a deep namespace") {
   expectEqual(460, s.methodTypedefQualName())
 }
 
+NamespacesTestSuite.test("Struct and function in a namespace") {
+  let s = MyNS.NestedStruct()
+  expectEqual(126, s.nestedMethod())
+  expectEqual(127, s.nestedMethodInline())
+}
+
 runAllTests()