chore: tidy up unhandled exceptions

Author: vinniefalco

include/mrdox/Support/Error.hpp

@@ -119,6 +119,14 @@ class [[nodiscard]] MRDOX_DECL
         source_location loc =
             source_location::current());
 
+    /** Constructor.
+
+        The constructed object will always
+        indicate a failure, even if the message
+        in the exception is empty.
+    */
+    explicit Error(std::exception const& ex);
+
     /** Constructor.
 
         This constructs a new error from a list
@@ -889,16 +897,6 @@ fatal(
 
 } // report
 
-//------------------------------------------------
-
-/** Report an unhandled exception
-*/
-MRDOX_DECL
-[[noreturn]]
-void
-reportUnhandledException(
-    std::exception const& ex);
-
 } // mrdox
 } // clang
 

lib/Support/Error.cpp

@@ -80,6 +80,17 @@ Error(
     loc_ = loc;
 }
 
+Error::
+Error(
+    std::exception const& ex)
+{
+    std::string_view s(ex.what());
+    if(s.empty())
+        s = "unknown exception";
+    reason_ = s;
+    message_ = s;
+}
+
 Error::
 Error(
     std::vector<Error> const& errors,
@@ -224,20 +235,5 @@ call_impl(
 
 } // report
 
-//------------------------------------------------
-
-void
-reportUnhandledException(
-    std::exception const& ex)
-{
-    namespace sys = llvm::sys;
-
-    std::lock_guard<llvm::sys::Mutex> lock(reportMutex_);
-    llvm::errs() <<
-        "Unhandled exception: " << ex.what() << '\n';
-    sys::PrintStackTrace(llvm::errs());
-    std::exit(EXIT_FAILURE);
-}
-
 } // mrdox
 } // clang

lib/Support/ExecutorGroup.cpp

@@ -125,11 +125,8 @@ run(std::unique_lock<std::mutex> lock)
                 }
                 catch(std::exception const& ex)
                 {
-                    // Any exception which is not
-                    // derived from Exception should
-                    // be reported and terminate
-                    // the process immediately.
-                    reportUnhandledException(ex);
+                    lock.lock();
+                    impl_->errors.emplace(Error(ex));
                 }
             }
         }

lib/Support/ThreadPool.cpp

@@ -75,26 +75,14 @@ post(
         [sp = std::make_shared<
             any_callable<void(void)>>(std::move(f))]
         {
-            try
-            {
-                (*sp)();
-            }
-            catch(std::exception const& ex)
-            {
-                reportUnhandledException(ex);
-            }
+            // do NOT catch exceptions here
+            (*sp)();
         });
         return;
     }
 
-    try
-    {
-        f();
-    }
-    catch(std::exception const& ex)
-    {
-        reportUnhandledException(ex);
-    }
+    // do NOT catch exceptions here
+    f();
 }
 
 //------------------------------------------------
@@ -180,11 +168,8 @@ post(
             }
             catch(std::exception const& ex)
             {
-                // Any exception which is not
-                // derived from Error should
-                // be reported and terminate
-                // the process immediately.
-                reportUnhandledException(ex);
+                std::lock_guard<std::mutex> lock(impl_->mutex);
+                impl_->errors.emplace(Error(ex));
             }
         });
         return;
@@ -200,9 +185,8 @@ post(
     }
     catch(std::exception const& ex)
     {
-        reportUnhandledException(ex);
+        impl_->errors.emplace(Error(ex));
     }
-    return;
 }
 
 } // mrdox

test/TestMain.cpp

@@ -92,6 +92,16 @@ int test_main(int argc, char const* const* argv)
     return EXIT_SUCCESS;
 }
 
+static void reportUnhandledException(
+    std::exception const& ex)
+{
+    namespace sys = llvm::sys;
+
+    llvm::errs() <<
+        "Unhandled exception: " << ex.what() << '\n';
+    sys::PrintStackTrace(llvm::errs());
+}
+
 } // mrdox
 } // clang
 
@@ -103,16 +113,12 @@ int main(int argc, char** argv)
     }
     catch(clang::mrdox::Exception const& ex)
     {
-        // Any exception derived from Exception should
-        // be caught and handled, and never make it here.
+        // thrown Exception should never get here.
         clang::mrdox::reportUnhandledException(ex);
-        return EXIT_FAILURE;
     }
     catch(std::exception const& ex)
     {
-        // Any exception not derived from Exception which
-        // makes it here must be reported and exit the program.
         clang::mrdox::reportUnhandledException(ex);
-        return EXIT_FAILURE;
     }
+    return EXIT_FAILURE;
 }

tool/ToolMain.cpp

@@ -82,6 +82,16 @@ int mrdox_main(int argc, char const** argv)
     return EXIT_SUCCESS;
 }
 
+static void reportUnhandledException(
+    std::exception const& ex)
+{
+    namespace sys = llvm::sys;
+
+    llvm::errs() <<
+        "Unhandled exception: " << ex.what() << '\n';
+    sys::PrintStackTrace(llvm::errs());
+}
+
 } // mrdox
 } // clang
 
@@ -93,17 +103,12 @@ int main(int argc, char const** argv)
     }
     catch(clang::mrdox::Exception const& ex)
     {
-        // Any exception derived from Exception should
-        // be caught and handled, and never make it here.
+        // thrown Exception should never get here.
         clang::mrdox::reportUnhandledException(ex);
-        MRDOX_UNREACHABLE();
     }
     catch(std::exception const& ex)
     {
-        // Any exception not derived from Exception which
-        // makes it here must be reported and terminate the
-        // process immediately.
         clang::mrdox::reportUnhandledException(ex);
-        return EXIT_FAILURE;
     }
+    return EXIT_FAILURE;
 }