[Tarantool-patches] [PATCH luajit v2 4/5] Revert "Update cur_L on exceptional path (arm)"
Maxim Kokryashkin
max.kokryashkin at gmail.com
Fri Sep 29 09:20:13 MSK 2023
This reverts commit 5ccd25d740476a37d414733b5192d5be0ef06173.
As was mentioned in tarantool/tarantool#6189, throwing an error
not on the currently executed coroutine is a violation of the
Lua/C API. This patch is a part of the patchset that supports
this violation and is reverted because of it.
Part of tarantool/tarantool#6323
---
src/vm_arm.dasc | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/vm_arm.dasc b/src/vm_arm.dasc
index 767d31f9..7095e660 100644
--- a/src/vm_arm.dasc
+++ b/src/vm_arm.dasc
@@ -351,7 +351,6 @@ static void build_subroutines(BuildCtx *ctx)
| mv_vmstate CARG4, CFUNC
| ldr GL:CARG3, L->glref
| str CARG4, GL:CARG3->vmstate
- | str L, GL:CARG3->cur_L
| b ->vm_leave_unw
|
|->vm_unwind_ff: // Unwind C stack, return from ff pcall.
@@ -372,7 +371,6 @@ static void build_subroutines(BuildCtx *ctx)
| mv_vmstate CARG2, INTERP
| str CARG1, [BASE, #-4] // Prepend false to error message.
| st_vmstate CARG2
- | str L, [DISPATCH, #DISPATCH_GL(cur_L)]
| b ->vm_returnc
|
|->vm_unwind_ext: // Complete external unwind.
--
2.42.0
More information about the Tarantool-patches
mailing list