recognize Java 21 version (65)

forax · forax · commit dd57050b0a34 · 2023-01-07T22:42:43.000+01:00
diff --git a/asm-util/src/main/java/org/objectweb/asm/util/ASMifier.java b/asm-util/src/main/java/org/objectweb/asm/util/ASMifier.java
@@ -110,6 +110,7 @@ public class ASMifier extends Printer {
     classVersions.put(Opcodes.V18, "V18");
     classVersions.put(Opcodes.V19, "V19");
     classVersions.put(Opcodes.V20, "V20");
+    classVersions.put(Opcodes.V20, "V21");
     CLASS_VERSIONS = Collections.unmodifiableMap(classVersions);
   }
 
diff --git a/asm/src/main/java/org/objectweb/asm/ClassReader.java b/asm/src/main/java/org/objectweb/asm/ClassReader.java
@@ -194,7 +194,7 @@ public ClassReader(
     this.b = classFileBuffer;
     // Check the class' major_version. This field is after the magic and minor_version fields, which
     // use 4 and 2 bytes respectively.
-    if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V20) {
+    if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V21) {
       throw new IllegalArgumentException(
           "Unsupported class file major version " + readShort(classFileOffset + 6));
     }
diff --git a/asm/src/main/java/org/objectweb/asm/Opcodes.java b/asm/src/main/java/org/objectweb/asm/Opcodes.java
@@ -286,6 +286,7 @@ public interface Opcodes {
   int V18 = 0 << 16 | 62;
   int V19 = 0 << 16 | 63;
   int V20 = 0 << 16 | 64;
+  int V21 = 0 << 16 | 65;
 
   /**
    * Version flag indicating that the class is using 'preview' features.
diff --git a/asm/src/test/java/org/objectweb/asm/ConstantsTest.java b/asm/src/test/java/org/objectweb/asm/ConstantsTest.java
@@ -253,6 +253,7 @@ private static ConstantType getType(final Field field) {
       case "V18":
       case "V19":
       case "V20":
+      case "V21":
         return ConstantType.CLASS_VERSION;
       case "ACC_PUBLIC":
       case "ACC_PRIVATE":

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@ public class ASMifier extends Printer {`
`110`	`110`	`classVersions.put(Opcodes.V18, "V18");`
`111`	`111`	`classVersions.put(Opcodes.V19, "V19");`
`112`	`112`	`classVersions.put(Opcodes.V20, "V20");`
	`113`	`+ classVersions.put(Opcodes.V20, "V21");`
`113`	`114`	`CLASS_VERSIONS = Collections.unmodifiableMap(classVersions);`
`114`	`115`	`}`
`115`	`116`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ public ClassReader(`
`194`	`194`	`this.b = classFileBuffer;`
`195`	`195`	`// Check the class' major_version. This field is after the magic and minor_version fields, which`
`196`	`196`	`// use 4 and 2 bytes respectively.`
`197`		`- if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V20) {`
	`197`	`+ if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V21) {`
`198`	`198`	`throw new IllegalArgumentException(`
`199`	`199`	`"Unsupported class file major version " + readShort(classFileOffset + 6));`
`200`	`200`	`}`