[llvm] r206549 - blockfreq: Fixing MSVC after r206548?

[Duncan P. N. Exon Smith]

Author: dexonsmith
Date: Thu Apr 17 21:06:24 2014
New Revision: 206549

URL: http://llvm.org/viewvc/llvm-project?rev=206549&view=rev
Log:
blockfreq: Fixing MSVC after r206548?

Modified:
    llvm/trunk/lib/Analysis/BlockFrequencyInfoImpl.cpp

Modified: llvm/trunk/lib/Analysis/BlockFrequencyInfoImpl.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/BlockFrequencyInfoImpl.cpp?rev=206549&r1=206548&r2=206549&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/BlockFrequencyInfoImpl.cpp (original)
+++ llvm/trunk/lib/Analysis/BlockFrequencyInfoImpl.cpp Thu Apr 17 21:06:24 2014
@@ -258,7 +258,7 @@ std::pair<uint64_t, int16_t> PositiveFlo
 
     // 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)