Merge branch 'release-5.21.2' into blead

[perl5.git] / opcode.h

diff --git a/opcode.h b/opcode.h
index b91e7ad..fbc3fe1 100644 (file)
--- a/opcode.h
+++ b/opcode.h
@@ -280,6 +280,7 @@ EXTCONST char* const PL_op_name[] = {
        "aelemfast_lex",
        "aelem",
        "aslice",
+       "kvaslice",
        "aeach",
        "akeys",
        "avalues",
@@ -666,6 +667,7 @@ EXTCONST char* const PL_op_desc[] = {
        "constant lexical array element",
        "array element",
        "array slice",
+       "index/value array slice",
        "each on array",
        "keys on array",
        "values on array",
@@ -1066,6 +1068,7 @@ EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
        Perl_pp_aelemfast_lex,  /* implemented by Perl_pp_aelemfast */
        Perl_pp_aelem,
        Perl_pp_aslice,
+       Perl_pp_kvaslice,
        Perl_pp_aeach,
        Perl_pp_akeys,
        Perl_pp_avalues,        /* implemented by Perl_pp_akeys */
@@ -1354,7 +1357,7 @@ EXT Perl_check_t PL_check[] /* or perlvars.h */
        Perl_ck_null,           /* srefgen */
        Perl_ck_fun,            /* ref */
        Perl_ck_fun,            /* bless */
-       Perl_ck_open,           /* backtick */
+       Perl_ck_backtick,       /* backtick */
        Perl_ck_glob,           /* glob */
        Perl_ck_readline,       /* readline */
        Perl_ck_null,           /* rcatline */
@@ -1462,6 +1465,7 @@ EXT Perl_check_t PL_check[] /* or perlvars.h */
        Perl_ck_null,           /* aelemfast_lex */
        Perl_ck_null,           /* aelem */
        Perl_ck_null,           /* aslice */
+       Perl_ck_null,           /* kvaslice */
        Perl_ck_each,           /* aeach */
        Perl_ck_each,           /* akeys */
        Perl_ck_each,           /* avalues */
@@ -1510,7 +1514,7 @@ EXT Perl_check_t PL_check[] /* or perlvars.h */
        Perl_ck_null,           /* leavesublv */
        Perl_ck_fun,            /* caller */
        Perl_ck_fun,            /* warn */
-       Perl_ck_die,            /* die */
+       Perl_ck_fun,            /* die */
        Perl_ck_fun,            /* reset */
        Perl_ck_null,           /* lineseq */
        Perl_ck_null,           /* nextstate */
@@ -1529,7 +1533,7 @@ EXT Perl_check_t PL_check[] /* or perlvars.h */
        Perl_ck_null,           /* redo */
        Perl_ck_null,           /* dump */
        Perl_ck_null,           /* goto */
-       Perl_ck_exit,           /* exit */
+       Perl_ck_fun,            /* exit */
        Perl_ck_null,           /* method_named */
        Perl_ck_null,           /* entergiven */
        Perl_ck_null,           /* leavegiven */
@@ -1852,6 +1856,7 @@ EXTCONST U32 PL_opargs[] = {
        0x00013040,     /* aelemfast_lex */
        0x00013204,     /* aelem */
        0x00023401,     /* aslice */
+       0x00023401,     /* kvaslice */
        0x00003b00,     /* aeach */
        0x00003b08,     /* akeys */
        0x00003b08,     /* avalues */
@@ -1860,7 +1865,7 @@ EXTCONST U32 PL_opargs[] = {
        0x00004b08,     /* keys */
        0x00001b00,     /* delete */
        0x00001b04,     /* exists */
-       0x00000148,     /* rv2hv */
+       0x00000140,     /* rv2hv */
        0x00014204,     /* helem */
        0x00024401,     /* hslice */
        0x00024401,     /* kvhslice */