Skip to content

Commit d5dc508

Browse files
authored
[clang][test] remove unused run overload in BoundNodesCallback (#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.
1 parent af63546 commit d5dc508

File tree

3 files changed

+5
-19
lines changed

3 files changed

+5
-19
lines changed

clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2030,8 +2030,6 @@ TEST_P(ASTMatchersTest,
20302030
template <typename T>
20312031
class VerifyAncestorHasChildIsEqual : public BoundNodesCallback {
20322032
public:
2033-
bool run(const BoundNodes *Nodes) override { return false; }
2034-
20352033
bool run(const BoundNodes *Nodes, ASTContext *Context) override {
20362034
const T *Node = Nodes->getNodeAs<T>("");
20372035
return verify(*Nodes, *Context, Node);

clang/unittests/ASTMatchers/ASTMatchersTest.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ using clang::tooling::runToolOnCodeWithArgs;
2828
class BoundNodesCallback {
2929
public:
3030
virtual ~BoundNodesCallback() {}
31-
virtual bool run(const BoundNodes *BoundNodes) = 0;
3231
virtual bool run(const BoundNodes *BoundNodes, ASTContext *Context) = 0;
3332
virtual void onEndOfTranslationUnit() {}
3433
};
@@ -403,7 +402,7 @@ template <typename T> class VerifyIdIsBoundTo : public BoundNodesCallback {
403402
EXPECT_EQ("", Name);
404403
}
405404

406-
bool run(const BoundNodes *Nodes) override {
405+
bool run(const BoundNodes *Nodes, ASTContext * /*Context*/) override {
407406
const BoundNodes::IDToNodeMap &M = Nodes->getMap();
408407
if (Nodes->getNodeAs<T>(Id)) {
409408
++Count;
@@ -426,10 +425,6 @@ template <typename T> class VerifyIdIsBoundTo : public BoundNodesCallback {
426425
return false;
427426
}
428427

429-
bool run(const BoundNodes *Nodes, ASTContext *Context) override {
430-
return run(Nodes);
431-
}
432-
433428
private:
434429
const std::string Id;
435430
const int ExpectedCount;

clang/unittests/ASTMatchers/ASTMatchersTraversalTest.cpp

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5666,7 +5666,6 @@ TEST(HasParent, MatchesAllParents) {
56665666
TEST(HasParent, NoDuplicateParents) {
56675667
class HasDuplicateParents : public BoundNodesCallback {
56685668
public:
5669-
bool run(const BoundNodes *Nodes) override { return false; }
56705669
bool run(const BoundNodes *Nodes, ASTContext *Context) override {
56715670
const Stmt *Node = Nodes->getNodeAs<Stmt>("node");
56725671
std::set<const void *> Parents;
@@ -5875,16 +5874,14 @@ template <typename T> class VerifyMatchOnNode : public BoundNodesCallback {
58755874
public:
58765875
VerifyMatchOnNode(StringRef Id, const internal::Matcher<T> &InnerMatcher,
58775876
StringRef InnerId)
5878-
: Id(Id), InnerMatcher(InnerMatcher), InnerId(InnerId) {
5879-
}
5880-
5881-
bool run(const BoundNodes *Nodes) override { return false; }
5877+
: Id(Id), InnerMatcher(InnerMatcher), InnerId(InnerId) {}
58825878

58835879
bool run(const BoundNodes *Nodes, ASTContext *Context) override {
58845880
const T *Node = Nodes->getNodeAs<T>(Id);
58855881
return selectFirst<T>(InnerId, match(InnerMatcher, *Node, *Context)) !=
5886-
nullptr;
5882+
nullptr;
58875883
}
5884+
58885885
private:
58895886
std::string Id;
58905887
internal::Matcher<T> InnerMatcher;
@@ -6078,7 +6075,7 @@ namespace {
60786075
class ForCallablePreservesBindingWithMultipleParentsTestCallback
60796076
: public BoundNodesCallback {
60806077
public:
6081-
bool run(const BoundNodes *BoundNodes) override {
6078+
bool run(const BoundNodes *BoundNodes, ASTContext *Context) override {
60826079
FunctionDecl const *FunDecl =
60836080
BoundNodes->getNodeAs<FunctionDecl>("funDecl");
60846081
// Validate test assumptions. This would be expressed as ASSERT_* in
@@ -6115,10 +6112,6 @@ class ForCallablePreservesBindingWithMultipleParentsTestCallback
61156112
return true;
61166113
}
61176114

6118-
bool run(const BoundNodes *BoundNodes, ASTContext *Context) override {
6119-
return run(BoundNodes);
6120-
}
6121-
61226115
private:
61236116
void ExpectCorrectResult(StringRef LogInfo,
61246117
ArrayRef<BoundNodes> Results) const {

0 commit comments

Comments
 (0)