From 5305c5c84d9c994201efbcf5da1b330db2715316 Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Sat, 26 Feb 2022 14:19:05 +0900
Subject: [PATCH] array.c: call `mrb_ary_delete_at()` directly from
 `Array#slice!`.

Avoid `mrb_funcall()`.
---
 mrbgems/mruby-array-ext/src/array.c | 16 +++++-----------
 src/array.c                         |  2 +-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/mrbgems/mruby-array-ext/src/array.c b/mrbgems/mruby-array-ext/src/array.c
index ae8a55d4d..b5031530f 100644
--- a/mrbgems/mruby-array-ext/src/array.c
+++ b/mrbgems/mruby-array-ext/src/array.c
@@ -111,6 +111,8 @@ mrb_ary_values_at(mrb_state *mrb, mrb_value self)
   return mrb_get_values_at(mrb, self, RARRAY_LEN(self), argc, argv, ary_ref);
 }
 
+mrb_value mrb_ary_delete_at(mrb_state *mrb, mrb_value self);
+
 /*
  *  call-seq:
  *     ary.slice!(index)         -> obj or nil
@@ -146,21 +148,13 @@ mrb_ary_slice_bang(mrb_state *mrb, mrb_value self)
   if (mrb_get_argc(mrb) == 1) {
     mrb_value index = mrb_get_arg1(mrb);
 
-    switch (mrb_type(index)) {
-    case MRB_TT_RANGE:
+    if (mrb_type(index) == MRB_TT_RANGE) {
       if (mrb_range_beg_len(mrb, index, &i, &len, ARY_LEN(a), TRUE) == MRB_RANGE_OK) {
         goto delete_pos_len;
       }
-      else {
-        return mrb_nil_value();
-      }
-    case MRB_TT_INTEGER:
-      val = mrb_funcall_id(mrb, self, MRB_SYM(delete_at), 1, index);
-      return val;
-    default:
-      val = mrb_funcall_id(mrb, self, MRB_SYM(delete_at), 1, index);
-      return val;
+      return mrb_nil_value();
     }
+    return mrb_ary_delete_at(mrb, self);
   }
 
   mrb_get_args(mrb, "ii", &i, &len);
diff --git a/src/array.c b/src/array.c
index 07ceefb7e..f8b56bfa2 100644
--- a/src/array.c
+++ b/src/array.c
@@ -1009,7 +1009,7 @@ mrb_ary_aset(mrb_state *mrb, mrb_value self)
   return v3;
 }
 
-static mrb_value
+mrb_value
 mrb_ary_delete_at(mrb_state *mrb, mrb_value self)
 {
   struct RArray *a = mrb_ary_ptr(self);