RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-23 11:13:28 +01:00
Code Issues Projects Releases Wiki Activity

Make MergeBlockIntoPredecessor conformant to the precondition of calling DTU.applyUpdates

Browse Source 
Summary:
It is mentioned in the document of DTU that "It is illegal to submit any update that has already been submitted, i.e., you are supposed not to insert an existent edge or delete a nonexistent edge." It is dangerous to violet this rule because DomTree and PostDomTree occasionally crash on this scenario.

This patch fixes `MergeBlockIntoPredecessor`, making it conformant to this precondition.

Reviewers: kuhar, brzycki, chandlerc

Reviewed By: brzycki

Subscribers: hiraditya, llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D58444

llvm-svn: 355105
This commit is contained in:
Chijun Sima 2019-02-28 16:47:18 +00:00
parent 5268203d9c
commit a16394ad24
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Transforms/Utils/BasicBlockUtils.cpp
View File

@ -186,7 +186,9 @@ bool llvm::MergeBlockIntoPredecessor(BasicBlock *BB, DomTreeUpdater *DTU,
Updates.push_back({DominatorTree::Delete, PredBB, BB}); Updates.push_back({DominatorTree::Delete, PredBB, BB});
for (auto I = succ_begin(BB), E = succ_end(BB); I != E; ++I) { for (auto I = succ_begin(BB), E = succ_end(BB); I != E; ++I) {
Updates.push_back({DominatorTree::Delete, BB, *I}); Updates.push_back({DominatorTree::Delete, BB, *I});
Updates.push_back({DominatorTree::Insert, PredBB, *I}); // This successor of BB may already have PredBB as a predecessor.
if (llvm::find(successors(PredBB), *I) == succ_end(PredBB))
Updates.push_back({DominatorTree::Insert, PredBB, *I});
} }
} }