Implement rb_imemo_tmpbuf_auto_free_pointer() which is needed by Ripper

Author: eregon

lib/cext/include/internal.h

@@ -65,13 +65,10 @@ typedef struct rb_imemo_tmpbuf_struct {
     size_t cnt; /* buffer size in VALUE */
 } rb_imemo_tmpbuf_t;
 
-#define rb_imemo_tmpbuf_auto_free_pointer() rb_imemo_new(imemo_tmpbuf, 0, 0, 0, 0)
-rb_imemo_tmpbuf_t *rb_imemo_tmpbuf_parser_heap(void *buf, rb_imemo_tmpbuf_t *old_heap, size_t cnt);
+VALUE rb_imemo_tmpbuf_auto_free_pointer(void);
+void* rb_imemo_tmpbuf_set_ptr(VALUE v, void *ptr);
 
-static inline
-void* rb_imemo_tmpbuf_set_ptr(VALUE v, void *ptr) {
-    return ((rb_imemo_tmpbuf_t *)v)->ptr = ptr;
-}
+rb_imemo_tmpbuf_t *rb_imemo_tmpbuf_parser_heap(void *buf, rb_imemo_tmpbuf_t *old_heap, size_t cnt);
 
 #if defined(HAVE_MALLOC_USABLE_SIZE) || defined(HAVE_MALLOC_SIZE) || defined(_WIN32)
 #define ruby_sized_xrealloc(ptr, new_size, old_size) ruby_xrealloc(ptr, new_size)

lib/truffle/truffle/cext.rb

@@ -1785,4 +1785,23 @@ def rb_sprintf(format, *args)
   def test_cext_wrap(value)
     Primitive.cext_wrap(value)
   end
+
+  # An object that once unreachable frees the associated native pointer using ruby_xfree()
+  class IMemoTmpBufAutoFree
+    def pointer=(address)
+      ObjectSpace.define_finalizer(self, self.class.free(address))
+    end
+
+    def self.free(address)
+      -> _id { LIBTRUFFLERUBY.ruby_xfree(address) }
+    end
+  end
+
+  def rb_imemo_tmpbuf_auto_free_pointer
+    IMemoTmpBufAutoFree.new
+  end
+
+  def rb_imemo_tmpbuf_set_ptr(obj, ptr)
+    obj.pointer = ptr
+  end
 end

src/main/c/cext/alloc.c

@@ -74,3 +74,12 @@ void rb_mem_clear(VALUE *mem, long n) {
     mem[i] = Qnil;
   }
 }
+
+VALUE rb_imemo_tmpbuf_auto_free_pointer(void) {
+  return RUBY_CEXT_INVOKE("rb_imemo_tmpbuf_auto_free_pointer");
+}
+
+void* rb_imemo_tmpbuf_set_ptr(VALUE imemo, void *ptr) {
+  polyglot_invoke(RUBY_CEXT, "rb_imemo_tmpbuf_set_ptr", rb_tr_unwrap(imemo), ptr);
+  return ptr;
+}

test/mri/excludes/Ripper/TestInput.rb

@@ -1,3 +1 @@
-exclude :test_aryptn, "needs investigation"
 exclude :test_block_variables, "needs investigation"
-exclude :test_event_coverage, "needs investigation"