intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-30 05:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ASTMatchers] Add support for dynamic matching of ofKind narrowing matcher

Browse Source 
Summary: Adds support for using the ofKind in clang-query and other dynamic matcher use cases

Reviewers: klimek, aaron.ballman, jdoerfert

Reviewed By: aaron.ballman

Subscribers: cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D77791
This commit is contained in:
Nathan James
2020-04-09 12:43:33 +01:00
parent 2477cec2ac
commit bf968e28ee
4 changed files with 53 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
clang/lib/ASTMatchers/Dynamic/Marshallers.cpp
View File

@@ -95,3 +95,17 @@ clang::ast_matchers::dynamic::internal::ArgTypeTraits<
"OMPC_");
return llvm::None;
}
llvm::Optional<std::string>
clang::ast_matchers::dynamic::internal::ArgTypeTraits<
clang::UnaryExprOrTypeTrait>::getBestGuess(const VariantValue &Value) {
static constexpr llvm::StringRef Allowed[] = {
"UETT_SizeOf", "UETT_AlignOf",
"UETT_VecStep", "UETT_OpenMPRequiredSimdAlign",
"UETT_PreferredAlignOf",
};
if (Value.isString())
return ::getBestGuess(Value.getString(), llvm::makeArrayRef(Allowed),
"UETT_");
return llvm::None;
}

30
clang/lib/ASTMatchers/Dynamic/Marshallers.h
View File

@@ -27,6 +27,7 @@
#include "clang/Basic/AttrKinds.h"
#include "clang/Basic/LLVM.h"
#include "clang/Basic/OpenMPKinds.h"
#include "clang/Basic/TypeTraits.h"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/None.h"
#include "llvm/ADT/Optional.h"
@@ -214,6 +215,35 @@ public:
static llvm::Optional<std::string> getBestGuess(const VariantValue &Value);
};
template <> struct ArgTypeTraits<UnaryExprOrTypeTrait> {
private:
static Optional<UnaryExprOrTypeTrait>
getUnaryOrTypeTraitKind(llvm::StringRef ClauseKind) {
// FIXME: Type traits should probably be in a `.def` to make less error
// prone.
return llvm::StringSwitch<Optional<UnaryExprOrTypeTrait>>(ClauseKind)
.Case("UETT_SizeOf", UETT_SizeOf)
.Case("UETT_AlignOf", UETT_AlignOf)
.Case("UETT_VecStep", UETT_VecStep)
.Case("UETT_OpenMPRequiredSimdAlign", UETT_OpenMPRequiredSimdAlign)
.Case("UETT_PreferredAlignOf", UETT_PreferredAlignOf)
.Default(llvm::None);
}
public:
static bool is(const VariantValue &Value) {
return Value.isString() && getUnaryOrTypeTraitKind(Value.getString());
}
static UnaryExprOrTypeTrait get(const VariantValue &Value) {
return *getUnaryOrTypeTraitKind(Value.getString());
}
static ArgKind getKind() { return ArgKind(ArgKind::AK_String); }
static llvm::Optional<std::string> getBestGuess(const VariantValue &Value);
};
/// Matcher descriptor interface.
///
/// Provides a \c create() method that constructs the matcher from the provided

4
clang/lib/ASTMatchers/Dynamic/Registry.cpp
View File

@@ -95,9 +95,6 @@ void RegistryMaps::registerMatcher(
RegistryMaps::RegistryMaps() {
// TODO: Here is the list of the missing matchers, grouped by reason.
//
// Need Variant/Parser fixes:
// ofKind
//
// Polymorphic + argument overload:
// findAll
//
@@ -458,6 +455,7 @@ RegistryMaps::RegistryMaps() {
REGISTER_MATCHER(objcThrowStmt);
REGISTER_MATCHER(objcTryStmt);
REGISTER_MATCHER(ofClass);
REGISTER_MATCHER(ofKind);
REGISTER_MATCHER(ompDefaultClause);
REGISTER_MATCHER(ompExecutableDirective);
REGISTER_MATCHER(on);

8
clang/unittests/ASTMatchers/Dynamic/ParserTest.cpp
View File

@@ -242,6 +242,14 @@ TEST(ParserTest, FullParserTest) {
EXPECT_TRUE(matches("void f(int a, int x);", M));
EXPECT_FALSE(matches("void f(int x, int a);", M));
Code = "unaryExprOrTypeTraitExpr(ofKind(\"UETT_SizeOf\"))";
llvm::Optional<DynTypedMatcher> UnaryExprSizeOf(
Parser::parseMatcherExpression(Code, nullptr, nullptr, &Error));
EXPECT_EQ("", Error.toStringFull());
Matcher<Stmt> MStmt = UnaryExprSizeOf->unconditionalConvertTo<Stmt>();
EXPECT_TRUE(matches("unsigned X = sizeof(int);", MStmt));
EXPECT_FALSE(matches("unsigned X = alignof(int);", MStmt));
Code = "hasInitializer(\n binaryOperator(hasLHS(\"A\")))";
EXPECT_TRUE(!Parser::parseMatcherExpression(Code, &Error).hasValue());
EXPECT_EQ("1:1: Error parsing argument 1 for matcher hasInitializer.\n"