admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

kernel.c: regression on struct/array/hash == override with super; fix #6660

Browse Source 
when overriding struct#==, array#==, or hash#== with super, the recursion
detection incorrectly treated the super call as a circular reference. this
was caused by commit 5ca2d442 which added recursion detection.

the fix introduces mrb_recursive_func_p that starts from ci[-2] instead of
ci[-1], skipping the immediate parent frame which may be a ruby override
calling super. equality methods (==, eql?) now use this function, while
inspect methods keep using mrb_recursive_method_p for immediate circular
reference detection.

Co-authored-by: Claude <noreply@anthropic.com>
This commit is contained in:
Yukihiro "Matz" Matsumoto
2025-11-12 07:11:12 +09:00
parent 4795b7e3ca
commit f4fb41b528
5 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mruby.h
+7
View File
@@ -1327,6 +1327,7 @@ MRB_API mrb_int mrb_cmp(mrb_state *mrb, mrb_value obj1, mrb_value obj2);
/* recursion detection */
MRB_API mrb_bool mrb_recursive_method_p(mrb_state *mrb, mrb_sym mid, mrb_value obj1, mrb_value obj2);
MRB_API mrb_bool mrb_recursive_func_p(mrb_state *mrb, mrb_sym mid, mrb_value obj1, mrb_value obj2);
#define MRB_RECURSIVE_P(mrb, mid, obj1, obj2) \
mrb_recursive_method_p(mrb, mid, obj1, obj2)
@@ -1337,6 +1338,12 @@ MRB_API mrb_bool mrb_recursive_method_p(mrb_state *mrb, mrb_sym mid, mrb_value o
#define MRB_RECURSIVE_BINARY_P(mrb, mid, obj1, obj2) \
mrb_recursive_method_p(mrb, mid, obj1, obj2)
#define MRB_RECURSIVE_FUNC_P(mrb, mid, obj) \
mrb_recursive_func_p(mrb, mid, obj, mrb_nil_value())
#define MRB_RECURSIVE_BINARY_FUNC_P(mrb, mid, obj1, obj2) \
mrb_recursive_func_p(mrb, mid, obj1, obj2)
#define mrb_gc_arena_save(mrb) ((mrb)->gc.arena_idx)
#define mrb_gc_arena_restore(mrb, idx) ((mrb)->gc.arena_idx = (idx))