Fix

Author: web-flow

lib/valueflow.cpp

@@ -5739,10 +5739,10 @@ static void valueFlowSubFunction(const TokenList& tokenlist,
                 std::list<ValueFlow::Value> argvalues(getFunctionArgumentValues(argtok));
 
                 // Remove non-local lifetimes and moved values
-                argvalues.remove_if([](const ValueFlow::Value& v) {
+                argvalues.remove_if([argvar](const ValueFlow::Value& v) {
                     if (v.isLifetimeValue())
                         return !v.isLocalLifetimeValue() && !v.isSubFunctionLifetimeValue();
-                    return v.isMovedValue();
+                    return v.isMovedValue() && !argvar->isReference();
                 });
                 // Remove uninit values if argument is passed by value
                 if (argtok->variable() && !argtok->variable()->isPointer() && argvalues.size() == 1 &&

test/testother.cpp

@@ -13355,6 +13355,16 @@ class TestOther : public TestFixture {
               "    t.set(s);\n"
               "}\n");
         ASSERT_EQUALS("[test.cpp:8:11]: (warning) Access of moved variable 's'. [accessMoved]\n", errout_str());
+
+        check("void g(const std::string& s) {}\n"
+              "void h(std::string& r) { x = std::move(r); }\n"
+              "void f(std::string s1, std::string s2) {\n"
+              "    t1 = std::move(s1);\n"
+              "    t2 = std::move(s2);\n"
+              "    g(s1);\n"
+              "    h(s2);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:40]: (warning) Access of moved variable 'r'. [accessMoved]\n", errout_str());
     }
 
     void funcArgNamesDifferent() {