From: Igor Munkin via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Sergey Kaplun <skaplun@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH luajit] LJ_GC64: Fix ir_khash for non-string GCobj. Date: Thu, 12 Jan 2023 17:55:31 +0300 [thread overview] Message-ID: <Y8AfY/CBQAP6K2zZ@tarantool.org> (raw) In-Reply-To: <20221208054618.9104-1-skaplun@tarantool.org> Sergey, I've checked the patches into all long-term branches in tarantool/luajit and bumped a new version in master, 2.10 and 1.10. On 08.12.22, Sergey Kaplun via Tarantool-patches wrote: > From: Mike Pall <mike> > > Contributed by Peter Cawley. > > (cherry picked from commit b4ed3219a1a98dd9fe7d1e3eeea3b82f5a780948) > > When emitting `IR_HREF` for constant value to lookup the `ir_khash()` > function is used to calculate hash for the corresponding object. > This calculation must be the same as in the corresponding `hashkey()` > function from <lj_tab.c>. > > Hash calculating via passing two arguments `lo`, and `hi` to `hashrot()` > routine. For non-string GC objects the first `lo` argument is the same > for GC64 and not GC64 mode -- lower 32 bits of the object address. For > GC64 mode `hi` argument is upper 32 bits of the object address, > including specific type NaN-tag. This `hi` argument in `ir_khash()` > function is miscalculated in GC64 using non-GC64 value (`lo` + > `HASH_BIAS`). As a result, the hash for the GC object is miscalculated > on trace and we exit from trace due to assertion guard on the type or > value check. > > This patch fixes calculation of hash value on trace for GC64 mode by > making it consistent with `hashkey()`. > > Sergey Kaplun: > * added the description and the test for the problem > > Part of tarantool/tarantool#7230 > --- > > Branch: https://github.com/tarantool/luajit/tree/skaplun/lj-356-ir-khash-non-string-obj-full-ci > Issue/PR: > * https://github.com/tarantool/tarantool/issues/7230 > * https://github.com/LuaJIT/LuaJIT/pull/356 > Tarantool PR: https://github.com/tarantool/tarantool/pull/8020 > > Side note: Problems with red fuzzer jobs look irrelevant to the patch. > > src/lj_asm.c | 4 + > .../lj-356-ir-khash-non-string-obj.test.lua | 90 +++++++++++++++++++ > 2 files changed, 94 insertions(+) > create mode 100644 test/tarantool-tests/lj-356-ir-khash-non-string-obj.test.lua > <snipped> > -- > 2.34.1 > -- Best regards, IM
prev parent reply other threads:[~2023-01-12 15:10 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-12-08 5:46 Sergey Kaplun via Tarantool-patches 2022-12-12 11:44 ` Maxim Kokryashkin via Tarantool-patches 2022-12-15 10:00 ` Sergey Kaplun via Tarantool-patches 2022-12-14 11:33 ` sergos via Tarantool-patches 2022-12-15 10:13 ` Sergey Kaplun via Tarantool-patches 2022-12-15 11:46 ` Maxim Kokryashkin via Tarantool-patches 2022-12-15 15:39 ` sergos via Tarantool-patches 2023-01-12 14:55 ` Igor Munkin via Tarantool-patches [this message]
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=Y8AfY/CBQAP6K2zZ@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=imun@tarantool.org \ --cc=skaplun@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH luajit] LJ_GC64: Fix ir_khash for non-string GCobj.' \ /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