Fix finalizers in coroutine lanes

2 files changed, 11 insertions, 6 deletions

diff --git a/src/lane.cpp b/src/lane.cpp
index 10060ad..e045d88 100644
--- a/src/lane.cpp
+++ b/src/lane.cpp
@@ -813,8 +813,10 @@ static void lane_main(Lane* const lane_)
         push_stack_trace(_L, lane_->errorTraceLevel, _rc, 1);                                      // L: retvals|error [trace]
 
         DEBUGSPEW_CODE(DebugSpew(lane_->U) << "Lane " << _L << " body: " << GetErrcodeName(_rc) << " (" << (kCancelError.equals(_L, 1) ? "cancelled" : luaG_typename(_L, 1)) << ")" << std::endl);
-        //  Call finalizers, if the script has set them up.
-        LuaError const _rc2{ run_finalizers(_L, lane_->errorTraceLevel, _rc) };
+        // Call finalizers, if the script has set them up.
+        // If the lane is not a coroutine, there is only a regular state, so everything is the same whether we use S or L.
+        // If the lane is a coroutine, this has to be done from the master state (S), not the thread (L), because we can't lua_pcall in a thread state
+        LuaError const _rc2{ run_finalizers(lane_->S, lane_->errorTraceLevel, _rc) };
         DEBUGSPEW_CODE(DebugSpew(lane_->U) << "Lane " << _L << " finalizer: " << GetErrcodeName(_rc2) << std::endl);
         if (_rc2 != LuaError::OK) { // Error within a finalizer!
             // the finalizer generated an error, and left its own error message [and stack trace] on the stack
diff --git a/tests/cancel.lua b/tests/cancel.lua
index 9ee986c..8dfccd2 100644
--- a/tests/cancel.lua
+++ b/tests/cancel.lua
@@ -26,6 +26,9 @@ local linda = lanes.linda()
 -- a numeric value to read
 linda:set( "val", 33.0)
 
+-- so that we can easily swap between lanes.gen and lanes.coro, to try stuff
+local generator = lanes.coro
+
 -- ##################################################################################################
 
 if not next(which_tests) or which_tests.genlock then
@@ -149,7 +152,7 @@ end
 if not next(which_tests) or which_tests.linda then
         remaining_tests.linda = nil
         print "\n\n####################################################################\nbegin linda cancel test\n"
-        h = lanes.gen( "*", laneBody)( "receive", nil) -- start an infinite wait on the linda
+        h = generator( "*", laneBody)( "receive", nil) -- start an infinite wait on the linda
 
         print "wait 1s"
         SLEEP(1)
@@ -170,7 +173,7 @@ end
 if not next(which_tests) or which_tests.soft then
         remaining_tests.soft = nil
         print "\n\n####################################################################\nbegin soft cancel test\n"
-        h = lanes.gen( "*", protectedBody)( "receive") -- start an infinite wait on the linda
+        h = generator( "*", protectedBody)( "receive") -- start an infinite wait on the linda
 
         print "wait 1s"
         SLEEP(1)
@@ -194,7 +197,7 @@ end
 if not next(which_tests) or which_tests.hook then
         remaining_tests.hook = nil
         print "\n\n####################################################################\nbegin hook cancel test\n"
-        h = lanes.gen( "*", protectedBody)( "get", 300000)
+        h = generator( "*", protectedBody)( "get", 300000)
         print "wait 2s"
         SLEEP(2)
 
@@ -230,7 +233,7 @@ end
 if not next(which_tests) or which_tests.hard_unprotected then
         remaining_tests.hard_unprotected = nil
         print "\n\n####################################################################\nbegin hard cancel test with unprotected lane body\n"
-        h = lanes.gen( "*", laneBody)( "receive", nil)
+        h = generator( "*", laneBody)( "receive", nil)
 
         -- wait 2s before cancelling the lane
         print "wait 2s"