Update tests

Author: lucic71

tests/ub/out/refcount/int_to_pointer_out_of_range.rs

@@ -51,10 +51,12 @@ fn main_0() -> i32 {
     };
     let u: Value<anon_0> = <Value<anon_0>>::default();
     (*u.borrow_mut()).p().write((arr.as_pointer() as Ptr<i32>));
-    let rhs_0 = ((((*u.borrow()).bits().read()) as u64)
-        .wrapping_add(((100_usize).wrapping_mul((::std::mem::size_of::<i32>() as usize)) as u64)))
-        as u64;
-    (*u.borrow_mut()).bits().write(rhs_0);
+    {
+        let rhs_0 = ((*u.borrow()).bits().read()).wrapping_add(
+            ((100_usize).wrapping_mul((::std::mem::size_of::<i32>() as usize)) as u64),
+        );
+        (*u.borrow_mut()).bits().write(rhs_0)
+    };
     let p: Value<Ptr<i32>> = Rc::new(RefCell::new(((*u.borrow()).p().read()).clone()));
     return if (((((*p.borrow()).read()) == 0) as i32) != 0) {
         0

tests/ub/out/unsafe/int_to_pointer_out_of_range.rs

@@ -26,9 +26,8 @@ unsafe fn main_0() -> i32 {
     };
     let mut u: anon_0 = <anon_0>::default();
     u.p = arr.as_mut_ptr();
-    u.bits = ((u.bits as u64)
-        .wrapping_add(((100_usize).wrapping_mul((::std::mem::size_of::<i32>() as usize)) as u64)))
-        as u64;
+    u.bits = (u.bits)
+        .wrapping_add(((100_usize).wrapping_mul((::std::mem::size_of::<i32>() as usize)) as u64));
     let mut p: *mut i32 = u.p;
     return if ((((*p) == (0)) as i32) != 0) { 0 } else { 1 };
 }

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

tests/unit/out/refcount/struct_member_array_adjacency.rs

@@ -11,6 +11,14 @@ pub struct pair {
     pub a: Value<Box<[i32]>>,
     pub b: Value<Box<[i32]>>,
 }
