Change 11223 by jhi@alpha on 2001/07/08 22:59:01
Retract #11212.
Affected files ...
... //depot/perl/cv.h#28 edit
... //depot/perl/ext/Opcode/Opcode.xs#30 edit
... //depot/perl/op.c#408 edit
... //depot/perl/pp_hot.c#246 edit
... //depot/perl/sv.h#90 edit
... //depot/perl/toke.c#374 edit
Differences ...
==== //depot/perl/cv.h#28 (text) ====
Index: perl/cv.h
--- perl/cv.h.~1~ Sun Jul 8 17:00:05 2001
+++ perl/cv.h Sun Jul 8 17:00:05 2001
@@ -34,7 +34,6 @@
struct perl_thread *xcv_owner; /* current owner thread */
#endif /* USE_THREADS */
cv_flags_t xcv_flags;
- HV * xcv_defstash;
};
/*
@@ -70,7 +69,6 @@
#define CvOWNER(sv) ((XPVCV*)SvANY(sv))->xcv_owner
#endif /* USE_THREADS */
#define CvFLAGS(sv) ((XPVCV*)SvANY(sv))->xcv_flags
-#define CvDEFSTASH(sv) ((XPVCV*)SvANY(sv))->xcv_defstash
#define CVf_CLONE 0x0001 /* anon CV uses external lexicals */
#define CVf_CLONED 0x0002 /* a clone of one of those */
==== //depot/perl/ext/Opcode/Opcode.xs#30 (text) ====
Index: perl/ext/Opcode/Opcode.xs
--- perl/ext/Opcode/Opcode.xs.~1~ Sun Jul 8 17:00:05 2001
+++ perl/ext/Opcode/Opcode.xs Sun Jul 8 17:00:05 2001
@@ -290,7 +290,6 @@
GvHV(PL_incgv) =
(HV*)SvREFCNT_inc(GvHV(gv_HVadd(gv_fetchpv("INC",TRUE,SVt_PVHV))));
PUSHMARK(SP);
- CvDEFSTASH(SvRV(codesv)) = PL_defstash;
perl_call_sv(codesv, GIMME|G_EVAL|G_KEEPERR); /* use callers context */
SPAGAIN; /* for the PUTBACK added by xsubpp */
LEAVE;
==== //depot/perl/op.c#408 (text) ====
Index: perl/op.c
--- perl/op.c.~1~ Sun Jul 8 17:00:05 2001
+++ perl/op.c Sun Jul 8 17:00:05 2001
@@ -4202,7 +4202,6 @@
SvREFCNT_dec((SV*)CvXSUBANY(cv).any_ptr);
CvCONST_off(cv);
}
- CvDEFSTASH(cv) = Nullhv;
if (CvPADLIST(cv)) {
/* may be during global destruction */
if (SvREFCNT(CvPADLIST(cv))) {
@@ -4320,7 +4319,6 @@
CvGV(cv) = CvGV(proto);
CvSTASH(cv) = CvSTASH(proto);
CvROOT(cv) = OpREFCNT_inc(CvROOT(proto));
- CvDEFSTASH(cv) = CvDEFSTASH(proto);
CvSTART(cv) = CvSTART(proto);
if (outside)
CvOUTSIDE(cv) = (CV*)SvREFCNT_inc(outside);
@@ -4712,7 +4710,6 @@
}
cv_undef(cv);
CvFLAGS(cv) = CvFLAGS(PL_compcv);
- CvDEFSTASH(cv) = CvDEFSTASH(PL_compcv);
CvOUTSIDE(cv) = CvOUTSIDE(PL_compcv);
CvOUTSIDE(PL_compcv) = 0;
CvPADLIST(cv) = CvPADLIST(PL_compcv);
@@ -5048,7 +5045,6 @@
CvFILE(cv) = filename; /* NOTE: not copied, as it is expected to be
an external constant string */
CvXSUB(cv) = subaddr;
- CvDEFSTASH(cv) = PL_defstash;
if (name) {
char *s = strrchr(name,':');
==== //depot/perl/pp_hot.c#246 (text) ====
Index: perl/pp_hot.c
--- perl/pp_hot.c.~1~ Sun Jul 8 17:00:05 2001
+++ perl/pp_hot.c Sun Jul 8 17:00:05 2001
@@ -2516,11 +2516,6 @@
goto retry;
}
- if(CvDEFSTASH(cv) != PL_defstash) {
- save_hptr(&PL_defstash);
- PL_defstash = CvDEFSTASH(cv);
- }
-
gimme = GIMME_V;
if ((PL_op->op_private & OPpENTERSUB_DB) && GvCV(PL_DBsub) && !CvNODEBUG(cv)) {
cv = get_db_sub(&sv, cv);
==== //depot/perl/sv.h#90 (text) ====
Index: perl/sv.h
--- perl/sv.h.~1~ Sun Jul 8 17:00:05 2001
+++ perl/sv.h Sun Jul 8 17:00:05 2001
@@ -322,7 +322,7 @@
U8 xbm_rare; /* rarest character in string */
};
-/* This structure must match XPVCV in cv.h */
+/* This structure much match XPVCV in cv.h */
typedef U16 cv_flags_t;
@@ -350,7 +350,6 @@
struct perl_thread *xcv_owner; /* current owner thread */
#endif /* USE_THREADS */
cv_flags_t xcv_flags;
- HV * xcv_defstash;
I32 xfm_lines;
};
==== //depot/perl/toke.c#374 (text) ====
Index: perl/toke.c
--- perl/toke.c.~1~ Sun Jul 8 17:00:05 2001
+++ perl/toke.c Sun Jul 8 17:00:05 2001
@@ -7444,7 +7444,6 @@
PL_compcv = (CV*)NEWSV(1104,0);
sv_upgrade((SV *)PL_compcv, is_format ? SVt_PVFM : SVt_PVCV);
CvFLAGS(PL_compcv) |= flags;
- CvDEFSTASH(PL_compcv) = PL_defstash;
PL_comppad = newAV();
av_push(PL_comppad, Nullsv);
End of Patch.
