8306584: Start of release updates for JDK 22

8306585: Add SourceVersion.RELEASE_22
8306586: Add source 22 and target 22 to javac

Reviewed-by: erikj, iris, dholmes, jlahoda, alanb

Author: jddarcy

.jcheck/conf

@@ -1,7 +1,7 @@
 [general]
 project=jdk
 jbs=JDK
-version=21
+version=22
 
 [checks]
 error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists

make/conf/version-numbers.conf

@@ -26,17 +26,17 @@
 # Default version, product, and vendor information to use,
 # unless overridden by configure
 
-DEFAULT_VERSION_FEATURE=21
+DEFAULT_VERSION_FEATURE=22
 DEFAULT_VERSION_INTERIM=0
 DEFAULT_VERSION_UPDATE=0
 DEFAULT_VERSION_PATCH=0
 DEFAULT_VERSION_EXTRA1=0
 DEFAULT_VERSION_EXTRA2=0
 DEFAULT_VERSION_EXTRA3=0
-DEFAULT_VERSION_DATE=2023-09-19
-DEFAULT_VERSION_CLASSFILE_MAJOR=65  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
+DEFAULT_VERSION_DATE=2024-03-19
+DEFAULT_VERSION_CLASSFILE_MAJOR=66  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_VERSION_DOCS_API_SINCE=11
-DEFAULT_ACCEPTABLE_BOOT_VERSIONS="20 21"
-DEFAULT_JDK_SOURCE_TARGET_VERSION=21
+DEFAULT_ACCEPTABLE_BOOT_VERSIONS="20 21 22"
+DEFAULT_JDK_SOURCE_TARGET_VERSION=22
 DEFAULT_PROMOTED_VERSION_PRE=ea

make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java

@@ -3700,8 +3700,8 @@ public boolean read(LineBasedReader reader) throws IOException {
                 Function<String, MethodParam> string2Param =
                         p -> {
                             int sep = p.indexOf(':');
-                            return new MethodParam(Integer.parseInt(p.substring(0, sep)),
-                                                    p.substring(sep + 1));
+                            return new MethodParam(Integer.parseInt(p.substring(0, sep), 16),
+                                                   p.substring(sep + 1));
                         };
                 methodParameters =
                         deserializeList(inMethodParameters).stream()

src/hotspot/share/classfile/classFileParser.cpp

@@ -145,6 +145,8 @@
 
 #define JAVA_21_VERSION                   65
 
+#define JAVA_22_VERSION                   66
+
 void ClassFileParser::set_class_bad_constant_seen(short bad_constant) {
   assert((bad_constant == JVM_CONSTANT_Module ||
           bad_constant == JVM_CONSTANT_Package) && _major_version >= JAVA_9_VERSION,

src/java.base/share/classes/java/lang/reflect/ClassFileFormatVersion.java

@@ -281,7 +281,20 @@ public enum ClassFileFormatVersion {
      * href="https://docs.oracle.com/javase/specs/jvms/se21/html/index.html">
      * <cite>The Java Virtual Machine Specification, Java SE 21 Edition</cite></a>
      */
-    RELEASE_21(65);
+    RELEASE_21(65),
+
+    /**
+     * The version introduced by the Java Platform, Standard Edition
+     * 22.
+     *
+     * @since 22
+     *
+     * @see <a
+     * href="https://docs.oracle.com/javase/specs/jvms/se22/html/index.html">
+     * <cite>The Java Virtual Machine Specification, Java SE 22 Edition</cite></a>
+     */
+    RELEASE_22(66),
+    ; // Reduce code churn when appending new constants
 
     // Note to maintainers: when adding constants for newer releases,
     // the implementation of latest() must be updated too.
@@ -296,7 +309,7 @@ private ClassFileFormatVersion(int major) {
      * {@return the latest class file format version}
      */
     public static ClassFileFormatVersion latest() {
-        return RELEASE_21;
+        return RELEASE_22;
     }
 
     /**

src/java.base/share/classes/jdk/internal/classfile/Classfile.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -606,8 +606,9 @@ public static void buildModuleTo(Path path,
     public static final int JAVA_19_VERSION = 63;
     public static final int JAVA_20_VERSION = 64;
     public static final int JAVA_21_VERSION = 65;
+    public static final int JAVA_22_VERSION = 66;
 
-    public static final int LATEST_MAJOR_VERSION = JAVA_21_VERSION;
+    public static final int LATEST_MAJOR_VERSION = JAVA_22_VERSION;
     public static final int LATEST_MINOR_VERSION = 0;
     public static final int PREVIEW_MINOR_VERSION = -1;
 

src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java

@@ -226,7 +226,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.V21) {
+        if (checkClassVersion && readShort(classFileOffset + 6) > Opcodes.V22) {
             throw new IllegalArgumentException(
                     "Unsupported class file major version " + readShort(classFileOffset + 6));
         }

src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java

@@ -311,6 +311,7 @@ public interface Opcodes {
     int V19 = 0 << 16 | 63;
     int V20 = 0 << 16 | 64;
     int V21 = 0 << 16 | 65;
+    int V22 = 0 << 16 | 66;
 
     /**
       * Version flag indicating that the class is using 'preview' features.

src/java.compiler/share/classes/javax/lang/model/SourceVersion.java

@@ -74,6 +74,7 @@ public enum SourceVersion {
      *  21: pattern matching for switch and record patterns (string
      *      templates in preview, unnamed patterns and variables in
      *      preview, unnamed classes and instance main methods in preview)
+     *  22: tbd
      */
 
     /**
@@ -395,7 +396,20 @@ public enum SourceVersion {
      * @see <a href="https://openjdk.org/jeps/441">
      * Pattern Matching for switch</a>
      */
-    RELEASE_21;
+    RELEASE_21,
+
+    /**
+     * The version introduced by the Java Platform, Standard Edition
+     * 22.
+     *
+     * @since 22
+     *
+     * @see <a
+     * href="https://docs.oracle.com/javase/specs/jls/se22/html/index.html">
+     * <cite>The Java Language Specification, Java SE 22 Edition</cite></a>
+     */
+    RELEASE_22,
+    ; // Reduce code churn when appending new constants
 
     // Note that when adding constants for newer releases, the
     // behavior of latest() and latestSupported() must be updated too.
@@ -404,7 +418,7 @@ public enum SourceVersion {
      * {@return the latest source version that can be modeled}
      */
     public static SourceVersion latest() {
-        return RELEASE_21;
+        return RELEASE_22;
     }
 
     private static final SourceVersion latestSupported = getLatestSupported();
@@ -419,7 +433,7 @@ public static SourceVersion latest() {
     private static SourceVersion getLatestSupported() {
         int intVersion = Runtime.version().feature();
         return (intVersion >= 11) ?
-            valueOf("RELEASE_" + Math.min(21, intVersion)):
+            valueOf("RELEASE_" + Math.min(22, intVersion)):
             RELEASE_10;
     }
 

src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor14.java

@@ -44,7 +44,7 @@
  * @see AbstractAnnotationValueVisitor9
  * @since 14
  */
-@SupportedSourceVersion(RELEASE_21)
+@SupportedSourceVersion(RELEASE_22)
 public abstract class AbstractAnnotationValueVisitor14<R, P> extends AbstractAnnotationValueVisitor9<R, P> {
 
     /**