diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-29 05:10:06 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-29 05:10:06 +0000 |
commit | 106f033b89fed268fe376ebaf16cb95fda655e6a (patch) | |
tree | 1e702e8796e17507302ec5c552daf09ee1252944 /encoding.c | |
parent | fc87b3b7e01c6d14e891b5a38921eef3fd05c8e7 (diff) |
* gc.c (gc_mark_ptr): remove debug code for #11244.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52336 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
-rw-r--r-- | encoding.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/encoding.c b/encoding.c index 57c89ee8ce..0444b5fccb 100644 --- a/encoding.c +++ b/encoding.c @@ -52,9 +52,7 @@ static struct { } enc_table; #define ENC_DUMMY_FLAG (1<<24) -#define ENC_INDEX_MASK (~(~0U<<24)) -#define ENC_TO_ENCINDEX(enc) (int)((enc)->ruby_encoding_index & ENC_INDEX_MASK) #define ENC_DUMMY_P(enc) ((enc)->ruby_encoding_index & ENC_DUMMY_FLAG) #define ENC_SET_DUMMY(enc) ((enc)->ruby_encoding_index |= ENC_DUMMY_FLAG) @@ -112,7 +110,7 @@ rb_enc_from_encoding(rb_encoding *encoding) int rb_enc_to_index(rb_encoding *enc) { - return enc ? ENC_TO_ENCINDEX(enc) : 0; + return enc_to_index(enc); } int @@ -758,13 +756,7 @@ rb_enc_get_index(VALUE obj) default: case T_STRING: case T_REGEXP: - i = ENCODING_GET_INLINED(obj); - if (i == ENCODING_INLINE_MAX) { - VALUE iv; - - iv = rb_ivar_get(obj, rb_id_encoding()); - i = NUM2INT(iv); - } + i = str_enc_get_index(obj); break; case T_FILE: tmp = rb_funcallv(obj, rb_intern("internal_encoding"), 0, 0); |