Merge pull request #82420 from swiftlang/egorzhdan/6.2-namespace-printer-null-crash

🍒[cxx-interop] Fix printing of namespaces declared in bridging headers

Author: egorzhdan

lib/AST/ASTPrinter.cpp

@@ -2737,6 +2737,10 @@ static void addNamespaceMembers(Decl *decl,
     declOwner = declOwner->getTopLevelModule();
   auto Redecls = llvm::SmallVector<clang::NamespaceDecl *, 2>(namespaceDecl->redecls());
   std::stable_sort(Redecls.begin(), Redecls.end(), [&](clang::NamespaceDecl *LHS, clang::NamespaceDecl *RHS) {
+    // A namespace redeclaration will not have an owning Clang module if it is
+    // declared in a bridging header.
+    if (!LHS->getOwningModule() || !RHS->getOwningModule())
+      return (bool)LHS->getOwningModule() < (bool)RHS->getOwningModule();
     return LHS->getOwningModule()->Name < RHS->getOwningModule()->Name;
   });
   for (auto redecl : Redecls) {

test/Interop/Cxx/namespace/Inputs/bridging-header.h

@@ -0,0 +1,15 @@
+namespace NS1 {
+namespace NS2 {
+
+struct InBridgingHeader1 {};
+
+} // namespace NS2
+} // namespace NS1
+
+namespace NS1 {
+namespace NS2 {
+
+struct InBridgingHeader2 {};
+
+} // namespace NS2
+} // namespace NS1

test/Interop/Cxx/namespace/bridging-header-module-interface.swift

@@ -0,0 +1,4 @@
+// RUN: %target-swift-ide-test -print-header -header-to-print %S/Inputs/bridging-header.h -import-objc-header %S/Inputs/bridging-header.h -source-filename=%s -cxx-interoperability-mode=upcoming-swift | %FileCheck %s
+
+// CHECK: struct InBridgingHeader1
+// CHECK: struct InBridgingHeader2