Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8289613: Drop use of Thread.stop in jshell #10166

Closed
wants to merge 6 commits into from
+70 −4
Closed

8289613: Drop use of Thread.stop in jshell #10166

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cf61e92
8289613: Drop use of Thread.stop in jshell
asotona Sep 5, 2022
355ba7f
removed obsolete SuppressWarnings
asotona Sep 5, 2022
0f0e0dd
alternative implementation where instrumented code is directly checki…
asotona Sep 5, 2022
36ee64b
Revert "alternative implementation where instrumented code is directl…
asotona Sep 5, 2022
30c34b6
allStop field and stopCheck method moved to synthetic REPL.$Cancel$
asotona Sep 5, 2022
c6821bc
Minor formating fixes
asotona Sep 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/jdk.jshell/share/classes/jdk/jshell/execution/LocalExecutionControl.java
View file
Original file line number Diff line number Diff line change
@@ -93,10 +93,10 @@ public void visitJumpInsn(int opcode, Label label) {
}

private static ClassBytecodes genCancelClass() {
var cancelWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES|ClassWriter.COMPUTE_MAXS);
var cancelWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
cancelWriter.visit(Opcodes.V19, Opcodes.ACC_PUBLIC, "REPL/$Cancel$", null, "java/lang/Object", null);
cancelWriter.visitField(Opcodes.ACC_PUBLIC|Opcodes.ACC_STATIC|Opcodes.ACC_VOLATILE, "allStop", "Z", null, null);
var checkVisitor = cancelWriter.visitMethod(Opcodes.ACC_PUBLIC|Opcodes.ACC_STATIC, "stopCheck", "()V", null, null);
cancelWriter.visitField(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_VOLATILE, "allStop", "Z", null, null);
var checkVisitor = cancelWriter.visitMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "stopCheck", "()V", null, null);
checkVisitor.visitCode();
checkVisitor.visitFieldInsn(Opcodes.GETSTATIC, "REPL/$Cancel$", "allStop", "Z");
var skip = new Label();
@@ -116,7 +116,7 @@ private static ClassBytecodes genCancelClass() {
@Override
protected String invoke(Method doitMethod) throws Exception {
if (allStop == null) {
super.load(new ClassBytecodes[]{genCancelClass()});
super.load(new ClassBytecodes[]{ genCancelClass() });
allStop = findClass("REPL.$Cancel$").getDeclaredField("allStop");
}
allStop.set(null, false);
@@ -196,8 +196,8 @@ public void stop() throws EngineTerminationException, InternalException {
}
try {
allStop.set(null, true);
} catch (IllegalArgumentException| IllegalAccessException ex) {
throw new InternalException(ex.getMessage());
} catch (IllegalArgumentException | IllegalAccessException ex) {
throw new InternalException("Exception on local stop: " + ex);
}
Thread[] threads;
int len, threadCount;