From 596db9c1f486d6609a4e97d82c8c71b54609fb6f Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Mon, 25 Dec 2023 15:38:12 +0900
Subject: [Feature #19370] Blocks without anonymous parameters should not
 affect

---
 parse.y | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'parse.y')

diff --git a/parse.y b/parse.y
index cd6f655a14..4014c0e731 100644
--- a/parse.y
+++ b/parse.y
@@ -15070,13 +15070,13 @@ forwarding_arg_check(struct parser_params *p, ID arg, ID all, const char *var)
     args = p->lvtbl->args;
 
     while (vars && !DVARS_TERMINAL_P(vars->prev)) {
+        conflict |= (vtable_included(args, arg) && !(all && vtable_included(args, all)));
         vars = vars->prev;
         args = args->prev;
-        conflict |= (vtable_included(args, arg) && !(all && vtable_included(args, all)));
     }
 
     bool found = false;
-    if (vars && vars->prev == DVARS_INHERIT) {
+    if (vars && vars->prev == DVARS_INHERIT && !found) {
         found = (rb_local_defined(arg, p->parent_iseq) &&
                  !(all && rb_local_defined(all, p->parent_iseq)));
     }
-- 
cgit v1.2.3