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

Add hints of tag jumps for optimization

Browse Source 
Just as the state was originally passed as the return value of
`longjmp`, the state stored in EC cannot be 0 when the jump is
captured now too.
This commit is contained in:
Nobuyoshi Nakada 2023-08-06 17:24:48 +09:00
parent ef5b1d19c1
commit 11f33ba620
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eval_intern.h
View File

@ -151,6 +151,7 @@ rb_ec_tag_state(const rb_execution_context_t *ec)
enum ruby_tag_type state = tag->state; enum ruby_tag_type state = tag->state;
tag->state = TAG_NONE; tag->state = TAG_NONE;
rb_ec_vm_lock_rec_check(ec, tag->lock_rec); rb_ec_vm_lock_rec_check(ec, tag->lock_rec);
RBIMPL_ASSUME(state != TAG_NONE);
return state; return state;
} }
@ -158,6 +159,7 @@ NORETURN(static inline void rb_ec_tag_jump(const rb_execution_context_t *ec, enu
static inline void static inline void
rb_ec_tag_jump(const rb_execution_context_t *ec, enum ruby_tag_type st) rb_ec_tag_jump(const rb_execution_context_t *ec, enum ruby_tag_type st)
{ {
RUBY_ASSERT(st != TAG_NONE);
ec->tag->state = st; ec->tag->state = st;
ruby_longjmp(ec->tag->buf, 1); ruby_longjmp(ec->tag->buf, 1);
} }
@ -167,7 +169,7 @@ rb_ec_tag_jump(const rb_execution_context_t *ec, enum ruby_tag_type st)
[ISO/IEC 9899:1999] 7.13.1.1 [ISO/IEC 9899:1999] 7.13.1.1
*/ */
#define EC_EXEC_TAG() \ #define EC_EXEC_TAG() \
(ruby_setjmp(_tag.buf) ? rb_ec_tag_state(VAR_FROM_MEMORY(_ec)) : (EC_REPUSH_TAG(), 0)) (UNLIKELY(ruby_setjmp(_tag.buf)) ? rb_ec_tag_state(VAR_FROM_MEMORY(_ec)) : (EC_REPUSH_TAG(), 0))
#define EC_JUMP_TAG(ec, st) rb_ec_tag_jump(ec, st) #define EC_JUMP_TAG(ec, st) rb_ec_tag_jump(ec, st)