mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better heuristic to only look through implicit copy/move ctors

Browse Source 
At least recent libc++ has a std::string ctor overload without a (defaulted)
Allocator argument (which otherwise causes creation of a temporary Allocator
object and thus a ExprWithCleanups), so in C++17 mode (i.e., with no implicit
move CXXConstructExpr -> MaterializeTemporaryExpr -> CXXBindTemporaryExpr chain
in the way) CellInfo::toString (sw/source/filter/ww8/WW8TableInfo.cxx) has a
ReturnStmt of just

> ReturnStmt
> `-ImplicitCastExpr 'std::string':'class std::__1::basic_string<char>' <ConstructorConversion>
>   `-CXXConstructExpr 'std::string':'class std::__1::basic_string<char>' 'void (const char *)'
>     `-ImplicitCastExpr 'const char *' <NoOp>
>       `-ImplicitCastExpr 'char *' <ArrayToPointerDecay>
>         `-DeclRefExpr 'char [256]' lvalue Var 'sBuffer' 'char [256]'

that erroneously triggered loplugin:passstuffbyref.

Change-Id: I53c8911cb1356560692c003808280a103c399e25
Reviewed-on: https://gerrit.libreoffice.org/45916
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2017-12-05 23:00:58 +01:00
parent e6f38aed7c
commit 37fe0f729c
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
compilerplugins/clang/passstuffbyref.cxx
View File

@@ -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();
}
}