#4320 MacOS crash handling

Author: akleshchev

indra/llcommon/workqueue.cpp

@@ -182,14 +182,22 @@ void LL::WorkQueueBase::callWork(const Work& work)
     }
     catch (...)
     {
-        // Stash any other kind of uncaught exception to be rethrown by main thread.
-        LL_WARNS("LLCoros") << "Capturing and rethrowing uncaught exception in WorkQueueBase "
+        if (getKey() != "mainloop")
+        {
+            // Stash any other kind of uncaught exception to be rethrown by main thread.
+            LL_WARNS("LLCoros") << "Capturing and rethrowing uncaught exception in WorkQueueBase "
             << getKey() << LL_ENDL;
-
-        LL::WorkQueue::ptr_t main_queue = LL::WorkQueue::getInstance("mainloop");
-        main_queue->post(
-            // Bind the current exception, rethrow it in main loop.
-            [exc = std::current_exception()]() { std::rethrow_exception(exc); });
+            
+            LL::WorkQueue::ptr_t main_queue = LL::WorkQueue::getInstance("mainloop");
+            main_queue->post(
+                             // Bind the current exception, rethrow it in main loop.
+                             [exc = std::current_exception()]() { std::rethrow_exception(exc); });
+        }
+        else
+        {
+            // let main loop crash
+            throw;
+        }
     }
 #endif // else LL_WINDOWS
 }

indra/newview/llappviewer.cpp

@@ -5696,7 +5696,8 @@ void LLAppViewer::forceExceptionThreadCrash()
 
         void run()
         {
-            throw std::exception();
+            const std::string exception_text = "This is a deliberate exception in a thread";
+            throw std::runtime_error(exception_text);
         }
     };