From 7aeacb213bdf40bab4393448023930eac35d127a Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 21 Sep 2019 01:57:15 +0900 Subject: Revert eval.c in e81a3e6df54842b5a836dad7055a4295cf4155bc Inadvertently merged change to suppress warnings by gcc 9.2. Pointed out by Alan Wu. --- eval.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'eval.c') diff --git a/eval.c b/eval.c index c548c34b68..5d402e5cb8 100644 --- a/eval.c +++ b/eval.c @@ -189,15 +189,13 @@ rb_ec_cleanup(rb_execution_context_t *ec, volatile int ex) volatile VALUE errs[2] = { Qundef, Qundef }; int nerr; rb_thread_t *th = rb_ec_thread_ptr(ec); - rb_thread_t *volatile const th0 = th; volatile int sysex = EXIT_SUCCESS; volatile int step = 0; rb_threadptr_interrupt(th); rb_threadptr_check_signal(th); EC_PUSH_TAG(ec); - th = th0; - if ((state = EC_EXEC_TAG(), th = th0, state) == TAG_NONE) { + if ((state = EC_EXEC_TAG()) == TAG_NONE) { SAVE_ROOT_JMPBUF(th, { RUBY_VM_CHECK_INTS(ec); }); step_0: step++; @@ -550,9 +548,10 @@ static void setup_exception(rb_execution_context_t *ec, int tag, volatile VALUE mesg, VALUE cause) { VALUE e; + const char *file = 0; int line; - const char *const file = rb_source_location_cstr(&line); + file = rb_source_location_cstr(&line); if ((file && !NIL_P(mesg)) || (cause != Qundef)) { volatile int state = 0; -- cgit v1.2.3