diff options
| author | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-08 03:36:58 +0000 |
|---|---|---|
| committer | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-08 03:36:58 +0000 |
| commit | ee68f78c2462908882e3394f8a91631ec4a45beb (patch) | |
| tree | d2049485ecaa88661958e9e0ff69a80e872da759 /vm_insnhelper.c | |
| parent | d928280cb6644d2d899aadf7bfc8cf4e1b5e2997 (diff) | |
* vm_insnhelper.c (vm_search_normal_superclass): super in a
refinement always uses the refined class as its superclass.
* test/ruby/test_refinement.rb: related test.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38271 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 4d0d6b6185..5743654953 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1866,8 +1866,14 @@ vm_call_super_method(rb_thread_t *th, rb_control_frame_t *reg_cfp, rb_call_info_ static inline VALUE vm_search_normal_superclass(VALUE klass) { - klass = RCLASS_ORIGIN(klass); - return RCLASS_SUPER(klass); + if (BUILTIN_TYPE(klass) == T_ICLASS && + FL_TEST(RBASIC(klass)->klass, RMODULE_IS_REFINEMENT)) { + return rb_refinement_module_get_refined_class(RBASIC(klass)->klass); + } + else { + klass = RCLASS_ORIGIN(klass); + return RCLASS_SUPER(klass); + } } static void |