https://git.ruby-lang.org/ruby.git/commit/?id=69ce154d6e

From 69ce154d6e5bc99a93e82e013862c321f74af8ec Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Fri, 24 Sep 2021 19:23:15 +0900
Subject: FL_USER flags on ohter than T_DATA are reserved [Misc #18059]

---
 spec/ruby/optional/capi/ext/rbasic_spec.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/spec/ruby/optional/capi/ext/rbasic_spec.c b/spec/ruby/optional/capi/ext/rbasic_spec.c
index 6cd6c23..9178e5f 100644
--- a/spec/ruby/optional/capi/ext/rbasic_spec.c
+++ b/spec/ruby/optional/capi/ext/rbasic_spec.c
@@ -6,9 +6,11 @@ extern "C" { https://github.com/ruby/ruby/blob/trunk/spec/ruby/optional/capi/ext/rbasic_spec.c#L6
 #endif
 
 #ifndef FL_SHAREABLE
-static const VALUE VISIBLE_BITS = FL_TAINT | FL_FREEZE | ~(FL_USER0 - 1);
+static const VALUE VISIBLE_BITS = FL_TAINT | FL_FREEZE;
+static const VALUE DATA_VISIBLE_BITS = FL_TAINT | FL_FREEZE | ~(FL_USER0 - 1);
 #else
-static const VALUE VISIBLE_BITS = FL_FREEZE | ~(FL_USER0 - 1);
+static const VALUE VISIBLE_BITS = FL_FREEZE;
+static const VALUE DATA_VISIBLE_BITS = FL_FREEZE | ~(FL_USER0 - 1);
 #endif
 
 #if SIZEOF_VALUE == SIZEOF_LONG
@@ -32,27 +34,27 @@ VALUE rbasic_spec_freeze_flag(VALUE self) { https://github.com/ruby/ruby/blob/trunk/spec/ruby/optional/capi/ext/rbasic_spec.c#L34
   return VALUE2NUM(RUBY_FL_FREEZE);
 }
 
-static VALUE spec_get_flags(const struct RBasic *b) {
-  VALUE flags = b->flags & VISIBLE_BITS;
+    static VALUE spec_get_flags(const struct RBasic *b, VALUE visible_bits) {
+  VALUE flags = b->flags & visible_bits;
   return VALUE2NUM(flags);
 }
 
-static VALUE spec_set_flags(struct RBasic *b, VALUE flags) {
-  flags &= VISIBLE_BITS;
-  b->flags = (b->flags & ~VISIBLE_BITS) | flags;
+static VALUE spec_set_flags(struct RBasic *b, VALUE flags, VALUE visible_bits) {
+  flags &= visible_bits;
+  b->flags = (b->flags & ~visible_bits) | flags;
   return VALUE2NUM(flags);
 }
 
 VALUE rbasic_spec_get_flags(VALUE self, VALUE val) {
-  return spec_get_flags(RBASIC(val));
+  return spec_get_flags(RBASIC(val), VISIBLE_BITS);
 }
 
 VALUE rbasic_spec_set_flags(VALUE self, VALUE val, VALUE flags) {
-  return spec_set_flags(RBASIC(val), NUM2VALUE(flags));
+  return spec_set_flags(RBASIC(val), NUM2VALUE(flags), VISIBLE_BITS);
 }
 
 VALUE rbasic_spec_copy_flags(VALUE self, VALUE to, VALUE from) {
-  return spec_set_flags(RBASIC(to), RBASIC(from)->flags);
+  return spec_set_flags(RBASIC(to), RBASIC(from)->flags, VISIBLE_BITS);
 }
 
 VALUE rbasic_spec_get_klass(VALUE self, VALUE val) {
@@ -60,15 +62,15 @@ VALUE rbasic_spec_get_klass(VALUE self, VALUE val) { https://github.com/ruby/ruby/blob/trunk/spec/ruby/optional/capi/ext/rbasic_spec.c#L62
 }
 
 VALUE rbasic_rdata_spec_get_flags(VALUE self, VALUE structure) {
-  return spec_get_flags(&RDATA(structure)->basic);
+  return spec_get_flags(&RDATA(structure)->basic, DATA_VISIBLE_BITS);
 }
 
 VALUE rbasic_rdata_spec_set_flags(VALUE self, VALUE structure, VALUE flags) {
-  return spec_set_flags(&RDATA(structure)->basic, NUM2VALUE(flags));
+  return spec_set_flags(&RDATA(structure)->basic, NUM2VALUE(flags), DATA_VISIBLE_BITS);
 }
 
 VALUE rbasic_rdata_spec_copy_flags(VALUE self, VALUE to, VALUE from) {
-  return spec_set_flags(&RDATA(to)->basic, RDATA(from)->basic.flags);
+  return spec_set_flags(&RDATA(to)->basic, RDATA(from)->basic.flags, DATA_VISIBLE_BITS);
 }
 
 VALUE rbasic_rdata_spec_get_klass(VALUE self, VALUE structure) {
-- 
cgit v1.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/