Make rt_trapExceptions apply to fibers as well

Marenz · Marenz · commit eef5dc5bc1ea · 2016-04-07T15:17:42.000+02:00
diff --git a/src/core/thread.d b/src/core/thread.d
@@ -3514,6 +3514,8 @@ shared static this()
 
 private
 {
+    extern extern (C) __gshared bool rt_trapExceptions;
+
     extern (C) void fiber_entryPoint()
     {
         Fiber   obj = Fiber.getThis();
@@ -3524,13 +3526,21 @@ private
         obj.m_ctxt.tstack = obj.m_ctxt.bstack;
         obj.m_state = Fiber.State.EXEC;
 
-        try
+
+        if (rt_trapExceptions)
         {
-            obj.run();
+            try
+            {
+                obj.run();
+            }
+            catch( Throwable t )
+            {
+                obj.m_unhandled = t;
+            }
         }
-        catch( Throwable t )
+        else
         {
-            obj.m_unhandled = t;
+            obj.run();
         }
 
         static if( __traits( compiles, ucontext_t ) )

Original file line number	Diff line number	Diff line change
`@@ -3514,6 +3514,8 @@ shared static this()`
`3514`	`3514`
`3515`	`3515`	`private`
`3516`	`3516`	`{`
	`3517`	`+ extern extern (C) __gshared bool rt_trapExceptions;`
	`3518`	`+`
`3517`	`3519`	`extern (C) void fiber_entryPoint()`
`3518`	`3520`	`{`
`3519`	`3521`	`Fiber obj = Fiber.getThis();`
`@@ -3524,13 +3526,21 @@ private`
`3524`	`3526`	`obj.m_ctxt.tstack = obj.m_ctxt.bstack;`
`3525`	`3527`	`obj.m_state = Fiber.State.EXEC;`
`3526`	`3528`
`3527`		`- try`
	`3529`	`+`
	`3530`	`+ if (rt_trapExceptions)`
`3528`	`3531`	`{`
`3529`		`- obj.run();`
	`3532`	`+ try`
	`3533`	`+ {`
	`3534`	`+ obj.run();`
	`3535`	`+ }`
	`3536`	`+ catch( Throwable t )`
	`3537`	`+ {`
	`3538`	`+ obj.m_unhandled = t;`
	`3539`	`+ }`
`3530`	`3540`	`}`
`3531`		`- catch( Throwable t )`
	`3541`	`+ else`
`3532`	`3542`	`{`
`3533`		`- obj.m_unhandled = t;`
	`3543`	`+ obj.run();`
`3534`	`3544`	`}`
`3535`	`3545`
`3536`	`3546`	`static if( __traits( compiles, ucontext_t ) )`