X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pp_hot.c;h=eeedc5b375b107b0c1cb004dbaa78b1d177c0817;hb=9f2f055aa1e8c86d97b5ea42473ab1747f518f3a;hp=d812e95644e467a70c30ea07c082df2f754fe2e5;hpb=ea726b52599b52cf534201a46ec3455418c9eb8e;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/pp_hot.c b/pp_hot.c
index d812e95..eeedc5b 100644
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -12,8 +12,10 @@
  * Then he heard Merry change the note, and up went the Horn-cry of Buckland,
  * shaking the air.
  *
- *            Awake!  Awake!  Fear, Fire, Foes!  Awake!
- *                     Fire, Foes!  Awake!
+ *                  Awake!  Awake!  Fear, Fire, Foes!  Awake!
+ *                               Fire, Foes!  Awake!
+ *
+ *     [p.1007 of _The Lord of the Rings_, VI/viii: "The Scouring of the Shire"]
  */
 
 /* This file contains 'hot' pp ("push/pop") functions that
@@ -89,7 +91,7 @@ PP(pp_stringify)
 PP(pp_gv)
 {
     dVAR; dSP;
-    XPUSHs((SV*)cGVOP_gv);
+    XPUSHs(MUTABLE_SV(cGVOP_gv));
     RETURN;
 }
 
@@ -136,7 +138,7 @@ PP(pp_sassign)
 		   The gv becomes a(nother) reference to the constant.  */
 		SV *const value = SvRV(cv);
 
-		SvUPGRADE((SV *)gv, SVt_IV);
+		SvUPGRADE(MUTABLE_SV(gv), SVt_IV);
 		SvPCS_IMPORTED_on(gv);
 		SvRV_set(gv, value);
 		SvREFCNT_inc_simple_void(value);
@@ -148,7 +150,7 @@ PP(pp_sassign)
 	/* Need to fix things up.  */
 	if (gv_type != SVt_PVGV) {
 	    /* Need to fix GV.  */
-	    right = (SV*)gv_fetchsv(right, GV_ADD, SVt_PVGV);
+	    right = MUTABLE_SV(gv_fetchsv(right, GV_ADD, SVt_PVGV));
 	}
 
 	if (!got_coderef) {
@@ -162,8 +164,8 @@ PP(pp_sassign)
 		   all sorts of fun as the reference to our new sub is
 		   donated to the GV that we're about to assign to.
 		*/
-		SvRV_set(left, (SV *)newCONSTSUB(GvSTASH(right), NULL,
-						 SvRV(cv)));
+		SvRV_set(left, MUTABLE_SV(newCONSTSUB(GvSTASH(right), NULL,
+						      SvRV(cv))));
 		SvREFCNT_dec(cv);
 		LEAVE;
 	    } else {
@@ -180,7 +182,7 @@ PP(pp_sassign)
 		   So change the reference so that it points to the subroutine
 		   of that typeglob, as that's what they were after all along.
 		*/
-		GV *const upgraded = (GV *) cv;
+		GV *const upgraded = MUTABLE_GV(cv);
 		CV *const source = GvCV(upgraded);
 
 		assert(source);
@@ -188,7 +190,7 @@ PP(pp_sassign)
 
 		SvREFCNT_inc_void(source);
 		SvREFCNT_dec(upgraded);
-		SvRV_set(left, (SV *)source);
+		SvRV_set(left, MUTABLE_SV(source));
 	    }
 	}
 
@@ -255,7 +257,7 @@ PP(pp_concat)
 	if (!SvOK(TARG)) {
 	    if (left == right && ckWARN(WARN_UNINITIALIZED))
 		report_uninit(right);
-	    sv_setpvn(left, "", 0);
+	    sv_setpvs(left, "");
 	}
 	(void)SvPV_nomg_const(left, llen);    /* Needed to set UTF8 flag */
 	lbyte = !DO_UTF8(left);
