3 files changed, 31 insertions, 4 deletions
diff --git a/include/Support/SlowOperationInformer.h b/include/Support/SlowOperationInformer.h
index 75c5796aaa..67edf7df42 100644
--- a/include/Support/SlowOperationInformer.h
+++ b/include/Support/SlowOperationInformer.h
@@ -32,6 +32,7 @@
 #define SUPPORT_SLOW_OPERATION_INFORMER_H
 
 #include <string>
+#include <cassert>
 
 namespace llvm {
   class SlowOperationInformer {
@@ -49,6 +50,15 @@ namespace llvm {
     /// along the operation is, given in 1/10ths of a percent (in other words,
     /// Amount should range from 0 to 1000).
     void progress(unsigned Amount);
+
+    /// progress - Same as the method above, but this performs the division for
+    /// you, and helps you avoid overflow if you are dealing with largish
+    /// numbers.
+    void progress(unsigned Current, unsigned Maximum) {
+      assert(Maximum != 0 &&
+             "Shouldn't be doing work if there is nothing to do!");
+      progress(Current*1000ULL/Maximum);
+    }
   };
 } // end namespace llvm
 
diff --git a/include/llvm/Support/SlowOperationInformer.h b/include/llvm/Support/SlowOperationInformer.h
index 75c5796aaa..67edf7df42 100644
--- a/include/llvm/Support/SlowOperationInformer.h
+++ b/include/llvm/Support/SlowOperationInformer.h
@@ -32,6 +32,7 @@
 #define SUPPORT_SLOW_OPERATION_INFORMER_H
 
 #include <string>
+#include <cassert>
 
 namespace llvm {
   class SlowOperationInformer {
@@ -49,6 +50,15 @@ namespace llvm {
     /// along the operation is, given in 1/10ths of a percent (in other words,
     /// Amount should range from 0 to 1000).
     void progress(unsigned Amount);
+
+    /// progress - Same as the method above, but this performs the division for
+    /// you, and helps you avoid overflow if you are dealing with largish
+    /// numbers.
+    void progress(unsigned Current, unsigned Maximum) {
+      assert(Maximum != 0 &&
+             "Shouldn't be doing work if there is nothing to do!");
+      progress(Current*1000ULL/Maximum);
+    }
   };
 } // end namespace llvm
 
diff --git a/lib/Support/SlowOperationInformer.cpp b/lib/Support/SlowOperationInformer.cpp
index 9dc2750f76..9fd718e306 100644
--- a/lib/Support/SlowOperationInformer.cpp
+++ b/lib/Support/SlowOperationInformer.cpp
@@ -59,8 +59,12 @@ SlowOperationInformer::SlowOperationInformer(const std::string &Name)
 
 SlowOperationInformer::~SlowOperationInformer() {
   NestedSOI = false;
-  if (LastPrintAmount)
-    std::cout << "\n";
+  if (LastPrintAmount) {
+    // If we have printed something, make _sure_ we print the 100% amount, and
+    // also print a newline.
+    std::cout << std::string(LastPrintAmount, '\b') << "Progress "
+              << OperationName << ": 100%  \n";
+  }
 
   alarm(0);
   signal(SIGALRM, SIG_DFL);
@@ -87,8 +91,11 @@ void SlowOperationInformer::progress(unsigned Amount) {
   std::string ToPrint = std::string(LastPrintAmount, '\b');
 
   std::ostringstream OS;
-  OS << "Progress " << OperationName << ": " << Amount/10 << "." << Amount % 10
-     << "%";
+  OS << "Progress " << OperationName << ": " << Amount/10;
+  if (unsigned Rem = Amount % 10)
+    OS << "." << Rem << "%";
+  else
+    OS << "%  ";
 
   LastPrintAmount = OS.str().size();
   std::cout << ToPrint+OS.str() << std::flush;