Merge pull request #60215 from zoecarver/diags-record-in-namesapce

[cxx-interop][diags] Fix diagnostics for records inside namespaces.

Author: zoecarver

lib/Sema/TypeCheckType.cpp

@@ -1253,6 +1253,12 @@ static Type diagnoseUnknownType(TypeResolution resolution,
         .diagnose(comp->getNameLoc(), diag::invalid_member_type,
                   comp->getNameRef(), kind, parentType)
         .highlight(parentRange);
+
+    if (!ctx.LangOpts.DisableExperimentalClangImporterDiagnostics) {
+      ctx.getClangModuleLoader()->diagnoseMemberValue(
+          comp->getNameRef().getFullName(), parentType);
+    }
+
     return ErrorType::get(ctx);
   }
 
@@ -1308,6 +1314,12 @@ static Type diagnoseUnknownType(TypeResolution resolution,
           .diagnose(comp->getNameLoc(), diag::invalid_member_type,
                     comp->getNameRef(), kind, parentType)
           .highlight(parentRange);
+
+      if (!ctx.LangOpts.DisableExperimentalClangImporterDiagnostics) {
+        ctx.getClangModuleLoader()->diagnoseMemberValue(
+            comp->getNameRef().getFullName(), parentType);
+      }
+
       // Note where the type was defined, this can help diagnose if the user
       // expected name lookup to find a module when there's a conflicting type.
       if (auto typeDecl = parentType->getNominalOrBoundGenericNominal()) {

test/Interop/Cxx/class/invalid-class-errors.swift

@@ -17,11 +17,19 @@ struct __attribute__((swift_attr("import_unsafe"))) B {
     B(const B&) = delete;
 };
 
+namespace Namespace {
+struct Nested {
+  Nested(const Nested&) = delete;
+};
+}
+
 //--- test.swift
 
 import Test
 
 // CHECK: note: record 'A' is not automatically importable: does not have a copy constructor or destructor. Refer to the C++ Interop User Manual to classify this type.
 public func test(x: A) { }
 // CHECK: note: record 'B' is not automatically importable: does not have a copy constructor or destructor. Refer to the C++ Interop User Manual to classify this type.
-public func test(x: B) { }
+public func test(x: B) { }
+// CHECK: note: record 'Nested' is not automatically importable: does not have a copy constructor or destructor. Refer to the C++ Interop User Manual to classify this type.
+public func test(x: Namespace.Nested) { }