aboutsummaryrefslogtreecommitdiff
path: root/src/lj_ccallback.c
diff options
context:
space:
mode:
authorMike Pall <mike>2020-09-22 23:37:43 +0200
committerMike Pall <mike>2020-09-22 23:37:43 +0200
commitdd0f09f95f36caf1f2111c10fec02748116003bb (patch)
tree675a63502635201a70fda3ce4a778c17296efbb8 /src/lj_ccallback.c
parent518e8cbeb435d7c294abbaded97bc1aa897e36c7 (diff)
downloadluajit-dd0f09f95f36caf1f2111c10fec02748116003bb.tar.gz
luajit-dd0f09f95f36caf1f2111c10fec02748116003bb.tar.bz2
luajit-dd0f09f95f36caf1f2111c10fec02748116003bb.zip
Another fix for lua_yield() from C hook.
Reported by Jason Carr.
Diffstat (limited to 'src/lj_ccallback.c')
-rw-r--r--src/lj_ccallback.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_ccallback.c b/src/lj_ccallback.c
index 49775d2b..4c71f1a6 100644
--- a/src/lj_ccallback.c
+++ b/src/lj_ccallback.c
@@ -549,13 +549,13 @@ static void callback_conv_args(CTState *cts, lua_State *L)
549 if (LJ_FR2) { 549 if (LJ_FR2) {
550 (o++)->u64 = LJ_CONT_FFI_CALLBACK; 550 (o++)->u64 = LJ_CONT_FFI_CALLBACK;
551 (o++)->u64 = rid; 551 (o++)->u64 = rid;
552 o++;
553 } else { 552 } else {
554 o->u32.lo = LJ_CONT_FFI_CALLBACK; 553 o->u32.lo = LJ_CONT_FFI_CALLBACK;
555 o->u32.hi = rid; 554 o->u32.hi = rid;
556 o++; 555 o++;
557 } 556 }
558 setframe_gc(o, obj2gco(fn), fntp); 557 setframe_gc(o, obj2gco(fn), fntp);
558 if (LJ_FR2) o++;
559 setframe_ftsz(o, ((char *)(o+1) - (char *)L->base) + FRAME_CONT); 559 setframe_ftsz(o, ((char *)(o+1) - (char *)L->base) + FRAME_CONT);
560 L->top = L->base = ++o; 560 L->top = L->base = ++o;
561 if (!ct) 561 if (!ct)