diff options
author | Hans Wennborg <hans@hanshq.net> | 2015-12-01 03:49:42 +0000 |
---|---|---|
committer | Hans Wennborg <hans@hanshq.net> | 2015-12-01 03:49:42 +0000 |
commit | 1dbaf67537327eb4e34a80c11503bf06e18811e1 (patch) | |
tree | 16aa75fee63a8fc80ed124a12c7ce2f3932358b9 /llvm/lib/CodeGen/MIRParser/MIParser.cpp | |
parent | 64daf7b1a5c24fe09045dc15b2bc55cc702633e1 (diff) | |
download | bcm5719-llvm-1dbaf67537327eb4e34a80c11503bf06e18811e1.tar.gz bcm5719-llvm-1dbaf67537327eb4e34a80c11503bf06e18811e1.zip |
Revert r254348: "Replace all weight-based interfaces in MBB with probability-based interfaces, and update all uses of old interfaces."
and the follow-up r254356: "Fix a bug in MachineBlockPlacement that may cause assertion failure during BranchProbability construction."
Asserts were firing in Chromium builds. See PR25687.
llvm-svn: 254366
Diffstat (limited to 'llvm/lib/CodeGen/MIRParser/MIParser.cpp')
-rw-r--r-- | llvm/lib/CodeGen/MIRParser/MIParser.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/llvm/lib/CodeGen/MIRParser/MIParser.cpp b/llvm/lib/CodeGen/MIRParser/MIParser.cpp index c9c2d62cec3..5a8e96df760 100644 --- a/llvm/lib/CodeGen/MIRParser/MIParser.cpp +++ b/llvm/lib/CodeGen/MIRParser/MIParser.cpp @@ -459,9 +459,8 @@ bool MIParser::parseBasicBlockSuccessors(MachineBasicBlock &MBB) { if (expectAndConsume(MIToken::rparen)) return true; } - MBB.addSuccessor(SuccMBB, BranchProbability::getRaw(Weight)); + MBB.addSuccessor(SuccMBB, Weight); } while (consumeIfPresent(MIToken::comma)); - MBB.normalizeSuccProbs(); return false; } |