From 87e628d66b7bf98f276dbd38b810f0197f821081 Mon Sep 17 00:00:00 2001 From: ko1 Date: Fri, 4 Jan 2019 07:49:00 +0000 Subject: [PATCH] skip to calculate hash value on empty Hash ar_table lookup. * hash.c (ar_lookup): don't calculate hash_value if ar_table is empty. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66702 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- hash.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/hash.c b/hash.c index 3cd4776a17..e45a257fc6 100644 --- a/hash.c +++ b/hash.c @@ -928,18 +928,23 @@ ar_insert(VALUE hash, st_data_t key, st_data_t value) static int ar_lookup(VALUE hash, st_data_t key, st_data_t *value) { - st_hash_t hash_value = do_hash(key); - unsigned bin = find_entry(hash, hash_value, key); - - if (bin == RHASH_AR_TABLE_MAX_BOUND) { + if (RHASH_AR_TABLE_SIZE(hash) == 0) { return 0; } else { - HASH_ASSERT(bin < RHASH_AR_TABLE_MAX_BOUND); - if (value != NULL) { - *value = RHASH_AR_TABLE_REF(hash, bin)->record; + st_hash_t hash_value = do_hash(key); + unsigned bin = find_entry(hash, hash_value, key); + + if (bin == RHASH_AR_TABLE_MAX_BOUND) { + return 0; + } + else { + HASH_ASSERT(bin < RHASH_AR_TABLE_MAX_BOUND); + if (value != NULL) { + *value = RHASH_AR_TABLE_REF(hash, bin)->record; + } + return 1; } - return 1; } }