merge revision(s) 3ddf6ad4d2f6dae4caa00b8c407768c7062099a0: [Backport #18629]

	Private local variables should shadow outer variables [Bug #18629]

	---
	 parse.y                 | 3 ++-
	 test/ruby/test_parse.rb | 4 ++++
	 2 files changed, 6 insertions(+), 1 deletion(-)

1 files changed, 2 insertions, 1 deletions

diff --git a/parse.y b/parse.y
index e3e680414a..27890ff4e8 100644
--- a/parse.y
+++ b/parse.y
@@ -10984,9 +10984,9 @@ is_private_local_id(ID name)
 static int
 shadowing_lvar_0(struct parser_params *p, ID name)
 {
-    if (is_private_local_id(name)) return 1;
     if (dyna_in_block(p)) {
 	if (dvar_curr(p, name)) {
+	    if (is_private_local_id(name)) return 1;
 	    yyerror0("duplicated argument name");
 	}
 	else if (dvar_defined(p, name) || local_id(p, name)) {
@@ -10999,6 +10999,7 @@ shadowing_lvar_0(struct parser_params *p, ID name)
     }
     else {
 	if (local_id(p, name)) {
+	    if (is_private_local_id(name)) return 1;
 	    yyerror0("duplicated argument name");
 	}
     }