Merge branch 'master' into v2.1

diff --cc src/lj_asm_x86.h
Simple merge

diff --cc src/lj_crecord.c
index bbf002bd7c27366d58454cddb6c4c8581e0714c9,80e25ef8a11704b936cd8e31089d502dd399f103..27f2c1dd990318966c035456678ddd4e20a8e954
--- 1/src/lj_crecord.c
--- 2/src/lj_crecord.c
+++ b/src/lj_crecord.c
@@@ -1265,14 -1130,15 +1266,14 @@@ static int crec_call(jit_State *J, Reco
      TRef tr;
      TValue tv;
      /* Check for blacklisted C functions that might call a callback. */
 -    setlightudV(&tv,
 -              cdata_getptr(cdataptr(cd), (LJ_64 && tp == IRT_P64) ? 8 : 4));
 +    tv.u64 = ((uintptr_t)cdata_getptr(cdataptr(cd), (LJ_64 && tp == IRT_P64) ? 8 : 4) >> 2) | U64x(800000000, 00000000);
      if (tvistrue(lj_tab_get(J->L, cts->miscmap, &tv)))
        lj_trace_err(J, LJ_TRERR_BLACKL);
-     if (ctype_isvoid(ctr->info)) {
+     if (ctype_isvoid(ctr_info)) {
        t = IRT_NIL;
        rd->nres = 0;
-     } else if (!(ctype_isnum(ctr->info) || ctype_isptr(ctr->info) ||
-                ctype_isenum(ctr->info)) || t == IRT_CDATA) {
+     } else if (!(ctype_isnum(ctr_info) || ctype_isptr(ctr_info) ||
+                ctype_isenum(ctr_info)) || t == IRT_CDATA) {
        lj_trace_err(J, LJ_TRERR_NYICALL);
      }
      if ((info & CTF_VARARG)

diff --cc src/lj_debug.c
Simple merge