tarantool / luajit / 13950129358

93%

tarantool/master: 93%

push

github

Avoid unpatching bytecode twice after a trace flush.

Reported by Sergey Kaplun.

(cherry picked from commit 85c3f2fb6)

When flushing the already flushed trace, it is possible that another
trace is recorded for the same bytecode as the first trace. In that
case, the assertion fails in `trace_unpatch()`.

This patch fixes it by unpatching the trace only in the case if it
persists in the trace chain. Also, it deletes the dead code for the
trace unpatching logic, since the root trace can't start from `BC_JMP`
and the child traces are handled differently.

Sergey Kaplun:
* added the description and the test for the problem

Part of tarantool/tarantool#11055

Reviewed-by: Sergey Bronnikov <sergeyb@tarantool.org>
Signed-off-by: Sergey Kaplun <skaplun@tarantool.org>
(cherry picked from commit ac16929ce)

5697 of 6039 branches covered (94.34%)

Branch coverage included in aggregate %.

21714 of 23461 relevant lines covered (92.55%)

2957786.19 hits per line