From 261661517af17df2cb8602594ab263b25c39132c Mon Sep 17 00:00:00 2001 From: ko1 Date: Fri, 15 Oct 2010 15:10:17 +0000 Subject: [PATCH] * hash.c (rb_hash_aref): skip calling "default" method if it is not neede for speed-up. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29511 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ hash.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bd8a9a0cb1..dc4b631db9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Oct 16 00:08:00 2010 Koichi Sasada + + * hash.c (rb_hash_aref): skip calling "default" method + if it is not neede for speed-up. + Fri Oct 15 23:36:25 2010 Nobuyoshi Nakada * file.c (NUM2DEVT, DEVT2NUM, PRI_DEVT_PREFIX): fallback to diff --git a/hash.c b/hash.c index 8b165735d9..0d1898313b 100644 --- a/hash.c +++ b/hash.c @@ -509,7 +509,14 @@ rb_hash_aref(VALUE hash, VALUE key) st_data_t val; if (!RHASH(hash)->ntbl || !st_lookup(RHASH(hash)->ntbl, key, &val)) { - return rb_funcall(hash, id_default, 1, key); + int rb_method_basic_definition_p(VALUE klass, ID id); + if (!FL_TEST(hash, HASH_PROC_DEFAULT) && + rb_method_basic_definition_p(CLASS_OF(hash), id_default)) { + return RHASH_IFNONE(hash); + } + else { + return rb_funcall(hash, id_default, 1, key); + } } return (VALUE)val; }