Revert use of RUBY_TYPED_EMBEDDABLE

Author: byroot

ext/json/ext/generator/extconf.rb

@@ -5,8 +5,6 @@
   File.write('Makefile', dummy_makefile("").join)
 else
   append_cflags("-std=c99")
-  have_const("RUBY_TYPED_EMBEDDABLE", "ruby.h")  # RUBY_VERSION >= 3.3
-
   $defs << "-DJSON_GENERATOR"
   $defs << "-DJSON_DEBUG" if ENV.fetch("JSON_DEBUG", "0") != "0"
 

ext/json/ext/generator/generator.c

@@ -722,20 +722,27 @@ static void State_compact(void *ptr)
     state->as_json = rb_gc_location(state->as_json);
 }
 
+static void State_free(void *ptr)
+{
+    JSON_Generator_State *state = ptr;
+    ruby_xfree(state);
+}
+
 static size_t State_memsize(const void *ptr)
 {
     return sizeof(JSON_Generator_State);
 }
 
 static const rb_data_type_t JSON_Generator_State_type = {
-    .wrap_struct_name = "JSON/Generator/State",
-    .function = {
+    "JSON/Generator/State",
+    {
         .dmark = State_mark,
-        .dfree = RUBY_DEFAULT_FREE,
+        .dfree = State_free,
         .dsize = State_memsize,
         .dcompact = State_compact,
     },
-    .flags = RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_FROZEN_SHAREABLE | RUBY_TYPED_EMBEDDABLE,
+    0, 0,
+    RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_FROZEN_SHAREABLE,
 };
 
 static void state_init(JSON_Generator_State *state)

ext/json/ext/json.h

@@ -54,10 +54,6 @@ typedef unsigned char _Bool;
 #   define RUBY_TYPED_FROZEN_SHAREABLE 0
 #endif
 
-#ifndef RUBY_TYPED_EMBEDDABLE
-# define RUBY_TYPED_EMBEDDABLE 0
-#endif
-
 #ifndef NORETURN
 #if defined(__has_attribute) && __has_attribute(noreturn)
 #define NORETURN(x) __attribute__((noreturn)) x
@@ -106,6 +102,4 @@ typedef unsigned char _Bool;
 #define JSON_CPU_LITTLE_ENDIAN_64BITS 0
 #endif
 
-
-
 #endif // _JSON_H_

ext/json/ext/parser/extconf.rb

@@ -6,7 +6,6 @@
 have_func("rb_str_to_interned_str", "ruby.h") # RUBY_VERSION >= 3.0
 have_func("rb_hash_new_capa", "ruby.h") # RUBY_VERSION >= 3.2
 have_func("rb_hash_bulk_insert", "ruby.h") # Missing on TruffleRuby
-have_const("RUBY_TYPED_EMBEDDABLE", "ruby.h")  # RUBY_VERSION >= 3.3
 
 append_cflags("-std=c99")
 

ext/json/ext/parser/parser.c

@@ -251,9 +251,7 @@ static void rvalue_stack_free(void *ptr)
     rvalue_stack *stack = (rvalue_stack *)ptr;
     if (stack) {
         ruby_xfree(stack->ptr);
-#ifndef HAVE_RUBY_TYPED_EMBEDDABLE
         ruby_xfree(stack);
-#endif
     }
 }
 
@@ -264,13 +262,14 @@ static size_t rvalue_stack_memsize(const void *ptr)
 }
 
 static const rb_data_type_t JSON_Parser_rvalue_stack_type = {
-    .wrap_struct_name = "JSON::Ext::Parser/rvalue_stack",
-    .function = {
+    "JSON::Ext::Parser/rvalue_stack",
+    {
         .dmark = rvalue_stack_mark,
         .dfree = rvalue_stack_free,
         .dsize = rvalue_stack_memsize,
     },
-    .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_EMBEDDABLE,
+    0, 0,
+    RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
 static rvalue_stack *rvalue_stack_spill(rvalue_stack *old_stack, VALUE *handle, rvalue_stack **stack_ref)
@@ -1609,9 +1608,7 @@ static void JSON_ParserConfig_mark(void *ptr)
 static void JSON_ParserConfig_free(void *ptr)
 {
     JSON_ParserConfig *config = ptr;
-#ifndef HAVE_RUBY_TYPED_EMBEDDABLE
     ruby_xfree(config);
-#endif
 }
 
 static size_t JSON_ParserConfig_memsize(const void *ptr)
@@ -1620,13 +1617,14 @@ static size_t JSON_ParserConfig_memsize(const void *ptr)
 }
 
 static const rb_data_type_t JSON_ParserConfig_type = {
-    .wrap_struct_name = "JSON::Ext::Parser/ParserConfig",
-    .function = {
+    "JSON::Ext::Parser/ParserConfig",
+    {
         JSON_ParserConfig_mark,
         JSON_ParserConfig_free,
         JSON_ParserConfig_memsize,
     },
-    .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FROZEN_SHAREABLE | RUBY_TYPED_EMBEDDABLE,
+    0, 0,
+    RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FROZEN_SHAREABLE,
 };
 
 static VALUE cJSON_parser_s_allocate(VALUE klass)