From: Maxim Kokryashkin via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: tarantool-patches@dev.tarantool.org, skaplun@tarantool.org, sergeyb@tarantool.org Subject: [Tarantool-patches] [PATCH luajit 2/2] Fix frame for more types of on-trace error messages. Date: Tue, 5 Sep 2023 13:39:15 +0300 [thread overview] Message-ID: <b4c093aabaaa9ec509887a6d28b5c820d42da0b9.1693910172.git.m.kokryashkin@tarantool.org> (raw) In-Reply-To: <cover.1693910172.git.m.kokryashkin@tarantool.org> From: Mike Pall <mike> Thanks to Maxim Kokryashkin. (cherry-picked from commit d5bbf9cdb4c5eddc404a90bd44f077cfb3a57a90) This patch fixes the same issue with frame, as the previous one, but now for the table overflow error in the `err_msgv` function. The test for the problem uses the table of GC finalizers, although they are not required to reproduce the issue. They only used to make the test as simple as possible. Resolves tarantool/tarantool#562 Part of tarantool/tarantool#8825 --- src/lj_err.c | 4 +++ .../lj-1034-tabov-error-frame.test.lua | 27 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 test/tarantool-tests/lj-1034-tabov-error-frame.test.lua diff --git a/src/lj_err.c b/src/lj_err.c index 763746e6..46fb81ee 100644 --- a/src/lj_err.c +++ b/src/lj_err.c @@ -875,6 +875,10 @@ LJ_NORET LJ_NOINLINE static void err_msgv(lua_State *L, ErrMsg em, ...) const char *msg; va_list argp; va_start(argp, em); + if (LJ_HASJIT) { + TValue *base = tvref(G(L)->jit_base); + if (base) L->base = base; + } if (curr_funcisL(L)) L->top = curr_topL(L); msg = lj_strfmt_pushvf(L, err2msg(em), argp); va_end(argp); diff --git a/test/tarantool-tests/lj-1034-tabov-error-frame.test.lua b/test/tarantool-tests/lj-1034-tabov-error-frame.test.lua new file mode 100644 index 00000000..b7520d92 --- /dev/null +++ b/test/tarantool-tests/lj-1034-tabov-error-frame.test.lua @@ -0,0 +1,27 @@ +local tap = require('tap') +local ffi = require('ffi') +local test = tap.test('lj-1034-tabov-error-frame'):skipcond({ + ['Test requires JIT enabled'] = not jit.status(), + ['Test requires GC64 mode enabled'] = not ffi.abi('gc64'), + ['Disabled on MacOS due to #8652'] = jit.os == 'OSX', +}) + +test:plan(2) + +-- luacheck: no unused +local anchor = {} +local function on_gc(t) end + +local function test_finalizers() + local i = 1 + while true do + anchor[i] = ffi.gc(ffi.cast('void *', 0), on_gc) + i = i + 1 + end +end + +local st, err = pcall(test_finalizers) +st, err = pcall(test_finalizers) +test:ok(st == false, 'error handled successfully') +test:like(err, '^.+table overflow', 'error is table overflow') +test:done(true) -- 2.41.0
next prev parent reply other threads:[~2023-09-05 10:40 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-09-05 10:39 [Tarantool-patches] [PATCH luajit 0/2] Fix frames for on trace errors Maxim Kokryashkin via Tarantool-patches 2023-09-05 10:39 ` [Tarantool-patches] [PATCH luajit 1/2] Fix frame for on-trace out-of-memory error Maxim Kokryashkin via Tarantool-patches 2023-09-07 8:07 ` Sergey Bronnikov via Tarantool-patches 2023-09-08 13:18 ` Maxim Kokryashkin via Tarantool-patches 2023-09-12 9:53 ` Sergey Bronnikov via Tarantool-patches 2023-09-11 8:04 ` Sergey Kaplun via Tarantool-patches 2023-09-11 11:52 ` Maxim Kokryashkin via Tarantool-patches 2023-09-05 10:39 ` Maxim Kokryashkin via Tarantool-patches [this message] 2023-09-07 8:11 ` [Tarantool-patches] [PATCH luajit 2/2] Fix frame for more types of on-trace error messages Sergey Bronnikov via Tarantool-patches 2023-09-07 8:56 ` Maxim Kokryashkin via Tarantool-patches 2023-09-07 10:06 ` Sergey Bronnikov via Tarantool-patches 2023-09-11 8:20 ` Sergey Kaplun via Tarantool-patches 2023-09-11 13:45 ` Maxim Kokryashkin via Tarantool-patches 2023-09-27 12:33 ` [Tarantool-patches] [PATCH luajit 0/2] Fix frames for on trace errors 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=b4c093aabaaa9ec509887a6d28b5c820d42da0b9.1693910172.git.m.kokryashkin@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=max.kokryashkin@gmail.com \ --cc=sergeyb@tarantool.org \ --cc=skaplun@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH luajit 2/2] Fix frame for more types of on-trace error messages.' \ /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