[前][次][番号順一覧][スレッド一覧]

ruby-changes:48437

From: ko1 <ko1@a...>
Date: Sun, 29 Oct 2017 23:52:10 +0900 (JST)
Subject: [ruby-changes:48437] ko1:r60551 (trunk): `th` -> `ec` for rb_raise_method_missing().

ko1	2017-10-29 23:52:05 +0900 (Sun, 29 Oct 2017)

  New Revision: 60551

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=60551

  Log:
    `th` -> `ec` for rb_raise_method_missing().

  Modified files:
    trunk/eval_intern.h
    trunk/vm_eval.c
    trunk/vm_insnhelper.c
Index: vm_insnhelper.c
===================================================================
--- vm_insnhelper.c	(revision 60550)
+++ vm_insnhelper.c	(revision 60551)
@@ -2339,7 +2339,7 @@ vm_call_method_nome(rb_execution_context https://github.com/ruby/ruby/blob/trunk/vm_insnhelper.c#L2339
     if (ci->mid == idMethodMissing) {
 	rb_control_frame_t *reg_cfp = cfp;
 	VALUE *argv = STACK_ADDR_FROM_TOP(calling->argc);
-	rb_raise_method_missing(rb_ec_thread_ptr(ec), calling->argc, argv, calling->recv, stat);
+	rb_raise_method_missing(ec, calling->argc, argv, calling->recv, stat);
     }
     else {
 	cc->aux.method_missing_reason = stat;
Index: vm_eval.c
===================================================================
--- vm_eval.c	(revision 60550)
+++ vm_eval.c	(revision 60551)
@@ -591,7 +591,7 @@ rb_call(VALUE recv, ID mid, int argc, co https://github.com/ruby/ruby/blob/trunk/vm_eval.c#L591
     return rb_call0(ec, recv, mid, argc, argv, scope, ec->cfp->self);
 }
 
-NORETURN(static void raise_method_missing(rb_thread_t *th, int argc, const VALUE *argv,
+NORETURN(static void raise_method_missing(rb_execution_context_t *ec, int argc, const VALUE *argv,
 					  VALUE obj, enum method_missing_reason call_status));
 
 /*
@@ -631,7 +631,7 @@ static VALUE https://github.com/ruby/ruby/blob/trunk/vm_eval.c#L631
 rb_method_missing(int argc, const VALUE *argv, VALUE obj)
 {
     rb_thread_t *th = GET_THREAD();
-    raise_method_missing(th, argc, argv, obj, th->method_missing_reason);
+    raise_method_missing(th->ec, argc, argv, obj, th->method_missing_reason);
     UNREACHABLE;
 }
 
@@ -662,7 +662,7 @@ make_no_method_exception(VALUE exc, VALU https://github.com/ruby/ruby/blob/trunk/vm_eval.c#L662
 }
 
 static void
-raise_method_missing(rb_thread_t *th, int argc, const VALUE *argv, VALUE obj,
+raise_method_missing(rb_execution_context_t *ec, int argc, const VALUE *argv, VALUE obj,
 		     enum method_missing_reason last_call_status)
 {
     VALUE exc = rb_eNoMethodError;
@@ -677,7 +677,7 @@ raise_method_missing(rb_thread_t *th, in https://github.com/ruby/ruby/blob/trunk/vm_eval.c#L677
 		 rb_obj_class(argv[0]));
     }
 
-    stack_check(th->ec);
+    stack_check(ec);
 
     if (last_call_status & MISSING_PRIVATE) {
 	format = rb_fstring_cstr("private method `%s' called for %s%s%s");
@@ -715,7 +715,7 @@ method_missing(VALUE obj, ID id, int arg https://github.com/ruby/ruby/blob/trunk/vm_eval.c#L715
 
     if (id == idMethodMissing) {
       missing:
-	raise_method_missing(rb_ec_thread_ptr(ec), argc, argv, obj, call_status | MISSING_MISSING);
+	raise_method_missing(ec, argc, argv, obj, call_status | MISSING_MISSING);
     }
 
     nargv = ALLOCV_N(VALUE, work, argc + 1);
@@ -735,11 +735,11 @@ method_missing(VALUE obj, ID id, int arg https://github.com/ruby/ruby/blob/trunk/vm_eval.c#L735
 }
 
 void
-rb_raise_method_missing(rb_thread_t *th, int argc, const VALUE *argv,
+rb_raise_method_missing(rb_execution_context_t *ec, int argc, const VALUE *argv,
 			VALUE obj, int call_status)
 {
-    vm_passed_block_handler_set(th->ec, VM_BLOCK_HANDLER_NONE);
-    raise_method_missing(th, argc, argv, obj, call_status | MISSING_MISSING);
+    vm_passed_block_handler_set(ec, VM_BLOCK_HANDLER_NONE);
+    raise_method_missing(ec, argc, argv, obj, call_status | MISSING_MISSING);
 }
 
 /*!
Index: eval_intern.h
===================================================================
--- eval_intern.h	(revision 60550)
+++ eval_intern.h	(revision 60551)
@@ -302,8 +302,8 @@ NORETURN(void rb_vm_localjump_error(cons https://github.com/ruby/ruby/blob/trunk/eval_intern.h#L302
 #if 0
 NORETURN(void rb_vm_jump_tag_but_local_jump(int));
 #endif
-NORETURN(void rb_raise_method_missing(rb_thread_t *th, int argc, const VALUE *argv,
-				      VALUE obj, int call_status));
+NORETURN(void rb_raise_method_missing(rb_execution_context_t *ec,
+				      int argc, const VALUE *argv, VALUE obj, int call_status));
 
 VALUE rb_vm_make_jump_tag_but_local_jump(int state, VALUE val);
 rb_cref_t *rb_vm_cref(void);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]