wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1245269 - Part 1: Make clang-plugin build with clang 3.8 and newer; r=mystor

Browse Source
This commit is contained in:
Ehsan Akhgari 2016-02-02 14:15:37 -05:00
parent d1c3eed1b2
commit 9d79527f47
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
build/clang-plugin/clang-plugin.cpp
View File

@ -28,6 +28,17 @@ typedef std::unique_ptr<ASTConsumer> ASTConsumerPtr;
typedef ASTConsumer *ASTConsumerPtr;
#endif
#if CLANG_VERSION_FULL < 308
// In clang 3.8, a number of AST matchers were renamed to better match the
// respective AST node. We use the new names, and #define them to the old
// ones for compatibility with older versions.
#define cxxConstructExpr constructExpr
#define cxxConstructorDecl constructorDecl
#define cxxMethodDecl methodDecl
#define cxxNewExpr newExpr
#define cxxRecordDecl recordDecl
#endif
namespace {
using namespace clang::ast_matchers;
@ -893,7 +904,7 @@ bool isPlacementNew(const CXXNewExpr *Expr) {
DiagnosticsMatcher::DiagnosticsMatcher() {
astMatcher.addMatcher(varDecl().bind("node"), &scopeChecker);
astMatcher.addMatcher(newExpr().bind("node"), &scopeChecker);
astMatcher.addMatcher(cxxNewExpr().bind("node"), &scopeChecker);
astMatcher.addMatcher(materializeTemporaryExpr().bind("node"), &scopeChecker);
astMatcher.addMatcher(
callExpr(callee(functionDecl(heapAllocator()))).bind("node"),
@ -919,7 +930,7 @@ DiagnosticsMatcher::DiagnosticsMatcher() {
.bind("call"),
&arithmeticArgChecker);
astMatcher.addMatcher(
constructExpr(
cxxConstructExpr(
allOf(hasDeclaration(noArithmeticExprInArgs()),
anyOf(hasDescendant(
binaryOperator(
@ -938,7 +949,7 @@ DiagnosticsMatcher::DiagnosticsMatcher() {
.bind("call"),
&arithmeticArgChecker);
astMatcher.addMatcher(recordDecl(hasTrivialCtorDtor()).bind("node"),
astMatcher.addMatcher(cxxRecordDecl(hasTrivialCtorDtor()).bind("node"),
&trivialCtorDtorChecker);
astMatcher.addMatcher(
@ -981,12 +992,12 @@ DiagnosticsMatcher::DiagnosticsMatcher() {
// conversions as 'operator _Bool', but newer clang versions recognize these
// as 'operator bool'.
astMatcher.addMatcher(
methodDecl(anyOf(hasName("operator bool"), hasName("operator _Bool")))
cxxMethodDecl(anyOf(hasName("operator bool"), hasName("operator _Bool")))
.bind("node"),
&explicitOperatorBoolChecker);
astMatcher.addMatcher(
recordDecl(allOf(decl().bind("decl"), hasRefCntMember())),
cxxRecordDecl(allOf(decl().bind("decl"), hasRefCntMember())),
&noDuplicateRefCntMemberChecker);
astMatcher.addMatcher(
@ -1005,20 +1016,20 @@ DiagnosticsMatcher::DiagnosticsMatcher() {
&nonMemMovableChecker);
astMatcher.addMatcher(
constructorDecl(isInterestingImplicitCtor(),
ofClass(allOf(isConcreteClass(), decl().bind("class"))),
unless(isMarkedImplicit()))
cxxConstructorDecl(isInterestingImplicitCtor(),
ofClass(allOf(isConcreteClass(), decl().bind("class"))),
unless(isMarkedImplicit()))
.bind("ctor"),
&explicitImplicitChecker);
astMatcher.addMatcher(varDecl(hasType(autoNonAutoableType())).bind("node"),
&noAutoTypeChecker);
astMatcher.addMatcher(constructorDecl(isExplicitMoveConstructor()).bind("node"),
astMatcher.addMatcher(cxxConstructorDecl(isExplicitMoveConstructor()).bind("node"),
&noExplicitMoveConstructorChecker);
astMatcher.addMatcher(constructExpr(hasDeclaration(
constructorDecl(
astMatcher.addMatcher(cxxConstructExpr(hasDeclaration(
cxxConstructorDecl(
isCompilerProvidedCopyConstructor(),
ofClass(hasRefCntMember())))).bind("node"),
&refCountedCopyConstructorChecker);