gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-08 07:34:07 +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 2013-12-22 11:46:06 +01:00
commit e52119bbdd
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lj_ffrecord.c
View File

@ -726,20 +726,19 @@ static void LJ_FASTCALL recff_string_range(jit_State *J, RecordFFData *rd)
end = argv2int(J, &rd->argv[2]); end = argv2int(J, &rd->argv[2]);
} }
} else { /* string.byte(str, [,start [,end]]) */ } else { /* string.byte(str, [,start [,end]]) */
if (!tref_isnil(J->base[1])) { if (tref_isnil(J->base[1])) {
start = 1;
trstart = lj_ir_kint(J, 1);
} else {
start = argv2int(J, &rd->argv[1]); start = argv2int(J, &rd->argv[1]);
trstart = lj_opt_narrow_toint(J, J->base[1]); trstart = lj_opt_narrow_toint(J, J->base[1]);
trend = J->base[2]; }
if (tref_isnil(trend)) { if (J->base[1] && !tref_isnil(J->base[2])) {
trend = lj_opt_narrow_toint(J, J->base[2]);
end = argv2int(J, &rd->argv[2]);
} else {
trend = trstart; trend = trstart;
end = start; end = start;
} else {
trend = lj_opt_narrow_toint(J, trend);
end = argv2int(J, &rd->argv[2]);
}
} else {
trend = trstart = lj_ir_kint(J, 1);
end = start = 1;
} }
} }
if (end < 0) { if (end < 0) {