diff options
| author | Mike Pall <mike> | 2023-07-09 21:09:21 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2023-07-09 21:09:21 +0200 |
| commit | bd55d3023fe0cb806d35eea10af1540ce805805f (patch) | |
| tree | 772fe95ddf136010332035d38328788a0fbea7dc | |
| parent | 0cc5fdfbc0810073485150eb184dc358dab507d9 (diff) | |
| parent | a01cba9d2d74efc57376822aa43db2d5043af5a4 (diff) | |
| download | luajit-bd55d3023fe0cb806d35eea10af1540ce805805f.tar.gz luajit-bd55d3023fe0cb806d35eea10af1540ce805805f.tar.bz2 luajit-bd55d3023fe0cb806d35eea10af1540ce805805f.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | src/lj_record.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/lj_record.c b/src/lj_record.c index 57642eb5..33767405 100644 --- a/src/lj_record.c +++ b/src/lj_record.c | |||
| @@ -1942,12 +1942,8 @@ static void rec_varg(jit_State *J, BCReg dst, ptrdiff_t nresults) | |||
| 1942 | if (J->framedepth > 0) { /* Simple case: varargs defined on-trace. */ | 1942 | if (J->framedepth > 0) { /* Simple case: varargs defined on-trace. */ |
| 1943 | ptrdiff_t i; | 1943 | ptrdiff_t i; |
| 1944 | if (nvararg < 0) nvararg = 0; | 1944 | if (nvararg < 0) nvararg = 0; |
| 1945 | if (nresults == -1) { | 1945 | if (nresults == -1) nresults = nvararg; |
| 1946 | nresults = nvararg; | 1946 | J->maxslot = dst + (BCReg)nresults; |
| 1947 | J->maxslot = dst + (BCReg)nvararg; | ||
| 1948 | } else if (dst + nresults > J->maxslot) { | ||
| 1949 | J->maxslot = dst + (BCReg)nresults; | ||
| 1950 | } | ||
| 1951 | if (J->baseslot + J->maxslot >= LJ_MAX_JSLOTS) | 1947 | if (J->baseslot + J->maxslot >= LJ_MAX_JSLOTS) |
| 1952 | lj_trace_err(J, LJ_TRERR_STACKOV); | 1948 | lj_trace_err(J, LJ_TRERR_STACKOV); |
| 1953 | for (i = 0; i < nresults; i++) | 1949 | for (i = 0; i < nresults; i++) |