[Tooling] Add a hack to work around issues with matcher binding in r368681.
The change in r368681 contains a (probably unintentional) behavioral change for rewrite rules with a single matcher. Previously, the single matcher would not need to be bound (`joinCaseMatchers` returned it directly), even though a final DynTypeMatcher was created and bound by `buildMatcher`. With the new change, a single matcher will be bound, in addition to the final binding (which is now in `buildMatchers`, but happens roughly at the same point in the overall flow). This patch simply duplicates the "final matcher" trick: it creates an extra DynTypedMatcher for each rewrite rule case matcher, and unconditionally makes it bindable. This is probably not the right long-term fix, but it does allow existing code to continue to work with this interface. Subscribers: cfe-commits, gribozavr, ymandel Tags: #clang Differential Revision: https://reviews.llvm.org/D66273 llvm-svn: 368958
This commit is contained in:
parent
10e3fa28d0
commit
4ed5521cad
|
@ -98,8 +98,10 @@ static std::vector<DynTypedMatcher> taggedMatchers(
|
||||||
Matchers.reserve(Cases.size());
|
Matchers.reserve(Cases.size());
|
||||||
for (const auto &Case : Cases) {
|
for (const auto &Case : Cases) {
|
||||||
std::string Tag = (TagBase + Twine(Case.first)).str();
|
std::string Tag = (TagBase + Twine(Case.first)).str();
|
||||||
auto M = Case.second.Matcher.tryBind(Tag);
|
// HACK: Many matchers are not bindable, so ensure that tryBind will work.
|
||||||
assert(M && "RewriteRule matchers should be bindable.");
|
DynTypedMatcher BoundMatcher(Case.second.Matcher);
|
||||||
|
BoundMatcher.setAllowBind(true);
|
||||||
|
auto M = BoundMatcher.tryBind(Tag);
|
||||||
Matchers.push_back(*std::move(M));
|
Matchers.push_back(*std::move(M));
|
||||||
}
|
}
|
||||||
return Matchers;
|
return Matchers;
|
||||||
|
|
Loading…
Reference in New Issue