In cv_clone, use pad ID to identify mysub outside

This code prints ARRAY(0x802e10), whereas it should print
SCALAR(0xfedbee):

undef &bar;
eval 'sub bar { my @x }';
{
  my sub foo;
  foo();
  sub bar {
    CORE::state $x;
    sub foo { warn \$x }
  }
}

The foo sub has a strong CvOUTSIDE pointer, but what it points to
can still be undefined and redefined.  So we need to identify it
by its pad.

1 files changed, 8 insertions, 4 deletions

diff --git a/pad.c b/pad.c
index f6c47f5bbd..454d842b89 100644
--- a/pad.c
+++ b/pad.c
@@ -1980,8 +1980,14 @@ S_cv_clone_pad(pTHX_ CV *proto, CV *cv, CV *outside)
       if (SvTYPE(proto) == SVt_PVCV)
       {
 	outside = find_runcv(NULL);
-	if (!CvANON(proto) && CvROOT(outside) != CvROOT(CvOUTSIDE(proto)))
-	    outside = CvOUTSIDE(proto);
+	if (!CvANON(proto)) {
+	    if (!CvPADLIST(outside) ||
+	        CvPADLIST(outside)->xpadl_id != protopadlist->xpadl_outid)
+		outside = CvOUTSIDE(proto);
+	    if (!CvPADLIST(outside) ||
+	        CvPADLIST(outside)->xpadl_id != protopadlist->xpadl_outid)
+		outside = NULL;
+	}
       }
       else {
 	outside = CvOUTSIDE(proto);
@@ -1998,7 +2004,6 @@ S_cv_clone_pad(pTHX_ CV *proto, CV *cv, CV *outside)
     depth = outside ? CvDEPTH(outside) : 0;
     if (!depth)
 	depth = 1;
-    assert(SvTYPE(proto) == SVt_PVFM || CvPADLIST(outside));
 
     ENTER;
     SAVESPTR(PL_compcv);
@@ -2019,7 +2024,6 @@ S_cv_clone_pad(pTHX_ CV *proto, CV *cv, CV *outside)
     outpad = outside && CvPADLIST(outside)
 	? AvARRAY(PadlistARRAY(CvPADLIST(outside))[depth])
 	: NULL;
-    assert(outpad || SvTYPE(cv) == SVt_PVFM);
     if (outpad) CvPADLIST(cv)->xpadl_outid = CvPADLIST(outside)->xpadl_id;
 
     for (ix = fpad; ix > 0; ix--) {