From: Matt Corallo <git@bluematt.me>
Date: Fri, 24 Sep 2021 17:36:56 +0000 (+0000)
Subject: Expand the criteria for cloning when passing to Rust
X-Git-Tag: v0.0.101.0~8
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=aacd3307d5682030df56136abfda6e4e8ee307a3;p=ldk-java

Expand the criteria for cloning when passing to Rust

If a method takes an object by ownership, we always need to clone.
---

diff --git a/gen_type_mapping.py b/gen_type_mapping.py
index bc3fb23a..2f479c8d 100644
--- a/gen_type_mapping.py
+++ b/gen_type_mapping.py
@@ -319,7 +319,7 @@ class TypeMappingGenerator:
                         to_hu_conv = ty_info.java_hu_ty + " ret_hu_conv = new " + ty_info.java_hu_ty + "(null, " + ty_info.var_name + ");\nret_hu_conv.ptrs_to.add(this);",
                         to_hu_conv_name = "ret_hu_conv",
                         from_hu_conv = (ty_info.var_name + " == null ? 0 : " + ty_info.var_name + ".ptr", "this.ptrs_to.add(" + ty_info.var_name + ")"))
-                needs_full_clone = not is_free and ((not ty_info.is_ptr and not holds_ref) or ty_info.requires_clone == True) and ty_info.requires_clone != False
+                needs_full_clone = not is_free and (not ty_info.is_ptr or ty_info.requires_clone == True) and ty_info.requires_clone != False
                 if needs_full_clone:
                     if "res" in ty_info.var_name: # XXX: This is a stupid hack
                         needs_full_clone = False