Merge pull request swiftlang#20836 from mikeash/anyhashable-cast-leak-fix

[Runtime] Fix leak when casting to AnyHashable.

Author: mikeash

stdlib/public/runtime/Casting.cpp

@@ -635,23 +635,13 @@ static bool _dynamicCastToAnyHashable(OpaqueValue *destination,
 
   // If we do find one, the cast succeeds.
 
-  // The intrinsic wants the value at +1, so we have to copy it into
-  // a temporary.
-  ValueBuffer buffer;
-  bool mustDeallocBuffer = false;
-  if (!(flags & DynamicCastFlags::TakeOnSuccess)) {
-    auto *valueAddr = sourceType->allocateBufferIn(&buffer);
-    source = sourceType->vw_initializeWithCopy(valueAddr, source);
-    mustDeallocBuffer = true;
-  }
-
   // Initialize the destination.
   _swift_convertToAnyHashableIndirect(source, destination,
                                       sourceType, hashableConformance);
 
-  // Deallocate the buffer if we used it.
-  if (mustDeallocBuffer) {
-    sourceType->deallocateBufferIn(&buffer);
+  // Destroy the value if requested.
+  if (flags & DynamicCastFlags::TakeOnSuccess) {
+    sourceType->vw_destroy(source);
   }
 
   // The cast succeeded.
@@ -1932,6 +1922,9 @@ static bool tryDynamicCastBoxedSwiftValue(OpaqueValue *dest,
 
 #if !SWIFT_OBJC_INTEROP // __SwiftValue is a native class:
   if (swift_unboxFromSwiftValueWithType(src, dest, targetType)) {
+    // Release the source if we need to.
+    if (flags & DynamicCastFlags::TakeOnSuccess)
+      srcType->vw_destroy(src);
     return true;
   }
 #endif

test/stdlib/AnyHashableCasts.swift.gyb

@@ -123,6 +123,16 @@ AnyHashableCasts.test("${valueExpr} as ${coercedType} as? ${castType}") {
 }
 % end
 
+AnyHashableCasts.test("Casting to AnyHashable doesn't leak") {
+  do {
+    let tracked = LifetimeTracked(42)
+    let anyHashable = AnyHashable(tracked)
+    let anyObject = anyHashable as AnyObject
+    _ = anyObject as? AnyHashable
+  }
+  expectEqual(LifetimeTracked.instances, 0)
+}
+
 #if _runtime(_ObjC)
 // A wrapper type around Int that bridges to NSNumber.
 struct IntWrapper1: _SwiftNewtypeWrapper, Hashable, _ObjectiveCBridgeable {