Inline tryAMAGICunDEREF_var() into its callers and eliminate it.

Nothing outside the core was using this macro.

1 files changed, 4 insertions, 3 deletions

diff --git a/pp_hot.c b/pp_hot.c
index a3fea5ca7a..9beb604ea6 100644
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -827,7 +827,8 @@ PP(pp_rv2av)
     if (!(PL_op->op_private & OPpDEREFed))
 	SvGETMAGIC(sv);
     if (SvROK(sv)) {
-	tryAMAGICunDEREF_var(is_pp_rv2av ? to_av_amg : to_hv_amg);
+	sv = amagic_deref_call(sv, is_pp_rv2av ? to_av_amg : to_hv_amg);
+	SPAGAIN;
 
 	sv = SvRV(sv);
 	if (SvTYPE(sv) != type)
@@ -2770,8 +2771,8 @@ PP(pp_entersub)
 	}
 	SvGETMAGIC(sv);
 	if (SvROK(sv)) {
-	    SV * const * sp = &sv;	/* Used in tryAMAGICunDEREF macro. */
-	    tryAMAGICunDEREF(to_cv);
+	    sv = amagic_deref_call(sv, to_cv_amg);
+	    /* Don't SPAGAIN here.  */
 	}
 	else {
 	    const char *sym;