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 2015-01-05 23:43:57 +01:00
commit c71cdf4c36
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lj_parse.c
View File

@ -687,10 +687,12 @@ static BCPos bcemit_jmp(FuncState *fs)
BCPos j = fs->pc - 1; BCPos j = fs->pc - 1;
BCIns *ip = &fs->bcbase[j].ins; BCIns *ip = &fs->bcbase[j].ins;
fs->jpc = NO_JMP; fs->jpc = NO_JMP;
if ((int32_t)j >= (int32_t)fs->lasttarget && bc_op(*ip) == BC_UCLO) if ((int32_t)j >= (int32_t)fs->lasttarget && bc_op(*ip) == BC_UCLO) {
setbc_j(ip, NO_JMP); setbc_j(ip, NO_JMP);
else fs->lasttarget = j+1;
} else {
j = bcemit_AJ(fs, BC_JMP, fs->freereg, NO_JMP); j = bcemit_AJ(fs, BC_JMP, fs->freereg, NO_JMP);
}
jmp_append(fs, &j, jpc); jmp_append(fs, &j, jpc);
return j; return j;
} }