Merge master HEAD into openj9-staging

Signed-off-by: J9 Build <[email protected]>

Author: j9build

make/hotspot/lib/CompileJvm.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2025, 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
@@ -127,9 +127,7 @@ else ifeq ($(call And, $(call isTargetOs, linux) $(call isTargetCpu, aarch64)),
   endif
 endif
 
-ifeq ($(call isTargetOs, linux macosx windows), true)
-  JVM_PRECOMPILED_HEADER := $(TOPDIR)/src/hotspot/share/precompiled/precompiled.hpp
-endif
+JVM_PRECOMPILED_HEADER := $(TOPDIR)/src/hotspot/share/precompiled/precompiled.hpp
 
 ifeq ($(call isTargetCpu, x86), true)
   JVM_EXCLUDE_PATTERNS += x86_64

make/hotspot/lib/JvmOverrideFiles.gmk

@@ -118,11 +118,7 @@ else ifeq ($(call isTargetOs, macosx), true)
   endif
 
 else ifeq ($(call isTargetOs, aix), true)
-  ifeq ($(TOOLCHAIN_TYPE), clang)
-    BUILD_LIBJVM_synchronizer.cpp_CXXFLAGS := -fno-inline
-  else
-    BUILD_LIBJVM_synchronizer.cpp_CXXFLAGS := -qnoinline
-  endif
+  BUILD_LIBJVM_synchronizer.cpp_CXXFLAGS := -fno-inline
   BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := $(CXX_O_FLAG_NONE)
   # Disable aggressive optimizations for functions in sharedRuntimeTrig.cpp
   # and sharedRuntimeTrans.cpp on ppc64.
@@ -146,6 +142,13 @@ else ifeq ($(call isTargetOs, aix), true)
   # Disable ELF decoder on AIX (AIX uses XCOFF).
   JVM_EXCLUDE_PATTERNS += elf
 
+  JVM_PRECOMPILED_HEADER_EXCLUDE := \
+      sharedRuntimeTrig.cpp \
+      sharedRuntimeTrans.cpp \
+      synchronizer.cpp \
+      $(OPT_SPEED_SRC) \
+      #
+
 else ifeq ($(call isTargetOs, windows), true)
   JVM_PRECOMPILED_HEADER_EXCLUDE := \
       bytecodeInterpreter.cpp \

src/java.base/share/classes/java/security/KeyPairGenerator.java

@@ -68,16 +68,9 @@
  * <p>Since no other parameters are specified when you call the above
  * algorithm-independent {@code initialize} methods, it is up to the
  * provider what to do about the algorithm-specific parameters (if any) to be
- * associated with each of the keys.
- *
- * <p>If the algorithm is the <i>DSA</i> algorithm, and the keysize (modulus
- * size) is 512, 768, 1024, or 2048, then the <i>Sun</i> provider uses a set of
- * precomputed values for the {@code p}, {@code q}, and
- * {@code g} parameters. If the modulus size is not one of the above
- * values, the <i>Sun</i> provider creates a new set of parameters. Other
- * providers might have precomputed parameter sets for more than just the
- * modulus sizes mentioned above. Still others might not have a list of
- * precomputed parameters at all and instead always create new parameter sets.
+ * associated with each of the keys. See the
+ * {@extLink security_guide_jdk_providers JDK Providers} document for information
+ * on the default algorithm-specific parameters used by JDK providers.
  *
  * <li><b>Algorithm-Specific Initialization</b>
  * <p>For situations where a set of algorithm-specific parameters already

src/java.base/share/classes/java/util/Currency.java

@@ -32,8 +32,10 @@
 import java.io.InputStream;
 import java.io.IOException;
 import java.io.Serializable;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.regex.Pattern;
@@ -1156,7 +1158,7 @@ private static Optional<CurrencyProperty> getValidEntry(String ctry,
                                 && !isPastCutoverDate(prop.date)) {
                             prop = null;
                         }
-                    } catch (ParseException ex) {
+                    } catch (DateTimeParseException ex) {
                         prop = null;
                     }
                 }
@@ -1196,15 +1198,12 @@ private static boolean containsInconsistentInstances(
                     || prop.fraction != fractionDigit);
         }
 
