Replace sv_newmortal + sv_setsv_nomg with sv_mortalcopy_flags

Creating a new mortal copy of an existing SV can also be done via: * `newsv = sv_newmortal();` * `sv_setsv_nomg(newsv, sv);` The same outcome can be achieved in a single function call: * `newsv = sv_mortalcopy_flags(sv, SV_DO_COW_SVSETSV);`
Perl · Feb 3, 2025 · fb6608f · fb6608f
1 parent 54858f1
commit fb6608f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 12 deletions.
diff --git a/pp.c b/pp.c
@@ -4063,8 +4063,7 @@ PP(pp_chr)
         {
             if (ckWARN(WARN_UTF8)) {
                 if (SvGMAGICAL(top)) {
-                    SV *top2 = sv_newmortal();
-                    sv_setsv_nomg(top2, top);
+                    SV *top2 = sv_mortalcopy_flags(top, SV_DO_COW_SVSETSV);
                     top = top2;
                 }
                 Perl_warner(aTHX_ packWARN(WARN_UTF8),

diff --git a/pp_ctl.c b/pp_ctl.c
@@ -4738,8 +4738,7 @@ S_require_file(pTHX_ SV *sv)
                         loader = *av_fetch(AV_FROM_REF(loader), 0, TRUE);
                         if (SvGMAGICAL(loader)) {
                             SvGETMAGIC(loader);
-                            SV *l = sv_newmortal();
-                            sv_setsv_nomg(l, loader);
+                            SV *l = sv_mortalcopy_flags(loader, SV_DO_COW_SVSETSV);
                             loader = l;
                         }
                     }

diff --git a/pp_hot.c b/pp_hot.c
@@ -6745,8 +6745,7 @@ Perl_vivify_ref(pTHX_ SV *sv, U32 to_what)
     if (SvGMAGICAL(sv)) {
         /* copy the sv without magic to prevent magic from being
            executed twice */
-        SV* msv = sv_newmortal();
-        sv_setsv_nomg(msv, sv);
+        SV* msv = sv_mortalcopy_flags(sv, SV_DO_COW_SVSETSV);
         return msv;
     }
     return sv;

diff --git a/pp_sys.c b/pp_sys.c
@@ -563,14 +563,12 @@ PP_wrapped(pp_warn, 0, 1)
       SvGETMAGIC(errsv);
       if (SvROK(errsv)) {
         if (SvGMAGICAL(errsv)) {
-            exsv = sv_newmortal();
-            sv_setsv_nomg(exsv, errsv);
+            exsv = sv_mortalcopy_flags(errsv, SV_DO_COW_SVSETSV);
         }
         else exsv = errsv;
       }
       else if (SvPOKp(errsv) ? SvCUR(errsv) : SvNIOKp(errsv)) {
-        exsv = sv_newmortal();
-        sv_setsv_nomg(exsv, errsv);
+        exsv = sv_mortalcopy_flags(errsv, SV_DO_COW_SVSETSV);
         sv_catpvs(exsv, "\t...caught");
       }
       else {

diff --git a/sv.c b/sv.c
@@ -10316,8 +10316,7 @@ Perl_sv_2io(pTHX_ SV *const sv)
         if (!io) {
             SV *newsv = sv;
             if (SvGMAGICAL(sv)) {
-                newsv = sv_newmortal();
-                sv_setsv_nomg(newsv, sv);
+                newsv = sv_mortalcopy_flags(sv, SV_DO_COW_SVSETSV);
             }
             Perl_croak(aTHX_ "Bad filehandle: %" SVf, SVfARG(newsv));
         }