Don't dangle return values of methods taking references to self if the return type is a Vec.

arik-so · arik-so · commit eb193641b9e7 · 2023-05-05T21:57:53.000-07:00
diff --git a/ci/LDKSwift/Tests/LDKSwiftTests/HumanObjectPeerTestInstance.swift b/ci/LDKSwift/Tests/LDKSwiftTests/HumanObjectPeerTestInstance.swift
@@ -375,7 +375,7 @@ public class HumanObjectPeerTestInstance {
                 let port = UInt16(i)
                 let bound = self.tcpSocketHandler!.bind(address: "127.0.0.1", port: port)
                 if bound {
-                    print("Bound socket to port \(port) on attempt \(i)")
+                    print("Bound socket to port \(port) on attempt \(i-9999)")
                     self.tcpPort = port
                     return
                 }
diff --git a/out/VersionDescriptor.swift b/out/VersionDescriptor.swift
@@ -5,13 +5,13 @@
 
 			extension Bindings {
 				public class func getLDKSwiftBindingsSerializationHash() -> String {
-					return "658748821a6d2592609e6ebecd7bac57a540d82fb1cf75c12814010e6f95488f"
+					return "aa6f30a3db94ea30b2790da44a24edca61205baa4e9893da31e33a98e7b66c65"
 				}
 				public class func getLDKSwiftBindingsVersion() -> String {
-					return "0.0.114-12-g2d08ea22-dirty"
+					return "0.0.114-18-g3ec14fd1-dirty"
 				}
 				public class func getLDKSwiftBindingsCommitHash() -> String {
-					return "2d08ea22d467b53c885f9a6ae0f3f54e57f49020"
+					return "3ec14fd17fe15bd5e450b0363369ad88db93288b"
 				}
 			}
 		
diff --git a/out/structs/ChainMonitor.swift b/out/structs/ChainMonitor.swift
@@ -160,7 +160,7 @@
 
 						
 						// return value (do some wrapping)
-						let returnValue = Vec_BalanceZ(cType: nativeCallResult, instantiationContext: "ChainMonitor.swift::\(#function):\(#line)", anchor: self).getValue()
+						let returnValue = Vec_BalanceZ(cType: nativeCallResult, instantiationContext: "ChainMonitor.swift::\(#function):\(#line)", anchor: self).dangle(false).getValue()
 						
 
 						return returnValue
diff --git a/out/structs/ChannelManager.swift b/out/structs/ChannelManager.swift
@@ -362,7 +362,7 @@
 
 						
 						// return value (do some wrapping)
-						let returnValue = Vec_RecentPaymentDetailsZ(cType: nativeCallResult, instantiationContext: "ChannelManager.swift::\(#function):\(#line)", anchor: self).getValue()
+						let returnValue = Vec_RecentPaymentDetailsZ(cType: nativeCallResult, instantiationContext: "ChannelManager.swift::\(#function):\(#line)", anchor: self).dangle(false).getValue()
 						
 
 						return returnValue
diff --git a/out/structs/ChannelMonitor.swift b/out/structs/ChannelMonitor.swift
@@ -311,7 +311,7 @@
 
 						
 						// return value (do some wrapping)
-						let returnValue = Vec_MonitorEventZ(cType: nativeCallResult, instantiationContext: "ChannelMonitor.swift::\(#function):\(#line)", anchor: self).getValue()
+						let returnValue = Vec_MonitorEventZ(cType: nativeCallResult, instantiationContext: "ChannelMonitor.swift::\(#function):\(#line)", anchor: self).dangle(false).getValue()
 						
 
 						return returnValue
@@ -341,7 +341,7 @@
 
 						
 						// return value (do some wrapping)
-						let returnValue = Vec_EventZ(cType: nativeCallResult, instantiationContext: "ChannelMonitor.swift::\(#function):\(#line)", anchor: self).getValue()
+						let returnValue = Vec_EventZ(cType: nativeCallResult, instantiationContext: "ChannelMonitor.swift::\(#function):\(#line)", anchor: self).dangle(false).getValue()
 						
 
 						return returnValue
@@ -461,7 +461,7 @@
 
 						
 						// return value (do some wrapping)
-						let returnValue = Vec_TransactionOutputsZ(cType: nativeCallResult, instantiationContext: "ChannelMonitor.swift::\(#function):\(#line)", anchor: self).getValue()
+						let returnValue = Vec_TransactionOutputsZ(cType: nativeCallResult, instantiationContext: "ChannelMonitor.swift::\(#function):\(#line)", anchor: self).dangle(false).getValue()
 						
 
 						return returnValue
@@ -530,7 +530,7 @@
 
 						
 						// return value (do some wrapping)
-						let returnValue = Vec_TransactionOutputsZ(cType: nativeCallResult, instantiationContext: "ChannelMonitor.swift::\(#function):\(#line)", anchor: self).getValue()
+						let returnValue = Vec_TransactionOutputsZ(cType: nativeCallResult, instantiationContext: "ChannelMonitor.swift::\(#function):\(#line)", anchor: self).dangle(false).getValue()
 						
 
 						return returnValue
@@ -599,7 +599,7 @@
 
 						
 						// return value (do some wrapping)
-						let returnValue = Vec_TransactionOutputsZ(cType: nativeCallResult, instantiationContext: "ChannelMonitor.swift::\(#function):\(#line)", anchor: self).getValue()
+						let returnValue = Vec_TransactionOutputsZ(cType: nativeCallResult, instantiationContext: "ChannelMonitor.swift::\(#function):\(#line)", anchor: self).dangle(false).getValue()
 						
 
 						return returnValue
@@ -683,7 +683,7 @@
 
 						
 						// return value (do some wrapping)
-						let returnValue = Vec_BalanceZ(cType: nativeCallResult, instantiationContext: "ChannelMonitor.swift::\(#function):\(#line)", anchor: self).getValue()
+						let returnValue = Vec_BalanceZ(cType: nativeCallResult, instantiationContext: "ChannelMonitor.swift::\(#function):\(#line)", anchor: self).dangle(false).getValue()
 						
 
 						return returnValue
diff --git a/out/structs/NodeAnnouncementInfo.swift b/out/structs/NodeAnnouncementInfo.swift
@@ -297,7 +297,7 @@
 
 						
 						// return value (do some wrapping)
-						let returnValue = Vec_NetAddressZ(cType: nativeCallResult, instantiationContext: "NodeAnnouncementInfo.swift::\(#function):\(#line)", anchor: self).getValue()
+						let returnValue = Vec_NetAddressZ(cType: nativeCallResult, instantiationContext: "NodeAnnouncementInfo.swift::\(#function):\(#line)", anchor: self).dangle(false).getValue()
 						
 
 						return returnValue
diff --git a/out/structs/PeerManager.swift b/out/structs/PeerManager.swift
@@ -183,7 +183,7 @@
 
 						
 						// return value (do some wrapping)
-						let returnValue = Vec_C2Tuple_PublicKeyCOption_NetAddressZZZ(cType: nativeCallResult, instantiationContext: "PeerManager.swift::\(#function):\(#line)", anchor: self).getValue()
+						let returnValue = Vec_C2Tuple_PublicKeyCOption_NetAddressZZZ(cType: nativeCallResult, instantiationContext: "PeerManager.swift::\(#function):\(#line)", anchor: self).dangle(false).getValue()
 						
 
 						return returnValue
diff --git a/out/structs/UnsignedNodeAnnouncement.swift b/out/structs/UnsignedNodeAnnouncement.swift
@@ -356,7 +356,7 @@
 
 						
 						// return value (do some wrapping)
-						let returnValue = Vec_NetAddressZ(cType: nativeCallResult, instantiationContext: "UnsignedNodeAnnouncement.swift::\(#function):\(#line)", anchor: self).getValue()
+						let returnValue = Vec_NetAddressZ(cType: nativeCallResult, instantiationContext: "UnsignedNodeAnnouncement.swift::\(#function):\(#line)", anchor: self).dangle(false).getValue()
 						
 
 						return returnValue
diff --git a/src/generation/base_type_generator.mts b/src/generation/base_type_generator.mts
@@ -983,8 +983,10 @@ export abstract class BaseTypeGenerator<Type extends RustType> {
 				 * In this peculiar condition where an instance pointer needs to be passed, we
 				 * actually can still free the returned object – we simply need to make sure that
 				 * the returned object doesn't outlive its creating object.
+				 *
+				 * The same exception also applies if the return type is a vector.
 				 */
-				if (hasRecursiveOwnershipFlags) {
+				if (hasRecursiveOwnershipFlags || returnType.type instanceof RustVector) {
 					dangleSuffix = '.dangle(false)';
 				}
 

Original file line number	Diff line number	Diff line change
`@@ -375,7 +375,7 @@ public class HumanObjectPeerTestInstance {`
`375`	`375`	`let port = UInt16(i)`
`376`	`376`	`let bound = self.tcpSocketHandler!.bind(address: "127.0.0.1", port: port)`
`377`	`377`	`if bound {`
`378`		`- print("Bound socket to port \(port) on attempt \(i)")`
	`378`	`+ print("Bound socket to port \(port) on attempt \(i-9999)")`
`379`	`379`	`self.tcpPort = port`
`380`	`380`	`return`
`381`	`381`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,13 @@`
`5`	`5`
`6`	`6`	`extension Bindings {`
`7`	`7`	`public class func getLDKSwiftBindingsSerializationHash() -> String {`
`8`		`- return "658748821a6d2592609e6ebecd7bac57a540d82fb1cf75c12814010e6f95488f"`
	`8`	`+ return "aa6f30a3db94ea30b2790da44a24edca61205baa4e9893da31e33a98e7b66c65"`
`9`	`9`	`}`
`10`	`10`	`public class func getLDKSwiftBindingsVersion() -> String {`
`11`		`- return "0.0.114-12-g2d08ea22-dirty"`
	`11`	`+ return "0.0.114-18-g3ec14fd1-dirty"`
`12`	`12`	`}`
`13`	`13`	`public class func getLDKSwiftBindingsCommitHash() -> String {`
`14`		`- return "2d08ea22d467b53c885f9a6ae0f3f54e57f49020"`
	`14`	`+ return "3ec14fd17fe15bd5e450b0363369ad88db93288b"`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`