Move markers to DataHolder

Author: aardvark179

lib/truffle/truffle/cext.rb

@@ -18,7 +18,6 @@ module Truffle::CExt
   DATA_TYPE = Primitive.object_hidden_var_create :data_type
   DATA_HOLDER = Primitive.object_hidden_var_create :data_holder
   DATA_MEMSIZER = Primitive.object_hidden_var_create :data_memsizer
-  DATA_MARKER = Primitive.object_hidden_var_create :data_marker
   RB_TYPE = Primitive.object_hidden_var_create :rb_type
   ALLOCATOR_FUNC = Primitive.object_hidden_var_create :allocator_func
   RB_IO_STRUCT = Primitive.object_hidden_var_create :rb_io_struct
@@ -1462,7 +1461,8 @@ def rb_set_end_proc(func, data)
   end
 
   def define_marker(object, marker)
-    Primitive.object_hidden_var_set object, DATA_MARKER, marker
+    data_holder = Primitive.object_hidden_var_get object, DATA_HOLDER
+    Primitive.data_holder_set_marker(data_holder, marker)
     Primitive.cext_mark_object_on_call_exit(object) unless Truffle::Interop.null?(marker)
   end
 
@@ -1497,10 +1497,10 @@ def rb_data_typed_object_wrap(ruby_class, data, data_type, mark, free, size)
   def run_marker(obj)
     Primitive.array_mark_store(obj) if Primitive.array_store_native?(obj)
 
-    mark = Primitive.object_hidden_var_get obj, DATA_MARKER
+    data_holder = Primitive.object_hidden_var_get obj, DATA_HOLDER
+    mark = Primitive.data_holder_get_marker(data_holder)
     unless Truffle::Interop.null?(mark)
       create_mark_list(obj)
-      data_holder = Primitive.object_hidden_var_get obj, DATA_HOLDER
       data = Primitive.data_holder_get_data(data_holder)
       # This call is done without pushing a new frame as the marking service manages frames itself.
       mark.call(data) unless Truffle::Interop.null?(data)

lib/truffle/truffle/cext_structs.rb

@@ -29,7 +29,7 @@ def RDATA_PTR(object)
       raise TypeError, "wrong argument type #{object.class} (expected T_DATA)"
     end
 
-    Primitive.cext_mark_object_on_call_exit(object) unless Truffle::Interop.null?(Primitive.object_hidden_var_get(object, Truffle::CExt::DATA_MARKER))
+    Primitive.cext_mark_object_on_call_exit(object) unless Truffle::Interop.null?(Primitive.data_holder_get_marker(data_holder))
     Primitive.data_holder_get_data(data_holder)
   end
 
@@ -69,7 +69,7 @@ def polyglot_members(internal)
   def polyglot_read_member(name)
     case name
     when 'data'
-      Primitive.cext_mark_object_on_call_exit(@object) unless Truffle::Interop.null?(Primitive.object_hidden_var_get(@object, Truffle::CExt::DATA_MARKER))
+      Primitive.cext_mark_object_on_call_exit(@object) unless Truffle::Interop.null?(Primitive.data_holder_get_marker(@data_holder))
       Primitive.data_holder_get_data(@data_holder)
     when 'type'
       type
@@ -296,7 +296,7 @@ def polyglot_pointer?
   end
 
   def polyglot_as_pointer
-    Primitive.cext_mark_object_on_call_exit(@array) unless Truffle::Interop.null?(Primitive.object_hidden_var_get(@object, Truffle::CExt::DATA_MARKER))
+    Primitive.cext_mark_object_on_call_exit(@array)
     Primitive.array_store_address(@array)
   end
 

src/main/java/org/truffleruby/cext/CExtNodes.java

@@ -2030,7 +2030,7 @@ public abstract static class DataHolderCreate extends PrimitiveArrayArgumentsNod
 
         @Specialization
         protected DataHolder create(Object address) {
-            return new DataHolder(address);
+            return new DataHolder(address, Pointer.NULL);
         }
     }
 
@@ -2053,6 +2053,25 @@ protected Object setData(DataHolder data, Object address) {
         }
     }
 
+    @Primitive(name = "data_holder_get_marker")
+    public abstract static class DataHolderGetMarker extends PrimitiveArrayArgumentsNode {
+
+        @Specialization
+        protected Object getMarker(DataHolder data) {
+            return data.getMarker();
+        }
+    }
+
+    @Primitive(name = "data_holder_set_marker")
+    public abstract static class DataHolderSetMarker extends PrimitiveArrayArgumentsNode {
+
+        @Specialization
+        protected Object setMarker(DataHolder data, Object marker) {
+            data.setMarker(marker);
+            return nil;
+        }
+    }
+
     @Primitive(name = "data_holder_is_holder?")
     public abstract static class DataHolderIsHolder extends PrimitiveArrayArgumentsNode {
 

src/main/java/org/truffleruby/cext/DataHolder.java

@@ -24,9 +24,11 @@
 public final class DataHolder implements TruffleObject {
 
     private Object pointer;
+    private Object marker;
 
-    public DataHolder(Object address) {
+    public DataHolder(Object address, Object marker) {
         this.pointer = address;
+        this.marker = marker;
     }
 
     public Object getPointer() {
@@ -37,6 +39,14 @@ public void setPointer(Object address) {
         this.pointer = address;
     }
 
+    public Object getMarker() {
+        return marker;
+    }
+
+    public void setMarker(Object marker) {
+        this.marker = marker;
+    }
+
     @ExportMessage
     protected boolean hasLanguage() {
         return true;