aboutsummaryrefslogtreecommitdiff
path: root/src/jit
diff options
context:
space:
mode:
authorMike Pall <mike>2023-08-21 03:18:35 +0200
committerMike Pall <mike>2023-08-21 03:18:35 +0200
commit2090842410e0ba6f81fad310a77bf5432488249a (patch)
tree2845b2d74f15cbb524801a53687151bb797a8e78 /src/jit
parentf0ff869bc2fffa17bb765c4c773457578da125a9 (diff)
parent50e0fa03c48cb9af03c3efdc3100f12687651a2e (diff)
downloadluajit-2090842410e0ba6f81fad310a77bf5432488249a.tar.gz
luajit-2090842410e0ba6f81fad310a77bf5432488249a.tar.bz2
luajit-2090842410e0ba6f81fad310a77bf5432488249a.zip
Merge branch 'master' into v2.1v2.1.ROLLING
Diffstat (limited to 'src/jit')
-rw-r--r--src/jit/bc.lua1
-rw-r--r--src/jit/bcsave.lua2
-rw-r--r--src/jit/dump.lua1
-rw-r--r--src/jit/p.lua1
-rw-r--r--src/jit/v.lua1
5 files changed, 1 insertions, 5 deletions
diff --git a/src/jit/bc.lua b/src/jit/bc.lua
index bf0812d8..f1a63b9c 100644
--- a/src/jit/bc.lua
+++ b/src/jit/bc.lua
@@ -41,7 +41,6 @@
41 41
42-- Cache some library functions and objects. 42-- Cache some library functions and objects.
43local jit = require("jit") 43local jit = require("jit")
44assert(jit.version_num == 20100, "LuaJIT core/library version mismatch")
45local jutil = require("jit.util") 44local jutil = require("jit.util")
46local vmdef = require("jit.vmdef") 45local vmdef = require("jit.vmdef")
47local bit = require("bit") 46local bit = require("bit")
diff --git a/src/jit/bcsave.lua b/src/jit/bcsave.lua
index 0f046669..74699f3d 100644
--- a/src/jit/bcsave.lua
+++ b/src/jit/bcsave.lua
@@ -11,7 +11,7 @@
11------------------------------------------------------------------------------ 11------------------------------------------------------------------------------
12 12
13local jit = require("jit") 13local jit = require("jit")
14assert(jit.version_num == 20100, "LuaJIT core/library version mismatch") 14assert(jit.version_num == 20199, "LuaJIT core/library version mismatch")
15local bit = require("bit") 15local bit = require("bit")
16 16
17-- Symbol name prefix for LuaJIT bytecode. 17-- Symbol name prefix for LuaJIT bytecode.
diff --git a/src/jit/dump.lua b/src/jit/dump.lua
index 364df151..746732f9 100644
--- a/src/jit/dump.lua
+++ b/src/jit/dump.lua
@@ -55,7 +55,6 @@
55 55
56-- Cache some library functions and objects. 56-- Cache some library functions and objects.
57local jit = require("jit") 57local jit = require("jit")
58assert(jit.version_num == 20100, "LuaJIT core/library version mismatch")
59local jutil = require("jit.util") 58local jutil = require("jit.util")
60local vmdef = require("jit.vmdef") 59local vmdef = require("jit.vmdef")
61local funcinfo, funcbc = jutil.funcinfo, jutil.funcbc 60local funcinfo, funcbc = jutil.funcinfo, jutil.funcbc
diff --git a/src/jit/p.lua b/src/jit/p.lua
index 3daa9291..36f836c5 100644
--- a/src/jit/p.lua
+++ b/src/jit/p.lua
@@ -41,7 +41,6 @@
41 41
42-- Cache some library functions and objects. 42-- Cache some library functions and objects.
43local jit = require("jit") 43local jit = require("jit")
44assert(jit.version_num == 20100, "LuaJIT core/library version mismatch")
45local profile = require("jit.profile") 44local profile = require("jit.profile")
46local vmdef = require("jit.vmdef") 45local vmdef = require("jit.vmdef")
47local math = math 46local math = math
diff --git a/src/jit/v.lua b/src/jit/v.lua
index 790ea3b2..8e91f494 100644
--- a/src/jit/v.lua
+++ b/src/jit/v.lua
@@ -59,7 +59,6 @@
59 59
60-- Cache some library functions and objects. 60-- Cache some library functions and objects.
61local jit = require("jit") 61local jit = require("jit")
62assert(jit.version_num == 20100, "LuaJIT core/library version mismatch")
63local jutil = require("jit.util") 62local jutil = require("jit.util")
64local vmdef = require("jit.vmdef") 63local vmdef = require("jit.vmdef")
65local funcinfo, traceinfo = jutil.funcinfo, jutil.traceinfo 64local funcinfo, traceinfo = jutil.funcinfo, jutil.traceinfo