---

yaml
---
r: 341625
b: refs/heads/rxwei-patch-1
c: 10f2f45
h: refs/heads/master
i:
  341623: 6b60121

Author: marcrasi

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: 019b2e43df7a209d0ae806284c203def48d3d503
+refs/heads/rxwei-patch-1: 10f2f451df5374593ce6e62110b657eee1f26540
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/stdlib/private/DifferentiationUnittest/DifferentiationUnittest.swift

@@ -1,4 +1,4 @@
-//===--- GenericLifetimeTracked.swift -------------------------------------===//
+//===--- DifferentiationUnittest.swift ------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //

branches/rxwei-patch-1/test/AutoDiff/leakchecking.swift

@@ -8,16 +8,21 @@ import DifferentiationUnittest
 
 var LeakCheckingTests = TestSuite("LeakChecking")
 
-/// Execute body, check expected leak count, and reset global leak count.
+/// Execute body and check expected leak count.
 func testWithLeakChecking(
   expectedLeakCount: Int = 0, file: String = #file, line: UInt = #line,
   _ body: () -> Void
 ) {
+  // Note: compare expected leak count with relative leak count after
+  // running `body`.
+  // This approach is more robust than comparing leak count with zero
+  // and resetting leak count to zero, which is stateful and causes issues.
+  let beforeLeakCount = _GlobalLeakCount.count
   body()
+  let leakCount = _GlobalLeakCount.count - beforeLeakCount
   expectEqual(
-    expectedLeakCount, _GlobalLeakCount.count, "Leak detected.",
+    expectedLeakCount, leakCount, "Leaks detected: \(leakCount)",
     file: file, line: line)
-  _GlobalLeakCount.count = 0
 }
 
 struct ExampleLeakModel : Differentiable {