diff options
| -rw-r--r-- | src/lj_asm.c | 2 | ||||
| -rw-r--r-- | src/lj_cparse.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/lj_asm.c b/src/lj_asm.c index 8ff3eaf7..15685d85 100644 --- a/src/lj_asm.c +++ b/src/lj_asm.c | |||
| @@ -1558,7 +1558,7 @@ static void asm_setup_regsp(ASMState *as, int sink) | |||
| 1558 | if (as->parent) { | 1558 | if (as->parent) { |
| 1559 | uint16_t *p; | 1559 | uint16_t *p; |
| 1560 | lastir = lj_snap_regspmap(as->parent, as->J->exitno, ir); | 1560 | lastir = lj_snap_regspmap(as->parent, as->J->exitno, ir); |
| 1561 | as->stopins = (lastir-1) - as->ir; | 1561 | as->stopins = (IRRef)((lastir-1) - as->ir); |
| 1562 | for (p = as->parentmap; ir < lastir; ir++) { | 1562 | for (p = as->parentmap; ir < lastir; ir++) { |
| 1563 | RegSP rs = ir->prev; | 1563 | RegSP rs = ir->prev; |
| 1564 | *p++ = (uint16_t)rs; /* Copy original parent RegSP to parentmap. */ | 1564 | *p++ = (uint16_t)rs; /* Copy original parent RegSP to parentmap. */ |
diff --git a/src/lj_cparse.c b/src/lj_cparse.c index d9f66227..e9826715 100644 --- a/src/lj_cparse.c +++ b/src/lj_cparse.c | |||
| @@ -225,7 +225,8 @@ static CPToken cp_param(CPState *cp) | |||
| 225 | return CTOK_INTEGER; | 225 | return CTOK_INTEGER; |
| 226 | } else { | 226 | } else { |
| 227 | GCcdata *cd; | 227 | GCcdata *cd; |
| 228 | if (!tviscdata(o)) lj_err_argtype(cp->L, o-cp->L->base+1, "type parameter"); | 228 | if (!tviscdata(o)) |
| 229 | lj_err_argtype(cp->L, (int)(o-cp->L->base)+1, "type parameter"); | ||
| 229 | cd = cdataV(o); | 230 | cd = cdataV(o); |
| 230 | if (cd->ctypeid == CTID_CTYPEID) | 231 | if (cd->ctypeid == CTID_CTYPEID) |
| 231 | cp->val.id = *(CTypeID *)cdataptr(cd); | 232 | cp->val.id = *(CTypeID *)cdataptr(cd); |