From cde911d0e0a65a17d39b5ac60bae2bc2fe63bead Mon Sep 17 00:00:00 2001
From: Igor Munkin <imun@tarantool.org>
Date: Wed, 24 May 2023 13:08:03 +0000
Subject: [PATCH] luajit: bump new version
* Fix IR_RENAME snapshot number. Follow-up fix for a32aeadc.
* OSX: Disable unreliable assertion for external frame unwinding.
* Disable unreliable assertion for external frame unwinding.
* Handle on-trace OOM errors from helper functions.
* LJ_GC64: Make ASMREF_L references 64 bit.
* lldb: introduce luajit-lldb
* x64/LJ_GC64: Fix emit_rma().
* Limit path length passed to C library loader.
Closes #7745
Part of #4808
Part of #8069
Part of #8516
NO_DOC=LuaJIT submodule bump
NO_TEST=LuaJIT submodule bump
---
changelogs/unreleased/gh-7745-exceptions-on-traces.md | 3 +++
changelogs/unreleased/gh-8069-luajit-fixes.md | 2 ++
changelogs/unreleased/gh-8516-luajit-fixes.md | 6 ++++++
third_party/luajit | 2 +-
4 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 changelogs/unreleased/gh-7745-exceptions-on-traces.md
create mode 100644 changelogs/unreleased/gh-8516-luajit-fixes.md
diff --git a/changelogs/unreleased/gh-7745-exceptions-on-traces.md b/changelogs/unreleased/gh-7745-exceptions-on-traces.md
new file mode 100644
index 0000000000..12042c3949
--- /dev/null
+++ b/changelogs/unreleased/gh-7745-exceptions-on-traces.md
@@ -0,0 +1,3 @@
+## feature/luajit
+
+* Now the LuaJIT can handle exceptions on traces (gh-7745).
diff --git a/changelogs/unreleased/gh-8069-luajit-fixes.md b/changelogs/unreleased/gh-8069-luajit-fixes.md
index dff9daff96..26efbf7186 100644
--- a/changelogs/unreleased/gh-8069-luajit-fixes.md
+++ b/changelogs/unreleased/gh-8069-luajit-fixes.md
@@ -8,3 +8,5 @@ were fixed as part of this activity:
* Fixed `pcall()` call without arguments on arm64.
* Fixed assembling of IR_{AHUV}LOAD specialized to boolean for aarch64.
* Fixed constant rematerialization on arm64.
+* Fixed `emit_rma()` for x64/GC64 mode for non-`mov` instructions.
+* Limited Lua C library path with the default `PATH_MAX` value of 4096 bytes.
diff --git a/changelogs/unreleased/gh-8516-luajit-fixes.md b/changelogs/unreleased/gh-8516-luajit-fixes.md
new file mode 100644
index 0000000000..ffa850a5f4
--- /dev/null
+++ b/changelogs/unreleased/gh-8516-luajit-fixes.md
@@ -0,0 +1,6 @@
+## bugfix/luajit
+
+Backported patches from the vanilla LuaJIT trunk (gh-8516). The following issues
+were fixed as part of this activity:
+
+* Fixed assembling of `IR_LREF` assembling for GC64 mode on x86_64
diff --git a/third_party/luajit b/third_party/luajit
index a17d6826d3..8ddd7bcdb8 160000
--- a/third_party/luajit
+++ b/third_party/luajit
@@ -1 +1 @@
-Subproject commit a17d6826d326dfdac5d58ee35500ee2ac274d66f
+Subproject commit 8ddd7bcdb83662d649d07dd27e0ee4c6f08265fb
--
GitLab