From: Duncan P. N. Exon Smith <dexonsmith@apple.com>
Date: Fri, 18 Apr 2014 02:06:24 +0000 (+0000)
Subject: blockfreq: Fixing MSVC after r206548?
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a3610962a91043142353e0011c0a420708537bdb;p=oota-llvm.git

blockfreq: Fixing MSVC after r206548?

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@206549 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Analysis/BlockFrequencyInfoImpl.cpp b/lib/Analysis/BlockFrequencyInfoImpl.cpp
index 4d20decbe75..2c7e9e131f4 100644
--- a/lib/Analysis/BlockFrequencyInfoImpl.cpp
+++ b/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)