[GR-17457] Fix Context#close(true) test and always propagate ThreadDeath

PullRequest: truffleruby/2384

Author: eregon

src/main/java/org/truffleruby/core/kernel/AtExitManager.java

@@ -68,7 +68,7 @@ private RubyException runExitHooks(Deque<RubyProc> stack, String name) {
             } catch (RaiseException e) {
                 handleAtExitException(context, e.getException());
                 lastException = e.getException();
-            } catch (ExitException e) {
+            } catch (ExitException | ThreadDeath e) {
                 throw e;
             } catch (RuntimeException | Error e) {
                 BacktraceFormatter.printInternalError(context, e, "Unexpected internal exception in " + name);

src/main/java/org/truffleruby/core/thread/ThreadManager.java

@@ -306,6 +306,8 @@ private void threadMain(RubyThread thread, Node currentNode, Supplier<Object> ta
             // Handlers in the same order as in FiberManager
         } catch (KillException e) {
             setThreadValue(thread, Nil.INSTANCE);
+        } catch (ThreadDeath e) { // Context#close(true)
+            throw e;
         } catch (RaiseException e) {
             setException(thread, e.getException(), currentNode);
         } catch (DynamicReturnException e) {

src/main/java/org/truffleruby/language/exceptions/TopLevelRaiseHandler.java

@@ -40,6 +40,8 @@ public int execute(Runnable body) {
         } catch (ExitException e) {
             // hard #exit!, return immediately, skip at_exit hooks
             return e.getCode();
+        } catch (ThreadDeath e) { // Context#close(true)
+            throw e;
         } catch (RuntimeException | Error e) {
             BacktraceFormatter.printInternalError(
                     getContext(),
@@ -66,6 +68,8 @@ public int execute(Runnable body) {
         } catch (ExitException e) {
             // hard #exit! during at_exit: ignore the main script exception
             exitCode = e.getCode();
+        } catch (ThreadDeath e) { // Context#close(true)
+            throw e;
         } catch (RuntimeException | Error e) { // Internal error
             BacktraceFormatter.printInternalError(
                     getContext(),

src/test/java/org/truffleruby/MiscTest.java

@@ -12,9 +12,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
-
-import java.util.Timer;
-import java.util.TimerTask;
+import static org.junit.Assert.fail;
 
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.PolyglotException;
@@ -46,28 +44,31 @@ public void testMembersAndStringUnboxing() {
     }
 
     @Test
-    public void timeoutExecution() {
+    public void timeoutExecution() throws Throwable {
         Context context = RubyTest.createContext();
 
-        Timer timer = new Timer();
         // schedule a timeout in 1s
-        timer.schedule(new TimerTask() {
-            @Override
-            public void run() {
-                try {
-                    context.close(true);
-                } catch (PolyglotException e) {
-                    assertTrue(e.isCancelled());
-                }
+        TestingThread thread = new TestingThread(() -> {
+            try {
+                Thread.sleep(1000);
+                context.close(true);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+                fail();
+            } catch (PolyglotException e) {
+                assertTrue(e.isCancelled());
             }
-        }, 1000);
+        });
 
+        thread.start();
         try {
             String maliciousCode = "while true; end";
             context.eval("ruby", maliciousCode);
             Assert.fail();
         } catch (PolyglotException e) {
             assertTrue(e.isCancelled());
+        } finally {
+            thread.join();
         }
     }