Drop useless clones for receiver

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -5130,6 +5130,9 @@ std::string Converter::ConvertPlaceholder(clang::Expr *expr, clang::Expr *arg,
 
   if (ph_ctx.needs_pointer_receiver()) {
     auto param_type = Mapper::GetParamType(*this, expr, ph_ctx.arg_idx);
+    bool borrowed = ph_ctx.access == TranslationRule::Access::kBorrow ||
+                    ph_ctx.access == TranslationRule::Access::kBorrowMut;
+    PushExprKind push(*this, borrowed ? ExprKind::Object : ExprKind::XValue);
     return ConvertPointerReceiver(arg, param_type);
   }
 

cpp2rust/converter/models/converter_refcount.cpp

@@ -401,7 +401,7 @@ std::string ConverterRefCount::AsPointerMethod(clang::QualType type) const {
 
 std::string ConverterRefCount::ConvertPointerReceiver(clang::Expr *arg,
                                                       std::string_view) {
-  return ConvertFreshObject(arg);
+  return isObject() ? ConvertObject(arg) : ConvertFreshObject(arg);
 }
 
 std::string ConverterRefCount::ConvertFreshObject(clang::Expr *expr) {

rule-preprocessor/src/syntactic.rs

@@ -216,7 +216,9 @@ impl<'a> FragmentCtx<'a> {
                     });
                     return;
                 }
-                let mut access = self.builder.classify_access(token);
+                let mut access = self
+                    .builder
+                    .classify_access(token, param.is_refcount_pointer);
                 if param.is_mut_ref && self.text_buf.ends_with('*') {
                     self.text_buf.pop();
                 }
@@ -392,7 +394,7 @@ impl<'a> FnIrBuilder<'a> {
         generics
     }
 
-    fn classify_rw_from_name_ref(&self, name_ref: &ast::NameRef) -> Access {
+    fn classify_rw_from_name_ref(&self, name_ref: &ast::NameRef, is_ptr: bool) -> Access {
         name_ref
             .syntax()
             .ancestors()
@@ -425,7 +427,8 @@ impl<'a> FnIrBuilder<'a> {
                                 {
                                     return None;
                                 }
-                            Some(Access::Unknown)
+                            // Every Ptr method takes &self.
+                            Some(if is_ptr { Access::Borrow } else { Access::Unknown })
                         },
                         ast::ReturnExpr(_) => {
                             panic!("return statements are not supported in rule bodies");
@@ -461,12 +464,12 @@ impl<'a> FnIrBuilder<'a> {
             .is_some_and(|ty| matches!(ty, ast::Type::RefType(r) if r.mut_token().is_some()))
     }
 
-    fn classify_access(&self, token: &ra_ap_syntax::SyntaxToken) -> Access {
+    fn classify_access(&self, token: &ra_ap_syntax::SyntaxToken, is_ptr: bool) -> Access {
         let Some(name_ref) = token.parent().and_then(ast::NameRef::cast) else {
             // Inside a macro invocation. Phase 2 will resolve this.
             return Access::Unknown;
         };
-        self.classify_rw_from_name_ref(&name_ref)
+        self.classify_rw_from_name_ref(&name_ref, is_ptr)
     }
 
     fn trim_whitespaces(fragments: &mut Vec<BodyFragment>) {

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

@@ -8,7 +8,7 @@ use std::os::fd::AsFd;
 use std::rc::{Rc, Weak};
 pub fn change_0(n: Ptr<Option<Value<i32>>>) {
     let m: Value<Option<Value<i32>>> = Rc::new(RefCell::new(Some(Rc::new(RefCell::new(20)))));
-    (n).clone().write((*m.borrow_mut()).take());
+    n.write((*m.borrow_mut()).take());
     assert!(((*m.borrow()).as_pointer()).is_null());
 }
 pub fn main() {

tests/unit/out/refcount/alloc_array.rs

@@ -19,7 +19,7 @@ pub fn All_0(arr: Ptr<Option<Value<Box<[i32]>>>>, mut N: i32, mut element: i32)
             .write(element);
         i.prefix_inc();
     }
-    (arr).clone().write((*all.borrow_mut()).take());
+    arr.write((*all.borrow_mut()).take());
 }
 pub fn Consume_1(mut arr: Option<Value<Box<[i32]>>>, mut N: i32) -> i32 {
     let mut sum: i32 = 0;

tests/unit/out/refcount/foreach_double.rs

@@ -80,9 +80,7 @@ fn main_0() -> i32 {
     'loop_: for row in IterRange::new(m.as_pointer().decay().begin(), m.as_pointer().decay().end())
     {
         let row: Ptr<Vec<i32>> = row.iter_deref();
-        'loop_: for col in
-            IterRange::new((row).clone().decay().begin(), (row).clone().decay().end())
-        {
+        'loop_: for col in IterRange::new(row.decay().begin(), row.decay().end()) {
             let col: Ptr<i32> = col.iter_deref();
             square += { (col.read()) };
         }

tests/unit/out/refcount/implicit_autoref.rs

@@ -49,7 +49,7 @@ fn main_0() -> i32 {
     assert!(((index!(p, 1_usize).read()) == 30));
     assert!((b == 40));
     assert!(((vec_elem!((hp), v, 1_usize).read()) == 60));
-    ({ write_through_0(((p).clone().decay().offset(0_usize as isize))) });
+    ({ write_through_0((p.decay().offset(0_usize as isize))) });
     assert!(((index!(p, 0_usize).read()) == 42));
     return 0;
 }

tests/unit/out/refcount/map.rs

@@ -423,10 +423,7 @@ fn main_0() -> i32 {
             != m.as_pointer()
                 .with(|__m: &Map<i16, (Value<i16>, Value<u32>)>| __m.end())
     );
-    (r).clone()
-        .with_mut(|__m: &mut Map<i16, (Value<i16>, Value<u32>)>| {
-            __m.erase(&(*it4.borrow()).clone())
-        });
+    r.with_mut(|__m: &mut Map<i16, (Value<i16>, Value<u32>)>| __m.erase(&(*it4.borrow()).clone()));
     assert!(((*r.upgrade().deref()).len() == 3_usize));
     assert!(
         m.as_pointer()

tests/unit/out/refcount/push_emplace_back.rs

@@ -99,7 +99,7 @@ pub fn nested_emplace_move_5(mut bw: Ptr<Writer>) {
 }
 pub fn self_ref_push_6(mut comps: Ptr<Vec<Chunk>>) {
     {
-        let a0_clone = (*(comps).clone().decay().upgrade().deref()).clone();
+        let a0_clone = (*comps.decay().upgrade().deref()).clone();
         comps.with_mut(|__v: &mut Vec<Chunk>| __v.push(a0_clone))
     };
 }

tests/unit/out/refcount/references2.rs

@@ -8,7 +8,7 @@ use std::os::fd::AsFd;
 use std::rc::{Rc, Weak};
 pub fn change_0(p: Ptr<Option<Value<i32>>>) {
     let q: Value<Option<Value<i32>>> = Rc::new(RefCell::new(Some(Rc::new(RefCell::new(7)))));
-    (p).clone().write((*q.borrow_mut()).take());
+    p.write((*q.borrow_mut()).take());
 }
 pub fn main() {
     __cpp2rust_init_globals();