<HTML><BODY><div>Hi, Sergey!</div><div>Thanks for the patch!</div><div>LGTM</div><div data-signature-widget="container"><div data-signature-widget="content"><div>--<br>Best regards,</div><div>Maxim Kokryashkin</div></div></div><div> </div><div> </div><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;">Понедельник, 23 октября 2023, 12:26 +03:00 от Sergey Kaplun <skaplun@tarantool.org>:<br> <div id=""><div class="js-helper js-readmsg-msg"><div><div id="style_16980531970589698812_BODY">From: Mike Pall <mike><br><br>(cherry-picked from commit 50d6883e6027c4c2f9a5e495fee6b7fff1bd73c9)<br><br>This patch introduces the macro `ctype_loadffi(L)` to avoid code<br>duplication while loading the FFI library.<br><br>Sergey Kaplun:<br>* added the description<br><br>Part of tarantool/tarantool#9145<br>---<br> src/lib_jit.c | 6 +-----<br> src/lj_bcread.c | 6 +-----<br> src/lj_ctype.h | 10 ++++++++++<br> src/lj_lex.c | 6 +-----<br> 4 files changed, 13 insertions(+), 15 deletions(-)<br><br>diff --git a/src/lib_jit.c b/src/lib_jit.c<br>index b3c1c93c..f705f334 100644<br>--- a/src/lib_jit.c<br>+++ b/src/lib_jit.c<br>@@ -339,11 +339,7 @@ LJLIB_CF(jit_util_tracek)<br> ir = &T->ir[ir->op1];<br> }<br> #if LJ_HASFFI<br>- if (ir->o == IR_KINT64 && !ctype_ctsG(G(L))) {<br>- ptrdiff_t oldtop = savestack(L, L->top);<br>- luaopen_ffi(L); /* Load FFI library on-demand. */<br>- L->top = restorestack(L, oldtop);<br>- }<br>+ if (ir->o == IR_KINT64) ctype_loadffi(L);<br> #endif<br> lj_ir_kvalue(L, L->top-2, ir);<br> setintV(L->top-1, (int32_t)irt_type(ir->t));<br>diff --git a/src/lj_bcread.c b/src/lj_bcread.c<br>index cddf6ff1..4915240f 100644<br>--- a/src/lj_bcread.c<br>+++ b/src/lj_bcread.c<br>@@ -414,11 +414,7 @@ static int bcread_header(LexState *ls)<br> if ((flags & BCDUMP_F_FFI)) {<br> #if LJ_HASFFI<br> lua_State *L = ls->L;<br>- if (!ctype_ctsG(G(L))) {<br>- ptrdiff_t oldtop = savestack(L, L->top);<br>- luaopen_ffi(L); /* Load FFI library on-demand. */<br>- L->top = restorestack(L, oldtop);<br>- }<br>+ ctype_loadffi(L);<br> #else<br> return 0;<br> #endif<br>diff --git a/src/lj_ctype.h b/src/lj_ctype.h<br>index c4f3bdde..fce29409 100644<br>--- a/src/lj_ctype.h<br>+++ b/src/lj_ctype.h<br>@@ -389,6 +389,16 @@ static LJ_AINLINE CTState *ctype_cts(lua_State *L)<br> return cts;<br> }<br> <br>+/* Load FFI library on-demand. */<br>+#define ctype_loadffi(L) \<br>+ do { \<br>+ if (!ctype_ctsG(G(L))) { \<br>+ ptrdiff_t oldtop = (char *)L->top - mref(L->stack, char); \<br>+ luaopen_ffi(L); \<br>+ L->top = (TValue *)(mref(L->stack, char) + oldtop); \<br>+ } \<br>+ } while (0)<br>+<br> /* Save and restore state of C type table. */<br> #define LJ_CTYPE_SAVE(cts) CTState savects_ = *(cts)<br> #define LJ_CTYPE_RESTORE(cts) \<br>diff --git a/src/lj_lex.c b/src/lj_lex.c<br>index cef3c683..7c6319cc 100644<br>--- a/src/lj_lex.c<br>+++ b/src/lj_lex.c<br>@@ -112,11 +112,7 @@ static void lex_number(LexState *ls, TValue *tv)<br> GCcdata *cd;<br> lj_assertLS(fmt == STRSCAN_I64 || fmt == STRSCAN_U64 || fmt == STRSCAN_IMAG,<br> "unexpected number format %d", fmt);<br>- if (!ctype_ctsG(G(L))) {<br>- ptrdiff_t oldtop = savestack(L, L->top);<br>- luaopen_ffi(L); /* Load FFI library on-demand. */<br>- L->top = restorestack(L, oldtop);<br>- }<br>+ ctype_loadffi(L);<br> if (fmt == STRSCAN_IMAG) {<br> cd = lj_cdata_new_(L, CTID_COMPLEX_DOUBLE, 2*sizeof(double));<br> ((double *)cdataptr(cd))[0] = 0;<br>--<br>2.42.0</div></div></div></div></blockquote><div> </div></BODY></HTML>