From b29101e9eeb20b5a3cccc71904f73e678c9fd783 Mon Sep 17 00:00:00 2001 From: Luke Gorrie Date: Wed, 29 Nov 2017 12:43:03 +0000 Subject: [PATCH] fixup! lj_auditlog: Improve logging of trace stop/abort --- src/lj_auditlog.c | 1 - src/lj_trace.c | 3 --- 2 files changed, 4 deletions(-) diff --git a/src/lj_auditlog.c b/src/lj_auditlog.c index 8e5ddff61a..e6c1b9e26d 100644 --- a/src/lj_auditlog.c +++ b/src/lj_auditlog.c @@ -107,7 +107,6 @@ void lj_auditlog_trace_stop(jit_State *J, GCtrace *T) void lj_auditlog_trace_abort(jit_State *J, TraceError e) { ensure_log_open(); log_jit_State(J); - log_GCtrace(&J->cur); log_event("trace_abort", 2); str_16("TraceError"); /* = */ uint_64(e); str_16("jit_State"); /* = */ uint_64((uint64_t)J); diff --git a/src/lj_trace.c b/src/lj_trace.c index 907d7d84bc..3701711aae 100644 --- a/src/lj_trace.c +++ b/src/lj_trace.c @@ -37,7 +37,6 @@ void lj_trace_err(jit_State *J, TraceError e) { setnilV(&J->errinfo); /* No error info. */ setintV(J->L->top++, (int32_t)e); - lj_auditlog_trace_abort(J, e); lj_err_throw(J->L, LUA_ERRRUN); } @@ -45,7 +44,6 @@ void lj_trace_err(jit_State *J, TraceError e) void lj_trace_err_info(jit_State *J, TraceError e) { setintV(J->L->top++, (int32_t)e); - lj_auditlog_trace_abort(J, e); lj_err_throw(J->L, LUA_ERRRUN); } @@ -526,7 +524,6 @@ static int trace_abort(jit_State *J) J->cur.traceno = 0; } L->top--; /* Remove error object */ - lj_auditlog_trace_abort(J, e); if (e == LJ_TRERR_DOWNREC) return trace_downrec(J); else if (e == LJ_TRERR_MCODEAL)