Merge branch 'upstream-master'

make/conf/github-actions.conf

@@ -29,21 +29,21 @@ GTEST_VERSION=1.14.0
 JTREG_VERSION=7.4+1
 
 LINUX_X64_BOOT_JDK_EXT=tar.gz
-LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk22.0.2/c9ecb94cd31b495da20a27d4581645e8/9/GPL/openjdk-22.0.2_linux-x64_bin.tar.gz
-LINUX_X64_BOOT_JDK_SHA256=41536f115668308ecf4eba92aaf6acaeb0936225828b741efd83b6173ba82963
+LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-x64_bin.tar.gz
+LINUX_X64_BOOT_JDK_SHA256=08fea92724127c6fa0f2e5ea0b07ff4951ccb1e2f22db3c21eebbd7347152a67
 
 ALPINE_LINUX_X64_BOOT_JDK_EXT=tar.gz
-ALPINE_LINUX_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_x64_alpine-linux_hotspot_22.0.2_9.tar.gz
-ALPINE_LINUX_X64_BOOT_JDK_SHA256=49f73414824b1a7c268a611225fa4d7ce5e25600201e0f1cd59f94d1040b5264
+ALPINE_LINUX_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_x64_alpine-linux_hotspot_23_37.tar.gz
+ALPINE_LINUX_X64_BOOT_JDK_SHA256=bff4c78f30d8d173e622bf2f40c36113df47337fc6d1ee5105ed2459841165aa
 
 MACOS_AARCH64_BOOT_JDK_EXT=tar.gz
-MACOS_AARCH64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk22.0.2/c9ecb94cd31b495da20a27d4581645e8/9/GPL/openjdk-22.0.2_macos-aarch64_bin.tar.gz
-MACOS_AARCH64_BOOT_JDK_SHA256=3dab98730234e1a87aec14bcb8171d2cae101e96ff4eed1dab96abbb08e843fd
+MACOS_AARCH64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_macos-aarch64_bin.tar.gz
+MACOS_AARCH64_BOOT_JDK_SHA256=9527bf080a74ae6dca51df413aa826f0c011c6048885e4c8ad112172be8815f3
 
 MACOS_X64_BOOT_JDK_EXT=tar.gz
-MACOS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk22.0.2/c9ecb94cd31b495da20a27d4581645e8/9/GPL/openjdk-22.0.2_macos-x64_bin.tar.gz
-MACOS_X64_BOOT_JDK_SHA256=e8b3ec7a7077711223d31156e771f11723cd7af31c2017f1bd2eda20855940fb
+MACOS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_macos-x64_bin.tar.gz
+MACOS_X64_BOOT_JDK_SHA256=5c3a909fd2079d0e376dd43c85c4f7d02d08914866f196480bd47784b2a0121e
 
 WINDOWS_X64_BOOT_JDK_EXT=zip
-WINDOWS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk22.0.2/c9ecb94cd31b495da20a27d4581645e8/9/GPL/openjdk-22.0.2_windows-x64_bin.zip
-WINDOWS_X64_BOOT_JDK_SHA256=f2a9b9ab944e71a64637fcdc6b13a1188cf02d4eb9ecf71dc927e98b3e45f5dc
+WINDOWS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_windows-x64_bin.zip
+WINDOWS_X64_BOOT_JDK_SHA256=cba5013874ba50cae543c86fe6423453816c77281e2751a8a9a633d966f1dc04

make/conf/jib-profiles.js

@@ -390,8 +390,8 @@ var getJibProfilesCommon = function (input, data) {
         };
     };
 
-    common.boot_jdk_version = "22";
-    common.boot_jdk_build_number = "36";
+    common.boot_jdk_version = "23";
+    common.boot_jdk_build_number = "37";
     common.boot_jdk_home = input.get("boot_jdk", "install_path") + "/jdk-"
         + common.boot_jdk_version
         + (input.build_os == "macosx" ? ".jdk/Contents/Home" : "");

