diff options
| -rw-r--r-- | compilerplugins/clang/passstuffbyref.cxx | 7 | ||||
| -rw-r--r-- | compilerplugins/clang/test/passstuffbyref.cxx | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/compilerplugins/clang/passstuffbyref.cxx b/compilerplugins/clang/passstuffbyref.cxx index f87e668ed4fa..3b4b974c697f 100644 --- a/compilerplugins/clang/passstuffbyref.cxx +++ b/compilerplugins/clang/passstuffbyref.cxx @@ -310,8 +310,11 @@ bool PassStuffByRef::isReturnExprDisqualified(const Expr* expr) if (isa<ExprWithCleanups>(expr)) { return true; } - if (const CXXConstructExpr* constructExpr = dyn_cast<CXXConstructExpr>(expr)) { - if (constructExpr->getNumArgs()==1) { + if (const CXXConstructExpr* constructExpr = dyn_cast<CXXConstructExpr>(expr)) + { + if (constructExpr->getNumArgs()==1 + && constructExpr->getConstructor()->isCopyOrMoveConstructor()) + { expr = constructExpr->getArg(0)->IgnoreParenCasts(); } } diff --git a/compilerplugins/clang/test/passstuffbyref.cxx b/compilerplugins/clang/test/passstuffbyref.cxx index 89f51fb1c294..2f076e58e7b7 100644 --- a/compilerplugins/clang/test/passstuffbyref.cxx +++ b/compilerplugins/clang/test/passstuffbyref.cxx @@ -26,6 +26,13 @@ void f() s = new S(v1, v2); } +struct S2 { S2(int); }; + +S2 f2() { + static int n; + return n; +} + // expected-no-diagnostics /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ |