From: Sergey Kaplun via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Maxim Kokryashkin <m.kokryashkin@tarantool.org>, Sergey Bronnikov <sergeyb@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH luajit 2/6] FFI: Fix missing cts->L initialization in argv2ctype(). Date: Mon, 23 Oct 2023 12:22:02 +0300 [thread overview] Message-ID: <30f685beb2bf4ce39dd82ede7b10c821af5c6f0d.1698049570.git.skaplun@tarantool.org> (raw) In-Reply-To: <cover.1698049570.git.skaplun@tarantool.org> From: Mike Pall <mike> (cherry-picked from commit 50d6883e6027c4c2f9a5e495fee6b7fff1bd73c9) When start trace recording without an initialized `L` in CType State (possible if the recording is started before any `ffi` library usage), the corresponding assertion fails in the `lj_ctype_intern()`. This patch adds missing initialization during recording. Sergey Kaplun: * added the description and the test for the problem Part of tarantool/tarantool#9145 --- src/lj_crecord.c | 2 +- .../fix-argv2ctype-cts-L-init.test.lua | 15 +++++++++++++++ .../fix-argv2ctype-cts-L-init/script.lua | 14 ++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 test/tarantool-tests/fix-argv2ctype-cts-L-init.test.lua create mode 100644 test/tarantool-tests/fix-argv2ctype-cts-L-init/script.lua diff --git a/src/lj_crecord.c b/src/lj_crecord.c index e1d1110f..10d1dc70 100644 --- a/src/lj_crecord.c +++ b/src/lj_crecord.c @@ -78,7 +78,7 @@ static CTypeID argv2ctype(jit_State *J, TRef tr, cTValue *o) /* Specialize to the string containing the C type declaration. */ emitir(IRTG(IR_EQ, IRT_STR), tr, lj_ir_kstr(J, s)); cp.L = J->L; - cp.cts = ctype_ctsG(J2G(J)); + cp.cts = ctype_cts(J->L); oldtop = cp.cts->top; cp.srcname = strdata(s); cp.p = strdata(s); diff --git a/test/tarantool-tests/fix-argv2ctype-cts-L-init.test.lua b/test/tarantool-tests/fix-argv2ctype-cts-L-init.test.lua new file mode 100644 index 00000000..ee45e424 --- /dev/null +++ b/test/tarantool-tests/fix-argv2ctype-cts-L-init.test.lua @@ -0,0 +1,15 @@ +local tap = require('tap') +local test = tap.test('fix-argv2ctype-cts-L-init'):skipcond({ + ['Test requires JIT enabled'] = not jit.status(), +}) + +-- Loading of 'tap' module initialize `cts->L` during parsing. +-- Run standalone script for testing. +local script = require('utils').exec.makecmd(arg) + +test:plan(1) + +local output = script() +test:is(output, 'OK', 'correct recording with uninitialized cts->L') + +test:done(true) diff --git a/test/tarantool-tests/fix-argv2ctype-cts-L-init/script.lua b/test/tarantool-tests/fix-argv2ctype-cts-L-init/script.lua new file mode 100644 index 00000000..2131385a --- /dev/null +++ b/test/tarantool-tests/fix-argv2ctype-cts-L-init/script.lua @@ -0,0 +1,14 @@ +local ffi = require('ffi') + +jit.opt.start('hotloop=1') + +local i = 1 +-- Use `while` to start compilation of the trace at the first +-- iteration, before `ffi.new()` is called, so `cts->L` is +-- uninitialized. +while i < 3 do + ffi.new('uint64_t', i) + i = i + 1 +end + +print('OK') -- 2.42.0
next prev parent reply other threads:[~2023-10-23 9:27 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-10-23 9:22 [Tarantool-patches] [PATCH luajit 0/6] FFI fixes Sergey Kaplun via Tarantool-patches 2023-10-23 9:22 ` [Tarantool-patches] [PATCH luajit 1/6] Abstract out on-demand loading of FFI library Sergey Kaplun via Tarantool-patches 2023-10-24 14:38 ` Maxim Kokryashkin via Tarantool-patches 2023-11-29 14:35 ` Sergey Bronnikov via Tarantool-patches 2023-10-23 9:22 ` Sergey Kaplun via Tarantool-patches [this message] 2023-10-24 14:49 ` [Tarantool-patches] [PATCH luajit 2/6] FFI: Fix missing cts->L initialization in argv2ctype() Maxim Kokryashkin via Tarantool-patches 2023-10-25 10:19 ` Sergey Kaplun via Tarantool-patches 2023-11-29 14:39 ` Sergey Bronnikov via Tarantool-patches 2023-10-23 9:22 ` [Tarantool-patches] [PATCH luajit 3/6] FFI: Ensure returned string is alive in ffi.typeinfo() Sergey Kaplun via Tarantool-patches 2023-10-24 21:33 ` Maxim Kokryashkin via Tarantool-patches 2023-11-29 14:48 ` Sergey Bronnikov via Tarantool-patches 2023-10-23 9:22 ` [Tarantool-patches] [PATCH luajit 4/6] FFI: Fix dangling reference to CType Sergey Kaplun via Tarantool-patches 2023-10-25 7:48 ` Maxim Kokryashkin via Tarantool-patches 2023-10-25 10:43 ` Sergey Kaplun via Tarantool-patches 2023-10-25 11:42 ` Maxim Kokryashkin via Tarantool-patches 2023-10-25 8:06 ` Maxim Kokryashkin via Tarantool-patches 2023-11-29 15:00 ` Sergey Bronnikov via Tarantool-patches 2023-10-23 9:22 ` [Tarantool-patches] [PATCH luajit 5/6] FFI: Fix dangling reference to CType. Improve checks Sergey Kaplun via Tarantool-patches 2023-10-25 8:05 ` Maxim Kokryashkin via Tarantool-patches 2023-10-25 10:46 ` Sergey Kaplun via Tarantool-patches 2023-10-25 11:42 ` Maxim Kokryashkin via Tarantool-patches 2023-11-29 15:41 ` Sergey Bronnikov via Tarantool-patches 2023-11-30 7:25 ` Sergey Kaplun via Tarantool-patches 2023-12-19 10:55 ` Sergey Bronnikov via Tarantool-patches 2023-10-23 9:22 ` [Tarantool-patches] [PATCH luajit 6/6] FFI: Fix dangling reference to CType in carith_checkarg() Sergey Kaplun via Tarantool-patches 2023-10-25 8:07 ` Maxim Kokryashkin via Tarantool-patches 2023-10-25 10:48 ` Sergey Kaplun via Tarantool-patches 2023-10-25 11:42 ` Maxim Kokryashkin via Tarantool-patches 2023-12-19 10:59 ` Sergey Bronnikov via Tarantool-patches 2023-12-19 11:01 ` [Tarantool-patches] [PATCH luajit 0/6] FFI fixes Sergey Bronnikov via Tarantool-patches 2024-01-10 8:53 ` Igor Munkin via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=30f685beb2bf4ce39dd82ede7b10c821af5c6f0d.1698049570.git.skaplun@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=m.kokryashkin@tarantool.org \ --cc=sergeyb@tarantool.org \ --cc=skaplun@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH luajit 2/6] FFI: Fix missing cts->L initialization in argv2ctype().' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox