From 9b4bbed047767485c724c7a5d1c712e62927196a Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Sat, 20 Aug 2022 21:24:30 +0900
Subject: [PATCH] vm.c (OP_SEND): remove scoping braces; ref #5775

---
 src/vm.c | 55 ++++++++++++++++++++++++++-----------------------------
 1 file changed, 26 insertions(+), 29 deletions(-)

diff --git a/src/vm.c b/src/vm.c
index ce4848fa6..3cf919097 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -1691,38 +1691,35 @@ RETRY_TRY_BLOCK:
       mrb_method_t m;
       struct RClass *cls;
       mrb_value recv, blk;
+      int n = c&0xf;
+      int nk = (c>>4)&0xf;
+      mrb_int bidx = a + mrb_bidx(n,nk);
 
-      {
-        int n = c&0xf;
-        int nk = (c>>4)&0xf;
-        mrb_int bidx = a + mrb_bidx(n,nk);
+      if (nk == CALL_MAXARGS) {
+        mrb_ensure_hash_type(mrb, regs[a+(n==CALL_MAXARGS?1:n)+1]);
+      }
+      else if (nk > 0) {  /* pack keyword arguments */
+        mrb_int kidx = a+(n==CALL_MAXARGS?1:n)+1;
+        mrb_value kdict = hash_new_from_regs(mrb, nk, kidx);
+        regs[kidx] = kdict;
+        nk = CALL_MAXARGS;
+        c = n | (nk<<4);
+      }
 
-        if (nk == CALL_MAXARGS) {
-          mrb_ensure_hash_type(mrb, regs[a+(n==CALL_MAXARGS?1:n)+1]);
-        }
-        else if (nk > 0) {  /* pack keyword arguments */
-          mrb_int kidx = a+(n==CALL_MAXARGS?1:n)+1;
-          mrb_value kdict = hash_new_from_regs(mrb, nk, kidx);
-          regs[kidx] = kdict;
-          nk = CALL_MAXARGS;
-          c = n | (nk<<4);
-        }
-
-        mrb_assert(bidx < irep->nregs);
-        mrb_int new_bidx = a+mrb_bidx(n, nk);
-        if (insn == OP_SEND) {
-          /* clear block argument */
-          SET_NIL_VALUE(regs[new_bidx]);
-          SET_NIL_VALUE(blk);
-        }
-        else {
-          blk = regs[bidx];
-          if (!mrb_nil_p(blk) && !mrb_proc_p(blk)) {
-            blk = mrb_type_convert(mrb, blk, MRB_TT_PROC, MRB_SYM(to_proc));
-            /* The stack might have been reallocated during mrb_type_convert(), see #3622 */
-          }
-          regs[new_bidx] = blk;
+      mrb_assert(bidx < irep->nregs);
+      mrb_int new_bidx = a+mrb_bidx(n, nk);
+      if (insn == OP_SEND) {
+        /* clear block argument */
+        SET_NIL_VALUE(regs[new_bidx]);
+        SET_NIL_VALUE(blk);
+      }
+      else {
+        blk = regs[bidx];
+        if (!mrb_nil_p(blk) && !mrb_proc_p(blk)) {
+          blk = mrb_type_convert(mrb, blk, MRB_TT_PROC, MRB_SYM(to_proc));
+          /* The stack might have been reallocated during mrb_type_convert(), see #3622 */
         }
+        regs[new_bidx] = blk;
       }
 
       recv = regs[a];