Remove psych patches

PullRequest: truffleruby/728

Author: aardvark179

CHANGELOG.md

@@ -10,6 +10,9 @@ Changes:
   have been removed.
 * Our experimental JRuby-compatible Java interop has been removed - use
   `Polyglot` and `Java` instead.
+* The Trufle handle patches applied to `psych` C extension have now been removed.
+* The `rb_tr_handle_*` functions have been removed as they are no
+  longer used in any C extension patches.
 
 Bug fixes:
 

lib/cext/include/truffleruby/truffleruby.h

@@ -36,18 +36,6 @@ int rb_tr_flags(VALUE value);
 void rb_tr_add_flags(VALUE value, int flags);
 bool rb_tr_hidden_p(VALUE value);
 
-// Handles
-
-void *rb_tr_handle_for_managed(VALUE managed);
-void *rb_tr_handle_for_managed_leaking(VALUE managed);
-void *rb_tr_handle_if_managed(VALUE managed);
-void *rb_tr_handle_if_managed_leaking(VALUE managed);
-VALUE rb_tr_managed_from_handle_or_null(void *handle);
-VALUE rb_tr_managed_from_handle(void *handle);
-VALUE rb_tr_managed_from_handle_release(void *handle);
-VALUE rb_tr_managed_if_handle(void *handle);
-void rb_tr_release_handle(void *handle);
-void rb_tr_release_if_handle(void *handle);
 
 // Managed Structs
 

src/main/c/cext/ruby.c

@@ -2828,69 +2828,6 @@ VALUE rb_java_to_string(VALUE obj) {
   return RUBY_CEXT_INVOKE("rb_java_to_string", obj);
 }
 
