diff options
author | Mike Pall <mike> | 2023-08-21 03:18:35 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2023-08-21 03:18:35 +0200 |
commit | 2090842410e0ba6f81fad310a77bf5432488249a (patch) | |
tree | 2845b2d74f15cbb524801a53687151bb797a8e78 /src/jit | |
parent | f0ff869bc2fffa17bb765c4c773457578da125a9 (diff) | |
parent | 50e0fa03c48cb9af03c3efdc3100f12687651a2e (diff) | |
download | luajit-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.lua | 1 | ||||
-rw-r--r-- | src/jit/bcsave.lua | 2 | ||||
-rw-r--r-- | src/jit/dump.lua | 1 | ||||
-rw-r--r-- | src/jit/p.lua | 1 | ||||
-rw-r--r-- | src/jit/v.lua | 1 |
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. |
43 | local jit = require("jit") | 43 | local jit = require("jit") |
44 | assert(jit.version_num == 20100, "LuaJIT core/library version mismatch") | ||
45 | local jutil = require("jit.util") | 44 | local jutil = require("jit.util") |
46 | local vmdef = require("jit.vmdef") | 45 | local vmdef = require("jit.vmdef") |
47 | local bit = require("bit") | 46 | local 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 | ||
13 | local jit = require("jit") | 13 | local jit = require("jit") |
14 | assert(jit.version_num == 20100, "LuaJIT core/library version mismatch") | 14 | assert(jit.version_num == 20199, "LuaJIT core/library version mismatch") |
15 | local bit = require("bit") | 15 | local 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. |
57 | local jit = require("jit") | 57 | local jit = require("jit") |
58 | assert(jit.version_num == 20100, "LuaJIT core/library version mismatch") | ||
59 | local jutil = require("jit.util") | 58 | local jutil = require("jit.util") |
60 | local vmdef = require("jit.vmdef") | 59 | local vmdef = require("jit.vmdef") |
61 | local funcinfo, funcbc = jutil.funcinfo, jutil.funcbc | 60 | local 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. |
43 | local jit = require("jit") | 43 | local jit = require("jit") |
44 | assert(jit.version_num == 20100, "LuaJIT core/library version mismatch") | ||
45 | local profile = require("jit.profile") | 44 | local profile = require("jit.profile") |
46 | local vmdef = require("jit.vmdef") | 45 | local vmdef = require("jit.vmdef") |
47 | local math = math | 46 | local 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. |
61 | local jit = require("jit") | 61 | local jit = require("jit") |
62 | assert(jit.version_num == 20100, "LuaJIT core/library version mismatch") | ||
63 | local jutil = require("jit.util") | 62 | local jutil = require("jit.util") |
64 | local vmdef = require("jit.vmdef") | 63 | local vmdef = require("jit.vmdef") |
65 | local funcinfo, traceinfo = jutil.funcinfo, jutil.traceinfo | 64 | local funcinfo, traceinfo = jutil.funcinfo, jutil.traceinfo |