[GR-26781] Implement rb_imemo_tmpbuf_auto_free_pointer() which is needed by Ripper

PullRequest: truffleruby/2152

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/Makefile

@@ -84,7 +84,7 @@ zlib/zlib.$(DLEXT): zlib/Makefile zlib/zlib.c
 ripper/Makefile: ripper/extconf.rb $(EXTCONF_DEPS)
 	$(Q) cd ripper && $(RUBY) extconf.rb || $(IF_EXTCONF_FAIL)
 
-ripper/ripper.$(DLEXT): ripper/Makefile
+ripper/ripper.$(DLEXT): ripper/Makefile ripper/*.c ripper/*.h
 	$(Q) cd ripper && $(MAKE) $(MKMF_MAKEFILE_SUBPROCESS_FLAGS)
 
 # syslog

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;
+}

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

@@ -13,6 +13,7 @@
 import static org.truffleruby.cext.ValueWrapperManager.TRUE_HANDLE;
 import static org.truffleruby.cext.ValueWrapperManager.UNDEF_HANDLE;
 
+import com.oracle.truffle.api.CompilerDirectives;
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.cext.UnwrapNodeGen.NativeToWrapperNodeGen;
@@ -88,15 +89,15 @@ protected Object unwrapTaggedObject(long handle,
 
         @TruffleBoundary
         private void raiseError(long handle) {
-            throw new RuntimeException("dead handle 0x" + Long.toHexString(handle));
+            throw CompilerDirectives.shouldNotReachHere("dead handle 0x" + Long.toHexString(handle));
         }
 
         @Fallback
         @TruffleBoundary
         protected ValueWrapper unWrapUnexpectedHandle(long handle) {
             // Avoid throwing a specialization exception when given an uninitialized or corrupt
             // handle.
-            throw new RuntimeException("corrupt handle 0x" + Long.toHexString(handle));
+            throw CompilerDirectives.shouldNotReachHere("corrupt handle 0x" + Long.toHexString(handle));
         }
 
         public static UnwrapNativeNode create() {

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"