diff options
| author | Mike Pall <mike> | 2024-08-15 00:19:35 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2024-08-15 00:19:35 +0200 |
| commit | 833600390cb34d2e1d3f05b8eae8bebf9fd7a873 (patch) | |
| tree | 8ec4efc21a4a11e5dedb49a58f2ef3b418038172 /src/lj_snap.c | |
| parent | 04dca7911ea255f37be799c18d74c305b921c1a6 (diff) | |
| parent | 86e7123bb1782a5f200ba5e83b8c4f3fbad4f7bc (diff) | |
| download | luajit-833600390cb34d2e1d3f05b8eae8bebf9fd7a873.tar.gz luajit-833600390cb34d2e1d3f05b8eae8bebf9fd7a873.tar.bz2 luajit-833600390cb34d2e1d3f05b8eae8bebf9fd7a873.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_snap.c')
| -rw-r--r-- | src/lj_snap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lj_snap.c b/src/lj_snap.c index 6fda08ba..27f9c8e5 100644 --- a/src/lj_snap.c +++ b/src/lj_snap.c | |||
| @@ -957,7 +957,8 @@ const BCIns *lj_snap_restore(jit_State *J, void *exptr) | |||
| 957 | lua_State *L = J->L; | 957 | lua_State *L = J->L; |
| 958 | 958 | ||
| 959 | /* Set interpreter PC to the next PC to get correct error messages. */ | 959 | /* Set interpreter PC to the next PC to get correct error messages. */ |
| 960 | setcframe_pc(cframe_raw(L->cframe), pc+1); | 960 | setcframe_pc(L->cframe, pc+1); |
| 961 | setcframe_pc(cframe_raw(cframe_prev(L->cframe)), pc); | ||
| 961 | 962 | ||
| 962 | /* Make sure the stack is big enough for the slots from the snapshot. */ | 963 | /* Make sure the stack is big enough for the slots from the snapshot. */ |
| 963 | if (LJ_UNLIKELY(L->base + snap->topslot >= tvref(L->maxstack))) { | 964 | if (LJ_UNLIKELY(L->base + snap->topslot >= tvref(L->maxstack))) { |