Fix accessor context

Author: lucic71

cpp2rust/converter/models/converter_refcount.cpp

@@ -1921,7 +1921,7 @@ void ConverterRefCount::ConvertUnionMemberAccessor(clang::MemberExpr *expr) {
   std::string str;
   {
     Buffer buf(*this);
-    PushExprKind push(*this, isLValue() ? ExprKind::LValue : ExprKind::RValue);
+    PushExprKind push(*this, ExprKind::RValue);
     Converter::ConvertMemberExpr(expr);
     str = std::move(buf).str();
   }

tests/unit/out/refcount/tag_vs_identifier_collision.rs

@@ -114,10 +114,10 @@ fn main_0() -> i32 {
     p.y = 4;
     assert!(((((p.x + p.y) == 7) as i32) != 0));
     let up: Value<point> = <Value<point>>::default();
-    (*up.borrow_mut()).whole().write(5);
+    (*up.borrow()).whole().write(5);
     assert!((((((*up.borrow()).whole().read()) == 5) as i32) != 0));
     let b: Value<slot_union> = <Value<slot_union>>::default();
-    (*b.borrow_mut()).i().write(9);
+    (*b.borrow()).i().write(9);
     assert!((((((*b.borrow()).i().read()) == 9) as i32) != 0));
     let mut e: slot = slot_SLOT_B;
     assert!(((((e as u32) == ((slot_SLOT_B as i32) as u32)) as i32) != 0));

tests/unit/out/refcount/union_basic.rs

@@ -51,10 +51,26 @@ fn main_0() -> i32 {
     let u: Value<basic> = Rc::new(RefCell::new(<basic>::default()));
     let e: Value<empty> = Rc::new(RefCell::new(<empty>::default()));
     &(*e.borrow_mut());
-    (*u.borrow_mut()).i().write(42);
+    (*u.borrow()).i().write(42);
     assert!((((*u.borrow()).i().read()) == 42));
-    (*u.borrow_mut()).f().write(3.140000105E+0);
+    (*u.borrow()).f().write(3.140000105E+0);
     assert!((((*u.borrow()).f().read()) == 3.140000105E+0));
+    let buf: Value<Box<[u8]>> = Rc::new(RefCell::new((0..4).map(|_| 0_u8).collect::<Box<[u8]>>()));
+    {
+        ((buf.as_pointer() as Ptr<u8>) as Ptr<u8>)
+            .to_any()
+            .memset((0) as u8, ::std::mem::size_of::<[u8; 4]>() as usize);
+        ((buf.as_pointer() as Ptr<u8>) as Ptr<u8>).to_any()
+    };
+    let mut ru: Ptr<basic> = (buf.as_pointer() as Ptr<u8>).reinterpret_cast::<basic>();
+    let mut pi: Ptr<i32> = ((*ru.upgrade().deref()).i()).clone();
+    let mut pf: Ptr<f32> = ((*ru.upgrade().deref()).f()).clone();
+    (*ru.upgrade().deref()).i().write(7);
+    assert!(((pi.read()) == 7));
+    pi.write(1065353216);
+    assert!((((*ru.upgrade().deref()).i().read()) == 1065353216));
+    assert!(((pf.read()) == 1.0E+0));
+    assert!((((*buf.borrow())[(3) as usize] as i32) == 63));
     return 0;
 }
 pub fn __cpp2rust_init_globals() {}

tests/unit/out/refcount/union_cross_arm_cast.rs

@@ -95,7 +95,7 @@ fn main_0() -> i32 {
             .memset((0) as u8, 68usize as usize);
         ((c.as_pointer()) as Ptr<Container>).to_any()
     };
-    field!((*c.borrow_mut()).u.a(), code).write(10_u16);
+    field!((*c.borrow()).u.a(), code).write(10_u16);
     (*c.borrow_mut()).len = (28usize as u32);
     field!(
         (((*c.borrow()).u.a()).to_any().reinterpret_cast::<shape_b>()),
@@ -104,7 +104,7 @@ fn main_0() -> i32 {
     .write(3735928559_u32);
     assert!(((((*c.borrow()).u.b().with(|__s| __s.tail) == 3735928559_u32) as i32) != 0));
     assert!((((((*c.borrow()).u.b().with(|__s| __s.code) as i32) == 10) as i32) != 0));
-    field!((*c.borrow_mut()).u.b(), lo).write(8080_u16);
+    field!((*c.borrow()).u.b(), lo).write(8080_u16);
     assert!(
         (((((elem!(
             ((((*c.borrow()).u.raw_().reinterpret_cast::<i8>()) as Ptr<i8>)

tests/unit/out/refcount/union_nested.rs

@@ -105,7 +105,7 @@ fn main_0() -> i32 {
     (*ex.borrow_mut()).level = 1;
     (*ex.borrow_mut()).variant = 6;
     (*ex.borrow_mut()).len = (16usize as u32);
-    field!((*ex.borrow_mut()).body.h(), code).write(2_u16);
+    field!((*ex.borrow()).body.h(), code).write(2_u16);
     elem!(
         (array_field_ptr!((*ex.borrow()).body.h(), pad) as Ptr::<i8>),
         0

tests/unit/out/refcount/union_pointer_pun_address.rs

@@ -29,7 +29,7 @@ pub fn main() {
 fn main_0() -> i32 {
     let a: Value<node_a> = Rc::new(RefCell::new(node_a { n: 123 }));
     let ptr: Value<anon_0> = <Value<anon_0>>::default();
-    (*ptr.borrow_mut()).to_a().write((a.as_pointer()));
+    (*ptr.borrow()).to_a().write((a.as_pointer()));
     let mut out: Ptr<node_b> = ((*ptr.borrow()).to_b().read());
     assert!(((({ (out).to_any() } == { (a.as_pointer()).to_any() }) as i32) != 0));
     return 0;

tests/unit/out/refcount/union_pointer_pun_writethrough.rs

@@ -13,7 +13,7 @@ pub fn main() {
 fn main_0() -> i32 {
     let x: Value<i64> = Rc::new(RefCell::new((-1_i32 as i64)));
     let pp: Value<anon_0> = <Value<anon_0>>::default();
-    (*pp.borrow_mut()).as_signed().write((x.as_pointer()));
+    (*pp.borrow()).as_signed().write((x.as_pointer()));
     ((*pp.borrow()).as_unsigned().read()).write(42_u64);
     assert!(((((*x.borrow()) == 42_i64) as i32) != 0));
     return 0;

tests/unit/out/refcount/union_struct_dual_use.rs

@@ -62,8 +62,8 @@ fn main_0() -> i32 {
             .memset((0) as u8, 16usize as usize);
         ((outer.as_pointer()) as Ptr<Outer>).to_any()
     };
-    field!((*outer.borrow_mut()).u.inner(), a).write(3);
-    field!((*outer.borrow_mut()).u.inner(), b).write(4);
+    field!((*outer.borrow()).u.inner(), a).write(3);
+    field!((*outer.borrow()).u.inner(), b).write(4);
     assert!((((({ sum_inner_0(((*outer.borrow()).u.inner()).clone(),) }) == 7) as i32) != 0));
     assert!(
         ((((((elem!(

tests/unit/out/refcount/union_void_ptr_sized_deref.rs

@@ -82,21 +82,21 @@ fn main_0() -> i32 {
     let buf16: Value<i16> = Rc::new(RefCell::new(0_i16));
     let s: Value<Sink> = <Value<Sink>>::default();
     (*s.borrow_mut()).width = Width_enum_W_64;
-    (*s.borrow_mut())
+    (*s.borrow())
         .out
         .handle()
         .write(((buf64.as_pointer()) as Ptr<i64>).to_any());
     ({ write_count_1((s.as_pointer()), 1234605616436508552_i64) });
     assert!(((((*buf64.borrow()) == 1234605616436508552_i64) as i32) != 0));
     (*s.borrow_mut()).width = Width_enum_W_32;
-    (*s.borrow_mut())
+    (*s.borrow())
         .out
         .handle()
         .write(((buf32.as_pointer()) as Ptr<i32>).to_any());
     ({ write_count_1((s.as_pointer()), 305419896_i64) });
     assert!(((((*buf32.borrow()) == 305419896) as i32) != 0));
     (*s.borrow_mut()).width = Width_enum_W_16;
-    (*s.borrow_mut())
+    (*s.borrow())
         .out
         .handle()
         .write(((buf16.as_pointer()) as Ptr<i16>).to_any());

tests/unit/out/refcount/va_arg_struct_ctx.rs

@@ -81,9 +81,9 @@ fn main_0() -> i32 {
     });
     assert!(((({ (*ctx.borrow()).last_error } == 42) as i32) != 0));
     let v: Value<value> = <Value<value>>::default();
-    (*v.borrow_mut()).l().write((1_i64 << 40));
+    (*v.borrow()).l().write((1_i64 << 40));
     assert!((((({ pick_1(1, &[((*v.borrow()).clone()).into(),]) }) == (1_i64 << 40)) as i32) != 0));
-    (*v.borrow_mut()).i().write(7);
+    (*v.borrow()).i().write(7);
     assert!((((({ pick_1(0, &[((*v.borrow()).clone()).into(),]) }) == 7_i64) as i32) != 0));
     return 0;
 }