Merge pull request #68432 from mikeash/destroy-bridged-storage-lifetime-fix-5.9

mikeash · web-flow · commit 3f85d2aafe1a · 2023-09-12T13:44:55.000-04:00
[5.9][Stdlib] Fix bridgedStorage lifetime in SwiftNativeNSArray._destroyBridgedStorage.
diff --git a/stdlib/public/core/SwiftNativeNSArray.swift b/stdlib/public/core/SwiftNativeNSArray.swift
@@ -367,9 +367,11 @@ extension __SwiftNativeNSArrayWithContiguousStorage {
 
   internal func _destroyBridgedStorage(_ hb: __BridgingBufferStorage?) {
     if let bridgedStorage = hb {
-      let buffer = _BridgingBuffer(bridgedStorage)
-      let count = buffer.count
-      buffer.baseAddress.deinitialize(count: count)
+      withExtendedLifetime(bridgedStorage) {
+        let buffer = _BridgingBuffer(bridgedStorage)
+        let count = buffer.count
+        buffer.baseAddress.deinitialize(count: count)
+      }
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -367,9 +367,11 @@ extension __SwiftNativeNSArrayWithContiguousStorage {`
`367`	`367`
`368`	`368`	`internal func _destroyBridgedStorage(_ hb: __BridgingBufferStorage?) {`
`369`	`369`	`if let bridgedStorage = hb {`
`370`		`- let buffer = _BridgingBuffer(bridgedStorage)`
`371`		`- let count = buffer.count`
`372`		`- buffer.baseAddress.deinitialize(count: count)`
	`370`	`+ withExtendedLifetime(bridgedStorage) {`
	`371`	`+ let buffer = _BridgingBuffer(bridgedStorage)`
	`372`	`+ let count = buffer.count`
	`373`	`+ buffer.baseAddress.deinitialize(count: count)`
	`374`	`+ }`
`373`	`375`	`}`
`374`	`376`	`}`
`375`	`377`