From 27ea512313a101ffb02eb9c24587dea91b0ae6a9 Mon Sep 17 00:00:00 2001
From: Lucian Popescu <lucian.popescu@tecnico.ulisboa.pt>
Date: Mon, 6 Jul 2026 15:15:00 +0100
Subject: [PATCH] Add Clone impl for C structs

---
 cpp2rust/converter/converter.cpp              |  2 +-
 .../converter/models/converter_refcount.cpp   | 17 ++++-
 .../out/refcount/cross_tu_tag_collision.rs    |  7 ++
 .../out/refcount/opaque_forward_decl.rs       |  8 ++
 tests/unit/c_struct.c                         |  6 ++
 tests/unit/out/refcount/anonymous-struct_c.rs | 74 +++++++++++++++++++
 tests/unit/out/refcount/anonymous_enum_c.rs   | 15 ++++
 tests/unit/out/refcount/array_const_init.rs   |  9 +++
 tests/unit/out/refcount/c_struct.rs           | 46 ++++++++++++
 .../out/refcount/enum_default_in_static.rs    |  8 ++
 tests/unit/out/refcount/enum_int_interop_c.rs |  9 +++
 .../out/refcount/goto_aggregate_default.rs    |  8 ++
 .../refcount/local_anon_struct_collision.rs   | 16 ++++
 .../unit/out/refcount/memcpy_struct_bytes.rs  |  8 ++
 .../unit/out/refcount/opaque_forward_decl.rs  |  8 ++
 .../unit/out/refcount/opaque_then_defined.rs  | 16 ++++
 .../refcount/tag_vs_identifier_collision.rs   | 37 ++++++++++
 .../out/refcount/union_addrof_external.rs     | 17 +++++
 .../unit/out/refcount/union_cross_arm_cast.rs | 27 +++++++
 .../out/refcount/union_field_alignment.rs     |  8 ++
 .../unit/out/refcount/union_memset_memcpy.rs  | 25 +++++++
 tests/unit/out/refcount/union_nested.rs       | 26 +++++++
 .../out/refcount/union_pointer_pun_address.rs | 15 ++++
 .../out/refcount/union_struct_dual_use.rs     | 15 ++++
 .../out/refcount/union_tagged_many_arms.rs    |  8 ++
 .../unit/out/refcount/union_tagged_simple.rs  |  9 +++
 .../out/refcount/union_tagged_struct_arms.rs  | 39 ++++++++++
 .../refcount/union_void_ptr_sized_deref.rs    |  8 ++
 .../out/refcount/va_arg_non_primitive_ptrs.rs |  8 ++
 tests/unit/out/refcount/va_arg_struct_ctx.rs  |  8 ++
 tests/unit/out/unsafe/c_struct.rs             |  5 ++
 31 files changed, 510 insertions(+), 2 deletions(-)

diff --git a/cpp2rust/converter/converter.cpp b/cpp2rust/converter/converter.cpp
index 37f474ad..eb513e84 100644
--- a/cpp2rust/converter/converter.cpp
+++ b/cpp2rust/converter/converter.cpp
@@ -819,9 +819,9 @@ void Converter::EmitRustStructOrUnion(clang::RecordDecl *decl) {
   // Traits
   if (auto *cxx = clang::dyn_cast<clang::CXXRecordDecl>(decl)) {
     AddOrdTrait(cxx);
-    AddCloneTrait(cxx);
     AddDropTrait(cxx);
   }
+  AddCloneTrait(decl);
   AddDefaultTrait(decl);
   AddByteReprTrait(decl);
 }
diff --git a/cpp2rust/converter/models/converter_refcount.cpp b/cpp2rust/converter/models/converter_refcount.cpp
index c7a2be2b..34f25d62 100644
--- a/cpp2rust/converter/models/converter_refcount.cpp
+++ b/cpp2rust/converter/models/converter_refcount.cpp
@@ -465,7 +465,22 @@ void ConverterRefCount::AddCloneTrait(const clang::RecordDecl *decl) {
   }
 
   auto *cxx = clang::dyn_cast<clang::CXXRecordDecl>(decl);
