X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pp_hot.c;h=72f657d08c75f0f7639cba8aac150d6353c8ec23;hb=b1ddf169801254979af17f682f37e96143b35982;hp=35558f17cb8b3e2b38140f7fd205476806754912;hpb=aec46f14fac1bc74bf8ad4054a6f9674b324f8d2;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/pp_hot.c b/pp_hot.c
index 35558f1..72f657d 100644
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -169,8 +169,7 @@ PP(pp_concat)
     }
     else { /* TARG == left */
         STRLEN llen;
-	if (SvGMAGICAL(left))
-	    mg_get(left);		/* or mg_get(left) may happen here */
+	SvGETMAGIC(left);		/* or mg_get(left) may happen here */
 	if (!SvOK(TARG))
 	    sv_setpvn(left, "", 0);
 	(void)SvPV_nomg_const(left, llen);    /* Needed to set UTF8 flag */
@@ -350,8 +349,7 @@ PP(pp_dor)
 	    RETURN;
 	break;
     default:
-	if (SvGMAGICAL(sv))
-	    mg_get(sv);
+	SvGETMAGIC(sv);
 	if (SvOK(sv))
 	    RETURN;
     }
@@ -1611,8 +1609,8 @@ Perl_do_readline(pTHX)
 	     const STRLEN len = SvCUR(sv) - offset;
 	     const U8 *f;
 	     
-	     if (!Perl_is_utf8_string_loc(aTHX_ s, len, &f)
-	        && ckWARN(WARN_UTF8))
+	     if (ckWARN(WARN_UTF8) &&
+		    !Perl_is_utf8_string_loc(aTHX_ s, len, &f))
 		  /* Emulate :encoding(utf8) warning in the same case. */
 		  Perl_warner(aTHX_ packWARN(WARN_UTF8),
 			      "utf8 \"\\x%02X\" does not map to Unicode",
@@ -2441,7 +2439,10 @@ PP(pp_leavesublv)
 	    MARK = newsp + 1;
 	    EXTEND_MORTAL(1);
 	    if (MARK == SP) {
-		if (SvFLAGS(TOPs) & (SVs_TEMP | SVs_PADTMP | SVf_READONLY)) {
+		/* Temporaries are bad unless they happen to be elements
+		 * of a tied hash or array */
+		if (SvFLAGS(TOPs) & (SVs_TEMP | SVs_PADTMP | SVf_READONLY) &&
+		    !(SvRMAGICAL(TOPs) && mg_find(TOPs, PERL_MAGIC_tiedelem))) {
 		    LEAVE;
 		    cxstack_ix--;
 		    POPSUB(cx,sv);
@@ -2911,8 +2912,7 @@ PP(pp_aelem)
 void
 Perl_vivify_ref(pTHX_ SV *sv, U32 to_what)
 {
-    if (SvGMAGICAL(sv))
-	mg_get(sv);
+    SvGETMAGIC(sv);
     if (!SvOK(sv)) {
 	if (SvREADONLY(sv))
 	    Perl_croak(aTHX_ PL_no_modify);
@@ -2982,8 +2982,7 @@ S_method_common(pTHX_ SV* meth, U32* hashp)
     if (!sv)
 	Perl_croak(aTHX_ "Can't call method \"%s\" on an undefined value", name);
 
-    if (SvGMAGICAL(sv))
-	mg_get(sv);
+    SvGETMAGIC(sv);
     if (SvROK(sv))
 	ob = (SV*)SvRV(sv);
     else {