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

Add extra guard when recording select(x, ...) with off-trace varargs

Browse Source 
For example, the following previously failed when it got jitted:

    local select = select
    local exptyp = "number"
    local function f(...)
      for i = 1, 100 do
        assert(type((select('#', ...))) == exptyp)
        if i == 75 then
          select = function() return "" end
          exptyp = "string"
        end
      end
    end
    f(1)
This commit is contained in:
Peter Cawley 2016-04-02 18:18:00 +01:00
parent 296f0ca8d7
commit 217ed8c233
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lj_record.c
View File

@ -1693,9 +1693,12 @@ static int select_detect(jit_State *J)
BCIns ins = J->pc[1]; BCIns ins = J->pc[1];
if (bc_op(ins) == BC_CALLM && bc_b(ins) == 2 && bc_c(ins) == 1) { if (bc_op(ins) == BC_CALLM && bc_b(ins) == 2 && bc_c(ins) == 1) {
cTValue *func = &J->L->base[bc_a(ins)]; cTValue *func = &J->L->base[bc_a(ins)];
if (tvisfunc(func) && funcV(func)->c.ffid == FF_select) if (tvisfunc(func) && funcV(func)->c.ffid == FF_select) {
TRef kfunc = lj_ir_kfunc(J, funcV(func));
emitir(IRTG(IR_EQ, IRT_FUNC), getslot(J, bc_a(ins)), kfunc);
return 1; return 1;
} }
}
return 0; return 0;
} }