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

This is fixed now on Clang trunk

Browse Source 
...since <https://github.com/llvm/llvm-project/commit/
dc3957ec215dd17b8d293461f18696566637a6cd> "Include leading attributes in
DeclStmt's SourceRange"

Change-Id: I21859dfdcb454a9dd4444ce299548bf75043b1ab
Reviewed-on: https://gerrit.libreoffice.org/81424
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2019-10-24 08:34:25 +02:00
parent 83baaec3a0
commit a246830d3f
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
compilerplugins/clang/indentation.cxx
View File

@@ -120,9 +120,12 @@ bool Indentation::VisitCompoundStmt(CompoundStmt const* compoundStmt)
// these are always weirdly indented
if (isa<LabelStmt>(stmt))
continue;
// At least until Clang 9.0.0, getBeginLoc of a VarDecl DeclStmt with an UnusedAttr points
// after the attr (and getLocation of the attr would point at "maybe_unused", not at the
// leading "[["), so just ignore those at least for now:
#if CLANG_VERSION < 100000
// Before
// <https://github.com/llvm/llvm-project/commit/dc3957ec215dd17b8d293461f18696566637a6cd>
// "Include leading attributes in DeclStmt's SourceRange", getBeginLoc of a VarDecl DeclStmt
// with an UnusedAttr pointed after the attr (and getLocation of the attr pointed at
// "maybe_unused", not at the leading "[["), so just ignore those in old compiler versions:
if (auto const declStmt = dyn_cast<DeclStmt>(stmt))
{
if (declStmt->decl_begin() != declStmt->decl_end())
@@ -136,6 +139,7 @@ bool Indentation::VisitCompoundStmt(CompoundStmt const* compoundStmt)
}
}
}
#endif
auto stmtLoc = compat::getBeginLoc(stmt);

9
compilerplugins/clang/test/indentation.cxx
View File

@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include "config_clang.h"
int foo();
int foo2(int);
@@ -49,4 +51,11 @@ void attr() {
foo();
}
#if CLANG_VERSION >= 100000
void attr_bad() {
[[maybe_unused]] int i = foo(); // expected-note {{measured against this one [loplugin:indentation]}}
foo(); // expected-error {{statement mis-aligned compared to neighbours [loplugin:indentation]}}
}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */