merge revision(s) 7df5d65eac86940619f87da7e70bc0911097ae2f: [Backport #20981]

	[Bug #20981] Bring back `rb_undefine_finalizer`

2 files changed, 7 insertions, 1 deletions

diff --git a/gc.c b/gc.c
index 1ec159a2da..68304d26c5 100644
--- a/gc.c
+++ b/gc.c
@@ -1619,6 +1619,12 @@ os_each_obj(int argc, VALUE *argv, VALUE os)
 static VALUE
 undefine_final(VALUE os, VALUE obj)
 {
+    return rb_undefine_finalizer(obj);
+}
+
+VALUE
+rb_undefine_finalizer(VALUE obj)
+{
     rb_check_frozen(obj);
 
     rb_gc_impl_undefine_finalizer(rb_gc_get_objspace(), obj);
diff --git a/version.h b/version.h
index 82dbaab0e0..4f4d12a9d2 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 0
+#define RUBY_PATCHLEVEL 1
 
 #include "ruby/version.h"
 #include "ruby/internal/abi.h"