From: Nicholas Clark <nick@ccl4.org>
Date: Fri, 1 Feb 2008 22:27:38 +0000 (+0000)
Subject: In pp_split(), eliminate most (all?) of the conditional calls to
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=437d3b4e2ce32830fdc042ab67d7815e3555e931;p=p5sagit%2Fp5-mst-13.2.git

In pp_split(), eliminate most (all?) of the conditional calls to
sv_2mortal() by conditionally passing SVs_TEMP to newSVpvn_flags().

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

diff --git a/pp.c b/pp.c
index 2b12a8f..8665c9c 100644
--- a/pp.c
+++ b/pp.c
@@ -4668,7 +4668,7 @@ PP(pp_split)
     I32 base;
     const I32 gimme = GIMME_V;
     const I32 oldsave = PL_savestack_ix;
-    I32 make_mortal = 1;
+    U32 make_mortal = SVs_TEMP;
     bool multiline = 0;
     MAGIC *mg = NULL;
 
@@ -4767,9 +4767,8 @@ PP(pp_split)
 	    if (m >= strend)
 		break;
 
-	    dstr = newSVpvn_utf8(s, m-s, do_utf8);
-	    if (make_mortal)
-		sv_2mortal(dstr);
+	    dstr = newSVpvn_flags(s, m-s,
+				  (do_utf8 ? SVf_UTF8 : 0) | make_mortal);
 	    XPUSHs(dstr);
 
 	    /* skip the whitespace found last */
@@ -4798,9 +4797,8 @@ PP(pp_split)
 	    m++;
 	    if (m >= strend)
 		break;
-	    dstr = newSVpvn_utf8(s, m-s, do_utf8);
-	    if (make_mortal)
-		sv_2mortal(dstr);
+	    dstr = newSVpvn_flags(s, m-s,
+				  (do_utf8 ? SVf_UTF8 : 0) | make_mortal);
 	    XPUSHs(dstr);
 	    s = m;
 	}
@@ -4825,10 +4823,7 @@ PP(pp_split)
                 /* keep track of how many bytes we skip over */
                 m = s;
                 s += UTF8SKIP(s);
-                dstr = newSVpvn_utf8(m, s-m, TRUE);
-
-                if (make_mortal)
-                    sv_2mortal(dstr);
+                dstr = newSVpvn_flags(m, s-m, SVf_UTF8 | make_mortal);
 
                 PUSHs(dstr);
 
@@ -4866,9 +4861,8 @@ PP(pp_split)
 		    ;
 		if (m >= strend)
 		    break;
-		dstr = newSVpvn_utf8(s, m-s, do_utf8);
-		if (make_mortal)
-		    sv_2mortal(dstr);
+		dstr = newSVpvn_flags(s, m-s,
+				      (do_utf8 ? SVf_UTF8 : 0) | make_mortal);
 		XPUSHs(dstr);
 		/* The rx->minlen is in characters but we want to step
 		 * s ahead by bytes. */
@@ -4883,9 +4877,8 @@ PP(pp_split)
 	      (m = fbm_instr((unsigned char*)s, (unsigned char*)strend,
 			     csv, multiline ? FBMrf_MULTILINE : 0)) )
 	    {
-		dstr = newSVpvn_utf8(s, m-s, do_utf8);
-		if (make_mortal)
-		    sv_2mortal(dstr);
+		dstr = newSVpvn_flags(s, m-s,
+				      (do_utf8 ? SVf_UTF8 : 0) | make_mortal);
 		XPUSHs(dstr);
 		/* The rx->minlen is in characters but we want to step
 		 * s ahead by bytes. */
@@ -4916,9 +4909,8 @@ PP(pp_split)
 		strend = s + (strend - m);
 	    }
 	    m = RX_OFFS(rx)[0].start + orig;
-	    dstr = newSVpvn_utf8(s, m-s, do_utf8);
-	    if (make_mortal)
-		sv_2mortal(dstr);
+	    dstr = newSVpvn_flags(s, m-s,
+				  (do_utf8 ? SVf_UTF8 : 0) | make_mortal);
 	    XPUSHs(dstr);
 	    if (RX_NPARENS(rx)) {
 		I32 i;
@@ -4930,12 +4922,12 @@ PP(pp_split)
 		       parens that didn't match -- they should be set to
 		       undef, not the empty string */
 		    if (m >= orig && s >= orig) {
-			dstr = newSVpvn_utf8(s, m-s, do_utf8);
+			dstr = newSVpvn_flags(s, m-s,
+					     (do_utf8 ? SVf_UTF8 : 0)
+					      | make_mortal);
 		    }
 		    else
 			dstr = &PL_sv_undef;  /* undef, not "" */
-		    if (make_mortal)
-			sv_2mortal(dstr);
 		    XPUSHs(dstr);
 		}
 	    }
@@ -4950,9 +4942,7 @@ PP(pp_split)
     /* keep field after final delim? */
     if (s < strend || (iters && origlimit)) {
         const STRLEN l = strend - s;
-	dstr = newSVpvn_utf8(s, l, do_utf8);
-	if (make_mortal)
-	    sv_2mortal(dstr);
+	dstr = newSVpvn_flags(s, l, (do_utf8 ? SVf_UTF8 : 0) | make_mortal);
 	XPUSHs(dstr);
 	iters++;
     }