bulk88 comments

Author: richardleach

sv.c

@@ -4634,7 +4634,7 @@ Perl_sv_setsv_flags(pTHX_ SV *dsv, SV* ssv, const I32 flags)
 
         (void)SvOK_off(dsv);
         SvFLAGS(dsv) |= sflags &
-            (SVf_POK|SVp_POK|SVf_IOK|SVp_IOK|SVf_NOK|SVp_NOK|SVf_UTF8);
+            (SVf_POK|SVp_POK|SVf_IOK|SVp_IOK|SVf_IVisUV|SVf_NOK|SVp_NOK|SVf_UTF8);
 
         if ( !(flags & SV_NOSTEAL) && S_SvPV_can_swipe_buf(ssv, sflags, cur, len) )
         {	/* Passes the swipe test.  */
@@ -4733,8 +4733,6 @@ Perl_sv_setsv_flags(pTHX_ SV *dsv, SV* ssv, const I32 flags)
         }
         if (sflags & SVp_IOK) {
             SvIV_set(dsv, SvIVX(ssv));
-            if (sflags & SVf_IVisUV)
-                SvIsUV_on(dsv);
             if ((sflags & SVf_IOK) && !(sflags & SVf_POK)) {
                 /* Source was SVf_IOK|SVp_IOK|SVp_POK but not SVf_POK, meaning
                    a value set as an integer and later stringified. So confirm
@@ -4800,9 +4798,10 @@ S_sv_freshcopy_POK(pTHX_ SV* dsv, SV* ssv, const I32 flags)
 
     if (!(flags & SV_NOSTEAL) && S_SvPV_can_swipe_buf(ssv, sflags, cur, len) ) {
         /* Passes the swipe test.  */
+        char * buf = SvPVX_mutable(ssv);
         SvLEN_set(dsv, len);
         SvCUR_set(dsv, cur);
-        SvPV_set(dsv, SvPVX_mutable(ssv));
+        SvPV_set(dsv, buf);
 
         assert(!SvOOK(ssv)); /* According to S_SvPV_can_swipe_buf() */
         /* (void)SvOK_off(ssv); but without the superfluous SvOOK_off(ssv)) */
@@ -5131,12 +5130,12 @@ Perl_sv_freshcopy_flags(pTHX_ SV *const old, I32 flags)
             break;
         case SVt_IV|SVf_ROK: /* [12%] */
             assert(SvANY(dsv));
+            SvFLAGS(dsv) = SVt_IV|SVf_ROK;
 #if defined (DEBUGGING) || defined (PERL_DEBUG_COW)
-            dsv->sv_u.svu_rv = SvREFCNT_inc(SvRV(old));
+            dsv->sv_u.svu_rv = SvREFCNT_inc_NN(SvRV(old));
 #else
-            dsv->sv_u.svu_rv = SvREFCNT_inc( old->sv_u.svu_rv );
+            dsv->sv_u.svu_rv = SvREFCNT_inc_NN( old->sv_u.svu_rv );
 #endif
-            SvFLAGS(dsv) = SVt_IV|SVf_ROK;
             break;
         case SVt_PV|SVf_POK: /* [32%] */
             SvANY(dsv) = new_XPV();