diff options
author | Jean byroot Boussier <jean.boussier+github@shopify.com> | 2023-02-07 15:44:16 +0100 |
---|---|---|
committer | Jean Boussier <jean.boussier@gmail.com> | 2023-02-07 22:33:12 +0100 |
commit | 4713b084da2e03451e3478ad63b148545db3f1a9 (patch) | |
tree | d9c2bbb3df8ef32145a5f89a3f28d6f878e73775 /gc.c | |
parent | fd71a76f55b84e02ba8a3b560baf9b1f996dedd4 (diff) |
Revert "Revert "Consider DATA objects without a mark function as protected""
This reverts commit 6eae8e5f514db716e52ad06a2ac97e2cc3910d83.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/7263
Diffstat (limited to 'gc.c')
-rw-r--r-- | gc.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -3110,7 +3110,7 @@ rb_data_object_wrap(VALUE klass, void *datap, RUBY_DATA_FUNC dmark, RUBY_DATA_FU { RUBY_ASSERT_ALWAYS(dfree != (RUBY_DATA_FUNC)1); if (klass) rb_data_object_check(klass); - return newobj_of(klass, T_DATA, (VALUE)dmark, (VALUE)dfree, (VALUE)datap, FALSE, sizeof(struct RTypedData)); + return newobj_of(klass, T_DATA, (VALUE)dmark, (VALUE)dfree, (VALUE)datap, !dmark, sizeof(struct RTypedData)); } VALUE @@ -3126,7 +3126,8 @@ rb_data_typed_object_wrap(VALUE klass, void *datap, const rb_data_type_t *type) { RBIMPL_NONNULL_ARG(type); if (klass) rb_data_object_check(klass); - return newobj_of(klass, T_DATA, (VALUE)type, (VALUE)1, (VALUE)datap, type->flags & RUBY_FL_WB_PROTECTED, sizeof(struct RTypedData)); + bool wb_protected = (type->flags & RUBY_FL_WB_PROTECTED) || !type->function.dmark; + return newobj_of(klass, T_DATA, (VALUE)type, (VALUE)1, (VALUE)datap, wb_protected, sizeof(struct RTypedData)); } VALUE |