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

Add missing lock for Module#remove_instance_variable

Browse Source 
We must take a lock to ensure another ractor isn't reading the ivars
while we're moving them.
This commit is contained in:
Jean Boussier 2025-05-23 16:08:51 +02:00
parent 52da5f8bbc
commit 1435ea7f44
Notes: git 2025-05-23 15:33:32 +00:00 
Merged: https://github.com/ruby/ruby/pull/13426
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
variable.c
View File

@ -1537,9 +1537,13 @@ rb_ivar_delete(VALUE obj, ID id, VALUE undef)
{ {
rb_check_frozen(obj); rb_check_frozen(obj);
bool locked = false;
unsigned int lev = 0;
VALUE val = undef; VALUE val = undef;
if (BUILTIN_TYPE(obj) == T_CLASS || BUILTIN_TYPE(obj) == T_MODULE) { if (BUILTIN_TYPE(obj) == T_CLASS || BUILTIN_TYPE(obj) == T_MODULE) {
IVAR_ACCESSOR_SHOULD_BE_MAIN_RACTOR(id); IVAR_ACCESSOR_SHOULD_BE_MAIN_RACTOR(id);
RB_VM_LOCK_ENTER_LEV(&lev);
locked = true;
} }
shape_id_t old_shape_id = rb_obj_shape_id(obj); shape_id_t old_shape_id = rb_obj_shape_id(obj);
@ -1551,6 +1555,9 @@ rb_ivar_delete(VALUE obj, ID id, VALUE undef)
shape_id_t next_shape_id = rb_shape_transition_remove_ivar(obj, id, &removed_shape_id); shape_id_t next_shape_id = rb_shape_transition_remove_ivar(obj, id, &removed_shape_id);
if (next_shape_id == old_shape_id) { if (next_shape_id == old_shape_id) {
if (locked) {
RB_VM_LOCK_LEAVE_LEV(&lev);
}
return undef; return undef;
} }
@ -1600,6 +1607,10 @@ rb_ivar_delete(VALUE obj, ID id, VALUE undef)
} }
rb_shape_set_shape_id(obj, next_shape_id); rb_shape_set_shape_id(obj, next_shape_id);
if (locked) {
RB_VM_LOCK_LEAVE_LEV(&lev);
}
return val; return val;
too_complex: too_complex:
@ -1630,6 +1641,11 @@ too_complex:
} }
} }
} }
if (locked) {
RB_VM_LOCK_LEAVE_LEV(&lev);
}
return val; return val;
} }