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

compile.c: use putspecialobject for RubyVM::FrozenCore

Browse Source 
[Bug #20569]

`putobject RubyVM::FrozenCore`, is not serializable, we
have to use `putspecialobject VM_SPECIAL_OBJECT_VMCORE`.
This commit is contained in:
Jean Boussier 2024-06-10 15:12:54 +02:00
parent d827d32527
commit f0001a4fa7
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compile.c
View File

@ -9882,7 +9882,7 @@ compile_attrasgn(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node
static int static int
compile_make_shareable_node(rb_iseq_t *iseq, LINK_ANCHOR *ret, LINK_ANCHOR *sub, const NODE *value, bool copy) compile_make_shareable_node(rb_iseq_t *iseq, LINK_ANCHOR *ret, LINK_ANCHOR *sub, const NODE *value, bool copy)
{ {
ADD_INSN1(ret, value, putobject, rb_mRubyVMFrozenCore); ADD_INSN1(ret, value, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
ADD_SEQ(ret, sub); ADD_SEQ(ret, sub);
if (copy) { if (copy) {
@ -9971,7 +9971,7 @@ compile_ensure_shareable_node(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *dest, con
*. RubyVM::FrozenCore.ensure_shareable(value, const_decl_path(dest)) *. RubyVM::FrozenCore.ensure_shareable(value, const_decl_path(dest))
*/ */
VALUE path = const_decl_path(dest); VALUE path = const_decl_path(dest);
ADD_INSN1(ret, value, putobject, rb_mRubyVMFrozenCore); ADD_INSN1(ret, value, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
CHECK(COMPILE(ret, "compile_ensure_shareable_node", value)); CHECK(COMPILE(ret, "compile_ensure_shareable_node", value));
ADD_INSN1(ret, value, putobject, path); ADD_INSN1(ret, value, putobject, path);
RB_OBJ_WRITTEN(iseq, Qundef, path); RB_OBJ_WRITTEN(iseq, Qundef, path);

8
test/ruby/test_iseq.rb
View File

@ -167,6 +167,14 @@ class TestISeq < Test::Unit::TestCase
end end
end end
def test_ractor_shareable_value_frozen_core
iseq = RubyVM::InstructionSequence.compile(<<~'RUBY')
# shareable_constant_value: literal
REGEX = /#{}/ # [Bug #20569]
RUBY
assert_includes iseq.to_binary, "REGEX".b
end
def test_disasm_encoding def test_disasm_encoding
src = +"\u{3042} = 1; \u{3042}; \u{3043}" src = +"\u{3042} = 1; \u{3042}; \u{3043}"
asm = compile(src).disasm asm = compile(src).disasm