-  if (!cxx || cxx->defaultedCopyConstructorIsDeleted()) {
+  if (!cxx) {
+    StrCat(keyword::kImpl, "Clone for", record_name);
+    PushBrace impl_brace(*this);
+    StrCat("fn clone(&self) -> Self");
+    PushBrace fn_brace(*this);
+    StrCat("Self");
+    PushBrace init_brace(*this);
+    for (auto *field : decl->fields()) {
+      auto name = GetNamedDeclAsString(field);
+      StrCat(std::format(
+          "{0}: Rc::new(RefCell::new((*self.{0}.borrow()).clone())),", name));
+    }
+    return;
+  }
+
+  if (cxx->defaultedCopyConstructorIsDeleted()) {
     return;
   }
 
diff --git a/tests/multi-file/cross_tu_tag_collision/out/refcount/cross_tu_tag_collision.rs b/tests/multi-file/cross_tu_tag_collision/out/refcount/cross_tu_tag_collision.rs
index 981fa9ae..f4846e89 100644
--- a/tests/multi-file/cross_tu_tag_collision/out/refcount/cross_tu_tag_collision.rs
+++ b/tests/multi-file/cross_tu_tag_collision/out/refcount/cross_tu_tag_collision.rs
@@ -10,6 +10,13 @@ use std::rc::{Rc, Weak};
 pub struct widget {
     pub id: Value<i32>,
 }
+impl Clone for widget {
+    fn clone(&self) -> Self {
+        Self {
+            id: Rc::new(RefCell::new((*self.id.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for widget {
     fn byte_size() -> usize {
         4
diff --git a/tests/multi-file/opaque_forward_decl/out/refcount/opaque_forward_decl.rs b/tests/multi-file/opaque_forward_decl/out/refcount/opaque_forward_decl.rs
index 77d2b14b..fe2518b9 100644
--- a/tests/multi-file/opaque_forward_decl/out/refcount/opaque_forward_decl.rs
+++ b/tests/multi-file/opaque_forward_decl/out/refcount/opaque_forward_decl.rs
@@ -11,6 +11,14 @@ pub struct container {
     pub p: Value<Ptr<opaque>>,
     pub x: Value<i32>,
 }
+impl Clone for container {
+    fn clone(&self) -> Self {
+        Self {
+            p: Rc::new(RefCell::new((*self.p.borrow()).clone())),
+            x: Rc::new(RefCell::new((*self.x.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for container {
     fn byte_size() -> usize {
         16
diff --git a/tests/unit/c_struct.c b/tests/unit/c_struct.c
index 9e79b582..cea796c1 100644
--- a/tests/unit/c_struct.c
+++ b/tests/unit/c_struct.c
@@ -29,6 +29,12 @@ int main() {
   assert(p.x == 10);
   assert(p.y == 20);
 
+  struct Point q = p;
+  q.x = 99;
+  assert(p.x == 10);
+  assert(q.x == 99);
+  assert(q.y == 20);
+
   struct Line l = {{1, 2}, {3, 4}};
   assert(l.start.x == 1);
   assert(l.end.y == 4);
diff --git a/tests/unit/out/refcount/anonymous-struct_c.rs b/tests/unit/out/refcount/anonymous-struct_c.rs
index 970d6e99..065fd2cc 100644
--- a/tests/unit/out/refcount/anonymous-struct_c.rs
+++ b/tests/unit/out/refcount/anonymous-struct_c.rs
@@ -11,6 +11,14 @@ pub struct Named {
     pub a: Value<i32>,
     pub b: Value<i32>,
 }
+impl Clone for Named {
+    fn clone(&self) -> Self {
+        Self {
+            a: Rc::new(RefCell::new((*self.a.borrow()).clone())),
+            b: Rc::new(RefCell::new((*self.b.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for Named {
     fn byte_size() -> usize {
         8
@@ -31,6 +39,14 @@ pub struct anon_0 {
     pub c: Value<i32>,
     pub d: Value<i32>,
 }
+impl Clone for anon_0 {
+    fn clone(&self) -> Self {
+        Self {
+            c: Rc::new(RefCell::new((*self.c.borrow()).clone())),
+            d: Rc::new(RefCell::new((*self.d.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for anon_0 {
     fn byte_size() -> usize {
         8
@@ -51,6 +67,14 @@ pub struct anon_1 {
     pub g: Value<i32>,
     pub h: Value<i32>,
 }
+impl Clone for anon_1 {
+    fn clone(&self) -> Self {
+        Self {
+            g: Rc::new(RefCell::new((*self.g.borrow()).clone())),
+            h: Rc::new(RefCell::new((*self.h.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for anon_1 {
     fn byte_size() -> usize {
         8
@@ -71,6 +95,14 @@ pub struct anon_2 {
     pub e: Value<i32>,
     pub f: Value<i32>,
 }
+impl Clone for anon_2 {
+    fn clone(&self) -> Self {
+        Self {
+            e: Rc::new(RefCell::new((*self.e.borrow()).clone())),
+            f: Rc::new(RefCell::new((*self.f.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for anon_2 {
     fn byte_size() -> usize {
         8
@@ -90,6 +122,13 @@ impl ByteRepr for anon_2 {
 pub struct anon_4 {
     pub j: Value<i32>,
 }
+impl Clone for anon_4 {
+    fn clone(&self) -> Self {
+        Self {
+            j: Rc::new(RefCell::new((*self.j.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for anon_4 {
     fn byte_size() -> usize {
         4
@@ -107,6 +146,13 @@ impl ByteRepr for anon_4 {
 pub struct anon_5 {
     pub k: Value<i32>,
 }
+impl Clone for anon_5 {
+    fn clone(&self) -> Self {
+        Self {
+            k: Rc::new(RefCell::new((*self.k.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for anon_5 {
     fn byte_size() -> usize {
         4
@@ -126,6 +172,15 @@ pub struct anon_3 {
     pub inner_named: Value<anon_4>,
     pub anon_5: Value<anon_5>,
 }
+impl Clone for anon_3 {
+    fn clone(&self) -> Self {
+        Self {
+            i: Rc::new(RefCell::new((*self.i.borrow()).clone())),
+            inner_named: Rc::new(RefCell::new((*self.inner_named.borrow()).clone())),
+            anon_5: Rc::new(RefCell::new((*self.anon_5.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for anon_3 {
     fn byte_size() -> usize {
         12
@@ -151,6 +206,17 @@ pub struct Outer {
     pub anon_2: Value<anon_2>,
     pub anon_3: Value<anon_3>,
 }
+impl Clone for Outer {
+    fn clone(&self) -> Self {
+        Self {
+            named: Rc::new(RefCell::new((*self.named.borrow()).clone())),
+            anon0: Rc::new(RefCell::new((*self.anon0.borrow()).clone())),
+            anon1: Rc::new(RefCell::new((*self.anon1.borrow()).clone())),
+            anon_2: Rc::new(RefCell::new((*self.anon_2.borrow()).clone())),
+            anon_3: Rc::new(RefCell::new((*self.anon_3.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for Outer {
     fn byte_size() -> usize {
         44
@@ -229,6 +295,14 @@ fn main_0() -> i32 {
         pub x: Value<i32>,
         pub z: Value<i32>,
     }
+    impl Clone for anon_6 {
+        fn clone(&self) -> Self {
+            Self {
+                x: Rc::new(RefCell::new((*self.x.borrow()).clone())),
+                z: Rc::new(RefCell::new((*self.z.borrow()).clone())),
+            }
+        }
+    }
     impl ByteRepr for anon_6 {
         fn byte_size() -> usize {
             8
diff --git a/tests/unit/out/refcount/anonymous_enum_c.rs b/tests/unit/out/refcount/anonymous_enum_c.rs
index a851a2b5..5aa61233 100644
--- a/tests/unit/out/refcount/anonymous_enum_c.rs
+++ b/tests/unit/out/refcount/anonymous_enum_c.rs
@@ -58,6 +58,13 @@ impl ByteRepr for anon_1 {
 pub struct S {
     pub a: Value<i32>,
 }
+impl Clone for S {
+    fn clone(&self) -> Self {
+        Self {
+            a: Rc::new(RefCell::new((*self.a.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for S {
     fn byte_size() -> usize {
         4
@@ -124,6 +131,14 @@ pub struct WithAnonField {
     pub a: Value<i32>,
     pub field: Value<anon_2>,
 }
+impl Clone for WithAnonField {
+    fn clone(&self) -> Self {
+        Self {
+            a: Rc::new(RefCell::new((*self.a.borrow()).clone())),
+            field: Rc::new(RefCell::new((*self.field.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for WithAnonField {
     fn byte_size() -> usize {
         8
diff --git a/tests/unit/out/refcount/array_const_init.rs b/tests/unit/out/refcount/array_const_init.rs
index 7a2cf78d..b0e467de 100644
--- a/tests/unit/out/refcount/array_const_init.rs
+++ b/tests/unit/out/refcount/array_const_init.rs
@@ -12,6 +12,15 @@ pub struct S {
     pub tail: Value<Box<[i32]>>,
     pub buf: Value<Box<[u8]>>,
 }
+impl Clone for S {
+    fn clone(&self) -> Self {
+        Self {
+            head: Rc::new(RefCell::new((*self.head.borrow()).clone())),
+            tail: Rc::new(RefCell::new((*self.tail.borrow()).clone())),
+            buf: Rc::new(RefCell::new((*self.buf.borrow()).clone())),
+        }
+    }
+}
 impl Default for S {
     fn default() -> Self {
         S {
diff --git a/tests/unit/out/refcount/c_struct.rs b/tests/unit/out/refcount/c_struct.rs
index d6921e87..d70a7553 100644
--- a/tests/unit/out/refcount/c_struct.rs
+++ b/tests/unit/out/refcount/c_struct.rs
@@ -11,6 +11,14 @@ pub struct Point {
     pub x: Value<i32>,
     pub y: Value<i32>,
 }
+impl Clone for Point {
+    fn clone(&self) -> Self {
+        Self {
+            x: Rc::new(RefCell::new((*self.x.borrow()).clone())),
+            y: Rc::new(RefCell::new((*self.y.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for Point {
     fn byte_size() -> usize {
         8
@@ -31,6 +39,14 @@ pub struct Line {
     pub start: Value<Point>,
     pub end: Value<Point>,
 }
+impl Clone for Line {
+    fn clone(&self) -> Self {
+        Self {
+            start: Rc::new(RefCell::new((*self.start.borrow()).clone())),
+            end: Rc::new(RefCell::new((*self.end.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for Line {
     fn byte_size() -> usize {
         16
@@ -51,6 +67,14 @@ pub struct Node {
     pub value: Value<i32>,
     pub next: Value<Ptr<Node>>,
 }
+impl Clone for Node {
+    fn clone(&self) -> Self {
+        Self {
+            value: Rc::new(RefCell::new((*self.value.borrow()).clone())),
+            next: Rc::new(RefCell::new((*self.next.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for Node {
     fn byte_size() -> usize {
         16
@@ -97,6 +121,14 @@ pub struct Inner {
     pub a: Value<i32>,
     pub b: Value<i32>,
 }
+impl Clone for Inner {
+    fn clone(&self) -> Self {
+        Self {
+            a: Rc::new(RefCell::new((*self.a.borrow()).clone())),
+            b: Rc::new(RefCell::new((*self.b.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for Inner {
     fn byte_size() -> usize {
         8
@@ -118,6 +150,15 @@ pub struct Container {
     pub color: Value<Color>,
     pub count: Value<i32>,
 }
+impl Clone for Container {
+    fn clone(&self) -> Self {
+        Self {
+            inner: Rc::new(RefCell::new((*self.inner.borrow()).clone())),
+            color: Rc::new(RefCell::new((*self.color.borrow()).clone())),
+            count: Rc::new(RefCell::new((*self.count.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for Container {
     fn byte_size() -> usize {
         16
@@ -145,6 +186,11 @@ fn main_0() -> i32 {
     }));
     assert!(((((*(*p.borrow()).x.borrow()) == 10) as i32) != 0));
     assert!(((((*(*p.borrow()).y.borrow()) == 20) as i32) != 0));
+    let q: Value<Point> = Rc::new(RefCell::new((*p.borrow()).clone()));
+    (*(*q.borrow()).x.borrow_mut()) = 99;
+    assert!(((((*(*p.borrow()).x.borrow()) == 10) as i32) != 0));
+    assert!(((((*(*q.borrow()).x.borrow()) == 99) as i32) != 0));
+    assert!(((((*(*q.borrow()).y.borrow()) == 20) as i32) != 0));
     let l: Value<Line> = Rc::new(RefCell::new(Line {
         start: Rc::new(RefCell::new(Point {
             x: Rc::new(RefCell::new(1)),
diff --git a/tests/unit/out/refcount/enum_default_in_static.rs b/tests/unit/out/refcount/enum_default_in_static.rs
index 866240a2..16aac005 100644
--- a/tests/unit/out/refcount/enum_default_in_static.rs
+++ b/tests/unit/out/refcount/enum_default_in_static.rs
@@ -37,6 +37,14 @@ pub struct Config {
     pub count: Value<i32>,
     pub mode: Value<Mode>,
 }
+impl Clone for Config {
+    fn clone(&self) -> Self {
+        Self {
+            count: Rc::new(RefCell::new((*self.count.borrow()).clone())),
+            mode: Rc::new(RefCell::new((*self.mode.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for Config {
     fn byte_size() -> usize {
         8
diff --git a/tests/unit/out/refcount/enum_int_interop_c.rs b/tests/unit/out/refcount/enum_int_interop_c.rs
index e004cd47..c6945040 100644
--- a/tests/unit/out/refcount/enum_int_interop_c.rs
+++ b/tests/unit/out/refcount/enum_int_interop_c.rs
@@ -92,6 +92,15 @@ pub struct Entry {
     pub color: Value<Color>,
     pub opt: Value<Option>,
 }
+impl Clone for Entry {
+    fn clone(&self) -> Self {
+        Self {
+            name: Rc::new(RefCell::new((*self.name.borrow()).clone())),
+            color: Rc::new(RefCell::new((*self.color.borrow()).clone())),
+            opt: Rc::new(RefCell::new((*self.opt.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for Entry {
     fn byte_size() -> usize {
         16
diff --git a/tests/unit/out/refcount/goto_aggregate_default.rs b/tests/unit/out/refcount/goto_aggregate_default.rs
index c2c6d4d4..ff5b7fa2 100644
--- a/tests/unit/out/refcount/goto_aggregate_default.rs
+++ b/tests/unit/out/refcount/goto_aggregate_default.rs
@@ -11,6 +11,14 @@ pub struct Point {
     pub x: Value<i32>,
     pub y: Value<i32>,
 }
+impl Clone for Point {
+    fn clone(&self) -> Self {
+        Self {
+            x: Rc::new(RefCell::new((*self.x.borrow()).clone())),
+            y: Rc::new(RefCell::new((*self.y.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for Point {
     fn byte_size() -> usize {
         8
diff --git a/tests/unit/out/refcount/local_anon_struct_collision.rs b/tests/unit/out/refcount/local_anon_struct_collision.rs
index d69250d0..d717fab0 100644
--- a/tests/unit/out/refcount/local_anon_struct_collision.rs
+++ b/tests/unit/out/refcount/local_anon_struct_collision.rs
@@ -12,6 +12,14 @@ pub fn first_0() -> i32 {
         pub x: Value<i32>,
         pub y: Value<i32>,
     }
+    impl Clone for anon_1 {
+        fn clone(&self) -> Self {
+            Self {
+                x: Rc::new(RefCell::new((*self.x.borrow()).clone())),
+                y: Rc::new(RefCell::new((*self.y.borrow()).clone())),
+            }
+        }
+    }
     impl ByteRepr for anon_1 {
         fn byte_size() -> usize {
             8
@@ -38,6 +46,14 @@ pub fn second_2() -> i32 {
         pub a: Value<i64>,
         pub b: Value<i64>,
     }
+    impl Clone for anon_3 {
+        fn clone(&self) -> Self {
+            Self {
+                a: Rc::new(RefCell::new((*self.a.borrow()).clone())),
+                b: Rc::new(RefCell::new((*self.b.borrow()).clone())),
+            }
+        }
+    }
     impl ByteRepr for anon_3 {
         fn byte_size() -> usize {
             16
diff --git a/tests/unit/out/refcount/memcpy_struct_bytes.rs b/tests/unit/out/refcount/memcpy_struct_bytes.rs
index d233b346..e141580f 100644
--- a/tests/unit/out/refcount/memcpy_struct_bytes.rs
+++ b/tests/unit/out/refcount/memcpy_struct_bytes.rs
@@ -11,6 +11,14 @@ pub struct point {
     pub x: Value<i32>,
     pub y: Value<i32>,
 }
+impl Clone for point {
+    fn clone(&self) -> Self {
+        Self {
+            x: Rc::new(RefCell::new((*self.x.borrow()).clone())),
+            y: Rc::new(RefCell::new((*self.y.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for point {
     fn byte_size() -> usize {
         8
diff --git a/tests/unit/out/refcount/opaque_forward_decl.rs b/tests/unit/out/refcount/opaque_forward_decl.rs
index 0403bbae..d4d00443 100644
--- a/tests/unit/out/refcount/opaque_forward_decl.rs
+++ b/tests/unit/out/refcount/opaque_forward_decl.rs
@@ -11,6 +11,14 @@ pub struct container {
     pub p: Value<Ptr<opaque>>,
     pub x: Value<i32>,
 }
+impl Clone for container {
+    fn clone(&self) -> Self {
+        Self {
+            p: Rc::new(RefCell::new((*self.p.borrow()).clone())),
+            x: Rc::new(RefCell::new((*self.x.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for container {
     fn byte_size() -> usize {
         16
diff --git a/tests/unit/out/refcount/opaque_then_defined.rs b/tests/unit/out/refcount/opaque_then_defined.rs
index b67e2e48..1c8c7a14 100644
--- a/tests/unit/out/refcount/opaque_then_defined.rs
+++ b/tests/unit/out/refcount/opaque_then_defined.rs
@@ -11,6 +11,14 @@ pub struct list {
     pub head: Value<Ptr<node>>,
     pub size: Value<i32>,
 }
+impl Clone for list {
+    fn clone(&self) -> Self {
+        Self {
+            head: Rc::new(RefCell::new((*self.head.borrow()).clone())),
+            size: Rc::new(RefCell::new((*self.size.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for list {
     fn byte_size() -> usize {
         16
@@ -31,6 +39,14 @@ pub struct node {
     pub value: Value<i32>,
     pub next: Value<Ptr<node>>,
 }
+impl Clone for node {
+    fn clone(&self) -> Self {
+        Self {
+            value: Rc::new(RefCell::new((*self.value.borrow()).clone())),
+            next: Rc::new(RefCell::new((*self.next.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for node {
     fn byte_size() -> usize {
         16
diff --git a/tests/unit/out/refcount/tag_vs_identifier_collision.rs b/tests/unit/out/refcount/tag_vs_identifier_collision.rs
index a3a2fb9d..98e95a3d 100644
--- a/tests/unit/out/refcount/tag_vs_identifier_collision.rs
+++ b/tests/unit/out/refcount/tag_vs_identifier_collision.rs
@@ -37,6 +37,14 @@ pub struct widget {
     pub id: Value<i32>,
     pub mode: Value<widget_enum>,
 }
+impl Clone for widget {
+    fn clone(&self) -> Self {
+        Self {
+            id: Rc::new(RefCell::new((*self.id.borrow()).clone())),
+            mode: Rc::new(RefCell::new((*self.mode.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for widget {
     fn byte_size() -> usize {
         8
@@ -57,6 +65,14 @@ pub struct point_struct {
     pub x: Value<i32>,
     pub y: Value<i32>,
 }
+impl Clone for point_struct {
+    fn clone(&self) -> Self {
+        Self {
+            x: Rc::new(RefCell::new((*self.x.borrow()).clone())),
+            y: Rc::new(RefCell::new((*self.y.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for point_struct {
     fn byte_size() -> usize {
         8
@@ -176,6 +192,13 @@ impl ByteRepr for slot {
 pub struct Inner {
     pub tag_field: Value<i32>,
 }
+impl Clone for Inner {
+    fn clone(&self) -> Self {
+        Self {
+            tag_field: Rc::new(RefCell::new((*self.tag_field.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for Inner {
     fn byte_size() -> usize {
         4
@@ -193,6 +216,13 @@ impl ByteRepr for Inner {
 pub struct Outer {
     pub field: Value<Inner>,
 }
+impl Clone for Outer {
+    fn clone(&self) -> Self {
+        Self {
+            field: Rc::new(RefCell::new((*self.field.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for Outer {
     fn byte_size() -> usize {
         4
@@ -210,6 +240,13 @@ impl ByteRepr for Outer {
 pub struct Inner_struct {
     pub typedef_field: Value<i32>,
 }
+impl Clone for Inner_struct {
+    fn clone(&self) -> Self {
+        Self {
+            typedef_field: Rc::new(RefCell::new((*self.typedef_field.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for Inner_struct {
     fn byte_size() -> usize {
         4
diff --git a/tests/unit/out/refcount/union_addrof_external.rs b/tests/unit/out/refcount/union_addrof_external.rs
index d5e5cf8c..15928f01 100644
--- a/tests/unit/out/refcount/union_addrof_external.rs
+++ b/tests/unit/out/refcount/union_addrof_external.rs
@@ -13,6 +13,16 @@ pub struct record {
     pub hi: Value<u32>,
     pub pad: Value<Box<[u8]>>,
 }
+impl Clone for record {
+    fn clone(&self) -> Self {
+        Self {
+            code: Rc::new(RefCell::new((*self.code.borrow()).clone())),
+            lo: Rc::new(RefCell::new((*self.lo.borrow()).clone())),
+            hi: Rc::new(RefCell::new((*self.hi.borrow()).clone())),
+            pad: Rc::new(RefCell::new((*self.pad.borrow()).clone())),
+        }
+    }
+}
 impl Default for record {
     fn default() -> Self {
         record {
@@ -86,6 +96,13 @@ impl ByteRepr for anon_0 {
 pub struct Container {
     pub view: Value<anon_0>,
 }
+impl Clone for Container {
+    fn clone(&self) -> Self {
+        Self {
+            view: Rc::new(RefCell::new((*self.view.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for Container {
     fn byte_size() -> usize {
         128
diff --git a/tests/unit/out/refcount/union_cross_arm_cast.rs b/tests/unit/out/refcount/union_cross_arm_cast.rs
index 6a6139d8..70fa8176 100644
--- a/tests/unit/out/refcount/union_cross_arm_cast.rs
+++ b/tests/unit/out/refcount/union_cross_arm_cast.rs
@@ -11,6 +11,14 @@ pub struct shape_a {
     pub code: Value<u16>,
     pub pad: Value<Box<[u8]>>,
 }
+impl Clone for shape_a {
+    fn clone(&self) -> Self {
+        Self {
+            code: Rc::new(RefCell::new((*self.code.borrow()).clone())),
+            pad: Rc::new(RefCell::new((*self.pad.borrow()).clone())),
+        }
+    }
+}
 impl Default for shape_a {
     fn default() -> Self {
         shape_a {
@@ -44,6 +52,17 @@ pub struct shape_b {
     pub fill: Value<Box<[u8]>>,
     pub tail: Value<u32>,
 }
+impl Clone for shape_b {
+    fn clone(&self) -> Self {
+        Self {
+            code: Rc::new(RefCell::new((*self.code.borrow()).clone())),
+            lo: Rc::new(RefCell::new((*self.lo.borrow()).clone())),
+            mid: Rc::new(RefCell::new((*self.mid.borrow()).clone())),
+            fill: Rc::new(RefCell::new((*self.fill.borrow()).clone())),
+            tail: Rc::new(RefCell::new((*self.tail.borrow()).clone())),
+        }
+    }
+}
 impl Default for shape_b {
     fn default() -> Self {
         shape_b {
@@ -124,6 +143,14 @@ pub struct Container {
     pub len: Value<u32>,
     pub u: Value<anon_0>,
 }
+impl Clone for Container {
+    fn clone(&self) -> Self {
+        Self {
+            len: Rc::new(RefCell::new((*self.len.borrow()).clone())),
+            u: Rc::new(RefCell::new((*self.u.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for Container {
     fn byte_size() -> usize {
         68
diff --git a/tests/unit/out/refcount/union_field_alignment.rs b/tests/unit/out/refcount/union_field_alignment.rs
index 1abb6a3d..54e96ad9 100644
--- a/tests/unit/out/refcount/union_field_alignment.rs
+++ b/tests/unit/out/refcount/union_field_alignment.rs
@@ -49,6 +49,14 @@ pub struct node {
     pub next: Value<Ptr<node>>,
     pub x: Value<anon_0>,
 }
+impl Clone for node {
+    fn clone(&self) -> Self {
+        Self {
+            next: Rc::new(RefCell::new((*self.next.borrow()).clone())),
+            x: Rc::new(RefCell::new((*self.x.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for node {
     fn byte_size() -> usize {
         16
diff --git a/tests/unit/out/refcount/union_memset_memcpy.rs b/tests/unit/out/refcount/union_memset_memcpy.rs
index 4466270c..ae06246a 100644
--- a/tests/unit/out/refcount/union_memset_memcpy.rs
+++ b/tests/unit/out/refcount/union_memset_memcpy.rs
@@ -11,6 +11,14 @@ pub struct shape_a {
     pub code: Value<u16>,
     pub pad: Value<Box<[u8]>>,
 }
+impl Clone for shape_a {
+    fn clone(&self) -> Self {
+        Self {
+            code: Rc::new(RefCell::new((*self.code.borrow()).clone())),
+            pad: Rc::new(RefCell::new((*self.pad.borrow()).clone())),
+        }
+    }
+}
 impl Default for shape_a {
     fn default() -> Self {
         shape_a {
@@ -43,6 +51,16 @@ pub struct shape_b {
     pub hi: Value<u32>,
     pub fill: Value<Box<[u8]>>,
 }
+impl Clone for shape_b {
+    fn clone(&self) -> Self {
+        Self {
+            code: Rc::new(RefCell::new((*self.code.borrow()).clone())),
+            lo: Rc::new(RefCell::new((*self.lo.borrow()).clone())),
+            hi: Rc::new(RefCell::new((*self.hi.borrow()).clone())),
+            fill: Rc::new(RefCell::new((*self.fill.borrow()).clone())),
+        }
+    }
+}
 impl Default for shape_b {
     fn default() -> Self {
         shape_b {
@@ -119,6 +137,13 @@ impl ByteRepr for anon_0 {
 pub struct Container {
     pub view: Value<anon_0>,
 }
+impl Clone for Container {
+    fn clone(&self) -> Self {
+        Self {
+            view: Rc::new(RefCell::new((*self.view.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for Container {
     fn byte_size() -> usize {
         256
diff --git a/tests/unit/out/refcount/union_nested.rs b/tests/unit/out/refcount/union_nested.rs
index dbf8aed8..094fc897 100644
--- a/tests/unit/out/refcount/union_nested.rs
+++ b/tests/unit/out/refcount/union_nested.rs
@@ -11,6 +11,14 @@ pub struct record {
     pub code: Value<u16>,
     pub pad: Value<Box<[u8]>>,
 }
+impl Clone for record {
+    fn clone(&self) -> Self {
+        Self {
+            code: Rc::new(RefCell::new((*self.code.borrow()).clone())),
+            pad: Rc::new(RefCell::new((*self.pad.borrow()).clone())),
+        }
+    }
+}
 impl Default for record {
     fn default() -> Self {
         record {
@@ -78,6 +86,13 @@ impl ByteRepr for anon_0 {
 pub struct inner {
     pub view: Value<anon_0>,
 }
+impl Clone for inner {
+    fn clone(&self) -> Self {
+        Self {
+            view: Rc::new(RefCell::new((*self.view.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for inner {
     fn byte_size() -> usize {
         128
@@ -137,6 +152,17 @@ pub struct Outer {
     pub len: Value<u32>,
     pub body: Value<anon_1>,
 }
+impl Clone for Outer {
+    fn clone(&self) -> Self {
+        Self {
+            kind: Rc::new(RefCell::new((*self.kind.borrow()).clone())),
+            level: Rc::new(RefCell::new((*self.level.borrow()).clone())),
+            variant: Rc::new(RefCell::new((*self.variant.borrow()).clone())),
+            len: Rc::new(RefCell::new((*self.len.borrow()).clone())),
+            body: Rc::new(RefCell::new((*self.body.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for Outer {
     fn byte_size() -> usize {
         144
diff --git a/tests/unit/out/refcount/union_pointer_pun_address.rs b/tests/unit/out/refcount/union_pointer_pun_address.rs
index 8cd925a7..4a0cb1bb 100644
--- a/tests/unit/out/refcount/union_pointer_pun_address.rs
+++ b/tests/unit/out/refcount/union_pointer_pun_address.rs
@@ -10,6 +10,13 @@ use std::rc::{Rc, Weak};
 pub struct node_a {
     pub n: Value<i32>,
 }
+impl Clone for node_a {
+    fn clone(&self) -> Self {
+        Self {
+            n: Rc::new(RefCell::new((*self.n.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for node_a {
     fn byte_size() -> usize {
         4
@@ -28,6 +35,14 @@ pub struct node_b {
     pub data: Value<AnyPtr>,
     pub next: Value<Ptr<node_b>>,
 }
+impl Clone for node_b {
+    fn clone(&self) -> Self {
+        Self {
+            data: Rc::new(RefCell::new((*self.data.borrow()).clone())),
+            next: Rc::new(RefCell::new((*self.next.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for node_b {
     fn byte_size() -> usize {
         16
diff --git a/tests/unit/out/refcount/union_struct_dual_use.rs b/tests/unit/out/refcount/union_struct_dual_use.rs
index d4a8bd78..e80895fa 100644
--- a/tests/unit/out/refcount/union_struct_dual_use.rs
+++ b/tests/unit/out/refcount/union_struct_dual_use.rs
@@ -11,6 +11,14 @@ pub struct Inner {
     pub a: Value<i32>,
     pub b: Value<i32>,
 }
+impl Clone for Inner {
+    fn clone(&self) -> Self {
+        Self {
+            a: Rc::new(RefCell::new((*self.a.borrow()).clone())),
+            b: Rc::new(RefCell::new((*self.b.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for Inner {
     fn byte_size() -> usize {
         8
@@ -75,6 +83,13 @@ impl ByteRepr for anon_1 {
 pub struct Outer {
     pub u: Value<anon_1>,
 }
+impl Clone for Outer {
+    fn clone(&self) -> Self {
+        Self {
+            u: Rc::new(RefCell::new((*self.u.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for Outer {
     fn byte_size() -> usize {
         16
diff --git a/tests/unit/out/refcount/union_tagged_many_arms.rs b/tests/unit/out/refcount/union_tagged_many_arms.rs
index 96784d0b..471c32f7 100644
--- a/tests/unit/out/refcount/union_tagged_many_arms.rs
+++ b/tests/unit/out/refcount/union_tagged_many_arms.rs
@@ -88,6 +88,14 @@ pub struct Slot {
     pub tag: Value<Tag_enum>,
     pub payload: Value<anon_0>,
 }
+impl Clone for Slot {
+    fn clone(&self) -> Self {
+        Self {
+            tag: Rc::new(RefCell::new((*self.tag.borrow()).clone())),
+            payload: Rc::new(RefCell::new((*self.payload.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for Slot {
     fn byte_size() -> usize {
         16
diff --git a/tests/unit/out/refcount/union_tagged_simple.rs b/tests/unit/out/refcount/union_tagged_simple.rs
index dc180c7e..93132b1c 100644
--- a/tests/unit/out/refcount/union_tagged_simple.rs
+++ b/tests/unit/out/refcount/union_tagged_simple.rs
@@ -74,6 +74,15 @@ pub struct Event {
     pub handle: Value<AnyPtr>,
     pub payload: Value<anon_0>,
 }
+impl Clone for Event {
+    fn clone(&self) -> Self {
+        Self {
+            kind: Rc::new(RefCell::new((*self.kind.borrow()).clone())),
+            handle: Rc::new(RefCell::new((*self.handle.borrow()).clone())),
+            payload: Rc::new(RefCell::new((*self.payload.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for Event {
     fn byte_size() -> usize {
         24
diff --git a/tests/unit/out/refcount/union_tagged_struct_arms.rs b/tests/unit/out/refcount/union_tagged_struct_arms.rs
index 13632b30..f8479d4b 100644
--- a/tests/unit/out/refcount/union_tagged_struct_arms.rs
+++ b/tests/unit/out/refcount/union_tagged_struct_arms.rs
@@ -38,6 +38,15 @@ pub struct anon_1 {
     pub count: Value<i64>,
     pub cursor: Value<i64>,
 }
+impl Clone for anon_1 {
+    fn clone(&self) -> Self {
+        Self {
+            items: Rc::new(RefCell::new((*self.items.borrow()).clone())),
+            count: Rc::new(RefCell::new((*self.count.borrow()).clone())),
+            cursor: Rc::new(RefCell::new((*self.cursor.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for anon_1 {
     fn byte_size() -> usize {
         24
@@ -62,6 +71,16 @@ pub struct anon_2 {
     pub curr: Value<i32>,
     pub step: Value<u8>,
 }
+impl Clone for anon_2 {
+    fn clone(&self) -> Self {
+        Self {
+            lo: Rc::new(RefCell::new((*self.lo.borrow()).clone())),
+            hi: Rc::new(RefCell::new((*self.hi.borrow()).clone())),
+            curr: Rc::new(RefCell::new((*self.curr.borrow()).clone())),
+            step: Rc::new(RefCell::new((*self.step.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for anon_2 {
     fn byte_size() -> usize {
         16
@@ -89,6 +108,17 @@ pub struct anon_3 {
     pub step: Value<i64>,
     pub width: Value<i32>,
 }
+impl Clone for anon_3 {
+    fn clone(&self) -> Self {
+        Self {
+            lo: Rc::new(RefCell::new((*self.lo.borrow()).clone())),
+            hi: Rc::new(RefCell::new((*self.hi.borrow()).clone())),
+            curr: Rc::new(RefCell::new((*self.curr.borrow()).clone())),
+            step: Rc::new(RefCell::new((*self.step.borrow()).clone())),
+            width: Rc::new(RefCell::new((*self.width.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for anon_3 {
     fn byte_size() -> usize {
         40
@@ -157,6 +187,15 @@ pub struct Branch {
     pub index: Value<i32>,
     pub v: Value<anon_0>,
 }
+impl Clone for Branch {
+    fn clone(&self) -> Self {
+        Self {
+            choice: Rc::new(RefCell::new((*self.choice.borrow()).clone())),
+            index: Rc::new(RefCell::new((*self.index.borrow()).clone())),
+            v: Rc::new(RefCell::new((*self.v.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for Branch {
     fn byte_size() -> usize {
         48
diff --git a/tests/unit/out/refcount/union_void_ptr_sized_deref.rs b/tests/unit/out/refcount/union_void_ptr_sized_deref.rs
index 80a09a34..e0af220a 100644
--- a/tests/unit/out/refcount/union_void_ptr_sized_deref.rs
+++ b/tests/unit/out/refcount/union_void_ptr_sized_deref.rs
@@ -81,6 +81,14 @@ pub struct Sink {
     pub width: Value<Width_enum>,
     pub out: Value<anon_0>,
 }
+impl Clone for Sink {
+    fn clone(&self) -> Self {
+        Self {
+            width: Rc::new(RefCell::new((*self.width.borrow()).clone())),
+            out: Rc::new(RefCell::new((*self.out.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for Sink {
     fn byte_size() -> usize {
         16
diff --git a/tests/unit/out/refcount/va_arg_non_primitive_ptrs.rs b/tests/unit/out/refcount/va_arg_non_primitive_ptrs.rs
index 836ccef8..cb69e40f 100644
--- a/tests/unit/out/refcount/va_arg_non_primitive_ptrs.rs
+++ b/tests/unit/out/refcount/va_arg_non_primitive_ptrs.rs
@@ -11,6 +11,14 @@ pub struct node {
     pub data: Value<i32>,
     pub next: Value<Ptr<node>>,
 }
+impl Clone for node {
+    fn clone(&self) -> Self {
+        Self {
+            data: Rc::new(RefCell::new((*self.data.borrow()).clone())),
+            next: Rc::new(RefCell::new((*self.next.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for node {
     fn byte_size() -> usize {
         16
diff --git a/tests/unit/out/refcount/va_arg_struct_ctx.rs b/tests/unit/out/refcount/va_arg_struct_ctx.rs
index b6b031f5..936e749f 100644
--- a/tests/unit/out/refcount/va_arg_struct_ctx.rs
+++ b/tests/unit/out/refcount/va_arg_struct_ctx.rs
@@ -11,6 +11,14 @@ pub struct context {
     pub verbose: Value<i32>,
     pub last_error: Value<i32>,
 }
+impl Clone for context {
+    fn clone(&self) -> Self {
+        Self {
+            verbose: Rc::new(RefCell::new((*self.verbose.borrow()).clone())),
+            last_error: Rc::new(RefCell::new((*self.last_error.borrow()).clone())),
+        }
+    }
+}
 impl ByteRepr for context {
     fn byte_size() -> usize {
         8
diff --git a/tests/unit/out/unsafe/c_struct.rs b/tests/unit/out/unsafe/c_struct.rs
index 5157a6f3..93823697 100644
--- a/tests/unit/out/unsafe/c_struct.rs
+++ b/tests/unit/out/unsafe/c_struct.rs
@@ -64,6 +64,11 @@ unsafe fn main_0() -> i32 {
     let mut p: Point = Point { x: 10, y: 20 };
     assert!(((((p.x) == (10)) as i32) != 0));
     assert!(((((p.y) == (20)) as i32) != 0));
+    let mut q: Point = p;
+    q.x = 99;
+    assert!(((((p.x) == (10)) as i32) != 0));
+    assert!(((((q.x) == (99)) as i32) != 0));
+    assert!(((((q.y) == (20)) as i32) != 0));
     let mut l: Line = Line {
         start: Point { x: 1, y: 2 },
         end: Point { x: 3, y: 4 },