[ASTMatchers] Fix matching after generic top-level matcher
authorStephen Kelly <steveire@gmail.com>
Sat, 30 Jan 2021 01:36:40 +0000 (01:36 +0000)
committerStephen Kelly <steveire@gmail.com>
Tue, 2 Feb 2021 13:31:05 +0000 (13:31 +0000)
commitd6a06365cf12bebe20a7d65cf3894608efc089b4
treed6c0da3b5b340849571dd42d7f797b1d0e1b50c9
parent8fce22888bd2aec9eadf8a0f229bfd0dbe06460d
[ASTMatchers] Fix matching after generic top-level matcher

With a matcher like

  expr(anyOf(integerLiteral(equals(42)), unless(expr())))

and code such as

  struct B {
    B(int);
  };

  B func1() { return 42; }

the top-level expr() would match each of the nodes which are not spelled
in the source and then ignore-traverse to match the integerLiteral node.
This would result in multiple results reported for the integerLiteral.

Fix that by only running matching logic on nodes which are not skipped
with the top-level matcher.

Differential Revision: https://reviews.llvm.org/D95735
clang/lib/ASTMatchers/ASTMatchFinder.cpp
clang/unittests/ASTMatchers/ASTMatchersTraversalTest.cpp