From: Nicholas Clark <nick@ccl4.org>
Date: Sat, 28 Jan 2006 17:15:21 +0000 (+0000)
Subject: Squeeze more flag manipulations together in sv_setsv_flags.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=2352541471cd5a156f21e29f93b7167afe87acb2;p=p5sagit%2Fp5-mst-13.2.git

Squeeze more flag manipulations together in sv_setsv_flags.

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

diff --git a/sv.c b/sv.c
index 6895df4..25d6f33 100644
--- a/sv.c
+++ b/sv.c
@@ -3260,25 +3260,18 @@ Perl_sv_setsv_flags(pTHX_ SV *dstr, register SV *sstr, I32 flags)
 	}
 	(void)SvOK_off(dstr);
 	SvRV_set(dstr, SvREFCNT_inc(SvRV(sstr)));
-	SvROK_on(dstr);
+	SvFLAGS(dstr) |= sflags & (SVf_IOK|SVp_IOK|SVf_NOK|SVp_NOK|SVf_ROK
+				   |SVf_AMAGIC);
 	if (sflags & SVp_NOK) {
-	    SvNOKp_on(dstr);
-	    /* Only set the public OK flag if the source has public OK.  */
-	    if (sflags & SVf_NOK)
-		SvFLAGS(dstr) |= SVf_NOK;
 	    SvNV_set(dstr, SvNVX(sstr));
 	}
 	if (sflags & SVp_IOK) {
-	    (void)SvIOKp_on(dstr);
-	    if (sflags & SVf_IOK)
-		SvFLAGS(dstr) |= SVf_IOK;
+	    /* Must do this otherwise some other overloaded use of 0x80000000
+	       gets confused. Probably 0x80000000 */
 	    if (sflags & SVf_IVisUV)
 		SvIsUV_on(dstr);
 	    SvIV_set(dstr, SvIVX(sstr));
 	}
-	if (SvAMAGIC(sstr)) {
-	    SvAMAGIC_on(dstr);
-	}
     }
     else if (sflags & SVp_POK) {
         bool isSwipe = 0;
@@ -3401,22 +3394,18 @@ Perl_sv_setsv_flags(pTHX_ SV *dstr, register SV *sstr, I32 flags)
                 SvTEMP_off(sstr);
             }
         }
-	if (sflags & SVf_UTF8)
-	    SvUTF8_on(dstr);
 	if (sflags & SVp_NOK) {
-	    SvNOKp_on(dstr);
-	    if (sflags & SVf_NOK)
-		SvFLAGS(dstr) |= SVf_NOK;
 	    SvNV_set(dstr, SvNVX(sstr));
 	}
 	if (sflags & SVp_IOK) {
-	    (void)SvIOKp_on(dstr);
-	    if (sflags & SVf_IOK)
-		SvFLAGS(dstr) |= SVf_IOK;
+	    SvRELEASE_IVX(dstr);
+	    SvIV_set(dstr, SvIVX(sstr));
+	    /* Must do this otherwise some other overloaded use of 0x80000000
+	       gets confused. I guess SVpbm_VALID */
 	    if (sflags & SVf_IVisUV)
 		SvIsUV_on(dstr);
-	    SvIV_set(dstr, SvIVX(sstr));
 	}
+	SvFLAGS(dstr) |= sflags & (SVf_IOK|SVp_IOK|SVf_NOK|SVp_NOK|SVf_UTF8);
 	{
 	    const MAGIC * const smg = SvVOK(sstr);
 	    if (smg) {