Update tests

Author: lucic71

tests/ub/out/refcount/ub6.rs

@@ -31,18 +31,22 @@ pub fn fill_1(arr: Ptr<Option<Value<Box<[Ptr<i32>]>>>>, n1: Ptr<i32>) {
             mkPair_0(_x1, _x2)
         }),
     ));
-    (*arr.upgrade().deref()).as_ref().unwrap().borrow_mut()[(0_usize) as usize] =
-        ({ (*pair.borrow()).x1.clone() }).clone();
-    (*arr.upgrade().deref()).as_ref().unwrap().borrow_mut()[(1_usize) as usize] =
-        ({ (*pair.borrow()).x2.clone() }).clone();
+    ((*arr.upgrade().deref()).as_pointer() as Ptr<Ptr<i32>>)
+        .offset(0_usize as isize)
+        .write(({ (*pair.borrow()).x1.clone() }).clone());
+    ((*arr.upgrade().deref()).as_pointer() as Ptr<Ptr<i32>>)
+        .offset(1_usize as isize)
+        .write(({ (*pair.borrow()).x2.clone() }).clone());
 }
 pub fn any_2(arr: Ptr<Option<Value<Box<[Ptr<i32>]>>>>, n1: Ptr<i32>) -> bool {
     let mut out: bool = false;
     let mut i: i32 = 0;
     'loop_: while ({ i } < { (n1.read()) }) {
         let __rhs = (out)
-            || (((*arr.upgrade().deref()).as_ref().unwrap().borrow()[(i as usize) as usize]
+            || (((((*arr.upgrade().deref()).as_pointer() as Ptr<Ptr<i32>>)
+                .offset((i as usize) as isize)
                 .read())
+            .read())
                 == 0);
         out = __rhs;
         i.prefix_inc();

tests/ub/out/unsafe/ub6.rs

@@ -22,14 +22,25 @@ pub unsafe fn fill_1(arr: *mut Option<Box<[*mut i32]>>, n1: *mut i32) {
         let _x2: *mut i32 = &mut n2;
         mkPair_0(_x1, _x2)
     });
-    (*arr).as_mut().unwrap()[(0_usize)] = (pair.x1);
-    (*arr).as_mut().unwrap()[(1_usize)] = (pair.x2);
+    (*(*arr)
+        .as_deref()
+        .map_or(::std::ptr::null_mut(), |s| s.as_ptr() as *mut *mut i32)
+        .add(0_usize)) = (pair.x1);
+    (*(*arr)
+        .as_deref()
+        .map_or(::std::ptr::null_mut(), |s| s.as_ptr() as *mut *mut i32)
+        .add(1_usize)) = (pair.x2);
 }
 pub unsafe fn any_2(arr: *mut Option<Box<[*mut i32]>>, n1: *mut i32) -> bool {
     let mut out: bool = false;
     let mut i: i32 = 0;
     'loop_: while ((i) < (*n1)) {
-        out = (out) || ((*(*arr).as_mut().unwrap()[(i as usize)]) == (0));
+        out = (out)
+            || ((*(*(*arr)
+                .as_deref()
+                .map_or(::std::ptr::null_mut(), |s| s.as_ptr() as *mut *mut i32)
+                .add((i as usize))))
+                == (0));
         i.prefix_inc();
     }
     return out;

tests/unit/out/refcount/07_unique.rs

@@ -7,7 +7,7 @@ use std::io::{Read, Seek, Write};
 use std::os::fd::AsFd;
 use std::rc::{Rc, Weak};
 pub fn fn_0(mut u: Option<Value<i32>>) -> Option<Value<i32>> {
-    (*u.as_ref().unwrap().borrow_mut()) = 10;
+    u.as_pointer().write(10);
     return u.take();
 }
 pub fn main() {
@@ -16,14 +16,14 @@ pub fn main() {
 }
 fn main_0() -> i32 {
     let f: Value<Option<Value<i32>>> = Rc::new(RefCell::new(Some(Rc::new(RefCell::new(8)))));
-    (*(*f.borrow()).as_ref().unwrap().borrow_mut()) = 9;
+    (*f.borrow()).as_pointer().write(9);
     let mut f_ptr1: Ptr<i32> = (*f.borrow()).as_pointer();
     f_ptr1.write(10);
     let mut f_ptr2: Ptr<i32> = ((*f.borrow()).as_pointer());
     f_ptr2.write(11);
     (f.as_pointer() as Ptr<Option<Value<i32>>>).write(Some(Rc::new(RefCell::new(9))).take());
     (f.as_pointer() as Ptr<Option<Value<i32>>>).write(({ fn_0((*f.borrow_mut()).take()) }).take());
-    assert!(((*(*f.borrow()).as_ref().unwrap().borrow()) == 10));
+    assert!((((*f.borrow()).as_pointer().read()) == 10));
     return 0;
 }
 pub fn __cpp2rust_init_globals() {}

tests/unit/out/refcount/08_unique_array.rs

@@ -14,14 +14,18 @@ fn main_0() -> i32 {
     let mut g: Option<Value<Box<[i32]>>> = Some(Rc::new(RefCell::new(
         (0..2_usize).map(|_| <i32>::default()).collect::<Box<[_]>>(),
     )));
-    g.as_ref().unwrap().borrow_mut()[(0_usize) as usize] = 11;
-    g.as_ref().unwrap().borrow_mut()[(1_usize) as usize] = 12;
+    (g.as_pointer() as Ptr<i32>)
+        .offset(0_usize as isize)
+        .write(11);
+    (g.as_pointer() as Ptr<i32>)
+        .offset(1_usize as isize)
+        .write(12);
     let mut g_ptr: Ptr<i32> = g.as_pointer();
     elem!(g_ptr, 0).write(13);
     elem!(g_ptr, 1).write(14);
     assert!(
-        ((g.as_ref().unwrap().borrow()[(0_usize) as usize]
-            + g.as_ref().unwrap().borrow()[(1_usize) as usize])
+        ((((g.as_pointer() as Ptr<i32>).offset(0_usize as isize).read())
+            + ((g.as_pointer() as Ptr<i32>).offset(1_usize as isize).read()))
             == 27)
     );
     return 0;

tests/unit/out/refcount/11_move.rs

@@ -18,7 +18,7 @@ pub fn main() {
 fn main_0() -> i32 {
     let n: Value<Option<Value<i32>>> = Rc::new(RefCell::new(Some(Rc::new(RefCell::new(10)))));
     ({ change_0(n.as_pointer()) });
-    assert!(((*(*n.borrow()).as_ref().unwrap().borrow()) == 20));
+    assert!((((*n.borrow()).as_pointer().read()) == 20));
     return 0;
 }
 pub fn __cpp2rust_init_globals() {}

tests/unit/out/refcount/alloc_array.rs

@@ -14,7 +14,9 @@ pub fn All_0(arr: Ptr<Option<Value<Box<[i32]>>>>, mut N: i32, mut element: i32)
     )))));
     let mut i: i32 = 0;
     'loop_: while (i < N) {
