https://github.com/5chmidti created
https://github.com/llvm/llvm-project/pull/105935
The overload that did not take the additional `ASTContext *` argument is
unnecessary when the context could simply be commented out, as it is always
passed to `run` from `VerifyMatcher::run`.
This patch removes the single-argument overload in favor of having a single
overload.
>From 8187d06e8a37899663b79c17402c544a48ec4610 Mon Sep 17 00:00:00 2001
From: Julian Schmidt <git.julian.schm...@gmail.com>
Date: Sat, 1 Jun 2024 17:49:13 +0200
Subject: [PATCH] [clang][test] remove unused `run` overload in
`BoundNodesCallback`
The overload that did not take the additional `ASTContext *` argument is
unnecessary when the context could simply be commented out, as it is
always passed to `run` from `VerifyMatcher::run`.
This patch removes the single-argument overload in favor of having a
single overload.
---
.../unittests/ASTMatchers/ASTMatchersNodeTest.cpp | 2 --
clang/unittests/ASTMatchers/ASTMatchersTest.h | 7 +------
.../ASTMatchers/ASTMatchersTraversalTest.cpp | 15 ++++-----------
3 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp
b/clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp
index 3295ad1e21455f..ebf548eb254313 100644
--- a/clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp
+++ b/clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp
@@ -2030,8 +2030,6 @@ TEST_P(ASTMatchersTest,
template <typename T>
class VerifyAncestorHasChildIsEqual : public BoundNodesCallback {
public:
- bool run(const BoundNodes *Nodes) override { return false; }
-
bool run(const BoundNodes *Nodes, ASTContext *Context) override {
const T *Node = Nodes->getNodeAs<T>("");
return verify(*Nodes, *Context, Node);
diff --git a/clang/unittests/ASTMatchers/ASTMatchersTest.h
b/clang/unittests/ASTMatchers/ASTMatchersTest.h
index e9812995315741..ad2f5f355621cd 100644
--- a/clang/unittests/ASTMatchers/ASTMatchersTest.h
+++ b/clang/unittests/ASTMatchers/ASTMatchersTest.h
@@ -28,7 +28,6 @@ using clang::tooling::runToolOnCodeWithArgs;
class BoundNodesCallback {
public:
virtual ~BoundNodesCallback() {}
- virtual bool run(const BoundNodes *BoundNodes) = 0;
virtual bool run(const BoundNodes *BoundNodes, ASTContext *Context) = 0;
virtual void onEndOfTranslationUnit() {}
};
@@ -403,7 +402,7 @@ template <typename T> class VerifyIdIsBoundTo : public
BoundNodesCallback {
EXPECT_EQ("", Name);
}
- bool run(const BoundNodes *Nodes) override {
+ bool run(const BoundNodes *Nodes, ASTContext * /*Context*/) override {
const BoundNodes::IDToNodeMap &M = Nodes->getMap();
if (Nodes->getNodeAs<T>(Id)) {
++Count;
@@ -426,10 +425,6 @@ template <typename T> class VerifyIdIsBoundTo : public
BoundNodesCallback {
return false;
}
- bool run(const BoundNodes *Nodes, ASTContext *Context) override {
- return run(Nodes);
- }
-
private:
const std::string Id;
const int ExpectedCount;
diff --git a/clang/unittests/ASTMatchers/ASTMatchersTraversalTest.cpp
b/clang/unittests/ASTMatchers/ASTMatchersTraversalTest.cpp
index 8a62358a71f0bf..b91eaf91c0bf23 100644
--- a/clang/unittests/ASTMatchers/ASTMatchersTraversalTest.cpp
+++ b/clang/unittests/ASTMatchers/ASTMatchersTraversalTest.cpp
@@ -5653,7 +5653,6 @@ TEST(HasParent, MatchesAllParents) {
TEST(HasParent, NoDuplicateParents) {
class HasDuplicateParents : public BoundNodesCallback {
public:
- bool run(const BoundNodes *Nodes) override { return false; }
bool run(const BoundNodes *Nodes, ASTContext *Context) override {
const Stmt *Node = Nodes->getNodeAs<Stmt>("node");
std::set<const void *> Parents;
@@ -5862,16 +5861,14 @@ template <typename T> class VerifyMatchOnNode : public
BoundNodesCallback {
public:
VerifyMatchOnNode(StringRef Id, const internal::Matcher<T> &InnerMatcher,
StringRef InnerId)
- : Id(Id), InnerMatcher(InnerMatcher), InnerId(InnerId) {
- }
-
- bool run(const BoundNodes *Nodes) override { return false; }
+ : Id(Id), InnerMatcher(InnerMatcher), InnerId(InnerId) {}
bool run(const BoundNodes *Nodes, ASTContext *Context) override {
const T *Node = Nodes->getNodeAs<T>(Id);
return selectFirst<T>(InnerId, match(InnerMatcher, *Node, *Context)) !=
- nullptr;
+ nullptr;
}
+
private:
std::string Id;
internal::Matcher<T> InnerMatcher;
@@ -6065,7 +6062,7 @@ namespace {
class ForCallablePreservesBindingWithMultipleParentsTestCallback
: public BoundNodesCallback {
public:
- bool run(const BoundNodes *BoundNodes) override {
+ bool run(const BoundNodes *BoundNodes, ASTContext *Context) override {
FunctionDecl const *FunDecl =
BoundNodes->getNodeAs<FunctionDecl>("funDecl");
// Validate test assumptions. This would be expressed as ASSERT_* in
@@ -6102,10 +6099,6 @@ class
ForCallablePreservesBindingWithMultipleParentsTestCallback
return true;
}
- bool run(const BoundNodes *BoundNodes, ASTContext *Context) override {
- return run(BoundNodes);
- }
-
private:
void ExpectCorrectResult(StringRef LogInfo,
ArrayRef<BoundNodes> Results) const {
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
