X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=gv.c;h=3ab1935ec653cdbeae50e68d3f369c65e07c837b;hb=f13a2bc0291ac6766d77bda1b46c5921237360c9;hp=6fd5ff75dfecc51a44adaed70644043ae8ab8a38;hpb=3ad83ce7d21aa3aa1ac69bde413ed71b6ce30329;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/gv.c b/gv.c
index 6fd5ff7..3ab1935 100644
--- a/gv.c
+++ b/gv.c
@@ -422,9 +422,17 @@ Perl_gv_fetchmethod_autoload(pTHX_ HV *stash, const char *name, I32 autoload)
 	    DEBUG_o( Perl_deb(aTHX_ "Treating %s as %s::%s\n",
 			 origname, HvNAME(stash), name) );
 	}
-	else
+	else {
             /* don't autovifify if ->NoSuchStash::method */
             stash = gv_stashpvn(origname, nsplit - origname, FALSE);
+
+	    /* however, explicit calls to Pkg::SUPER::method may
+	       happen, and may require autovivification to work */
+	    if (!stash && (nsplit - origname) >= 7 &&
+		strnEQ(nsplit - 7, "::SUPER", 7) &&
+		gv_stashpvn(origname, nsplit - origname - 7, FALSE))
+	      stash = gv_stashpvn(origname, nsplit - origname, TRUE);
+	}
     }
 
     gv = gv_fetchmeth(stash, name, nend - name, 0);
@@ -644,7 +652,7 @@ Perl_gv_fetchpv(pTHX_ const char *nambeg, I32 add, I32 sv_type)
 		char smallbuf[256];
 		char *tmpbuf;
 
-		if (len + 3 < sizeof smallbuf)
+		if (len + 3 < sizeof (smallbuf))
 		    tmpbuf = smallbuf;
 		else
 		    New(601, tmpbuf, len+3, char);
@@ -1245,30 +1253,6 @@ Perl_gp_free(pTHX_ GV *gv)
     GvGP(gv) = 0;
 }
 
-#if defined(CRIPPLED_CC) && (defined(iAPX286) || defined(M_I286) || defined(I80286))
-#define MICROPORT
-#endif
-
-#ifdef	MICROPORT	/* Microport 2.4 hack */
-AV *GvAVn(gv)
-register GV *gv;
-{
-    if (GvGP(gv)->gp_av)
-	return GvGP(gv)->gp_av;
-    else
-	return GvGP(gv_AVadd(gv))->gp_av;
-}
-
-HV *GvHVn(gv)
-register GV *gv;
-{
-    if (GvGP(gv)->gp_hv)
-	return GvGP(gv)->gp_hv;
-    else
-	return GvGP(gv_HVadd(gv))->gp_hv;
-}
-#endif			/* Microport 2.4 hack */
-
 int
 Perl_magic_freeovrld(pTHX_ SV *sv, MAGIC *mg)
 {
@@ -1299,7 +1283,7 @@ Perl_Gv_AMupdate(pTHX_ HV *stash)
 
   if (mg && amtp->was_ok_am == PL_amagic_generation
       && amtp->was_ok_sub == PL_sub_generation)
-      return AMT_OVERLOADED(amtp);
+      return (bool)AMT_OVERLOADED(amtp);
   sv_unmagic((SV*)stash, PERL_MAGIC_overload_table);
 
   DEBUG_o( Perl_deb(aTHX_ "Recalcing overload magic in package %s\n",HvNAME(stash)) );
@@ -1821,7 +1805,7 @@ Perl_is_gv_magical(pTHX_ char *name, STRLEN len, U32 flags)
 	break;
     case '\017':   /* $^O & $^OPEN */
 	if (len == 1
-	    || (len == 4 && strEQ(name, "\027PEN")))
+	    || (len == 4 && strEQ(name, "\017PEN")))
 	{
 	    goto yes;
 	}