Materialize temporary when calling method

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -2669,11 +2669,8 @@ void Converter::ConvertGenericBinaryOperator(clang::BinaryOperator *expr) {
 }
 
 bool Converter::IsReferenceType(const clang::Expr *expr) const {
-  const auto *e = expr->IgnoreCasts();
+  const auto *e = IgnoreStdMove(expr->IgnoreCasts())->IgnoreCasts();
   if (const auto *call = clang::dyn_cast<clang::CallExpr>(e)) {
-    if (call->isCallToStdMove()) {
-      return IsReferenceType(call->getArg(0));
-    }
     return !clang::isa<clang::CXXOperatorCallExpr>(call) &&
            GetReturnTypeOfFunction(call)->isReferenceType();
   }

cpp2rust/converter/converter_lib.cpp

@@ -1347,6 +1347,25 @@ bool IsBuiltinVaCopy(const clang::CallExpr *expr) {
   return false;
 }
 
+const clang::Expr *IgnoreStdMove(const clang::Expr *expr) {
+  while (true) {
+    const auto *call =
+        clang::dyn_cast<clang::CallExpr>(expr->IgnoreParenImpCasts());
+    if (!call || !call->isCallToStdMove()) {
+      return expr;
+    }
+    expr = call->getArg(0);
+  }
+}
+
+bool IsTemporaryObject(const clang::Expr *expr) {
+  const auto *operand = IgnoreStdMove(expr);
+  if (operand != expr) {
+    return !operand->isGLValue();
+  }
+  return !expr->isLValue();
+}
+
 bool ContainsVAArgExpr(const clang::Stmt *stmt) {
   if (clang::isa<clang::VAArgExpr>(stmt)) {
     return true;

cpp2rust/converter/converter_lib.h

@@ -243,6 +243,10 @@ bool IsBuiltinVaEnd(const clang::CallExpr *expr);
 
 bool IsBuiltinVaCopy(const clang::CallExpr *expr);
 
+const clang::Expr *IgnoreStdMove(const clang::Expr *expr);
+
+bool IsTemporaryObject(const clang::Expr *expr);
+
 bool ContainsVAArgExpr(const clang::Stmt *stmt);
 
 clang::Expr *NormalizeToBool(clang::Expr *expr, clang::ASTContext &ctx);

cpp2rust/converter/models/converter_refcount.cpp

@@ -2658,11 +2658,7 @@ void ConverterRefCount::SetUFCSReceiver(clang::Expr *base, bool is_arrow,
     }
     return;
   }
-  auto *moved = clang::dyn_cast<clang::CallExpr>(base->IgnoreParenImpCasts());
-  bool is_moved_object =
-      moved && moved->isCallToStdMove() && moved->getArg(0)->isGLValue();
-  if (!base->isLValue() && !is_moved_object &&
-      base->getType()->isRecordType() &&
+  if (IsTemporaryObject(base) && base->getType()->isRecordType() &&
       !IsReferenceType(base->IgnoreImplicit())) {
     PushConversionKind push(*this, ConversionKind::FullRefCount);
     ufcs_receiver_ =