Merge

Author: theaoqi

.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/hotspot/share/gc/z/zPhysicalMemory.cpp

@@ -283,15 +283,15 @@ void ZPhysicalMemoryManager::nmt_commit(zoffset offset, size_t size) const {
   // When this function is called we don't know where in the virtual memory
   // this physical memory will be mapped. So we fake that the virtual memory
   // address is the heap base + the given offset.
-  const zaddress addr = ZOffset::address(offset);
-  MemTracker::record_virtual_memory_commit((void*)untype(addr), size, CALLER_PC);
+  const uintptr_t addr = ZAddressHeapBase + untype(offset);
+  MemTracker::record_virtual_memory_commit((void*)addr, size, CALLER_PC);
 }
 
 void ZPhysicalMemoryManager::nmt_uncommit(zoffset offset, size_t size) const {
   if (MemTracker::enabled()) {
-    const zaddress addr = ZOffset::address(offset);
+    const uintptr_t addr = ZAddressHeapBase + untype(offset);
     Tracker tracker(Tracker::uncommit);
-    tracker.record((address)untype(addr), size);
+    tracker.record((address)addr, size);
   }
 }
 

src/java.base/share/classes/java/lang/Thread.java

@@ -2011,22 +2011,6 @@ public static int enumerate(Thread[] tarray) {
         return currentThread().getThreadGroup().enumerate(tarray);
     }
 
-    /**
-     * Throws {@code UnsupportedOperationException}.
-     *
-     * @return     nothing
-     *
-     * @deprecated This method was originally designed to count the number of
-     *             stack frames but the results were never well-defined and it
-     *             depended on thread-suspension.
-     *             This method is subject to removal in a future version of Java SE.
-     * @see        StackWalker
-     */
-    @Deprecated(since="1.2", forRemoval=true)
-    public int countStackFrames() {
-        throw new UnsupportedOperationException();
-    }
-
     /**
      * Waits at most {@code millis} milliseconds for this thread to terminate.
      * A timeout of {@code 0} means to wait forever.

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/java/text/Collator.java

@@ -275,7 +275,7 @@ public static synchronized Collator getInstance() {
      * may return a {@code Collator} instance with the Swedish traditional sorting, which
      * gives 'v' and 'w' the same sorting order, while the {@code Collator} instance
      * for the Swedish locale without "co" identifier distinguishes 'v' and 'w'.
-     * @spec https://www.unicode.org/reports/tr35/ Unicode Locale Data Markup Language
+     * @spec https://www.unicode.org/reports/tr35 Unicode Locale Data Markup Language
      *     (LDML)
      * @param desiredLocale the desired locale.
      * @return the Collator for the desired locale.

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));
         }