debase-ruby_core_source 0.10.9 → 0.10.13

data/lib/debase/ruby_core_source/{ruby-2.7.0-preview3 → ruby-3.0.0-p0}/insns_info.inc

@@ -40,8 +40,8 @@ enum ruby_insn_type_chars {
     TS_VARIABLE = '.',
     TS_CALLDATA = 'C',
     TS_CDHASH = 'H',
-    TS_GENTRY = 'G',
     TS_IC = 'K',
+    TS_IVC = 'A',
     TS_ID = 'I',
     TS_ISE = 'T',
     TS_ISEQ = 'S',
@@ -86,7 +86,6 @@ insn_name(VALUE i)
         "putstring" "\0"
         "concatstrings" "\0"
         "tostring" "\0"
-        "freezestring" "\0"
         "toregexp" "\0"
         "intern" "\0"
         "newarray" "\0"
@@ -156,7 +155,6 @@ insn_name(VALUE i)
         "opt_succ" "\0"
         "opt_not" "\0"
         "opt_regexpmatch2" "\0"
-        "opt_call_c_function" "\0"
         "invokebuiltin" "\0"
         "opt_invokebuiltin_delegate" "\0"
         "opt_invokebuiltin_delegate_leave" "\0"
@@ -189,7 +187,6 @@ insn_name(VALUE i)
         "trace_putstring" "\0"
         "trace_concatstrings" "\0"
         "trace_tostring" "\0"
-        "trace_freezestring" "\0"
         "trace_toregexp" "\0"
         "trace_intern" "\0"
         "trace_newarray" "\0"
@@ -259,7 +256,6 @@ insn_name(VALUE i)
         "trace_opt_succ" "\0"
         "trace_opt_not" "\0"
         "trace_opt_regexpmatch2" "\0"
-        "trace_opt_call_c_function" "\0"
         "trace_invokebuiltin" "\0"
         "trace_opt_invokebuiltin_delegate" "\0"
         "trace_opt_invokebuiltin_delegate_leave" "\0"
@@ -274,22 +270,21 @@ insn_name(VALUE i)
     static const unsigned short y[] = {
            0,    4,   13,   22,   36,   50,   69,   80,   91,  111,  131,  148,
          165,  177,  189,  199,  209,  216,  224,  234,  251,  261,  275,  284,
-         297,  306,  313,  322,  338,  347,  355,  367,  379,  390,  398,  407,
-         411,  415,  420,  425,  433,  438,  443,  455,  463,  474,  487,  497,
-         509,  522,  536,  541,  564,  579,  589,  604,  621,  638,  650,  662,
-         668,  674,  679,  688,  701,  711,  730,  749,  754,  772,  781,  791,
-         800,  808,  816,  823,  831,  838,  845,  852,  859,  868,  876,  883,
-         892,  901,  915,  929,  940,  949,  961,  970,  978,  995, 1015, 1029,
-        1056, 1089, 1103, 1117, 1131, 1145, 1166, 1187, 1197, 1212, 1227, 1247,
-        1267, 1292, 1309, 1326, 1352, 1378, 1401, 1424, 1442, 1460, 1476, 1492,
-        1505, 1519, 1535, 1558, 1574, 1594, 1609, 1628, 1643, 1656, 1671, 1693,
-        1708, 1722, 1740, 1758, 1775, 1789, 1804, 1814, 1824, 1835, 1846, 1860,
-        1871, 1882, 1900, 1914, 1931, 1950, 1966, 1984, 2003, 2023, 2034, 2063,
-        2084, 2100, 2121, 2144, 2167, 2185, 2203, 2215, 2227, 2238, 2253, 2272,
-        2288, 2313, 2338, 2349, 2373, 2388, 2404, 2419, 2433, 2447, 2460, 2474,
-        2487, 2500, 2513, 2526, 2541, 2555, 2568, 2583, 2598, 2618, 2638, 2655,
-        2670, 2688, 2703, 2717, 2740, 2766, 2786, 2819, 2858, 2878, 2898, 2918,
-        2938, 2965,
+         293,  300,  309,  325,  334,  342,  354,  366,  377,  385,  394,  398,
+         402,  407,  412,  420,  425,  430,  442,  450,  461,  474,  484,  496,
+         509,  523,  528,  551,  566,  576,  591,  608,  625,  637,  649,  655,
+         661,  666,  675,  688,  698,  717,  736,  741,  759,  768,  778,  787,
+         795,  803,  810,  818,  825,  832,  839,  846,  855,  863,  870,  879,
+         888,  902,  916,  927,  936,  948,  957,  965,  982,  996, 1023, 1056,
+        1070, 1084, 1098, 1112, 1133, 1154, 1164, 1179, 1194, 1214, 1234, 1259,
+        1276, 1293, 1319, 1345, 1368, 1391, 1409, 1427, 1443, 1459, 1472, 1486,
+        1502, 1525, 1541, 1561, 1576, 1591, 1604, 1619, 1641, 1656, 1670, 1688,
+        1706, 1723, 1737, 1752, 1762, 1772, 1783, 1794, 1808, 1819, 1830, 1848,
+        1862, 1879, 1898, 1914, 1932, 1951, 1971, 1982, 2011, 2032, 2048, 2069,
+        2092, 2115, 2133, 2151, 2163, 2175, 2186, 2201, 2220, 2236, 2261, 2286,
+        2297, 2321, 2336, 2352, 2367, 2381, 2395, 2408, 2422, 2435, 2448, 2461,
+        2474, 2489, 2503, 2516, 2531, 2546, 2566, 2586, 2603, 2618, 2636, 2651,
+        2665, 2688, 2708, 2741, 2780, 2800, 2820, 2840, 2860, 2887,
     };
 
     ASSERT_VM_INSTRUCTION_SIZE(y);
@@ -304,14 +299,14 @@ insn_len(VALUE i)
 {
     static const char t[] = {
         1, 3, 3, 3, 3, 3, 3, 2, 3, 3, 2, 2, 2, 2, 2, 2, 1, 1, 2, 2, 2, 2, 1,
-        2, 3, 1, 2, 2, 2, 2, 3, 1, 2, 2, 2, 1, 1, 2, 1, 2, 2, 2, 2, 4, 2, 3,
-        2, 4, 3, 3, 3, 2, 3, 2, 3, 2, 2, 3, 2, 1, 2, 2, 2, 2, 2, 3, 2, 3, 3,
-        2, 2, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 2, 2, 2, 2, 2,
-        2, 2, 2, 3, 3, 2, 2, 2, 2, 1, 1, 1, 3, 3, 3, 3, 3, 3, 2, 3, 3, 2, 2,
-        2, 2, 2, 2, 1, 1, 2, 2, 2, 2, 1, 2, 3, 1, 2, 2, 2, 2, 3, 1, 2, 2, 2,
-        1, 1, 2, 1, 2, 2, 2, 2, 4, 2, 3, 2, 4, 3, 3, 3, 2, 3, 2, 3, 2, 2, 3,
-        2, 1, 2, 2, 2, 2, 2, 3, 2, 3, 3, 2, 2, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2,
-        2, 2, 2, 2, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 2, 2, 2, 2, 1, 1,
+        3, 1, 2, 2, 2, 2, 3, 1, 2, 2, 2, 1, 1, 2, 1, 2, 2, 2, 2, 4, 2, 3, 2,
+        4, 3, 3, 3, 2, 3, 2, 3, 2, 2, 3, 2, 1, 2, 2, 2, 2, 2, 3, 2, 3, 3, 2,
+        2, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 2, 2, 2, 2, 2, 2,
+        2, 3, 3, 2, 2, 2, 2, 1, 1, 1, 3, 3, 3, 3, 3, 3, 2, 3, 3, 2, 2, 2, 2,
+        2, 2, 1, 1, 2, 2, 2, 2, 1, 3, 1, 2, 2, 2, 2, 3, 1, 2, 2, 2, 1, 1, 2,
+        1, 2, 2, 2, 2, 4, 2, 3, 2, 4, 3, 3, 3, 2, 3, 2, 3, 2, 2, 3, 2, 1, 2,
+        2, 2, 2, 2, 3, 2, 3, 3, 2, 2, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2,
+        2, 3, 3, 2, 2, 2, 2, 2, 2, 2, 3, 3, 2, 2, 2, 2, 1, 1,
     };
 
     ASSERT_VM_INSTRUCTION_SIZE(t);
@@ -326,10 +321,30 @@ insn_op_types(VALUE i)
 {
     static const char x[] =
         ""     "\0" "LN"   "\0" "LN"   "\0" "LN"   "\0" "LN"   "\0"
-        "LN"   "\0" "NN"   "\0" "N"    "\0" "IK"   "\0" "IK"   "\0"
-        "I"    "\0" "I"    "\0" "I"    "\0" "I"    "\0" "G"    "\0"
-        "G"    "\0" ""     "\0" ""     "\0" "V"    "\0" "N"    "\0"
-        "V"    "\0" "N"    "\0" ""     "\0" "V"    "\0" "NN"   "\0"
+        "LN"   "\0" "NN"   "\0" "N"    "\0" "IA"   "\0" "IA"   "\0"
+        "I"    "\0" "I"    "\0" "I"    "\0" "I"    "\0" "I"    "\0"
+        "I"    "\0" ""     "\0" ""     "\0" "V"    "\0" "N"    "\0"
+        "V"    "\0" "N"    "\0" ""     "\0" "NN"   "\0" ""     "\0"
+        "N"    "\0" "N"    "\0" "V"    "\0" "V"    "\0" "NN"   "\0"
+        ""     "\0" "V"    "\0" "N"    "\0" "N"    "\0" ""     "\0"
+        ""     "\0" "N"    "\0" ""     "\0" "N"    "\0" "N"    "\0"
+        "N"    "\0" "N"    "\0" "NVV"  "\0" "N"    "\0" "LL"   "\0"
+        "N"    "\0" "ISN"  "\0" "IS"   "\0" "IS"   "\0" "CS"   "\0"
+        "C"    "\0" "VC"   "\0" "C"    "\0" "VC"   "\0" "N"    "\0"
+        "N"    "\0" "CS"   "\0" "C"    "\0" ""     "\0" "N"    "\0"
+        "O"    "\0" "O"    "\0" "O"    "\0" "O"    "\0" "OK"   "\0"
+        "K"    "\0" "ST"   "\0" "HO"   "\0" "C"    "\0" "C"    "\0"
+        "C"    "\0" "C"    "\0" "C"    "\0" "C"    "\0" "CC"   "\0"
+        "C"    "\0" "C"    "\0" "C"    "\0" "C"    "\0" "C"    "\0"
+        "C"    "\0" "C"    "\0" "C"    "\0" "C"    "\0" "VC"   "\0"
+        "VC"   "\0" "C"    "\0" "C"    "\0" "C"    "\0" "C"    "\0"
+        "C"    "\0" "C"    "\0" "R"    "\0" "RN"   "\0" "RN"   "\0"
+        "L"    "\0" "L"    "\0" "L"    "\0" "L"    "\0" ""     "\0"
+        ""     "\0" ""     "\0" "LN"   "\0" "LN"   "\0" "LN"   "\0"
+        "LN"   "\0" "LN"   "\0" "NN"   "\0" "N"    "\0" "IA"   "\0"
+        "IA"   "\0" "I"    "\0" "I"    "\0" "I"    "\0" "I"    "\0"
+        "I"    "\0" "I"    "\0" ""     "\0" ""     "\0" "V"    "\0"
+        "N"    "\0" "V"    "\0" "N"    "\0" ""     "\0" "NN"   "\0"
         ""     "\0" "N"    "\0" "N"    "\0" "V"    "\0" "V"    "\0"
         "NN"   "\0" ""     "\0" "V"    "\0" "N"    "\0" "N"    "\0"
         ""     "\0" ""     "\0" "N"    "\0" ""     "\0" "N"    "\0"
@@ -343,51 +358,29 @@ insn_op_types(VALUE i)
         "CC"   "\0" "C"    "\0" "C"    "\0" "C"    "\0" "C"    "\0"
         "C"    "\0" "C"    "\0" "C"    "\0" "C"    "\0" "C"    "\0"
         "VC"   "\0" "VC"   "\0" "C"    "\0" "C"    "\0" "C"    "\0"
-        "C"    "\0" "C"    "\0" "C"    "\0" "F"    "\0" "R"    "\0"
-        "RN"   "\0" "RN"   "\0" "L"    "\0" "L"    "\0" "L"    "\0"
-        "L"    "\0" ""     "\0" ""     "\0" ""     "\0" "LN"   "\0"
-        "LN"   "\0" "LN"   "\0" "LN"   "\0" "LN"   "\0" "NN"   "\0"
-        "N"    "\0" "IK"   "\0" "IK"   "\0" "I"    "\0" "I"    "\0"
-        "I"    "\0" "I"    "\0" "G"    "\0" "G"    "\0" ""     "\0"
-        ""     "\0" "V"    "\0" "N"    "\0" "V"    "\0" "N"    "\0"
-        ""     "\0" "V"    "\0" "NN"   "\0" ""     "\0" "N"    "\0"
-        "N"    "\0" "V"    "\0" "V"    "\0" "NN"   "\0" ""     "\0"
-        "V"    "\0" "N"    "\0" "N"    "\0" ""     "\0" ""     "\0"
-        "N"    "\0" ""     "\0" "N"    "\0" "N"    "\0" "N"    "\0"
-        "N"    "\0" "NVV"  "\0" "N"    "\0" "LL"   "\0" "N"    "\0"
-        "ISN"  "\0" "IS"   "\0" "IS"   "\0" "CS"   "\0" "C"    "\0"
-        "VC"   "\0" "C"    "\0" "VC"   "\0" "N"    "\0" "N"    "\0"
-        "CS"   "\0" "C"    "\0" ""     "\0" "N"    "\0" "O"    "\0"
-        "O"    "\0" "O"    "\0" "O"    "\0" "OK"   "\0" "K"    "\0"
-        "ST"   "\0" "HO"   "\0" "C"    "\0" "C"    "\0" "C"    "\0"
-        "C"    "\0" "C"    "\0" "C"    "\0" "CC"   "\0" "C"    "\0"
-        "C"    "\0" "C"    "\0" "C"    "\0" "C"    "\0" "C"    "\0"
-        "C"    "\0" "C"    "\0" "C"    "\0" "VC"   "\0" "VC"   "\0"
-        "C"    "\0" "C"    "\0" "C"    "\0" "C"    "\0" "C"    "\0"
-        "C"    "\0" "F"    "\0" "R"    "\0" "RN"   "\0" "RN"   "\0"
-        "L"    "\0" "L"    "\0" "L"    "\0" "L"    "\0" ""     "\0"
-        ""     "\0"
+        "C"    "\0" "C"    "\0" "C"    "\0" "R"    "\0" "RN"   "\0"
+        "RN"   "\0" "L"    "\0" "L"    "\0" "L"    "\0" "L"    "\0"
+        ""     "\0" ""     "\0"
         ;
 
     static const unsigned short y[] = {
           0,   1,   4,   7,  10,  13,  16,  19,  21,  24,  27,  29,
          31,  33,  35,  37,  39,  40,  41,  43,  45,  47,  49,  50,
-         52,  55,  56,  58,  60,  62,  64,  67,  68,  70,  72,  74,
-         75,  76,  78,  79,  81,  83,  85,  87,  91,  93,  96,  98,
-        102, 105, 108, 111, 113, 116, 118, 121, 123, 125, 128, 130,
-        131, 133, 135, 137, 139, 141, 144, 146, 149, 152, 154, 156,
-        158, 160, 162, 164, 167, 169, 171, 173, 175, 177, 179, 181,
-        183, 185, 188, 191, 193, 195, 197, 199, 201, 203, 205, 207,
-        210, 213, 215, 217, 219, 221, 222, 223, 224, 227, 230, 233,
-        236, 239, 242, 244, 247, 250, 252, 254, 256, 258, 260, 262,
-        263, 264, 266, 268, 270, 272, 273, 275, 278, 279, 281, 283,
-        285, 287, 290, 291, 293, 295, 297, 298, 299, 301, 302, 304,
-        306, 308, 310, 314, 316, 319, 321, 325, 328, 331, 334, 336,
-        339, 341, 344, 346, 348, 351, 353, 354, 356, 358, 360, 362,
-        364, 367, 369, 372, 375, 377, 379, 381, 383, 385, 387, 390,
-        392, 394, 396, 398, 400, 402, 404, 406, 408, 411, 414, 416,
-        418, 420, 422, 424, 426, 428, 430, 433, 436, 438, 440, 442,
-        444, 445,
+         53,  54,  56,  58,  60,  62,  65,  66,  68,  70,  72,  73,
+         74,  76,  77,  79,  81,  83,  85,  89,  91,  94,  96, 100,
+        103, 106, 109, 111, 114, 116, 119, 121, 123, 126, 128, 129,
+        131, 133, 135, 137, 139, 142, 144, 147, 150, 152, 154, 156,
+        158, 160, 162, 165, 167, 169, 171, 173, 175, 177, 179, 181,
+        183, 186, 189, 191, 193, 195, 197, 199, 201, 203, 206, 209,
+        211, 213, 215, 217, 218, 219, 220, 223, 226, 229, 232, 235,
+        238, 240, 243, 246, 248, 250, 252, 254, 256, 258, 259, 260,
+        262, 264, 266, 268, 269, 272, 273, 275, 277, 279, 281, 284,
+        285, 287, 289, 291, 292, 293, 295, 296, 298, 300, 302, 304,
+        308, 310, 313, 315, 319, 322, 325, 328, 330, 333, 335, 338,
+        340, 342, 345, 347, 348, 350, 352, 354, 356, 358, 361, 363,
+        366, 369, 371, 373, 375, 377, 379, 381, 384, 386, 388, 390,
+        392, 394, 396, 398, 400, 402, 405, 408, 410, 412, 414, 416,
+        418, 420, 422, 425, 428, 430, 432, 434, 436, 437,
     };
 
     ASSERT_VM_INSTRUCTION_SIZE(y);
@@ -408,65 +401,12 @@ insn_op_type(VALUE i, long j)
 
 #line 10 "tool/ruby_vm/views/_leaf_helpers.erb"
 
-static bool
-leafness_of_getglobal(VALUE gentry)
-{
-    const struct rb_global_entry *e = (void *)gentry;
-
-    if (UNLIKELY(rb_gvar_is_traced(e))) {
-        return false;
-    }
-    else {
-        /* We cannot write this function using a switch() because a
-         * case label cannot be a function pointer. */
-        static rb_gvar_getter_t *const allowlist[] = {
-            rb_gvar_val_getter,
-            rb_gvar_var_getter,
-            /* rb_gvar_undef_getter issues rb_warning() */
-        };
-        rb_gvar_getter_t *f = rb_gvar_getter_function_of(e);
-        int i;
-
-        for (i = 0; i < numberof(allowlist); i++) {
-            if (f == allowlist[i]) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
-
-static bool
-leafness_of_setglobal(VALUE gentry)
-{
-    const struct rb_global_entry *e = (void *)gentry;
-
-    if (UNLIKELY(rb_gvar_is_traced(e))) {
-        return false;
-    }
-    else {
-        /* We cannot write this function using a switch() because a
-         * case label cannot be a function pointer. */
-        static rb_gvar_setter_t *const allowlist[] = {
-            rb_gvar_val_setter,
-            /* rb_gvar_readonly_setter issues rb_name_error() */
-            rb_gvar_var_setter,
-            rb_gvar_undef_setter,
-        };
-        rb_gvar_setter_t *f = rb_gvar_setter_function_of(e);
-        int i;
-
-        for (i = 0; i < numberof(allowlist); i++) {
-            if (f == allowlist[i]) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
-
 #include "iseq.h"
 
+// This is used to tell MJIT that this insn would be leaf if CHECK_INTS didn't exist.
+// It should be used only when RUBY_VM_CHECK_INTS is directly written in insns.def.
+static bool leafness_of_check_ints = false;
+
 static bool
 leafness_of_defined(rb_num_t op_type)
 {
@@ -505,12 +445,12 @@ leafness_of_checkmatch(rb_num_t flag)
         return false;
     }
 }
-#line 509 "insns_info.inc"
+#line 449 "insns_info.inc"
 
 #line 10 "tool/ruby_vm/views/_sp_inc_helpers.erb"
 
 static rb_snum_t
-sp_inc_of_sendish(const struct rb_call_info *ci)
+sp_inc_of_sendish(const struct rb_callinfo *ci)
 {
     /* Send-ish instructions will:
      *
@@ -519,8 +459,8 @@ sp_inc_of_sendish(const struct rb_call_info *ci)
      * 3. Pop receiver.
      * 4. Push return value.
      */
-    const int argb = (ci->flag & VM_CALL_ARGS_BLOCKARG) ? 1 : 0;
-    const int argc = ci->orig_argc;
+    const int argb = (vm_ci_flag(ci) & VM_CALL_ARGS_BLOCKARG) ? 1 : 0;
+    const int argc = vm_ci_argc(ci);
     const int recv = 1;
     const int retn = 1;
 
@@ -529,13 +469,13 @@ sp_inc_of_sendish(const struct rb_call_info *ci)
 }
 
 static rb_snum_t
-sp_inc_of_invokeblock(const struct rb_call_info *ci)
+sp_inc_of_invokeblock(const struct rb_callinfo *ci)
 {
     /* sp_inc of invokeblock is almost identical to that of sendish
      * instructions, except that it does not pop receiver. */
     return sp_inc_of_sendish(ci) + 1;
 }
-#line 539 "insns_info.inc"
+#line 479 "insns_info.inc"
 
 #ifndef RUBY_VM_EXEC_H
 /* can't #include "vm_exec.h" here... */
@@ -617,24 +557,24 @@ PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_popn_setspecial(rb_num_t key)));
 PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_retn_setspecial(rb_num_t key)));
 PUREFUNC(MAYBE_UNUSED(static rb_snum_t attr_sp_inc_setspecial(rb_num_t key)));
 PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_width_setspecial(rb_num_t key)));
-PUREFUNC(MAYBE_UNUSED(static enum ruby_vminsn_type attr_bin_getinstancevariable(ID id, IC ic)));
-PUREFUNC(MAYBE_UNUSED(static bool attr_handles_sp_getinstancevariable(ID id, IC ic)));
-PUREFUNC(MAYBE_UNUSED(static bool attr_leaf_getinstancevariable(ID id, IC ic)));
-PUREFUNC(MAYBE_UNUSED(static const char* attr_name_getinstancevariable(ID id, IC ic)));
-PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_open_getinstancevariable(ID id, IC ic)));
-PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_popn_getinstancevariable(ID id, IC ic)));
-PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_retn_getinstancevariable(ID id, IC ic)));
-PUREFUNC(MAYBE_UNUSED(static rb_snum_t attr_sp_inc_getinstancevariable(ID id, IC ic)));
-PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_width_getinstancevariable(ID id, IC ic)));
-PUREFUNC(MAYBE_UNUSED(static enum ruby_vminsn_type attr_bin_setinstancevariable(ID id, IC ic)));
-PUREFUNC(MAYBE_UNUSED(static bool attr_handles_sp_setinstancevariable(ID id, IC ic)));
-PUREFUNC(MAYBE_UNUSED(static bool attr_leaf_setinstancevariable(ID id, IC ic)));
-PUREFUNC(MAYBE_UNUSED(static const char* attr_name_setinstancevariable(ID id, IC ic)));
-PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_open_setinstancevariable(ID id, IC ic)));
-PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_popn_setinstancevariable(ID id, IC ic)));
-PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_retn_setinstancevariable(ID id, IC ic)));
-PUREFUNC(MAYBE_UNUSED(static rb_snum_t attr_sp_inc_setinstancevariable(ID id, IC ic)));
-PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_width_setinstancevariable(ID id, IC ic)));
+PUREFUNC(MAYBE_UNUSED(static enum ruby_vminsn_type attr_bin_getinstancevariable(ID id, IVC ic)));
+PUREFUNC(MAYBE_UNUSED(static bool attr_handles_sp_getinstancevariable(ID id, IVC ic)));
+PUREFUNC(MAYBE_UNUSED(static bool attr_leaf_getinstancevariable(ID id, IVC ic)));
+PUREFUNC(MAYBE_UNUSED(static const char* attr_name_getinstancevariable(ID id, IVC ic)));
+PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_open_getinstancevariable(ID id, IVC ic)));
+PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_popn_getinstancevariable(ID id, IVC ic)));
+PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_retn_getinstancevariable(ID id, IVC ic)));
+PUREFUNC(MAYBE_UNUSED(static rb_snum_t attr_sp_inc_getinstancevariable(ID id, IVC ic)));
+PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_width_getinstancevariable(ID id, IVC ic)));
+PUREFUNC(MAYBE_UNUSED(static enum ruby_vminsn_type attr_bin_setinstancevariable(ID id, IVC ic)));
+PUREFUNC(MAYBE_UNUSED(static bool attr_handles_sp_setinstancevariable(ID id, IVC ic)));
+PUREFUNC(MAYBE_UNUSED(static bool attr_leaf_setinstancevariable(ID id, IVC ic)));
+PUREFUNC(MAYBE_UNUSED(static const char* attr_name_setinstancevariable(ID id, IVC ic)));
+PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_open_setinstancevariable(ID id, IVC ic)));
+PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_popn_setinstancevariable(ID id, IVC ic)));
+PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_retn_setinstancevariable(ID id, IVC ic)));
+PUREFUNC(MAYBE_UNUSED(static rb_snum_t attr_sp_inc_setinstancevariable(ID id, IVC ic)));
+PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_width_setinstancevariable(ID id, IVC ic)));
 PUREFUNC(MAYBE_UNUSED(static enum ruby_vminsn_type attr_bin_getclassvariable(ID id)));
 PUREFUNC(MAYBE_UNUSED(static bool attr_handles_sp_getclassvariable(ID id)));
 PUREFUNC(MAYBE_UNUSED(static bool attr_leaf_getclassvariable(ID id)));
