Update tests

Author: lucic71

tests/unit/out/refcount/copy_ctor.rs

@@ -111,7 +111,7 @@ impl Default for Holder {
         }
     }
 }
-#[derive(Record, ByteRepr, FnPtrArg, MoveCtor, Default)]
+#[derive(Record, ByteRepr, VaArg, FnPtrArg, MoveCtor, Default)]
 #[byte_size(4)]
 pub struct Box_int_ {
     #[offset(0)]
@@ -122,26 +122,32 @@ impl Box_int_ {
         let v: Value<i32> = Rc::new(RefCell::new(v));
         Self { val: (*v.borrow()) }
     }
+    pub fn copy_from(o: Ptr<Box_int_>) -> Self {
+        Self {
+            val: o.with(|__s| __s.val),
+        }
+    }
     pub fn move_from(_a0: Ptr<Box_int_>) -> Self {
         Self {
             val: { (*_a0.upgrade().deref()).val },
         }
     }
 }
-#[derive(Record, ByteRepr, FnPtrArg, MoveCtor, Default)]
+impl Clone for Box_int_ {
+    fn clone(&self) -> Self {
+        let __src: Value<Box_int_> = Rc::new(RefCell::new(Box_int_ {
+            val: self.val.clone(),
+        }));
+        Box_int_::copy_from(__src.as_pointer())
+    }
+}
+#[derive(Clone, Record, ByteRepr, VaArg, FnPtrArg, Default)]
 #[byte_size(4)]
 pub struct Owner {
     #[offset(0)]
     #[byte_size(4)]
     pub box_: Box_int_,
 }
-impl Owner {
-    pub fn move_from(_a0: Ptr<Owner>) -> Self {
-        Self {
-            box_: Box_int_::move_from({ field_ptr!(_a0, box_) }),
-        }
-    }
-}
 #[derive(Record, ByteRepr, VaArg, FnPtrArg, Default)]
 #[byte_size(4)]
 pub struct OutOfLine {
@@ -235,7 +241,7 @@ fn main_0() -> i32 {
     let o: Value<Owner> = Rc::new(RefCell::new(Owner {
         box_: Box_int_::new({ 3 }),
     }));
-    let mut o2: Owner = Owner::move_from({ o.as_pointer() });
+    let mut o2: Owner = (*o.borrow()).clone();
     assert!((o2.box_.val == 3));
     let ol1: Value<OutOfLine> = Rc::new(RefCell::new(OutOfLine::new({ 5 })));
     let mut ol2: OutOfLine = OutOfLine::copy_from({ ol1.as_pointer() });

tests/unit/out/unsafe/copy_ctor.rs

@@ -89,7 +89,7 @@ pub struct Holder {
     pub arr: [Counted; 2],
 }
 #[repr(C)]
-#[derive(FnPtrArg, MoveCtorUnsafe, Default)]
+#[derive(VaArg, FnPtrArg, MoveCtorUnsafe, Default)]
 pub struct Box_int_ {
     pub val: i32,
 }
@@ -98,24 +98,25 @@ impl Box_int_ {
         let mut this = Self { val: v };
         this
     }
+    pub unsafe fn copy_from(o: *const Box_int_) -> Self {
+        let mut this = Self { val: (*o).val };
+        this
+    }
     pub unsafe fn move_from(_a0: *mut Box_int_) -> Self {
         let mut this = Self { val: (*_a0).val };
         this
     }
 }
+impl Clone for Box_int_ {
+    fn clone(&self) -> Self {
+        unsafe { Box_int_::copy_from(self as *const Box_int_) }
+    }
+}
 #[repr(C)]
-#[derive(FnPtrArg, MoveCtorUnsafe, Default)]
+#[derive(Clone, VaArg, FnPtrArg, Default)]
 pub struct Owner {
     pub box_: Box_int_,
 }
-impl Owner {
-    pub unsafe fn move_from(_a0: *mut Owner) -> Self {
-        let mut this = Self {
-            box_: Box_int_::move_from({ &mut (*_a0).box_ }),
-        };
-        this
-    }
-}
 #[repr(C)]
 #[derive(VaArg, FnPtrArg, Default)]
 pub struct OutOfLine {
@@ -196,7 +197,7 @@ unsafe fn main_0() -> i32 {
     let mut o: Owner = Owner {
         box_: Box_int_::new({ 3 }),
     };
-    let mut o2: Owner = Owner::move_from({ &mut o });
+    let mut o2: Owner = o.clone();
     assert!(((o2.box_.val) == (3)));
     let mut ol1: OutOfLine = OutOfLine::new({ 5 });
     let mut ol2: OutOfLine = OutOfLine::copy_from({ &ol1 });