Take code that occurs in three places to take a scalar and ready it to

hold a reference, and convert it to a macro define prepare_SV_for_RV().

p4raw-id: //depot/perl@32737

1 files changed, 2 insertions, 6 deletions

diff --git a/sv.c b/sv.c
index 7b49ce21e5..577c13415e 100644
--- a/sv.c
+++ b/sv.c
@@ -7857,12 +7857,8 @@ Perl_newSVrv(pTHX_ SV *rv, const char *classname)
 	sv_upgrade(rv, SVt_IV);
     } else if (SvROK(rv)) {
 	SvREFCNT_dec(SvRV(rv));
-    } else if (SvTYPE(rv) < SVt_PV && SvTYPE(rv) != SVt_IV)
-	sv_upgrade(rv, SVt_IV);
-    else if (SvTYPE(rv) >= SVt_PV) {
-	SvPV_free(rv);
-	SvCUR_set(rv, 0);
-	SvLEN_set(rv, 0);
+    } else {
+	prepare_SV_for_RV(rv);
     }
 
     SvOK_off(rv);