Refactor the common soft-reference code from pp_rv2sv and pp_rv2av

into a single routine Perl_softref2xv(). As soft references are
rarely used compared with true references, move this code from pp_hot.c

p4raw-id: //depot/perl@29905

1 files changed, 4 insertions, 32 deletions

diff --git a/pp_hot.c b/pp_hot.c
index 821f3b16b8..dabdc97c66 100644
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -836,38 +836,10 @@ PP(pp_rv2av)
 		    if (SvROK(sv))
 			goto wasref;
 		}
-		if (PL_op->op_private & HINT_STRICT_REFS) {
-		    if (SvOK(sv))
-			DIE(aTHX_ PL_no_symref_sv, sv,
-			    is_pp_rv2av ? an_array : a_hash);
-		    else
-			DIE(aTHX_ PL_no_usym, is_pp_rv2av ? an_array : a_hash);
-		}
-		if (!SvOK(sv)) {
-		    if (PL_op->op_flags & OPf_REF)
-			DIE(aTHX_ PL_no_usym, is_pp_rv2av ? an_array : a_hash);
-		    if (ckWARN(WARN_UNINITIALIZED))
-			report_uninit(sv);
-		    if (gimme == G_ARRAY) {
-			SP--;
-			RETURN;
-		    }
-		    RETSETUNDEF;
-		}
-		if ((PL_op->op_flags & OPf_SPECIAL) &&
-		    !(PL_op->op_flags & OPf_MOD))
-		{
-		    gv = (GV*)gv_fetchsv(sv, 0, type);
-		    if (!gv
-			&& (!is_gv_magical_sv(sv,0)
-			    || !(gv = (GV*)gv_fetchsv(sv, GV_ADD, type))))
-		    {
-			RETSETUNDEF;
-		    }
-		}
-		else {
-		    gv = (GV*)gv_fetchsv(sv, GV_ADD, type);
-		}
+		gv = Perl_softref2xv(aTHX_ sv, is_pp_rv2av ? an_array : a_hash,
+				     type, &sp);
+		if (!gv)
+		    RETURN;
 	    }
 	    else {
 		gv = (GV*)sv;