Skip to content

Commit

Permalink
Merge branch 'master' into v2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike Pall committed Jan 23, 2022
2 parents 5935564 + c50232e commit c18acfe
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/lj_mcode.c
Original file line number Diff line number Diff line change
Expand Up @@ -168,14 +168,15 @@ static void mcode_protect(jit_State *J, int prot)
#define MCPROT_RUN MCPROT_RX

/* Protection twiddling failed. Probably due to kernel security. */
static LJ_NOINLINE void mcode_protfail(jit_State *J)
static LJ_NORET LJ_NOINLINE void mcode_protfail(jit_State *J)
{
lua_CFunction panic = J2G(J)->panic;
if (panic) {
lua_State *L = J->L;
setstrV(L, L->top++, lj_err_str(L, LJ_ERR_JITPROT));
panic(L);
}
exit(EXIT_FAILURE);
}

/* Change protection of MCode area. */
Expand Down

0 comments on commit c18acfe

Please sign in to comment.