Merge branch 'master' into v2.1

1 files changed, 5 insertions, 1 deletions

diff --git a/src/lj_trace.c b/src/lj_trace.c
index 10d114b3..c2329394 100644
--- a/src/lj_trace.c
+++ b/src/lj_trace.c
@@ -672,9 +672,11 @@ static TValue *trace_state(lua_State *L, lua_CFunction dummy, void *ud)
       trace_pendpatch(J, 0);
       setvmstate(J2G(J), RECORD);
       lj_vmevent_send_(L, RECORD,
-        /* Save/restore tmptv state for trace recorder. */
+        /* Save/restore state for trace recorder. */
         TValue savetv = J2G(J)->tmptv;
         TValue savetv2 = J2G(J)->tmptv2;
+        TraceNo parent = J->parent;
+        ExitNo exitno = J->exitno;
         setintV(L->top++, J->cur.traceno);
         setfuncV(L, L->top++, J->fn);
         setintV(L->top++, J->pt ? (int32_t)proto_bcpos(J->pt, J->pc) : -1);
@@ -682,6 +684,8 @@ static TValue *trace_state(lua_State *L, lua_CFunction dummy, void *ud)
       ,
         J2G(J)->tmptv = savetv;
         J2G(J)->tmptv2 = savetv2;
+        J->parent = parent;
+        J->exitno = exitno;
       );
       lj_record_ins(J);
       break;