Add RVALUE_OVERHEAD and move ractor_belonging_id

This commit adds RVALUE_OVERHEAD for storing metadata at the end of the
slot. This commit moves the ractor_belonging_id in debug builds from the
flags to RVALUE_OVERHEAD which frees the 16 bits in the headers for
object shapes.

3 files changed, 4 insertions, 4 deletions

diff --git a/test/objspace/test_objspace.rb b/test/objspace/test_objspace.rb
index 2366ec3b61..1eded6a439 100644
--- a/test/objspace/test_objspace.rb
+++ b/test/objspace/test_objspace.rb
@@ -480,8 +480,8 @@ class TestObjSpace < Test::Unit::TestCase
         obj = JSON.parse(l)
         next if obj["type"] == "ROOT"
 
-        assert(obj["slot_size"] != nil)
-        assert(obj["slot_size"] % GC::INTERNAL_CONSTANTS[:BASE_SLOT_SIZE] == 0)
+        assert_not_nil obj["slot_size"]
+        assert_equal 0, obj["slot_size"] % GC::INTERNAL_CONSTANTS[:RVALUE_SIZE]
       }
     end
   end
diff --git a/test/ruby/test_gc.rb b/test/ruby/test_gc.rb
index 06bf038cae..e22d6436d4 100644
--- a/test/ruby/test_gc.rb
+++ b/test/ruby/test_gc.rb
@@ -152,7 +152,7 @@ class TestGc < Test::Unit::TestCase
       GC.stat_heap(i, stat_heap)
       GC.stat(stat)
 
-      assert_equal GC::INTERNAL_CONSTANTS[:BASE_SLOT_SIZE] * (2**i), stat_heap[:slot_size]
+      assert_equal GC::INTERNAL_CONSTANTS[:RVALUE_SIZE] * (2**i), stat_heap[:slot_size]
       assert_operator stat_heap[:heap_allocatable_pages], :<=, stat[:heap_allocatable_pages]
       assert_operator stat_heap[:heap_eden_pages], :<=, stat[:heap_eden_pages]
       assert_operator stat_heap[:heap_eden_slots], :>=, 0
diff --git a/test/ruby/test_objectspace.rb b/test/ruby/test_objectspace.rb
index 3c912fe300..a7cfb064a8 100644
--- a/test/ruby/test_objectspace.rb
+++ b/test/ruby/test_objectspace.rb
@@ -67,7 +67,7 @@ End
 
   def test_id2ref_invalid_symbol_id
     msg = /is not symbol id value/
-    assert_raise_with_message(RangeError, msg) { ObjectSpace._id2ref(:a.object_id + 40) }
+    assert_raise_with_message(RangeError, msg) { ObjectSpace._id2ref(:a.object_id + GC::INTERNAL_CONSTANTS[:RVALUE_SIZE]) }
   end
 
   def test_count_objects