Add experimental support for Java 22 class files (#1479)

jacoco · Jun 13, 2023 · e0f2725 · e0f2725
1 parent 1f7b17b
commit e0f2725
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 19 deletions.
diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
@@ -45,6 +45,8 @@ jobs:
         JDK_VERSION: 20
       JDK 21:
         JDK_VERSION: 21
+      JDK 22:
+        JDK_VERSION: 22
   pool:
     vmImage: 'ubuntu-20.04'
   steps:

diff --git a/org.jacoco.build/pom.xml b/org.jacoco.build/pom.xml
@@ -919,6 +919,20 @@
       </properties>
     </profile>
 
+    <profile>
+      <id>java22-bytecode</id>
+      <activation>
+        <property>
+          <name>bytecode.version</name>
+          <value>22</value>
+        </property>
+      </activation>
+      <properties>
+        <maven.compiler.source>13</maven.compiler.source>
+        <maven.compiler.target>13</maven.compiler.target>
+      </properties>
+    </profile>
+
     <!-- This profile enables use of ECJ -->
     <profile>
       <id>ecj</id>

diff --git a/org.jacoco.core.test.validation/pom.xml b/org.jacoco.core.test.validation/pom.xml
@@ -458,6 +458,39 @@
       </modules>
     </profile>
 
+    <profile>
+      <id>java22-bytecode</id>
+      <activation>
+        <property>
+          <name>bytecode.version</name>
+          <value>22</value>
+        </property>
+      </activation>
+      <properties>
+        <!-- Kotlin 1.5.0 doesn't support compilation into 22 -->
+        <kotlin.compiler.jvmTarget>16</kotlin.compiler.jvmTarget>
+        <!-- Groovy 3.0.15 does not support compilation into 22 -->
+        <groovy.targetBytecode>16</groovy.targetBytecode>
+        <!-- see respective profile in org.jacoco.build about this override -->
+        <maven.compiler.source>22</maven.compiler.source>
+        <maven.compiler.target>22</maven.compiler.target>
+      </properties>
+      <modules>
+        <module>../org.jacoco.core.test.validation.kotlin</module>
+        <module>../org.jacoco.core.test.validation.java7</module>
+        <module>../org.jacoco.core.test.validation.java8</module>
+        <module>../org.jacoco.core.test.validation.java14</module>
+        <module>../org.jacoco.core.test.validation.java16</module>
+        <module>../org.jacoco.core.test.validation.java20</module>
+        <!-- Groovy 3.0.15 does not support Java 22
+        <module>../org.jacoco.core.test.validation.groovy</module>
+        -->
+        <!-- Scala 2.13.4 does not support Java 22 - see https://github.com/jacoco/jacoco/issues/1431
+        <module>../org.jacoco.core.test.validation.scala</module>
+        -->
+      </modules>
+    </profile>
+
   </profiles>
 
 </project>
diff --git a/org.jacoco.core.test/src/org/jacoco/core/analysis/AnalyzerTest.java b/org.jacoco.core.test/src/org/jacoco/core/analysis/AnalyzerTest.java
@@ -109,7 +109,7 @@ public void should_ignore_synthetic_classes() throws Exception {
 	@Test
 	public void should_not_modify_class_bytes_to_support_next_version()
 			throws Exception {
-		final byte[] originalBytes = createClass(Opcodes.V20 + 1);
+		final byte[] originalBytes = createClass(Opcodes.V21 + 1);
 		final byte[] bytes = new byte[originalBytes.length];
 		System.arraycopy(originalBytes, 0, bytes, 0, originalBytes.length);
 		final long expectedClassId = CRC64.classId(bytes);
@@ -132,13 +132,13 @@ private static byte[] createClass(final int version) {
 	 */
 	@Test
 	public void analyzeClass_should_throw_exception_for_unsupported_class_file_version() {
-		final byte[] bytes = createClass(Opcodes.V20 + 2);
+		final byte[] bytes = createClass(Opcodes.V21 + 2);
 		try {
 			analyzer.analyzeClass(bytes, "UnsupportedVersion");
 			fail("exception expected");
 		} catch (IOException e) {
 			assertExceptionMessage("UnsupportedVersion", e);
-			assertEquals("Unsupported class file major version 66",
+			assertEquals("Unsupported class file major version 67",
 					e.getCause().getMessage());
 		}
 	}
@@ -218,14 +218,14 @@ public void testAnalyzeClass_BrokenStream() throws IOException {
 	 */
 	@Test
 	public void analyzeAll_should_throw_exception_for_unsupported_class_file_version() {
-		final byte[] bytes = createClass(Opcodes.V20 + 2);
+		final byte[] bytes = createClass(Opcodes.V21 + 2);
 		try {
 			analyzer.analyzeAll(new ByteArrayInputStream(bytes),
 					"UnsupportedVersion");
 			fail("exception expected");
 		} catch (IOException e) {
 			assertExceptionMessage("UnsupportedVersion", e);
-			assertEquals("Unsupported class file major version 66",
+			assertEquals("Unsupported class file major version 67",
 					e.getCause().getMessage());
 		}
 	}

diff --git a/org.jacoco.core.test/src/org/jacoco/core/instr/InstrumenterTest.java b/org.jacoco.core.test/src/org/jacoco/core/instr/InstrumenterTest.java
@@ -100,7 +100,7 @@ public void setup() throws Exception {
 	@Test
 	public void should_not_modify_class_bytes_to_support_next_version()
 			throws Exception {
-		final byte[] originalBytes = createClass(Opcodes.V20 + 1);
+		final byte[] originalBytes = createClass(Opcodes.V21 + 1);
 		final byte[] bytes = new byte[originalBytes.length];
 		System.arraycopy(originalBytes, 0, bytes, 0, originalBytes.length);
 		final long expectedClassId = CRC64.classId(bytes);
@@ -123,13 +123,13 @@ private static byte[] createClass(final int version) {
 	 */
 	@Test
 	public void instrument_should_throw_exception_for_unsupported_class_file_version() {
-		final byte[] bytes = createClass(Opcodes.V20 + 2);
+		final byte[] bytes = createClass(Opcodes.V21 + 2);
 		try {
 			instrumenter.instrument(bytes, "UnsupportedVersion");
 			fail("exception expected");
 		} catch (final IOException e) {
 			assertExceptionMessage("UnsupportedVersion", e);
-			assertEquals("Unsupported class file major version 66",
+			assertEquals("Unsupported class file major version 67",
 					e.getCause().getMessage());
 		}
 	}
@@ -221,14 +221,14 @@ public void testSerialization() throws Exception {
 	 */
 	@Test
 	public void instrumentAll_should_throw_exception_for_unsupported_class_file_version() {
-		final byte[] bytes = createClass(Opcodes.V20 + 2);
+		final byte[] bytes = createClass(Opcodes.V21 + 2);
 		try {
 			instrumenter.instrumentAll(new ByteArrayInputStream(bytes),
 					new ByteArrayOutputStream(), "UnsupportedVersion");
 			fail("exception expected");
 		} catch (final IOException e) {
 			assertExceptionMessage("UnsupportedVersion", e);
-			assertEquals("Unsupported class file major version 66",
+			assertEquals("Unsupported class file major version 67",
 					e.getCause().getMessage());
 		}
 	}

diff --git a/org.jacoco.core.test/src/org/jacoco/core/internal/instr/InstrSupportTest.java b/org.jacoco.core.test/src/org/jacoco/core/internal/instr/InstrSupportTest.java
@@ -43,8 +43,8 @@ public void setup() {
 	}
 
 	@Test
-	public void classReaderFor_should_read_java_21_class() {
-		final byte[] bytes = createJava21Class();
+	public void classReaderFor_should_read_java_22_class() {
+		final byte[] bytes = createJava22Class();
 
 		final ClassReader classReader = InstrSupport.classReaderFor(bytes);
 
@@ -53,16 +53,16 @@ public void classReaderFor_should_read_java_21_class() {
 			public void visit(final int version, final int access,
 					final String name, final String signature,
 					final String superName, final String[] interfaces) {
-				assertEquals(Opcodes.V20 + 1, version);
+				assertEquals(Opcodes.V21 + 1, version);
 			}
 		}, 0);
 
-		assertArrayEquals(createJava21Class(), bytes);
+		assertArrayEquals(createJava22Class(), bytes);
 	}
 
-	private static byte[] createJava21Class() {
+	private static byte[] createJava22Class() {
 		final ClassWriter cw = new ClassWriter(0);
-		cw.visit(Opcodes.V20 + 1, 0, "Foo", null, "java/lang/Object", null);
+		cw.visit(Opcodes.V21 + 1, 0, "Foo", null, "java/lang/Object", null);
 		cw.visitEnd();
 		return cw.toByteArray();
 	}
@@ -132,7 +132,8 @@ public void needFrames_should_return_true_for_versions_greater_than_or_equal_to_
 		assertTrue(InstrSupport.needsFrames(Opcodes.V18));
 		assertTrue(InstrSupport.needsFrames(Opcodes.V19));
 		assertTrue(InstrSupport.needsFrames(Opcodes.V20));
-		assertTrue(InstrSupport.needsFrames(Opcodes.V20 + 1));
+		assertTrue(InstrSupport.needsFrames(Opcodes.V21));
+		assertTrue(InstrSupport.needsFrames(Opcodes.V21 + 1));
 
 		assertTrue(InstrSupport.needsFrames(0x0100));
 	}

diff --git a/org.jacoco.core/src/org/jacoco/core/internal/instr/InstrSupport.java b/org.jacoco.core/src/org/jacoco/core/internal/instr/InstrSupport.java
@@ -273,9 +273,9 @@ public static void push(final MethodVisitor mv, final int value) {
 	 */
 	public static ClassReader classReaderFor(final byte[] b) {
 		final int originalVersion = getMajorVersion(b);
-		if (originalVersion == Opcodes.V20 + 1) {
+		if (originalVersion == Opcodes.V21 + 1) {
 			// temporarily downgrade version to bypass check in ASM
-			setMajorVersion(Opcodes.V20, b);
+			setMajorVersion(Opcodes.V21, b);
 		}
 		final ClassReader classReader = new ClassReader(b);
 		setMajorVersion(originalVersion, b);

diff --git a/org.jacoco.doc/docroot/doc/changes.html b/org.jacoco.doc/docroot/doc/changes.html
@@ -22,6 +22,8 @@ <h2>Snapshot Build @qualified.bundle.version@ (@build.date@)</h2>
 
 <h3>New Features</h3>
 <ul>
+  <li>Experimental support for Java 22 class files
+      (GitHub <a href="https://github.com/jacoco/jacoco/issues/1479">#1479</a>).</li>
   <li>Part of bytecode generated by the Java compilers for record patterns is
       filtered out during generation of report
       (GitHub <a href="https://github.com/jacoco/jacoco/issues/1473">#1473</a>).</li>