2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 80ae9a2760..c4b5d333a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Sep 29 20:41:19 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_subseq): use rb_str_drop_bytes if possible.
+
 Mon Sep 29 20:22:20 2008  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* test/date/*.rb: imported additional tests and some adjustments.
diff --git a/string.c b/string.c
index 7d6f30555a..cf7f484c7d 100644
--- a/string.c
+++ b/string.c
@@ -1283,7 +1283,15 @@ rb_str_sublen(VALUE str, long pos)
 VALUE
 rb_str_subseq(VALUE str, long beg, long len)
 {
-    VALUE str2 = rb_str_new5(str, RSTRING_PTR(str)+beg, len);
+    VALUE str2;
+
+    if (RSTRING_LEN(str) == beg + len) {
+        str2 = rb_str_new_shared(str);
+        rb_str_drop_bytes(str2, beg);
+    }
+    else {
+        str2 = rb_str_new5(str, RSTRING_PTR(str)+beg, len);
+    }
 
     rb_enc_cr_str_copy_for_substr(str2, str);
     OBJ_INFECT(str2, str);