2 files changed, 8 insertions, 5 deletions
diff --git a/lib/Debugger/ProgramInfo.cpp b/lib/Debugger/ProgramInfo.cpp
index 3bbb0ec936..66d38f73ca 100644
--- a/lib/Debugger/ProgramInfo.cpp
+++ b/lib/Debugger/ProgramInfo.cpp
@@ -280,7 +280,8 @@ ProgramInfo::getSourceFiles(bool RequiresCompleteMap) {
   // mapping.
   for (unsigned i = 0, e = TranslationUnits.size(); i != e; ++i) {
     getSourceFile(TranslationUnits[i]);
-    SOI.progress(i+1, e);
+    if (SOI.progress(i+1, e))
+      throw "While building source files index, operation cancelled.";
   }
 
   // Ok, if we got this far, then we indexed the whole program.
@@ -361,7 +362,8 @@ ProgramInfo::getSourceFunctions(bool RequiresCompleteMap) {
   // Loop over all of the functions found, building the SourceFunctions mapping.
   for (unsigned i = 0, e = Functions.size(); i != e; ++i) {
     getFunction(Functions[i]);
-    SOI.progress(i+1, e);
+    if (SOI.progress(i+1, e))
+      throw "While functions index, operation cancelled.";
   }
 
   // Ok, if we got this far, then we indexed the whole program.
diff --git a/lib/Support/SlowOperationInformer.cpp b/lib/Support/SlowOperationInformer.cpp
index 4dafa2c5a1..bfdfe8808f 100644
--- a/lib/Support/SlowOperationInformer.cpp
+++ b/lib/Support/SlowOperationInformer.cpp
@@ -37,18 +37,18 @@ SlowOperationInformer::~SlowOperationInformer() {
 /// an exception-safe state.  The Amount variable should indicate how far
 /// along the operation is, given in 1/10ths of a percent (in other words,
 /// Amount should range from 0 to 1000).
-void SlowOperationInformer::progress(unsigned Amount) {
+bool SlowOperationInformer::progress(unsigned Amount) {
   int status = sys::AlarmStatus();
   if (status == -1) {
     std::cout << "\n";
     LastPrintAmount = 0;
-    throw "While " + OperationName + ", operation cancelled.";
+    return true;
   }
 
   // If we haven't spent enough time in this operation to warrant displaying the
   // progress bar, don't do so yet.
   if (status == 0)
-    return;
+    return false;
 
   // Delete whatever we printed last time.
   std::string ToPrint = std::string(LastPrintAmount, '\b');
@@ -62,4 +62,5 @@ void SlowOperationInformer::progress(unsigned Amount) {
 
   LastPrintAmount = OS.str().size();
   std::cout << ToPrint+OS.str() << std::flush;
+  return false;
 }