2 files changed, 16 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1bb12f7c20..8d9545f5ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 15 13:36:02 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* hash.c (rb_hash_each_pair): performance improvement by using
+	  rb_block_arity().
+
 Mon Jul 15 13:15:37 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
 	* proc.c (rb_block_arity): create internal API rb_block_arity().
diff --git a/hash.c b/hash.c
index 182a856a38..6cddb8cf0b 100644
--- a/hash.c
+++ b/hash.c
@@ -1472,6 +1472,13 @@ each_pair_i(VALUE key, VALUE value)
     return ST_CONTINUE;
 }
 
+static int
+each_pair_i_fast(VALUE key, VALUE value)
+{
+    rb_yield_values(2, key, value);
+    return ST_CONTINUE;
+}
+
 /*
  *  call-seq:
  *     hsh.each      {| key, value | block } -> hsh
@@ -1498,7 +1505,10 @@ static VALUE
 rb_hash_each_pair(VALUE hash)
 {
     RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
-    rb_hash_foreach(hash, each_pair_i, 0);
+    if (rb_block_arity() > 1)
+	rb_hash_foreach(hash, each_pair_i_fast, 0);
+    else
+	rb_hash_foreach(hash, each_pair_i, 0);
     return hash;
 }