8296149: Start of release updates for JDK 21

8296150: Add SourceVersion.RELEASE_21
8296151: Add source 21 and target 21 to javac

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

Author: jddarcy

.jcheck/conf

@@ -1,7 +1,7 @@
 [general]
 project=jdk
 jbs=JDK
-version=20
+version=21
 
 [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=20
+DEFAULT_VERSION_FEATURE=21
 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-03-21
-DEFAULT_VERSION_CLASSFILE_MAJOR=64  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
+DEFAULT_VERSION_DATE=2023-09-19
+DEFAULT_VERSION_CLASSFILE_MAJOR=65  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_VERSION_DOCS_API_SINCE=11
-DEFAULT_ACCEPTABLE_BOOT_VERSIONS="19 20"
-DEFAULT_JDK_SOURCE_TARGET_VERSION=20
+DEFAULT_ACCEPTABLE_BOOT_VERSIONS="19 20 21"
+DEFAULT_JDK_SOURCE_TARGET_VERSION=21
 DEFAULT_PROMOTED_VERSION_PRE=ea

src/hotspot/share/classfile/classFileParser.cpp

@@ -142,6 +142,8 @@
 
 #define JAVA_20_VERSION                   64
 
+#define JAVA_21_VERSION                   65
+
 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

@@ -262,7 +262,17 @@ public enum ClassFileFormatVersion {
      * href="https://docs.oracle.com/javase/specs/jvms/se20/html/index.html">
      * <cite>The Java Virtual Machine Specification, Java SE 20 Edition</cite></a>
      */
-    RELEASE_20(64);
+    RELEASE_20(64),
+
+    /**
+     * The version recognized by the Java Platform, Standard Edition
+     * 21.
+     *
+     * @see <a
+     * 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);
 
     // Note to maintainers: when adding constants for newer releases,
     // the implementation of latest() must be updated too.
@@ -277,7 +287,7 @@ private ClassFileFormatVersion(int major) {
      * {@return the latest class file format version}
      */
     public static ClassFileFormatVersion latest() {
-        return RELEASE_20;
+        return RELEASE_21;
     }
 
     /**

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

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

@@ -310,6 +310,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.

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

@@ -71,6 +71,7 @@ public enum SourceVersion {
      *      record patterns in preview)
      *  20: no changes (pattern matching for switch in fourth preview,
      *      record patterns in second preview)
+     *  21: tbd
      */
 
     /**
@@ -372,7 +373,19 @@ public enum SourceVersion {
      * href="https://docs.oracle.com/javase/specs/jls/se20/html/index.html">
      * <cite>The Java Language Specification, Java SE 20 Edition</cite></a>
      */
-    RELEASE_20;
+    RELEASE_20,
+
+    /**
+     * The version recognized by the Java Platform, Standard Edition
+     * 21.
+     *
+     * @since 21
+     *
+     * @see <a
+     * href="https://docs.oracle.com/javase/specs/jls/se21/html/index.html">
+     * <cite>The Java Language Specification, Java SE 21 Edition</cite></a>
+     */
+    RELEASE_21;
 
     // Note that when adding constants for newer releases, the
     // behavior of latest() and latestSupported() must be updated too.
@@ -381,7 +394,7 @@ public enum SourceVersion {
      * {@return the latest source version that can be modeled}
      */
     public static SourceVersion latest() {
-        return RELEASE_20;
+        return RELEASE_21;
     }
 
     private static final SourceVersion latestSupported = getLatestSupported();
@@ -396,7 +409,7 @@ public static SourceVersion latest() {
     private static SourceVersion getLatestSupported() {
         int intVersion = Runtime.version().feature();
         return (intVersion >= 11) ?
-            valueOf("RELEASE_" + Math.min(20, intVersion)):
+            valueOf("RELEASE_" + Math.min(21, intVersion)):
             RELEASE_10;
     }
 

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

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

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

@@ -49,7 +49,7 @@
  * @see AbstractElementVisitor9
  * @since 16
  */
-@SupportedSourceVersion(RELEASE_20)
+@SupportedSourceVersion(RELEASE_21)
 public abstract class AbstractElementVisitor14<R, P> extends AbstractElementVisitor9<R, P> {
     /**
      * Constructor for concrete subclasses to call.

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

@@ -47,7 +47,7 @@
  * @see AbstractTypeVisitor9
  * @since 14
  */
-@SupportedSourceVersion(RELEASE_20)
+@SupportedSourceVersion(RELEASE_21)
 public abstract class AbstractTypeVisitor14<R, P> extends AbstractTypeVisitor9<R, P> {
     /**
      * Constructor for concrete subclasses to call.