[GR-50901] Merge in tag jdk-23+1

PullRequest: labsjdk-ce/42

Author: OracleLabsAutomation

.jcheck/conf

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

ci.jsonnet

@@ -130,8 +130,8 @@ local contains(str, needle) = std.findSubstr(needle, str) != [];
         downloads+: {
             BOOT_JDK: {
                 name : "jpg-jdk",
-                version : "22",
-                build_id: "8",
+                version : "23",
+                build_id: "1",
                 release: true,
                 platformspecific: true
             }
@@ -246,7 +246,7 @@ local contains(str, needle) = std.findSubstr(needle, str) != [];
     # Downstream Graal branch to test against. If you change this value to anything but
     # "master", you must create an ol-jira issue to change it back to master once the
     # next JVMCI release has been made. Add the issue id as a comment here.
-    local downstream_branch = "labsjdk/automation-12-8-2023-8501",
+    local downstream_branch = "labsjdk/automation-12-13-2023-2112",
 
     local clone_graal(defs) = {
         # Checkout the graal-enterprise repo to the "_gate" version of the

make/conf/version-numbers.conf

@@ -26,17 +26,17 @@
 # Default version, product, and vendor information to use,
 # unless overridden by configure
 
-DEFAULT_VERSION_FEATURE=22
+DEFAULT_VERSION_FEATURE=23
 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=2024-03-19
-DEFAULT_VERSION_CLASSFILE_MAJOR=66  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
+DEFAULT_VERSION_DATE=2024-09-17
+DEFAULT_VERSION_CLASSFILE_MAJOR=67  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_VERSION_DOCS_API_SINCE=11
-DEFAULT_ACCEPTABLE_BOOT_VERSIONS="21 22"
-DEFAULT_JDK_SOURCE_TARGET_VERSION=22
+DEFAULT_ACCEPTABLE_BOOT_VERSIONS="21 22 23"
+DEFAULT_JDK_SOURCE_TARGET_VERSION=23
 DEFAULT_PROMOTED_VERSION_PRE=ea

src/hotspot/share/classfile/classFileParser.cpp

@@ -149,6 +149,8 @@
 
 #define JAVA_22_VERSION                   66
 
+#define JAVA_23_VERSION                   67
+
 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/classfile/ClassFile.java

@@ -1475,6 +1475,9 @@ default List<VerifyError> verify(Path path) throws IOException {
     /** The class major version of JAVA_22. */
     int JAVA_22_VERSION = 66;
 
+    /** 67 */
+    int JAVA_23_VERSION = 67;
+
     /**
      * A minor version number indicating a class uses preview features
      * of a Java SE version since 12, for major versions {@value
@@ -1486,7 +1489,7 @@ default List<VerifyError> verify(Path path) throws IOException {
      * {@return the latest major Java version}
      */
     static int latestMajorVersion() {
-        return JAVA_22_VERSION;
+        return JAVA_23_VERSION;
     }
 
     /**

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

@@ -294,6 +294,18 @@ public enum ClassFileFormatVersion {
      * <cite>The Java Virtual Machine Specification, Java SE 22 Edition</cite></a>
      */
     RELEASE_22(66),
+
+    /**
+     * The version introduced by the Java Platform, Standard Edition
+     * 23.
+     *
+     * @since 23
+     *
+     * @see <a
+     * href="https://docs.oracle.com/javase/specs/jvms/se23/html/index.html">
+     * <cite>The Java Virtual Machine Specification, Java SE 23 Edition</cite></a>
+     */
+    RELEASE_23(67),
     ; // Reduce code churn when appending new constants
 
     // Note to maintainers: when adding constants for newer releases,
@@ -309,7 +321,7 @@ private ClassFileFormatVersion(int major) {
      * {@return the latest class file format version}
      */
     public static ClassFileFormatVersion latest() {
-        return RELEASE_22;
+        return RELEASE_23;
     }
 
     /**

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

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

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

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

@@ -415,6 +415,18 @@ public enum SourceVersion {
      * JEP 456: Unnamed Variables &amp; Patterns</a>
      */
     RELEASE_22,
+
+    /**
+     * The version introduced by the Java Platform, Standard Edition
+     * 23.
+     *
+     * @since 23
+     *
+     * @see <a
+     * href="https://docs.oracle.com/javase/specs/jls/se23/html/index.html">
+     * <cite>The Java Language Specification, Java SE 23 Edition</cite></a>
+     */
+    RELEASE_23,
     ; // Reduce code churn when appending new constants
 
     // Note that when adding constants for newer releases, the
@@ -424,7 +436,7 @@ public enum SourceVersion {
      * {@return the latest source version that can be modeled}
      */
     public static SourceVersion latest() {
-        return RELEASE_22;
+        return RELEASE_23;
     }
 
     private static final SourceVersion latestSupported = getLatestSupported();
@@ -439,7 +451,7 @@ public static SourceVersion latest() {
     private static SourceVersion getLatestSupported() {
         int intVersion = Runtime.version().feature();
         return (intVersion >= 11) ?
-            valueOf("RELEASE_" + Math.min(22, intVersion)):
+            valueOf("RELEASE_" + Math.min(23, intVersion)):
             RELEASE_10;
     }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 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
@@ -44,7 +44,7 @@
  * @see AbstractAnnotationValueVisitor9
  * @since 14
  */
-@SupportedSourceVersion(RELEASE_22)
+@SupportedSourceVersion(RELEASE_23)
 public abstract class AbstractAnnotationValueVisitor14<R, P> extends AbstractAnnotationValueVisitor9<R, P> {
 
     /**