@@ -671,24 +611,24 @@ PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_popn_setconstant(ID id)));
 PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_retn_setconstant(ID id)));
 PUREFUNC(MAYBE_UNUSED(static rb_snum_t attr_sp_inc_setconstant(ID id)));
 PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_width_setconstant(ID id)));
-PUREFUNC(MAYBE_UNUSED(static enum ruby_vminsn_type attr_bin_getglobal(GENTRY entry)));
-PUREFUNC(MAYBE_UNUSED(static bool attr_handles_sp_getglobal(GENTRY entry)));
-PUREFUNC(MAYBE_UNUSED(static bool attr_leaf_getglobal(GENTRY entry)));
-PUREFUNC(MAYBE_UNUSED(static const char* attr_name_getglobal(GENTRY entry)));
-PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_open_getglobal(GENTRY entry)));
-PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_popn_getglobal(GENTRY entry)));
-PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_retn_getglobal(GENTRY entry)));
-PUREFUNC(MAYBE_UNUSED(static rb_snum_t attr_sp_inc_getglobal(GENTRY entry)));
-PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_width_getglobal(GENTRY entry)));
-PUREFUNC(MAYBE_UNUSED(static enum ruby_vminsn_type attr_bin_setglobal(GENTRY entry)));
-PUREFUNC(MAYBE_UNUSED(static bool attr_handles_sp_setglobal(GENTRY entry)));
-PUREFUNC(MAYBE_UNUSED(static bool attr_leaf_setglobal(GENTRY entry)));
-PUREFUNC(MAYBE_UNUSED(static const char* attr_name_setglobal(GENTRY entry)));
-PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_open_setglobal(GENTRY entry)));
-PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_popn_setglobal(GENTRY entry)));
-PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_retn_setglobal(GENTRY entry)));
-PUREFUNC(MAYBE_UNUSED(static rb_snum_t attr_sp_inc_setglobal(GENTRY entry)));
-PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_width_setglobal(GENTRY entry)));
+PUREFUNC(MAYBE_UNUSED(static enum ruby_vminsn_type attr_bin_getglobal(ID gid)));
+PUREFUNC(MAYBE_UNUSED(static bool attr_handles_sp_getglobal(ID gid)));
+PUREFUNC(MAYBE_UNUSED(static bool attr_leaf_getglobal(ID gid)));
+PUREFUNC(MAYBE_UNUSED(static const char* attr_name_getglobal(ID gid)));
+PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_open_getglobal(ID gid)));
+PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_popn_getglobal(ID gid)));
+PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_retn_getglobal(ID gid)));
+PUREFUNC(MAYBE_UNUSED(static rb_snum_t attr_sp_inc_getglobal(ID gid)));
+PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_width_getglobal(ID gid)));
+PUREFUNC(MAYBE_UNUSED(static enum ruby_vminsn_type attr_bin_setglobal(ID gid)));
+PUREFUNC(MAYBE_UNUSED(static bool attr_handles_sp_setglobal(ID gid)));
+PUREFUNC(MAYBE_UNUSED(static bool attr_leaf_setglobal(ID gid)));
+PUREFUNC(MAYBE_UNUSED(static const char* attr_name_setglobal(ID gid)));
+PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_open_setglobal(ID gid)));
+PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_popn_setglobal(ID gid)));
+PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_retn_setglobal(ID gid)));
+PUREFUNC(MAYBE_UNUSED(static rb_snum_t attr_sp_inc_setglobal(ID gid)));
+PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_width_setglobal(ID gid)));
 PUREFUNC(MAYBE_UNUSED(static enum ruby_vminsn_type attr_bin_putnil(void)));
 PUREFUNC(MAYBE_UNUSED(static bool attr_handles_sp_putnil(void)));
 PUREFUNC(MAYBE_UNUSED(static bool attr_leaf_putnil(void)));
