From 53ff0cb5269220cc3eb88dd0722c19d5a92abcb9 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Mon, 22 Jan 2024 13:13:13 -0500
Subject: [PATCH 1/2] Most robust `CpsFlowExecution.croak`

---
 .../plugins/workflow/cps/CpsFlowExecution.java         | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java
index a0a01a0c6..fb70131db 100644
--- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java
+++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java
@@ -912,7 +912,15 @@ private void loadProgramFailed(final Throwable problem, SettableFuture<CpsThread
     /** Report a fatal error in the VM. */
     void croak(Throwable t) {
         setResult(Result.FAILURE);
-        onProgramEnd(new Outcome(null, t));
+        if (startNodes == null || startNodes.isEmpty()) {
+            try {
+                createPlaceholderNodes(t);
+            } catch (Exception x) {
+                LOGGER.log(Level.WARNING, "Failed to create placeholder nodes in " + owner, x);
+            }
+        } else {
+            onProgramEnd(new Outcome(null, t));
+        }
         cleanUpHeap();
         try {
             saveOwner();

From 480c4e2e722d2c6ef94fde799f8ddfa1ed27cd29 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Fri, 16 Feb 2024 14:17:01 -0500
Subject: [PATCH 2/2] SpotBugs

---
 .../jenkinsci/plugins/workflow/cps/CpsFlowExecution.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java
index fb70131db..69c2399d9 100644
--- a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java
+++ b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java
@@ -912,7 +912,11 @@ private void loadProgramFailed(final Throwable problem, SettableFuture<CpsThread
     /** Report a fatal error in the VM. */
     void croak(Throwable t) {
         setResult(Result.FAILURE);
-        if (startNodes == null || startNodes.isEmpty()) {
+        boolean noStartNodes;
+        synchronized (this) {
+            noStartNodes = startNodes == null || startNodes.isEmpty();
+        }
+        if (noStartNodes) {
             try {
                 createPlaceholderNodes(t);
             } catch (Exception x) {