Fix #11818 FP constParameterReference with stream write

danmar · Jul 7, 2023 · 1f44fbb · 1f44fbb
1 parent 607c090
commit 1f44fbb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/astutils.cpp b/lib/astutils.cpp
@@ -3033,7 +3033,7 @@ bool isLikelyStreamRead(bool cpp, const Token *op)
     const Token *parent = op;
     while (parent->astParent() && parent->astParent()->str() == op->str())
         parent = parent->astParent();
-    if (parent->astParent() && !Token::Match(parent->astParent(), "%oror%|&&|(|,|.|!|;"))
+    if (parent->astParent() && !Token::Match(parent->astParent(), "%oror%|&&|(|,|.|!|;|return"))
         return false;
     if (op->str() == "&" && parent->astParent())
         return false;

diff --git a/test/testother.cpp b/test/testother.cpp
@@ -3270,6 +3270,12 @@ class TestOther : public TestFixture {
               "    const int* p = s.g<int>();\n"
               "}\n");
         ASSERT_EQUALS("", errout.str());
+
+        check("struct S { int x; };\n" // #11818
+              "std::istream& f(std::istream& is, S& s) {\n"
+              "    return is >> s.x;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void constParameterCallback() {