@@ -752,15 +692,6 @@ PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_popn_tostring(void)));
 PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_retn_tostring(void)));
 PUREFUNC(MAYBE_UNUSED(static rb_snum_t attr_sp_inc_tostring(void)));
 PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_width_tostring(void)));
-PUREFUNC(MAYBE_UNUSED(static enum ruby_vminsn_type attr_bin_freezestring(VALUE debug_info)));
-PUREFUNC(MAYBE_UNUSED(static bool attr_handles_sp_freezestring(VALUE debug_info)));
-PUREFUNC(MAYBE_UNUSED(static bool attr_leaf_freezestring(VALUE debug_info)));
-PUREFUNC(MAYBE_UNUSED(static const char* attr_name_freezestring(VALUE debug_info)));
-PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_open_freezestring(VALUE debug_info)));
-PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_popn_freezestring(VALUE debug_info)));
-PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_retn_freezestring(VALUE debug_info)));
-PUREFUNC(MAYBE_UNUSED(static rb_snum_t attr_sp_inc_freezestring(VALUE debug_info)));
-PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_width_freezestring(VALUE debug_info)));
 PUREFUNC(MAYBE_UNUSED(static enum ruby_vminsn_type attr_bin_toregexp(rb_num_t opt, rb_num_t cnt)));
 PUREFUNC(MAYBE_UNUSED(static bool attr_handles_sp_toregexp(rb_num_t opt, rb_num_t cnt)));
 PUREFUNC(MAYBE_UNUSED(static bool attr_leaf_toregexp(rb_num_t opt, rb_num_t cnt)));
@@ -1386,15 +1317,6 @@ PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_popn_opt_regexpmatch2(CALL_DATA cd)))
 PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_retn_opt_regexpmatch2(CALL_DATA cd)));
 PUREFUNC(MAYBE_UNUSED(static rb_snum_t attr_sp_inc_opt_regexpmatch2(CALL_DATA cd)));
 PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_width_opt_regexpmatch2(CALL_DATA cd)));
