[CGP] Fix the remove of matched phis in complex addressing mode
When we replace the Phi we created with matched ones it is possible that
there are two identical phi nodes in IR. And matcher is smart enough to find that
new created phi matches both of them. So we try to replace our phi node with
matched ones twice and what is bad we delete our phi node twice causing a crash.
As soon as we found that we have two identical Phi nodes it makes sense to do
a clean-up and replace one phi node by other one.
The patch implements it.
Reviewers: john.brawn, reames
Reviewed By: john.brawn
Subscribers: llvm-commits
Differential Revision: https://reviews.llvm.org/D43758
llvm-svn: 327250
diff --git a/llvm/lib/CodeGen/CodeGenPrepare.cpp b/llvm/lib/CodeGen/CodeGenPrepare.cpp
index 1b1bad1..422a0a9 100644
--- a/llvm/lib/CodeGen/CodeGenPrepare.cpp
+++ b/llvm/lib/CodeGen/CodeGenPrepare.cpp
@@ -2946,8 +2946,20 @@
Matched.clear();
}
if (IsMatched) {
- // Replace all matched values and erase them.
+ // If we matched phi node to different but identical phis then
+ // make a simplification here.
+ DenseMap<PHINode *, PHINode *> MatchedPHINodeMapping;
for (auto MV : Matched) {
+ auto AlreadyMatched = MatchedPHINodeMapping.find(MV.first);
+ if (AlreadyMatched != MatchedPHINodeMapping.end()) {
+ MV.second->replaceAllUsesWith(AlreadyMatched->second);
+ ST.Put(MV.second, AlreadyMatched->second);
+ MV.second->eraseFromParent();
+ } else
+ MatchedPHINodeMapping.insert({ MV.first, MV.second });
+ }
+ // Replace all matched values and erase them.
+ for (auto MV : MatchedPHINodeMapping) {
MV.first->replaceAllUsesWith(MV.second);
PhiNodesToMatch.erase(MV.first);
ST.Put(MV.first, MV.second);