From: Andy Lester <andy@petdance.com>
Date: Sat, 1 Apr 2006 02:01:30 +0000 (-0600)
Subject: SvREFCNT_inc tweaks
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=f84c484e31ca71701038f389bc647f43cdbdfd43;p=p5sagit%2Fp5-mst-13.2.git

SvREFCNT_inc tweaks
Message-ID: <20060401080130.GA19372@petdance.com>

p4raw-id: //depot/perl@27701
---

diff --git a/op.c b/op.c
index 64a5b7d..355b5cd 100644
--- a/op.c
+++ b/op.c
@@ -5121,7 +5121,7 @@ Perl_newATTRSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs, OP *block)
 	}
     }
     if (const_sv) {
-	SvREFCNT_inc_void_NN(const_sv);
+	SvREFCNT_inc_simple_void_NN(const_sv);
 	if (cv) {
 	    assert(!CvROOT(cv) && !CvCONST(cv));
 	    sv_setpvn((SV*)cv, "", 0);  /* prototype is "" */
diff --git a/pad.c b/pad.c
index 4a24216..2d2bade 100644
--- a/pad.c
+++ b/pad.c
@@ -287,7 +287,7 @@ Perl_pad_undef(pTHX_ CV* cv)
 			CvWEAKOUTSIDE_off(innercv);
 			CvOUTSIDE(innercv) = outercv;
 			CvOUTSIDE_SEQ(innercv) = seq;
-			SvREFCNT_inc_void_NN(outercv);
+			SvREFCNT_inc_simple_void_NN(outercv);
 		    }
 		    else {
 			CvOUTSIDE(innercv) = NULL;
@@ -352,7 +352,7 @@ Perl_pad_add_name(pTHX_ const char *name, HV* typestash, HV* ourstash, bool fake
     if (ourstash) {
 	SvPAD_OUR_on(namesv);
 	OURSTASH_set(namesv, ourstash);
-	SvREFCNT_inc_void_NN(ourstash);
+	SvREFCNT_inc_simple_void_NN(ourstash);
     }
 
     av_store(PL_comppad_name, offset, namesv);
@@ -1493,7 +1493,7 @@ Perl_cv_clone(pTHX_ CV *proto)
 		}
 		else {
 		    assert(!SvPADSTALE(sv));
-		    SvREFCNT_inc_simple_void(sv);
+		    SvREFCNT_inc_simple_void_NN(sv);
 		}
 	    }
 	    if (!sv) {
@@ -1510,7 +1510,7 @@ Perl_cv_clone(pTHX_ CV *proto)
 	    }
 	}
 	else if (IS_PADGV(ppad[ix]) || IS_PADCONST(ppad[ix])) {
-	    sv = SvREFCNT_inc(ppad[ix]);
+	    sv = SvREFCNT_inc_NN(ppad[ix]);
 	}
 	else {
 	    sv = newSV(0);
@@ -1626,7 +1626,7 @@ Perl_pad_push(pTHX_ PADLIST *padlist, int depth)
 		}
 	    }
 	    else if (IS_PADGV(oldpad[ix]) || IS_PADCONST(oldpad[ix])) {
-		av_store(newpad, ix, SvREFCNT_inc(oldpad[ix]));
+		av_store(newpad, ix, SvREFCNT_inc_NN(oldpad[ix]));
 	    }
 	    else {
 		/* save temporaries on recursion? */
diff --git a/perlio.c b/perlio.c
index 0cb4922..94ce1bc 100644
--- a/perlio.c
+++ b/perlio.c
@@ -614,7 +614,7 @@ PerlIO_list_push(pTHX_ PerlIO_list_t *list, PerlIO_funcs *funcs, SV *arg)
     p = &(list->array[list->cur++]);
     p->funcs = funcs;
     if ((p->arg = arg)) {
-	SvREFCNT_inc_void_NN(arg);
+	SvREFCNT_inc_simple_void_NN(arg);
     }
 }