[Test] Re-write the test for SR-13495 to use StblibUnitTest

Author: hborla

test/SILOptimizer/di_property_wrappers.swift

@@ -534,54 +534,6 @@ func testSR_12341() {
   _ = SR_12341(condition: true)
 }
 
-class TestLeak: CustomStringConvertible {
-  let val: Int
-  init(val: Int) { self.val = val }
-  deinit { print("    .. \(self).deinit") }
-  var description: String { "TestLeak(\(val))" }
-}
-
-struct SR_13495 {
-  @Wrapper var wrapped: TestLeak
-  var str: String
-
-  init() {
-     wrapped = TestLeak(val: 42)
-     str = ""
-     wrapped = TestLeak(val: 27)
-  }
-
-  init(conditionalInit: Bool) {
-    if (conditionalInit) {
-      wrapped = TestLeak(val: 42)
-    }
-    str = ""
-    wrapped = TestLeak(val: 27)
-  }
-}
-
-func testSR_13495() {
-  // CHECK: ## SR_13495
-  print("\n## SR_13495")
-
-  // CHECK-NEXT:   .. init TestLeak(42)
-  // CHECK-NEXT:     .. TestLeak(42).deinit
-  // CHECK-NEXT:   .. set TestLeak(27)
-  // CHECK-NEXT:     .. TestLeak(27).deinit
-  _ = SR_13495()
-
-  // CHECK-NEXT:   .. init TestLeak(42)
-  // CHECK-NEXT:     .. TestLeak(42).deinit
-  // CHECK-NEXT:   .. init TestLeak(27)
-  // CHECK-NEXT:     .. TestLeak(27).deinit
-  _ = SR_13495(conditionalInit: true)
-
-  // CHECK-NEXT:   .. init TestLeak(27)
-  // CHECK-NEXT:     .. TestLeak(27).deinit
-  _ = SR_13495(conditionalInit: false)
-}
-
-
 @propertyWrapper
 struct NonMutatingSetterWrapper<Value> {
     var value: Value
@@ -620,5 +572,4 @@ testDefaultNilOptIntStruct()
 testComposed()
 testWrapperInitWithDefaultArg()
 testSR_12341()
-testSR_13495()
 testNonMutatingSetterStruct()

test/SILOptimizer/di_property_wrappers_leak.swift

@@ -0,0 +1,40 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-build-swift %s -o %t/a.out
+// RUN: %target-codesign %t/a.out
+// RUN: %target-run %t/a.out
+
+// REQUIRES: executable_test
+
+import StdlibUnittest
+
+@propertyWrapper
+struct Wrapper<T> {
+  var wrappedValue: T
+}
+
+struct TestWrappedValueLeak {
+  @Wrapper var wrapped: LifetimeTracked = LifetimeTracked(0)
+  var str: String
+
+  init() {
+    wrapped = LifetimeTracked(42)
+    str = ""
+    wrapped = LifetimeTracked(27)
+  }
+
+  init(conditionalInit: Bool) {
+    if (conditionalInit) {
+      wrapped = LifetimeTracked(42)
+    }
+    str = ""
+    wrapped = LifetimeTracked(27)
+  }
+}
+
+TestSuite("Property Wrapper DI").test("test wrapped value leak") {
+  _ = TestWrappedValueLeak()
+  _ = TestWrappedValueLeak(conditionalInit: true)
+  _ = TestWrappedValueLeak(conditionalInit: false)
+}
+
+runAllTests()