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

Show embed status of array when len is 0 in objspace dump

Browse Source
This commit is contained in:
Peter Zhu 2022-02-28 09:39:16 -05:00
parent 7790905536
commit fb724a887a
Notes: git 2022-03-02 00:56:13 +09:00 
Merged: https://github.com/ruby/ruby/pull/5609
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/objspace/objspace_dump.c
View File

@ -419,7 +419,7 @@ dump_object(VALUE obj, struct dump_config *dc)
dump_append_ld(dc, RARRAY_LEN(obj));
if (RARRAY_LEN(obj) > 0 && FL_TEST(obj, ELTS_SHARED))
dump_append(dc, ", \"shared\":true");
if (RARRAY_LEN(obj) > 0 && FL_TEST(obj, RARRAY_EMBED_FLAG))
if (FL_TEST(obj, RARRAY_EMBED_FLAG))
dump_append(dc, ", \"embedded\":true");
break;

22
test/objspace/test_objspace.rb
View File

@ -307,6 +307,28 @@ class TestObjSpace < Test::Unit::TestCase
JSON.parse(info) if defined?(JSON)
end
def test_dump_array
# Empty array
info = ObjectSpace.dump([])
assert_include(info, '"length":0, "embedded":true')
assert_not_include(info, '"shared":true')
# Non-embed array
arr = (1..10).to_a
info = ObjectSpace.dump(arr)
assert_include(info, '"length":10')
assert_not_include(info, '"embedded":true')
assert_not_include(info, '"shared":true')
# Shared array
arr1 = (1..10).to_a
arr = []
arr.replace(arr1)
info = ObjectSpace.dump(arr)
assert_include(info, '"length":10, "shared":true')
assert_not_include(info, '"embedded":true')
end
def test_dump_control_char
assert_include(ObjectSpace.dump("\x0f"), '"value":"\u000f"')
assert_include(ObjectSpace.dump("\C-?"), '"value":"\u007f"')