1 files changed, 8 insertions, 1 deletions

diff --git a/src/lj_trace.c b/src/lj_trace.c
index afaeb300..5de43f23 100644
--- a/src/lj_trace.c
+++ b/src/lj_trace.c
@@ -574,11 +574,18 @@ static TValue *trace_state(lua_State *L, lua_CFunction dummy, void *ud)
     case LJ_TRACE_RECORD:
       trace_pendpatch(J, 0);
       setvmstate(J2G(J), RECORD);
-      lj_vmevent_send(L, RECORD,
+      lj_vmevent_send_(L, RECORD,
+        TValue savetv;  /* Save tmptv state for trace recorder. */
+        TValue savetv2;
+        copyTV(L, &savetv, &J2G(J)->tmptv);
+        copyTV(L, &savetv2, &J2G(J)->tmptv2);
         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);
         setintV(L->top++, J->framedepth);
+      ,
+        copyTV(L, &J2G(J)->tmptv, &savetv);
+        copyTV(L, &J2G(J)->tmptv2, &savetv2);
       );
       lj_record_ins(J);
       break;