summaryrefslogtreecommitdiff
path: root/vm_method.c
diff options
context:
space:
mode:
Diffstat (limited to 'vm_method.c')
-rw-r--r--vm_method.c18
1 files changed, 14 insertions, 4 deletions
diff --git a/vm_method.c b/vm_method.c
index 43b9ddb107..bf605e6f67 100644
--- a/vm_method.c
+++ b/vm_method.c
@@ -385,10 +385,20 @@ search_method(VALUE klass, ID id, VALUE omod, VALUE *defined_class_ptr)
for (body = 0; klass; klass = RCLASS_SUPER(klass)) {
st_table *m_tbl;
- if (!NIL_P(omod) && klass != skipped_class &&
- !NIL_P(iclass = rb_hash_lookup(omod, klass))) {
- skipped_class = klass;
- klass = iclass;
+ if (!NIL_P(omod) && klass != skipped_class) {
+ VALUE c;
+
+ if (BUILTIN_TYPE(klass) == T_ICLASS) {
+ c = RBASIC(klass)->klass;
+ }
+ else {
+ c = klass;
+ }
+ iclass = rb_hash_lookup(omod, c);
+ if (!NIL_P(iclass)) {
+ skipped_class = klass;
+ klass = iclass;
+ }
}
m_tbl = RCLASS_M_TBL(klass);
if (!m_tbl) {