From 48ce4cb414be48be1a73d2530203469b3b98281c Mon Sep 17 00:00:00 2001 From: ko1 Date: Tue, 7 Nov 2017 05:22:09 +0000 Subject: * eval_intern.h: rename macros rb_thread_raised_* to rb_ec_raised_*. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60684 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- gc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gc.c') diff --git a/gc.c b/gc.c index 49b5cbce5e..c1bcdd2c75 100644 --- a/gc.c +++ b/gc.c @@ -7697,27 +7697,27 @@ ruby_memerror(void) void rb_memerror(void) { - rb_thread_t *th = GET_THREAD(); - rb_objspace_t *objspace = rb_objspace_of(th->vm); + rb_execution_context_t *ec = GET_EC(); + rb_objspace_t *objspace = rb_objspace_of(rb_ec_vm_ptr(ec)); VALUE exc; if (during_gc) gc_exit(objspace, "rb_memerror"); exc = nomem_error; if (!exc || - rb_thread_raised_p(th, RAISED_NOMEMORY)) { + rb_ec_raised_p(ec, RAISED_NOMEMORY)) { fprintf(stderr, "[FATAL] failed to allocate memory\n"); exit(EXIT_FAILURE); } - if (rb_thread_raised_p(th, RAISED_NOMEMORY)) { - rb_thread_raised_clear(th); + if (rb_ec_raised_p(ec, RAISED_NOMEMORY)) { + rb_ec_raised_clear(ec); } else { - rb_thread_raised_set(th, RAISED_NOMEMORY); + rb_ec_raised_set(ec, RAISED_NOMEMORY); exc = ruby_vm_special_exception_copy(exc); } - th->ec->errinfo = exc; - EC_JUMP_TAG(th->ec, TAG_RAISE); + ec->errinfo = exc; + EC_JUMP_TAG(ec, TAG_RAISE); } static void * -- cgit v1.2.3