Remove more clones

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -669,7 +669,7 @@ bool Converter::RecordDerivesDefault(const clang::RecordDecl *decl) {
   return true;
 }
 
-bool Converter::RecordDerivesCopy(const clang::RecordDecl *decl) {
+bool Converter::RecordDerivesCopy(const clang::RecordDecl *decl) const {
   auto *derives = Mapper::MappedDerives(ctx_.getCanonicalTagType(decl));
   return derives &&
          std::find(derives->begin(), derives->end(), "Copy") != derives->end();
@@ -4394,15 +4394,8 @@ void Converter::SetFresh() {
   }
 }
 
-static bool hasCopyTrait(clang::QualType type) {
-  if (type->isBuiltinType())
-    return true;
-
-  return false;
-}
-
 void Converter::SetValueFreshness(clang::QualType type) {
-  if (hasCopyTrait(type)) {
+  if (TypeIsCopyable(type)) {
     computed_expr_type_ = ComputedExprType::FreshValue;
   } else if (type->isPointerType() || type->isReferenceType()) {
     computed_expr_type_ = ComputedExprType::Pointer;

cpp2rust/converter/converter.h

@@ -279,7 +279,13 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
     if (ty->isFunctionPointerType() || ty->isFunctionType()) {
       return FunctionPointerImplementsCopy();
     }
-    return ty->isIntegerType();
+    if (ty->isBuiltinType() || ty->isEnumeralType()) {
+      return true;
+    }
+    if (auto *record = ty->getAsRecordDecl()) {
+      return RecordDerivesCopy(record);
+    }
+    return false;
   }
 
   virtual void ConvertPrintf(clang::CallExpr *expr);
@@ -602,7 +608,7 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
 
   virtual bool RecordDerivesDefault(const clang::RecordDecl *decl);
 
-  bool RecordDerivesCopy(const clang::RecordDecl *decl);
+  bool RecordDerivesCopy(const clang::RecordDecl *decl) const;
 
   bool RecordHasCopyableFields(const clang::RecordDecl *decl);
 

cpp2rust/converter/models/converter_refcount.cpp

@@ -2391,7 +2391,7 @@ void ConverterRefCount::ConvertDeref(clang::Expr *expr) {
     Convert(expr);
     if (deref) {
       StrCat(GetPointerDerefSuffix(pointee_type));
-      SetValueFreshness(expr->getType());
+      SetValueFreshness(pointee_type);
     }
   }
 

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

@@ -71,5 +71,5 @@ impl ByteRepr for widget_enum {
 }
 pub fn b_value_1() -> i32 {
     let w: Value<widget_enum> = Rc::new(RefCell::new(widget_enum::WIDGET_C));
-    return ((*w.borrow()) as i32).clone();
+    return ((*w.borrow()) as i32);
 }

tests/unit/out/refcount/anonymous_enum.rs

@@ -136,7 +136,7 @@ impl Clone for WithAnonField {
     fn clone(&self) -> Self {
         let mut this = Self {
             a: Rc::new(RefCell::new((*self.a.borrow()))),
-            field: Rc::new(RefCell::new((*self.field.borrow()).clone())),
+            field: Rc::new(RefCell::new((*self.field.borrow()))),
         };
         this
     }

tests/unit/out/refcount/bool_condition_enum.rs

@@ -52,7 +52,7 @@ fn main_0() -> i32 {
     }
     let t9: Value<i32> = Rc::new(RefCell::new((!((*code.borrow()) != Code::from(0)) as i32)));
     assert!(((*t9.borrow()) == 1));
-    let b4: Value<bool> = Rc::new(RefCell::new(((*code.borrow()) != Code::from(0)).clone()));
+    let b4: Value<bool> = Rc::new(RefCell::new(((*code.borrow()) != Code::from(0))));
     assert!(!(*b4.borrow()));
     return 0;
 }

tests/unit/out/refcount/bool_condition_enum_c.rs

@@ -52,7 +52,7 @@ fn main_0() -> i32 {
     }
     let t9: Value<i32> = Rc::new(RefCell::new((!((*code.borrow()) != Code::from(0)) as i32)));
     assert!(((((*t9.borrow()) == 1) as i32) != 0));
-    let b4: Value<bool> = Rc::new(RefCell::new(((*code.borrow()) != Code::from(0)).clone()));
+    let b4: Value<bool> = Rc::new(RefCell::new(((*code.borrow()) != Code::from(0))));
     assert!(((!(*b4.borrow()) as i32) != 0));
     return 0;
 }

tests/unit/out/refcount/enum_int_interop.rs

@@ -96,8 +96,8 @@ impl Clone for Entry {
     fn clone(&self) -> Self {
         let mut this = Self {
             name: Rc::new(RefCell::new((*self.name.borrow()).clone())),
-            color: Rc::new(RefCell::new((*self.color.borrow()).clone())),
-            opt: Rc::new(RefCell::new((*self.opt.borrow()).clone())),
+            color: Rc::new(RefCell::new((*self.color.borrow()))),
+            opt: Rc::new(RefCell::new((*self.opt.borrow()))),
         };
         this
     }
@@ -149,7 +149,7 @@ thread_local!(
 );
 pub fn as_int_4(c: Color) -> i32 {
     let c: Value<Color> = Rc::new(RefCell::new(c));
-    return ((*c.borrow()) as i32).clone();
+    return ((*c.borrow()) as i32);
 }
 pub fn classify_option_5(option: i32) -> i32 {
     let option: Value<i32> = Rc::new(RefCell::new(option));
@@ -207,7 +207,7 @@ fn main_0() -> i32 {
             }
         }
     };
-    let x: Value<i32> = Rc::new(RefCell::new(((*c.borrow()) as i32).clone()));
+    let x: Value<i32> = Rc::new(RefCell::new(((*c.borrow()) as i32)));
     assert!(((*x.borrow()) == 0));
     let y: Value<i32> = Rc::new(RefCell::new((((*c.borrow()) as i32) + 1)));
     assert!(((*y.borrow()) == 1));
@@ -221,12 +221,12 @@ fn main_0() -> i32 {
     let o: Value<Option> = Rc::new(RefCell::new(Option::OPT_A));
     assert!((((*o.borrow()) as i32) == (Option::OPT_A as i32)));
     assert!((((*o.borrow()) as i32) == 10));
-    let oi: Value<i32> = Rc::new(RefCell::new(((*o.borrow()) as i32).clone()));
+    let oi: Value<i32> = Rc::new(RefCell::new(((*o.borrow()) as i32)));
     assert!(((*oi.borrow()) == 10));
     (*o.borrow_mut()) = Option::from(20);
     assert!((((*o.borrow()) as i32) == (Option::OPT_B as i32)));
     let rc: Value<i32> = Rc::new(RefCell::new(
-        ({ classify_option_5(((*o.borrow()) as i32).clone()) }),
+        ({ classify_option_5(((*o.borrow()) as i32)) }),
     ));
     assert!(((*rc.borrow()) == 2));
     (*rc.borrow_mut()) = ({ classify_option_5(20) });
@@ -236,7 +236,7 @@ fn main_0() -> i32 {
     let t: Value<Tag> = Rc::new(RefCell::new(Tag::TAG_ONE));
     assert!((((*t.borrow()) as i32) == 1));
     assert!((((*t.borrow()) as i32) == (Tag::TAG_ONE as i32)));
-    let ti: Value<i32> = Rc::new(RefCell::new(((*t.borrow()) as i32).clone()));
+    let ti: Value<i32> = Rc::new(RefCell::new(((*t.borrow()) as i32)));
     assert!(((*ti.borrow()) == 1));
     (*t.borrow_mut()) = Tag::from(2);
     assert!((((*t.borrow()) as i32) == (Tag::TAG_TWO as i32)));

tests/unit/out/refcount/enum_int_interop_c.rs

@@ -148,7 +148,7 @@ thread_local!(
 );
 pub fn as_int_4(c: Color) -> i32 {
     let c: Value<Color> = Rc::new(RefCell::new(c));
-    return ((*c.borrow()) as i32).clone();
+    return ((*c.borrow()) as i32);
 }
 pub fn classify_option_5(option: i32) -> i32 {
     let option: Value<i32> = Rc::new(RefCell::new(option));
@@ -206,7 +206,7 @@ fn main_0() -> i32 {
             }
         }
     };
-    let x: Value<i32> = Rc::new(RefCell::new(((*c.borrow()) as i32).clone()));
+    let x: Value<i32> = Rc::new(RefCell::new(((*c.borrow()) as i32)));
     assert!(((((*x.borrow()) == 0) as i32) != 0));
     let y: Value<i32> = Rc::new(RefCell::new(
         ((((*c.borrow()) as u32).wrapping_add(1_u32)) as i32),
@@ -224,12 +224,12 @@ fn main_0() -> i32 {
     let o: Value<Option> = Rc::new(RefCell::new(Option::OPT_A));
     assert!((((((*o.borrow()) as u32) == ((Option::OPT_A as i32) as u32)) as i32) != 0));
     assert!((((((*o.borrow()) as u32) == 10_u32) as i32) != 0));
-    let oi: Value<i32> = Rc::new(RefCell::new(((*o.borrow()) as i32).clone()));
+    let oi: Value<i32> = Rc::new(RefCell::new(((*o.borrow()) as i32)));
     assert!(((((*oi.borrow()) == 10) as i32) != 0));
     (*o.borrow_mut()) = Option::from(20);
     assert!((((((*o.borrow()) as u32) == ((Option::OPT_B as i32) as u32)) as i32) != 0));
     let rc: Value<i32> = Rc::new(RefCell::new(
-        ({ classify_option_5(((*o.borrow()) as i32).clone()) }),
+        ({ classify_option_5(((*o.borrow()) as i32)) }),
     ));
     assert!(((((*rc.borrow()) == 2) as i32) != 0));
     (*rc.borrow_mut()) = ({ classify_option_5(20) });
@@ -239,7 +239,7 @@ fn main_0() -> i32 {
     let t: Value<Tag_enum> = Rc::new(RefCell::new(Tag_enum::TAG_ONE));
     assert!((((((*t.borrow()) as u32) == 1_u32) as i32) != 0));
     assert!((((((*t.borrow()) as u32) == ((Tag_enum::TAG_ONE as i32) as u32)) as i32) != 0));
-    let ti: Value<i32> = Rc::new(RefCell::new(((*t.borrow()) as i32).clone()));
+    let ti: Value<i32> = Rc::new(RefCell::new(((*t.borrow()) as i32)));
     assert!(((((*ti.borrow()) == 1) as i32) != 0));
     (*t.borrow_mut()) = Tag_enum::from(2);
     assert!((((((*t.borrow()) as u32) == ((Tag_enum::TAG_TWO as i32) as u32)) as i32) != 0));