merge leavegiven op type into leaveloop

The leaveloop op type can already do the whole job, with leavegiven being
a near duplicate of it.  Replace all uses of leavegiven with leaveloop.

1 files changed, 1 insertions, 8 deletions

diff --git a/opcode.h b/opcode.h
index 08ce46fb35..37089fe3c2 100644
--- a/opcode.h
+++ b/opcode.h
@@ -364,7 +364,6 @@ EXTCONST char* const PL_op_name[] = {
 	"method_redir",
 	"method_redir_super",
 	"entergiven",
-	"leavegiven",
 	"enterwhen",
 	"leavewhen",
 	"continue",
@@ -768,7 +767,6 @@ EXTCONST char* const PL_op_desc[] = {
 	"redirect method with known name",
 	"redirect super method with known name",
 	"given()",
-	"leave given block",
 	"when()",
 	"leave when block",
 	"continue",
@@ -1184,7 +1182,6 @@ EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
 	Perl_pp_method_redir,
 	Perl_pp_method_redir_super,
 	Perl_pp_entergiven,
-	Perl_pp_leavegiven,
 	Perl_pp_enterwhen,
 	Perl_pp_leavewhen,
 	Perl_pp_continue,
@@ -1596,7 +1593,6 @@ EXT Perl_check_t PL_check[] /* or perlvars.h */
 	Perl_ck_null,		/* method_redir */
 	Perl_ck_null,		/* method_redir_super */
 	Perl_ck_null,		/* entergiven */
-	Perl_ck_null,		/* leavegiven */
 	Perl_ck_null,		/* enterwhen */
 	Perl_ck_null,		/* leavewhen */
 	Perl_ck_null,		/* continue */
@@ -2004,7 +2000,6 @@ EXTCONST U32 PL_opargs[] = {
 	0x00000e40,	/* method_redir */
 	0x00000e40,	/* method_redir_super */
 	0x00000940,	/* entergiven */
-	0x00000100,	/* leavegiven */
 	0x00000340,	/* enterwhen */
 	0x00000100,	/* leavewhen */
 	0x00000000,	/* continue */
@@ -2667,7 +2662,6 @@ EXTCONST I16  PL_op_private_bitdef_ix[] = {
        0, /* method_redir */
        0, /* method_redir_super */
       -1, /* entergiven */
-       0, /* leavegiven */
        0, /* enterwhen */
        0, /* leavewhen */
       -1, /* continue */
@@ -2863,7 +2857,7 @@ EXTCONST I16  PL_op_private_bitdef_ix[] = {
  */
 
 EXTCONST U16  PL_op_private_bitdefs[] = {
-    0x0003, /* scalar, prototype, refgen, srefgen, readline, regcmaybe, regcreset, regcomp, substcont, chop, schop, defined, undef, study, preinc, i_preinc, predec, i_predec, postinc, i_postinc, postdec, i_postdec, negate, i_negate, not, complement, ucfirst, lcfirst, uc, lc, quotemeta, aeach, avalues, each, pop, shift, grepstart, mapstart, mapwhile, range, and, or, dor, andassign, orassign, dorassign, argcheck, argdefelem, method, method_named, method_super, method_redir, method_redir_super, leavegiven, enterwhen, leavewhen, untie, tied, dbmclose, getsockname, getpeername, lstat, stat, readlink, readdir, telldir, rewinddir, closedir, localtime, alarm, require, dofile, entertry, ghbyname, gnbyname, gpbyname, shostent, snetent, sprotoent, sservent, gpwnam, gpwuid, ggrnam, ggrgid, lock, once, fc, anonconst */
+    0x0003, /* scalar, prototype, refgen, srefgen, readline, regcmaybe, regcreset, regcomp, substcont, chop, schop, defined, undef, study, preinc, i_preinc, predec, i_predec, postinc, i_postinc, postdec, i_postdec, negate, i_negate, not, complement, ucfirst, lcfirst, uc, lc, quotemeta, aeach, avalues, each, pop, shift, grepstart, mapstart, mapwhile, range, and, or, dor, andassign, orassign, dorassign, argcheck, argdefelem, method, method_named, method_super, method_redir, method_redir_super, enterwhen, leavewhen, untie, tied, dbmclose, getsockname, getpeername, lstat, stat, readlink, readdir, telldir, rewinddir, closedir, localtime, alarm, require, dofile, entertry, ghbyname, gnbyname, gpbyname, shostent, snetent, sprotoent, sservent, gpwnam, gpwuid, ggrnam, ggrgid, lock, once, fc, anonconst */
     0x2ebc, 0x3fb9, /* pushmark */
     0x00bd, /* wantarray, runcv */
     0x0578, 0x1930, 0x406c, 0x3b28, 0x3305, /* const */
@@ -3158,7 +3152,6 @@ EXTCONST U8 PL_op_private_valid[] = {
     /* METHOD_REDIR */ (OPpARG1_MASK),
     /* METHOD_REDIR_SUPER */ (OPpARG1_MASK),
     /* ENTERGIVEN */ (0),
-    /* LEAVEGIVEN */ (OPpARG1_MASK),
     /* ENTERWHEN  */ (OPpARG1_MASK),
     /* LEAVEWHEN  */ (OPpARG1_MASK),
     /* CONTINUE   */ (0),