diff options
| author | Mike Pall <mike> | 2025-05-28 21:14:47 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2025-05-28 21:14:47 +0200 |
| commit | f9140a622a0c44a99efb391cc1c2358bc8098ab7 (patch) | |
| tree | 4d4657d9fb2fc0546d8dd6dc0533605a35a16e24 /src | |
| parent | 0a8cd58ea19850a08d7765f82b79f75553a3d71c (diff) | |
| parent | 048972dbfdb6b441fe8a9bfe4d1f048966579ba8 (diff) | |
| download | luajit-f9140a622a0c44a99efb391cc1c2358bc8098ab7.tar.gz luajit-f9140a622a0c44a99efb391cc1c2358bc8098ab7.tar.bz2 luajit-f9140a622a0c44a99efb391cc1c2358bc8098ab7.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/lj_record.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lj_record.c b/src/lj_record.c index ad45bebb..6543f274 100644 --- a/src/lj_record.c +++ b/src/lj_record.c | |||
| @@ -973,7 +973,8 @@ void lj_record_ret(jit_State *J, BCReg rbase, ptrdiff_t gotresults) | |||
| 973 | lj_trace_err(J, LJ_TRERR_LLEAVE); | 973 | lj_trace_err(J, LJ_TRERR_LLEAVE); |
| 974 | } else if (J->needsnap) { /* Tailcalled to ff with side-effects. */ | 974 | } else if (J->needsnap) { /* Tailcalled to ff with side-effects. */ |
| 975 | lj_trace_err(J, LJ_TRERR_NYIRETL); /* No way to insert snapshot here. */ | 975 | lj_trace_err(J, LJ_TRERR_NYIRETL); /* No way to insert snapshot here. */ |
| 976 | } else if (1 + pt->framesize >= LJ_MAX_JSLOTS) { | 976 | } else if (1 + pt->framesize >= LJ_MAX_JSLOTS || |
| 977 | J->baseslot + J->maxslot >= LJ_MAX_JSLOTS) { | ||
| 977 | lj_trace_err(J, LJ_TRERR_STACKOV); | 978 | lj_trace_err(J, LJ_TRERR_STACKOV); |
| 978 | } else { /* Return to lower frame. Guard for the target we return to. */ | 979 | } else { /* Return to lower frame. Guard for the target we return to. */ |
| 979 | TRef trpt = lj_ir_kgc(J, obj2gco(pt), IRT_PROTO); | 980 | TRef trpt = lj_ir_kgc(J, obj2gco(pt), IRT_PROTO); |