only call amagic_deref_call() if we have to

1 files changed, 8 insertions, 5 deletions

diff --git a/pp.c b/pp.c
index b5e93a2f6a..112f4f5f95 100644
--- a/pp.c
+++ b/pp.c
@@ -142,9 +142,10 @@ PP(pp_rv2gv)
     if (!isGV(sv) || SvFAKE(sv)) SvGETMAGIC(sv);
     if (SvROK(sv)) {
       wasref:
-	sv = amagic_deref_call(sv, to_gv_amg);
-	SPAGAIN;
-
+	if (SvAMAGIC(sv)) {
+	    sv = amagic_deref_call(sv, to_gv_amg);
+	    SPAGAIN;
+	}
 	sv = SvRV(sv);
 	if (SvTYPE(sv) == SVt_PVIO) {
 	    GV * const gv = MUTABLE_GV(sv_newmortal());
@@ -284,8 +285,10 @@ PP(pp_rv2sv)
     if (!(PL_op->op_private & OPpDEREFed))
 	SvGETMAGIC(sv);
     if (SvROK(sv)) {
-	sv = amagic_deref_call(sv, to_sv_amg);
-	SPAGAIN;
+	if (SvAMAGIC(sv)) {
+	    sv = amagic_deref_call(sv, to_sv_amg);
+	    SPAGAIN;
+	}
 
 	sv = SvRV(sv);
 	switch (SvTYPE(sv)) {