@@ -306,16 +308,16 @@ PP(pp_readline)
 {
     dVAR;
     tryAMAGICunTARGET(iter, 0);
-    PL_last_in_gv = (GV*)(*PL_stack_sp--);
+    PL_last_in_gv = MUTABLE_GV(*PL_stack_sp--);
     if (!isGV_with_GP(PL_last_in_gv)) {
 	if (SvROK(PL_last_in_gv) && isGV_with_GP(SvRV(PL_last_in_gv)))
-	    PL_last_in_gv = (GV*)SvRV(PL_last_in_gv);
+	    PL_last_in_gv = MUTABLE_GV(SvRV(PL_last_in_gv));
 	else {
 	    dSP;
-	    XPUSHs((SV*)PL_last_in_gv);
+	    XPUSHs(MUTABLE_SV(PL_last_in_gv));
 	    PUTBACK;
 	    pp_rv2gv();
-	    PL_last_in_gv = (GV*)(*PL_stack_sp--);
+	    PL_last_in_gv = MUTABLE_GV(*PL_stack_sp--);
 	}
     }
     return do_readline();
@@ -398,7 +400,7 @@ PP(pp_preinc)
 {
     dVAR; dSP;
     if (SvTYPE(TOPs) >= SVt_PVAV || isGV_with_GP(TOPs))
-	DIE(aTHX_ PL_no_modify);
+	DIE(aTHX_ "%s", PL_no_modify);
     if (!SvREADONLY(TOPs) && SvIOK_notUV(TOPs) && !SvNOK(TOPs) && !SvPOK(TOPs)
         && SvIVX(TOPs) != IV_MAX)
     {
@@ -649,8 +651,8 @@ PP(pp_add)
 PP(pp_aelemfast)
 {
     dVAR; dSP;
-    AV * const av = PL_op->op_flags & OPf_SPECIAL ?
-		(AV*)PAD_SV(PL_op->op_targ) : GvAV(cGVOP_gv);
+    AV * const av = PL_op->op_flags & OPf_SPECIAL
+	? MUTABLE_AV(PAD_SV(PL_op->op_targ)) : GvAV(cGVOP_gv);
     const U32 lval = PL_op->op_flags & OPf_MOD;
     SV** const svp = av_fetch(av, PL_op->op_private, lval);
     SV *sv = (svp ? *svp : &PL_sv_undef);
@@ -685,7 +687,7 @@ PP(pp_pushre)
     Copy(&PL_op, &LvTARGOFF(sv), 1, OP*);
     XPUSHs(sv);
 #else
-    XPUSHs((SV*)PL_op);
+    XPUSHs(MUTABLE_SV(PL_op));
 #endif
     RETURN;
 }
@@ -698,10 +700,11 @@ PP(pp_print)
     IO *io;
     register PerlIO *fp;
     MAGIC *mg;
-    GV * const gv = (PL_op->op_flags & OPf_STACKED) ? (GV*)*++MARK : PL_defoutgv;
+    GV * const gv
+	= (PL_op->op_flags & OPf_STACKED) ? MUTABLE_GV(*++MARK) : PL_defoutgv;
 
     if (gv && (io = GvIO(gv))
-	&& (mg = SvTIED_mg((SV*)io, PERL_MAGIC_tiedscalar)))
+	&& (mg = SvTIED_mg((const SV *)io, PERL_MAGIC_tiedscalar)))
     {
       had_magic:
 	if (MARK == ORIGMARK) {
@@ -714,7 +717,7 @@ PP(pp_print)
 	    ++SP;
 	}
 	PUSHMARK(MARK - 1);
-	*MARK = SvTIED_obj((SV*)io, mg);
+	*MARK = SvTIED_obj(MUTABLE_SV(io), mg);
 	PUTBACK;
 	ENTER;
 	if( PL_op->op_type == OP_SAY ) {
@@ -732,7 +735,7 @@ PP(pp_print)
     }
     if (!(io = GvIO(gv))) {
         if ((GvEGV(gv)) && (io = GvIO(GvEGV(gv)))
-	    && (mg = SvTIED_mg((SV*)io, PERL_MAGIC_tiedscalar)))
+	    && (mg = SvTIED_mg((const SV *)io, PERL_MAGIC_tiedscalar)))
             goto had_magic;
 	if (ckWARN2(WARN_UNOPENED,WARN_CLOSED))
 	    report_evil_fh(gv, io, PL_op->op_type);
@@ -825,7 +828,7 @@ PP(pp_rv2av)
 	}
 	else if (PL_op->op_flags & OPf_MOD
 		&& PL_op->op_private & OPpLVAL_INTRO)
-	    Perl_croak(aTHX_ PL_no_localize_ref);
+	    Perl_croak(aTHX_ "%s", PL_no_localize_ref);
     }
     else {
 	if (SvTYPE(sv) == type) {
@@ -855,11 +858,11 @@ PP(pp_rv2av)
 		    RETURN;
 	    }
 	    else {
-		gv = (GV*)sv;
+		gv = MUTABLE_GV(sv);
 	    }
-	    sv = is_pp_rv2av ? (SV*)GvAVn(gv) : (SV*)GvHVn(gv);
+	    sv = is_pp_rv2av ? MUTABLE_SV(GvAVn(gv)) : MUTABLE_SV(GvHVn(gv));
 	    if (PL_op->op_private & OPpLVAL_INTRO)
-		sv = is_pp_rv2av ? (SV*)save_ary(gv) : (SV*)save_hash(gv);
+		sv = is_pp_rv2av ? MUTABLE_SV(save_ary(gv)) : MUTABLE_SV(save_hash(gv));
 	    if (PL_op->op_flags & OPf_REF) {
 		SETs(sv);
 		RETURN;
@@ -874,7 +877,7 @@ PP(pp_rv2av)
     }
 
     if (is_pp_rv2av) {
-	AV *const av = (AV*)sv;
+	AV *const av = MUTABLE_AV(sv);
 	/* The guts of pp_rv2av, with no intenting change to preserve history
 	   (until such time as we get tools that can do blame annotation across
 	   whitespace changes.  */
@@ -945,7 +948,7 @@ S_do_oddball(pTHX_ HV *hash, SV **relem, SV **firstrelem)
 	    }
 	    else
 		err = "Odd number of elements in hash assignment";
-	    Perl_warner(aTHX_ packWARN(WARN_MISC), err);
+	    Perl_warner(aTHX_ packWARN(WARN_MISC), "%s", err);
 	}
 
         tmpstr = newSV(0);
@@ -1008,7 +1011,7 @@ PP(pp_aassign)
 	sv = *lelem++;
 	switch (SvTYPE(sv)) {
 	case SVt_PVAV:
-	    ary = (AV*)sv;
+	    ary = MUTABLE_AV(sv);
 	    magic = SvMAGICAL(ary) != 0;
 	    av_clear(ary);
 	    av_extend(ary, lastrelem - relem);
@@ -1034,7 +1037,7 @@ PP(pp_aassign)
 		TAINT_NOT;
 	    }
 	    if (PL_delaymagic & DM_ARRAY)
-		SvSETMAGIC((SV*)ary);
+		SvSETMAGIC(MUTABLE_SV(ary));
 	    break;
 	case SVt_PVHV: {				/* normal hash */
 		SV *tmpstr;
@@ -1207,7 +1210,7 @@ PP(pp_qr)
     /* This RV is about to own a reference to the regexp. (In addition to the
        reference already owned by the PMOP.  */
     ReREFCNT_inc(rx);
-    SvRV_set(rv, (SV*) rx);
+    SvRV_set(rv, MUTABLE_SV(rx));
     SvROK_on(rv);
 
     if (pkg) {
@@ -1544,10 +1547,10 @@ Perl_do_readline(pTHX)
     const I32 gimme = GIMME_V;
 
     if (io) {
-	MAGIC * const mg = SvTIED_mg((SV*)io, PERL_MAGIC_tiedscalar);
+	MAGIC * const mg = SvTIED_mg((const SV *)io, PERL_MAGIC_tiedscalar);
 	if (mg) {
 	    PUSHMARK(SP);
-	    XPUSHs(SvTIED_obj((SV*)io, mg));
+	    XPUSHs(SvTIED_obj(MUTABLE_SV(io), mg));
 	    PUTBACK;
 	    ENTER;
 	    call_method("READLINE", gimme);
@@ -1571,7 +1574,7 @@ Perl_do_readline(pTHX)
 		    if (av_len(GvAVn(PL_last_in_gv)) < 0) {
 			IoFLAGS(io) &= ~IOf_START;
 			do_open(PL_last_in_gv,"-",1,FALSE,O_RDONLY,0,NULL);
-			sv_setpvn(GvSVn(PL_last_in_gv), "-", 1);
+			sv_setpvs(GvSVn(PL_last_in_gv), "-");
 			SvSETMAGIC(GvSV(PL_last_in_gv));
 			fp = IoIFP(io);
 			goto have_fp;
@@ -1785,12 +1788,12 @@ PP(pp_helem)
 	/* does the element we're localizing already exist? */
 	preeminent = /* can we determine whether it exists? */
 	    (    !SvRMAGICAL(hv)
-		|| mg_find((SV*)hv, PERL_MAGIC_env)
-		|| (     (mg = mg_find((SV*)hv, PERL_MAGIC_tied))
+		|| mg_find((const SV *)hv, PERL_MAGIC_env)
+		|| (     (mg = mg_find((const SV *)hv, PERL_MAGIC_tied))
 			/* Try to preserve the existenceness of a tied hash
 			* element by using EXISTS and DELETE if possible.
 			* Fallback to FETCH and STORE otherwise */
-		    && (stash = SvSTASH(SvRV(SvTIED_obj((SV*)hv, mg))))
+		    && (stash = SvSTASH(SvRV(SvTIED_obj(MUTABLE_SV(hv), mg))))
 		    && gv_fetchmethod_autoload(stash, "EXISTS", TRUE)
 		    && gv_fetchmethod_autoload(stash, "DELETE", TRUE)
 		)
@@ -1817,7 +1820,7 @@ PP(pp_helem)
 	}
 	if (PL_op->op_private & OPpLVAL_INTRO) {
 	    if (HvNAME_get(hv) && isGV(*svp))
-		save_gp((GV*)*svp, !(PL_op->op_flags & OPf_SPECIAL));
+		save_gp(MUTABLE_GV(*svp), !(PL_op->op_flags & OPf_SPECIAL));
 	    else {
 		if (!preeminent) {
 		    STRLEN keylen;
@@ -2096,7 +2099,7 @@ PP(pp_subst)
 	 || ( ((SvTYPE(TARG) == SVt_PVGV && isGV_with_GP(TARG))
 	       || SvTYPE(TARG) > SVt_PVLV)
 	     && !(SvTYPE(TARG) == SVt_PVGV && SvFAKE(TARG)))))
-	DIE(aTHX_ PL_no_modify);
+	DIE(aTHX_ "%s", PL_no_modify);
     PUTBACK;
 
     s = SvPV_mutable(TARG, len);
@@ -2668,7 +2671,7 @@ PP(pp_entersub)
     case SVt_PVGV:
 	if (!isGV_with_GP(sv))
 	    DIE(aTHX_ "Not a CODE reference");
-	if (!(cv = GvCVu((GV*)sv))) {
+	if (!(cv = GvCVu((const GV *)sv))) {
 	    HV *stash;
 	    cv = sv_2cv(sv, &stash, &gv, 0);
 	}
@@ -2795,7 +2798,7 @@ try_autoload:
 	SAVECOMPPAD();
 	PAD_SET_CUR_NOSAVE(padlist, CvDEPTH(cv));
 	if (hasargs) {
-	    AV* const av = (AV*)PAD_SVl(0);
+	    AV *const av = MUTABLE_AV(PAD_SVl(0));
 	    if (AvREAL(av)) {
 		/* @_ is normally not REAL--this should only ever
 		 * happen when DB::sub() calls things that modify @_ */
@@ -2804,7 +2807,7 @@ try_autoload:
 		AvREIFY_on(av);
 	    }
 	    cx->blk_sub.savearray = GvAV(PL_defgv);
-	    GvAV(PL_defgv) = (AV*)SvREFCNT_inc_simple(av);
+	    GvAV(PL_defgv) = MUTABLE_AV(SvREFCNT_inc_simple(av));
 	    CX_CURPAD_SAVE(cx->blk_sub);
 	    cx->blk_sub.argarray = av;
 	    ++MARK;
@@ -2904,7 +2907,7 @@ PP(pp_aelem)
     SV** svp;
     SV* const elemsv = POPs;
     IV elem = SvIV(elemsv);
-    AV* const av = (AV*)POPs;
+    AV *const av = MUTABLE_AV(POPs);
     const U32 lval = PL_op->op_flags & OPf_MOD || LVRET;
     const U32 defer = (PL_op->op_private & OPpLVAL_DEFER) && (elem > av_len(av));
     SV *sv;
@@ -2966,17 +2969,17 @@ Perl_vivify_ref(pTHX_ SV *sv, U32 to_what)
     SvGETMAGIC(sv);
     if (!SvOK(sv)) {
 	if (SvREADONLY(sv))
-	    Perl_croak(aTHX_ PL_no_modify);
+	    Perl_croak(aTHX_ "%s", PL_no_modify);
 	prepare_SV_for_RV(sv);
 	switch (to_what) {
 	case OPpDEREF_SV:
 	    SvRV_set(sv, newSV(0));
 	    break;
 	case OPpDEREF_AV:
-	    SvRV_set(sv, (SV*)newAV());
+	    SvRV_set(sv, MUTABLE_SV(newAV()));
 	    break;
 	case OPpDEREF_HV:
-	    SvRV_set(sv, (SV*)newHV());
+	    SvRV_set(sv, MUTABLE_SV(newHV()));
 	    break;
 	}
 	SvROK_on(sv);
@@ -3032,7 +3035,7 @@ S_method_common(pTHX_ SV* meth, U32* hashp)
 
     SvGETMAGIC(sv);
     if (SvROK(sv))
-	ob = (SV*)SvRV(sv);
+	ob = MUTABLE_SV(SvRV(sv));
     else {
 	GV* iogv;
 
@@ -3048,7 +3051,7 @@ S_method_common(pTHX_ SV* meth, U32* hashp)
 	if (!SvOK(sv) ||
 	    !(packname) ||
 	    !(iogv = gv_fetchsv(sv, 0, SVt_PVIO)) ||
-	    !(ob=(SV*)GvIO(iogv)))
+	    !(ob=MUTABLE_SV(GvIO(iogv))))
 	{
 	    /* this isn't the name of a filehandle either */
 	    if (!packname ||
@@ -3072,14 +3075,14 @@ S_method_common(pTHX_ SV* meth, U32* hashp)
 	    goto fetch;
 	}
 	/* it _is_ a filehandle name -- replace with a reference */
-	*(PL_stack_base + TOPMARK + 1) = sv_2mortal(newRV((SV*)iogv));
+	*(PL_stack_base + TOPMARK + 1) = sv_2mortal(newRV(MUTABLE_SV(iogv)));
     }
 
     /* if we got here, ob should be a reference or a glob */
     if (!ob || !(SvOBJECT(ob)
 		 || (SvTYPE(ob) == SVt_PVGV 
 		     && isGV_with_GP(ob)
-		     && (ob = (SV*)GvIO((GV*)ob))
+		     && (ob = MUTABLE_SV(GvIO((const GV *)ob)))
 		     && SvOBJECT(ob))))
     {
 	Perl_croak(aTHX_ "Can't call method \"%s\" on unblessed reference",
@@ -3097,11 +3100,11 @@ S_method_common(pTHX_ SV* meth, U32* hashp)
     if (hashp) {
 	const HE* const he = hv_fetch_ent(stash, meth, 0, *hashp);
 	if (he) {
-	    gv = (GV*)HeVAL(he);
+	    gv = MUTABLE_GV(HeVAL(he));
 	    if (isGV(gv) && GvCV(gv) &&
 		(!GvCVGEN(gv) || GvCVGEN(gv)
                   == (PL_sub_generation + HvMROMETA(stash)->cache_gen)))
-		return (SV*)GvCV(gv);
+		return MUTABLE_SV(GvCV(gv));
 	}
     }
 
@@ -3110,7 +3113,7 @@ S_method_common(pTHX_ SV* meth, U32* hashp)
 
     assert(gv);
 
-    return isGV(gv) ? (SV*)GvCV(gv) : (SV*)gv;
+    return isGV(gv) ? MUTABLE_SV(GvCV(gv)) : MUTABLE_SV(gv);
 }
 
 /*