kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/objspace/objspace_dump.c (dump_object): use STR_SHARED_P()

Browse source 
instead of removed STR_NOCAPA_P() macro.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44832 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2014-02-05 05:41:04 +00:00
parent 1ccaa4756a
commit d76b382683
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Feb 5 14:40:16 2014 Koichi Sasada <ko1@atdot.net>
* ext/objspace/objspace_dump.c (dump_object): use STR_SHARED_P()
instead of removed STR_NOCAPA_P() macro.
Wed Feb 5 13:51:33 2014 Koichi Sasada <ko1@atdot.net> Wed Feb 5 13:51:33 2014 Koichi Sasada <ko1@atdot.net>
* internal.h, vm_core.h: move LIKELY/UNLIKELY/UNINITIALIZED_VAR() * internal.h, vm_core.h: move LIKELY/UNLIKELY/UNINITIALIZED_VAR()

2
ext/objspace/objspace_dump.c
View file

@ -182,7 +182,7 @@ dump_object(VALUE obj, struct dump_config *dc)
dump_append(dc, ", \"shared\":true"); dump_append(dc, ", \"shared\":true");
else { else {
dump_append(dc, ", \"bytesize\":%ld", RSTRING_LEN(obj)); dump_append(dc, ", \"bytesize\":%ld", RSTRING_LEN(obj));
if (!STR_EMBED_P(obj) && !STR_NOCAPA_P(obj) && (long)rb_str_capacity(obj) != RSTRING_LEN(obj)) if (!STR_EMBED_P(obj) && !STR_SHARED_P(obj) && (long)rb_str_capacity(obj) != RSTRING_LEN(obj))
dump_append(dc, ", \"capacity\":%ld", rb_str_capacity(obj)); dump_append(dc, ", \"capacity\":%ld", rb_str_capacity(obj));
if (is_ascii_string(obj)) { if (is_ascii_string(obj)) {