aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Pall <mike>2014-01-20 21:31:06 +0100
committerMike Pall <mike>2014-01-20 21:31:06 +0100
commit5a5a340f6e8aa315ba01f65c5f7659a4b75ed247 (patch)
tree821bc5fa4317ccfe83a7d16d758a8b7eb6004134 /src
parentbcd27038fc59057213b7f844c7ae8621d3dff641 (diff)
downloadluajit-5a5a340f6e8aa315ba01f65c5f7659a4b75ed247.tar.gz
luajit-5a5a340f6e8aa315ba01f65c5f7659a4b75ed247.tar.bz2
luajit-5a5a340f6e8aa315ba01f65c5f7659a4b75ed247.zip
Don't start stitched trace with CALLMT, too.
Diffstat (limited to 'src')
-rw-r--r--src/lj_ffrecord.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lj_ffrecord.c b/src/lj_ffrecord.c
index 5e86ed05..8470dd8c 100644
--- a/src/lj_ffrecord.c
+++ b/src/lj_ffrecord.c
@@ -148,7 +148,8 @@ static void LJ_FASTCALL recff_nyi(jit_State *J, RecordFFData *rd)
148 if (J->framedepth && frame_islua(J->L->base-1)) { 148 if (J->framedepth && frame_islua(J->L->base-1)) {
149 BCOp op = bc_op(*frame_pc(J->L->base-1)); 149 BCOp op = bc_op(*frame_pc(J->L->base-1));
150 /* Stitched trace cannot start with *M op with variable # of args. */ 150 /* Stitched trace cannot start with *M op with variable # of args. */
151 if (!(op == BC_CALLM || op == BC_RETM || op == BC_TSETM)) { 151 if (!(op == BC_CALLM || op == BC_CALLMT ||
152 op == BC_RETM || op == BC_TSETM)) {
152 switch (J->fn->c.ffid) { 153 switch (J->fn->c.ffid) {
153 case FF_error: 154 case FF_error:
154 case FF_debug_sethook: 155 case FF_debug_sethook: