Merge branch 'master' into v2.1

diff --cc src/lj_snap.c
index fee68ba54b668ea21eac5f3d9986c16f35861a52,0c5e8e90f6ff03ce6fe9d2de98f27ac00aec04b7..8efe37fd55cd6da4f272fa82a364b7f00604cdae
--- 1/src/lj_snap.c
--- 2/src/lj_snap.c
+++ b/src/lj_snap.c
@@@ -276,10 -238,9 +276,10 @@@ static BCReg snap_usedef(jit_State *J, 
         if (!(op == BC_ISTC || op == BC_ISFC)) DEF_SLOT(bc_a(ins));
         break;
      case BCMbase:
-       if (op >= BC_CALLM && op <= BC_VARG) {
+       if (op >= BC_CALLM && op <= BC_ITERN) {
        BCReg top = (op == BC_CALLM || op == BC_CALLMT || bc_c(ins) == 0) ?
 -                  maxslot : (bc_a(ins) + bc_c(ins));
 +                  maxslot : (bc_a(ins) + bc_c(ins)+LJ_FR2);
 +      if (LJ_FR2) DEF_SLOT(bc_a(ins)+1);
        s = bc_a(ins) - ((op == BC_ITERC || op == BC_ITERN) ? 3 : 0);
        for (; s < top; s++) USE_SLOT(s);
        for (; s < maxslot; s++) DEF_SLOT(s);