[GR-57835] Remove dead threads from PolyglotContextImpl#threads durin…

…g new thread initialization. PullRequest: graal/18734
oracle · Sep 5, 2024 · 259433a · 259433a
2 parents b2b58af + 4943435
commit 259433a
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/.../src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextImpl.java b/.../src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextImpl.java
@@ -874,6 +874,14 @@ Object[] enterThreadChanged(boolean enterReverted, boolean pollSafepoint, boolea
                          */
                         setCachedThreadInfo(PolyglotThreadInfo.NULL);
                     }
+                    if (needsInitialization) {
+                        /*
+                         * A thread is added to the threads map only by the thread itself, so when
+                         * the thread is in the map, and it is not alive, then it surely won't be
+                         * used ever again.
+                         */
+                        threads.entrySet().removeIf(threadInfoEntry -> !threadInfoEntry.getKey().isAlive());
+                    }
                     boolean transitionToMultiThreading = isSingleThreaded() && hasActiveOtherThread(true, false);
 
                     if (transitionToMultiThreading) {