make/conf/version-numbers.conf

@@ -37,6 +37,6 @@ DEFAULT_VERSION_DATE=2025-03-18
 DEFAULT_VERSION_CLASSFILE_MAJOR=68  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_VERSION_DOCS_API_SINCE=11
-DEFAULT_ACCEPTABLE_BOOT_VERSIONS="22 23 24"
+DEFAULT_ACCEPTABLE_BOOT_VERSIONS="23 24"
 DEFAULT_JDK_SOURCE_TARGET_VERSION=24
 DEFAULT_PROMOTED_VERSION_PRE=ea

src/hotspot/cpu/s390/matcher_s390.hpp

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2017, 2022 SAP SE. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024 SAP SE. 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
@@ -63,11 +63,16 @@
     return true;
   }
 
-  // Suppress CMOVL. Conditional move available on z/Architecture only from z196 onwards. Not exploited yet.
-  static int long_cmove_cost() { return ConditionalMoveLimit; }
+  // Use conditional move (CMOVL)
+  static int long_cmove_cost() {
+    // z196/z11 or later hardware support conditional moves
+    return VM_Version::has_LoadStoreConditional() ? 0 : ConditionalMoveLimit;
+  }
 
-  // Suppress CMOVF. Conditional move available on z/Architecture only from z196 onwards. Not exploited yet.
-  static int float_cmove_cost() { return ConditionalMoveLimit; }
+  static int float_cmove_cost() {
+    // z196/z11 or later hardware support conditional moves
+    return VM_Version::has_LoadStoreConditional() ? 0 : ConditionalMoveLimit;
+  }
 
   // Set this as clone_shift_expressions.
   static bool narrow_oop_use_complex_address() {

src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp

@@ -64,16 +64,16 @@ class CgroupV2CpuController: public CgroupCpuController {
     bool is_read_only() override {
       return reader()->is_read_only();
     }
-    const char* subsystem_path() {
+    const char* subsystem_path() override {
       return reader()->subsystem_path();
     }
     bool needs_hierarchy_adjustment() override {
       return reader()->needs_hierarchy_adjustment();
     }
-    void set_subsystem_path(const char* cgroup_path) {
+    void set_subsystem_path(const char* cgroup_path) override {
       reader()->set_subsystem_path(cgroup_path);
     }
-    const char* mount_point() { return reader()->mount_point(); }
+    const char* mount_point() override { return reader()->mount_point(); }
     const char* cgroup_path() override { return reader()->cgroup_path(); }
 };
 
@@ -97,16 +97,16 @@ class CgroupV2MemoryController final: public CgroupMemoryController {
     bool is_read_only() override {
       return reader()->is_read_only();
     }
-    const char* subsystem_path() {
+    const char* subsystem_path() override {
       return reader()->subsystem_path();
     }
     bool needs_hierarchy_adjustment() override {
       return reader()->needs_hierarchy_adjustment();
     }
-    void set_subsystem_path(const char* cgroup_path) {
+    void set_subsystem_path(const char* cgroup_path) override {
       reader()->set_subsystem_path(cgroup_path);
     }
-    const char* mount_point() { return reader()->mount_point(); }
+    const char* mount_point() override { return reader()->mount_point(); }
     const char* cgroup_path() override { return reader()->cgroup_path(); }
 };
 

src/hotspot/share/gc/g1/g1RemSet.cpp

@@ -967,6 +967,10 @@ class G1MergeHeapRootsTask : public WorkerTask {
       _merged[G1GCPhaseTimes::MergeRSCards] += increment;
     }
 
+    void dec_remset_cards(size_t decrement) {
+      _merged[G1GCPhaseTimes::MergeRSCards] -= decrement;
+    }
+
     size_t merged(uint i) const { return _merged[i]; }
   };
 
@@ -1091,6 +1095,11 @@ class G1MergeHeapRootsTask : public WorkerTask {
 
     G1MergeCardSetStats stats() {
       _merge_card_set_cache.flush();
+      // Compensation for the dummy cards that were initially pushed into the
+      // card cache.
+      // We do not need to compensate for the other counters because the dummy
+      // card mark will never update another counter because it is initally "dirty".
+      _stats.dec_remset_cards(G1MergeCardSetCache::CacheSize);
       return _stats;
     }
   };

src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.hpp

@@ -80,6 +80,8 @@ class ShenandoahSimpleBitMap {
   bool is_forward_consecutive_ones(idx_t start_idx, idx_t count) const;
   bool is_backward_consecutive_ones(idx_t last_idx, idx_t count) const;
 
+  static inline uintx tail_mask(uintx bit_number);
+
 public:
 
   inline idx_t aligned_index(idx_t idx) const {

src/hotspot/share/gc/shenandoah/shenandoahSimpleBitMap.inline.hpp

@@ -27,7 +27,7 @@
 
 #include "gc/shenandoah/shenandoahSimpleBitMap.hpp"
 
-inline uintx tail_mask(uintx bit_number) {
+inline uintx ShenandoahSimpleBitMap::tail_mask(uintx bit_number) {
   if (bit_number >= BitsPerWord) {
     return -1;
   }

src/java.base/share/classes/java/util/zip/ZipEntry.java

@@ -564,20 +564,20 @@ void setExtra0(byte[] extra, boolean doZIP64, boolean isLOC) {
                             // be the magic value and it "accidentally" has some
                             // bytes in extra match the id.
                             if (sz >= 16) {
-                                size = get64(extra, off);
-                                csize = get64(extra, off + 8);
+                                size = get64S(extra, off);
+                                csize = get64S(extra, off + 8);
                             }
                         } else {
                             // CEN extra zip64
                             if (size == ZIP64_MAGICVAL) {
                                 if (off + 8 > len)  // invalid zip64 extra
                                     break;          // fields, just skip
-                                size = get64(extra, off);
+                                size = get64S(extra, off);
                             }
                             if (csize == ZIP64_MAGICVAL) {
                                 if (off + 16 > len)  // invalid zip64 extra
                                     break;           // fields, just skip
-                                csize = get64(extra, off + 8);
+                                csize = get64S(extra, off + 8);
                             }
                         }
                     }
@@ -588,15 +588,15 @@ void setExtra0(byte[] extra, boolean doZIP64, boolean isLOC) {
                     int pos = off + 4;               // reserved 4 bytes
                     if (get16(extra, pos) !=  0x0001 || get16(extra, pos + 2) != 24)
                         break;
-                    long wtime = get64(extra, pos + 4);
+                    long wtime = get64S(extra, pos + 4);
                     if (wtime != WINDOWS_TIME_NOT_AVAILABLE) {
                         mtime = winTimeToFileTime(wtime);
                     }
-                    wtime = get64(extra, pos + 12);
+                    wtime = get64S(extra, pos + 12);
                     if (wtime != WINDOWS_TIME_NOT_AVAILABLE) {
                         atime = winTimeToFileTime(wtime);
                     }
-                    wtime = get64(extra, pos + 20);
+                    wtime = get64S(extra, pos + 20);
                     if (wtime != WINDOWS_TIME_NOT_AVAILABLE) {
                         ctime = winTimeToFileTime(wtime);
                     }

src/java.base/share/classes/java/util/zip/ZipError.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, 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
@@ -28,9 +28,12 @@
 /**
  * Signals that an unrecoverable error has occurred.
  *
+ * @deprecated ZipError is no longer used and is obsolete.
+ * {@link ZipException} should be used instead.
  * @author  Dave Bristor
  * @since   1.6
  */
+@Deprecated(since="24", forRemoval = true)
 public class ZipError extends InternalError {
     @java.io.Serial
     private static final long serialVersionUID = 853973422266861979L;