diff options
| author | Mike Pall <mike> | 2014-01-20 16:59:04 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-01-20 16:59:04 +0100 |
| commit | bcd27038fc59057213b7f844c7ae8621d3dff641 (patch) | |
| tree | b6ed85f6b47d57b41651a527a19e760ef2c1543a /src/lj_record.c | |
| parent | 4e78b9bb126a3c4a3d27770664452039419d339b (diff) | |
| parent | 92475419e5cc5e61c5feb6a0fe549b1fc4a9d7cf (diff) | |
| download | luajit-bcd27038fc59057213b7f844c7ae8621d3dff641.tar.gz luajit-bcd27038fc59057213b7f844c7ae8621d3dff641.tar.bz2 luajit-bcd27038fc59057213b7f844c7ae8621d3dff641.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_record.c')
| -rw-r--r-- | src/lj_record.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_record.c b/src/lj_record.c index 725b4aaf..650763fe 100644 --- a/src/lj_record.c +++ b/src/lj_record.c | |||
| @@ -2305,7 +2305,7 @@ static const BCIns *rec_setup_root(jit_State *J) | |||
| 2305 | case BC_RET0: | 2305 | case BC_RET0: |
| 2306 | case BC_RET1: | 2306 | case BC_RET1: |
| 2307 | /* No bytecode range check for down-recursive root traces. */ | 2307 | /* No bytecode range check for down-recursive root traces. */ |
| 2308 | J->maxslot = ra + bc_d(ins); | 2308 | J->maxslot = ra + bc_d(ins) - 1; |
| 2309 | break; | 2309 | break; |
| 2310 | case BC_FUNCF: | 2310 | case BC_FUNCF: |
| 2311 | /* No bytecode range check for root traces started by a hot call. */ | 2311 | /* No bytecode range check for root traces started by a hot call. */ |