2 files changed, 10 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 587725d61b..1d0c2dc141 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Tue Feb 21 20:22:43 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Feb 21 20:23:47 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_any_hash): treat Qundef like as other special constants.
 
 	* hash.c (hash_foreach_iter): fix signature.
 
diff --git a/hash.c b/hash.c
index 4959a2c1bc..b908950bb9 100644
--- a/hash.c
+++ b/hash.c
@@ -80,20 +80,14 @@ rb_any_hash(VALUE a)
     VALUE hval;
     st_index_t hnum;
 
-    switch (TYPE(a)) {
-      case T_FIXNUM:
-      case T_SYMBOL:
-      case T_NIL:
-      case T_FALSE:
-      case T_TRUE:
-	hnum = rb_hash_end(rb_hash_start((unsigned int)a));
-	break;
-
-      case T_STRING:
+    if (SPECIAL_CONST_P(a)) {
+	if (a == Qundef) return 0;
+	hnum = rb_hash_end(rb_hash_start((st_index_t)a));
+    }
+    else if (BUILTIN_TYPE(a) == T_STRING) {
 	hnum = rb_str_hash(a);
-	break;
-
-      default:
+    }
+    else {
         hval = rb_hash(a);
 	hnum = FIX2LONG(hval);
     }