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: suppress warning

Browse source 
* eval.c (rb_protect): get rid of false clobbered warning.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43535 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-11-05 07:56:49 +00:00
parent 8a9dff36c3
commit f08c697cd4
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
eval.c
View file

@ -778,7 +778,7 @@ VALUE
rb_protect(VALUE (* proc) (VALUE), VALUE data, int * state) rb_protect(VALUE (* proc) (VALUE), VALUE data, int * state)
{ {
volatile VALUE result = Qnil; volatile VALUE result = Qnil;
int status; volatile int status;
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = GET_THREAD();
rb_control_frame_t *cfp = th->cfp; rb_control_frame_t *cfp = th->cfp;
struct rb_vm_protect_tag protect_tag; struct rb_vm_protect_tag protect_tag;
@ -792,6 +792,9 @@ rb_protect(VALUE (* proc) (VALUE), VALUE data, int * state)
if ((status = TH_EXEC_TAG()) == 0) { if ((status = TH_EXEC_TAG()) == 0) {
SAVE_ROOT_JMPBUF(th, result = (*proc) (data)); SAVE_ROOT_JMPBUF(th, result = (*proc) (data));
} }
else {
th->cfp = cfp;
}
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;
TH_POP_TAG(); TH_POP_TAG();
@ -799,10 +802,6 @@ rb_protect(VALUE (* proc) (VALUE), VALUE data, int * state)
if (state) { if (state) {
*state = status; *state = status;
} }
if (status != 0) {
th->cfp = cfp;
return Qnil;
}
return result; return result;
} }