Locale::Maketext version bump; MANIFEST, ChangeLog, perldelta updates

[perl5.git] / gv.c

diff --git a/gv.c b/gv.c
index 664e877..65c2971 100644 (file)
--- a/gv.c
+++ b/gv.c
@@ -121,9 +121,9 @@ Perl_gv_fetchfile_flags(pTHX_ const char *const name, const STRLEN namelen,
 #else
        sv_setpvn(GvSV(gv), name, namelen);
 #endif
-       if (PERLDB_LINE || PERLDB_SAVESRC)
-           hv_magic(GvHVn(gv_AVadd(gv)), NULL, PERL_MAGIC_dbfile);
     }
+    if ((PERLDB_LINE || PERLDB_SAVESRC) && !GvAV(gv))
+           hv_magic(GvHVn(gv_AVadd(gv)), NULL, PERL_MAGIC_dbfile);
     if (tmpbuf != smallbuf)
        Safefree(tmpbuf);
     return gv;
@@ -964,7 +964,7 @@ Perl_gv_fetchsv(pTHX_ SV *name, I32 flags, const svtype sv_type) {
 }
 
 STATIC void
-S_gv_magicalize_isa(GV *gv, const char *nambeg, I32 add)
+S_gv_magicalize_isa(pTHX_ GV *gv, const char *nambeg, I32 add)
 {
     AV* av;
 
@@ -992,7 +992,7 @@ S_gv_magicalize_isa(GV *gv, const char *nambeg, I32 add)
 }
 
 STATIC void
-S_gv_magicalize_overload(GV *gv)
+S_gv_magicalize_overload(pTHX_ GV *gv)
 {
     HV* hv;