-        private static boolean isPastCutoverDate(String s)
-                throws ParseException {
-            SimpleDateFormat format = new SimpleDateFormat(
-                    "yyyy-MM-dd'T'HH:mm:ss", Locale.ROOT);
-            format.setTimeZone(TimeZone.getTimeZone("UTC"));
-            format.setLenient(false);
-            long time = format.parse(s.trim()).getTime();
-            return System.currentTimeMillis() > time;
-
+        // cutOver adheres to ISO8601 Local Date Time format (excluding nano secs)
+        private static boolean isPastCutoverDate(String cutOver) {
+            return System.currentTimeMillis() >
+                    LocalDateTime.parse(cutOver, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+                            .toInstant(ZoneOffset.UTC)
+                            .toEpochMilli();
         }
 
         private static void info(String message, Throwable t) {

src/java.rmi/share/classes/sun/rmi/log/LogInputStream.java

@@ -124,12 +124,4 @@ public int available() throws IOException {
     public void close() {
         length = 0;
     }
-
-    /**
-     * Closes the stream when garbage is collected.
-     */
-    @SuppressWarnings("removal")
-    protected void finalize() throws IOException {
-        close();
-    }
 }

src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java

@@ -100,11 +100,6 @@ public RegistryContext(String host, int port, Hashtable<?, ?> env)
         reference = ctx.reference;
     }
 
-    @SuppressWarnings("removal")
-    protected void finalize() {
-        close();
-    }
-
     public Object lookup(Name name) throws NamingException {
         if (name.isEmpty()) {
             return (new RegistryContext(this));
@@ -557,11 +552,6 @@ class BindingEnumeration implements NamingEnumeration<Binding> {
         nextName = 0;
     }
 
-    @SuppressWarnings("removal")
-    protected void finalize() {
-        ctx.close();
-    }
-
     public boolean hasMore() {
         if (nextName >= names.length) {
             ctx.close();
@@ -598,8 +588,7 @@ public Binding nextElement() {
         }
     }
 
-    @SuppressWarnings("deprecation")
     public void close () {
-        finalize();
+        ctx.close();
     }
 }

test/hotspot/jtreg/compiler/intrinsics/TestContinuationPinningAndEA.java

@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @requires vm.continuations
  * @bug 8347997
  * @summary Test that Continuation.pin() and unpin() intrinsics work with EA.
  * @modules java.base/jdk.internal.vm

test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/IncompatibleOptions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, 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
@@ -78,10 +78,6 @@
 import jdk.test.whitebox.gc.GC;
 
 public class IncompatibleOptions {
-    static final String COOPS_DUMP_WARNING =
-        "Cannot dump shared archive when UseCompressedOops or UseCompressedClassPointers is off";
-    static final String GC_WARNING =
-        "Archived java heap is not supported";
     static final String OBJ_ALIGNMENT_MISMATCH =
         "The shared archive file's ObjectAlignmentInBytes of .* does not equal the current ObjectAlignmentInBytes of";
     static final String COMPACT_STRING_MISMATCH =

test/jdk/java/net/httpclient/HttpRequestBuilderTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, 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
@@ -25,6 +25,9 @@
 import java.net.http.HttpClient;
 import java.time.Duration;
 import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -34,11 +37,12 @@
 import static java.net.http.HttpRequest.BodyPublishers.ofString;
 import static java.net.http.HttpRequest.BodyPublishers.noBody;
 
-/**
+/*
  * @test
  * @bug 8170064 8276559
- * @summary  HttpRequest[.Builder] API and behaviour checks
+ * @summary HttpRequest[.Builder] API and behaviour checks
  */
+
 public class HttpRequestBuilderTest {
 
     static final URI TEST_URI = URI.create("http://www.foo.com/");
@@ -262,13 +266,11 @@ public static void main(String[] args) throws Exception {
         // verify that the default HEAD() method implementation in HttpRequest.Builder
         // interface works as expected
         HttpRequest defaultHeadReq = new NotOverriddenHEADImpl().HEAD().uri(TEST_URI).build();
-        String actualMethod = defaultHeadReq.method();
-        if (!actualMethod.equals("HEAD")) {
-            throw new AssertionError("failed: expected HEAD method but got method: " + actualMethod);
-        }
-        if (defaultHeadReq.bodyPublisher().isEmpty()) {
-            throw new AssertionError("failed: missing bodyPublisher on HEAD request");
-        }
+        assertEquals("HEAD", defaultHeadReq.method(), "Method");
+        assertEquals(false, defaultHeadReq.bodyPublisher().isEmpty(), "Body publisher absence");
+
+        verifyCopy();
+
     }
 
     private static boolean shouldFail(Class<? extends Exception> ...exceptions) {
@@ -295,13 +297,7 @@ static void method(String name,
             throw new AssertionError("failed: " + name
                     + ". Unexpected body processor for GET: "
                     + request.bodyPublisher().get());
-
-        if (expectedMethod.equals(method)) {
-            System.out.println("success: " + name);
-        } else {
-            throw new AssertionError("failed: " + name
-                    + ". Expected " + expectedMethod + ", got " + method);
-        }
+        assertEquals(expectedMethod, method, "Method");
     }
 
     static void test0(String name,
@@ -378,6 +374,45 @@ public static <R,P1, P2> R test2(String name, R receiver, BiFunction<P1, P2, R>
         }
     }
 
+    private static void verifyCopy() {
+
+        // Create the request builder
+        HttpRequest.Builder requestBuilder = HttpRequest
+                .newBuilder(TEST_URI)
+                .header("X-Foo", "1")
+                .method("GET", noBody())
+                .expectContinue(true)
+                .timeout(Duration.ofSeconds(0xBEEF))
+                .version(HttpClient.Version.HTTP_2);
+
+        // Create the original and the _copy_ requests
+        HttpRequest request = requestBuilder.build();
+        HttpRequest copiedRequest = requestBuilder
+                .copy()
+                .header("X-Foo", "2")
+                .header("X-Bar", "3")
+                .build();
+
+        // Verify copied _references_
+        assertEquals(request.uri(), copiedRequest.uri(), "URI");
+        assertEquals(request.method(), copiedRequest.method(), "Method");
+        assertEquals(request.expectContinue(), copiedRequest.expectContinue(), "Expect continue setting");
+        assertEquals(request.timeout(), copiedRequest.timeout(), "Timeout");
+        assertEquals(request.version(), copiedRequest.version(), "Version");
+
+        // Verify headers
+        assertEquals(request.headers().map(), Map.of("X-Foo", List.of("1")), "Request headers");
+        assertEquals(copiedRequest.headers().map(), Map.of("X-Foo", List.of("1", "2"), "X-Bar", List.of("3")), "Copied request headers");
+
+    }
+
+    private static void assertEquals(Object expected, Object actual, Object name) {
+        if (!Objects.equals(expected, actual)) {
+            String message = String.format("%s mismatch!%nExpected: %s%nActual: %s", name, expected, actual);
+            throw new AssertionError(message);
+        }
+    }
+
     // doesn't override the default HEAD() method
     private static final class NotOverriddenHEADImpl implements HttpRequest.Builder {
         private final HttpRequest.Builder underlying = HttpRequest.newBuilder();

test/jdk/jdk/jfr/event/gc/detailed/TestShenandoahEvacuationInformationEvent.java

@@ -49,6 +49,7 @@ public class TestShenandoahEvacuationInformationEvent {
 
     public static void main(String[] args) throws Exception {
         final long shenandoahHeapRegionSize = 1024 * 1024;
+        final long shenandoahMaxHeapRegionCount = 64;
         Recording recording = new Recording();
         recording.enable(EVENT_NAME).withThreshold(Duration.ofMillis(0));
         recording.start();
@@ -63,14 +64,14 @@ public static void main(String[] args) throws Exception {
             }
             System.out.println("Event: " + event);
 
-            long setRegions = Events.assertField(event, "cSetRegions").atLeast(0L).getValue();
+            long cSetRegions = Events.assertField(event, "cSetRegions").atLeast(0L).getValue();
             long setUsedAfter = Events.assertField(event, "cSetUsedAfter").atLeast(0L).getValue();
             long setUsedBefore = Events.assertField(event, "cSetUsedBefore").atLeast(setUsedAfter).getValue();
-            long regionsFreed = Events.assertField(event, "regionsFreed").atLeast(0L).getValue();
+            long freeRegions = Events.assertField(event, "freeRegions").atLeast(0L).getValue();
             Events.assertField(event, "collectedOld").atLeast(0L).getValue();
             Events.assertField(event, "collectedYoung").atLeast(0L).getValue();
 
-            Asserts.assertGreaterThanOrEqual(setRegions, regionsFreed, "setRegions >= regionsFreed");
+            Asserts.assertGreaterThanOrEqual(shenandoahMaxHeapRegionCount, freeRegions + cSetRegions, "numRegions >= freeRegions + cSetRegions");
             Asserts.assertGreaterThanOrEqual(shenandoahHeapRegionSize * setRegions, setUsedAfter, "ShenandoahHeapRegionSize * setRegions >= setUsedAfter");
             Asserts.assertGreaterThanOrEqual(shenandoahHeapRegionSize * setRegions, setUsedBefore, "ShenandoahHeapRegionSize * setRegions >= setUsedBefore");
 

test/jtreg-ext/requires/VMProps.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, 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
@@ -452,7 +452,9 @@ protected String vmCDSForCustomLoaders() {
     }
 
     /**
-     * @return true if this VM can write Java heap objects into the CDS archive
+     * @return true if it's possible for "java -Xshare:dump" to write Java heap objects
+     *         with the current set of jtreg VM options. For example, false will be returned
+     *         if -XX:-UseCompressedClassPointers is specified,
      */
     protected String vmCDSCanWriteArchivedJavaHeap() {
         return "" + ("true".equals(vmCDS()) && WB.canWriteJavaHeapArchive()

test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayCriticalXorOpImpl.java

@@ -1,3 +1,26 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
 package org.openjdk.bench.java.lang.foreign.xor;
 
 public class GetArrayCriticalXorOpImpl implements XorOp {

test/micro/org/openjdk/bench/java/lang/foreign/xor/GetArrayElementsXorOpImpl.java

@@ -1,3 +1,26 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
 package org.openjdk.bench.java.lang.foreign.xor;
 
 public class GetArrayElementsXorOpImpl implements XorOp {