Change 18409 by [EMAIL PROTECTED] on 2003/01/03 11:05:09
Subject: remove flag SvPADBUSY
From: Dave Mitchell <[EMAIL PROTECTED]>
Date: Thu, 19 Dec 2002 18:55:43 +0000
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/perl/dump.c#129 edit
... //depot/perl/ext/Devel/Peek/Peek.t#22 edit
... //depot/perl/pad.c#11 edit
... //depot/perl/scope.c#105 edit
... //depot/perl/sv.h#128 edit
Differences ...
==== //depot/perl/dump.c#129 (text) ====
Index: perl/dump.c
--- perl/dump.c#128~18302~ Sat Dec 14 14:34:25 2002
+++ perl/dump.c Fri Jan 3 03:05:09 2003
@@ -942,7 +942,6 @@
(int)(PL_dumpindent*level), "", (IV)SvREFCNT(sv),
(int)(PL_dumpindent*level), "");
- if (flags & SVs_PADBUSY) sv_catpv(d, "PADBUSY,");
if (flags & SVs_PADTMP) sv_catpv(d, "PADTMP,");
if (flags & SVs_PADMY) sv_catpv(d, "PADMY,");
if (flags & SVs_TEMP) sv_catpv(d, "TEMP,");
==== //depot/perl/ext/Devel/Peek/Peek.t#22 (text) ====
Index: perl/ext/Devel/Peek/Peek.t
--- perl/ext/Devel/Peek/Peek.t#21~18302~ Sat Dec 14 14:34:25 2002
+++ perl/ext/Devel/Peek/Peek.t Fri Jan 3 03:05:09 2003
@@ -85,7 +85,7 @@
$c = 456,
'SV = IV\\($ADDR\\) at $ADDR
REFCNT = 1
- FLAGS = \\(PADBUSY,PADMY,IOK,pIOK\\)
+ FLAGS = \\(PADMY,IOK,pIOK\\)
IV = 456');
# If perl is built with PERL_PRESERVE_IVUV then maths is done as integers
@@ -206,7 +206,7 @@
RV = $ADDR
SV = PVCV\\($ADDR\\) at $ADDR
REFCNT = 2
- FLAGS = \\(PADBUSY,PADMY,POK,pPOK,ANON,WEAKOUTSIDE\\)
+ FLAGS = \\(PADMY,POK,pPOK,ANON,WEAKOUTSIDE\\)
IV = 0
NV = 0
PROTOTYPE = ""
@@ -327,7 +327,7 @@
chr(256).chr(0).chr(512),
'SV = PV\\($ADDR\\) at $ADDR
REFCNT = 1
- FLAGS = \\((?:PADBUSY,PADTMP,)?POK,READONLY,pPOK,UTF8\\)
+ FLAGS = \\((?:PADTMP,)?POK,READONLY,pPOK,UTF8\\)
PV = $ADDR "\\\214\\\101\\\0\\\235\\\101"\\\0 \[UTF8
"\\\x\{100\}\\\x\{0\}\\\x\{200\}"\]
CUR = 5
LEN = \\d+');
@@ -336,7 +336,7 @@
chr(256).chr(0).chr(512),
'SV = PV\\($ADDR\\) at $ADDR
REFCNT = 1
- FLAGS = \\((?:PADBUSY,PADTMP,)?POK,READONLY,pPOK,UTF8\\)
+ FLAGS = \\((?:PADTMP,)?POK,READONLY,pPOK,UTF8\\)
PV = $ADDR "\\\304\\\200\\\0\\\310\\\200"\\\0 \[UTF8
"\\\x\{100\}\\\x\{0\}\\\x\{200\}"\]
CUR = 5
LEN = \\d+');
@@ -402,7 +402,7 @@
$x,
'SV = PVMG\\($ADDR\\) at $ADDR
REFCNT = 1
- FLAGS = \\(PADBUSY,PADMY,SMG,POK,pPOK\\)
+ FLAGS = \\(PADMY,SMG,POK,pPOK\\)
IV = 0
NV = 0
PV = $ADDR ""\\\0
==== //depot/perl/pad.c#11 (text) ====
Index: perl/pad.c
--- perl/pad.c#10~18319~ Tue Dec 17 02:08:24 2002
+++ perl/pad.c Fri Jan 3 03:05:09 2003
@@ -378,9 +378,7 @@
if (PL_pad_reset_pending)
pad_reset();
if (tmptype & SVs_PADMY) {
- do {
- sv = *av_fetch(PL_comppad, AvFILLp(PL_comppad) + 1, TRUE);
- } while (SvPADBUSY(sv)); /* need a fresh one */
+ sv = *av_fetch(PL_comppad, AvFILLp(PL_comppad) + 1, TRUE);
retval = AvFILLp(PL_comppad);
}
else {
@@ -1344,8 +1342,7 @@
sv = (SV*)newHV();
else
sv = NEWSV(0, 0);
- if (!SvPADBUSY(sv))
- SvPADMY_on(sv);
+ SvPADMY_on(sv);
PL_curpad[ix] = sv;
}
}
==== //depot/perl/scope.c#105 (text) ====
Index: perl/scope.c
--- perl/scope.c#104~18312~ Mon Dec 16 17:43:28 2002
+++ perl/scope.c Fri Jan 3 03:05:09 2003
@@ -920,7 +920,7 @@
}
}
else { /* Someone has a claim on this, so abandon it. */
- U32 padflags = SvFLAGS(sv) & (SVs_PADBUSY|SVs_PADMY|SVs_PADTMP);
+ U32 padflags = SvFLAGS(sv) & (SVs_PADMY|SVs_PADTMP);
switch (SvTYPE(sv)) { /* Console ourselves with a new value */
case SVt_PVAV: *(SV**)ptr = (SV*)newAV(); break;
case SVt_PVHV: *(SV**)ptr = (SV*)newHV(); break;
==== //depot/perl/sv.h#128 (text) ====
Index: perl/sv.h
--- perl/sv.h#127~18220~ Sun Dec 1 16:58:54 2002
+++ perl/sv.h Fri Jan 3 03:05:09 2003
@@ -148,7 +148,7 @@
#define SvUPGRADE(sv, mt) (SvTYPE(sv) >= mt || sv_upgrade(sv, mt))
-#define SVs_PADBUSY 0x00000100 /* reserved for tmp or my already */
+/* XXX spare */
#define SVs_PADTMP 0x00000200 /* in use as tmp */
#define SVs_PADMY 0x00000400 /* in use a "my" variable */
#define SVs_TEMP 0x00000800 /* string is stealable? */
@@ -637,14 +637,12 @@
#define SvTHINKFIRST(sv) (SvFLAGS(sv) & SVf_THINKFIRST)
-#define SvPADBUSY(sv) (SvFLAGS(sv) & SVs_PADBUSY)
-
#define SvPADTMP(sv) (SvFLAGS(sv) & SVs_PADTMP)
-#define SvPADTMP_on(sv) (SvFLAGS(sv) |= SVs_PADTMP|SVs_PADBUSY)
+#define SvPADTMP_on(sv) (SvFLAGS(sv) |= SVs_PADTMP)
#define SvPADTMP_off(sv) (SvFLAGS(sv) &= ~SVs_PADTMP)
#define SvPADMY(sv) (SvFLAGS(sv) & SVs_PADMY)
-#define SvPADMY_on(sv) (SvFLAGS(sv) |= SVs_PADMY|SVs_PADBUSY)
+#define SvPADMY_on(sv) (SvFLAGS(sv) |= SVs_PADMY)
#define SvTEMP(sv) (SvFLAGS(sv) & SVs_TEMP)
#define SvTEMP_on(sv) (SvFLAGS(sv) |= SVs_TEMP)
End of Patch.
