BoundNodesTreeBuilder *Builder,
ArrayRef<DynTypedMatcher> InnerMatchers) {
BoundNodesTreeBuilder Result;
+ bool Matched = false;
for (const DynTypedMatcher &InnerMatcher : InnerMatchers) {
BoundNodesTreeBuilder BuilderInner(*Builder);
- if (InnerMatcher.matches(DynNode, Finder, &BuilderInner))
+ if (InnerMatcher.matches(DynNode, Finder, &BuilderInner)) {
+ Matched = true;
Result.addMatch(BuilderInner);
+ }
}
- *Builder = std::move(Result);
+ // If there were no matches, we can't assign to `*Builder`; we'd (incorrectly)
+ // clear it because `Result` is empty.
+ if (Matched)
+ *Builder = std::move(Result);
return true;
}
std::make_unique<VerifyIdIsBoundTo<FieldDecl>>("v")));
}
+// Regression test.
+TEST(Optionally, SubmatchersDoNotMatchButPreserveBindings) {
+ std::string Code = "class A { int a; int b; };";
+ auto Matcher = recordDecl(decl().bind("decl"),
+ optionally(has(fieldDecl(hasName("c")).bind("v"))));
+ // "decl" is still bound.
+ EXPECT_TRUE(matchAndVerifyResultTrue(
+ Code, Matcher, std::make_unique<VerifyIdIsBoundTo<RecordDecl>>("decl")));
+ // "v" is not bound, but the match still suceeded.
+ EXPECT_TRUE(matchAndVerifyResultFalse(
+ Code, Matcher, std::make_unique<VerifyIdIsBoundTo<FieldDecl>>("v")));
+}
+
TEST(Optionally, SubmatchersMatch) {
EXPECT_TRUE(matchAndVerifyResultTrue(
"class A { int a; int c; };",