replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Further simplify from r253832 with some unique_ptr and coalescing conditions 

llvm-svn: 253834
This commit is contained in:
David Blaikie 2015-11-22 20:11:21 +00:00
parent b8fc0186c7
commit fda69dd736
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
llvm/utils/TableGen/CodeGenDAGPatterns.cpp
View File

@ -3523,8 +3523,8 @@ static void CombineChildVariants(TreePatternNode *Orig,
std::vector<TreePatternNode*> NewChildren;
for (unsigned i = 0, e = ChildVariants.size(); i != e; ++i)
NewChildren.push_back(ChildVariants[i][Idxs[i]]);
TreePatternNode *R = new TreePatternNode(Orig->getOperator(), NewChildren,
Orig->getNumTypes());
auto R = llvm::make_unique<TreePatternNode>(
Orig->getOperator(), NewChildren, Orig->getNumTypes());
// Copy over properties.
R->setName(Orig->getName());
@ -3535,21 +3535,16 @@ static void CombineChildVariants(TreePatternNode *Orig,
// If this pattern cannot match, do not include it as a variant.
std::string ErrString;
if (!R->canPatternMatch(ErrString, CDP)) {
delete R;
} else {
// Scan to see if this pattern has already been emitted. We can get
// duplication due to things like commuting:
// (and GPRC:$a, GPRC:$b) -> (and GPRC:$b, GPRC:$a)
// which are the same pattern. Ignore the dups.
if (std::any_of(OutVariants.begin(), OutVariants.end(),
[=](TreePatternNode *Variant) {
return R->isIsomorphicTo(Variant, DepVars);
}))
delete R;
else
OutVariants.push_back(R);
}
// Scan to see if this pattern has already been emitted. We can get
// duplication due to things like commuting:
// (and GPRC:$a, GPRC:$b) -> (and GPRC:$b, GPRC:$a)
// which are the same pattern. Ignore the dups.
if (R->canPatternMatch(ErrString, CDP) &&
std::none_of(OutVariants.begin(), OutVariants.end(),
[&](TreePatternNode *Variant) {
return R->isIsomorphicTo(Variant, DepVars);
}))
OutVariants.push_back(R.release());
// Increment indices to the next permutation by incrementing the
// indices from last index backward, e.g., generate the sequence