From 3bb70a6924ddd83f90b508b5bbc4d5629b8a41c6 Mon Sep 17 00:00:00 2001
From: Jeremy Evans <code@jeremyevans.net>
Date: Mon, 4 Apr 2022 13:14:45 -0700
Subject: Fix using anonymous block in method accepting explicit keywords

Record block ID before vtable_pop, so the incorrect one doesn't
override it.

Fixes [Bug #18673]
---
 parse.y | 1 +
 1 file changed, 1 insertion(+)

(limited to 'parse.y')

diff --git a/parse.y b/parse.y
index 41a09e79fe..d391354bea 100644
--- a/parse.y
+++ b/parse.y
@@ -12081,6 +12081,7 @@ new_args_tail(struct parser_params *p, NODE *kw_args, ID kw_rest_arg, ID block,
 	struct vtable *vtargs = p->lvtbl->args;
 	NODE *kwn = kw_args;
 
+        if (block) block = vtargs->tbl[vtargs->pos-1];
 	vtable_pop(vtargs, !!block + !!kw_rest_arg);
 	required_kw_vars = kw_vars = &vtargs->tbl[vtargs->pos];
 	while (kwn) {
-- 
cgit v1.2.3