This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Re: [PATCH scope.c] Re: local($tied->{foo}) leaks
[perl5.git] / pp_hot.c
index 98229a2..de2dec4 100644 (file)
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -1699,17 +1699,8 @@ PP(pp_helem)
                    STRLEN keylen;
                    char *key = SvPV(keysv, keylen);
                    SAVEDELETE(hv, savepvn(key,keylen), keylen);
-               } else {
-                   SV *sv;
+               } else
                    save_helem(hv, keysv, svp);
-                   sv = *svp;
-                   /* If we're localizing a tied hash element, this new
-                    * sv won't actually be stored in the hash - so it
-                    * won't get reaped when the localize ends. Ensure it
-                    * gets reaped by mortifying it instead. DAPM */
-                   if (SvTIED_mg(sv, PERL_MAGIC_tiedelem))
-                       sv_2mortal(sv);
-               }
             }
        }
        else if (PL_op->op_private & OPpDEREF)
@@ -2964,17 +2955,8 @@ PP(pp_aelem)
            PUSHs(lv);
            RETURN;
        }
-       if (PL_op->op_private & OPpLVAL_INTRO) {
-           SV *sv;
+       if (PL_op->op_private & OPpLVAL_INTRO)
            save_aelem(av, elem, svp);
-           sv = *svp;
-           /* If we're localizing a tied array element, this new sv
-            * won't actually be stored in the array - so it won't get
-            * reaped when the localize ends. Ensure it gets reaped by
-            * mortifying it instead. DAPM */
-           if (SvTIED_mg(sv, PERL_MAGIC_tiedelem))
-               sv_2mortal(sv);
-       }
        else if (PL_op->op_private & OPpDEREF)
            vivify_ref(*svp, PL_op->op_private & OPpDEREF);
     }