Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2016-04-03 19:13:37 +02:00
commit d150fbf441

View File

@ -1693,8 +1693,11 @@ 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;
} }