diff options
| author | Cong Hou <congh@google.com> | 2015-12-17 01:29:08 +0000 |
|---|---|---|
| committer | Cong Hou <congh@google.com> | 2015-12-17 01:29:08 +0000 |
| commit | b9e8d483b586ce3ed219872ee2d2ede2d58784de (patch) | |
| tree | 5bd367eba26f3aa5501c31b54864fa27f1b3b074 /llvm/lib/CodeGen | |
| parent | 02dfd496b04919ece112ff2ddf3f195b9f5925cd (diff) | |
| download | bcm5719-llvm-b9e8d483b586ce3ed219872ee2d2ede2d58784de.tar.gz bcm5719-llvm-b9e8d483b586ce3ed219872ee2d2ede2d58784de.zip | |
Fix PR25838.
This is a quick fix to PR25838. The issue comes from the restriction that we
cannot normalize probabilities containing both known and unknown ones. A patch
that removes this restriction is under the review now:
http://reviews.llvm.org/D15548
llvm-svn: 255867
Diffstat (limited to 'llvm/lib/CodeGen')
| -rw-r--r-- | llvm/lib/CodeGen/IfConversion.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/llvm/lib/CodeGen/IfConversion.cpp b/llvm/lib/CodeGen/IfConversion.cpp index a1835fa3297..c38c9d22266 100644 --- a/llvm/lib/CodeGen/IfConversion.cpp +++ b/llvm/lib/CodeGen/IfConversion.cpp @@ -1662,6 +1662,12 @@ void IfConverter::MergeBlocks(BBInfo &ToBBI, BBInfo &FromBBI, bool AddEdges) { ToBBI.BB->splice(ToBBI.BB->end(), FromBBI.BB, FromBBI.BB->begin(), FromBBI.BB->end()); + // Force normalizing the successors' probabilities of ToBBI.BB to convert all + // unknown probabilities into known ones. + // FIXME: This usage is too tricky and in the future we would like to + // eliminate all unknown probabilities in MBB. + ToBBI.BB->normalizeSuccProbs(); + SmallVector<MachineBasicBlock *, 4> FromSuccs(FromBBI.BB->succ_begin(), FromBBI.BB->succ_end()); MachineBasicBlock *NBB = getNextBlock(FromBBI.BB); |

