From: Yui NARUSE <redmine@...>
Date: 2010-07-20T09:32:11+09:00
Subject: [ruby-core:31362] [Bug #3562] regression in respond_to?

Issue #3562 has been updated by Yui NARUSE.


I'll commit following revert patch.

diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb
index d135577..da17ef5 100644
--- a/test/ruby/test_method.rb
+++ b/test/ruby/test_method.rb
@@ -371,7 +371,7 @@ class TestMethod < Test::Unit::TestCase
 
     assert_equal(true,  respond_to?(:mv1))
     assert_equal(false, respond_to?(:mv2))
-    assert_equal(false, respond_to?(:mv3))
+    assert_equal(true, respond_to?(:mv3))
 
     assert_equal(true,  respond_to?(:mv1, true))
     assert_equal(true,  respond_to?(:mv2, true))
@@ -393,7 +393,7 @@ class TestMethod < Test::Unit::TestCase
 
     assert_equal(true,  v.respond_to?(:mv1))
     assert_equal(false, v.respond_to?(:mv2))
-    assert_equal(false, v.respond_to?(:mv3))
+    assert_equal(true, v.respond_to?(:mv3))
 
     assert_equal(true,  v.respond_to?(:mv1, true))
     assert_equal(true,  v.respond_to?(:mv2, true))
diff --git a/vm_method.c b/vm_method.c
index aa5db73..50f0b12 100644
--- a/vm_method.c
+++ b/vm_method.c
@@ -565,19 +565,18 @@ rb_method_boundp(VALUE klass, ID id, int ex)
 {
     rb_method_entry_t *me = rb_method_entry(klass, id);
 
-    if (!me) return 0; 
-    if (ex & ~NOEX_RESPONDS) { /* pub */
-       if (me->flag & NOEX_PRIVATE) return 0;
-       if (ex & NOEX_RESPONDS) {
-           if (me->flag & NOEX_PROTECTED) return 0;
+    if (me != 0) {
+       if ((ex & ~NOEX_RESPONDS) && (me->flag & NOEX_PRIVATE)) {
+           return FALSE;
        }
+       if (!me->def) return 0;
+       if (me->def->type == VM_METHOD_TYPE_NOTIMPLEMENTED) {
+           if (ex & NOEX_RESPONDS) return 2;
+           return 0;
+       }
+       return 1;
     }
-    if (!me->def) return 0;
-    if (me->def->type == VM_METHOD_TYPE_NOTIMPLEMENTED) {
-       if (ex & NOEX_RESPONDS) return 2;
-       return 0;
-    }
-    return 1;
+    return 0;
 }
 
 void
----------------------------------------
http://redmine.ruby-lang.org/issues/show/3562

----------------------------------------
http://redmine.ruby-lang.org