shyouhei	2009-11-25 16:21:40 +0900 (Wed, 25 Nov 2009)

  New Revision: 25914

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25914

  Log:
    merge revision(s) 25359:
    * eval.c (rb_clear_cache_for_undef): clear entries for inherited
      methods.  [ruby-core:26074]

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/eval.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 25913)
+++ ruby_1_8_7/ChangeLog	(revision 25914)
@@ -1,3 +1,8 @@
+Wed Nov 25 16:18:37 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* eval.c (rb_clear_cache_for_undef): clear entries for inherited
+	  methods.  [ruby-core:26074]
+
 Tue Nov 24 16:15:18 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/iconv/iconv.c (iconv_create): cannot retry with given block.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 25913)
+++ ruby_1_8_7/version.h	(revision 25914)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-11-24"
+#define RUBY_RELEASE_DATE "2009-11-25"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20091124
-#define RUBY_PATCHLEVEL 220
+#define RUBY_RELEASE_CODE 20091125
+#define RUBY_PATCHLEVEL 221
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 24
+#define RUBY_RELEASE_DAY 25
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_7/eval.c
===================================================================
--- ruby_1_8_7/eval.c	(revision 25913)
+++ ruby_1_8_7/eval.c	(revision 25914)
@@ -370,7 +370,8 @@
     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++;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/