Fixes for the ownership-transfer changes (for #124)

jwharm · Sep 21, 2024 · 66ed5f2 · 66ed5f2
1 parent 961982d
commit 66ed5f2
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/buildSrc/src/main/java/io/github/jwharm/javagi/generators/MethodGenerator.java b/buildSrc/src/main/java/io/github/jwharm/javagi/generators/MethodGenerator.java
@@ -322,9 +322,17 @@ else if (((target instanceof Record record
                     return;
                 }
 
+                // don't copy the result of ref() or copy()
+                if ("ref".equals(func.name()) || "copy".equals(func.name())
+                        || (copyFunc != null && copyFunc.name().equals(func.name()))) {
+                    builder.addNamedCode(PartialStatement.of("var _instance = ")
+                            .add(stmt)
+                            .add(";\n").format(), stmt.arguments());
+                }
+
                 // No copy function, but know memory layout size: malloc() a new
                 // struct, and copy the contents manually
-                if (hasMemoryLayout && copyFunc == null) {
+                else if (hasMemoryLayout && copyFunc == null) {
                     builder.addStatement("$T _copy = $T.malloc($T.getMemoryLayout().byteSize())",
                             MemorySegment.class,
                             ClassNames.GLIB,