Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2014-12-20 01:48:17 +01:00
commit ecaa4eae88

View File

@ -1647,7 +1647,7 @@ static void build_subroutines(BuildCtx *ctx)
| mov RD, 1+3
| jmp ->fff_res
|
|.ffunc_1 ipairs_aux
|.ffunc_2 ipairs_aux
| cmp dword [BASE+4], LJ_TTAB; jne ->fff_fallback
| cmp dword [BASE+12], LJ_TISNUM
|.if DUALNUM