From: Nicholas Clark <nick@ccl4.org>
Date: Sat, 4 Nov 2006 18:56:33 +0000 (+0000)
Subject: Change 27506 wasn't quite correct - the copy of the AMAGIC flag should
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=96d4b0ee18db074ad085f9a9d1710201f6a87763;p=p5sagit%2Fp5-mst-13.2.git

Change 27506 wasn't quite correct - the copy of the AMAGIC flag should
be as part of RvDEEPCP() in gv.c (Perl_amagic_call())

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

diff --git a/gv.c b/gv.c
index 9ad4434..29d2f60 100644
--- a/gv.c
+++ b/gv.c
@@ -1723,6 +1723,12 @@ Perl_amagic_call(pTHX_ SV *left, SV *right, int method, int flags)
 		 */
 		SV* const newref = newSVsv(tmpRef);
 		SvOBJECT_on(newref);
+		/* As a bit of a source compatibility hack, SvAMAGIC() and
+		   friends dereference an RV, to behave the same was as when
+		   overloading was stored on the reference, not the referant.
+		   Hence we can't use SvAMAGIC_on()
+		*/
+		SvFLAGS(newref) |= SVf_AMAGIC;
 		SvSTASH_set(newref, (HV*)SvREFCNT_inc(SvSTASH(tmpRef)));
 		return newref;
 	     }
diff --git a/sv.c b/sv.c
index a959d66..eb3796f 100644
--- a/sv.c
+++ b/sv.c
@@ -3583,7 +3583,7 @@ Perl_sv_setsv_flags(pTHX_ SV *dstr, register SV *sstr, I32 flags)
 	}
 	(void)SvOK_off(dstr);
 	SvRV_set(dstr, SvREFCNT_inc(SvRV(sstr)));
-	SvFLAGS(dstr) |= sflags & (SVf_ROK|SVf_AMAGIC);
+	SvFLAGS(dstr) |= sflags & SVf_ROK;
 	assert(!(sflags & SVp_NOK));
 	assert(!(sflags & SVp_IOK));
 	assert(!(sflags & SVf_NOK));
@@ -3736,8 +3736,7 @@ Perl_sv_setsv_flags(pTHX_ SV *dstr, register SV *sstr, I32 flags)
 	    if (sflags & SVf_IVisUV)
 		SvIsUV_on(dstr);
 	}
-	SvFLAGS(dstr) |= sflags & (SVf_IOK|SVp_IOK|SVf_NOK|SVp_NOK|SVf_UTF8
-				   |SVf_AMAGIC);
+	SvFLAGS(dstr) |= sflags & (SVf_IOK|SVp_IOK|SVf_NOK|SVp_NOK|SVf_UTF8);
 	{
 	    const MAGIC * const smg = SvVSTRING_mg(sstr);
 	    if (smg) {
@@ -3749,8 +3748,7 @@ Perl_sv_setsv_flags(pTHX_ SV *dstr, register SV *sstr, I32 flags)
     }
     else if (sflags & (SVp_IOK|SVp_NOK)) {
 	(void)SvOK_off(dstr);
-	SvFLAGS(dstr) |= sflags & (SVf_IOK|SVp_IOK|SVf_IVisUV|SVf_NOK|SVp_NOK
-				   |SVf_AMAGIC);
+	SvFLAGS(dstr) |= sflags & (SVf_IOK|SVp_IOK|SVf_IVisUV|SVf_NOK|SVp_NOK);
 	if (sflags & SVp_IOK) {
 	    /* XXXX Do we want to set IsUV for IV(ROK)?  Be extra safe... */
 	    SvIV_set(dstr, SvIVX(sstr));
@@ -3770,7 +3768,6 @@ Perl_sv_setsv_flags(pTHX_ SV *dstr, register SV *sstr, I32 flags)
 	    SvFAKE_off(sstr);
 	    gv_efullname3(dstr, (GV *)sstr, "*");
 	    SvFLAGS(sstr) |= wasfake;
-	    SvFLAGS(dstr) |= sflags & SVf_AMAGIC;
 	}
 	else
 	    (void)SvOK_off(dstr);