-PUREFUNC(MAYBE_UNUSED(static enum ruby_vminsn_type attr_bin_opt_call_c_function(rb_insn_func_t funcptr)));
-PUREFUNC(MAYBE_UNUSED(static bool attr_handles_sp_opt_call_c_function(rb_insn_func_t funcptr)));
-PUREFUNC(MAYBE_UNUSED(static bool attr_leaf_opt_call_c_function(rb_insn_func_t funcptr)));
-PUREFUNC(MAYBE_UNUSED(static const char* attr_name_opt_call_c_function(rb_insn_func_t funcptr)));
-PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_open_opt_call_c_function(rb_insn_func_t funcptr)));
-PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_popn_opt_call_c_function(rb_insn_func_t funcptr)));
-PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_retn_opt_call_c_function(rb_insn_func_t funcptr)));
-PUREFUNC(MAYBE_UNUSED(static rb_snum_t attr_sp_inc_opt_call_c_function(rb_insn_func_t funcptr)));
-PUREFUNC(MAYBE_UNUSED(static rb_num_t attr_width_opt_call_c_function(rb_insn_func_t funcptr)));
 PUREFUNC(MAYBE_UNUSED(static enum ruby_vminsn_type attr_bin_invokebuiltin(RB_BUILTIN bf)));
 PUREFUNC(MAYBE_UNUSED(static bool attr_handles_sp_invokebuiltin(RB_BUILTIN bf)));
 PUREFUNC(MAYBE_UNUSED(static bool attr_leaf_invokebuiltin(RB_BUILTIN bf)));
@@ -2020,7 +1942,7 @@ attr_leaf_getspecial(
     return
 #line 192 "insns.def"
 (type == 0) ? true : false;
-#line 2024 "insns_info.inc"
+#line 1946 "insns_info.inc"
 }
 
 /* attr const char* name @ getspecial(key, type)()(val) */
