From: Sergey Kaplun via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: Maxim Kokryashkin <m.kokryashkin@tarantool.org>
Cc: Maksim Kokryashkin <max.kokryashkin@gmail.com>,
tarantool-patches@dev.tarantool.org
Subject: Re: [Tarantool-patches] [PATCH luajit] FFI: Fix recording of union initialization.
Date: Sat, 15 Jul 2023 14:27:10 +0300 [thread overview]
Message-ID: <ZLKCjgiERSm+TCbc@root> (raw)
In-Reply-To: <1689346625.351693821@f380.i.mail.ru>
Hi, Max!
Thanks for the fixes!
LGTM, with a minor reminder below.
I suppose, that Sergey concerned about test name in the `test:ok()`
routine.
On 14.07.23, Maxim Kokryashkin wrote:
>
> Hi!
> Thanks for the review!
> Added a comment with the test description, the branch is force-pushed.
> Here is the diff for the test description:
> ==============================================
> diff --git a/test/tarantool-tests/lj-128-fix-union-init.test.lua b/test/tarantool-tests/lj-128-fix-union-init.test.lua
> index 6a49cec8..65ba0f28 100644
> --- a/test/tarantool-tests/lj-128-fix-union-init.test.lua
> +++ b/test/tarantool-tests/lj-128-fix-union-init.test.lua
> @@ -10,6 +10,46 @@ test:plan(NITERATIONS)
> local ffi = require('ffi')
> local union_type = ffi.typeof('union { uint32_t u; float f; }')
>
> +-- Before the patch, the `union_type` call resulted in the
> +-- initialization of both the integer and the float members
> +-- of the union, leading to undefined behavior since the
> +-- integer member was overwritten.
> +-- The IR was the following:
> +--
> +-- 0031 ------ LOOP ------------
> +-- 0032 u8 XLOAD [0x100684521] V
> +-- 0033 int BAND 0032 +12
> +-- 0034 > int EQ 0033 +0
> +-- 0035 > cdt CNEW +96
> +-- 0036 p64 ADD 0035 +16
> +-- 0037 u32 XSTORE 0036 0029 <--- `u` member init
> +-- 0038 flt XSTORE 0036 0022 <--- `f` member init
> +-- 0039 u32 XLOAD 0036
> +-- 0040 num CONV 0039 num.u32
> +-- 0041 num CONV 0029 num.int
> +-- 0042 > num EQ 0041 0040
> +-- 0043 + int ADD 0029 +1
> +-- 0044 > int LE 0043 0001
> +-- 0045 int PHI 0029 0043
> +--
> +-- After the patch, the initialization is performed only
> +-- for the first member of the union, so now IR looks
> +-- like this:
> +-- 0029 ------ LOOP ------------
> +-- 0030 u8 XLOAD [0x1047c4521] V
> +-- 0031 int BAND 0030 +12
> +-- 0032 > int EQ 0031 +0
> +-- 0033 } cdt CNEW +96
> +-- 0034 p64 ADD 0033 +16
> +-- 0035 } u32 XSTORE 0034 0027 <--- `u` member init
> +-- 0036 u32 CONV 0027 u32.int
> +-- 0037 num CONV 0036 num.u32
> +-- 0038 num CONV 0027 num.int
> +-- 0039 > num EQ 0038 0037
> +-- 0040 + int ADD 0027 +1
> +-- 0041 > int LE 0040 0001
> +-- 0042 int PHI 0027 0040
> +
> jit.opt.start('hotloop=1')
> for i = 1, NITERATIONS do
> test:ok(union_type(i).u == i)
Minor: the description of the test is still missing.
> ==============================================
<snipped>
> >>> +for i = 1, NITERATIONS do
> >>> + test:ok(union_type(i).u == i)
> >>testcases description is missed, please add one.
> >>> +end
> >>> +
> >>> +os.exit(test:check() and 0 or 1)
> >
--
Best regards,
Sergey Kaplun
next prev parent reply other threads:[~2023-07-15 11:31 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-10 15:56 Maksim Kokryashkin via Tarantool-patches
2023-07-13 9:26 ` Sergey Bronnikov via Tarantool-patches
2023-07-13 10:30 ` Sergey Kaplun via Tarantool-patches
2023-07-14 14:57 ` Maxim Kokryashkin via Tarantool-patches
2023-07-15 11:27 ` Sergey Kaplun via Tarantool-patches [this message]
2023-07-17 11:31 ` Maxim Kokryashkin via Tarantool-patches
2023-07-18 15:11 ` Sergey Bronnikov via Tarantool-patches
2023-07-20 18:37 ` 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=ZLKCjgiERSm+TCbc@root \
--to=tarantool-patches@dev.tarantool.org \
--cc=m.kokryashkin@tarantool.org \
--cc=max.kokryashkin@gmail.com \
--cc=skaplun@tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH luajit] FFI: Fix recording of union initialization.' \
/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