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

improve loplugin:stringconstant

Browse Source 
to find more places we can elide the OUString() constructor at call
sites

Change-Id: Ie09f3c61f2c4b4959c97dc98ebcbaf7c51d5d713
Reviewed-on: https://gerrit.libreoffice.org/71514
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2019-04-29 11:18:21 +02:00
parent 22f2cf3ccc
commit dd8d5e5795
46 changed files with 210 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
compilerplugins/clang/stringconstant.cxx
View File

@@ -58,7 +58,19 @@ bool isLhsOfAssignment(FunctionDecl const * decl, unsigned parameter) {
|| (oo >= OO_PlusEqual && oo <= OO_GreaterGreaterEqual);
}
bool hasOverloads(FunctionDecl const * decl, unsigned arguments) {
bool typecheckIsOUStringParam(const clang::QualType t) {
return bool(loplugin::TypeCheck(t).NotSubstTemplateTypeParmType()
.LvalueReference().Const().NotSubstTemplateTypeParmType()
.Class("OUString").Namespace("rtl").GlobalNamespace());
}
bool typecheckIsOStringParam(const clang::QualType t) {
return bool(loplugin::TypeCheck(t).NotSubstTemplateTypeParmType()
.LvalueReference().Const().NotSubstTemplateTypeParmType()
.Class("OString").Namespace("rtl").GlobalNamespace());
}
bool hasOverloads(FunctionDecl const * decl, unsigned arguments, unsigned paramIndex) {
int n = 0;
auto ctx = decl->getDeclContext();
if (ctx->getDeclKind() == Decl::LinkageSpec) {
@@ -67,17 +79,32 @@ bool hasOverloads(FunctionDecl const * decl, unsigned arguments) {
auto res = ctx->lookup(decl->getDeclName());
for (auto d = res.begin(); d != res.end(); ++d) {
FunctionDecl const * f = dyn_cast<FunctionDecl>(*d);
if (f != nullptr && f->getMinRequiredArguments() <= arguments
&& f->getNumParams() >= arguments)
{
auto consDecl = dyn_cast<CXXConstructorDecl>(f);
if (consDecl && consDecl->isCopyOrMoveConstructor()) {
continue;
}
++n;
if (n == 2) {
return true;
}
if (f == nullptr || f->getMinRequiredArguments() > arguments
|| f->getNumParams() < arguments) {
continue;
}
auto consDecl = dyn_cast<CXXConstructorDecl>(f);
if (consDecl && consDecl->isCopyOrMoveConstructor()) {
continue;
}
// Deleted stuff like in ORowSetValueDecorator in connectivity can cause
// trouble.
if (consDecl && consDecl->isDeleted()) {
return true;
}
if (paramIndex >= f->getNumParams()) {
continue;
}
auto t = f->getParamDecl(paramIndex)->getType();
// bool because 'const char *' converts to bool
if (!typecheckIsOUStringParam(t) && !typecheckIsOStringParam(t)
&& !loplugin::TypeCheck(t).Pointer().Const().Char()
&& !loplugin::TypeCheck(t).AnyBoolean()) {
continue;
}
++n;
if (n == 2) {
return true;
}
}
return false;
@@ -269,29 +296,6 @@ bool StringConstant::VisitCallExpr(CallExpr const * expr) {
if (fdecl == nullptr) {
return true;
}
for (unsigned i = 0; i != fdecl->getNumParams(); ++i) {
auto t = fdecl->getParamDecl(i)->getType();
if (loplugin::TypeCheck(t).NotSubstTemplateTypeParmType()
.LvalueReference().Const().NotSubstTemplateTypeParmType()
.Class("OUString").Namespace("rtl").GlobalNamespace())
{
if (!(isLhsOfAssignment(fdecl, i)
|| hasOverloads(fdecl, expr->getNumArgs())))
{
handleOUStringCtor(expr, i, fdecl, true);
}
}
if (loplugin::TypeCheck(t).NotSubstTemplateTypeParmType()
.LvalueReference().Const().NotSubstTemplateTypeParmType()
.Class("OString").Namespace("rtl").GlobalNamespace())
{
if (!(isLhsOfAssignment(fdecl, i)
|| hasOverloads(fdecl, expr->getNumArgs())))
{
handleOStringCtor(expr, i, fdecl, true);
}
}
}
loplugin::DeclCheck dc(fdecl);
//TODO: u.compareToAscii("foo") -> u.???("foo")
//TODO: u.compareToIgnoreAsciiCaseAscii("foo") -> u.???("foo")
@@ -773,6 +777,25 @@ bool StringConstant::VisitCallExpr(CallExpr const * expr) {
}
return true;
}
for (unsigned i = 0; i != fdecl->getNumParams(); ++i) {
auto t = fdecl->getParamDecl(i)->getType();
if (typecheckIsOUStringParam(t))
{
if (!(isLhsOfAssignment(fdecl, i)
|| hasOverloads(fdecl, expr->getNumArgs(), i)))
{
handleOUStringCtor(expr, i, fdecl, true);
}
}
if (typecheckIsOStringParam(t))
{
if (!(isLhsOfAssignment(fdecl, i)
|| hasOverloads(fdecl, expr->getNumArgs(), i)))
{
handleOStringCtor(expr, i, fdecl, true);
}
}
}
return true;
}
@@ -1176,27 +1199,23 @@ bool StringConstant::VisitCXXConstructExpr(CXXConstructExpr const * expr) {
auto consDecl = expr->getConstructor();
for (unsigned i = 0; i != consDecl->getNumParams(); ++i) {
auto t = consDecl->getParamDecl(i)->getType();
if (loplugin::TypeCheck(t).NotSubstTemplateTypeParmType()
.LvalueReference().Const().NotSubstTemplateTypeParmType()
.Class("OUString").Namespace("rtl").GlobalNamespace())
if (typecheckIsOUStringParam(t))
{
auto argExpr = expr->getArg(i);
if (argExpr && i <= consDecl->getNumParams())
{
if (!hasOverloads(consDecl, expr->getNumArgs()))
if (!hasOverloads(consDecl, expr->getNumArgs(), i))
{
handleOUStringCtor(expr, argExpr, consDecl, true);
}
}
}
if (loplugin::TypeCheck(t).NotSubstTemplateTypeParmType()
.LvalueReference().Const().NotSubstTemplateTypeParmType()
.Class("OString").Namespace("rtl").GlobalNamespace())
if (typecheckIsOStringParam(t))
{
auto argExpr = expr->getArg(i);
if (argExpr && i <= consDecl->getNumParams())
{
if (!hasOverloads(consDecl, expr->getNumArgs()))
if (!hasOverloads(consDecl, expr->getNumArgs(), i))
{
handleOStringCtor(expr, argExpr, consDecl, true);
}