summaryrefslogtreecommitdiff
path: root/pp_ctl.c
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2010-06-27 18:34:36 +0100
committerNicholas Clark <nick@ccl4.org>2010-06-27 18:42:03 +0100
commit9fed9930ce50e45354ea3630282369d9cbf41332 (patch)
treebbff8153b688078490f75948769e9c7d65f92c9c /pp_ctl.c
parenta009834b5bcd633e6446e235821ffdb3091b62b8 (diff)
downloadperl-9fed9930ce50e45354ea3630282369d9cbf41332.tar.gz
Return DIE(...) to *return*ing Perl_die(...).
Much simplification ensues - witness the diffstat. Changes Perl_die_unwind() to use Perl_croak() rather than DIE(). Reverses an unwise part of bb4c52e023e0fcad. Reverts 9e95c6350a60744d and 805bf316c58ab2d7.
Diffstat (limited to 'pp_ctl.c')
-rw-r--r--pp_ctl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/pp_ctl.c b/pp_ctl.c
index 7b94587fd2..28fc6ffdb3 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -1635,8 +1635,8 @@ Perl_die_unwind(pTHX_ SV *msv)
* supposed to trap errors. So now that we've popped the
* EVAL that pp_require pushed, and processed the error
* message, rethrow the error */
- DIE(aTHX_ "%sCompilation failed in require",
- *msg ? msg : "Unknown error\n");
+ Perl_croak(aTHX_ "%sCompilation failed in require",
+ *msg ? msg : "Unknown error\n");
}
if (in_eval & EVAL_KEEPERR) {
Perl_ck_warner(aTHX_ packWARN(WARN_MISC), "\t(in cleanup) %s",