Merge pull request #618 from andreasfertig/fixIssue605

Fixed #605: Treat temporary as lambda initializer.

Author: andreasfertig

CodeGenerator.cpp

@@ -3878,6 +3878,7 @@ void CodeGenerator::InsertArg(const CXXRecordDecl* stmt)
                 bool byConstRef{false};
                 auto fieldName{isThis ? kwInternalThis : name};
                 auto fieldDeclType{fd->getType()};
+                bool isMoved{};
 
                 std::string fname = StrCat("_"sv, name);
 
@@ -3923,13 +3924,23 @@ void CodeGenerator::InsertArg(const CXXRecordDecl* stmt)
                     ) {
                         // this must go before adding the L or R-value reference, otherwise we get T& const instead of
                         // const T&
-                        fieldDeclType.addConst();
+
+                        if(exprWithoutImpCasts->isPRValue() and isa<CXXBindTemporaryExpr>(exprWithoutImpCasts) and
+                           not exprWithoutImpCasts->getType().isConstQualified()) {
+                            fieldDeclType = stmt->getASTContext().getRValueReferenceType(fieldDeclType);
+                            EnableGlobalInsert(GlobalInserts::HeaderUtility);
+                            fname   = StrCat("std::move("sv, fname, ")"sv);
+                            isMoved = true;
+
+                        } else {
+                            fieldDeclType.addConst();
+                        }
                     }
 
                     if(exprWithoutImpCasts->isXValue()) {
                         fieldDeclType = stmt->getASTContext().getRValueReferenceType(fieldDeclType);
 
-                    } else {
+                    } else if(not isMoved) {
                         fieldDeclType = stmt->getASTContext().getLValueReferenceType(fieldDeclType);
                     }
                 }

tests/Issue605.cpp

@@ -0,0 +1,12 @@
+// cmdline:-std=c++23
+
+#include <cstdio>
+#include <functional>
+#include <memory>
+
+using namespace std;
+
+int main()
+{
+    [a=make_unique<int>(42)]() {};
+}

tests/Issue605.expect

@@ -0,0 +1,33 @@
+#include <utility> // std::move
+
+#include <cstdio>
+#include <functional>
+#include <memory>
+
+using namespace std;
+
+int main()
+{
+    
+  class __lambda_11_5
+  {
+    public: 
+    inline /*constexpr */ void operator()() const
+    {
+    }
+    
+    private: 
+    std::unique_ptr<int, std::default_delete<int> > a;
+    public: 
+    // inline /*constexpr */ __lambda_11_5(const __lambda_11_5 &) /* noexcept */ = delete;
+    // inline /*constexpr */ __lambda_11_5 & operator=(const __lambda_11_5 &) /* noexcept */ = delete;
+    // inline /*constexpr */ ~__lambda_11_5() noexcept = default;
+    __lambda_11_5(std::unique_ptr<int, std::default_delete<int> > && _a)
+    : a{std::move(_a)}
+    {}
+    
+  } __lambda_11_5{std::make_unique<int>(42)};
+  
+  ;
+  return 0;
+}