diff options
| -rw-r--r-- | test/ruby/test_defined.rb | 28 | ||||
| -rw-r--r-- | vm_insnhelper.c | 2 | ||||
| -rw-r--r-- | vm_method.c | 2 |
3 files changed, 30 insertions, 2 deletions
diff --git a/test/ruby/test_defined.rb b/test/ruby/test_defined.rb index e1571d5714..6ad4854b98 100644 --- a/test/ruby/test_defined.rb +++ b/test/ruby/test_defined.rb @@ -301,4 +301,32 @@ class TestDefined < Test::Unit::TestCase def test_top_level_constant_not_defined assert_nil(defined?(TestDefined::Object)) end + + class RefinedClass + end + + module RefiningModule + refine RefinedClass do + def pub + end + end + + def self.call_without_using(x = RefinedClass.new) + defined?(x.pub) + end + + using self + + def self.call_with_using(x = RefinedClass.new) + defined?(x.pub) + end + end + + def test_defined_refined_call_without_using + assert(!RefiningModule.call_without_using, "refined public method without using") + end + + def test_defined_refined_call_with_using + assert(RefiningModule.call_with_using, "refined public method with using") + end end diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 6c82d74020..f910c036f1 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -3660,7 +3660,7 @@ vm_defined(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, rb_num_t op_ break; case DEFINED_METHOD:{ VALUE klass = CLASS_OF(v); - const rb_method_entry_t *me = rb_method_entry(klass, SYM2ID(obj)); + const rb_method_entry_t *me = rb_method_entry_with_refinements(klass, SYM2ID(obj), NULL); if (me) { switch (METHOD_ENTRY_VISI(me)) { diff --git a/vm_method.c b/vm_method.c index 0c4c26a193..a87a8f360c 100644 --- a/vm_method.c +++ b/vm_method.c @@ -1088,7 +1088,7 @@ method_entry_resolve_refinement(VALUE klass, ID id, int with_refinement, VALUE * return me; } -const rb_method_entry_t * +MJIT_FUNC_EXPORTED const rb_method_entry_t * rb_method_entry_with_refinements(VALUE klass, ID id, VALUE *defined_class_ptr) { return method_entry_resolve_refinement(klass, id, TRUE, defined_class_ptr); |