Matches the operator Name of operator expressions (binary or
unary).
diff --git a/clang/docs/tools/dump_ast_matchers.py b/clang/docs/tools/dump_ast_matchers.py
--- a/clang/docs/tools/dump_ast_matchers.py
+++ b/clang/docs/tools/dump_ast_matchers.py
@@ -284,6 +284,22 @@
add_matcher(result, name, '%s, ..., %s' % (arg, arg), comment)
return
+ m = re.match(
+ r"""^.*internal::VariadicFunction\s*<\s*
+ internal::PolymorphicMatcherWithParam1<[\S\s]+
+ AST_POLYMORPHIC_SUPPORTED_TYPES\(([^)]*)\)>,\s*([^,]+),
+ \s*[^>]+>\s*([a-zA-Z]*);$""",
+ declaration, flags=re.X)
+
+ if m:
+ results, arg, name = m.groups()[:3]
+
+ result_types = [r.strip() for r in results.split(',')]
+ for result_type in result_types:
+ add_matcher(result_type, name, '%s, ..., %s' % (arg, arg), comment)
+ return
+
+
# Parse Variadic operator matchers.
m = re.match(
r"""^.*VariadicOperatorMatcherFunc\s*<\s*([^,]+),\s*([^\s]+)\s*>\s*
diff --git a/clang/include/clang/ASTMatchers/ASTMatchers.h b/clang/include/clang/ASTMatchers/ASTMatchers.h
--- a/clang/include/clang/ASTMatchers/ASTMatchers.h
+++ b/clang/include/clang/ASTMatchers/ASTMatchers.h
@@ -4762,6 +4762,19 @@
return Name == Node.getOpcodeStr(Node.getOpcode());
}
+/// Matches operator expressions (binary or unary) that have any of the
+/// specified names.
+///
+/// hasAnyOperatorName("+", "-")
+/// Is equivalent to
+/// anyOf(hasOperatorName("+"), hasOperatorName("-"))
+extern const internal::VariadicFunction<
+ internal::PolymorphicMatcherWithParam1<
+ internal::HasAnyOperatorNameMatcher, std::vector,
+ AST_POLYMORPHIC_SUPPORTED_TYPES(BinaryOperator, UnaryOperator)>,
+ StringRef, internal::hasAnyOperatorNameFunc>
+ hasAnyOperatorName;
+
/// Matches all kinds of assignment operators.
///
/// Example 1: matches a += b (matcher = binaryOperator(isAssignmentOperator()))
diff --git a/clang/include/clang/ASTMatchers/ASTMatchersInternal.h b/clang/include/clang/ASTMatchers/ASTMatchersInternal.h
--- a/clang/include/clang/ASTMatchers/ASTMatchersInternal.h
+++ b/clang/include/clang/ASTMatchers/ASTMatchersInternal.h
@@ -1858,6 +1858,47 @@
llvm::Optional
getExpansionLocOfMacro(StringRef MacroName, SourceLocation Loc,
const ASTContext &Context);
+
+/// Matches overloaded operators with a specific name.
+///
+/// The type argument ArgT is not used by this matcher but is used by
+/// PolymorphicMatcherWithParam1 and should be std::vector>.
+template >
+class HasAnyOperatorNameMatcher : public SingleNodeMatcherInterface {
+ static_assert(std::is_same::value ||
+ std::is_same::value,
+ "Matcher only supports `BinaryOperator` and `UnaryOperator`");
+ static_assert(std::is_same>::value,
+ "Matcher ArgT must be std::vector");
+
+public:
+ explicit HasAnyOperatorNameMatcher(std::vector Names)
+ : SingleNodeMatcherInterface(), Names(std::move(Names)) {}
+
+ bool matchesNode(const T &Node) const override {
+ StringRef OpName = getOpName(Node);
+ return llvm::any_of(
+ Names, [&](const std::string &Name) { return Name == OpName; });
+ }
+
+private:
+ static StringRef getOpName(const UnaryOperator &Node) {
+ return Node.getOpcodeStr(Node.getOpcode());
+ }
+ static StringRef getOpName(const BinaryOperator &Node) {
+ return Node.getOpcodeStr();
+ }
+
+ const std::vector Names;
+};
+
+using HasOpNameMatcher =
+ PolymorphicMatcherWithParam1,
+ void(TypeList)>;
+
+HasOpNameMatcher hasAnyOperatorNameFunc(ArrayRef NameRefs);
+
} // namespace internal
} // namespace ast_matchers
diff --git a/clang/lib/ASTMatchers/ASTMatchersInternal.cpp b/clang/lib/ASTMatchers/ASTMatchersInternal.cpp
--- a/clang/lib/ASTMatchers/ASTMatchersInternal.cpp
+++ b/clang/lib/ASTMatchers/ASTMatchersInternal.cpp
@@ -375,6 +375,10 @@
return hasAnySelectorMatcher(vectorFromRefs(NameRefs));
}
+HasOpNameMatcher hasAnyOperatorNameFunc(ArrayRef NameRefs) {
+ return HasOpNameMatcher(vectorFromRefs(NameRefs));
+}
+
HasNameMatcher::HasNameMatcher(std::vector N)
: UseUnqualifiedMatch(llvm::all_of(
N, [](StringRef Name) { return Name.find("::") == Name.npos; })),
@@ -849,6 +853,10 @@
const internal::VariadicFunction, StringRef,
internal::hasAnyNameFunc>
hasAnyName = {};
+
+const internal::VariadicFunction
+ hasAnyOperatorName = {};
const internal::VariadicFunction, StringRef,
internal::hasAnySelectorFunc>
hasAnySelector = {};
diff --git a/clang/lib/ASTMatchers/Dynamic/Registry.cpp b/clang/lib/ASTMatchers/Dynamic/Registry.cpp
--- a/clang/lib/ASTMatchers/Dynamic/Registry.cpp
+++ b/clang/lib/ASTMatchers/Dynamic/Registry.cpp
@@ -243,6 +243,7 @@
REGISTER_MATCHER(hasAnyConstructorInitializer);
REGISTER_MATCHER(hasAnyDeclaration);
REGISTER_MATCHER(hasAnyName);
+ REGISTER_MATCHER(hasAnyOperatorName);
REGISTER_MATCHER(hasAnyParameter);
REGISTER_MATCHER(hasAnyPlacementArg);
REGISTER_MATCHER(hasAnySelector);
diff --git a/clang/unittests/ASTMatchers/ASTMatchersTraversalTest.cpp b/clang/unittests/ASTMatchers/ASTMatchersTraversalTest.cpp
--- a/clang/unittests/ASTMatchers/ASTMatchersTraversalTest.cpp
+++ b/clang/unittests/ASTMatchers/ASTMatchersTraversalTest.cpp
@@ -1123,6 +1123,19 @@
EXPECT_TRUE(notMatches("void x() { true && false; }", OperatorOr));
}
+TEST(MatchBinaryOperator, HasAnyOperatorName) {
+ StatementMatcher Matcher =
+ binaryOperator(hasAnyOperatorName("+", "-", "*", "/"));
+
+ EXPECT_TRUE(matches("int x(int I) { return I + 2; }", Matcher));
+ EXPECT_TRUE(matches("int x(int I) { return I - 2; }", Matcher));
+ EXPECT_TRUE(matches("int x(int I) { return I * 2; }", Matcher));
+ EXPECT_TRUE(matches("int x(int I) { return I / 2; }", Matcher));
+ EXPECT_TRUE(notMatches("int x(int I) { return I % 2; }", Matcher));
+ // Ensure '+= isn't mistaken.
+ EXPECT_TRUE(notMatches("void x(int &I) { I += 1; }", Matcher));
+}
+
TEST(MatchBinaryOperator, HasLHSAndHasRHS) {
StatementMatcher OperatorTrueFalse =
binaryOperator(hasLHS(cxxBoolLiteral(equals(true))),
@@ -1255,6 +1268,18 @@
EXPECT_TRUE(notMatches("void x() { true; } ", OperatorNot));
}
+TEST(MatchUnaryOperator, HasAnyOperatorName) {
+ StatementMatcher Matcher = unaryOperator(hasAnyOperatorName("-", "*", "++"));
+
+ EXPECT_TRUE(matches("int x(int *I) { return *I; }", Matcher));
+ EXPECT_TRUE(matches("int x(int I) { return -I; }", Matcher));
+ EXPECT_TRUE(matches("void x(int &I) { I++; }", Matcher));
+ EXPECT_TRUE(matches("void x(int &I) { ++I; }", Matcher));
+ EXPECT_TRUE(notMatches("void x(int &I) { I--; }", Matcher));
+ EXPECT_TRUE(notMatches("void x(int &I) { --I; }", Matcher));
+ EXPECT_TRUE(notMatches("int *x(int &I) { return &I; }", Matcher));
+}
+
TEST(MatchUnaryOperator, HasUnaryOperand) {
StatementMatcher OperatorOnFalse =
unaryOperator(hasUnaryOperand(cxxBoolLiteral(equals(false))));
|