From 9fed9930ce50e45354ea3630282369d9cbf41332 Mon Sep 17 00:00:00 2001 From: Nicholas Clark Date: Sun, 27 Jun 2010 18:34:36 +0100 Subject: 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. --- pp_ctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pp_ctl.c') 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", -- cgit v1.2.1