1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

eval_intern.h: use TH_TMPPOP_TAG and TH_REPUSH_TAG

Browse Source 
* eval_intern.h (TH_TMPPOP_TAG, TH_REPUSH_TAG): instead of TAG2 names.

* eval_intern.h (TH_REPUSH_TAG): suppress unused-value warning.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44848 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-02-05 15:32:35 +00:00
parent b2b5a5db09
commit 8a2621ddc2
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eval_intern.h
View File

@ -120,14 +120,10 @@ extern int select_large_fdset(int, fd_set *, fd_set *, fd_set *, struct timeval
_th->tag = _tag.prev; \
} while (0)
#define TH_POP_TAG2() \
#define TH_TMPPOP_TAG() \
_th->tag = _tag.prev
#define TH_PUSH_TAG2() (_th->tag = &_tag, 0)
#define TH_TMPPOP_TAG() TH_POP_TAG2()
#define TH_REPUSH_TAG() TH_PUSH_TAG2()
#define TH_REPUSH_TAG() (void)(_th->tag = &_tag)
#define PUSH_TAG() TH_PUSH_TAG(GET_THREAD())
#define POP_TAG() TH_POP_TAG()
@ -153,7 +149,7 @@ rb_threadptr_tag_jump(rb_thread_t *th, int st)
[ISO/IEC 9899:1999] 7.13.1.1
*/
#define TH_EXEC_TAG() \
(ruby_setjmp(_tag.buf) ? rb_threadptr_tag_state(_th) : TH_PUSH_TAG2())
(ruby_setjmp(_tag.buf) ? rb_threadptr_tag_state(_th) : (TH_REPUSH_TAG(), 0))
#define EXEC_TAG() \
TH_EXEC_TAG()

2
vm.c
View File

@ -1543,7 +1543,7 @@ vm_exec(rb_thread_t *th)
if (VM_FRAME_TYPE_FINISH_P(th->cfp)) {
vm_pop_frame(th);
th->errinfo = err;
TH_POP_TAG2();
TH_TMPPOP_TAG();
JUMP_TAG(state);
}
else {