Inline tryAMAGICunDEREF_var() into its callers and eliminate it.

Nothing outside the core was using this macro.

1 files changed, 3 insertions, 2 deletions

diff --git a/sv.c b/sv.c
index aefcde879b..f3010af387 100644
--- a/sv.c
+++ b/sv.c
@@ -8729,9 +8729,10 @@ Perl_sv_2cv(pTHX_ SV *sv, HV **const st, GV **const gvp, const I32 lref)
 
     default:
 	if (SvROK(sv)) {
-	    SV * const *sp = &sv;	/* Used in tryAMAGICunDEREF macro. */
 	    SvGETMAGIC(sv);
-	    tryAMAGICunDEREF(to_cv);
+	    sv = amagic_deref_call(sv, to_cv_amg);
+	    /* At this point I'd like to do SPAGAIN, but really I need to
+	       force it upon my callers. Hmmm. This is a mess... */
 
 	    sv = SvRV(sv);
 	    if (SvTYPE(sv) == SVt_PVCV) {