@@ -2150,7 +2072,7 @@ attr_width_setspecial(MAYBE_UNUSED(rb_num_t key))
 enum ruby_vminsn_type
 attr_bin_getinstancevariable(
     MAYBE_UNUSED(ID id),
-    MAYBE_UNUSED(IC ic)
+    MAYBE_UNUSED(IVC ic)
 )
 {
     return BIN(getinstancevariable);
@@ -2160,7 +2082,7 @@ attr_bin_getinstancevariable(
 bool
 attr_handles_sp_getinstancevariable(
     MAYBE_UNUSED(ID id),
-    MAYBE_UNUSED(IC ic)
+    MAYBE_UNUSED(IVC ic)
 )
 {
     return false;
@@ -2170,20 +2092,20 @@ attr_handles_sp_getinstancevariable(
 bool
 attr_leaf_getinstancevariable(
     MAYBE_UNUSED(ID id),
-    MAYBE_UNUSED(IC ic)
+    MAYBE_UNUSED(IVC ic)
 )
 {
     return
 #line 214 "insns.def"
 false;
-#line 2180 "insns_info.inc"
+#line 2102 "insns_info.inc"
 }
 
 /* attr const char* name @ getinstancevariable(id, ic)()(val) */
 const char*
 attr_name_getinstancevariable(
     MAYBE_UNUSED(ID id),
-    MAYBE_UNUSED(IC ic)
+    MAYBE_UNUSED(IVC ic)
 )
 {
     return insn_name(BIN(getinstancevariable));
@@ -2193,7 +2115,7 @@ attr_name_getinstancevariable(
 rb_num_t
 attr_open_getinstancevariable(
     MAYBE_UNUSED(ID id),
-    MAYBE_UNUSED(IC ic)
+    MAYBE_UNUSED(IVC ic)
 )
 {
     return 2;
@@ -2203,7 +2125,7 @@ attr_open_getinstancevariable(
 rb_num_t
 attr_popn_getinstancevariable(
     MAYBE_UNUSED(ID id),
-    MAYBE_UNUSED(IC ic)
+    MAYBE_UNUSED(IVC ic)
 )
 {
     return 0;
@@ -2213,7 +2135,7 @@ attr_popn_getinstancevariable(
 rb_num_t
 attr_retn_getinstancevariable(
     MAYBE_UNUSED(ID id),
-    MAYBE_UNUSED(IC ic)
+    MAYBE_UNUSED(IVC ic)
 )
 {
     return 1;
@@ -2223,7 +2145,7 @@ attr_retn_getinstancevariable(
 rb_snum_t
 attr_sp_inc_getinstancevariable(
     MAYBE_UNUSED(ID id),
-    MAYBE_UNUSED(IC ic)
+    MAYBE_UNUSED(IVC ic)
 )
 {
     return 1;
@@ -2233,7 +2155,7 @@ attr_sp_inc_getinstancevariable(
 rb_num_t
 attr_width_getinstancevariable(
     MAYBE_UNUSED(ID id),
-    MAYBE_UNUSED(IC ic)
+    MAYBE_UNUSED(IVC ic)
 )
 {
     return 3;
@@ -2243,7 +2165,7 @@ attr_width_getinstancevariable(
 enum ruby_vminsn_type
 attr_bin_setinstancevariable(
     MAYBE_UNUSED(ID id),
-    MAYBE_UNUSED(IC ic)
+    MAYBE_UNUSED(IVC ic)
 )
 {
     return BIN(setinstancevariable);
@@ -2253,7 +2175,7 @@ attr_bin_setinstancevariable(
 bool
 attr_handles_sp_setinstancevariable(
     MAYBE_UNUSED(ID id),
-    MAYBE_UNUSED(IC ic)
+    MAYBE_UNUSED(IVC ic)
 )
 {
     return false;
@@ -2263,20 +2185,20 @@ attr_handles_sp_setinstancevariable(
 bool
 attr_leaf_setinstancevariable(
     MAYBE_UNUSED(ID id),
-    MAYBE_UNUSED(IC ic)
+    MAYBE_UNUSED(IVC ic)
 )
 {
     return
 #line 225 "insns.def"
 false;
-#line 2273 "insns_info.inc"
+#line 2195 "insns_info.inc"
 }
 
 /* attr const char* name @ setinstancevariable(id, ic)(val)() */
 const char*
 attr_name_setinstancevariable(
     MAYBE_UNUSED(ID id),
-    MAYBE_UNUSED(IC ic)
+    MAYBE_UNUSED(IVC ic)
 )
 {
     return insn_name(BIN(setinstancevariable));
@@ -2286,7 +2208,7 @@ attr_name_setinstancevariable(
 rb_num_t
 attr_open_setinstancevariable(
     MAYBE_UNUSED(ID id),
-    MAYBE_UNUSED(IC ic)
+    MAYBE_UNUSED(IVC ic)
 )
 {
     return 2;
@@ -2296,7 +2218,7 @@ attr_open_setinstancevariable(
 rb_num_t
 attr_popn_setinstancevariable(
     MAYBE_UNUSED(ID id),
-    MAYBE_UNUSED(IC ic)
+    MAYBE_UNUSED(IVC ic)
 )
 {
     return 1;
@@ -2306,7 +2228,7 @@ attr_popn_setinstancevariable(
 rb_num_t
 attr_retn_setinstancevariable(
     MAYBE_UNUSED(ID id),
-    MAYBE_UNUSED(IC ic)
+    MAYBE_UNUSED(IVC ic)
 )
 {
     return 0;
@@ -2316,7 +2238,7 @@ attr_retn_setinstancevariable(
 rb_snum_t
 attr_sp_inc_setinstancevariable(
     MAYBE_UNUSED(ID id),
-    MAYBE_UNUSED(IC ic)
+    MAYBE_UNUSED(IVC ic)
 )
 {
     return -1;
@@ -2326,7 +2248,7 @@ attr_sp_inc_setinstancevariable(
 rb_num_t
 attr_width_setinstancevariable(
     MAYBE_UNUSED(ID id),
-    MAYBE_UNUSED(IC ic)
+    MAYBE_UNUSED(IVC ic)
 )
 {
     return 3;
@@ -2353,7 +2275,7 @@ attr_leaf_getclassvariable(MAYBE_UNUSED(ID id))
     return
 #line 237 "insns.def"
 false;
-#line 2357 "insns_info.inc"
+#line 2279 "insns_info.inc"
 }
 
 /* attr const char* name @ getclassvariable(id)()(val) */
@@ -2419,7 +2341,7 @@ attr_leaf_setclassvariable(MAYBE_UNUSED(ID id))
     return
 #line 249 "insns.def"
 false;
-#line 2423 "insns_info.inc"
+#line 2345 "insns_info.inc"
 }
 
 /* attr const char* name @ setclassvariable(id)(val)() */
@@ -2485,7 +2407,7 @@ attr_leaf_getconstant(MAYBE_UNUSED(ID id))
     return
 #line 265 "insns.def"
 false;
-#line 2489 "insns_info.inc"
+#line 2411 "insns_info.inc"
 }
 
 /* attr const char* name @ getconstant(id)(klass, allow_nil)(val) */
@@ -2551,7 +2473,7 @@ attr_leaf_setconstant(MAYBE_UNUSED(ID id))
     return
 #line 281 "insns.def"
 false;
-#line 2555 "insns_info.inc"
+#line 2477 "insns_info.inc"
 }
 
 /* attr const char* name @ setconstant(id)(val, cbase)() */
@@ -2596,134 +2518,134 @@ attr_width_setconstant(MAYBE_UNUSED(ID id))
     return 2;
 }
 
-/* attr enum ruby_vminsn_type bin @ getglobal(entry)()(val) */
+/* attr enum ruby_vminsn_type bin @ getglobal(gid)()(val) */
 enum ruby_vminsn_type
-attr_bin_getglobal(MAYBE_UNUSED(GENTRY entry))
+attr_bin_getglobal(MAYBE_UNUSED(ID gid))
 {
     return BIN(getglobal);
 }
 
-/* attr bool handles_sp @ getglobal(entry)()(val) */
+/* attr bool handles_sp @ getglobal(gid)()(val) */
 bool
-attr_handles_sp_getglobal(MAYBE_UNUSED(GENTRY entry))
+attr_handles_sp_getglobal(MAYBE_UNUSED(ID gid))
 {
     return false;
 }
 
-/* attr bool leaf @ getglobal(entry)()(val) */
+/* attr bool leaf @ getglobal(gid)()(val) */
 bool
-attr_leaf_getglobal(MAYBE_UNUSED(GENTRY entry))
+attr_leaf_getglobal(MAYBE_UNUSED(ID gid))
 {
     return
 #line 294 "insns.def"
-leafness_of_getglobal(entry);
-#line 2621 "insns_info.inc"
+false;
+#line 2543 "insns_info.inc"
 }
 
-/* attr const char* name @ getglobal(entry)()(val) */
+/* attr const char* name @ getglobal(gid)()(val) */
 const char*
-attr_name_getglobal(MAYBE_UNUSED(GENTRY entry))
+attr_name_getglobal(MAYBE_UNUSED(ID gid))
 {
     return insn_name(BIN(getglobal));
 }
 
-/* attr rb_num_t open @ getglobal(entry)()(val) */
+/* attr rb_num_t open @ getglobal(gid)()(val) */
 rb_num_t
-attr_open_getglobal(MAYBE_UNUSED(GENTRY entry))
+attr_open_getglobal(MAYBE_UNUSED(ID gid))
 {
     return 1;
 }
 
-/* attr rb_num_t popn @ getglobal(entry)()(val) */
+/* attr rb_num_t popn @ getglobal(gid)()(val) */
 rb_num_t
-attr_popn_getglobal(MAYBE_UNUSED(GENTRY entry))
+attr_popn_getglobal(MAYBE_UNUSED(ID gid))
 {
     return 0;
 }
 
-/* attr rb_num_t retn @ getglobal(entry)()(val) */
+/* attr rb_num_t retn @ getglobal(gid)()(val) */
 rb_num_t
-attr_retn_getglobal(MAYBE_UNUSED(GENTRY entry))
+attr_retn_getglobal(MAYBE_UNUSED(ID gid))
 {
     return 1;
 }
 
-/* attr rb_snum_t sp_inc @ getglobal(entry)()(val) */
+/* attr rb_snum_t sp_inc @ getglobal(gid)()(val) */
 rb_snum_t
-attr_sp_inc_getglobal(MAYBE_UNUSED(GENTRY entry))
+attr_sp_inc_getglobal(MAYBE_UNUSED(ID gid))
 {
     return 1;
 }
 
-/* attr rb_num_t width @ getglobal(entry)()(val) */
+/* attr rb_num_t width @ getglobal(gid)()(val) */
 rb_num_t
-attr_width_getglobal(MAYBE_UNUSED(GENTRY entry))
+attr_width_getglobal(MAYBE_UNUSED(ID gid))
 {
     return 2;
 }
 
-/* attr enum ruby_vminsn_type bin @ setglobal(entry)(val)() */
+/* attr enum ruby_vminsn_type bin @ setglobal(gid)(val)() */
 enum ruby_vminsn_type
-attr_bin_setglobal(MAYBE_UNUSED(GENTRY entry))
+attr_bin_setglobal(MAYBE_UNUSED(ID gid))
 {
     return BIN(setglobal);
 }
 
-/* attr bool handles_sp @ setglobal(entry)(val)() */
+/* attr bool handles_sp @ setglobal(gid)(val)() */
 bool
-attr_handles_sp_setglobal(MAYBE_UNUSED(GENTRY entry))
+attr_handles_sp_setglobal(MAYBE_UNUSED(ID gid))
 {
     return false;
 }
 
-/* attr bool leaf @ setglobal(entry)(val)() */
+/* attr bool leaf @ setglobal(gid)(val)() */
 bool
-attr_leaf_setglobal(MAYBE_UNUSED(GENTRY entry))
+attr_leaf_setglobal(MAYBE_UNUSED(ID gid))
 {
     return
-#line 306 "insns.def"
-leafness_of_setglobal(entry);
-#line 2687 "insns_info.inc"
+#line 305 "insns.def"
+false;
+#line 2609 "insns_info.inc"
 }
 
-/* attr const char* name @ setglobal(entry)(val)() */
+/* attr const char* name @ setglobal(gid)(val)() */
 const char*
-attr_name_setglobal(MAYBE_UNUSED(GENTRY entry))
+attr_name_setglobal(MAYBE_UNUSED(ID gid))
 {
     return insn_name(BIN(setglobal));
 }
 
-/* attr rb_num_t open @ setglobal(entry)(val)() */
+/* attr rb_num_t open @ setglobal(gid)(val)() */
 rb_num_t
-attr_open_setglobal(MAYBE_UNUSED(GENTRY entry))
+attr_open_setglobal(MAYBE_UNUSED(ID gid))
 {
     return 1;
 }
 
-/* attr rb_num_t popn @ setglobal(entry)(val)() */
+/* attr rb_num_t popn @ setglobal(gid)(val)() */
 rb_num_t
-attr_popn_setglobal(MAYBE_UNUSED(GENTRY entry))
+attr_popn_setglobal(MAYBE_UNUSED(ID gid))
 {
     return 1;
 }
 
-/* attr rb_num_t retn @ setglobal(entry)(val)() */
+/* attr rb_num_t retn @ setglobal(gid)(val)() */
 rb_num_t
-attr_retn_setglobal(MAYBE_UNUSED(GENTRY entry))
+attr_retn_setglobal(MAYBE_UNUSED(ID gid))
 {
     return 0;
 }
 
-/* attr rb_snum_t sp_inc @ setglobal(entry)(val)() */
+/* attr rb_snum_t sp_inc @ setglobal(gid)(val)() */
 rb_snum_t
-attr_sp_inc_setglobal(MAYBE_UNUSED(GENTRY entry))
+attr_sp_inc_setglobal(MAYBE_UNUSED(ID gid))
 {
     return -1;
 }
 
-/* attr rb_num_t width @ setglobal(entry)(val)() */
+/* attr rb_num_t width @ setglobal(gid)(val)() */
 rb_num_t
-attr_width_setglobal(MAYBE_UNUSED(GENTRY entry))
+attr_width_setglobal(MAYBE_UNUSED(ID gid))
 {
     return 2;
 }
@@ -3062,9 +2984,9 @@ bool
 attr_leaf_concatstrings(MAYBE_UNUSED(rb_num_t num))
 {
     return
-#line 379 "insns.def"
+#line 377 "insns.def"
 false;
-#line 3068 "insns_info.inc"
+#line 2990 "insns_info.inc"
 }
 
 /* attr const char* name @ concatstrings(num)(...)(val) */
@@ -3100,9 +3022,9 @@ rb_snum_t
 attr_sp_inc_concatstrings(MAYBE_UNUSED(rb_num_t num))
 {
     return
-#line 380 "insns.def"
+#line 378 "insns.def"
 1 - (rb_snum_t)num;
-#line 3106 "insns_info.inc"
+#line 3028 "insns_info.inc"
 }
 
 /* attr rb_num_t width @ concatstrings(num)(...)(val) */
@@ -3175,69 +3097,6 @@ attr_width_tostring(void)
     return 1;
 }
 
-/* attr enum ruby_vminsn_type bin @ freezestring(debug_info)(str)(str) */
-enum ruby_vminsn_type
-attr_bin_freezestring(MAYBE_UNUSED(VALUE debug_info))
-{
-    return BIN(freezestring);
-}
-
-/* attr bool handles_sp @ freezestring(debug_info)(str)(str) */
-bool
-attr_handles_sp_freezestring(MAYBE_UNUSED(VALUE debug_info))
-{
-    return false;
-}
-
-/* attr bool leaf @ freezestring(debug_info)(str)(str) */
-bool
-attr_leaf_freezestring(MAYBE_UNUSED(VALUE debug_info))
-{
-    return true;
-}
-
-/* attr const char* name @ freezestring(debug_info)(str)(str) */
-const char*
-attr_name_freezestring(MAYBE_UNUSED(VALUE debug_info))
-{
-    return insn_name(BIN(freezestring));
-}
-
-/* attr rb_num_t open @ freezestring(debug_info)(str)(str) */
-rb_num_t
-attr_open_freezestring(MAYBE_UNUSED(VALUE debug_info))
-{
-    return 1;
-}
-
-/* attr rb_num_t popn @ freezestring(debug_info)(str)(str) */
-rb_num_t
-attr_popn_freezestring(MAYBE_UNUSED(VALUE debug_info))
-{
-    return 1;
-}
-
-/* attr rb_num_t retn @ freezestring(debug_info)(str)(str) */
-rb_num_t
-attr_retn_freezestring(MAYBE_UNUSED(VALUE debug_info))
-{
-    return 1;
-}
-
-/* attr rb_snum_t sp_inc @ freezestring(debug_info)(str)(str) */
-rb_snum_t
-attr_sp_inc_freezestring(MAYBE_UNUSED(VALUE debug_info))
-{
-    return 0;
-}
-
-/* attr rb_num_t width @ freezestring(debug_info)(str)(str) */
-rb_num_t
-attr_width_freezestring(MAYBE_UNUSED(VALUE debug_info))
-{
-    return 2;
-}
-
 /* attr enum ruby_vminsn_type bin @ toregexp(opt, cnt)(...)(val) */
 enum ruby_vminsn_type
 attr_bin_toregexp(
@@ -3266,9 +3125,9 @@ attr_leaf_toregexp(
 )
 {
     return
-#line 415 "insns.def"
+#line 403 "insns.def"
 false;
-#line 3272 "insns_info.inc"
+#line 3131 "insns_info.inc"
 }
 
 /* attr const char* name @ toregexp(opt, cnt)(...)(val) */
@@ -3319,9 +3178,9 @@ attr_sp_inc_toregexp(
 )
 {
     return
-#line 416 "insns.def"
+#line 404 "insns.def"
 1 - (rb_snum_t)cnt;
-#line 3325 "insns_info.inc"
+#line 3184 "insns_info.inc"
 }
 
 /* attr rb_num_t width @ toregexp(opt, cnt)(...)(val) */
@@ -3451,9 +3310,9 @@ rb_snum_t
 attr_sp_inc_newarray(MAYBE_UNUSED(rb_num_t num))
 {
     return
-#line 439 "insns.def"
+#line 427 "insns.def"
 1 - (rb_snum_t)num;
-#line 3457 "insns_info.inc"
+#line 3316 "insns_info.inc"
 }
 
 /* attr rb_num_t width @ newarray(num)(...)(val) */
@@ -3517,9 +3376,9 @@ rb_snum_t
 attr_sp_inc_newarraykwsplat(MAYBE_UNUSED(rb_num_t num))
 {
     return
-#line 454 "insns.def"
+#line 442 "insns.def"
 1 - (rb_snum_t)num;
-#line 3523 "insns_info.inc"
+#line 3382 "insns_info.inc"
 }
 
 /* attr rb_num_t width @ newarraykwsplat(num)(...)(val) */
@@ -3683,9 +3542,9 @@ attr_leaf_expandarray(
 )
 {
     return
-#line 500 "insns.def"
+#line 488 "insns.def"
 false;
-#line 3689 "insns_info.inc"
+#line 3548 "insns_info.inc"
 }
 
 /* attr const char* name @ expandarray(num, flag)(..., ary)(...) */
@@ -3736,9 +3595,9 @@ attr_sp_inc_expandarray(
 )
 {
     return
-#line 501 "insns.def"
+#line 489 "insns.def"
 (rb_snum_t)num - 1 + (flag & 1 ? 1 : 0);
-#line 3742 "insns_info.inc"
+#line 3601 "insns_info.inc"
 }
 
 /* attr rb_num_t width @ expandarray(num, flag)(..., ary)(...) */
@@ -3770,9 +3629,9 @@ bool
 attr_leaf_concatarray(void)
 {
     return
-#line 512 "insns.def"
+#line 500 "insns.def"
 false;
-#line 3776 "insns_info.inc"
+#line 3635 "insns_info.inc"
 }
 
 /* attr const char* name @ concatarray()(ary1, ary2)(ary) */
@@ -3836,9 +3695,9 @@ bool
 attr_leaf_splatarray(MAYBE_UNUSED(VALUE flag))
 {
     return
-#line 523 "insns.def"
+#line 511 "insns.def"
 false;
-#line 3842 "insns_info.inc"
+#line 3701 "insns_info.inc"
 }
 
 /* attr const char* name @ splatarray(flag)(ary)(obj) */
@@ -3902,9 +3761,9 @@ bool
 attr_leaf_newhash(MAYBE_UNUSED(rb_num_t num))
 {
     return
-#line 534 "insns.def"
+#line 522 "insns.def"
 false;
-#line 3908 "insns_info.inc"
+#line 3767 "insns_info.inc"
 }
 
 /* attr const char* name @ newhash(num)(...)(val) */
@@ -3940,9 +3799,9 @@ rb_snum_t
 attr_sp_inc_newhash(MAYBE_UNUSED(rb_num_t num))
 {
     return
-#line 535 "insns.def"
+#line 523 "insns.def"
 1 - (rb_snum_t)num;
-#line 3946 "insns_info.inc"
+#line 3805 "insns_info.inc"
 }
 
 /* attr rb_num_t width @ newhash(num)(...)(val) */
@@ -3971,9 +3830,9 @@ bool
 attr_leaf_newrange(MAYBE_UNUSED(rb_num_t flag))
 {
     return
-#line 553 "insns.def"
+#line 541 "insns.def"
 false;
-#line 3977 "insns_info.inc"
+#line 3836 "insns_info.inc"
 }
 
 /* attr const char* name @ newrange(flag)(low, high)(val) */
@@ -4198,9 +4057,9 @@ rb_snum_t
 attr_sp_inc_dupn(MAYBE_UNUSED(rb_num_t n))
 {
     return
-#line 589 "insns.def"
+#line 577 "insns.def"
 n;
-#line 4204 "insns_info.inc"
+#line 4063 "insns_info.inc"
 }
 
 /* attr rb_num_t width @ dupn(n)(...)(...) */
@@ -4327,9 +4186,9 @@ rb_snum_t
 attr_sp_inc_reverse(MAYBE_UNUSED(rb_num_t n))
 {
     return
-#line 613 "insns.def"
+#line 601 "insns.def"
 0;
-#line 4333 "insns_info.inc"
+#line 4192 "insns_info.inc"
 }
 
 /* attr rb_num_t width @ reverse(n)(...)(...) */
@@ -4393,9 +4252,9 @@ rb_snum_t
 attr_sp_inc_topn(MAYBE_UNUSED(rb_num_t n))
 {
     return
-#line 643 "insns.def"
+#line 631 "insns.def"
 1;
-#line 4399 "insns_info.inc"
+#line 4258 "insns_info.inc"
 }
 
 /* attr rb_num_t width @ topn(n)(...)(val) */
@@ -4459,9 +4318,9 @@ rb_snum_t
 attr_sp_inc_setn(MAYBE_UNUSED(rb_num_t n))
 {
     return
-#line 654 "insns.def"
+#line 642 "insns.def"
 0;
-#line 4465 "insns_info.inc"
+#line 4324 "insns_info.inc"
 }
 
 /* attr rb_num_t width @ setn(n)(..., val)(val) */
@@ -4525,9 +4384,9 @@ rb_snum_t
 attr_sp_inc_adjuststack(MAYBE_UNUSED(rb_num_t n))
 {
     return
-#line 665 "insns.def"
+#line 653 "insns.def"
 -(rb_snum_t)n;
-#line 4531 "insns_info.inc"
+#line 4390 "insns_info.inc"
 }
 
 /* attr rb_num_t width @ adjuststack(n)(...)(...) */
@@ -4568,9 +4427,9 @@ attr_leaf_defined(
 )
 {
     return
-#line 680 "insns.def"
+#line 668 "insns.def"
 leafness_of_defined(op_type);
-#line 4574 "insns_info.inc"
+#line 4433 "insns_info.inc"
 }
 
 /* attr const char* name @ defined(op_type, obj, needstr)(v)(val) */
@@ -4658,9 +4517,9 @@ bool
 attr_leaf_checkmatch(MAYBE_UNUSED(rb_num_t flag))
 {
     return
-#line 697 "insns.def"
+#line 685 "insns.def"
 leafness_of_checkmatch(flag);
-#line 4664 "insns_info.inc"
+#line 4523 "insns_info.inc"
 }
 
 /* attr const char* name @ checkmatch(flag)(target, pattern)(result) */
@@ -5155,9 +5014,9 @@ attr_comptime_sp_inc_send(
 )
 {
     return
-#line 779 "insns.def"
+#line 767 "insns.def"
 sp_inc_of_sendish(ci);
-#line 5161 "insns_info.inc"
+#line 5020 "insns_info.inc"
 }
 
 /* attr bool handles_sp @ send(cd, blockiseq)(...)(val) */
@@ -5228,9 +5087,9 @@ attr_sp_inc_send(
 )
 {
     return
-#line 778 "insns.def"
-sp_inc_of_sendish(&cd->ci);
-#line 5234 "insns_info.inc"
+#line 766 "insns.def"
+sp_inc_of_sendish(cd->ci);
+#line 5093 "insns_info.inc"
 }
 
 /* attr rb_num_t width @ send(cd, blockiseq)(...)(val) */
@@ -5255,9 +5114,9 @@ rb_snum_t
 attr_comptime_sp_inc_opt_send_without_block(MAYBE_UNUSED(CALL_INFO ci))
 {
     return
-#line 798 "insns.def"
+#line 786 "insns.def"
 sp_inc_of_sendish(ci);
-#line 5261 "insns_info.inc"
+#line 5120 "insns_info.inc"
 }
 
 /* attr bool handles_sp @ opt_send_without_block(cd)(...)(val) */
@@ -5265,9 +5124,9 @@ bool
 attr_handles_sp_opt_send_without_block(MAYBE_UNUSED(CALL_DATA cd))
 {
     return
-#line 796 "insns.def"
+#line 784 "insns.def"
 true;
-#line 5271 "insns_info.inc"
+#line 5130 "insns_info.inc"
 }
 
 /* attr bool leaf @ opt_send_without_block(cd)(...)(val) */
@@ -5310,9 +5169,9 @@ rb_snum_t
 attr_sp_inc_opt_send_without_block(MAYBE_UNUSED(CALL_DATA cd))
 {
     return
-#line 797 "insns.def"
-sp_inc_of_sendish(&cd->ci);
-#line 5316 "insns_info.inc"
+#line 785 "insns.def"
+sp_inc_of_sendish(cd->ci);
+#line 5175 "insns_info.inc"
 }
 
 /* attr rb_num_t width @ opt_send_without_block(cd)(...)(val) */
@@ -5584,9 +5443,9 @@ bool
 attr_leaf_opt_newarray_max(MAYBE_UNUSED(rb_num_t num))
 {
     return
-#line 860 "insns.def"
+#line 848 "insns.def"
 false;
-#line 5590 "insns_info.inc"
+#line 5449 "insns_info.inc"
 }
 
 /* attr const char* name @ opt_newarray_max(num)(...)(val) */
@@ -5622,9 +5481,9 @@ rb_snum_t
 attr_sp_inc_opt_newarray_max(MAYBE_UNUSED(rb_num_t num))
 {
     return
-#line 861 "insns.def"
+#line 849 "insns.def"
 1 - (rb_snum_t)num;
-#line 5628 "insns_info.inc"
+#line 5487 "insns_info.inc"
 }
 
 /* attr rb_num_t width @ opt_newarray_max(num)(...)(val) */
@@ -5653,9 +5512,9 @@ bool
 attr_leaf_opt_newarray_min(MAYBE_UNUSED(rb_num_t num))
 {
     return
-#line 872 "insns.def"
+#line 860 "insns.def"
 false;
-#line 5659 "insns_info.inc"
+#line 5518 "insns_info.inc"
 }
 
 /* attr const char* name @ opt_newarray_min(num)(...)(val) */
@@ -5691,9 +5550,9 @@ rb_snum_t
 attr_sp_inc_opt_newarray_min(MAYBE_UNUSED(rb_num_t num))
 {
     return
-#line 873 "insns.def"
+#line 861 "insns.def"
 1 - (rb_snum_t)num;
-#line 5697 "insns_info.inc"
+#line 5556 "insns_info.inc"
 }
 
 /* attr rb_num_t width @ opt_newarray_min(num)(...)(val) */
@@ -5721,9 +5580,9 @@ attr_comptime_sp_inc_invokesuper(
 )
 {
     return
-#line 885 "insns.def"
+#line 873 "insns.def"
 sp_inc_of_sendish(ci);
-#line 5727 "insns_info.inc"
+#line 5586 "insns_info.inc"
 }
 
 /* attr bool handles_sp @ invokesuper(cd, blockiseq)(...)(val) */
@@ -5794,9 +5653,9 @@ attr_sp_inc_invokesuper(
 )
 {
     return
-#line 884 "insns.def"
-sp_inc_of_sendish(&cd->ci);
-#line 5800 "insns_info.inc"
+#line 872 "insns.def"
+sp_inc_of_sendish(cd->ci);
+#line 5659 "insns_info.inc"
 }
 
 /* attr rb_num_t width @ invokesuper(cd, blockiseq)(...)(val) */
@@ -5821,9 +5680,9 @@ rb_snum_t
 attr_comptime_sp_inc_invokeblock(MAYBE_UNUSED(CALL_INFO ci))
 {
     return
-#line 904 "insns.def"
+#line 892 "insns.def"
 sp_inc_of_invokeblock(ci);
-#line 5827 "insns_info.inc"
+#line 5686 "insns_info.inc"
 }
 
 /* attr bool handles_sp @ invokeblock(cd)(...)(val) */
@@ -5831,9 +5690,9 @@ bool
 attr_handles_sp_invokeblock(MAYBE_UNUSED(CALL_DATA cd))
 {
     return
-#line 902 "insns.def"
+#line 890 "insns.def"
 true;
-#line 5837 "insns_info.inc"
+#line 5696 "insns_info.inc"
 }
 
 /* attr bool leaf @ invokeblock(cd)(...)(val) */
@@ -5876,9 +5735,9 @@ rb_snum_t
 attr_sp_inc_invokeblock(MAYBE_UNUSED(CALL_DATA cd))
 {
     return
-#line 903 "insns.def"
-sp_inc_of_invokeblock(&cd->ci);
-#line 5882 "insns_info.inc"
+#line 891 "insns.def"
+sp_inc_of_invokeblock(cd->ci);
+#line 5741 "insns_info.inc"
 }
 
 /* attr rb_num_t width @ invokeblock(cd)(...)(val) */
@@ -5900,9 +5759,9 @@ bool
 attr_handles_sp_leave(void)
 {
     return
-#line 929 "insns.def"
+#line 913 "insns.def"
 true;
-#line 5906 "insns_info.inc"
+#line 5765 "insns_info.inc"
 }
 
 /* attr bool leaf @ leave()(val)(val) */
@@ -5910,9 +5769,9 @@ bool
 attr_leaf_leave(void)
 {
     return
-#line 928 "insns.def"
+#line 912 "insns.def"
 false;
-#line 5916 "insns_info.inc"
+#line 5775 "insns_info.inc"
 }
 
 /* attr const char* name @ leave()(val)(val) */
@@ -5976,9 +5835,9 @@ bool
 attr_leaf_throw(MAYBE_UNUSED(rb_num_t throw_state))
 {
     return
-#line 964 "insns.def"
+#line 946 "insns.def"
 false;
-#line 5982 "insns_info.inc"
+#line 5841 "insns_info.inc"
 }
 
 /* attr const char* name @ throw(throw_state)(throwobj)(val) */
@@ -6042,9 +5901,9 @@ bool
 attr_leaf_jump(MAYBE_UNUSED(OFFSET dst))
 {
     return
-#line 983 "insns.def"
-false;
-#line 6048 "insns_info.inc"
+#line 964 "insns.def"
+leafness_of_check_ints;
+#line 5907 "insns_info.inc"
 }
 
 /* attr const char* name @ jump(dst)()() */
@@ -6108,9 +5967,9 @@ bool
 attr_leaf_branchif(MAYBE_UNUSED(OFFSET dst))
 {
     return
-#line 996 "insns.def"
-false;
-#line 6114 "insns_info.inc"
+#line 977 "insns.def"
+leafness_of_check_ints;
+#line 5973 "insns_info.inc"
 }
 
 /* attr const char* name @ branchif(dst)(val)() */
@@ -6174,9 +6033,9 @@ bool
 attr_leaf_branchunless(MAYBE_UNUSED(OFFSET dst))
 {
     return
-#line 1011 "insns.def"
-false;
-#line 6180 "insns_info.inc"
+#line 992 "insns.def"
+leafness_of_check_ints;
+#line 6039 "insns_info.inc"
 }
 
 /* attr const char* name @ branchunless(dst)(val)() */
@@ -6240,9 +6099,9 @@ bool
 attr_leaf_branchnil(MAYBE_UNUSED(OFFSET dst))
 {
     return
-#line 1026 "insns.def"
-false;
-#line 6246 "insns_info.inc"
+#line 1007 "insns.def"
+leafness_of_check_ints;
+#line 6105 "insns_info.inc"
 }
 
 /* attr const char* name @ branchnil(dst)(val)() */
@@ -6608,9 +6467,9 @@ attr_sp_inc_opt_case_dispatch(
 )
 {
     return
-#line 1080 "insns.def"
+#line 1061 "insns.def"
 -1;
-#line 6614 "insns_info.inc"
+#line 6473 "insns_info.inc"
 }
 
 /* attr rb_num_t width @ opt_case_dispatch(hash, else_offset)(..., key)() */
@@ -6831,9 +6690,9 @@ bool
 attr_leaf_opt_div(MAYBE_UNUSED(CALL_DATA cd))
 {
     return
-#line 1141 "insns.def"
+#line 1122 "insns.def"
 false;
-#line 6837 "insns_info.inc"
+#line 6696 "insns_info.inc"
 }
 
 /* attr const char* name @ opt_div(cd)(recv, obj)(val) */
@@ -6897,9 +6756,9 @@ bool
 attr_leaf_opt_mod(MAYBE_UNUSED(CALL_DATA cd))
 {
     return
-#line 1157 "insns.def"
+#line 1138 "insns.def"
 false;
-#line 6903 "insns_info.inc"
+#line 6762 "insns_info.inc"
 }
 
 /* attr const char* name @ opt_mod(cd)(recv, obj)(val) */
@@ -7368,9 +7227,9 @@ bool
 attr_leaf_opt_ltlt(MAYBE_UNUSED(CALL_DATA cd))
 {
     return
-#line 1259 "insns.def"
+#line 1240 "insns.def"
 false;
-#line 7374 "insns_info.inc"
+#line 7233 "insns_info.inc"
 }
 
 /* attr const char* name @ opt_ltlt(cd)(recv, obj)(val) */
@@ -7560,9 +7419,9 @@ bool
 attr_leaf_opt_aref(MAYBE_UNUSED(CALL_DATA cd))
 {
     return
-#line 1306 "insns.def"
+#line 1287 "insns.def"
 false;
-#line 7566 "insns_info.inc"
+#line 7425 "insns_info.inc"
 }
 
 /* attr const char* name @ opt_aref(cd)(recv, obj)(val) */
@@ -7626,9 +7485,9 @@ bool
 attr_leaf_opt_aset(MAYBE_UNUSED(CALL_DATA cd))
 {
     return
-#line 1323 "insns.def"
+#line 1304 "insns.def"
 false;
-#line 7632 "insns_info.inc"
+#line 7491 "insns_info.inc"
 }
 
 /* attr const char* name @ opt_aset(cd)(recv, obj, set)(val) */
@@ -7701,9 +7560,9 @@ attr_leaf_opt_aset_with(
 )
 {
     return
-#line 1339 "insns.def"
+#line 1320 "insns.def"
 false;
-#line 7707 "insns_info.inc"
+#line 7566 "insns_info.inc"
 }
 
 /* attr const char* name @ opt_aset_with(key, cd)(recv, val)(val) */
@@ -7794,9 +7653,9 @@ attr_leaf_opt_aref_with(
 )
 {
     return
-#line 1362 "insns.def"
+#line 1343 "insns.def"
 false;
-#line 7800 "insns_info.inc"
+#line 7659 "insns_info.inc"
 }
 
 /* attr const char* name @ opt_aref_with(key, cd)(recv)(val) */
@@ -8193,9 +8052,9 @@ bool
 attr_leaf_opt_regexpmatch2(MAYBE_UNUSED(CALL_DATA cd))
 {
     return
-#line 1450 "insns.def"
+#line 1431 "insns.def"
 false;
-#line 8199 "insns_info.inc"
+#line 8058 "insns_info.inc"
 }
 
 /* attr const char* name @ opt_regexpmatch2(cd)(obj2, obj1)(val) */
@@ -8240,145 +8099,76 @@ attr_width_opt_regexpmatch2(MAYBE_UNUSED(CALL_DATA cd))
     return 2;
 }
 
-/* attr enum ruby_vminsn_type bin @ opt_call_c_function(funcptr)()() */
-enum ruby_vminsn_type
-attr_bin_opt_call_c_function(MAYBE_UNUSED(rb_insn_func_t funcptr))
-{
-    return BIN(opt_call_c_function);
-}
-
-/* attr bool handles_sp @ opt_call_c_function(funcptr)()() */
-bool
-attr_handles_sp_opt_call_c_function(MAYBE_UNUSED(rb_insn_func_t funcptr))
-{
-    return
-#line 1466 "insns.def"
-true;
-#line 8258 "insns_info.inc"
-}
-
-/* attr bool leaf @ opt_call_c_function(funcptr)()() */
-bool
-attr_leaf_opt_call_c_function(MAYBE_UNUSED(rb_insn_func_t funcptr))
-{
-    return
-#line 1465 "insns.def"
-false;
-#line 8268 "insns_info.inc"
-}
-
-/* attr const char* name @ opt_call_c_function(funcptr)()() */
-const char*
-attr_name_opt_call_c_function(MAYBE_UNUSED(rb_insn_func_t funcptr))
-{
-    return insn_name(BIN(opt_call_c_function));
-}
-
-/* attr rb_num_t open @ opt_call_c_function(funcptr)()() */
-rb_num_t
-attr_open_opt_call_c_function(MAYBE_UNUSED(rb_insn_func_t funcptr))
-{
-    return 1;
-}
-
-/* attr rb_num_t popn @ opt_call_c_function(funcptr)()() */
-rb_num_t
-attr_popn_opt_call_c_function(MAYBE_UNUSED(rb_insn_func_t funcptr))
-{
-    return 0;
-}
-
-/* attr rb_num_t retn @ opt_call_c_function(funcptr)()() */
-rb_num_t
-attr_retn_opt_call_c_function(MAYBE_UNUSED(rb_insn_func_t funcptr))
-{
-    return 0;
-}
-
-/* attr rb_snum_t sp_inc @ opt_call_c_function(funcptr)()() */
-rb_snum_t
-attr_sp_inc_opt_call_c_function(MAYBE_UNUSED(rb_insn_func_t funcptr))
-{
-    return 0;
-}
-
-/* attr rb_num_t width @ opt_call_c_function(funcptr)()() */
-rb_num_t
-attr_width_opt_call_c_function(MAYBE_UNUSED(rb_insn_func_t funcptr))
-{
-    return 2;
-}
-
-/* attr enum ruby_vminsn_type bin @ invokebuiltin(bf)(...)(ret) */
+/* attr enum ruby_vminsn_type bin @ invokebuiltin(bf)(...)(val) */
 enum ruby_vminsn_type
 attr_bin_invokebuiltin(MAYBE_UNUSED(RB_BUILTIN bf))
 {
     return BIN(invokebuiltin);
 }
 
-/* attr bool handles_sp @ invokebuiltin(bf)(...)(ret) */
+/* attr bool handles_sp @ invokebuiltin(bf)(...)(val) */
 bool
 attr_handles_sp_invokebuiltin(MAYBE_UNUSED(RB_BUILTIN bf))
 {
     return false;
 }
 
-/* attr bool leaf @ invokebuiltin(bf)(...)(ret) */
+/* attr bool leaf @ invokebuiltin(bf)(...)(val) */
 bool
 attr_leaf_invokebuiltin(MAYBE_UNUSED(RB_BUILTIN bf))
 {
     return
-#line 1486 "insns.def"
+#line 1467 "insns.def"
 false;
-#line 8334 "insns_info.inc"
+#line 8124 "insns_info.inc"
 }
 
-/* attr const char* name @ invokebuiltin(bf)(...)(ret) */
+/* attr const char* name @ invokebuiltin(bf)(...)(val) */
 const char*
 attr_name_invokebuiltin(MAYBE_UNUSED(RB_BUILTIN bf))
 {
     return insn_name(BIN(invokebuiltin));
 }
 
-/* attr rb_num_t open @ invokebuiltin(bf)(...)(ret) */
+/* attr rb_num_t open @ invokebuiltin(bf)(...)(val) */
 rb_num_t
 attr_open_invokebuiltin(MAYBE_UNUSED(RB_BUILTIN bf))
 {
     return 1;
 }
 
-/* attr rb_num_t popn @ invokebuiltin(bf)(...)(ret) */
+/* attr rb_num_t popn @ invokebuiltin(bf)(...)(val) */
 rb_num_t
 attr_popn_invokebuiltin(MAYBE_UNUSED(RB_BUILTIN bf))
 {
     return 0;
 }
 
-/* attr rb_num_t retn @ invokebuiltin(bf)(...)(ret) */
+/* attr rb_num_t retn @ invokebuiltin(bf)(...)(val) */
 rb_num_t
 attr_retn_invokebuiltin(MAYBE_UNUSED(RB_BUILTIN bf))
 {
     return 1;
 }
 
-/* attr rb_snum_t sp_inc @ invokebuiltin(bf)(...)(ret) */
+/* attr rb_snum_t sp_inc @ invokebuiltin(bf)(...)(val) */
 rb_snum_t
 attr_sp_inc_invokebuiltin(MAYBE_UNUSED(RB_BUILTIN bf))
 {
     return
-#line 1487 "insns.def"
+#line 1468 "insns.def"
 1 - bf->argc;
-#line 8372 "insns_info.inc"
+#line 8162 "insns_info.inc"
 }
 
-/* attr rb_num_t width @ invokebuiltin(bf)(...)(ret) */
+/* attr rb_num_t width @ invokebuiltin(bf)(...)(val) */
 rb_num_t
 attr_width_invokebuiltin(MAYBE_UNUSED(RB_BUILTIN bf))
 {
     return 2;
 }
 
-/* attr enum ruby_vminsn_type bin @ opt_invokebuiltin_delegate(bf, index)()(ret) */
+/* attr enum ruby_vminsn_type bin @ opt_invokebuiltin_delegate(bf, index)()(val) */
 enum ruby_vminsn_type
 attr_bin_opt_invokebuiltin_delegate(
     MAYBE_UNUSED(RB_BUILTIN bf),
@@ -8388,7 +8178,7 @@ attr_bin_opt_invokebuiltin_delegate(
     return BIN(opt_invokebuiltin_delegate);
 }
 
-/* attr bool handles_sp @ opt_invokebuiltin_delegate(bf, index)()(ret) */
+/* attr bool handles_sp @ opt_invokebuiltin_delegate(bf, index)()(val) */
 bool
 attr_handles_sp_opt_invokebuiltin_delegate(
     MAYBE_UNUSED(RB_BUILTIN bf),
@@ -8398,7 +8188,7 @@ attr_handles_sp_opt_invokebuiltin_delegate(
     return false;
 }
 
-/* attr bool leaf @ opt_invokebuiltin_delegate(bf, index)()(ret) */
+/* attr bool leaf @ opt_invokebuiltin_delegate(bf, index)()(val) */
 bool
 attr_leaf_opt_invokebuiltin_delegate(
     MAYBE_UNUSED(RB_BUILTIN bf),
@@ -8406,12 +8196,12 @@ attr_leaf_opt_invokebuiltin_delegate(
 )
 {
     return
-#line 1498 "insns.def"
+#line 1479 "insns.def"
 false;
-#line 8412 "insns_info.inc"
+#line 8202 "insns_info.inc"
 }
 
-/* attr const char* name @ opt_invokebuiltin_delegate(bf, index)()(ret) */
+/* attr const char* name @ opt_invokebuiltin_delegate(bf, index)()(val) */
 const char*
 attr_name_opt_invokebuiltin_delegate(
     MAYBE_UNUSED(RB_BUILTIN bf),
@@ -8421,7 +8211,7 @@ attr_name_opt_invokebuiltin_delegate(
     return insn_name(BIN(opt_invokebuiltin_delegate));
 }
 
-/* attr rb_num_t open @ opt_invokebuiltin_delegate(bf, index)()(ret) */
+/* attr rb_num_t open @ opt_invokebuiltin_delegate(bf, index)()(val) */
 rb_num_t
 attr_open_opt_invokebuiltin_delegate(
     MAYBE_UNUSED(RB_BUILTIN bf),
@@ -8431,7 +8221,7 @@ attr_open_opt_invokebuiltin_delegate(
     return 2;
 }
 
-/* attr rb_num_t popn @ opt_invokebuiltin_delegate(bf, index)()(ret) */
+/* attr rb_num_t popn @ opt_invokebuiltin_delegate(bf, index)()(val) */
 rb_num_t
 attr_popn_opt_invokebuiltin_delegate(
     MAYBE_UNUSED(RB_BUILTIN bf),
@@ -8441,7 +8231,7 @@ attr_popn_opt_invokebuiltin_delegate(
     return 0;
 }
 
-/* attr rb_num_t retn @ opt_invokebuiltin_delegate(bf, index)()(ret) */
+/* attr rb_num_t retn @ opt_invokebuiltin_delegate(bf, index)()(val) */
 rb_num_t
 attr_retn_opt_invokebuiltin_delegate(
     MAYBE_UNUSED(RB_BUILTIN bf),
@@ -8451,7 +8241,7 @@ attr_retn_opt_invokebuiltin_delegate(
     return 1;
 }
 
-/* attr rb_snum_t sp_inc @ opt_invokebuiltin_delegate(bf, index)()(ret) */
+/* attr rb_snum_t sp_inc @ opt_invokebuiltin_delegate(bf, index)()(val) */
 rb_snum_t
 attr_sp_inc_opt_invokebuiltin_delegate(
     MAYBE_UNUSED(RB_BUILTIN bf),
@@ -8461,7 +8251,7 @@ attr_sp_inc_opt_invokebuiltin_delegate(
     return 1;
 }
 
-/* attr rb_num_t width @ opt_invokebuiltin_delegate(bf, index)()(ret) */
+/* attr rb_num_t width @ opt_invokebuiltin_delegate(bf, index)()(val) */
 rb_num_t
 attr_width_opt_invokebuiltin_delegate(
     MAYBE_UNUSED(RB_BUILTIN bf),
@@ -8499,9 +8289,9 @@ attr_leaf_opt_invokebuiltin_delegate_leave(
 )
 {
     return
-#line 1509 "insns.def"
+#line 1490 "insns.def"
 false;
-#line 8505 "insns_info.inc"
+#line 8295 "insns_info.inc"
 }
 
 /* attr const char* name @ opt_invokebuiltin_delegate_leave(bf, index)()(val) */
@@ -8951,17 +8741,17 @@ comptime_insn_stack_increase_dispatch(enum ruby_vminsn_type insn, const VALUE *o
     static const signed char t[] = {
            0,    1,   -1,    1,   -1,    1,    1,   -1,
            1,   -1,    1,   -1,   -1,   -2,    1,   -1,
-           1,    1,    1,    1,    1, -127,   -1,    0,
-        -127,    0, -127, -127,    1,    1, -127,   -1,
-           0, -127,   -1,   -1,    1, -127,    0, -127,
-        -127, -127, -127,    0,   -1,    1,    0,   -1,
-           0,   -1, -127, -127,    1,    0,    1, -127,
-        -127, -127, -127,    0,    0,    0,   -1,   -1,
-          -1,    1,    0,    1, -127,   -1,   -1,   -1,
+           1,    1,    1,    1,    1, -127,   -1, -127,
+           0, -127, -127,    1,    1, -127,   -1,    0,
+        -127,   -1,   -1,    1, -127,    0, -127, -127,
+        -127, -127,    0,   -1,    1,    0,   -1,    0,
+          -1, -127, -127,    1,    0,    1, -127, -127,
+        -127, -127,    0,    0,    0,   -1,   -1,   -1,
+           1,    0,    1, -127,   -1,   -1,   -1,   -1,
           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-          -1,   -1,   -1,   -1,   -2,   -1,    0,    0,
-           0,    0,    0,    0,   -1,    0, -127,    1,
-           1,    1,    1,   -1,   -1,    1,    1,    0,
+          -1,   -1,   -1,   -2,   -1,    0,    0,    0,
+           0,    0,    0,   -1, -127,    1,    1,    1,
+           1,   -1,   -1,    1,    1,    0,    0,    0,
            0,    0,    0,    0,    0,    0,    0,    0,
            0,    0,    0,    0,    0,    0,    0,    0,
            0,    0,    0,    0,    0,    0,    0,    0,
@@ -8974,7 +8764,7 @@ comptime_insn_stack_increase_dispatch(enum ruby_vminsn_type insn, const VALUE *o
            0,    0,    0,    0,    0,    0,    0,    0,
            0,    0,    0,    0,    0,    0,    0,    0,
            0,    0,    0,    0,    0,    0,    0,    0,
-           0,    0,    0,    0,    0,    0,
+           0,    0,
     };
     signed char c = t[insn];
 
@@ -9081,7 +8871,6 @@ insn_may_depend_on_sp_or_pc(int insn, const VALUE *opes)
       case BIN(opt_aset_with):
       case BIN(opt_aref_with):
       case BIN(opt_regexpmatch2):
-      case BIN(opt_call_c_function):
       case BIN(invokebuiltin):
       case BIN(opt_invokebuiltin_delegate):
       case BIN(opt_invokebuiltin_delegate_leave):
@@ -9108,7 +8897,6 @@ insn_may_depend_on_sp_or_pc(int insn, const VALUE *opes)
       case BIN(trace_putstring):
       case BIN(trace_concatstrings):
       case BIN(trace_tostring):
-      case BIN(trace_freezestring):
       case BIN(trace_toregexp):
       case BIN(trace_intern):
       case BIN(trace_newarray):
@@ -9178,7 +8966,6 @@ insn_may_depend_on_sp_or_pc(int insn, const VALUE *opes)
       case BIN(trace_opt_succ):
       case BIN(trace_opt_not):
       case BIN(trace_opt_regexpmatch2):
-      case BIN(trace_opt_call_c_function):
       case BIN(trace_invokebuiltin):
       case BIN(trace_opt_invokebuiltin_delegate):
       case BIN(trace_opt_invokebuiltin_delegate_leave):