Fixing the trait struct cookie assignment in Kotlin (#707)

* Fixing a bug in kotlin code gen that crashed the JVM on GC * updating tests --------- Co-authored-by: Ellen Arteca <[email protected]>
rust-diplomat · Oct 10, 2024 · 179b75d · 179b75d
1 parent e93cf1a
commit 179b75d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/feature_tests/kotlin/somelib/src/main/kotlin/dev/diplomattest/somelib/TesterTrait.kt b/feature_tests/kotlin/somelib/src/main/kotlin/dev/diplomattest/somelib/TesterTrait.kt
diff --git a/tool/src/kotlin/snapshots/diplomat_tool__kotlin__test__trait_gen.snap b/tool/src/kotlin/snapshots/diplomat_tool__kotlin__test__trait_gen.snap
@@ -165,7 +165,7 @@ internal class DiplomatTrait_TesterTrait_Wrapper internal constructor (
             vtable.run_testEnumReturn_callback = testEnumReturn;
             val native_wrapper = DiplomatTrait_TesterTrait_Wrapper_Native();
             native_wrapper.vtable = vtable;
-            native_wrapper.data_ = DiplomatJVMRuntime.buildRustCookie(vtable as Object);
+            native_wrapper.data_ = DiplomatJVMRuntime.buildRustCookie(native_wrapper as Object);
             return DiplomatTrait_TesterTrait_Wrapper(native_wrapper);
         }
     }

diff --git a/tool/templates/kotlin/Trait.kt.jinja b/tool/templates/kotlin/Trait.kt.jinja
@@ -93,7 +93,7 @@ internal class DiplomatTrait_{{trait_name}}_Wrapper internal constructor (
             {% endif -%}
             val native_wrapper = DiplomatTrait_{{trait_name}}_Wrapper_Native();
             native_wrapper.vtable = vtable;
-            native_wrapper.data_ = DiplomatJVMRuntime.buildRustCookie(vtable as Object);
+            native_wrapper.data_ = DiplomatJVMRuntime.buildRustCookie(native_wrapper as Object);
             return DiplomatTrait_{{trait_name}}_Wrapper(native_wrapper);
         }
     }