Merge branch 'master' into v2.1

2014-01-20 16:59:04 +01:00
parent 4e78b9bb12 92475419e5
commit bcd27038fc
4 changed files with 6 additions and 4 deletions
--- a/src/lj_record.c
+++ b/src/lj_record.c
@@ -2305,7 +2305,7 @@ static const BCIns *rec_setup_root(jit_State *J)
  case BC_RET0:
  case BC_RET1:
    /* No bytecode range check for down-recursive root traces. */
-    J->maxslot = ra + bc_d(ins);
+    J->maxslot = ra + bc_d(ins) - 1;
    break;
  case BC_FUNCF:
    /* No bytecode range check for root traces started by a hot call. */