2 files changed, 6 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 53e5a7332a..9928e791dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jan 31 21:43:35 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* string.c (rb_string_value): make no exception for Symbol.
+	  [ruby-dev:40274]
+
 Sun Jan 31 21:10:15 2010  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* vm_insnhelper.c (vm_throw): fixed infinite loop.  [ruby-core:27969]
diff --git a/string.c b/string.c
index 109edd36ba..81b9b9d134 100644
--- a/string.c
+++ b/string.c
@@ -1349,13 +1349,7 @@ rb_string_value(volatile VALUE *ptr)
 {
     VALUE s = *ptr;
     if (TYPE(s) != T_STRING) {
-	if (SYMBOL_P(s)) {
-	    s = rb_sym_to_s(s);
-	}
-	else {
-	    s = rb_str_to_str(s);
-	}
-	*ptr = s;
+	*ptr = rb_str_to_str(s);
     }
     return s;
 }