gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 15:14:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall 2023-08-28 21:08:00 +02:00
commit 631a45f73b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lj_dispatch.c
View File

@ -307,9 +307,9 @@ int luaJIT_setmode(lua_State *L, int idx, int mode)
} else { } else {
return 0; /* Failed. */ return 0; /* Failed. */
} }
g->bc_cfunc_ext = BCINS_AD(BC_FUNCCW, 0, 0); setbc_op(&g->bc_cfunc_ext, BC_FUNCCW);
} else { } else {
g->bc_cfunc_ext = BCINS_AD(BC_FUNCC, 0, 0); setbc_op(&g->bc_cfunc_ext, BC_FUNCC);
} }
break; break;
default: default:

4
src/lj_parse.c
View File

@ -2513,9 +2513,11 @@ static void parse_for_num(LexState *ls, GCstr *varname, BCLine line)
*/ */
static int predict_next(LexState *ls, FuncState *fs, BCPos pc) static int predict_next(LexState *ls, FuncState *fs, BCPos pc)
{ {
BCIns ins = fs->bcbase[pc].ins; BCIns ins;
GCstr *name; GCstr *name;
cTValue *o; cTValue *o;
if (pc >= fs->bclim) return 0;
ins = fs->bcbase[pc].ins;
switch (bc_op(ins)) { switch (bc_op(ins)) {
case BC_MOV: case BC_MOV:
if (bc_d(ins) >= fs->nactvar) return 0; if (bc_d(ins) >= fs->nactvar) return 0;