diff options
| author | eileencodes <[email protected]> | 2023-02-07 15:46:50 -0500 |
|---|---|---|
| committer | nagachika <[email protected]> | 2023-07-01 14:17:30 +0900 |
| commit | 8a3d57971c99680d4baec84553247b9c6ee41080 (patch) | |
| tree | 46800a87d7f72c09087deaa37c504c005a187fd6 /class.c | |
| parent | 06dae46036316e6e9926c4613ac8058b78eb7f2e (diff) | |
Fix cvar caching when class is cloned
The class variable cache that was added in
https://github.com/ruby/ruby/pull/4544 changed the behavior of class
variables on cloned classes. As reported when a class is cloned AND a
class variable was set, and the class variable was read from the
original class, reading a class variable from the cloned class would
return the value from the original class.
This was happening because the IC (inline cache) is stored on the ISEQ
which is shared between the original and cloned class, therefore they
share the cache too.
To fix this we are now storing the `cref` in the cache so that we can
check if it's equal to the current `cref`. If it's different we don't
want to read from the cache. If it's the same we do. Cloned classes
don't share the same cref with their original class.
This will need to be backported to 3.1 in addition to 3.2 since the bug
exists in both versions.
We also added a marking function which was missing.
Fixes [Bug #19379]
Co-authored-by: Aaron Patterson <[email protected]>
Diffstat (limited to 'class.c')
| -rw-r--r-- | class.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -419,9 +419,12 @@ cvc_table_copy(ID id, VALUE val, void *data) { ent = ALLOC(struct rb_cvar_class_tbl_entry); ent->class_value = ctx->clone; + ent->cref = orig_entry->cref; ent->global_cvar_state = orig_entry->global_cvar_state; rb_id_table_insert(ctx->new_table, id, (VALUE)ent); + RB_OBJ_WRITTEN(ctx->clone, Qundef, ent->cref); + return ID_TABLE_CONTINUE; } |