Skip to content

Update ECJ versions and generate the SWAP fixture with BCEL #537

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

Merged
garydgregory merged 1 commit into from
Oct 18, 2026
Merged

Update ECJ versions and generate the SWAP fixture with BCEL #537

Show file tree
Hide file tree
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
25 changes: 22 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@
<commons.jira.pid>12314220</commons.jira.pid>
<jna.version>5.19.1</jna.version>
<japicmp.skip>false</japicmp.skip>
<!-- 3.26.0 is the last JDK8-compatible version -->
<!-- 3.27.0 says "class file has wrong version 55.0, should be 52.0" -->
<ecj.version>3.26.0</ecj.version>
<ecj.version>3.46.100</ecj.version>
<!-- JaCoCo on Java 8 is different from other versions. On JDK9+ there is a profile -->
<!-- JaCoCo: Don't make code coverage worse than: -->
<commons.jacoco.haltOnFailure>true</commons.jacoco.haltOnFailure>
Expand Down Expand Up @@ -497,6 +495,27 @@
</plugins>
</build>
</profile>
<profile>
<id>ecj-java-11-down</id>
<activation>
<jdk>(,12)</jdk>
</activation>
<properties>
<!-- Last ECJ version compatible with Java 11. -->
<ecj.version>3.33.0</ecj.version>
</properties>
</profile>
<!-- Keep this profile after ecj-java-11-down so its property takes precedence on Java 8 and below. -->
<profile>
<id>ecj-java-8-down</id>
<activation>
<jdk>(,1.9)</jdk>
</activation>
<properties>
<!-- Last ECJ version compatible with Java 8. -->
<ecj.version>3.26.0</ecj.version>
</properties>
</profile>
<profile>
<id>spdx-java-11</id>
<activation>
Expand Down
39 changes: 0 additions & 39 deletions src/test/java/org/apache/bcel/data/SWAP.java
View file
Open in desktop

This file was deleted.

55 changes: 42 additions & 13 deletions src/test/java/org/apache/bcel/verifier/VerifierMainTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,29 @@
import static org.junit.jupiter.api.Assertions.assertEquals;

import java.io.BufferedInputStream;
import java.io.File;
import java.io.InputStream;
import java.io.PrintWriter;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;

import org.apache.bcel.AbstractTest;
import org.apache.bcel.Const;
import org.apache.bcel.classfile.ClassParser;
import org.apache.bcel.classfile.JavaClass;
import org.apache.bcel.classfile.Method;
import org.apache.bcel.generic.ClassGen;
import org.apache.bcel.generic.EmptyVisitor;
import org.apache.bcel.generic.ILOAD;
import org.apache.bcel.generic.InstructionConst;
import org.apache.bcel.generic.InstructionHandle;
import org.apache.bcel.generic.InstructionList;
import org.apache.bcel.generic.MethodGen;
import org.apache.bcel.generic.SWAP;
import org.apache.bcel.generic.Type;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.SystemProperties;
import org.eclipse.jdt.internal.compiler.batch.Main;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;

Expand All @@ -50,16 +55,36 @@ class VerifierMainTest extends AbstractTest {

@Test
void testSWAP() throws Exception {
final String[] argv = { "src/test/java/org/apache/bcel/data/SWAP.java", "-g", "-source", "1.4", "-target", "1.4", "-d", tempDir.toString() };
new Main(new PrintWriter(System.out), new PrintWriter(System.err), false/*systemExit*/, null/*options*/, null/*progress*/).compile(argv);
final String className = "org.apache.bcel.data.SWAP";
final Path classFile = tempDir.resolve("org/apache/bcel/data/SWAP.class");
final ClassGen classGen = new ClassGen(className, "java.lang.Object", "SWAP.java", Const.ACC_PUBLIC | Const.ACC_SUPER, null);
classGen.setMajor(Const.MAJOR_1_4);
classGen.setMinor(Const.MINOR_1_4);
classGen.addEmptyConstructor(Const.ACC_PUBLIC);
final InstructionList instructions = new InstructionList();
try {
instructions.append(new ILOAD(0));
instructions.append(new ILOAD(1));
instructions.append(InstructionConst.SWAP);
instructions.append(InstructionConst.ISUB);
instructions.append(InstructionConst.IRETURN);
final MethodGen methodGen = new MethodGen(Const.ACC_PUBLIC | Const.ACC_STATIC, Type.INT, new Type[] { Type.INT, Type.INT },
new String[] { "first", "second" }, "swap", className, instructions, classGen.getConstantPool());
methodGen.setMaxStack();
methodGen.setMaxLocals();
classGen.addMethod(methodGen.getMethod());
} finally {
instructions.dispose();
}
classGen.getJavaClass().dump(classFile.toFile());
final String javaAgent = getJavaAgent();
final List<String> args = new ArrayList<>();
args.add("java");
args.add(SystemProperties.getJavaHome() + File.separator + "bin" + File.separator + "java");
if (javaAgent != null) {
args.add(javaAgent.replace("jacoco.exec", "jacoco_org.apache.bcel.data.SWAP.exec"));
}
args.add("-cp");
args.add(SystemProperties.getJavaClassPath());
args.add(tempDir + File.pathSeparator + SystemProperties.getJavaClassPath());
args.add("org.apache.bcel.verifier.Verifier");
args.add("org/apache/bcel/data/SWAP.class");
final ProcessBuilder pb = new ProcessBuilder(args);
Expand All @@ -76,7 +101,7 @@ void testSWAP() throws Exception {
assertEquals(0, StringUtils.countMatches(output, "VERIFIED_REJECTED"), output);
assertEquals(6, StringUtils.countMatches(output, "VERIFIED_OK"), output);
}
// Class has passed the JustIce verifier, but now we need to ensure that the SWAP instruction is in the compiled class.
// Class has passed the JustIce verifier, but now we need to ensure that the SWAP instruction is in the generated class.
final List<SWAP> swapInstructionsList = new ArrayList<>();
final EmptyVisitor swapCollector = new EmptyVisitor() {
@Override
Expand All @@ -85,14 +110,18 @@ public void visitSWAP(final SWAP obj) {
super.visitSWAP(obj);
}
};
try (InputStream in = Files.newInputStream(tempDir.resolve("org/apache/bcel/data/SWAP.class"))) {
try (InputStream in = Files.newInputStream(classFile)) {
final ClassParser classParser = new ClassParser(in, "SWAP.class");
final JavaClass javaClass = classParser.parse();
final Method method = javaClass.getMethod(org.apache.bcel.data.SWAP.class.getMethod("getTestConstructor", Class.class));
final byte[] code = method.getCode().getCode();
final InstructionList instructionList = new InstructionList(code);
for (final InstructionHandle instructionHandle : instructionList) {
instructionHandle.accept(swapCollector);
for (final Method method : javaClass.getMethods()) {
final InstructionList instructionList = new InstructionList(method.getCode().getCode());
try {
for (final InstructionHandle instructionHandle : instructionList) {
instructionHandle.accept(swapCollector);
}
} finally {
instructionList.dispose();
}
}
}
assertEquals(1, swapInstructionsList.size());
Expand Down
Loading