Merge pull request #1570 from SAP/pr-jdk-23+1

Merge to tag jdk-23+1
SAP · Dec 13, 2023 · f138e49 · f138e49
2 parents 37e2797 + 519ecd3
commit f138e49
Show file tree

Hide file tree

Showing 98 changed files with 4,872 additions and 44 deletions.
diff --git a/.jcheck/conf b/.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

diff --git a/make/conf/version-numbers.conf b/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
diff --git a/src/hotspot/share/classfile/classFileParser.cpp b/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,

diff --git a/src/java.base/share/classes/java/lang/classfile/ClassFile.java b/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;
  }
 
  /**

diff --git a/src/java.base/share/classes/java/lang/reflect/ClassFileFormatVersion.java b/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;
  }
 
  /**

diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java b/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));
  }

diff --git a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java b/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.

diff --git a/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java b/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;
  }
 

diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor14.java b/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> {
 
  /**

diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor14.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor14.java
@@ -50,7 +50,7 @@
  * @see AbstractElementVisitor9
  * @since 16
  */
-@SupportedSourceVersion(RELEASE_22)
+@SupportedSourceVersion(RELEASE_23)
 public abstract class AbstractElementVisitor14<R, P> extends AbstractElementVisitor9<R, P> {
  /**
  * Constructor for concrete subclasses to call.

diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor14.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor14.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
@@ -47,7 +47,7 @@
  * @see AbstractTypeVisitor9
  * @since 14
  */
-@SupportedSourceVersion(RELEASE_22)
+@SupportedSourceVersion(RELEASE_23)
 public abstract class AbstractTypeVisitor14<R, P> extends AbstractTypeVisitor9<R, P> {
  /**
  * Constructor for concrete subclasses to call.

diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor14.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor14.java
@@ -61,7 +61,7 @@
  * @see ElementKindVisitor9
  * @since 16
  */
-@SupportedSourceVersion(RELEASE_22)
+@SupportedSourceVersion(RELEASE_23)
 public class ElementKindVisitor14<R, P> extends ElementKindVisitor9<R, P> {
  /**
  * Constructor for concrete subclasses; uses {@code null} for the

diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner14.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner14.java
@@ -78,7 +78,7 @@
  * @see ElementScanner9
  * @since 16
  */
-@SupportedSourceVersion(RELEASE_22)
+@SupportedSourceVersion(RELEASE_23)
 public class ElementScanner14<R, P> extends ElementScanner9<R, P> {
  /**
  * Constructor for concrete subclasses; uses {@code null} for the

diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor14.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor14.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
@@ -52,7 +52,7 @@
  * @see SimpleAnnotationValueVisitor9
  * @since 14
  */
-@SupportedSourceVersion(RELEASE_22)
+@SupportedSourceVersion(RELEASE_23)
 public class SimpleAnnotationValueVisitor14<R, P> extends SimpleAnnotationValueVisitor9<R, P> {
  /**
  * Constructor for concrete subclasses; uses {@code null} for the

diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor14.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor14.java
@@ -58,7 +58,7 @@
  * @see SimpleElementVisitor9
  * @since 16
  */
-@SupportedSourceVersion(RELEASE_22)
+@SupportedSourceVersion(RELEASE_23)
 public class SimpleElementVisitor14<R, P> extends SimpleElementVisitor9<R, P> {
  /**
  * Constructor for concrete subclasses; uses {@code null} for the

diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor14.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor14.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
@@ -56,7 +56,7 @@
  * @see SimpleTypeVisitor9
  * @since 14
  */
-@SupportedSourceVersion(RELEASE_22)
+@SupportedSourceVersion(RELEASE_23)
 public class SimpleTypeVisitor14<R, P> extends SimpleTypeVisitor9<R, P> {
  /**
  * Constructor for concrete subclasses; uses {@code null} for the

diff --git a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor14.java b/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor14.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
@@ -61,7 +61,7 @@
  * @see TypeKindVisitor9
  * @since 14
  */
-@SupportedSourceVersion(RELEASE_22)
+@SupportedSourceVersion(RELEASE_23)
 public class TypeKindVisitor14<R, P> extends TypeKindVisitor9<R, P> {
  /**
  * Constructor for concrete subclasses to call; uses {@code null}

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
@@ -138,6 +138,11 @@ public enum Source {
  * 22, tbd
  */
  JDK22("22"),
+
+ /**
+ * 23, tbd
+ */
+ JDK23("23"),
  ; // Reduce code churn when appending new constants
 
  private static final Context.Key<Source> sourceKey = new Context.Key<>();
@@ -190,6 +195,7 @@ public boolean isSupported() {
 
  public Target requiredTarget() {
  return switch(this) {
+ case JDK23 -> Target.JDK1_23;
  case JDK22 -> Target.JDK1_22;
  case JDK21 -> Target.JDK1_21;
  case JDK20 -> Target.JDK1_20;
@@ -333,6 +339,7 @@ public static SourceVersion toSourceVersion(Source source) {
  case JDK20 -> RELEASE_20;
  case JDK21 -> RELEASE_21;
  case JDK22 -> RELEASE_22;
+ case JDK23 -> RELEASE_23;
  default -> null;
  };
  }

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java
@@ -125,6 +125,7 @@ public enum Version {
  V64(64, 0), // JDK 20
  V65(65, 0), // JDK 21
  V66(66, 0), // JDK 22
+ V67(67, 0), // JDK 23
  ; // Reduce code churn when appending new constants
  Version(int major, int minor) {
  this.major = major;

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java
@@ -101,6 +101,9 @@ public enum Target {
 
  /** JDK 22. */
  JDK1_22("22", 66, 0),
+
+ /** JDK 23. */
+ JDK1_23("23", 67, 0),
  ; // Reduce code churn when appending new constants
 
  private static final Context.Key<Target> targetKey = new Context.Key<>();

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java
@@ -55,7 +55,7 @@
  * deletion without notice.</b>
  */
 @SupportedAnnotationTypes("*")
-@SupportedSourceVersion(SourceVersion.RELEASE_22)
+@SupportedSourceVersion(SourceVersion.RELEASE_23)
 public class PrintingProcessor extends AbstractProcessor {
  PrintWriter writer;