diff options
| author | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2014-04-18 02:06:24 +0000 |
|---|---|---|
| committer | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2014-04-18 02:06:24 +0000 |
| commit | c7abca54cff532fc9610fbc3c9a0d8512467b854 (patch) | |
| tree | b9caa0320842f4c2fd62a6f2072bb979502c4010 /llvm/lib/Analysis | |
| parent | 12e68e1733fe26f3a2d977922e2c3dbc15667413 (diff) | |
| download | bcm5719-llvm-c7abca54cff532fc9610fbc3c9a0d8512467b854.tar.gz bcm5719-llvm-c7abca54cff532fc9610fbc3c9a0d8512467b854.zip | |
blockfreq: Fixing MSVC after r206548?
llvm-svn: 206549
Diffstat (limited to 'llvm/lib/Analysis')
| -rw-r--r-- | llvm/lib/Analysis/BlockFrequencyInfoImpl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Analysis/BlockFrequencyInfoImpl.cpp b/llvm/lib/Analysis/BlockFrequencyInfoImpl.cpp index 4d20decbe75..2c7e9e131f4 100644 --- a/llvm/lib/Analysis/BlockFrequencyInfoImpl.cpp +++ b/llvm/lib/Analysis/BlockFrequencyInfoImpl.cpp @@ -258,7 +258,7 @@ std::pair<uint64_t, int16_t> PositiveFloatBase::divide64(uint64_t Dividend, // Divide. bool DoesDivide = IsOverflow || Divisor <= Dividend; - Quotient = (Quotient << 1) | DoesDivide; + Quotient = (Quotient << 1) | uint64_t(DoesDivide); Dividend -= DoesDivide ? Divisor : 0; } @@ -382,7 +382,7 @@ struct LoopStack { void push(const BlockNode &LoopHead, const BlockNode &LatestBackedge) { assert(LoopHead.isValid()); assert(LatestBackedge.isValid()); - OpenLoops.push_back({LoopHead, LatestBackedge}); + OpenLoops.emplace_back(LoopHead, LatestBackedge); } void pop(const BlockNode &FinishedNode) { while (!empty() && top().LatestBackedge <= FinishedNode) |
