Merge branch 'master' into v2.1

diff --cc src/lj_snap.c
index 7d7347a1b2f82e26f08b209467d5e12e98dcfca8,4a77304873845e67d45eeae43542a6524c9707f0..f3645e87676763c2ac1cae73850f844729447d7e
--- 1/src/lj_snap.c
--- 2/src/lj_snap.c
+++ b/src/lj_snap.c
@@@ -450,10 -409,11 +450,11 @@@ static TRef snap_replay_const(jit_Stat
    case IR_KPRI: return TREF_PRI(irt_type(ir->t));
    case IR_KINT: return lj_ir_kint(J, ir->i);
    case IR_KGC: return lj_ir_kgc(J, ir_kgc(ir), irt_t(ir->t));
 -  case IR_KNUM: return lj_ir_k64(J, IR_KNUM, ir_knum(ir));
 -  case IR_KINT64: return lj_ir_k64(J, IR_KINT64, ir_kint64(ir));
 +  case IR_KNUM: case IR_KINT64:
 +    return lj_ir_k64(J, (IROp)ir->o, ir_k64(ir)->u64);
    case IR_KPTR: return lj_ir_kptr(J, ir_kptr(ir));  /* Continuation. */
 -  default: lua_assert(0); return TREF_NIL; break;
+   case IR_KNULL: return lj_ir_knull(J, irt_type(ir->t));
 +  default: lj_assertJ(0, "bad IR constant op %d", ir->o); return TREF_NIL;
    }
  }