Merge pull request #64265 from hyp/eng/swift-stdlib-is-swift-whoda-thunk-it

[interop][SwiftToCxx] emit Swift's stdlib inside of 'swift' namespace

Author: hyp

lib/AST/SwiftNameTranslation.cpp

@@ -163,6 +163,10 @@ swift::cxx_translation::getNameForCxx(const ValueDecl *VD,
   if (customNamesOnly)
     return StringRef();
 
+  if (auto *mod = dyn_cast<ModuleDecl>(VD)) {
+    if (mod->isStdlibModule())
+      return "swift";
+  }
   if (VD->getModuleContext()->isStdlibModule()) {
     // Incorporate argument labels into Stdlib API names.
     // FIXME: This should be done more broadly.

lib/PrintAsClang/ClangSyntaxPrinter.cpp

@@ -142,7 +142,7 @@ void ClangSyntaxPrinter::printModuleNamespaceStart(
     const ModuleDecl &moduleContext) const {
   os << "namespace ";
   printBaseName(&moduleContext);
-  os << " __attribute__((swift_private))";
+  os << " SWIFT_PRIVATE_ATTR";
   printSymbolUSRAttribute(&moduleContext);
   os << " {\n";
 }
@@ -155,7 +155,7 @@ void ClangSyntaxPrinter::printNamespace(
   os << "namespace ";
   namePrinter(os);
   if (trivia == NamespaceTrivia::AttributeSwiftPrivate)
-    os << " __attribute__((swift_private))";
+    os << " SWIFT_PRIVATE_ATTR";
   if (moduleContext)
     printSymbolUSRAttribute(moduleContext);
   os << " {\n\n";

lib/PrintAsClang/ModuleContentsWriter.cpp

@@ -835,8 +835,8 @@ EmittedClangHeaderDependencyInfo swift::printModuleContentsAsCxx(
       os << "#endif\n";
     os << "#ifdef __cplusplus\n";
     os << "namespace ";
-    M.ValueDecl::getName().print(os);
-    os << " __attribute__((swift_private))";
+    ClangSyntaxPrinter(os).printBaseName(&M);
+    os << " SWIFT_PRIVATE_ATTR";
     ClangSyntaxPrinter(os).printSymbolUSRAttribute(&M);
     os << " {\n";
     os << "namespace " << cxx_synthesis::getCxxImplNamespaceName() << " {\n";
@@ -854,7 +854,7 @@ EmittedClangHeaderDependencyInfo swift::printModuleContentsAsCxx(
 
   // Construct a C++ namespace for the module.
   ClangSyntaxPrinter(os).printNamespace(
-      [&](raw_ostream &os) { M.ValueDecl::getName().print(os); },
+      [&](raw_ostream &os) { ClangSyntaxPrinter(os).printBaseName(&M); },
       [&](raw_ostream &os) { os << moduleOS.str(); },
       ClangSyntaxPrinter::NamespaceTrivia::AttributeSwiftPrivate, &M);
 

lib/PrintAsClang/PrintClangFunction.cpp

@@ -19,6 +19,7 @@
 #include "PrintClangValueType.h"
 #include "SwiftToClangInteropContext.h"
 #include "swift/ABI/MetadataValues.h"
+#include "swift/AST/ASTContext.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/GenericParamList.h"
 #include "swift/AST/Module.h"
@@ -218,7 +219,8 @@ class CFunctionSignatureTypePrinter
                      llvm::function_ref<void()> body) {
     if (!optionalKind || optionalKind == OTK_None)
       return body();
-    os << "Swift::Optional<";
+    printBaseName(moduleContext->getASTContext().getStdlibModule());
+    os << "::Optional<";
     body();
     os << '>';
   }
@@ -718,7 +720,7 @@ ClangRepresentation DeclAndTypeClangFunctionPrinter::printFunctionSignature(
 
   // Print out the return type.
   if (FD->hasThrows() && outputLang == OutputLanguageMode::Cxx)
-    os << "Swift::ThrowingResult<";
+    os << "swift::ThrowingResult<";
   if (kind == FunctionSignatureKind::CFunctionProto) {
     // First, verify that the C++ return type is representable.
     {
@@ -1330,25 +1332,25 @@ void DeclAndTypeClangFunctionPrinter::printCxxThunkBody(
   if (hasThrows) {
     os << "  if (opaqueError != nullptr)\n";
     os << "#ifdef __cpp_exceptions\n";
-    os << "    throw (Swift::Error(opaqueError));\n";
+    os << "    throw (swift::Error(opaqueError));\n";
     os << "#else\n";
     if (resultTy->isVoid()) {
-      os << "    return Swift::Expected<void>(Swift::Error(opaqueError));\n";
+      os << "    return swift::Expected<void>(swift::Error(opaqueError));\n";
       os << "#endif\n";
     } else {
       auto directResultType = signature.getDirectResultType();
       printDirectReturnOrParamCType(
           *directResultType, resultTy, moduleContext, os, cPrologueOS,
           typeMapping, interopContext, [&]() {
-            os << "    return Swift::Expected<";
+            os << "    return swift::Expected<";
             OptionalTypeKind retKind;
             Type objTy;
             std::tie(objTy, retKind) =
                 DeclAndTypePrinter::getObjectTypeAndOptionality(FD, resultTy);
 
             auto s = printClangFunctionReturnType(objTy, retKind, const_cast<ModuleDecl *>(moduleContext),
                                                   OutputLanguageMode::Cxx);
-            os << ">(Swift::Error(opaqueError));\n";
+            os << ">(swift::Error(opaqueError));\n";
             os << "#endif\n";
 
             // Return the function result value if it doesn't throw.

lib/PrintAsClang/PrintSwiftToClangCoreScaffold.cpp

@@ -200,24 +200,27 @@ void swift::printSwiftToClangCoreScaffold(SwiftToClangInteropContext &ctx,
                                           PrimitiveTypeMapping &typeMapping,
                                           raw_ostream &os) {
   ClangSyntaxPrinter printer(os);
-  printer.printNamespace("swift", [&](raw_ostream &) {
-    printer.printNamespace(
-        cxx_synthesis::getCxxImplNamespaceName(), [&](raw_ostream &) {
-          printer.printExternC([&](raw_ostream &os) {
-            printTypeMetadataResponseType(ctx, typeMapping, os);
-            os << "\n";
-            printValueWitnessTable(os);
-            os << "\n";
-            printPrimitiveGenericTypeTraits(os, astContext, typeMapping,
-                                            /*isCForwardDefinition=*/true);
-          });
-          os << "\n";
+  printer.printNamespace(
+      cxx_synthesis::getCxxSwiftNamespaceName(),
+      [&](raw_ostream &) {
+        printer.printNamespace(
+            cxx_synthesis::getCxxImplNamespaceName(), [&](raw_ostream &) {
+              printer.printExternC([&](raw_ostream &os) {
+                printTypeMetadataResponseType(ctx, typeMapping, os);
+                os << "\n";
+                printValueWitnessTable(os);
+                os << "\n";
+                printPrimitiveGenericTypeTraits(os, astContext, typeMapping,
+                                                /*isCForwardDefinition=*/true);
+              });
+              os << "\n";
+            });
+        os << "\n";
+        // C++ only supports inline variables from C++17.
+        ClangSyntaxPrinter(os).printIgnoredCxx17ExtensionDiagnosticBlock([&]() {
+          printPrimitiveGenericTypeTraits(os, astContext, typeMapping,
+                                          /*isCForwardDefinition=*/false);
         });
-    os << "\n";
-    // C++ only supports inline variables from C++17.
-    ClangSyntaxPrinter(os).printIgnoredCxx17ExtensionDiagnosticBlock([&]() {
-      printPrimitiveGenericTypeTraits(os, astContext, typeMapping,
-                                      /*isCForwardDefinition=*/false);
-    });
-  });
+      },
+      ClangSyntaxPrinter::NamespaceTrivia::AttributeSwiftPrivate);
 }

lib/PrintAsClang/_SwiftCxxInteroperability.h

@@ -71,7 +71,13 @@
 #define SWIFT_SYMBOL_MODULE(moduleValue)
 #endif
 
-namespace swift {
+#if __has_attribute(swift_private)
+#define SWIFT_PRIVATE_ATTR __attribute__((swift_private))
+#else
+#define SWIFT_PRIVATE_ATTR
+#endif
+
+namespace swift SWIFT_PRIVATE_ATTR {
 namespace _impl {
 
 extern "C" void *_Nonnull swift_retain(void *_Nonnull) noexcept;
@@ -243,7 +249,7 @@ SWIFT_INLINE_THUNK void *_Nonnull getOpaquePointer(T &value) {
 
 #pragma clang diagnostic pop
 
-} // namespace swift
+} // namespace swift SWIFT_PRIVATE_ATTR
 #endif
 
 #endif // SWIFT_CXX_INTEROPERABILITY_H

lib/PrintAsClang/_SwiftStdlibCxxOverlay.h

@@ -189,7 +189,7 @@ class Error {
     opaqueValue = other.opaqueValue;
   }
 
-  template <class T> SWIFT_INLINE_THUNK Swift::Optional<T> as() {
+  template <class T> SWIFT_INLINE_THUNK swift::Optional<T> as() {
     alignas(alignof(T)) char buffer[sizeof(T)];
     const void *em = getErrorMetadata();
     void *ep = getPointerToOpaquePointer();
@@ -207,10 +207,10 @@ class Error {
             swift::_impl::implClassFor<T>::type::initializeWithTake(dest,
                                                                     buffer);
           });
-      return Swift::Optional<T>::init(result);
+      return swift::Optional<T>::init(result);
     }
 
-    return  Swift::Optional<T>::none();
+    return swift::Optional<T>::none();
   }
 
 private:
@@ -236,7 +236,7 @@ class Expected {
     has_val = false;
   }
 
-  constexpr Expected(const Swift::Error& error_val) noexcept {
+  constexpr Expected(const swift::Error &error_val) noexcept {
     new (&buffer) Error(error_val);
     has_val = false;
   }
@@ -264,7 +264,7 @@ class Expected {
     if (has_value())
       reinterpret_cast<const T *>(buffer)->~T();
     else
-      reinterpret_cast<Swift::Error *>(buffer)->~Error();
+      reinterpret_cast<swift::Error *>(buffer)->~Error();
   }
 
   /// assignment
@@ -313,22 +313,23 @@ class Expected {
   }
 
   // Get error
-  constexpr Swift::Error const& error() const& {
+  constexpr swift::Error const &error() const & {
     if (has_value())
       abort();
-    return reinterpret_cast<const Swift::Error&>(buffer);
+    return reinterpret_cast<const swift::Error &>(buffer);
   }
 
-  constexpr Swift::Error& error() & {
+  constexpr swift::Error &error() & {
     if (has_value())
       abort();
-    return reinterpret_cast<Swift::Error&>(buffer);
+    return reinterpret_cast<swift::Error &>(buffer);
   }
 
   constexpr bool has_value() const noexcept { return has_val; }
 
 private:
-  alignas(_impl::max(alignof(T), alignof(Swift::Error))) char buffer[_impl::max(sizeof(T), sizeof(Swift::Error))];
+  alignas(_impl::max(alignof(T), alignof(swift::Error))) char buffer[_impl::max(
+      sizeof(T), sizeof(swift::Error))];
   bool has_val;
 };
 
@@ -341,12 +342,11 @@ class Expected<void> {
     has_val = false;
   }
 
-  Expected(const Swift::Error& error_val) noexcept {
+  Expected(const swift::Error &error_val) noexcept {
     new (&buffer) Error(error_val);
     has_val = false;
   }
 
-
   /// Copy
   Expected(Expected const& other) noexcept {
     if (other.has_value())
@@ -361,9 +361,7 @@ class Expected<void> {
   // FIXME: Implement move semantics when move swift values is possible
   [[noreturn]] Expected(Expected&&) noexcept { abort(); }
 
-  ~Expected() noexcept {
-    reinterpret_cast<Swift::Error *>(buffer)->~Error();
-  }
+  ~Expected() noexcept { reinterpret_cast<swift::Error *>(buffer)->~Error(); }
 
   /// assignment
   constexpr auto operator=(Expected&& other) noexcept = delete;
@@ -373,21 +371,21 @@ class Expected<void> {
   constexpr explicit operator bool() const noexcept { return has_value(); }
 
   // Get error
-  constexpr Swift::Error const& error() const& {
+  constexpr swift::Error const &error() const & {
     if (has_value())
       abort();
-    return reinterpret_cast<const Swift::Error&>(buffer);
+    return reinterpret_cast<const swift::Error &>(buffer);
   }
 
-  constexpr Swift::Error& error() & {
+  constexpr swift::Error &error() & {
     if (has_value())
       abort();
-    return reinterpret_cast<Swift::Error&>(buffer);
+    return reinterpret_cast<swift::Error &>(buffer);
   }
 
   constexpr bool has_value() const noexcept { return has_val; }
 private:
-  alignas(alignof(Swift::Error)) char buffer[sizeof(Swift::Error)];
+  alignas(alignof(swift::Error)) char buffer[sizeof(swift::Error)];
   bool has_val;
 };
 
@@ -400,10 +398,9 @@ using ThrowingResult = T;
 
 #else
 
-template<class T>
-using ThrowingResult = Swift::Expected<T>;
+template <class T> using ThrowingResult = swift::Expected<T>;
 
-#define SWIFT_RETURN_THUNK(T, v) Swift::Expected<T>(v)
+#define SWIFT_RETURN_THUNK(T, v) swift::Expected<T>(v)
 
 #endif
 

test/Interop/CxxToSwiftToCxx/bridge-cxx-struct-back-to-cxx.swift

@@ -192,7 +192,7 @@ public func takeTrivialInout(_ x: inout Trivial) {
 // CHECK-NEXT: #pragma clang diagnostic pop
 // CHECK-NEXT: } // namespace swift
 // CHECK-EMPTY:
-// CHECK-NEXT: namespace UseCxxTy __attribute__((swift_private)) SWIFT_SYMBOL_MODULE("UseCxxTy") {
+// CHECK-NEXT: namespace UseCxxTy SWIFT_PRIVATE_ATTR SWIFT_SYMBOL_MODULE("UseCxxTy") {
 
 // CHECK: SWIFT_INLINE_THUNK ns::NonTrivialTemplate<int> retNonTrivial() noexcept SWIFT_SYMBOL({{.*}}) SWIFT_WARN_UNUSED_RESULT {
 // CHECK-NEXT: alignas(alignof(ns::NonTrivialTemplate<int>)) char storage[sizeof(ns::NonTrivialTemplate<int>)];
@@ -231,7 +231,7 @@ public func takeTrivialInout(_ x: inout Trivial) {
 // CHECK-NEXT: #pragma clang diagnostic pop
 // CHECK-NEXT: } // namespace swift
 // CHECK-EMPTY:
-// CHECK-NEXT: namespace UseCxxTy __attribute__((swift_private)) SWIFT_SYMBOL_MODULE("UseCxxTy") {
+// CHECK-NEXT: namespace UseCxxTy SWIFT_PRIVATE_ATTR SWIFT_SYMBOL_MODULE("UseCxxTy") {
 // CHECK-EMPTY:
 // CHECK-NEXT: SWIFT_INLINE_THUNK ns::NonTrivialTemplate<ns::TrivialinNS> retNonTrivial2() noexcept SWIFT_SYMBOL({{.*}}) SWIFT_WARN_UNUSED_RESULT {
 // CHECK-NEXT: alignas(alignof(ns::NonTrivialTemplate<ns::TrivialinNS>)) char storage[sizeof(ns::NonTrivialTemplate<ns::TrivialinNS>)];

test/Interop/SwiftToCxx/class/swift-actor-in-cxx.swift

@@ -34,7 +34,7 @@ public final actor ActorWithField {
   }
 }
 
-// CHECK: namespace Actor __attribute__((swift_private)) SWIFT_SYMBOL_MODULE("Actor") {
+// CHECK: namespace Actor SWIFT_PRIVATE_ATTR SWIFT_SYMBOL_MODULE("Actor") {
 // CHECK: SWIFT_EXTERN void * _Nonnull $s5Actor0A9WithFieldCACycfC(SWIFT_CONTEXT void * _Nonnull _self) SWIFT_NOEXCEPT SWIFT_CALL; // init()
 // CHECK: SWIFT_EXTERN void $s5Actor0A9WithFieldC6methodyyF(SWIFT_CONTEXT void * _Nonnull _self) SWIFT_NOEXCEPT SWIFT_CALL; // method()
 

test/Interop/SwiftToCxx/class/swift-class-in-cxx.swift

@@ -21,14 +21,14 @@ public final class ClassWithIntField {
   }
 }
 
-// CHECK: namespace Class __attribute__((swift_private)) SWIFT_SYMBOL_MODULE("Class") {
+// CHECK: namespace Class SWIFT_PRIVATE_ATTR SWIFT_SYMBOL_MODULE("Class") {
 
 // CHECK: SWIFT_EXTERN void * _Nonnull $s5Class011passThroughA12WithIntFieldyAA0adeF0CADF(void * _Nonnull x) SWIFT_NOEXCEPT SWIFT_CALL; // passThroughClassWithIntField(_:)
 // CHECK-NEXT: SWIFT_EXTERN void * _Nonnull $s5Class06returnA12WithIntFieldAA0acdE0CyF(void) SWIFT_NOEXCEPT SWIFT_CALL; // returnClassWithIntField()
 // CHECK-NEXT: SWIFT_EXTERN void $s5Class04takeA12WithIntFieldyyAA0acdE0CF(void * _Nonnull x) SWIFT_NOEXCEPT SWIFT_CALL; // takeClassWithIntField(_:)
 // CHECK-NEXT: SWIFT_EXTERN void $s5Class04takeA17WithIntFieldInoutyyAA0acdE0CzF(void * _Nonnull * _Nonnull x) SWIFT_NOEXCEPT SWIFT_CALL; // takeClassWithIntFieldInout(_:)
 
-// CHECK: namespace Class __attribute__((swift_private)) SWIFT_SYMBOL_MODULE("Class") {
+// CHECK: namespace Class SWIFT_PRIVATE_ATTR SWIFT_SYMBOL_MODULE("Class") {
 
 // CHECK: class SWIFT_SYMBOL("s:5Class0A12WithIntFieldC") ClassWithIntField;
 // CHECK-NEXT: } // end namespace
@@ -43,7 +43,7 @@ public final class ClassWithIntField {
 // CHECK-NEXT: } // namespace swift
 
 // CHECK: namespace
-// CHECK-SAME: Class __attribute__((swift_private)) SWIFT_SYMBOL_MODULE("Class") {
+// CHECK-SAME: Class SWIFT_PRIVATE_ATTR SWIFT_SYMBOL_MODULE("Class") {
 
 // CHECK: namespace
 // CHECK-SAME: _impl {
@@ -100,7 +100,7 @@ public final class ClassWithIntField {
 // CHECK-NEXT: #pragma clang diagnostic pop
 // CHECK-NEXT: } // namespace swift
 // CHECK-EMPTY:
-// CHECK-NEXT: namespace Class __attribute__((swift_private)) SWIFT_SYMBOL_MODULE("Class") {
+// CHECK-NEXT: namespace Class SWIFT_PRIVATE_ATTR SWIFT_SYMBOL_MODULE("Class") {
 
 // CHECK: SWIFT_INLINE_THUNK ClassWithIntField passThroughClassWithIntField(const ClassWithIntField& x) noexcept SWIFT_SYMBOL("s:5Class011passThroughA12WithIntFieldyAA0adeF0CADF") SWIFT_WARN_UNUSED_RESULT {
 // CHECK-NEXT:  return _impl::_impl_ClassWithIntField::makeRetained(_impl::$s5Class011passThroughA12WithIntFieldyAA0adeF0CADF(::swift::_impl::_impl_RefCountedClass::getOpaquePointer(x)));