From fe3722abd84ce066d462ad9809b7e6bde507f11c Mon Sep 17 00:00:00 2001 From: ko1 Date: Thu, 16 Nov 2017 04:37:02 +0000 Subject: fix up r60782 and r60783. * cont.c (cont_restore_thread): re-check a condition (pointed by nobu). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60786 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- cont.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cont.c b/cont.c index e340677fba..bcc33a1530 100644 --- a/cont.c +++ b/cont.c @@ -706,13 +706,12 @@ cont_restore_thread(rb_context_t *cont) th->ec->errinfo = sec->errinfo; /* trace on -> trace off */ - if (sec->trace_arg == NULL && th->ec->trace_arg != NULL) { + if (th->ec->trace_arg != NULL && sec->trace_arg == NULL) { GET_VM()->trace_running--; } - else { /* sec->trace_arg == NULL */ - if (th->ec->trace_arg != NULL) { - GET_VM()->trace_running++; - } + /* trace off -> trace on */ + else if (th->ec->trace_arg == NULL && sec->trace_arg != NULL) { + GET_VM()->trace_running++; } th->ec->trace_arg = sec->trace_arg; -- cgit v1.2.3