archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8336588: Ensure Transform downstream receives upstream start items only after downstream started

Browse source 
Reviewed-by: asotona
This commit is contained in:
Chen Liang 2024-07-18 21:46:07 +00:00
parent 02be7b8ddc
commit b44632aa15
2 changed files with 54 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/java.base/share/classes/jdk/internal/classfile/impl/TransformImpl.java
View file

@ -111,7 +111,7 @@ public final class TransformImpl {
ResolvedTransform<ClassElement> upstream = TransformImpl.resolve(t, chainedBuilder); ResolvedTransform<ClassElement> upstream = TransformImpl.resolve(t, chainedBuilder);
return new ResolvedTransform<>(upstream.consumer(), return new ResolvedTransform<>(upstream.consumer(),
chainRunnable(upstream.endHandler(), downstream.endHandler()), chainRunnable(upstream.endHandler(), downstream.endHandler()),
chainRunnable(upstream.startHandler(), downstream.startHandler())); chainRunnable(downstream.startHandler(), upstream.startHandler()));
} }
} }
@ -198,7 +198,7 @@ public final class TransformImpl {
ResolvedTransform<MethodElement> upstream = TransformImpl.resolve(t, chainedBuilder); ResolvedTransform<MethodElement> upstream = TransformImpl.resolve(t, chainedBuilder);
return new ResolvedTransform<>(upstream.consumer(), return new ResolvedTransform<>(upstream.consumer(),
chainRunnable(upstream.endHandler(), downstream.endHandler()), chainRunnable(upstream.endHandler(), downstream.endHandler()),
chainRunnable(upstream.startHandler(), downstream.startHandler())); chainRunnable(downstream.startHandler(), upstream.startHandler()));
} }
} }
@ -261,7 +261,7 @@ public final class TransformImpl {
ResolvedTransform<FieldElement> upstream = TransformImpl.resolve(t, chainedBuilder); ResolvedTransform<FieldElement> upstream = TransformImpl.resolve(t, chainedBuilder);
return new ResolvedTransform<>(upstream.consumer(), return new ResolvedTransform<>(upstream.consumer(),
chainRunnable(upstream.endHandler(), downstream.endHandler()), chainRunnable(upstream.endHandler(), downstream.endHandler()),
chainRunnable(upstream.startHandler(), downstream.startHandler())); chainRunnable(downstream.startHandler(), upstream.startHandler()));
} }
} }
@ -301,7 +301,7 @@ public final class TransformImpl {
ResolvedTransform<CodeElement> upstream = TransformImpl.resolve(t, chainedBuilder); ResolvedTransform<CodeElement> upstream = TransformImpl.resolve(t, chainedBuilder);
return new ResolvedTransform<>(upstream.consumer(), return new ResolvedTransform<>(upstream.consumer(),
chainRunnable(upstream.endHandler(), downstream.endHandler()), chainRunnable(upstream.endHandler(), downstream.endHandler()),
chainRunnable(upstream.startHandler(), downstream.startHandler())); chainRunnable(downstream.startHandler(), upstream.startHandler()));
} }
} }

60
test/jdk/jdk/classfile/TransformTests.java
View file

@ -23,18 +23,27 @@
/* /*
* @test * @test
* @bug 8336010 * @bug 8336010 8336588
* @summary Testing ClassFile transformations. * @summary Testing ClassFile transformations.
* @run junit TransformTests * @run junit TransformTests
*/ */
import java.lang.classfile.ClassBuilder; import java.lang.classfile.ClassBuilder;
import java.lang.classfile.ClassElement;
import java.lang.classfile.ClassFile;
import java.lang.classfile.ClassModel;
import java.lang.classfile.ClassTransform;
import java.lang.classfile.CodeBuilder; import java.lang.classfile.CodeBuilder;
import java.lang.classfile.CodeElement; import java.lang.classfile.CodeElement;
import java.lang.classfile.CodeModel;
import java.lang.classfile.CodeTransform;
import java.lang.classfile.FieldModel; import java.lang.classfile.FieldModel;
import java.lang.classfile.FieldTransform; import java.lang.classfile.FieldTransform;
import java.lang.classfile.Label; import java.lang.classfile.Label;
import java.lang.classfile.MethodModel;
import java.lang.classfile.MethodTransform; import java.lang.classfile.MethodTransform;
import java.lang.classfile.instruction.BranchInstruction; import java.lang.classfile.instruction.BranchInstruction;
import java.lang.classfile.instruction.ConstantInstruction;
import java.lang.classfile.instruction.LabelTarget; import java.lang.classfile.instruction.LabelTarget;
import java.lang.constant.ClassDesc; import java.lang.constant.ClassDesc;
import java.lang.constant.MethodTypeDesc; import java.lang.constant.MethodTypeDesc;
@ -43,18 +52,10 @@ import java.net.URI;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import helpers.ByteArrayClassLoader;
import java.lang.classfile.ClassModel;
import java.lang.classfile.ClassTransform;
import java.lang.classfile.ClassFile;
import java.lang.classfile.CodeModel;
import java.lang.classfile.CodeTransform;
import java.lang.classfile.MethodModel;
import java.lang.classfile.instruction.ConstantInstruction;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import helpers.ByteArrayClassLoader;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import static java.lang.classfile.ClassFile.*; import static java.lang.classfile.ClassFile.*;
@ -289,6 +290,45 @@ class TransformTests {
assertTrue(leaveLabels.isEmpty(), () -> "Some labels are not bounded: " + leaveLabels); assertTrue(leaveLabels.isEmpty(), () -> "Some labels are not bounded: " + leaveLabels);
} }
@Test
void testStateOrder() throws Exception {
var bytes = Files.readAllBytes(testClassPath);
var cf = ClassFile.of();
var cm = cf.parse(bytes);
int[] counter = {0};
enum TransformState { START, ONGOING, ENDED }
var ct = ClassTransform.ofStateful(() -> new ClassTransform() {
TransformState state = TransformState.START;
@Override
public void atStart(ClassBuilder builder) {
assertSame(TransformState.START, state);
builder.withField("f" + counter[0]++, CD_int, 0);
state = TransformState.ONGOING;
}
@Override
public void atEnd(ClassBuilder builder) {
assertSame(TransformState.ONGOING, state);
builder.withField("f" + counter[0]++, CD_int, 0);
state = TransformState.ENDED;
}
@Override
public void accept(ClassBuilder builder, ClassElement element) {
assertSame(TransformState.ONGOING, state);
builder.with(element);
}
});
cf.transformClass(cm, ct);
cf.transformClass(cm, ct.andThen(ct));
cf.transformClass(cm, ct.andThen(ct).andThen(ct));
}
public static class TestClass { public static class TestClass {
static public String foo() { static public String foo() {
return "foo"; return "foo";