summaryrefslogtreecommitdiff
path: root/eval.c
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2019-09-21 01:57:15 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2019-09-21 01:57:29 +0900
commit7aeacb213bdf40bab4393448023930eac35d127a (patch)
treede6b46ab518cf71c988c400b6ebf639cac398698 /eval.c
parent990e714fd3f4e9b28e007ff1bd2bcf4217269776 (diff)
Revert eval.c in e81a3e6df54842b5a836dad7055a4295cf4155bc
Inadvertently merged change to suppress warnings by gcc 9.2. Pointed out by Alan Wu.
Diffstat (limited to 'eval.c')
-rw-r--r--eval.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/eval.c b/eval.c
index c548c34..5d402e5 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;