mirror/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2026-01-26 20:19:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix rb_shape_transition_object_id transition to TOO_COMPLEX

Browse Source 
If `get_next_shape_internal` fail to return a shape, we must
transitiont to a complex shape. `shape_transition_object_id`
mistakenly didn't.

Co-Authored-By: Peter Zhu <peter@peterzhu.ca>
This commit is contained in:
Jean Boussier 2025-08-01 11:22:11 +02:00
parent 547f111b5b
commit 1064c63643
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gc.c
View File

@ -1897,8 +1897,6 @@ object_id0(VALUE obj)
return object_id_get(obj, shape_id);
}
// rb_shape_object_id_shape may lock if the current shape has
// multiple children.
shape_id_t object_id_shape_id = rb_shape_transition_object_id(obj);
id = generate_next_object_id();

1
shape.c
View File

@ -716,6 +716,7 @@ shape_transition_object_id(shape_id_t original_shape_id)
rb_shape_t *shape = get_next_shape_internal(RSHAPE(original_shape_id), id_object_id, SHAPE_OBJ_ID, &dont_care, true);
if (!shape) {
shape = RSHAPE(ROOT_SHAPE_WITH_OBJ_ID);
return transition_complex(shape_id(shape, original_shape_id) | SHAPE_ID_FL_HAS_OBJECT_ID);
}
RUBY_ASSERT(shape);

8
test/ruby/test_shapes.rb
View File

@ -655,6 +655,14 @@ class TestShapes < Test::Unit::TestCase
end
def test_object_id_transition_too_complex
assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
begin;
obj = Object.new
obj.instance_variable_set(:@a, 1)
RubyVM::Shape.exhaust_shapes
assert_equal obj.object_id, obj.object_id
end;
assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
begin;
class Hi; end