diff options
| author | Mike Pall <mike> | 2022-01-23 19:19:26 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2022-01-23 19:19:26 +0100 |
| commit | c18acfe7565b9b20be0a73563f535766233ad78a (patch) | |
| tree | 65ad45d21a280975267c73651cd0c36972f08fd6 | |
| parent | 5935564c3bd0d807327e94f916abf826f5c4bb70 (diff) | |
| parent | c50232eb320d56d526ba5e6cb5bda8cf5a848a55 (diff) | |
| download | luajit-c18acfe7565b9b20be0a73563f535766233ad78a.tar.gz luajit-c18acfe7565b9b20be0a73563f535766233ad78a.tar.bz2 luajit-c18acfe7565b9b20be0a73563f535766233ad78a.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to '')
| -rw-r--r-- | src/lj_mcode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lj_mcode.c b/src/lj_mcode.c index 42aab0bc..163aada4 100644 --- a/src/lj_mcode.c +++ b/src/lj_mcode.c | |||
| @@ -168,7 +168,7 @@ static void mcode_protect(jit_State *J, int prot) | |||
| 168 | #define MCPROT_RUN MCPROT_RX | 168 | #define MCPROT_RUN MCPROT_RX |
| 169 | 169 | ||
| 170 | /* Protection twiddling failed. Probably due to kernel security. */ | 170 | /* Protection twiddling failed. Probably due to kernel security. */ |
| 171 | static LJ_NOINLINE void mcode_protfail(jit_State *J) | 171 | static LJ_NORET LJ_NOINLINE void mcode_protfail(jit_State *J) |
| 172 | { | 172 | { |
| 173 | lua_CFunction panic = J2G(J)->panic; | 173 | lua_CFunction panic = J2G(J)->panic; |
| 174 | if (panic) { | 174 | if (panic) { |
| @@ -176,6 +176,7 @@ static LJ_NOINLINE void mcode_protfail(jit_State *J) | |||
| 176 | setstrV(L, L->top++, lj_err_str(L, LJ_ERR_JITPROT)); | 176 | setstrV(L, L->top++, lj_err_str(L, LJ_ERR_JITPROT)); |
| 177 | panic(L); | 177 | panic(L); |
| 178 | } | 178 | } |
| 179 | exit(EXIT_FAILURE); | ||
| 179 | } | 180 | } |
| 180 | 181 | ||
| 181 | /* Change protection of MCode area. */ | 182 | /* Change protection of MCode area. */ |