From 0017503d59a1f7d4a5837a72bbc6b18bdc25c1b9 Mon Sep 17 00:00:00 2001
From: "Paul \"LeoNerd\" Evans" <leonerd@leonerd.org.uk>
Date: Sat, 3 May 2025 16:21:46 +0100
Subject: [PATCH] Do the required JMPENV dance when invoking a nested runloop
 for defer {} block in order to correctly handle exceptions thrown and caught
 entirely within it

---
 pod/perldelta.pod | 14 +++++++++++++-
 pp_ctl.c          | 30 +++++++++++++++++++++++++++++-
 t/op/defer.t      | 17 ++++++++++++++++-
 t/op/try.t        | 19 +++++++++++++++++++
 4 files changed, 77 insertions(+), 3 deletions(-)

diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index a722ab7cf428..ad5ffb5694d6 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -368,7 +368,19 @@ manager will later use a regex to expand these into links.
 
 =item *
 
-XXX
+Exceptions thrown and caught entirely within a C<defer {}> or C<finally {}>
+block no longer stop the outer run-loop.
+
+Code such as the following would stop running the contents of the C<defer>
+block once the inner exception in the inner C<try>/C<catch> block was caught.
+This has now been fixed, and runs as expected. ([GH #23064]).
+
+    defer {
+        try { die "It breaks\n"; }
+        catch ($e) { warn $e }
+
+        say "This line would never run";
+    }
 
 =back
 
diff --git a/pp_ctl.c b/pp_ctl.c
index ae4a4f2b0b73..7162d5a41855 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -6475,9 +6475,37 @@ _invoke_defer_block(pTHX_ U8 type, void *_arg)
     SAVETMPS;
 
     SAVEOP();
+    OP *was_PL_op = PL_op;
     PL_op = start;
 
-    CALLRUNOPS(aTHX);
+    dJMPENV;
+    int ret;
+    JMPENV_PUSH(ret);
+    switch (ret) {
+    case 0: /* normal start */
+redo_body:
+        CALLRUNOPS(aTHX);
+        break;
+
+    case 3: /* exception happened */
+        if (PL_restartjmpenv == PL_top_env) {
+            if (!PL_restartop)
+                break;
+            PL_restartjmpenv = NULL;
+            PL_op = PL_restartop;
+            PL_restartop = NULL;
+            goto redo_body;
+        }
+
+        /* FALLTHROUGH */
+    default:
+        JMPENV_POP;
+        PL_op = was_PL_op;
+        JMPENV_JUMP(ret);
+        NOT_REACHED;
+    }
+
+    JMPENV_POP;
 
     FREETMPS;
     LEAVE;
diff --git a/t/op/defer.t b/t/op/defer.t
index fd712d9c665c..58f2c71d0f78 100644
--- a/t/op/defer.t
+++ b/t/op/defer.t
@@ -6,7 +6,7 @@ BEGIN {
     set_up_inc('../lib');
 }
 
-plan 28;
+plan 29;
 
 use feature 'defer';
 no warnings 'experimental::defer';
@@ -285,3 +285,18 @@ no warnings 'experimental::defer';
     like($e, qr/^Bareword "foo" not allowed while "strict subs" in use at /,
         'Error from finalization');
 }
+
+# GH#23604
+{
+    my $ok;
+    {
+        defer {
+            eval { die "Ignore this error\n" };
+            $ok .= "k";
+        }
+
+        $ok .= "o";
+    }
+
+    is($ok, "ok", 'eval{die} inside defer does not stop runloop');
+}
diff --git a/t/op/try.t b/t/op/try.t
index 433ba4ff1a8f..d22a9b677a31 100644
--- a/t/op/try.t
+++ b/t/op/try.t
@@ -330,6 +330,25 @@ no warnings 'experimental::try';
     ok($finally_invoked, 'finally block still invoked for side-effects');
 }
 
+# Variant of GH#23604
+{
+    my $ok;
+    try {
+        # nothing
+    }
+    catch ($e) {}
+    finally {
+        try {
+            die "Ignore this error\n"
+        }
+        catch ($e) {}
+
+        $ok = "ok";
+    }
+
+    is($ok, "ok", 'try{die} inside try/finally does not stop runloop');
+}
+
 # Nicer compiletime errors
 {
     my $e;