3 files changed, 27 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 01776c9a5a..aa7068e8ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 16 09:52:00 2009  Nobuyoshi Nakada  <[email protected]>
+
+	* eval.c (rb_clear_cache_for_undef): clear entries for inherited
+	  methods.  [ruby-core:26074]
+
 Fri Oct 16 09:20:45 2009  Nobuyoshi Nakada  <[email protected]>
 
 	* test/ruby/envutil.rb: get rid of double loading.
diff --git a/eval.c b/eval.c
index 32caecec06..ae5cad5265 100644
--- a/eval.c
+++ b/eval.c
@@ -384,7 +384,8 @@ rb_clear_cache_for_undef(klass, id)
     ent = cache; end = ent + CACHE_SIZE;
     while (ent < end) {
 	if (ent->mid == id &&
-	    RCLASS(ent->origin)->m_tbl == RCLASS(klass)->m_tbl) {
+	    (ent->klass == klass ||
+	     RCLASS(ent->origin)->m_tbl == RCLASS(klass)->m_tbl)) {
 	    ent->mid = 0;
 	}
 	ent++;
diff --git a/test/ruby/test_object.rb b/test/ruby/test_object.rb
index aa6d83d68a..221d0256d5 100644
--- a/test/ruby/test_object.rb
+++ b/test/ruby/test_object.rb
@@ -230,6 +230,26 @@ class TestObject < Test::Unit::TestCase
     assert_raise(TypeError) do
       c.instance_eval { remove_method(:foo) }
     end
+
+    c = Class.new do
+      def meth1; "meth" end
+    end
+    d = Class.new(c) do
+      alias meth2 meth1
+    end
+    o1 = c.new
+    assert_respond_to(o1, :meth1)
+    assert_equal("meth", o1.meth1)
+    o2 = d.new
+    assert_respond_to(o2, :meth1)
+    assert_equal("meth", o2.meth1)
+    assert_respond_to(o2, :meth2)
+    assert_equal("meth", o2.meth2)
+    d.class_eval do
+      remove_method :meth2
+    end
+    bug2202 = '[ruby-core:26074]'
+    assert_raise(NoMethodError, bug2202) {o2.meth2}
   end
 
   def test_method_missing