another change towards a shareable optree: avoid pointer to filegv

in COP; revert parts of change#4485 and s/xcv_filegv/xcv_file/
(CvFILE() may yet come in handy somewhere); adjust compiler doodads
to suit

p4raw-link: @4485 on //depot/perl: b195d4879f55e1610299cb9b1b55356940c2a577

p4raw-id: //depot/perl@4545

1 files changed, 2 insertions, 4 deletions

diff --git a/sv.h b/sv.h
index bd7dac184d..e9d6893e21 100644
--- a/sv.h
+++ b/sv.h
@@ -257,7 +257,7 @@ struct xpvbm {
     U8		xbm_rare;	/* rarest character in string */
 };
 
-/* This structure much match XPVCV */
+/* This structure much match XPVCV in cv.h */
 
 typedef U16 cv_flags_t;
 
@@ -276,9 +276,7 @@ struct xpvfm {
     void      (*xcv_xsub)(pTHXo_ CV*);
     ANY		xcv_xsubany;
     GV *	xcv_gv;
-#if defined(PERL_BINCOMPAT_5005)
-    GV *	xcv_filegv;	/* XXX unused (and deprecated) */
-#endif
+    char *	xcv_file;
     long	xcv_depth;	/* >= 2 indicates recursive call */
     AV *	xcv_padlist;
     CV *	xcv_outside;