Retract #13475 until Arthur gets back to the mine.

p4raw-id: //depot/perl@13476

1 files changed, 5 insertions, 37 deletions

diff --git a/op.c b/op.c
index 19bfe2a6f9..8125b308ce 100644
--- a/op.c
+++ b/op.c
@@ -4216,9 +4216,6 @@ Perl_newLOOPEX(pTHX_ I32 type, OP *label)
 void
 Perl_cv_undef(pTHX_ CV *cv)
 {
-    CV *outsidecv;
-    CV *freecv = Nullcv;
-
 #ifdef USE_5005THREADS
     if (CvMUTEXP(cv)) {
 	MUTEX_DESTROY(CvMUTEXP(cv));
@@ -4254,14 +4251,13 @@ Perl_cv_undef(pTHX_ CV *cv)
     }
     SvPOK_off((SV*)cv);		/* forget prototype */
     CvGV(cv) = Nullgv;
-    outsidecv = CvOUTSIDE(cv);
     /* Since closure prototypes have the same lifetime as the containing
      * CV, they don't hold a refcount on the outside CV.  This avoids
      * the refcount loop between the outer CV (which keeps a refcount to
      * the closure prototype in the pad entry for pp_anoncode()) and the
      * closure prototype, and the ensuing memory leak.  --GSAR */
     if (!CvANON(cv) || CvCLONED(cv))
-	freecv = outsidecv;
+	SvREFCNT_dec(CvOUTSIDE(cv));
     CvOUTSIDE(cv) = Nullcv;
     if (CvCONST(cv)) {
 	SvREFCNT_dec((SV*)CvXSUBANY(cv).any_ptr);
@@ -4270,36 +4266,10 @@ Perl_cv_undef(pTHX_ CV *cv)
     if (CvPADLIST(cv)) {
 	/* may be during global destruction */
 	if (SvREFCNT(CvPADLIST(cv))) {
-	    /* inner references to cv must be fixed up */
-	    AV *padlist = CvPADLIST(cv);
-	    AV *comppad_name = (AV*)AvARRAY(padlist)[0];
-	    AV *comppad = (AV*)AvARRAY(padlist)[1];
-	    SV **namepad = AvARRAY(comppad_name);
-	    SV **curpad = AvARRAY(comppad);
-	    I32 ix;
-	    for (ix = AvFILLp(comppad_name); ix > 0; ix--) {
-		SV *namesv = namepad[ix];
-		if (namesv && namesv != &PL_sv_undef
-		    && *SvPVX(namesv) == '&')
-		{
-		    CV *innercv = (CV*)curpad[ix];
-		    if (SvTYPE(innercv) == SVt_PVCV
-			&& CvOUTSIDE(innercv) == cv)
-		    {
-			CvOUTSIDE(innercv) = outsidecv;
-			if (!CvANON(innercv) || CvCLONED(innercv)) {
-			    (void)SvREFCNT_inc(outsidecv);
-			    if (SvREFCNT(cv))
-				SvREFCNT_dec(cv);
-			}
-		    }
-		}
-	    }
-	    if (freecv)
-		SvREFCNT_dec(freecv);
-	    ix = AvFILLp(padlist);
-	    while (ix >= 0) {
-		SV* sv = AvARRAY(padlist)[ix--];
+	    I32 i = AvFILLp(CvPADLIST(cv));
+	    while (i >= 0) {
+		SV** svp = av_fetch(CvPADLIST(cv), i--, FALSE);
+		SV* sv = svp ? *svp : Nullsv;
 		if (!sv)
 		    continue;
 		if (sv == (SV*)PL_comppad_name)
@@ -4314,8 +4284,6 @@ Perl_cv_undef(pTHX_ CV *cv)
 	}
 	CvPADLIST(cv) = Nullav;
     }
-    else if (freecv)
-	SvREFCNT_dec(freecv);
     if (CvXSUB(cv)) {
         CvXSUB(cv) = 0;
     }