Fix #11881 FP returnStdMoveLocal for rvalue reference return value

chrchr-github · Aug 18, 2023 · 5703aed · 5703aed
1 parent 66cc8cd
commit 5703aed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/checkfunctions.cpp b/lib/checkfunctions.cpp
@@ -673,7 +673,7 @@ void CheckFunctions::returnLocalStdMove()
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope *scope : symbolDatabase->functionScopes) {
         // Expect return by-value
-        if (Function::returnsReference(scope->function, true))
+        if (Function::returnsReference(scope->function, /*unknown*/ true, /*includeRValueRef*/ true))
             continue;
         const auto rets = Function::findReturns(scope->function);
         for (const Token* ret : rets) {

diff --git a/test/testfunctions.cpp b/test/testfunctions.cpp
@@ -1808,6 +1808,12 @@ class TestFunctions : public TestFixture {
               "    std::cout << p->msg;\n"
               "}\n");
         ASSERT_EQUALS("", errout.str());
+
+        check("std::string&& f() {\n" // #11881
+              "    std::string s;\n"
+              "    return std::move(s);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void negativeMemoryAllocationSizeError() { // #389