-        (*all.borrow()).as_ref().unwrap().borrow_mut()[(i as usize) as usize] = element;
+        ((*all.borrow()).as_pointer() as Ptr<i32>)
+            .offset((i as usize) as isize)
+            .write(element);
         i.prefix_inc();
     }
     ((arr).clone() as Ptr<Option<Value<Box<[i32]>>>>).write((*all.borrow_mut()).take());
@@ -23,7 +25,9 @@ pub fn Consume_1(mut arr: Option<Value<Box<[i32]>>>, mut N: i32) -> i32 {
     let mut sum: i32 = 0;
     let mut i: i32 = -1_i32;
     'loop_: while (i.prefix_inc() < N) {
-        sum += arr.as_ref().unwrap().borrow()[(i as usize) as usize];
+        sum += ((arr.as_pointer() as Ptr<i32>)
+            .offset((i as usize) as isize)
+            .read());
     }
     return sum;
 }

tests/unit/out/refcount/copy_move_defaulted.rs

@@ -379,7 +379,7 @@ fn main_0() -> i32 {
     assert!(
         ((({ (*o2.borrow()).n } == 5) && ((*o2.borrow()).data.len() == 1_usize))
             && ((array_elem!(o2.as_pointer(), arr, 1).read()) == 6))
-            && ((*{ (*o2.borrow()).p.clone() }.as_ref().unwrap().borrow()) == 7)
+            && (({ (*o2.borrow()).p.clone() }.as_pointer().read()) == 7)
     );
     assert!(
         ((*o1.borrow()).data.is_empty()) && (({ (*o1.borrow()).p.clone() }.as_pointer()).is_null())
@@ -390,7 +390,7 @@ fn main_0() -> i32 {
         ((({ (*o3.borrow()).n } == 5)
             && ((vec_elem!(o3.as_pointer(), data, 0_usize).read()) == 5))
             && ((array_elem!(o3.as_pointer(), arr, 0).read()) == 5))
-            && ((*{ (*o3.borrow()).p.clone() }.as_ref().unwrap().borrow()) == 7)
+            && (({ (*o3.borrow()).p.clone() }.as_pointer().read()) == 7)
     );
     assert!(
         ((*o2.borrow()).data.is_empty()) && (({ (*o2.borrow()).p.clone() }.as_pointer()).is_null())
@@ -405,7 +405,7 @@ fn main_0() -> i32 {
     let _dtor_h2 = ScopedDestructor::new(&h2, |__p| __p.destructor());
     assert!(
         ((({ (*h2.borrow()).inner.x } == 4) && ({ (*h2.borrow()).e.v } == 4))
-            && ((*{ (*h2.borrow()).p.clone() }.as_ref().unwrap().borrow()) == 9))
+            && (({ (*h2.borrow()).p.clone() }.as_pointer().read()) == 9))
             && (({ (*h1.borrow()).p.clone() }.as_pointer()).is_null())
     );
     let h3: Value<Holder> = Rc::new(RefCell::new(Holder::new({ 1 })));
@@ -414,7 +414,7 @@ fn main_0() -> i32 {
     assert!(
         ((({ (*h3.borrow()).inner.x } == 4)
             && ((array_elem!(field_ptr!(h3.as_pointer(), e), arr, 1).read()) == 5))
-            && ((*{ (*h3.borrow()).p.clone() }.as_ref().unwrap().borrow()) == 9))
+            && (({ (*h3.borrow()).p.clone() }.as_pointer().read()) == 9))
             && (({ (*h2.borrow()).p.clone() }.as_pointer()).is_null())
     );
     return 0;