By changing SvVOK() from returning 0/1 to 0/pointer-to-magic we can

save duplicating mg_find calls, without changing the semantics in any
boolean context.

p4raw-id: //depot/perl@26979

1 files changed, 7 insertions, 5 deletions

diff --git a/sv.c b/sv.c
index 913d4c85b7..f48aa8bf82 100644
--- a/sv.c
+++ b/sv.c
@@ -3417,11 +3417,13 @@ Perl_sv_setsv_flags(pTHX_ SV *dstr, register SV *sstr, I32 flags)
 		SvIsUV_on(dstr);
 	    SvIV_set(dstr, SvIVX(sstr));
 	}
-	if (SvVOK(sstr)) {
-	    const MAGIC * const smg = mg_find(sstr,PERL_MAGIC_vstring);
-	    sv_magic(dstr, NULL, PERL_MAGIC_vstring,
-			smg->mg_ptr, smg->mg_len);
-	    SvRMAGICAL_on(dstr);
+	{
+	    const MAGIC * const smg = SvVOK(sstr);
+	    if (smg) {
+		sv_magic(dstr, NULL, PERL_MAGIC_vstring,
+			 smg->mg_ptr, smg->mg_len);
+		SvRMAGICAL_on(dstr);
+	    }
 	}
     }
     else if (sflags & SVp_IOK) {