diff options
-rw-r--r-- | src/lj_ccallback.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lj_ccallback.c b/src/lj_ccallback.c index 00109923..c975c88f 100644 --- a/src/lj_ccallback.c +++ b/src/lj_ccallback.c | |||
@@ -408,6 +408,7 @@ static void callback_conv_args(CTState *cts, lua_State *L) | |||
408 | intptr_t *stack = cts->cb.stack; | 408 | intptr_t *stack = cts->cb.stack; |
409 | MSize slot = cts->cb.slot; | 409 | MSize slot = cts->cb.slot; |
410 | CTypeID id = 0, rid, fid; | 410 | CTypeID id = 0, rid, fid; |
411 | int gcsteps = 0; | ||
411 | CType *ct; | 412 | CType *ct; |
412 | GCfunc *fn; | 413 | GCfunc *fn; |
413 | MSize ngpr = 0, nsp = 0, maxgpr = CCALL_NARG_GPR; | 414 | MSize ngpr = 0, nsp = 0, maxgpr = CCALL_NARG_GPR; |
@@ -475,7 +476,7 @@ static void callback_conv_args(CTState *cts, lua_State *L) | |||
475 | done: | 476 | done: |
476 | if (LJ_BE && cta->size < CTSIZE_PTR) | 477 | if (LJ_BE && cta->size < CTSIZE_PTR) |
477 | sp = (void *)((uint8_t *)sp + CTSIZE_PTR-cta->size); | 478 | sp = (void *)((uint8_t *)sp + CTSIZE_PTR-cta->size); |
478 | lj_cconv_tv_ct(cts, cta, 0, o++, sp); | 479 | gcsteps += lj_cconv_tv_ct(cts, cta, 0, o++, sp); |
479 | } | 480 | } |
480 | fid = ctf->sib; | 481 | fid = ctf->sib; |
481 | } | 482 | } |
@@ -485,6 +486,8 @@ static void callback_conv_args(CTState *cts, lua_State *L) | |||
485 | if (ctype_cconv(ct->info) != CTCC_CDECL) | 486 | if (ctype_cconv(ct->info) != CTCC_CDECL) |
486 | (L->base-2)->u32.hi |= (nsp << (16+2)); | 487 | (L->base-2)->u32.hi |= (nsp << (16+2)); |
487 | #endif | 488 | #endif |
489 | while (gcsteps-- > 0) | ||
490 | lj_gc_check(L); | ||
488 | } | 491 | } |
489 | 492 | ||
490 | /* Convert Lua object to callback result. */ | 493 | /* Convert Lua object to callback result. */ |