Set freshness in VisitArrayInitIndexExpr

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -3232,6 +3232,7 @@ bool Converter::VisitOpaqueValueExpr(clang::OpaqueValueExpr *expr) {
 
 bool Converter::VisitArrayInitIndexExpr(clang::ArrayInitIndexExpr *expr) {
   StrCat("__i");
+  computed_expr_type_ = ComputedExprType::FreshValue;
   return false;
 }
 

tests/multi-file/defaulted_move_cross_tu/out/refcount/defaulted_move_cross_tu.rs

@@ -26,9 +26,9 @@ impl S {
     }
     pub fn S_pmutS(_a0: Ptr<S>) -> Self {
         let __this: Value<S> = Rc::new(RefCell::new(Self {
-            v: Rc::new(RefCell::new(std::mem::take(
-                &mut (*(*_a0.upgrade().deref()).v.borrow_mut()),
-            ))),
+            v: Rc::new(RefCell::new(
+                (std::mem::take(&mut (*(*_a0.upgrade().deref()).v.borrow_mut()))).clone(),
+            )),
             n: Rc::new(RefCell::new(Box::new(std::array::from_fn::<_, 2, _>(
                 |__i: usize| (*(*_a0.upgrade().deref()).n.borrow())[(__i) as usize],
             )))),
@@ -105,9 +105,7 @@ impl SImpl for Ptr<S> {
                     &(((*_a0.upgrade().deref()).n.as_pointer()) as Ptr<i32>).to_any(),
                     8_usize as usize,
                 );
-            (((*(*self).upgrade().deref()).n.as_pointer()) as Ptr<i32>)
-                .to_any()
-                .clone()
+            (((*(*self).upgrade().deref()).n.as_pointer()) as Ptr<i32>).to_any()
         };
         return (*self).clone();
     }

tests/unit/out/refcount/clone_vs_move.rs

@@ -46,7 +46,9 @@ impl Clone for Foo {
             x: Rc::new(RefCell::new((*self.x.borrow()))),
             y: (self.y).clone(),
             z: Rc::new(RefCell::new((*self.z.borrow()).clone())),
-            a: Rc::new(RefCell::new((*self.a.borrow()).clone())),
+            a: Rc::new(RefCell::new(Box::new(std::array::from_fn::<_, 3, _>(
+                |__i: usize| (*self.a.borrow())[(__i) as usize],
+            )))),
             bar: Rc::new(RefCell::new((*self.bar.borrow()).clone())),
         }));
         let this: Ptr<Foo> = __this.as_pointer();

tests/unit/out/refcount/copy_move_defaulted.rs

@@ -263,12 +263,12 @@ impl Buffer {
     }
     pub fn Buffer_pmutBuffer(_a0: Ptr<Buffer>) -> Self {
         let __this: Value<Buffer> = Rc::new(RefCell::new(Self {
-            data: Rc::new(RefCell::new(std::mem::take(
-                &mut (*(*_a0.upgrade().deref()).data.borrow_mut()),
-            ))),
-            rows: Rc::new(RefCell::new(std::mem::take(
-                &mut (*(*_a0.upgrade().deref()).rows.borrow_mut()),
-            ))),
+            data: Rc::new(RefCell::new(
+                (std::mem::take(&mut (*(*_a0.upgrade().deref()).data.borrow_mut()))).clone(),
+            )),
+            rows: Rc::new(RefCell::new(
+                (std::mem::take(&mut (*(*_a0.upgrade().deref()).rows.borrow_mut()))).clone(),
+            )),
             n: Rc::new(RefCell::new((*(*_a0.upgrade().deref()).n.borrow()))),
             arr: Rc::new(RefCell::new(Box::new(std::array::from_fn::<_, 2, _>(
                 |__i: usize| (*(*_a0.upgrade().deref()).arr.borrow())[(__i) as usize],
@@ -321,9 +321,9 @@ pub struct Owner {
 impl Owner {
     pub fn Owner_pmutOwner(_a0: Ptr<Owner>) -> Self {
         let __this: Value<Owner> = Rc::new(RefCell::new(Self {
-            data: Rc::new(RefCell::new(std::mem::take(
-                &mut (*(*_a0.upgrade().deref()).data.borrow_mut()),
-            ))),
+            data: Rc::new(RefCell::new(
+                (std::mem::take(&mut (*(*_a0.upgrade().deref()).data.borrow_mut()))).clone(),
+            )),
             n: Rc::new(RefCell::new((*(*_a0.upgrade().deref()).n.borrow()))),
             arr: Rc::new(RefCell::new(Box::new(std::array::from_fn::<_, 2, _>(
                 |__i: usize| (*(*_a0.upgrade().deref()).arr.borrow())[(__i) as usize],
@@ -727,9 +727,7 @@ impl BufferImpl for Ptr<Buffer> {
                     &(((*_a0.upgrade().deref()).arr.as_pointer()) as Ptr<i32>).to_any(),
                     8_usize as usize,
                 );
-            (((*(*self).upgrade().deref()).arr.as_pointer()) as Ptr<i32>)
-                .to_any()
-                .clone()
+            (((*(*self).upgrade().deref()).arr.as_pointer()) as Ptr<i32>).to_any()
         };
         return (*self).clone();
     }
@@ -792,9 +790,7 @@ impl OwnerImpl for Ptr<Owner> {
                     &(((*_a0.upgrade().deref()).arr.as_pointer()) as Ptr<i32>).to_any(),
                     8_usize as usize,
                 );
-            (((*(*self).upgrade().deref()).arr.as_pointer()) as Ptr<i32>)
-                .to_any()
-                .clone()
+            (((*(*self).upgrade().deref()).arr.as_pointer()) as Ptr<i32>).to_any()
         };
         ((*(*self).upgrade().deref()).p.as_pointer() as Ptr<Option<Value<i32>>>)
             .write((*(*_a0.upgrade().deref()).p.borrow_mut()).take());