diff options
| author | Mike Pall <mike> | 2023-11-09 11:05:27 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2023-11-09 11:05:27 +0100 |
| commit | 69bbbf77363ceb00ad2653a7729a5c9e8316e61f (patch) | |
| tree | 86d60724ddfd42befc31f3f33e815c190a209217 /src | |
| parent | b94fbfbee9e7dd0979e35aacea7fcdd43905789b (diff) | |
| parent | 65c849390702b1150d52e64db86cbc6b3c98413e (diff) | |
| download | luajit-69bbbf77363ceb00ad2653a7729a5c9e8316e61f.tar.gz luajit-69bbbf77363ceb00ad2653a7729a5c9e8316e61f.tar.bz2 luajit-69bbbf77363ceb00ad2653a7729a5c9e8316e61f.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/lj_record.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lj_record.c b/src/lj_record.c index 1dd310d4..b7af5896 100644 --- a/src/lj_record.c +++ b/src/lj_record.c | |||
| @@ -976,6 +976,7 @@ void lj_record_ret(jit_State *J, BCReg rbase, ptrdiff_t gotresults) | |||
| 976 | emitir(IRTG(IR_RETF, IRT_PGC), trpt, trpc); | 976 | emitir(IRTG(IR_RETF, IRT_PGC), trpt, trpc); |
| 977 | J->retdepth++; | 977 | J->retdepth++; |
| 978 | J->needsnap = 1; | 978 | J->needsnap = 1; |
| 979 | J->scev.idx = REF_NIL; | ||
| 979 | lj_assertJ(J->baseslot == 1+LJ_FR2, "bad baseslot for return"); | 980 | lj_assertJ(J->baseslot == 1+LJ_FR2, "bad baseslot for return"); |
| 980 | /* Shift result slots up and clear the slots of the new frame below. */ | 981 | /* Shift result slots up and clear the slots of the new frame below. */ |
| 981 | memmove(J->base + cbase, J->base-1-LJ_FR2, sizeof(TRef)*nresults); | 982 | memmove(J->base + cbase, J->base-1-LJ_FR2, sizeof(TRef)*nresults); |