[cxx-interop] Test static factory backed initializers with value types

test/Interop/Cxx/class/Inputs/constructors.h

@@ -122,4 +122,58 @@ struct MoveConstructorWithOneParameterWithDefaultArg {
       : value(other.value + 1) {}
 };
 
+struct __attribute__((swift_attr("import_reference")))
+__attribute__((swift_attr("retain:retain")))
+__attribute__((swift_attr("release:release"))) ImportWithCtor {
+  int value = 0;
+  int param1 = 0;
+  int param2 = 0;
+
+  __attribute__((swift_name("init()")))
+  __attribute__((swift_attr("returns_retained")))
+  static ImportWithCtor * _Nonnull create() {
+    return new ImportWithCtor{1};
+  }
+
+  __attribute__((swift_name("init(_:)")))
+  __attribute__((swift_attr("returns_retained")))
+  static ImportWithCtor * _Nonnull create(int x) {
+    return new ImportWithCtor{1, x};
+  }
+
+  __attribute__((swift_name("init(_:_:)")))
+  __attribute__((swift_attr("returns_retained")))
+  static ImportWithCtor * _Nonnull create(int x, int y) {
+    return new ImportWithCtor{1, x, y};
+  }
+
+  __attribute__((swift_name("init(_:_:_:)")))
+  __attribute__((swift_attr("returns_unretained")))
+  static ImportWithCtor * _Nonnull create(int x, int y, int z) {
+    return new ImportWithCtor{0, x, y};
+  }
+};
+
+inline void retain(ImportWithCtor * _Nonnull x) {
+  x->value++;
+}
+
+inline void release(ImportWithCtor * _Nonnull x) {
+  if (!--x->value)
+    delete x;
+}
+
+class Value {
+public:
+  __attribute__((swift_name("init(x:)")))
+  static Value forFoo(int x) {
+      Value ret;
+      ret.x = x;
+      return ret; 
+  }
+  int getX() const { return x; }
+private:
+  int x;
+};
+
 #endif // TEST_INTEROP_CXX_CLASS_INPUTS_CONSTRUCTORS_H

test/Interop/Cxx/class/constructors-executable.swift

@@ -1,4 +1,4 @@
-// RUN: %target-run-simple-swift(-I %S/Inputs/ -Xfrontend -enable-experimental-cxx-interop)
+// RUN: %target-run-simple-swift(-I %S/Inputs/ -Xfrontend -enable-experimental-cxx-interop -Xfrontend -disable-availability-checking)
 //
 // REQUIRES: executable_test
 
@@ -70,4 +70,22 @@ CxxConstructorTestSuite.test("MoveConstructorWithOneParamWithDefaultArg") {
   expectTrue(instance2.value + instance3.value >= 10)
 }
 
+CxxConstructorTestSuite.test("ImportStaticFactoryAsInitializer") {
+  let x = ImportWithCtor()
+  expectEqual(x.param1, 0)
+  expectEqual(x.param2, 0)
+  let y = x
+  let z = ImportWithCtor(1)
+  expectEqual(z.param1, 1)
+  expectEqual(z.param2, 0)
+  let z2 = ImportWithCtor(2, 3)
+  expectEqual(z2.param1, 2)
+  expectEqual(z2.param2, 3)
+  let z3 = ImportWithCtor(2, 3, 4)
+  expectEqual(z3.param1, 2)
+  expectEqual(z3.param2, 3)
+  let v = Value(x: 2)
+  expectEqual(v.getX(), 2)
+}
+
 runAllTests()