-// Handles
-
-void *rb_tr_handle_for_managed(VALUE managed) {
-  return truffle_handle_for_managed(managed);
-}
-
-void *rb_tr_handle_for_managed_leaking(VALUE managed) {
-  rb_tr_log_warning("rb_tr_handle_for_managed without matching rb_tr_release_handle; handles will be leaking");
-  return rb_tr_handle_for_managed(managed);
-}
-
-void *rb_tr_handle_if_managed(VALUE pointer) {
-  if (polyglot_is_value(pointer)) {
-    return rb_tr_handle_for_managed(pointer);
-  } else {
-    return pointer;
-  }
-}
-
-void *rb_tr_handle_if_managed_leaking(VALUE pointer) {
-  if (polyglot_is_value(pointer)) {
-    return rb_tr_handle_if_managed_leaking(pointer);
-  } else {
-    return pointer;
-  }
-}
-
-VALUE rb_tr_managed_from_handle_or_null(void *handle) {
-  if (handle == NULL) {
-    return NULL;
-  } else {
-    return rb_tr_managed_from_handle(handle);
-  }
-}
-
-VALUE rb_tr_managed_if_handle(void *pointer) {
-  if (truffle_is_handle_to_managed(pointer)) {
-    return rb_tr_managed_from_handle(pointer);
-  } else {
-    return pointer;
-  }
-}
-
-VALUE rb_tr_managed_from_handle(void *handle) {
-  return truffle_managed_from_handle(handle);
-}
-
-VALUE rb_tr_managed_from_handle_release(void *handle) {
-  VALUE managed = rb_tr_managed_from_handle(handle);
-  rb_tr_release_handle(handle);
-  return managed;
-}
-
-void rb_tr_release_if_handle(void *pointer) {
-  if (truffle_is_handle_to_managed(pointer)) {
-    truffle_release_handle(pointer);
-  }
-}
-
-void rb_tr_release_handle(void *handle) {
-  truffle_release_handle(handle);
-}
-
 // Managed Structs
 
 void* rb_tr_new_managed_struct_internal(void *type) {

src/main/c/psych/yaml/api.c

@@ -1,6 +1,5 @@
 
 #include "yaml_private.h"
-#include "ruby.h"
 
 /*
  * Get the library version.
@@ -216,8 +215,6 @@ YAML_DECLARE(void)
 yaml_parser_delete(yaml_parser_t *parser)
 {
     assert(parser); /* Non-NULL parser object expected. */
-    
-    rb_tr_release_if_handle(parser->read_handler_data);
 
     BUFFER_DEL(parser, parser->raw_buffer);
     BUFFER_DEL(parser, parser->buffer);
@@ -292,7 +289,7 @@ yaml_parser_set_input_string(yaml_parser_t *parser,
     assert(input);  /* Non-NULL input string expected. */
 
     parser->read_handler = yaml_string_read_handler;
-    parser->read_handler_data = rb_tr_handle_if_managed(parser);
+    parser->read_handler_data = parser;
 
     parser->input.string.start = input;
     parser->input.string.current = input;
@@ -311,7 +308,7 @@ yaml_parser_set_input_file(yaml_parser_t *parser, FILE *file)
     assert(file);   /* Non-NULL file object expected. */
 
     parser->read_handler = yaml_file_read_handler;
-    parser->read_handler_data = rb_tr_handle_for_managed(parser);
+    parser->read_handler_data = parser;
 
     parser->input.file = file;
 }
@@ -329,7 +326,7 @@ yaml_parser_set_input(yaml_parser_t *parser,
     assert(handler);    /* Non-NULL read handler expected. */
 
     parser->read_handler = handler;
-    parser->read_handler_data = rb_tr_handle_for_managed(data);
+    parser->read_handler_data = data;
 }
 
 /*
@@ -390,8 +387,6 @@ YAML_DECLARE(void)
 yaml_emitter_delete(yaml_emitter_t *emitter)
 {
     assert(emitter);    /* Non-NULL emitter object expected. */
-    
-    rb_tr_release_handle(emitter->write_handler_data);
 
     BUFFER_DEL(emitter, emitter->buffer);
     BUFFER_DEL(emitter, emitter->raw_buffer);
@@ -462,7 +457,7 @@ yaml_emitter_set_output_string(yaml_emitter_t *emitter,
     assert(output);     /* Non-NULL output string expected. */
 
     emitter->write_handler = yaml_string_write_handler;
-    emitter->write_handler_data = rb_tr_handle_for_managed(emitter);
+    emitter->write_handler_data = emitter;
 
     emitter->output.string.buffer = output;
     emitter->output.string.size = size;
@@ -482,7 +477,7 @@ yaml_emitter_set_output_file(yaml_emitter_t *emitter, FILE *file)
     assert(file);       /* Non-NULL file object expected. */
 
     emitter->write_handler = yaml_file_write_handler;
-    emitter->write_handler_data = rb_tr_handle_for_managed(emitter);
+    emitter->write_handler_data = emitter;
 
     emitter->output.file = file;
 }
@@ -500,7 +495,7 @@ yaml_emitter_set_output(yaml_emitter_t *emitter,
     assert(handler);    /* Non-NULL handler object expected. */
 
     emitter->write_handler = handler;
-    emitter->write_handler_data = rb_tr_handle_for_managed(data);
+    emitter->write_handler_data = data;
 }
 
 /*
@@ -1394,3 +1389,5 @@ yaml_document_append_mapping_pair(yaml_document_t *document,
 
     return 1;
 }
+
+

src/main/c/psych/yaml/reader.c

@@ -118,7 +118,7 @@ yaml_parser_update_raw_buffer(yaml_parser_t *parser)
 
     /* Call the read handler to fill the buffer. */
 
-    if (!parser->read_handler(rb_tr_managed_if_handle(parser->read_handler_data), parser->raw_buffer.last,
+    if (!parser->read_handler(parser->read_handler_data, parser->raw_buffer.last,
                 parser->raw_buffer.end - parser->raw_buffer.last, &size_read)) {
         return yaml_parser_set_reader_error(parser, "input error",
                 parser->offset, -1);

src/main/c/psych/yaml/writer.c

@@ -50,7 +50,7 @@ yaml_emitter_flush(yaml_emitter_t *emitter)
 
     if (emitter->encoding == YAML_UTF8_ENCODING)
     {
-        if (((yaml_write_handler_t *)emitter->write_handler)(truffle_managed_from_handle(emitter->write_handler_data),
+        if (emitter->write_handler(emitter->write_handler_data,
                     emitter->buffer.start,
                     emitter->buffer.last - emitter->buffer.start)) {
             emitter->buffer.last = emitter->buffer.start;
@@ -125,7 +125,7 @@ yaml_emitter_flush(yaml_emitter_t *emitter)
 
     /* Write the raw buffer. */
 
-        if (((yaml_write_handler_t *)emitter->write_handler)(truffle_managed_from_handle(emitter->write_handler_data),
+    if (emitter->write_handler(emitter->write_handler_data,
                 emitter->raw_buffer.start,
                 emitter->raw_buffer.last - emitter->raw_buffer.start)) {
         emitter->buffer.last = emitter->buffer.start;

src/main/c/psych/yaml/yaml.h

@@ -19,8 +19,6 @@ extern "C" {
 #include <stdio.h>
 #include <string.h>
 
-#include <ruby.h>
-
 /**
  * @defgroup export Export Definitions
  * @{