op.c:ck_subr: reify GVs based on call checker

Instead of faking up a GV to pass to the call checker if we have a
lexical sub, just get the GV from CvGV (since that will reify the GV,
even for lexical subs), unless the call checker has not specifically
requested GVs.

For now, we assume the default call checker cannot handle non-GV sub
names, as indeed it cannot.  An imminent commit will rectify that.

The code in scope.c was getting the name hek from the proto CV (stowed
in magic on the pad name) if the CV in the pad had lost it.  Now, the
proto CV can lose it at compile time via CvGV, so that does not work
anymore.  Instead, just get it from the GV.

1 files changed, 7 insertions, 15 deletions

diff --git a/scope.c b/scope.c
index 9c8b040735..8229c1a5c2 100644
--- a/scope.c
+++ b/scope.c
@@ -1030,14 +1030,9 @@ Perl_leave_scope(pTHX_ I32 base)
                     case SVt_PVCV:
                     {
                         HEK *hek =
-			    CvNAME_HEK((CV *)(
 			      CvNAMED(sv)
-				? sv
-				: mg_find(PadlistNAMESARRAY(
-						CvPADLIST(find_runcv(NULL))
-					  )[svp-PL_curpad],
-					  PERL_MAGIC_proto
-				  	 )->mg_obj));
+				? CvNAME_HEK((CV *)sv)
+				: GvNAME_HEK(CvGV(sv));
                         assert(hek);
                         share_hek_hek(hek);
                         cv_undef((CV *)sv);
@@ -1064,19 +1059,16 @@ Perl_leave_scope(pTHX_ I32 base)
                     case SVt_PVHV:	*svp = MUTABLE_SV(newHV());	break;
                     case SVt_PVCV:
                     {
+                        HEK * const hek = CvNAMED(sv)
+                                             ? CvNAME_HEK((CV *)sv)
+                                             : GvNAME_HEK(CvGV(sv));
+
                         /* Create a stub */
                         *svp = newSV_type(SVt_PVCV);
 
                         /* Share name */
                         CvNAME_HEK_set(*svp,
-                            share_hek_hek(CvNAME_HEK((CV *)(
-			      CvNAMED(sv)
-				? sv
-				: mg_find(PadlistNAMESARRAY(
-						CvPADLIST(find_runcv(NULL))
-					  )[svp-PL_curpad],
-					  PERL_MAGIC_proto
-				  	 )->mg_obj))));
+                                       share_hek_hek(hek));
                         CvLEXICAL_on(*svp);
                         break;
                     }