From c4adc6d6aa772cb9b8e5dc294bbdc75b4e22f38d Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sat, 1 Apr 2017 11:33:11 +0200
Subject: Redo handling of unhandled exceptions in async execution

Here is the problem: noexcept looses the call stack. That is, unlike an
unhandled exception, if noexcept is tripped, then you won't see the place
where it was thrown.

In this new implementation we now have noexcept only on the task thunk. And
the task is called via a thunk only in case of async execution. This means
that if we are executing serially (-j 1), then this will be an unhandled
exception, not noexcept. Hopefully will be a bit easier to debug.
---
 build2/test/rule.cxx           | 11 ++---------
 build2/test/script/builtin.cxx | 12 +-----------
 build2/test/script/parser.cxx  | 11 ++---------
 3 files changed, 5 insertions(+), 29 deletions(-)

(limited to 'build2/test')

diff --git a/build2/test/rule.cxx b/build2/test/rule.cxx
index 8e39104..bc90c1f 100644
--- a/build2/test/rule.cxx
+++ b/build2/test/rule.cxx
@@ -367,7 +367,7 @@ namespace build2
     perform_script_impl (const target& t,
                          const testscript& ts,
                          const dir_path& wd,
-                         const common& c) noexcept
+                         const common& c)
     {
       using namespace script;
 
@@ -397,13 +397,6 @@ namespace build2
       {
         r = scope_state::failed;
       }
-      catch (const std::exception& e)
-      {
-        diag_lock l;
-        *diag_stream << "unhandled exception: " << e << endl;
-        assert (false);
-        abort ();
-      }
 
       return r;
     }
@@ -525,7 +518,7 @@ namespace build2
                                       const target& t,
                                       const testscript& ts,
                                       const dir_path& wd,
-                                      const diag_frame* ds) noexcept
+                                      const diag_frame* ds)
                               {
                                 diag_frame df (ds);
                                 r = perform_script_impl (t, ts, wd, *this);
diff --git a/build2/test/script/builtin.cxx b/build2/test/script/builtin.cxx
index 9bd6a1b..a2f3107 100644
--- a/build2/test/script/builtin.cxx
+++ b/build2/test/script/builtin.cxx
@@ -1355,17 +1355,7 @@ namespace build2
                     auto_fd in, auto_fd out, auto_fd err,
                     uint8_t& r) noexcept
       {
-        try
-        {
-          r = fn (sp, args, move (in), move (out), move (err));
-        }
-        catch (const std::exception& e)
-        {
-          diag_lock l;
-          *diag_stream << "unhandled exception: " << e << endl;
-          assert (false);
-          abort ();
-        }
+        r = fn (sp, args, move (in), move (out), move (err));
       }
 
       // Run builtin implementation asynchronously.
diff --git a/build2/test/script/parser.cxx b/build2/test/script/parser.cxx
index d6d77fe..350ca44 100644
--- a/build2/test/script/parser.cxx
+++ b/build2/test/script/parser.cxx
@@ -2868,7 +2868,7 @@ namespace build2
       }
 
       static void
-      execute_impl (scope& s, script& scr, runner& r) noexcept
+      execute_impl (scope& s, script& scr, runner& r)
       {
         try
         {
@@ -2879,13 +2879,6 @@ namespace build2
         {
           s.state = scope_state::failed;
         }
-        catch (const std::exception& e)
-        {
-          diag_lock l;
-          *diag_stream << "unhandled exception: " << e << endl;
-          assert (false);
-          abort ();
-        }
       }
 
       void parser::
@@ -3007,7 +3000,7 @@ namespace build2
                                 [] (scope& s,
                                     script& scr,
                                     runner& r,
-                                    const diag_frame* ds) noexcept
+                                    const diag_frame* ds)
                                 {
                                   diag_frame df (ds);
                                   execute_impl (s, scr, r);
-- 
cgit v1.1