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: reuse tag

Browse source 
* eval.c (rb_rescue2): reuse tags pushed for body proc to protect
  rescue proc too.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44186 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-12-13 16:32:00 +00:00
parent 71286e3770
commit b2f9a0f5cb
2 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Dec 14 01:31:52 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_rescue2): reuse tags pushed for body proc to protect
rescue proc too.
Sat Dec 14 01:15:51 2013 Masaya Tarui <tarui@ruby-lang.org>
* gc.c (wmap_final_func): Bugfix. Should update *value to new pointer.

32
eval.c
View file

@ -741,7 +741,7 @@ rb_rescue2(VALUE (* b_proc) (ANYARGS), VALUE data1,
int state;
rb_thread_t *th = GET_THREAD();
rb_control_frame_t *cfp = th->cfp;
volatile VALUE result;
volatile VALUE result = Qfalse;
volatile VALUE e_info = th->errinfo;
va_list args;
@ -750,6 +750,15 @@ rb_rescue2(VALUE (* b_proc) (ANYARGS), VALUE data1,
retry_entry:
result = (*b_proc) (data1);
}
else if (result) {
/* escape from r_proc */
if (state == TAG_RETRY) {
state = 0;
th->errinfo = Qnil;
result = Qfalse;
goto retry_entry;
}
}
else {
th->cfp = cfp; /* restore */
@ -767,25 +776,12 @@ rb_rescue2(VALUE (* b_proc) (ANYARGS), VALUE data1,
va_end(args);
if (handle) {
result = Qnil;
state = 0;
if (r_proc) {
PUSH_TAG();
if ((state = EXEC_TAG()) == 0) {
result = (*r_proc) (data2, th->errinfo);
}
POP_TAG();
if (state == TAG_RETRY) {
state = 0;
th->errinfo = Qnil;
goto retry_entry;
}
}
else {
result = Qnil;
state = 0;
}
if (state == 0) {
th->errinfo = e_info;
result = (*r_proc) (data2, th->errinfo);
}
th->errinfo = e_info;
}
}
}