Merge pull request #61299 from hyp/eng/static-property-bridge

hyp · web-flow · commit 9ca5492a3a37 · 2022-09-26T16:37:47.000-07:00
[interop][SwiftToCxx] add support for bridging static properties
diff --git a/lib/PrintAsClang/DeclAndTypePrinter.cpp b/lib/PrintAsClang/DeclAndTypePrinter.cpp
@@ -914,10 +914,6 @@ class DeclAndTypePrinter::Implementation
         getForeignResultType(AFD, methodTy, asyncConvention, errorConvention);
 
     if (outputLang == OutputLanguageMode::Cxx) {
-      // FIXME: Support static methods.
-      if (isClassMethod)
-        return;
-      assert(!AFD->isStatic());
       auto *typeDeclContext = dyn_cast<NominalTypeDecl>(AFD->getParent());
       if (!typeDeclContext) {
         typeDeclContext =
@@ -941,11 +937,13 @@ class DeclAndTypePrinter::Implementation
         if (SD)
           declPrinter.printCxxSubscriptAccessorMethod(
               typeDeclContext, accessor, funcABI->getSignature(),
-              funcABI->getSymbolName(), resultTy, /*isDefinition=*/false);
+              funcABI->getSymbolName(), resultTy,
+              /*isDefinition=*/false);
         else
           declPrinter.printCxxPropertyAccessorMethod(
               typeDeclContext, accessor, funcABI->getSignature(),
               funcABI->getSymbolName(), resultTy,
+              /*isStatic=*/isClassMethod,
               /*isDefinition=*/false);
       } else {
         declPrinter.printCxxMethod(typeDeclContext, AFD,
@@ -968,6 +966,7 @@ class DeclAndTypePrinter::Implementation
           defPrinter.printCxxPropertyAccessorMethod(
               typeDeclContext, accessor, funcABI->getSignature(),
               funcABI->getSymbolName(), resultTy,
+              /*isStatic=*/isClassMethod,
               /*isDefinition=*/true);
       } else {
         defPrinter.printCxxMethod(typeDeclContext, AFD, funcABI->getSignature(),
@@ -1596,6 +1595,9 @@ class DeclAndTypePrinter::Implementation
         return;
       }
 
+      // FIXME: Support static methods.
+      if (FD->getDeclContext()->isTypeContext() && FD->isStatic())
+        return;
       if (FD->getDeclContext()->isTypeContext())
         return printAbstractFunctionAsMethod(FD, FD->isStatic());
 
@@ -1688,13 +1690,10 @@ class DeclAndTypePrinter::Implementation
     if (outputLang == OutputLanguageMode::Cxx) {
       // FIXME: Documentation.
       // FIXME: availability.
-      // FIXME: support static properties.
-      if (VD->isStatic())
-        return;
       auto *getter = VD->getOpaqueAccessor(AccessorKind::Get);
-      printAbstractFunctionAsMethod(getter, /*isStatic=*/false);
+      printAbstractFunctionAsMethod(getter, /*isStatic=*/VD->isStatic());
       if (auto *setter = VD->getOpaqueAccessor(AccessorKind::Set))
-        printAbstractFunctionAsMethod(setter, /*isStatic=*/false);
+        printAbstractFunctionAsMethod(setter, /*isStatic=*/VD->isStatic());
       return;
     }
 
diff --git a/lib/PrintAsClang/PrintClangFunction.cpp b/lib/PrintAsClang/PrintClangFunction.cpp
@@ -1291,15 +1291,17 @@ static std::string remapPropertyName(const AccessorDecl *accessor,
 void DeclAndTypeClangFunctionPrinter::printCxxPropertyAccessorMethod(
     const NominalTypeDecl *typeDeclContext, const AccessorDecl *accessor,
     const LoweredFunctionSignature &signature, StringRef swiftSymbolName,
-    Type resultTy, bool isDefinition) {
+    Type resultTy, bool isStatic, bool isDefinition) {
   assert(accessor->isSetter() || accessor->getParameters()->size() == 0);
   os << "  ";
 
   FunctionSignatureModifiers modifiers;
   if (isDefinition)
     modifiers.qualifierContext = typeDeclContext;
+  modifiers.isStatic = isStatic && !isDefinition;
   modifiers.isInline = true;
-  modifiers.isConst = accessor->isGetter() && !isa<ClassDecl>(typeDeclContext);
+  modifiers.isConst =
+      !isStatic && accessor->isGetter() && !isa<ClassDecl>(typeDeclContext);
   auto result = printFunctionSignature(
       accessor, signature, remapPropertyName(accessor, resultTy), resultTy,
       FunctionSignatureKind::CxxInlineThunk, modifiers);
diff --git a/lib/PrintAsClang/PrintClangFunction.h b/lib/PrintAsClang/PrintClangFunction.h
@@ -122,7 +122,7 @@ class DeclAndTypeClangFunctionPrinter {
                                       const AccessorDecl *accessor,
                                       const LoweredFunctionSignature &signature,
                                       StringRef swiftSymbolName, Type resultTy,
-                                      bool isDefinition);
+                                      bool isStatic, bool isDefinition);
 
   /// Print the C++ subscript method.
   void printCxxSubscriptAccessorMethod(
diff --git a/test/Interop/SwiftToCxx/properties/getter-in-cxx-execution.cpp b/test/Interop/SwiftToCxx/properties/getter-in-cxx-execution.cpp
@@ -59,5 +59,12 @@ int main() {
   assert(propsInClass.getComputedInt() == -1235);
   auto smallStructFromClass = propsInClass.getSmallStruct();
   assert(smallStructFromClass.getX() == 1234);
+
+  {
+    auto x = LargeStruct::getStaticX();
+    assert(x == -402);
+    auto smallStruct = LargeStruct::getStaticSmallStruct();
+    assert(smallStruct.getX() == 789);
+  }
   return 0;
 }
diff --git a/test/Interop/SwiftToCxx/properties/getter-in-cxx.swift b/test/Interop/SwiftToCxx/properties/getter-in-cxx.swift
@@ -24,6 +24,14 @@ public struct LargeStruct {
     public var firstSmallStruct: FirstSmallStruct {
         return FirstSmallStruct(x: 65)
     }
+
+    static public var staticX: Int {
+        return -402
+    }
+
+    static public var staticSmallStruct: FirstSmallStruct {
+        return FirstSmallStruct(x: 789)
+    }
 }
 
 // CHECK: class LargeStruct final {
@@ -37,6 +45,8 @@ public struct LargeStruct {
 // CHECK-NEXT: inline swift::Int getX6() const;
 // CHECK-NEXT: inline LargeStruct getAnotherLargeStruct() const;
 // CHECK-NEXT: inline FirstSmallStruct getFirstSmallStruct() const;
+// CHECK-NEXT: static inline swift::Int getStaticX();
+// CHECK-NEXT: static inline FirstSmallStruct getStaticSmallStruct();
 // CHECK-NEXT: private:
 
 public final class PropertiesInClass {
@@ -153,6 +163,14 @@ public func createStructWithRefCountStoredProp() -> StructWithRefCountStoredProp
 // CHECK-NEXT:   _impl::swift_interop_returnDirect_Properties_uint32_t_0_4(result, _impl::$s10Properties11LargeStructV010firstSmallC0AA05FirsteC0Vvg(_getOpaquePointer()));
 // CHECK-NEXT: });
 // CHECK-NEXT: }
+// CHECK-NEXT: inline swift::Int LargeStruct::getStaticX() {
+// CHECK-NEXT: return _impl::$s10Properties11LargeStructV7staticXSivgZ();
+// CHECK-NEXT: }
+// CHECK-NEXT: inline FirstSmallStruct LargeStruct::getStaticSmallStruct() {
+// CHECK-NEXT: return _impl::_impl_FirstSmallStruct::returnNewValue([&](char * _Nonnull result) {
+// CHECK-NEXT:   _impl::swift_interop_returnDirect_Properties_uint32_t_0_4(result, _impl::$s10Properties11LargeStructV011staticSmallC0AA05FirsteC0VvgZ());
+// CHECK-NEXT: });
+// CHECK-NEXT: }
 
 // CHECK: inline int32_t PropertiesInClass::getStoredInt() {
 // CHECK-NEXT: return _impl::$s10Properties0A7InClassC9storedInts5Int32Vvg(::swift::_impl::_impl_RefCountedClass::getOpaquePointer(*this));
diff --git a/test/Interop/SwiftToCxx/properties/setter-in-cxx-execution.cpp b/test/Interop/SwiftToCxx/properties/setter-in-cxx-execution.cpp
@@ -55,5 +55,13 @@ int main() {
   propsInClass.setComputedInt(-11);
   assert(propsInClass.getComputedInt() == -11);
   assert(propsInClass.getStoredInt() == -13);
+
+  {
+    auto x = LargeStruct::getStaticX();
+    assert(x == 0);
+    LargeStruct::setStaticX(13);
+    x = LargeStruct::getStaticX();
+    assert(x == 13);
+  }
   return 0;
 }
diff --git a/test/Interop/SwiftToCxx/properties/setter-in-cxx.swift b/test/Interop/SwiftToCxx/properties/setter-in-cxx.swift
@@ -17,6 +17,16 @@ public struct FirstSmallStruct {
 
 public struct LargeStruct {
     public var x1, x2, x3, x4, x5, x6: Int
+
+    private static var _statX: Int = 0
+    public static var staticX: Int {
+        get {
+            return _statX
+        }
+        set {
+            _statX = newValue
+        }
+    }
 }
 
 // CHECK: class LargeStruct final {
@@ -34,6 +44,8 @@ public struct LargeStruct {
 // CHECK-NEXT: inline void setX5(swift::Int value);
 // CHECK-NEXT: inline swift::Int getX6() const;
 // CHECK-NEXT: inline void setX6(swift::Int value);
+// CHECK-NEXT: static inline swift::Int getStaticX();
+// CHECK-NEXT: static inline void setStaticX(swift::Int newValue);
 // CHECK-NEXT: private:
 
 public struct LargeStructWithProps {
@@ -128,6 +140,13 @@ public func createFirstSmallStruct(_ x: UInt32) -> FirstSmallStruct {
 // CHECK-NEXT:   return _impl::$s10Properties11LargeStructV2x1Sivs(value, _getOpaquePointer());
 // CHECK-NEXT:   }
 
+// CHECK:      inline swift::Int LargeStruct::getStaticX() {
+// CHECK-NEXT: return _impl::$s10Properties11LargeStructV7staticXSivgZ();
+// CHECK-NEXT: }
+// CHECK-NEXT: inline void LargeStruct::setStaticX(swift::Int newValue) {
+// CHECK-NEXT: return _impl::$s10Properties11LargeStructV7staticXSivsZ(newValue);
+// CHECK-NEXT: }
+
 // CHECK:        inline LargeStruct LargeStructWithProps::getStoredLargeStruct() const {
 // CHECK-NEXT:    return _impl::_impl_LargeStruct::returnNewValue([&](char * _Nonnull result) {
 // CHECK-NEXT:     _impl::$s10Properties20LargeStructWithPropsV06storedbC0AA0bC0Vvg(result, _getOpaquePointer());
