mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
eval.c: suppress warning
* 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:
parent
8a9dff36c3
commit
f08c697cd4
1 changed files with 4 additions and 5 deletions
9
eval.c
9
eval.c
|
@ -778,7 +778,7 @@ VALUE
|
|||
rb_protect(VALUE (* proc) (VALUE), VALUE data, int * state)
|
||||
{
|
||||
volatile VALUE result = Qnil;
|
||||
int status;
|
||||
volatile int status;
|
||||
rb_thread_t *th = GET_THREAD();
|
||||
rb_control_frame_t *cfp = th->cfp;
|
||||
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) {
|
||||
SAVE_ROOT_JMPBUF(th, result = (*proc) (data));
|
||||
}
|
||||
else {
|
||||
th->cfp = cfp;
|
||||
}
|
||||
MEMCPY(&(th)->root_jmpbuf, &org_jmpbuf, rb_jmpbuf_t, 1);
|
||||
th->protect_tag = protect_tag.prev;
|
||||
TH_POP_TAG();
|
||||
|
@ -799,10 +802,6 @@ rb_protect(VALUE (* proc) (VALUE), VALUE data, int * state)
|
|||
if (state) {
|
||||
*state = status;
|
||||
}
|
||||
if (status != 0) {
|
||||
th->cfp = cfp;
|
||||
return Qnil;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue