Stop calling Perl_die manually

Leont · mauke · commit 79ae12aeb4e6 · 2025-03-18T04:16:51.000+01:00
Call die() instead.
diff --git a/builtin.c b/builtin.c
@@ -221,7 +221,7 @@ XS(XS_builtin_func1_scalar)
             break;
 
         default:
-            Perl_die(aTHX_ "panic: unhandled opcode %" IVdf
+            die("panic: unhandled opcode %" IVdf
                            " for xs_builtin_func1_scalar()", (IV) ix);
     }
 
@@ -392,7 +392,7 @@ XS(XS_builtin_func1_void)
             break;
 
         default:
-            Perl_die(aTHX_ "panic: unhandled opcode %" IVdf
+            die("panic: unhandled opcode %" IVdf
                            " for xs_builtin_func1_void()", (IV) ix);
     }
 
diff --git a/doio.c b/doio.c
@@ -2632,11 +2632,11 @@ Perl_apply(pTHX_ I32 type, SV **mark, SV **sp)
        platforms where kill was not defined.  */
 #ifndef HAS_KILL
     if (type == OP_KILL)
-        Perl_die(aTHX_ PL_no_func, what);
+        die(PL_no_func, what);
 #endif
 #ifndef HAS_CHOWN
     if (type == OP_CHOWN)
-        Perl_die(aTHX_ PL_no_func, what);
+        die(PL_no_func, what);
 #endif
 
 
@@ -2675,7 +2675,7 @@ Perl_apply(pTHX_ I32 type, SV **mark, SV **sp)
                         } else if (fchmod(fd, val))
                             tot--;
 #else
-                        Perl_die(aTHX_ PL_no_func, "fchmod");
+                        die(PL_no_func, "fchmod");
 #endif
                     }
                     else {
@@ -2716,7 +2716,7 @@ Perl_apply(pTHX_ I32 type, SV **mark, SV **sp)
                         } else if (fchown(fd, val, val2))
                             tot--;
 #else
-                        Perl_die(aTHX_ PL_no_func, "fchown");
+                        die(PL_no_func, "fchown");
 #endif
                     }
                     else {
@@ -2908,7 +2908,7 @@ nothing in the core.
                         } else if (futimes(fd, (struct timeval *) utbufp))
                             tot--;
 #else
-                        Perl_die(aTHX_ PL_no_func, "futimes");
+                        die(PL_no_func, "futimes");
 #endif
                     }
                     else {
diff --git a/gv.c b/gv.c
@@ -3107,7 +3107,7 @@ Perl_gp_free(pTHX_ GV *gv)
        && !gp->gp_form) break;
 
       if (--attempts == 0) {
-        Perl_die(aTHX_
+        die(
           "panic: gp_free failed to free glob pointer - "
           "something is repeatedly re-creating entries"
         );
diff --git a/hv.c b/hv.c
@@ -3499,7 +3499,7 @@ Perl_hv_placeholders_p(pTHX_ HV *hv)
         mg = sv_magicext(MUTABLE_SV(hv), 0, PERL_MAGIC_rhash, 0, 0, 0);
 
         if (!mg) {
-            Perl_die(aTHX_ "panic: hv_placeholders_p");
+            die("panic: hv_placeholders_p");
         }
     }
     return &(mg->mg_len);
@@ -3543,7 +3543,7 @@ Perl_hv_placeholders_set(pTHX_ HV *hv, I32 ph)
         mg->mg_len = ph;
     } else if (ph) {
         if (!sv_magicext(MUTABLE_SV(hv), 0, PERL_MAGIC_rhash, 0, 0, ph))
-            Perl_die(aTHX_ "panic: hv_placeholders_set");
+            die("panic: hv_placeholders_set");
     }
     /* else we don't need to add magic to record 0 placeholders.  */
 }
diff --git a/mg.c b/mg.c
@@ -1440,7 +1440,7 @@ Perl_magic_set_all_env(pTHX_ SV *sv, MAGIC *mg)
     PERL_ARGS_ASSERT_MAGIC_SET_ALL_ENV;
     PERL_UNUSED_ARG(mg);
 #if defined(VMS)
-    Perl_die(aTHX_ "Can't make list assignment to %%ENV on this system");
+    die("Can't make list assignment to %%ENV on this system");
 #else
     if (PL_localizing) {
         HE* entry;
@@ -1463,7 +1463,7 @@ Perl_magic_clear_all_env(pTHX_ SV *sv, MAGIC *mg)
     PERL_UNUSED_ARG(sv);
     PERL_UNUSED_ARG(mg);
 #if defined(VMS)
-    Perl_die(aTHX_ "Can't make list assignment to %%ENV on this system");
+    die("Can't make list assignment to %%ENV on this system");
 #else
     my_clearenv();
 #endif
diff --git a/pp.c b/pp.c
@@ -115,7 +115,7 @@ S_rv2gv(pTHX_ SV *sv, const bool vivify_sv, const bool strict,
             sv = MUTABLE_SV(gv);
         }
         else if (!isGV_with_GP(sv)) {
-            Perl_die(aTHX_ "Not a GLOB reference");
+            die("Not a GLOB reference");
         }
     }
     else {
@@ -143,7 +143,7 @@ S_rv2gv(pTHX_ SV *sv, const bool vivify_sv, const bool strict,
                     goto wasref;
                 }
                 if (PL_op->op_flags & OPf_REF || strict) {
-                    Perl_die(aTHX_ PL_no_usym, "a symbol");
+                    die(PL_no_usym, "a symbol");
                 }
                 if (ckWARN(WARN_UNINITIALIZED))
                     report_uninit(sv);
@@ -158,7 +158,7 @@ S_rv2gv(pTHX_ SV *sv, const bool vivify_sv, const bool strict,
             }
             else {
                 if (strict) {
-                    Perl_die(aTHX_
+                    die(
                              PL_no_symref_sv,
                              sv,
                              (SvPOKp(sv) && SvCUR(sv)>32 ? "..." : ""),
@@ -223,16 +223,16 @@ Perl_softref2xv(pTHX_ SV *const sv, const char *const what,
 
     if (PL_op->op_private & HINT_STRICT_REFS) {
         if (SvOK(sv))
-            Perl_die(aTHX_ PL_no_symref_sv, sv,
+            die(PL_no_symref_sv, sv,
                      (SvPOKp(sv) && SvCUR(sv)>32 ? "..." : ""), what);
         else
-            Perl_die(aTHX_ PL_no_usym, what);
+            die(PL_no_usym, what);
     }
     if (!SvOK(sv)) {
         if (
           PL_op->op_flags & OPf_REF
         )
-            Perl_die(aTHX_ PL_no_usym, what);
+            die(PL_no_usym, what);
         if (ckWARN(WARN_UNINITIALIZED))
             report_uninit(sv);
         if (type != SVt_PV && GIMME_V == G_LIST) {
diff --git a/pp_ctl.c b/pp_ctl.c
@@ -6767,7 +6767,7 @@ S_doparseform(pTHX_ SV *sv)
     mg->mg_flags |= MGf_REFCOUNTED;
 
     if (unchopnum && repeat)
-        Perl_die(aTHX_ "Repeated format line will never terminate (~~ and @#)");
+        die("Repeated format line will never terminate (~~ and @#)");
 
     return mg;
 }
diff --git a/pp_hot.c b/pp_hot.c
@@ -2748,7 +2748,7 @@ S_aassign_uid(pTHX)
 #  endif /* HAS_SETEUID */
         if (PL_delaymagic & DM_UID) {
             if (PL_delaymagic_uid != PL_delaymagic_euid)
-                Perl_die(aTHX_ "No setreuid available");
+                die("No setreuid available");
             PERL_UNUSED_RESULT(PerlProc_setuid(PL_delaymagic_uid));
         }
 #endif /* HAS_SETRESUID */
@@ -2783,7 +2783,7 @@ S_aassign_uid(pTHX)
 #  endif /* HAS_SETEGID */
         if (PL_delaymagic & DM_GID) {
             if (PL_delaymagic_gid != PL_delaymagic_egid)
-                Perl_die(aTHX_ "No setregid available");
+                die("No setregid available");
             PERL_UNUSED_RESULT(PerlProc_setgid(PL_delaymagic_gid));
         }
 #endif /* HAS_SETRESGID */
@@ -4427,13 +4427,13 @@ S_softref2xv_lite(pTHX_ SV *const sv, const char *const what,
 {
     if (PL_op->op_private & HINT_STRICT_REFS) {
         if (SvOK(sv))
-            Perl_die(aTHX_ PL_no_symref_sv, sv,
+            die(PL_no_symref_sv, sv,
                      (SvPOKp(sv) && SvCUR(sv)>32 ? "..." : ""), what);
         else
-            Perl_die(aTHX_ PL_no_usym, what);
+            die(PL_no_usym, what);
     }
     if (!SvOK(sv))
-        Perl_die(aTHX_ PL_no_usym, what);
+        die(PL_no_usym, what);
     return gv_fetchsv_nomg(sv, GV_ADD, type);
 }
 
diff --git a/sv.c b/sv.c
@@ -13508,7 +13508,7 @@ Perl_sv_vcatpvfn_flags(pTHX_ SV *const sv, const char *const pat, const STRLEN p
                 int i = PERL_INT_MIN;
                 (void)Perl_frexp((NV)fv, &i);
                 if (i == PERL_INT_MIN)
-                    Perl_die(aTHX_ "panic: frexp: %" VCATPVFN_FV_GF, fv);
+                    die("panic: frexp: %" VCATPVFN_FV_GF, fv);
 
                 if (i > 0) {
                     digits = BIT_DIGITS(i);
diff --git a/toke.c b/toke.c
@@ -4961,7 +4961,7 @@ Perl_filter_del(pTHX_ filter_t funcp)
         return;
     }
     /* we need to search for the correct entry and clear it	*/
-    Perl_die(aTHX_ "filter_del can only delete in reverse order (currently)");
+    die("filter_del can only delete in reverse order (currently)");
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ XS(XS_builtin_func1_scalar)`
`221`	`221`	`break;`
`222`	`222`
`223`	`223`	`default:`
`224`		`- Perl_die(aTHX_ "panic: unhandled opcode %" IVdf`
	`224`	`+ die("panic: unhandled opcode %" IVdf`
`225`	`225`	`" for xs_builtin_func1_scalar()", (IV) ix);`
`226`	`226`	`}`
`227`	`227`
`@@ -392,7 +392,7 @@ XS(XS_builtin_func1_void)`
`392`	`392`	`break;`
`393`	`393`
`394`	`394`	`default:`
`395`		`- Perl_die(aTHX_ "panic: unhandled opcode %" IVdf`
	`395`	`+ die("panic: unhandled opcode %" IVdf`
`396`	`396`	`" for xs_builtin_func1_void()", (IV) ix);`
`397`	`397`	`}`
`398`	`398`
Original file line number	Diff line number	Diff line change
`@@ -3499,7 +3499,7 @@ Perl_hv_placeholders_p(pTHX_ HV *hv)`
`3499`	`3499`	`mg = sv_magicext(MUTABLE_SV(hv), 0, PERL_MAGIC_rhash, 0, 0, 0);`
`3500`	`3500`
`3501`	`3501`	`if (!mg) {`
`3502`		`- Perl_die(aTHX_ "panic: hv_placeholders_p");`
	`3502`	`+ die("panic: hv_placeholders_p");`
`3503`	`3503`	`}`
`3504`	`3504`	`}`
`3505`	`3505`	`return &(mg->mg_len);`
`@@ -3543,7 +3543,7 @@ Perl_hv_placeholders_set(pTHX_ HV *hv, I32 ph)`
`3543`	`3543`	`mg->mg_len = ph;`
`3544`	`3544`	`} else if (ph) {`
`3545`	`3545`	`if (!sv_magicext(MUTABLE_SV(hv), 0, PERL_MAGIC_rhash, 0, 0, ph))`
`3546`		`- Perl_die(aTHX_ "panic: hv_placeholders_set");`
	`3546`	`+ die("panic: hv_placeholders_set");`
`3547`	`3547`	`}`
`3548`	`3548`	`/* else we don't need to add magic to record 0 placeholders. */`
`3549`	`3549`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ S_rv2gv(pTHX_ SV *sv, const bool vivify_sv, const bool strict,`
`115`	`115`	`sv = MUTABLE_SV(gv);`
`116`	`116`	`}`
`117`	`117`	`else if (!isGV_with_GP(sv)) {`
`118`		`- Perl_die(aTHX_ "Not a GLOB reference");`
	`118`	`+ die("Not a GLOB reference");`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`	`else {`
`@@ -143,7 +143,7 @@ S_rv2gv(pTHX_ SV *sv, const bool vivify_sv, const bool strict,`
`143`	`143`	`goto wasref;`
`144`	`144`	`}`
`145`	`145`	`if (PL_op->op_flags & OPf_REF \|\| strict) {`
`146`		`- Perl_die(aTHX_ PL_no_usym, "a symbol");`
	`146`	`+ die(PL_no_usym, "a symbol");`
`147`	`147`	`}`
`148`	`148`	`if (ckWARN(WARN_UNINITIALIZED))`
`149`	`149`	`report_uninit(sv);`
`@@ -158,7 +158,7 @@ S_rv2gv(pTHX_ SV *sv, const bool vivify_sv, const bool strict,`
`158`	`158`	`}`
`159`	`159`	`else {`
`160`	`160`	`if (strict) {`
`161`		`- Perl_die(aTHX_`
	`161`	`+ die(`
`162`	`162`	`PL_no_symref_sv,`
`163`	`163`	`sv,`
`164`	`164`	`(SvPOKp(sv) && SvCUR(sv)>32 ? "..." : ""),`
`@@ -223,16 +223,16 @@ Perl_softref2xv(pTHX_ SV const sv, const char const what,`
`223`	`223`
`224`	`224`	`if (PL_op->op_private & HINT_STRICT_REFS) {`
`225`	`225`	`if (SvOK(sv))`
`226`		`- Perl_die(aTHX_ PL_no_symref_sv, sv,`
	`226`	`+ die(PL_no_symref_sv, sv,`
`227`	`227`	`(SvPOKp(sv) && SvCUR(sv)>32 ? "..." : ""), what);`
`228`	`228`	`else`
`229`		`- Perl_die(aTHX_ PL_no_usym, what);`
	`229`	`+ die(PL_no_usym, what);`
`230`	`230`	`}`
`231`	`231`	`if (!SvOK(sv)) {`
`232`	`232`	`if (`
`233`	`233`	`PL_op->op_flags & OPf_REF`
`234`	`234`	`)`
`235`		`- Perl_die(aTHX_ PL_no_usym, what);`
	`235`	`+ die(PL_no_usym, what);`
`236`	`236`	`if (ckWARN(WARN_UNINITIALIZED))`
`237`	`237`	`report_uninit(sv);`
`238`	`238`	`if (type != SVt_PV && GIMME_V == G_LIST) {`
Original file line number	Diff line number	Diff line change
`@@ -6767,7 +6767,7 @@ S_doparseform(pTHX_ SV *sv)`
`6767`	`6767`	`mg->mg_flags \|= MGf_REFCOUNTED;`
`6768`	`6768`
`6769`	`6769`	`if (unchopnum && repeat)`
`6770`		`- Perl_die(aTHX_ "Repeated format line will never terminate (~~ and @#)");`
	`6770`	`+ die("Repeated format line will never terminate (~~ and @#)");`
`6771`	`6771`
`6772`	`6772`	`return mg;`
`6773`	`6773`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4961,7 +4961,7 @@ Perl_filter_del(pTHX_ filter_t funcp)`
`4961`	`4961`	`return;`
`4962`	`4962`	`}`
`4963`	`4963`	`/* we need to search for the correct entry and clear it */`
`4964`		`- Perl_die(aTHX_ "filter_del can only delete in reverse order (currently)");`
	`4964`	`+ die("filter_del can only delete in reverse order (currently)");`
`4965`	`4965`	`}`
`4966`	`4966`
`4967`	`4967`