kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* eval.c, vm_eval.c: use TH_PUSH_TAG() instead of PUSH_TAG().

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2012-10-19 07:57:56 +00:00
parent e99989bf4f
commit 0fc7f4bb30
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Fri Oct 19 16:55:58 2012 Koichi Sasada <ko1@atdot.net>
* eval.c, vm_eval.c: use TH_PUSH_TAG() instead of PUSH_TAG().
Fri Oct 19 11:13:55 2012 Koichi Sasada <ko1@atdot.net> Fri Oct 19 11:13:55 2012 Koichi Sasada <ko1@atdot.net>
* benchmark/driver.rb: remove unexpected `output'. * benchmark/driver.rb: remove unexpected `output'.

12
eval.c
View file

@ -699,8 +699,8 @@ rb_rescue2(VALUE (* b_proc) (ANYARGS), VALUE data1,
volatile VALUE e_info = th->errinfo; volatile VALUE e_info = th->errinfo;
va_list args; va_list args;
PUSH_TAG(); TH_PUSH_TAG(th);
if ((state = EXEC_TAG()) == 0) { if ((state = TH_EXEC_TAG()) == 0) {
retry_entry: retry_entry:
result = (*b_proc) (data1); result = (*b_proc) (data1);
} }
@ -743,7 +743,7 @@ rb_rescue2(VALUE (* b_proc) (ANYARGS), VALUE data1,
} }
} }
} }
POP_TAG(); TH_POP_TAG();
if (state) if (state)
JUMP_TAG(state); JUMP_TAG(state);
@ -770,15 +770,15 @@ rb_protect(VALUE (* proc) (VALUE), VALUE data, int * state)
protect_tag.prev = th->protect_tag; protect_tag.prev = th->protect_tag;
PUSH_TAG(); TH_PUSH_TAG(th);
th->protect_tag = &protect_tag; th->protect_tag = &protect_tag;
MEMCPY(&org_jmpbuf, &(th)->root_jmpbuf, rb_jmpbuf_t, 1); MEMCPY(&org_jmpbuf, &(th)->root_jmpbuf, rb_jmpbuf_t, 1);
if ((status = EXEC_TAG()) == 0) { if ((status = TH_EXEC_TAG()) == 0) {
SAVE_ROOT_JMPBUF(th, result = (*proc) (data)); SAVE_ROOT_JMPBUF(th, result = (*proc) (data));
} }
MEMCPY(&(th)->root_jmpbuf, &org_jmpbuf, rb_jmpbuf_t, 1); MEMCPY(&(th)->root_jmpbuf, &org_jmpbuf, rb_jmpbuf_t, 1);
th->protect_tag = protect_tag.prev; th->protect_tag = protect_tag.prev;
POP_TAG(); TH_POP_TAG();
if (state) { if (state) {
*state = status; *state = status;

6
vm_eval.c
View file

@ -1652,11 +1652,11 @@ rb_catch_obj(VALUE tag, VALUE (*func)(), VALUE data)
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = GET_THREAD();
rb_control_frame_t *saved_cfp = th->cfp; rb_control_frame_t *saved_cfp = th->cfp;
PUSH_TAG(); TH_PUSH_TAG(th);
th->tag->tag = tag; th->tag->tag = tag;
if ((state = EXEC_TAG()) == 0) { if ((state = TH_EXEC_TAG()) == 0) {
/* call with argc=1, argv = [tag], block = Qnil to insure compatibility */ /* call with argc=1, argv = [tag], block = Qnil to insure compatibility */
val = (*func)(tag, data, 1, &tag, Qnil); val = (*func)(tag, data, 1, &tag, Qnil);
} }
@ -1666,7 +1666,7 @@ rb_catch_obj(VALUE tag, VALUE (*func)(), VALUE data)
th->errinfo = Qnil; th->errinfo = Qnil;
state = 0; state = 0;
} }
POP_TAG(); TH_POP_TAG();
if (state) if (state)
JUMP_TAG(state); JUMP_TAG(state);