[llvm-branch-commits] [llvm-branch] r128201 - in /llvm/branches/release_29: ./ tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp

[Bill Wendling]

Author: void
Date: Thu Mar 24 01:12:07 2011
New Revision: 128201

URL: http://llvm.org/viewvc/llvm-project?rev=128201&view=rev
Log:
PR9505:
--- Merging r127858 into '.':
U    tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp


Modified:
    llvm/branches/release_29/   (props changed)
    llvm/branches/release_29/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp

Propchange: llvm/branches/release_29/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 24 01:12:07 2011
@@ -1,2 +1,2 @@
 /llvm/branches/Apple/Pertwee:110850,110961
-/llvm/trunk:127241,127263-127264,127298,127325,127328,127350-127351,127441,127464,127780,127871,127981,128041,128100,128194-128197
+/llvm/trunk:127241,127263-127264,127298,127325,127328,127350-127351,127441,127464,127780,127858,127871,127981,128041,128100,128194-128197

Modified: llvm/branches/release_29/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_29/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp?rev=128201&r1=128200&r2=128201&view=diff
==============================================================================
--- llvm/branches/release_29/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp (original)
+++ llvm/branches/release_29/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp Thu Mar 24 01:12:07 2011
@@ -471,11 +471,11 @@
 }
 
 static void PrintSize(double Bits) {
-  fprintf(stderr, "%.2f/%.2fB/%lluW", Bits, Bits/8,(unsigned long long)Bits/32);
+  fprintf(stderr, "%.2f/%.2fB/%luW", Bits, Bits/8,(unsigned long)(Bits/32));
 }
 static void PrintSize(uint64_t Bits) {
-  fprintf(stderr, "%llub/%.2fB/%lluW", (unsigned long long)Bits,
-          (double)Bits/8, (unsigned long long)Bits/32);
+  fprintf(stderr, "%lub/%.2fB/%luW", (unsigned long)Bits,
+          (double)Bits/8, (unsigned long)(Bits/32));
 }
 
 
@@ -601,8 +601,8 @@
       for (unsigned i = 0, e = FreqPairs.size(); i != e; ++i) {
         const PerRecordStats &RecStats = Stats.CodeFreq[FreqPairs[i].second];
 
-        fprintf(stderr, "\t\t%7d %9llu ", RecStats.NumInstances,
-                (unsigned long long)RecStats.TotalBits);
+        fprintf(stderr, "\t\t%7d %9lu ", RecStats.NumInstances,
+                (unsigned long)RecStats.TotalBits);
 
         if (RecStats.NumAbbrev)
           fprintf(stderr, "%7.2f  ",