Simplify rb_io_fptr_finalize usage.

ioquatix · ioquatix · commit bb5fdce8b88a · 2022-04-01T16:15:51.000+13:00
diff --git a/gc.c b/gc.c
@@ -3145,11 +3145,17 @@ make_zombie(rb_objspace_t *objspace, VALUE obj, void (*dfree)(void *), void *dat
     heap_pages_final_slots++;
 }
 
+static void
+io_fptr_finalize(void *fptr)
+{
+    rb_io_fptr_finalize((struct rb_io *)fptr);
+}
+
 static inline void
 make_io_zombie(rb_objspace_t *objspace, VALUE obj)
 {
     rb_io_t *fptr = RANY(obj)->as.file.fptr;
-    make_zombie(objspace, obj, rb_io_fptr_finalize_internal, fptr);
+    make_zombie(objspace, obj, io_fptr_finalize, fptr);
 }
 
 static void
diff --git a/internal.h b/internal.h
@@ -63,9 +63,6 @@
 /* internal/array.h */
 #define rb_ary_new_from_args(...) rb_nonexistent_symbol(__VA_ARGS__)
 
-/* internal/io.h */
-#define rb_io_fptr_finalize(...) rb_nonexistent_symbol(__VA_ARGS__)
-
 /* internal/string.h */
 #define rb_fstring_cstr(...) rb_nonexistent_symbol(__VA_ARGS__)
 
diff --git a/internal/io.h b/internal/io.h
@@ -140,11 +140,6 @@ void rb_stdio_set_default_encoding(void);
 VALUE rb_io_flush_raw(VALUE, int);
 size_t rb_io_memsize(const rb_io_t *);
 int rb_stderr_tty_p(void);
-void rb_io_fptr_finalize_internal(void *ptr);
-#ifdef rb_io_fptr_finalize
-# undef rb_io_fptr_finalize
-#endif
-#define rb_io_fptr_finalize rb_io_fptr_finalize_internal
 VALUE rb_io_popen(VALUE pname, VALUE pmode, VALUE env, VALUE opt);
 
 VALUE rb_io_prep_stdin(void);
diff --git a/io.c b/io.c
@@ -5455,12 +5455,10 @@ clear_codeconv(rb_io_t *fptr)
     clear_writeconv(fptr);
 }
 
-void
-rb_io_fptr_finalize_internal(void *ptr)
+int
+rb_io_fptr_finalize(struct rb_io *fptr)
 {
-    rb_io_t *fptr = ptr;
-
-    if (!ptr) return;
+    if (!fptr) return 0;
     fptr->pathv = Qnil;
     if (0 <= fptr->fd)
         rb_io_fptr_cleanup(fptr, TRUE);
@@ -5469,22 +5467,9 @@ rb_io_fptr_finalize_internal(void *ptr)
     io_internal_buffer_free(&fptr->wbuf);
     clear_codeconv(fptr);
     free(fptr);
+    return 1;
 }
 
-#undef rb_io_fptr_finalize
-int
-rb_io_fptr_finalize(rb_io_t *fptr)
-{
-    if (!fptr) {
-        return 0;
-    }
-    else {
-        rb_io_fptr_finalize_internal(fptr);
-        return 1;
-    }
-}
-#define rb_io_fptr_finalize(fptr) rb_io_fptr_finalize_internal(fptr)
-
 RUBY_FUNC_EXPORTED size_t
 rb_io_memsize(const rb_io_t *fptr)
 {

Original file line number	Diff line number	Diff line change
`@@ -3145,11 +3145,17 @@ make_zombie(rb_objspace_t objspace, VALUE obj, void (dfree)(void ), void dat`
`3145`	`3145`	`heap_pages_final_slots++;`
`3146`	`3146`	`}`
`3147`	`3147`
	`3148`	`+static void`
	`3149`	`+io_fptr_finalize(void *fptr)`
	`3150`	`+{`
	`3151`	`+ rb_io_fptr_finalize((struct rb_io *)fptr);`
	`3152`	`+}`
	`3153`	`+`
`3148`	`3154`	`static inline void`
`3149`	`3155`	`make_io_zombie(rb_objspace_t *objspace, VALUE obj)`
`3150`	`3156`	`{`
`3151`	`3157`	`rb_io_t *fptr = RANY(obj)->as.file.fptr;`
`3152`		`- make_zombie(objspace, obj, rb_io_fptr_finalize_internal, fptr);`
	`3158`	`+ make_zombie(objspace, obj, io_fptr_finalize, fptr);`
`3153`	`3159`	`}`
`3154`	`3160`
`3155`	`3161`	`static void`