mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
str_buf_cat: preserve coderange when going through fastpath
rb_str_modify clear the coderange, which in this case isn't
necessary.
```
compare-ruby: ruby 3.2.0dev (2022-07-12T15:01:11Z master 71aec68566
) [arm64-darwin21]
built-ruby: ruby 3.2.0dev (2022-07-19T07:17:01Z faster-buffer-conc.. 3cad62aab4) [arm64-darwin21]
warming up...
| |compare-ruby|built-ruby|
|:---------------------|-----------:|---------:|
|binary_concat_utf8 | 360.617k| 605.091k|
| | -| 1.68x|
|binary_concat_binary | 446.650k| 605.053k|
| | -| 1.35x|
|utf8_concat_utf8 | 454.166k| 597.311k|
| | -| 1.32x|
```
```
| |compare-ruby|built-ruby|
|:-----------|-----------:|---------:|
|erb_render | 1.790M| 2.045M|
| | -| 1.14x|
```
This commit is contained in:
parent
0ae8dbbee0
commit
cb9fd920a3
Notes:
git
2022-07-19 17:42:07 +09:00
1 changed files with 14 additions and 6 deletions
20
string.c
20
string.c
|
@ -3110,8 +3110,16 @@ rb_str_resize(VALUE str, long len)
|
|||
}
|
||||
|
||||
static VALUE
|
||||
str_buf_cat(VALUE str, const char *ptr, long len)
|
||||
str_buf_cat4(VALUE str, const char *ptr, long len, bool keep_cr)
|
||||
{
|
||||
if (keep_cr) {
|
||||
str_modify_keep_cr(str);
|
||||
}
|
||||
else {
|
||||
rb_str_modify(str);
|
||||
}
|
||||
if (len == 0) return 0;
|
||||
|
||||
long capa, total, olen, off = -1;
|
||||
char *sptr;
|
||||
const int termlen = TERM_LEN(str);
|
||||
|
@ -3123,12 +3131,11 @@ str_buf_cat(VALUE str, const char *ptr, long len)
|
|||
if (ptr >= sptr && ptr <= sptr + olen) {
|
||||
off = ptr - sptr;
|
||||
}
|
||||
rb_str_modify(str);
|
||||
if (len == 0) return 0;
|
||||
|
||||
if (STR_EMBED_P(str)) {
|
||||
capa = str_embed_capa(str) - termlen;
|
||||
sptr = RSTRING(str)->as.embed.ary;
|
||||
olen = RSTRING_EMBED_LEN(str);
|
||||
olen = RSTRING_EMBED_LEN(str);
|
||||
}
|
||||
else {
|
||||
capa = RSTRING(str)->as.heap.aux.capa;
|
||||
|
@ -3159,7 +3166,8 @@ str_buf_cat(VALUE str, const char *ptr, long len)
|
|||
return str;
|
||||
}
|
||||
|
||||
#define str_buf_cat2(str, ptr) str_buf_cat((str), (ptr), rb_strlen_lit(ptr))
|
||||
#define str_buf_cat(str, ptr, len) str_buf_cat4((str), (ptr), len, false)
|
||||
#define str_buf_cat2(str, ptr) str_buf_cat4((str), (ptr), rb_strlen_lit(ptr), false)
|
||||
|
||||
VALUE
|
||||
rb_str_cat(VALUE str, const char *ptr, long len)
|
||||
|
@ -3322,7 +3330,7 @@ rb_str_buf_append(VALUE str, VALUE str2)
|
|||
{
|
||||
int str2_cr = rb_enc_str_coderange(str2);
|
||||
if (str2_cr == ENC_CODERANGE_7BIT && str_enc_fastpath(str)) {
|
||||
str_buf_cat(str, RSTRING_PTR(str2), RSTRING_LEN(str2));
|
||||
str_buf_cat4(str, RSTRING_PTR(str2), RSTRING_LEN(str2), true);
|
||||
return str;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue