[interop][SwiftToCxx] expose getOpaquePointer class pointer accessors via swift helper class in shims header

Author: hyp

lib/PrintAsClang/PrintClangClassType.cpp

@@ -37,7 +37,7 @@ void ClangClassTypePrinter::printClassTypeDecl(
   os << "class ";
   printer.printBaseName(typeDecl);
   // FIXME: Add support for inherintance.
-  os << " final : " << baseClassQualifiedName;
+  os << " final : public " << baseClassQualifiedName;
   os << " {\n";
   os << "public:\n";
 
@@ -65,12 +65,6 @@ void ClangClassTypePrinter::printClassTypeDecl(
         os << " makeRetained(void * _Nonnull ptr) noexcept { return ";
         printer.printBaseName(typeDecl);
         os << "(ptr); }\n";
-        os << "static inline void * _Nonnull getOpaquePointer(const ";
-        printer.printBaseName(typeDecl);
-        os << " &object) noexcept { return object._opaquePointer; }\n";
-        os << "static inline void * _Nonnull &getOpaquePointerRef(";
-        printer.printBaseName(typeDecl);
-        os << " &object) noexcept { return object._opaquePointer; }\n";
         os << "};\n";
       });
 }
@@ -93,11 +87,9 @@ void ClangClassTypePrinter::printParameterCxxtoCUseScaffold(
     llvm::function_ref<void(void)> bodyPrinter, bool isInOut) {
   if (isInOut)
     os << '&';
-  ClangSyntaxPrinter(os).printModuleNamespaceQualifiersIfNeeded(
-      type->getModuleContext(), moduleContext);
-  os << cxx_synthesis::getCxxImplNamespaceName() << "::";
-  ClangValueTypePrinter::printCxxImplClassName(os, type);
-  os << "::getOpaquePointer";
+  os << "::swift::" << cxx_synthesis::getCxxImplNamespaceName()
+     << "::_impl_RefCountedClass"
+     << "::getOpaquePointer";
   if (isInOut)
     os << "Ref";
   os << '(';

stdlib/public/SwiftShims/_SwiftCxxInteroperability.h

@@ -73,7 +73,19 @@ class RefCountedClass {
 protected:
   inline RefCountedClass(void *_Nonnull ptr) noexcept : _opaquePointer(ptr) {}
 
+private:
   void *_Nonnull _opaquePointer;
+  friend class _impl_RefCountedClass;
+};
+
+class _impl_RefCountedClass {
+public:
+  static inline void *_Nonnull getOpaquePointer(const RefCountedClass &object) {
+    return object._opaquePointer;
+  }
+  static inline void *_Nonnull &getOpaquePointerRef(RefCountedClass &object) {
+    return object._opaquePointer;
+  }
 };
 
 } // namespace _impl

test/Interop/SwiftToCxx/class/swift-class-execution.cpp

@@ -17,8 +17,8 @@
 extern "C" size_t swift_retainCount(void * _Nonnull obj);
 
 size_t getRetainCount(const Class::ClassWithIntField & swiftClass) {
-    void *p = Class::_impl::_impl_ClassWithIntField::getOpaquePointer(swiftClass);
-    return swift_retainCount(p);
+  void *p = swift::_impl::_impl_RefCountedClass::getOpaquePointer(swiftClass);
+  return swift_retainCount(p);
 }
 
 int main() {

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

@@ -31,7 +31,7 @@ public final class ClassWithIntField {
 // CHECK-EMPTY:
 // CHECK-NEXT: } // namespace _impl
 // CHECK-EMPTY:
-// CHECK-NEXT: class ClassWithIntField final : swift::_impl::RefCountedClass {
+// CHECK-NEXT: class ClassWithIntField final : public swift::_impl::RefCountedClass {
 // CHECK-NEXT: public:
 // CHECK-NEXT:   using RefCountedClass::RefCountedClass;
 // CHECK-NEXT:   using RefCountedClass::operator=;
@@ -46,19 +46,17 @@ public final class ClassWithIntField {
 // CHECK-NEXT:class _impl_ClassWithIntField {
 // CHECK-NEXT:public:
 // CHECK-NEXT:static inline ClassWithIntField makeRetained(void * _Nonnull ptr) noexcept { return ClassWithIntField(ptr); }
-// CHECK-NEXT:static inline void * _Nonnull getOpaquePointer(const ClassWithIntField &object) noexcept { return object._opaquePointer; }
-// CHECK-NEXT:static inline void * _Nonnull &getOpaquePointerRef(ClassWithIntField &object) noexcept { return object._opaquePointer; }
 // CHECK-NEXT:};
 // CHECK-EMPTY:
 // CHECK-NEXT:} // namespace _impl
 
 // CHECK: inline ClassWithIntField passThroughClassWithIntField(const ClassWithIntField& x) noexcept SWIFT_WARN_UNUSED_RESULT {
-// CHECK-NEXT:  return _impl::_impl_ClassWithIntField::makeRetained(_impl::$s5Class011passThroughA12WithIntFieldyAA0adeF0CADF(_impl::_impl_ClassWithIntField::getOpaquePointer(x)));
+// CHECK-NEXT:  return _impl::_impl_ClassWithIntField::makeRetained(_impl::$s5Class011passThroughA12WithIntFieldyAA0adeF0CADF(::swift::_impl::_impl_RefCountedClass::getOpaquePointer(x)));
 // CHECK-NEXT: }
 
 public final class register { }
 
-// CHECK: class register_ final : swift::_impl::RefCountedClass {
+// CHECK: class register_ final : public swift::_impl::RefCountedClass {
 
 public func returnClassWithIntField() -> ClassWithIntField {
   return ClassWithIntField()
@@ -84,5 +82,5 @@ public func takeClassWithIntFieldInout(_ x: inout ClassWithIntField) {
 // CHECK-NEXT: }
 
 // CHECK: inline void takeClassWithIntField(const ClassWithIntField& x) noexcept {
-// CHECK-NEXT:  return _impl::$s5Class04takeA12WithIntFieldyyAA0acdE0CF(_impl::_impl_ClassWithIntField::getOpaquePointer(x));
+// CHECK-NEXT:  return _impl::$s5Class04takeA12WithIntFieldyyAA0acdE0CF(::swift::_impl::_impl_RefCountedClass::getOpaquePointer(x));
 // CHECK-NEXT: }