1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

symbol.h: optimize ID2SYM

* symbol.h (rb_id2sym): optimize for predefined IDs.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48152 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-10-27 06:16:16 +00:00
parent ce9fc203d1
commit fc9fffca1d
2 changed files with 10 additions and 2 deletions

View file

@ -24,9 +24,7 @@
#define SYMBOL_PINNED_P(sym) (RSYMBOL(sym)->id&~ID_SCOPE_MASK) #define SYMBOL_PINNED_P(sym) (RSYMBOL(sym)->id&~ID_SCOPE_MASK)
#define DYNAMIC_ID_P(id) (!(id&ID_STATIC_SYM)&&id>tLAST_OP_ID)
#define STATIC_SYM2ID(sym) RSHIFT((unsigned long)(sym), RUBY_SPECIAL_SHIFT) #define STATIC_SYM2ID(sym) RSHIFT((unsigned long)(sym), RUBY_SPECIAL_SHIFT)
#define STATIC_ID2SYM(id) (((VALUE)(id)<<RUBY_SPECIAL_SHIFT)|SYMBOL_FLAG)
static ID register_static_symid(ID, const char *, long, rb_encoding *); static ID register_static_symid(ID, const char *, long, rb_encoding *);
static ID register_static_symid_str(ID, VALUE); static ID register_static_symid_str(ID, VALUE);
@ -748,6 +746,7 @@ rb_sym2id(VALUE sym)
return id; return id;
} }
#undef rb_id2sym
VALUE VALUE
rb_id2sym(ID x) rb_id2sym(ID x)
{ {

View file

@ -14,6 +14,15 @@
#include "id.h" #include "id.h"
#define DYNAMIC_ID_P(id) (!(id&ID_STATIC_SYM)&&id>tLAST_OP_ID)
#define STATIC_ID2SYM(id) (((VALUE)(id)<<RUBY_SPECIAL_SHIFT)|SYMBOL_FLAG)
#ifdef __GNUC__
#define rb_id2sym(id) \
__extension__(__builtin_constant_p(id) && !DYNAMIC_ID_P(id) ? \
STATIC_ID2SYM(id) : rb_id2sym(id))
#endif
struct RSymbol { struct RSymbol {
struct RBasic basic; struct RBasic basic;
VALUE fstr; VALUE fstr;