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

Ensure exception region exits are generated #252

Closed
wants to merge 1 commit into from
+124 −14
Closed

Ensure exception region exits are generated #252

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 4 additions & 6 deletions src/java.base/share/classes/java/lang/reflect/code/op/ExtendedOp.java
View file
Original file line number Diff line number Diff line change
@@ -2551,19 +2551,17 @@ public Block.Builder lower(Block.Builder b, OpTransformer opT) {
OpTransformer tryExitTransformer;
if (finalizer != null) {
tryExitTransformer = opT.compose((block, op) -> {
if (op instanceof CoreOp.ReturnOp) {
return inlineFinalizer(block, tryExceptionRegion, opT);
} else if (op instanceof ExtendedOp.JavaLabelOp lop && ifExitFromTry(lop)) {
if (op instanceof CoreOp.ReturnOp ||
(op instanceof ExtendedOp.JavaLabelOp lop && ifExitFromTry(lop))) {
return inlineFinalizer(block, tryExceptionRegion, opT);
} else {
return block;
}
});
} else {
tryExitTransformer = opT.compose((block, op) -> {
// @@@ break and continue
// when target break/continue is enclosing the try
if (op instanceof CoreOp.ReturnOp) {
if (op instanceof CoreOp.ReturnOp ||
(op instanceof ExtendedOp.JavaLabelOp lop && ifExitFromTry(lop))) {
Block.Builder tryRegionReturnExit = block.block();
block.op(exceptionRegionExit(tryExceptionRegion, tryRegionReturnExit.successor()));
return tryRegionReturnExit;
128 changes: 120 additions & 8 deletions ...ng/reflect/code/TestTryFinallyNested.java → ...java/lang/reflect/code/TestTryNested.java
View file
Original file line number Diff line number Diff line change
@@ -23,15 +23,14 @@

/*
* @test
* @run testng TestTryFinallyNested
* @run testng TestTryNested
*/

import org.testng.Assert;
import org.testng.annotations.Test;

import java.lang.reflect.code.OpTransformer;
import java.lang.reflect.code.op.CoreOp;
import java.lang.reflect.code.Op;
import java.lang.reflect.code.interpreter.Interpreter;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Method;
@@ -43,7 +42,7 @@
import java.util.function.IntConsumer;
import java.util.stream.Stream;

public class TestTryFinallyNested {
public class TestTryNested {
@CodeReflection
public static void tryCatchFinally(IntConsumer c, int i) {
try {
@@ -113,6 +112,64 @@ public void testCatchFinally() {
}


@CodeReflection
public static void tryCatchBreak(IntConsumer c, int i) {
a: try {
try {
if (i == 0) {
break a;
}
c.accept(0);
} catch (IllegalStateException e) {
if (i == 1) {
break a;
}
c.accept(1);
}
if (i == 2) {
break a;
}
c.accept(2);
} catch (IllegalStateException e) {
if (i == 3) {
break a;
}
c.accept(3);
}
c.accept(4);
}

@Test
public void testCatchBreak() {
CoreOp.FuncOp f = getFuncOp("tryCatchBreak");

f.writeTo(System.out);

CoreOp.FuncOp lf = f.transform(OpTransformer.LOWERING_TRANSFORMER);

lf.writeTo(System.out);

for (int ra = -1; ra < 4; ra++) {
int fra = ra;

Consumer<IntConsumer> test = testConsumer(
c -> Interpreter.invoke(MethodHandles.lookup(), lf, c, fra),
c -> tryCatchBreak(c, fra)
);

test.accept(i -> {});
for (int ea = 0; ea <= 4; ea++) {
int fea = ea;
test.accept(i -> {
if (i == fea) throw new IllegalStateException();
});
test.accept(i -> {
if (i == fea) throw new RuntimeException();
});
}
}
}

@CodeReflection
public static void tryCatchFinallyBreak(IntConsumer c, int i) {
a: try {
@@ -169,7 +226,7 @@ public void testCatchFinallyBreak() {
);

test.accept(i -> {});
for (int ea = 0; ea < 6; ea++) {
for (int ea = 0; ea <= 6; ea++) {
int fea = ea;
test.accept(i -> {
if (i == fea) throw new IllegalStateException();
@@ -193,7 +250,7 @@ public static void tryForLoop(IntConsumer c) {
break;
}
c.accept(1);
} finally {
} catch (IllegalStateException e) {
c.accept(2);
}
c.accept(3);
@@ -213,10 +270,65 @@ public void testTryForLoop() {

Consumer<IntConsumer> test = testConsumer(
c -> Interpreter.invoke(MethodHandles.lookup(), lf, c),
TestTryFinallyNested::tryForLoop
TestTryNested::tryForLoop
);

test.accept(i -> { });
for (int ea = 0; ea <= 4; ea++) {
int fea = ea;
test.accept(i -> {
if (i == fea) throw new IllegalStateException();
});
test.accept(i -> {
if (i == fea) throw new RuntimeException();
});
}
}

@CodeReflection
public static void tryForLoopFinally(IntConsumer c) {
for (int i = 0; i < 8; i++) {
c.accept(0);
try {
if (i == 4) {
continue;
} else if (i == 5) {
break;
}
c.accept(1);
} finally {
c.accept(2);
}
c.accept(3);
}
c.accept(4);
}

@Test
public void testTryForLoopFinally() {
CoreOp.FuncOp f = getFuncOp("tryForLoopFinally");

f.writeTo(System.out);

CoreOp.FuncOp lf = f.transform(OpTransformer.LOWERING_TRANSFORMER);

lf.writeTo(System.out);

Consumer<IntConsumer> test = testConsumer(
c -> Interpreter.invoke(MethodHandles.lookup(), lf, c),
TestTryNested::tryForLoopFinally
);

test.accept(i -> { });
for (int ea = 0; ea <= 4; ea++) {
int fea = ea;
test.accept(i -> {
if (i == fea) throw new IllegalStateException();
});
test.accept(i -> {
if (i == fea) throw new RuntimeException();
});
}
}


@@ -256,7 +368,7 @@ public void testTryLabeledForLoop() {

Consumer<IntConsumer> test = testConsumer(
c -> Interpreter.invoke(MethodHandles.lookup(), lf, c),
TestTryFinallyNested::tryLabeledForLoop
TestTryNested::tryLabeledForLoop
);

test.accept(i -> { });
@@ -305,7 +417,7 @@ public void testTryLambda() {


static CoreOp.FuncOp getFuncOp(String name) {
Optional<Method> om = Stream.of(TestTryFinallyNested.class.getDeclaredMethods())
Optional<Method> om = Stream.of(TestTryNested.class.getDeclaredMethods())
.filter(m -> m.getName().equals(name))
.findFirst();