Merge branch 'master' into v2.1

2 files changed, 3 insertions, 3 deletions

diff --git a/src/lj_snap.c b/src/lj_snap.c
index 4ca8cb15..cc498c89 100644
--- a/src/lj_snap.c
+++ b/src/lj_snap.c
@@ -709,7 +709,7 @@ static void snap_unsink(jit_State *J, GCtrace *T, ExitState *ex,
              ir->o == IR_CNEW || ir->o == IR_CNEWI);
 #if LJ_HASFFI
   if (ir->o == IR_CNEW || ir->o == IR_CNEWI) {
-    CTState *cts = ctype_ctsG(J2G(J));
+    CTState *cts = ctype_cts(J->L);
     CTypeID id = (CTypeID)T->ir[ir->op1].i;
     CTSize sz = lj_ctype_size(cts, id);
     GCcdata *cd = lj_cdata_new(cts, id, sz);
diff --git a/src/vm_x86.dasc b/src/vm_x86.dasc
index bae85bdf..bbe341ff 100644
--- a/src/vm_x86.dasc
+++ b/src/vm_x86.dasc
@@ -5950,12 +5950,12 @@ static void emit_asm_debug(BuildCtx *ctx)
 #if LJ_64
           "\t.byte 0xe\n\t.byte 16\n"           /* def_cfa_offset */
           "\t.byte 0x86\n\t.byte 0x2\n"         /* offset rbp */
-          "\t.byte 0xd\n\t.uleb128 0x6\n"       /* def_cfa_register rbp */
+          "\t.byte 0xd\n\t.byte 0x6\n"          /* def_cfa_register rbp */
           "\t.byte 0x83\n\t.byte 0x3\n"         /* offset rbx */
 #else
           "\t.byte 0xe\n\t.byte 8\n"            /* def_cfa_offset */
           "\t.byte 0x84\n\t.byte 0x2\n"         /* offset ebp (4 for MACH-O)*/
-          "\t.byte 0xd\n\t.uleb128 0x4\n"       /* def_cfa_register ebp */
+          "\t.byte 0xd\n\t.byte 0x4\n"          /* def_cfa_register ebp */
           "\t.byte 0x83\n\t.byte 0x3\n"         /* offset ebx */
 #endif
           "\t.align " BSZPTR "\n"