From e97bf2aa9ccd7f05015901fd6084284d0d99743f Mon Sep 17 00:00:00 2001 From: shyouhei Date: Wed, 25 Nov 2009 07:21:40 +0000 Subject: merge revision(s) 25359: * eval.c (rb_clear_cache_for_undef): clear entries for inherited methods. [ruby-core:26074] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@25914 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ eval.c | 3 ++- version.h | 8 ++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 44ed049663..bfc3eb84b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Nov 25 16:18:37 2009 Nobuyoshi Nakada + + * eval.c (rb_clear_cache_for_undef): clear entries for inherited + methods. [ruby-core:26074] + Tue Nov 24 16:15:18 2009 Nobuyoshi Nakada * ext/iconv/iconv.c (iconv_create): cannot retry with given block. diff --git a/eval.c b/eval.c index ba15931e69..2541e2e2e7 100644 --- a/eval.c +++ b/eval.c @@ -370,7 +370,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/version.h b/version.h index cc3598c3c7..369361cab9 100644 --- a/version.h +++ b/version.h @@ -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[]; -- cgit v1.2.3