From 89656c13724aaef517af1a12294865dbea6eb0f0 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 27 Jun 2026 23:02:35 +0900 Subject: [PATCH 1/3] Fix a line numer in test code --- test/ruby/test_settracefunc.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb index e2cda4dfb82af7..b4af8fa98625b8 100644 --- a/test/ruby/test_settracefunc.rb +++ b/test/ruby/test_settracefunc.rb @@ -352,7 +352,7 @@ def test_break # [ruby-core:27606] [Bug #2610] 2: events << [event, lineno, mid, klass] if file == name 3: }) 4: [1,2,3].any? {|n| n} - 8: set_trace_func(nil) + 5: set_trace_func(nil) EOF [["c-return", 1, :set_trace_func, Kernel], From 16c70c4ad031cd59b0b5251c255d45a3fc4ef0fe Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 28 Jun 2026 17:58:29 +0900 Subject: [PATCH 2/3] LeakChecker: skip AF_SYSTEM sockets on macOS Socket used for kernel events and kernel control that cannot be closed while the process is running. --- tool/lib/leakchecker.rb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tool/lib/leakchecker.rb b/tool/lib/leakchecker.rb index 7bd479bbd3f83d..b1f94ea5d62d6b 100644 --- a/tool/lib/leakchecker.rb +++ b/tool/lib/leakchecker.rb @@ -122,18 +122,24 @@ def check_fd_leak(test_name) end if header = open_list&.shift columns = header.split - fd_index, node_index = columns.index('FD'), columns.index('NODE') + fd_index, type_index, node_index = %w'FD TYPE NODE'.map {|n| columns.index(n)} open_list.reject! do |of| of = of.chomp.split(' ', node_index + 2) if of[node_index] == 'TCP' and of.last.end_with?('(CLOSE_WAIT)', '(CLOSED)') + # Sometimes TCP sockets still live in the kernel space + # but have been closed in the user space. + skip = true + elsif of[type_index] == 'systm' + # AF_SYSTEM on macOS is kept alive + skip = true + end + if skip fd = of[fd_index].to_i inspect.delete(fd) h.delete(fd) live2.delete(fd) - true - else - false end + skip end puts(header, open_list) unless open_list.empty? end From fd12adf71889dd08f44f17fad170cf4eba81537c Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Sat, 27 Jun 2026 08:36:23 +0900 Subject: [PATCH 3/3] Make rb_gc_verify_internal_consistency static --- gc/default/default.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gc/default/default.c b/gc/default/default.c index bb889fecf873da..7a54f30b29b61f 100644 --- a/gc/default/default.c +++ b/gc/default/default.c @@ -9663,7 +9663,7 @@ gc_profile_disable(VALUE _) return Qnil; } -void +static void rb_gc_verify_internal_consistency(void) { gc_verify_internal_consistency(rb_gc_get_objspace());