+impl Clone for pair {
+    fn clone(&self) -> Self {
+        Self {
+            a: Rc::new(RefCell::new((*self.a.borrow()).clone())),
+            b: Rc::new(RefCell::new((*self.b.borrow()).clone())),
+        }
+    }
+}
 impl Default for pair {
     fn default() -> Self {
         pair {

tests/unit/out/refcount/union_pointer_int_roundtrip.rs

@@ -53,10 +53,11 @@ fn main_0() -> i32 {
     (*u.borrow_mut())
         .p()
         .write(((arr.as_pointer() as Ptr<i32>).offset(1)));
-    let rhs_0 = ((((*u.borrow()).bits().read()) as u64)
-        .wrapping_add(((2_usize).wrapping_mul((::std::mem::size_of::<i32>() as usize)) as u64)))
-        as u64;
-    (*u.borrow_mut()).bits().write(rhs_0);
+    {
+        let rhs_0 = ((*u.borrow()).bits().read())
+            .wrapping_add(((2_usize).wrapping_mul((::std::mem::size_of::<i32>() as usize)) as u64));
+        (*u.borrow_mut()).bits().write(rhs_0)
+    };
     let q: Value<Ptr<i32>> = Rc::new(RefCell::new(((*u.borrow()).p().read()).clone()));
     assert!((((((*q.borrow()).read()) == 40) as i32) != 0));
     assert!(
@@ -66,10 +67,11 @@ fn main_0() -> i32 {
         }) as i32)
             != 0)
     );
-    let rhs_0 = ((((*u.borrow()).bits().read()) as u64)
-        .wrapping_sub(((3_usize).wrapping_mul((::std::mem::size_of::<i32>() as usize)) as u64)))
-        as u64;
-    (*u.borrow_mut()).bits().write(rhs_0);
+    {
+        let rhs_0 = ((*u.borrow()).bits().read())
+            .wrapping_sub(((3_usize).wrapping_mul((::std::mem::size_of::<i32>() as usize)) as u64));
+        (*u.borrow_mut()).bits().write(rhs_0)
+    };
     assert!(
         ((({
             let _lhs = ((*u.borrow()).p().read()).clone();

tests/unit/out/refcount/union_struct_pointer_roundtrip.rs

@@ -11,6 +11,14 @@ pub struct pair {
     pub x: Value<i32>,
     pub y: Value<i32>,
 }
+impl Clone for pair {
+    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 pair {
     fn byte_size() -> usize {
         8
@@ -87,8 +95,10 @@ fn main_0() -> i32 {
         }) as i32)
             != 0)
     );
-    let rhs_0 = ((((*u.borrow()).bits().read()) as u64).wrapping_add((8usize as u64))) as u64;
-    (*u.borrow_mut()).bits().write(rhs_0);
+    {
+        let rhs_0 = ((*u.borrow()).bits().read()).wrapping_add((8usize as u64));
+        (*u.borrow_mut()).bits().write(rhs_0)
+    };
     assert!(((((*(*((*u.borrow()).p().read()).upgrade().deref()).x.borrow()) == 30) as i32) != 0));
     assert!(
         ((({
@@ -97,9 +107,11 @@ fn main_0() -> i32 {
         }) as i32)
             != 0)
     );
-    let rhs_0 = ((((*u.borrow()).bits().read()) as u64)
-        .wrapping_sub(((2_usize).wrapping_mul((8usize as usize)) as u64))) as u64;
-    (*u.borrow_mut()).bits().write(rhs_0);
+    {
+        let rhs_0 = ((*u.borrow()).bits().read())
+            .wrapping_sub(((2_usize).wrapping_mul((8usize as usize)) as u64));
+        (*u.borrow_mut()).bits().write(rhs_0)
+    };
     assert!(((((*(*((*u.borrow()).p().read()).upgrade().deref()).x.borrow()) == 10) as i32) != 0));
     assert!(
         ((({

tests/unit/out/unsafe/union_pointer_int_roundtrip.rs

@@ -26,15 +26,13 @@ unsafe fn main_0() -> i32 {
     };
     let mut u: anon_0 = <anon_0>::default();
     u.p = (&mut arr[(1) as usize] as *mut i32);
-    u.bits = ((u.bits as u64)
-        .wrapping_add(((2_usize).wrapping_mul((::std::mem::size_of::<i32>() as usize)) as u64)))
-        as u64;
+    u.bits = (u.bits)
+        .wrapping_add(((2_usize).wrapping_mul((::std::mem::size_of::<i32>() as usize)) as u64));
     let mut q: *mut i32 = u.p;
     assert!(((((*q) == (40)) as i32) != 0));
     assert!(((((q) == (&mut arr[(3) as usize] as *mut i32)) as i32) != 0));
-    u.bits = ((u.bits as u64)
-        .wrapping_sub(((3_usize).wrapping_mul((::std::mem::size_of::<i32>() as usize)) as u64)))
-        as u64;
+    u.bits = (u.bits)
+        .wrapping_sub(((3_usize).wrapping_mul((::std::mem::size_of::<i32>() as usize)) as u64));
     assert!(((((u.p) == (&mut arr[(0) as usize] as *mut i32)) as i32) != 0));
     assert!(((((*u.p) == (10)) as i32) != 0));
     u.p = arr.as_mut_ptr().offset((4) as isize);

tests/unit/out/unsafe/union_struct_pointer_roundtrip.rs

@@ -38,12 +38,11 @@ unsafe fn main_0() -> i32 {
     let mut q: *mut pair = u.p;
     assert!((((((*q).x) == (20)) as i32) != 0));
     assert!(((((q) == (&mut arr[(1) as usize] as *mut pair)) as i32) != 0));
-    u.bits = ((u.bits as u64).wrapping_add((::std::mem::size_of::<pair>() as u64))) as u64;
+    u.bits = (u.bits).wrapping_add((::std::mem::size_of::<pair>() as u64));
     assert!((((((*u.p).x) == (30)) as i32) != 0));
     assert!(((((u.p) == (&mut arr[(2) as usize] as *mut pair)) as i32) != 0));
-    u.bits = ((u.bits as u64)
-        .wrapping_sub(((2_usize).wrapping_mul((::std::mem::size_of::<pair>() as usize)) as u64)))
-        as u64;
+    u.bits = (u.bits)
+        .wrapping_sub(((2_usize).wrapping_mul((::std::mem::size_of::<pair>() as usize)) as u64));
     assert!((((((*u.p).x) == (10)) as i32) != 0));
     assert!(((((u.p) == (&mut arr[(0) as usize] as *mut pair)) as i32) != 0));
     return 0;

tests/unit/unconst.cpp

@@ -1,4 +1,3 @@
-// panic: refcount
 #include <assert.h>
 #include <stdint.h>