Renames and fixes

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -1703,8 +1703,8 @@ bool Converter::VisitCallExpr(clang::CallExpr *expr) {
       computed_expr_type_ = ComputedExprType::FreshValue;
       return false;
     }
-    computed_expr_type_ = ComputedExprType::FreshValue;
     StrCat(std::format("{}", ToString(expr->getArg(0))));
+    computed_expr_type_ = ComputedExprType::FreshValue;
     return false;
   }
 
@@ -3350,9 +3350,7 @@ bool Converter::VisitCXXConstructExpr(clang::CXXConstructExpr *expr) {
     // Take suppress before recursing into the child.
     bool suppress = PushSuppressIteratorClone::take(*this);
     Convert(expr->getArg(0));
-    bool clone =
-        ctor->isCopyConstructor() ||
-        (ctor->isMoveConstructor() && IsUserDefinedDecl(ctor->getParent()));
+    bool clone = ctor->isCopyConstructor() || IsDefaultedMoveConstructor(ctor);
     if (clone && !suppress && !TypeIsCopyable(expr->getType())) {
       StrCat(".clone()");
     }

cpp2rust/converter/converter_lib.cpp

@@ -269,12 +269,11 @@ bool IsUserDefinedCopyOrMoveConstructor(const clang::CXXConstructorDecl *ctor) {
 }
 
 bool IsDefaultedMoveConstructor(const clang::CXXConstructorDecl *ctor) {
-  return ctor->isMoveConstructor() &&
-         !IsUserDefinedCopyOrMoveConstructor(ctor) &&
+  return ctor->isMoveConstructor() && !ctor->isUserProvided() &&
          IsUserDefinedDecl(ctor->getParent());
 }
 
-bool IsCopyOrMoveSpecialMember(const clang::CXXMethodDecl *method) {
+bool IsCopyOrMoveAssignmentOrCtor(const clang::CXXMethodDecl *method) {
   if (const auto *ctor = clang::dyn_cast<clang::CXXConstructorDecl>(method)) {
     return ctor->isCopyOrMoveConstructor();
   }
@@ -349,7 +348,7 @@ bool IsConvertibleCXXRecordDecl(const clang::CXXRecordDecl *decl) {
                return method->getDefinition() || method->isPureVirtual() ||
                       method->getTemplateInstantiationPattern() ||
                       method->getDescribedFunctionTemplate() ||
-                      IsCopyOrMoveSpecialMember(method);
+                      IsCopyOrMoveAssignmentOrCtor(method);
              });
 }
 

cpp2rust/converter/converter_lib.h

@@ -69,7 +69,7 @@ bool IsUserDefinedCopyOrMoveConstructor(const clang::CXXConstructorDecl *ctor);
 
 bool IsDefaultedMoveConstructor(const clang::CXXConstructorDecl *ctor);
 
-bool IsCopyOrMoveSpecialMember(const clang::CXXMethodDecl *method);
+bool IsCopyOrMoveAssignmentOrCtor(const clang::CXXMethodDecl *method);
 
 clang::CXXConstructorDecl *
 GetUserDefinedCopyConstructor(const clang::RecordDecl *decl);

cpp2rust/converter/models/converter_refcount.cpp

@@ -1873,6 +1873,10 @@ bool ConverterRefCount::VisitCXXConstructExpr(clang::CXXConstructExpr *expr) {
     return false;
   }
 
+  // Default move is translated using a bitwise .clone() implementation.
+  // Bitwise clone is only satisfied by default copy constructor. If the copy
+  // constructor is user defined, then default move calls copy constructor,
+  // which is wrong.
   if (IsDefaultedMoveConstructor(ctor) &&
       !HasDefaultedCopyConstructor(ctor->getParent())) {
     llvm::report_fatal_error("defaulted move constructor without a fieldwise "