ruby-changes:73841
From: nagachika <ko1@a...>
Date: Mon, 3 Oct 2022 19:53:06 +0900 (JST)
Subject: [ruby-changes:73841] 263ae50365 (ruby_3_1): merge revision(s) b91f685a2615ef957210f5e3a50c0e8299c20c55: [Backport #18435]
https://git.ruby-lang.org/ruby.git/commit/?id=263ae50365 From 263ae503650531b90653ab78124b6d2d513e06cc Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Mon, 3 Oct 2022 19:52:35 +0900 Subject: merge revision(s) b91f685a2615ef957210f5e3a50c0e8299c20c55: [Backport #18435] Mark struct METHOD->owner for the GC * Fixes https://github.com/ruby/ruby/commit/6b7d32a5e5 * See [Bug #18729] --- proc.c | 2 ++ 1 file changed, 2 insertions(+) --- proc.c | 2 ++ version.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/proc.c b/proc.c index 84e6645835..adf1878612 100644 --- a/proc.c +++ b/proc.c @@ -1564,6 +1564,7 @@ bm_mark(void *ptr) https://github.com/ruby/ruby/blob/trunk/proc.c#L1564 rb_gc_mark_movable(data->recv); rb_gc_mark_movable(data->klass); rb_gc_mark_movable(data->iclass); + rb_gc_mark_movable(data->owner); rb_gc_mark_movable((VALUE)data->me); } @@ -1574,6 +1575,7 @@ bm_compact(void *ptr) https://github.com/ruby/ruby/blob/trunk/proc.c#L1575 UPDATE_REFERENCE(data->recv); UPDATE_REFERENCE(data->klass); UPDATE_REFERENCE(data->iclass); + UPDATE_REFERENCE(data->owner); UPDATE_TYPED_REFERENCE(rb_method_entry_t *, data->me); } diff --git a/version.h b/version.h index ab05283529..b9a5acf310 100644 --- a/version.h +++ b/version.h @@ -11,11 +11,11 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L11 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 67 +#define RUBY_PATCHLEVEL 68 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 10 -#define RUBY_RELEASE_DAY 1 +#define RUBY_RELEASE_DAY 3 #include "ruby/version.h" -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/