mirror of
https://github.com/ruby/ruby.git
synced 2025-08-15 13:39:04 +02:00

* Copy cvar table on clone When a class with a class variable is cloned we need to also copy the cvar cache table from the original table to the clone. I found this bug while working on fixing [Bug #19379]. While this does not fix that bug directly it is still a required change to fix another bug revealed by the fix in https://github.com/ruby/ruby/pull/7265 This needs to be backported to 3.2.x and 3.1.x. Co-authored-by: Aaron Patterson <tenderlove@ruby-lang.org> * 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 <tenderlove@ruby-lang.org> * Add missing write barrier We were missing the write barrier for class_value to cref. This should fix the segv we were seeing in http://ci.rvm.jp/logfiles/brlog.trunk-gc-asserts.20230601-165052 Co-authored-by: Aaron Patterson <tenderlove@ruby-lang.org> --------- Co-authored-by: Aaron Patterson <tenderlove@ruby-lang.org>
200 lines
6.6 KiB
C
200 lines
6.6 KiB
C
#ifndef INTERNAL_CLASS_H /*-*-C-*-vi:se ft=c:*/
|
|
#define INTERNAL_CLASS_H
|
|
/**
|
|
* @author Ruby developers <ruby-core@ruby-lang.org>
|
|
* @copyright This file is a part of the programming language Ruby.
|
|
* Permission is hereby granted, to either redistribute and/or
|
|
* modify this file, provided that the conditions mentioned in the
|
|
* file COPYING are met. Consult the file for details.
|
|
* @brief Internal header for Class.
|
|
*/
|
|
#include "id_table.h" /* for struct rb_id_table */
|
|
#include "internal/gc.h" /* for RB_OBJ_WRITE */
|
|
#include "internal/serial.h" /* for rb_serial_t */
|
|
#include "ruby/internal/stdbool.h" /* for bool */
|
|
#include "ruby/intern.h" /* for rb_alloc_func_t */
|
|
#include "ruby/ruby.h" /* for struct RBasic */
|
|
#include "ruby_assert.h"
|
|
#include "vm_core.h"
|
|
#include "method.h" /* for rb_cref_t */
|
|
|
|
#ifdef RCLASS_SUPER
|
|
# undef RCLASS_SUPER
|
|
#endif
|
|
|
|
struct rb_subclass_entry {
|
|
VALUE klass;
|
|
struct rb_subclass_entry *next;
|
|
struct rb_subclass_entry *prev;
|
|
};
|
|
|
|
struct rb_iv_index_tbl_entry {
|
|
uint32_t index;
|
|
rb_serial_t class_serial;
|
|
VALUE class_value;
|
|
};
|
|
|
|
struct rb_cvar_class_tbl_entry {
|
|
uint32_t index;
|
|
rb_serial_t global_cvar_state;
|
|
const rb_cref_t * cref;
|
|
VALUE class_value;
|
|
};
|
|
|
|
struct rb_classext_struct {
|
|
struct st_table *iv_index_tbl; // ID -> struct rb_iv_index_tbl_entry
|
|
struct st_table *iv_tbl;
|
|
#if SIZEOF_SERIAL_T == SIZEOF_VALUE /* otherwise m_tbl is in struct RClass */
|
|
struct rb_id_table *m_tbl;
|
|
#endif
|
|
struct rb_id_table *const_tbl;
|
|
struct rb_id_table *callable_m_tbl;
|
|
struct rb_id_table *cc_tbl; /* ID -> [[ci, cc1], cc2, ...] */
|
|
struct rb_id_table *cvc_tbl;
|
|
struct rb_subclass_entry *subclasses;
|
|
struct rb_subclass_entry *subclass_entry;
|
|
/**
|
|
* In the case that this is an `ICLASS`, `module_subclasses` points to the link
|
|
* in the module's `subclasses` list that indicates that the klass has been
|
|
* included. Hopefully that makes sense.
|
|
*/
|
|
struct rb_subclass_entry *module_subclass_entry;
|
|
#if SIZEOF_SERIAL_T != SIZEOF_VALUE /* otherwise class_serial is in struct RClass */
|
|
rb_serial_t class_serial;
|
|
#endif
|
|
const VALUE origin_;
|
|
const VALUE refined_class;
|
|
rb_alloc_func_t allocator;
|
|
const VALUE includer;
|
|
};
|
|
|
|
struct RClass {
|
|
struct RBasic basic;
|
|
VALUE super;
|
|
#if !USE_RVARGC
|
|
struct rb_classext_struct *ptr;
|
|
#endif
|
|
#if SIZEOF_SERIAL_T == SIZEOF_VALUE
|
|
/* Class serial is as wide as VALUE. Place it here. */
|
|
rb_serial_t class_serial;
|
|
#else
|
|
/* Class serial does not fit into struct RClass. Place m_tbl instead. */
|
|
struct rb_id_table *m_tbl;
|
|
#endif
|
|
};
|
|
|
|
typedef struct rb_subclass_entry rb_subclass_entry_t;
|
|
typedef struct rb_classext_struct rb_classext_t;
|
|
|
|
#if USE_RVARGC
|
|
# define RCLASS_EXT(c) ((rb_classext_t *)((char *)c + sizeof(struct RClass)))
|
|
#else
|
|
# define RCLASS_EXT(c) (RCLASS(c)->ptr)
|
|
#endif
|
|
#define RCLASS_IV_TBL(c) (RCLASS_EXT(c)->iv_tbl)
|
|
#define RCLASS_CONST_TBL(c) (RCLASS_EXT(c)->const_tbl)
|
|
#if SIZEOF_SERIAL_T == SIZEOF_VALUE
|
|
# define RCLASS_M_TBL(c) (RCLASS_EXT(c)->m_tbl)
|
|
#else
|
|
# define RCLASS_M_TBL(c) (RCLASS(c)->m_tbl)
|
|
#endif
|
|
#define RCLASS_CALLABLE_M_TBL(c) (RCLASS_EXT(c)->callable_m_tbl)
|
|
#define RCLASS_CC_TBL(c) (RCLASS_EXT(c)->cc_tbl)
|
|
#define RCLASS_CVC_TBL(c) (RCLASS_EXT(c)->cvc_tbl)
|
|
#define RCLASS_IV_INDEX_TBL(c) (RCLASS_EXT(c)->iv_index_tbl)
|
|
#define RCLASS_ORIGIN(c) (RCLASS_EXT(c)->origin_)
|
|
#define RCLASS_REFINED_CLASS(c) (RCLASS_EXT(c)->refined_class)
|
|
#if SIZEOF_SERIAL_T == SIZEOF_VALUE
|
|
# define RCLASS_SERIAL(c) (RCLASS(c)->class_serial)
|
|
#else
|
|
# define RCLASS_SERIAL(c) (RCLASS_EXT(c)->class_serial)
|
|
#endif
|
|
#define RCLASS_INCLUDER(c) (RCLASS_EXT(c)->includer)
|
|
#define RCLASS_SUBCLASS_ENTRY(c) (RCLASS_EXT(c)->subclass_entry)
|
|
#define RCLASS_MODULE_SUBCLASS_ENTRY(c) (RCLASS_EXT(c)->module_subclass_entry)
|
|
#define RCLASS_ALLOCATOR(c) (RCLASS_EXT(c)->allocator)
|
|
#define RCLASS_SUBCLASSES(c) (RCLASS_EXT(c)->subclasses)
|
|
|
|
#define RICLASS_IS_ORIGIN FL_USER5
|
|
#define RCLASS_CLONED FL_USER6
|
|
#define RICLASS_ORIGIN_SHARED_MTBL FL_USER8
|
|
|
|
/* class.c */
|
|
void rb_class_subclass_add(VALUE super, VALUE klass);
|
|
void rb_class_remove_from_super_subclasses(VALUE);
|
|
void rb_class_remove_subclass_head(VALUE);
|
|
int rb_singleton_class_internal_p(VALUE sklass);
|
|
VALUE rb_class_boot(VALUE);
|
|
VALUE rb_class_s_alloc(VALUE klass);
|
|
VALUE rb_module_s_alloc(VALUE klass);
|
|
void rb_module_set_initialized(VALUE module);
|
|
void rb_module_check_initializable(VALUE module);
|
|
VALUE rb_make_metaclass(VALUE, VALUE);
|
|
VALUE rb_include_class_new(VALUE, VALUE);
|
|
void rb_class_foreach_subclass(VALUE klass, void (*f)(VALUE, VALUE), VALUE);
|
|
void rb_class_detach_subclasses(VALUE);
|
|
void rb_class_detach_module_subclasses(VALUE);
|
|
void rb_class_remove_from_module_subclasses(VALUE);
|
|
VALUE rb_obj_methods(int argc, const VALUE *argv, VALUE obj);
|
|
VALUE rb_obj_protected_methods(int argc, const VALUE *argv, VALUE obj);
|
|
VALUE rb_obj_private_methods(int argc, const VALUE *argv, VALUE obj);
|
|
VALUE rb_obj_public_methods(int argc, const VALUE *argv, VALUE obj);
|
|
VALUE rb_special_singleton_class(VALUE);
|
|
VALUE rb_singleton_class_clone_and_attach(VALUE obj, VALUE attach);
|
|
VALUE rb_singleton_class_get(VALUE obj);
|
|
void rb_undef_methods_from(VALUE klass, VALUE super);
|
|
|
|
static inline void RCLASS_SET_ORIGIN(VALUE klass, VALUE origin);
|
|
static inline void RICLASS_SET_ORIGIN_SHARED_MTBL(VALUE iclass);
|
|
static inline VALUE RCLASS_SUPER(VALUE klass);
|
|
static inline VALUE RCLASS_SET_SUPER(VALUE klass, VALUE super);
|
|
static inline void RCLASS_SET_INCLUDER(VALUE iclass, VALUE klass);
|
|
|
|
MJIT_SYMBOL_EXPORT_BEGIN
|
|
VALUE rb_class_inherited(VALUE, VALUE);
|
|
VALUE rb_keyword_error_new(const char *, VALUE);
|
|
MJIT_SYMBOL_EXPORT_END
|
|
|
|
static inline void
|
|
RCLASS_SET_ORIGIN(VALUE klass, VALUE origin)
|
|
{
|
|
RB_OBJ_WRITE(klass, &RCLASS_ORIGIN(klass), origin);
|
|
if (klass != origin) FL_SET(origin, RICLASS_IS_ORIGIN);
|
|
}
|
|
|
|
static inline void
|
|
RICLASS_SET_ORIGIN_SHARED_MTBL(VALUE iclass)
|
|
{
|
|
FL_SET(iclass, RICLASS_ORIGIN_SHARED_MTBL);
|
|
}
|
|
|
|
static inline bool
|
|
RICLASS_OWNS_M_TBL_P(VALUE iclass)
|
|
{
|
|
return FL_TEST_RAW(iclass, RICLASS_IS_ORIGIN | RICLASS_ORIGIN_SHARED_MTBL) == RICLASS_IS_ORIGIN;
|
|
}
|
|
|
|
static inline void
|
|
RCLASS_SET_INCLUDER(VALUE iclass, VALUE klass)
|
|
{
|
|
RB_OBJ_WRITE(iclass, &RCLASS_INCLUDER(iclass), klass);
|
|
}
|
|
|
|
static inline VALUE
|
|
RCLASS_SUPER(VALUE klass)
|
|
{
|
|
return RCLASS(klass)->super;
|
|
}
|
|
|
|
static inline VALUE
|
|
RCLASS_SET_SUPER(VALUE klass, VALUE super)
|
|
{
|
|
if (super) {
|
|
rb_class_remove_from_super_subclasses(klass);
|
|
rb_class_subclass_add(super, klass);
|
|
}
|
|
RB_OBJ_WRITE(klass, &RCLASS(klass)->super, super);
|
|
return super;
|
|
}
|
|
|
|
#endif /* INTERNAL_CLASS_H */
|