infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 03:58:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

8370175: State engine terminates when throwing self-caused exception

Browse Source 
Reviewed-by: jlahoda, fandreuzzi
This commit is contained in:
Christian Stein 2025-11-05 06:23:26 +00:00
parent 8b536b5428
commit a0e70c4e94
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/jdk.jshell/share/classes/jdk/jshell/execution/DirectExecutionControl.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -29,6 +29,9 @@ import java.lang.reflect.Array;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Collections;
import java.util.IdentityHashMap;
import java.util.Set;
import java.util.stream.IntStream;
import jdk.jshell.spi.ExecutionControl;
import jdk.jshell.spi.SPIResolutionException;
@ -335,10 +338,15 @@ public class DirectExecutionControl implements ExecutionControl {
* @throws ExecutionControl.InternalException for internal problems
*/
protected String throwConvertedInvocationException(Throwable cause) throws RunException, InternalException {
throw asRunException(cause);
// Guard against recursive cause chains by
// using a Set with identity equality semantics.
Set<Throwable> dejaVu = Collections.newSetFromMap(new IdentityHashMap<>());
dejaVu.add(cause);
throw asRunException(cause, dejaVu);
}
private RunException asRunException(Throwable ex) {
private RunException asRunException(Throwable ex, Set<Throwable> dejaVu) {
if (ex instanceof SPIResolutionException) {
SPIResolutionException spire = (SPIResolutionException) ex;
return new ResolutionException(spire.id(), spire.getStackTrace());
@ -347,7 +355,14 @@ public class DirectExecutionControl implements ExecutionControl {
ex.getClass().getName(),
ex.getStackTrace());
Throwable cause = ex.getCause();
ue.initCause(cause == null ? null : asRunException(cause));
if (cause != null) {
Throwable throwable = dejaVu.add(cause)
? asRunException(cause, dejaVu)
: new UserException("CIRCULAR REFERENCE!",
cause.getClass().getName(),
cause.getStackTrace());
ue.initCause(throwable);
}
return ue;
}
}

12
test/langtools/jdk/jshell/ExceptionsTest.java
View File

@ -24,7 +24,7 @@
/*
* @test
* @summary Tests for exceptions
* @bug 8198801 8212167 8210527
* @bug 8198801 8212167 8210527 8370175
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.jdeps/com.sun.tools.javap
@ -320,6 +320,16 @@ public class ExceptionsTest extends KullaTesting {
assertExecuteException("f();", StackOverflowError.class);
}
@Test
public void recursiveCauses() {
assertEval("var one = new Throwable();");
assertEval("var two = new Error();");
assertEval("one.initCause(two);");
assertEval("two.initCause(one);");
assertExecuteException("throw one;", Throwable.class);
assertExecuteException("throw two;", Error.class);
}
private StackTraceElement newStackTraceElement(String className, String methodName, Snippet key, int lineNumber) {
return new StackTraceElement(className, methodName, "#" + key.id(), lineNumber);
}