Show trailing NYI item for stitched trace with -jv.

diff --git a/src/jit/v.lua b/src/jit/v.lua
index 22bee3ffa79d99f6c360d6a599837ea29bb4264b..6dd7f1792f46eadb2cc06bdeada66e6d437f8965 100644 (file)
--- a/src/jit/v.lua
+++ b/src/jit/v.lua
@@ -116,6 +116,9 @@ local function dump_trace(what, tr, func, pc, otr, oex)
       if ltype == "interpreter" then
        out:write(format("[TRACE %3s %s%s -- fallback to interpreter]\n",
          tr, startex, startloc))
+      elseif ltype == "stitch" then
+       out:write(format("[TRACE %3s %s%s %s %s]\n",
+         tr, startex, startloc, ltype, fmtfunc(func, pc)))
       elseif link == tr or link == 0 then
        out:write(format("[TRACE %3s %s%s %s]\n",
          tr, startex, startloc, ltype))

diff --git a/src/lj_trace.c b/src/lj_trace.c
index fa15e23dee15e030c040694ff01f1a6bc0881e5e..7cc9844eca833fc982a2da1436c5e73f5c861e46 100644 (file)
--- a/src/lj_trace.c
+++ b/src/lj_trace.c
@@ -473,6 +473,7 @@ static void trace_stop(jit_State *J)
   lj_vmevent_send(L, TRACE,
     setstrV(L, L->top++, lj_str_newlit(L, "stop"));
     setintV(L->top++, traceno);
+    setfuncV(L, L->top++, J->fn);
   );
 }