diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-02-15 15:03:24 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-02-17 21:45:06 +0100 |
| commit | d1a2b80b9dc146c7fe63d2657e5506f49d6e5c0d (patch) | |
| tree | 7ceeb7e977c660d5b69bc93e8327674b7ea1ae5d /compilerplugins/clang/conditionalstring.cxx | |
| parent | eed401bc7429f29f1b21cf8e3b08969e011d5692 (diff) | |
Bump compiler plugins Clang baseline to 12.0.1
...as discussed in the mail thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2020-November/086234.html>
"Bump --enable-compiler-plugins Clang baseline?" (and now picked up again at
<https://lists.freedesktop.org/archives/libreoffice/2022-February/088459.html>
"Re: Bump --enable-compiler-plugins Clang baseline?"), and clean up
compilerplugins/clang/ accordingly
Change-Id: I5e81c6fdcc363aeefd6227606225b526fdf7ac16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129989
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'compilerplugins/clang/conditionalstring.cxx')
| -rw-r--r-- | compilerplugins/clang/conditionalstring.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/compilerplugins/clang/conditionalstring.cxx b/compilerplugins/clang/conditionalstring.cxx index bf6c196846dc..cf858601ea0a 100644 --- a/compilerplugins/clang/conditionalstring.cxx +++ b/compilerplugins/clang/conditionalstring.cxx @@ -12,7 +12,6 @@ #include <cassert> #include "check.hxx" -#include "compat.hxx" #include "plugin.hxx" // Find uses of OUString in conditional expressions that could be rewritten as std::u16string_view, @@ -32,15 +31,13 @@ Expr const* ignoreImplicit(Expr const* expr) { e = e1->getSubExprAsWritten(); } -#if CLANG_VERSION >= 80000 else if (auto const e2 = dyn_cast<FullExpr>(e)) { e = e2->getSubExpr(); } -#endif else if (auto const e3 = dyn_cast<MaterializeTemporaryExpr>(e)) { - e = compat::getSubExpr(e3); + e = e3->getSubExpr(); } else if (auto const e4 = dyn_cast<CXXBindTemporaryExpr>(e)) { @@ -398,8 +395,7 @@ private: { e = e1->getSubExpr(); } - if (auto const e1 - = dyn_cast<CXXConstructExpr>(compat::IgnoreImplicit(e)->IgnoreParens())) + if (auto const e1 = dyn_cast<CXXConstructExpr>(e->IgnoreImplicit()->IgnoreParens())) { if (e1->getNumArgs() != 0 //TODO && isa<clang::StringLiteral>(e1->getArg(0)->IgnoreParenImpCasts())) |