From c7abca54cff532fc9610fbc3c9a0d8512467b854 Mon Sep 17 00:00:00 2001 From: "Duncan P. N. Exon Smith" Date: Fri, 18 Apr 2014 02:06:24 +0000 Subject: blockfreq: Fixing MSVC after r206548? llvm-svn: 206549 --- llvm/lib/Analysis/BlockFrequencyInfoImpl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'llvm/lib/Analysis/BlockFrequencyInfoImpl.cpp') 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 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) -- cgit v1.2.3