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

* vm_method.c (search_method): check omod only once for performance.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37105 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shugo 2012-10-06 07:32:45 +00:00
parent a9497d5a84
commit c29c44c454
2 changed files with 43 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Sat Oct 6 16:32:04 2012 Shugo Maeda <shugo@ruby-lang.org>
* vm_method.c (search_method): check omod only once for performance.
Sat Oct 6 09:42:04 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Oct 6 09:42:04 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* enc/encdb.c, enc/utf_16_32.h (ENC_DUMMY_UNICODE): endian-less wide * enc/encdb.c, enc/utf_16_32.h (ENC_DUMMY_UNICODE): endian-less wide

49
vm_method.c
View file

@ -394,16 +394,24 @@ copy_refinement_iclass(VALUE iclass, VALUE superclass)
return result; return result;
} }
static rb_method_entry_t* static inline int
search_method(VALUE klass, ID id, VALUE omod, VALUE *defined_class_ptr) lookup_method_table(VALUE klass, ID id, st_data_t *body)
{
st_table *m_tbl = RCLASS_M_TBL(klass);
if (!m_tbl) {
m_tbl = RCLASS_M_TBL(RCLASS_ORIGIN(RBASIC(klass)->klass));
}
return st_lookup(m_tbl, id, body);
}
static inline rb_method_entry_t*
search_method_with_omod(VALUE klass, ID id, VALUE omod, VALUE *defined_class_ptr)
{ {
st_data_t body; st_data_t body;
VALUE iclass, skipped_class = Qnil; VALUE iclass, skipped_class = Qnil;
for (body = 0; klass; klass = RCLASS_SUPER(klass)) { for (body = 0; klass; klass = RCLASS_SUPER(klass)) {
st_table *m_tbl; if (klass != skipped_class) {
if (!NIL_P(omod) && klass != skipped_class) {
iclass = rb_hash_lookup(omod, klass); iclass = rb_hash_lookup(omod, klass);
if (NIL_P(iclass) && BUILTIN_TYPE(klass) == T_ICLASS) { if (NIL_P(iclass) && BUILTIN_TYPE(klass) == T_ICLASS) {
iclass = rb_hash_lookup(omod, RBASIC(klass)->klass); iclass = rb_hash_lookup(omod, RBASIC(klass)->klass);
@ -415,11 +423,7 @@ search_method(VALUE klass, ID id, VALUE omod, VALUE *defined_class_ptr)
klass = iclass; klass = iclass;
} }
} }
m_tbl = RCLASS_M_TBL(klass); if (lookup_method_table(klass, id, &body)) break;
if (!m_tbl) {
m_tbl = RCLASS_M_TBL(RCLASS_ORIGIN(RBASIC(klass)->klass));
}
if (st_lookup(m_tbl, id, &body)) break;
} }
if (defined_class_ptr) if (defined_class_ptr)
@ -427,6 +431,31 @@ search_method(VALUE klass, ID id, VALUE omod, VALUE *defined_class_ptr)
return (rb_method_entry_t *)body; return (rb_method_entry_t *)body;
} }
static inline rb_method_entry_t*
search_method_without_omod(VALUE klass, ID id, VALUE *defined_class_ptr)
{
st_data_t body;
for (body = 0; klass; klass = RCLASS_SUPER(klass)) {
if (lookup_method_table(klass, id, &body)) break;
}
if (defined_class_ptr)
*defined_class_ptr = klass;
return (rb_method_entry_t *)body;
}
static rb_method_entry_t*
search_method(VALUE klass, ID id, VALUE omod, VALUE *defined_class_ptr)
{
if (NIL_P(omod)) {
return search_method_without_omod(klass, id, defined_class_ptr);
}
else {
return search_method_with_omod(klass, id, omod, defined_class_ptr);
}
}
/* /*
* search method entry without the method cache. * search method entry without the method cache.
* *