summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--string.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index da69b4cf0a..9768ae74bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Sep 2 23:59:37 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * string.c (str_to_id): a bug caused by premature optimization.
+
Sat Sep 2 23:53:28 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* object.c (Init_Object): move symbol related code to string.c
diff --git a/string.c b/string.c
index 8bb3158917..8c167faa93 100644
--- a/string.c
+++ b/string.c
@@ -4538,8 +4538,6 @@ str_to_id(VALUE str)
if (!RSTRING_PTR(str) || RSTRING_LEN(str) == 0) {
rb_raise(rb_eArgError, "empty symbol string");
}
- if (RBASIC(str)->klass == rb_cSymbol)
- return str;
return rb_intern2(RSTRING_PTR(str), RSTRING_LEN(str));
}