move JMPENV_JUMP to die_where and mark it as "noreturn"

1 files changed, 3 insertions, 15 deletions

diff --git a/util.c b/util.c
index f2702129f7..5e5758dadd 100644
--- a/util.c
+++ b/util.c
@@ -1364,8 +1364,7 @@ S_vdie(pTHX_ const char* pat, va_list *args)
 
     message = vdie_croak_common(pat, args);
 
-    PL_restartop = die_where(message);
-    JMPENV_JUMP(3);
+    die_where(message);
     /* NOTREACHED */
     return NULL;
 }
@@ -1403,13 +1402,7 @@ Perl_vcroak(pTHX_ const char* pat, va_list *args)
 
     msv = S_vdie_croak_common(aTHX_ pat, args);
 
-    if (PL_in_eval) {
-	PL_restartop = die_where(msv);
-	JMPENV_JUMP(3);
-    }
-
-    write_to_stderr( msv ? msv : ERRSV );
-    my_failure_exit();
+    die_where(msv);
 }
 
 #if defined(PERL_IMPLICIT_CONTEXT)
@@ -1564,12 +1557,7 @@ Perl_vwarner(pTHX_ U32  err, const char* pat, va_list* args)
 	    assert(msv);
 	    S_vdie_common(aTHX_ msv, FALSE);
 	}
-	if (PL_in_eval) {
-	    PL_restartop = die_where(msv);
-	    JMPENV_JUMP(3);
-	}
-	write_to_stderr(msv);
-	my_failure_exit();
+	die_where(msv);
     }
     else {
 	Perl_vwarn(aTHX_ pat, args);