1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

string.c: str_duplicate

Browse Source 
* string.c (str_duplicate): move from rb_str_resurrect to short
  circuit initialization.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-10-07 12:32:54 +00:00
parent 2c31c3b45e
commit 89dde224d4
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Oct 7 21:32:51 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (str_duplicate): move from rb_str_resurrect to short
circuit initialization.
Wed Oct 7 20:43:14 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Oct 7 20:43:14 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_resurrect): fix resurrection of short enough to * string.c (rb_str_resurrect): fix resurrection of short enough to

40
string.c
View File

@ -1235,20 +1235,6 @@ str_replace(VALUE str, VALUE str2)
static VALUE static VALUE
str_duplicate(VALUE klass, VALUE str) str_duplicate(VALUE klass, VALUE str)
{
VALUE dup = str_alloc(klass);
str_replace(dup, str);
return dup;
}
VALUE
rb_str_dup(VALUE str)
{
return str_duplicate(rb_obj_class(str), str);
}
VALUE
rb_str_resurrect(VALUE str)
{ {
enum {embed_size = RSTRING_EMBED_LEN_MAX + 1}; enum {embed_size = RSTRING_EMBED_LEN_MAX + 1};
const VALUE flag_mask = const VALUE flag_mask =
@ -1257,18 +1243,12 @@ rb_str_resurrect(VALUE str)
FL_TAINT | FL_FREEZE FL_TAINT | FL_FREEZE
; ;
VALUE flags = FL_TEST_RAW(str, flag_mask); VALUE flags = FL_TEST_RAW(str, flag_mask);
VALUE dup; VALUE dup = str_alloc(klass);
if (RUBY_DTRACE_STRING_CREATE_ENABLED()) {
RUBY_DTRACE_STRING_CREATE(RSTRING_LEN(str),
rb_sourcefile(), rb_sourceline());
}
dup = str_alloc(rb_cString);
MEMCPY(RSTRING(dup)->as.ary, RSTRING(str)->as.ary, MEMCPY(RSTRING(dup)->as.ary, RSTRING(str)->as.ary,
char, embed_size); char, embed_size);
if (flags & STR_NOEMBED) { if (flags & STR_NOEMBED) {
if (UNLIKELY(!(flags & FL_FREEZE))) { if (UNLIKELY(!(flags & FL_FREEZE))) {
str = str_new_frozen(rb_cString, str); str = str_new_frozen(klass, str);
FL_SET_RAW(str, flags & FL_TAINT); FL_SET_RAW(str, flags & FL_TAINT);
flags = FL_TEST_RAW(str, flag_mask); flags = FL_TEST_RAW(str, flag_mask);
} }
@ -1285,6 +1265,22 @@ rb_str_resurrect(VALUE str)
return dup; return dup;
} }
VALUE
rb_str_dup(VALUE str)
{
return str_duplicate(rb_obj_class(str), str);
}
VALUE
rb_str_resurrect(VALUE str)
{
if (RUBY_DTRACE_STRING_CREATE_ENABLED()) {
RUBY_DTRACE_STRING_CREATE(RSTRING_LEN(str),
rb_sourcefile(), rb_sourceline());
}
return str_duplicate(rb_cString, str);
}
/* /*
* call-seq: * call-seq:
* String.new(str="") -> new_str * String.new(str="") -> new_str