[Tarantool-patches] [PATCH luajit] x64: Properly fix __call metamethod return dispatch.

Igor Munkin imun at tarantool.org
Thu Nov 23 09:29:47 MSK 2023


Sergey,

I've checked the patchset into all long-term branches in
tarantool/luajit and bumped a new version in master, release/2.11 and
release/2.10.

On 07.11.23, Sergey Kaplun wrote:
> From: Mike Pall <mike>
> 
> Reported by Sergey Kaplun.
> 
> (cherry-picked from commit d133d67c881f363f0b5584ebd21a965eb3435aa1)
> 
> This patch is the follow-up for the commit
> 1672bdc0ffbee9f32fadb6943909d6af7eb9a7b1 ("x64: Fix __call metamethod
> return dispatch."). This patch uses the incorrect macro x64 (which is
> undefined in dasm) instead of X64. `KBASE` (r15d) is still compared
> against `BASE` (edx) instead of `KBASEa` (r15) against rdx.
> 
> This patch fixes the typo, so the correct registers are chosen.
> 
> Sergey Kaplun:
> * added the description for the problem
> 
> Part of tarantool/tarantool#9145
> ---
> 
> The test is omitted for the same reason as it was omitted in the 1672bdc
> commit: it is too hard (or even impossible) to create the test case.
> 
> Branch: https://github.com/tarantool/luajit/tree/skaplun/lj-1110-x64-return-dispatch
> Tarantool PR: https://github.com/tarantool/tarantool/pull/9335
> Relate issues and PRs:
> * https://github.com/LuaJIT/LuaJIT/pull/636
> * https://github.com/LuaJIT/LuaJIT/issues/1110
> * https://github.com/tarantool/tarantool/issues/9145
> 
>  src/vm_x86.dasc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 

<snipped>

> -- 
> 2.42.0
> 

-- 
Best regards,
IM


More information about the Tarantool-patches mailing list