Merge master HEAD into openj9-staging

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

.github/workflows/main.yml

@@ -325,17 +325,6 @@ jobs:
       bootjdk-platform: linux-x64
       runs-on: ubuntu-22.04
 
-  test-macos-x64:
-    name: macos-x64
-    needs:
-      - build-macos-x64
-    uses: ./.github/workflows/test.yml
-    with:
-      platform: macos-x64
-      bootjdk-platform: macos-x64
-      runs-on: macos-13
-      xcode-toolset-version: '14.3.1'
-
   test-macos-aarch64:
     name: macos-aarch64
     needs:

make/autoconf/flags-cflags.m4

@@ -898,6 +898,22 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
 
   FLAGS_SETUP_BRANCH_PROTECTION
 
+  if test "x$FLAGS_CPU" = xriscv64; then
+    AC_MSG_CHECKING([if RVV/vector sigcontext supported])
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <linux/ptrace.h>],
+        [
+          return (int)sizeof(struct __riscv_v_ext_state);
+        ])],
+        [
+          AC_MSG_RESULT([yes])
+        ],
+        [
+          $1_DEFINES_CPU_JVM="${$1_DEFINES_CPU_JVM} -DNO_RVV_SIGCONTEXT"
+          AC_MSG_RESULT([no])
+        ]
+    )
+  fi
+
   # EXPORT to API
   CFLAGS_JVM_COMMON="$ALWAYS_CFLAGS_JVM $ALWAYS_DEFINES_JVM \
       $TOOLCHAIN_CFLAGS_JVM ${$1_TOOLCHAIN_CFLAGS_JVM} \

src/java.base/aix/native/libjava/ProcessHandleImpl_aix.c

@@ -162,7 +162,24 @@ jint os_getChildren(JNIEnv *env, jlong jpid, jlongArray jarray,
 }
 
 pid_t os_getParentPidAndTimings(JNIEnv *env, pid_t pid, jlong *total, jlong *start) {
-    return unix_getParentPidAndTimings(env, pid, total, start);
+    pid_t the_pid = pid;
+    struct procentry64 ProcessBuffer;
+
+    if (getprocs64(&ProcessBuffer, sizeof(ProcessBuffer), NULL, sizeof(struct fdsinfo64), &the_pid, 1) <= 0) {
+        return -1;
+    }
+
+    // Validate the pid before returning the info
+    if (kill(pid, 0) < 0) {
+        return -1;
+    }
+
+    *total = ((ProcessBuffer.pi_ru.ru_utime.tv_sec + ProcessBuffer.pi_ru.ru_stime.tv_sec) * 1000000000L) +
+             ((ProcessBuffer.pi_ru.ru_utime.tv_usec + ProcessBuffer.pi_ru.ru_stime.tv_usec));
+
+    *start = ProcessBuffer.pi_start * (jlong)1000;
+
+    return (pid_t) ProcessBuffer.pi_ppid;
 }
 
 void os_getCmdlineAndUserInfo(JNIEnv *env, jobject jinfo, pid_t pid) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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
@@ -42,12 +42,12 @@ public class EnumConstantNotPresentException extends RuntimeException {
     private static final long serialVersionUID = -6046998521960521108L;
 
     /**
-     * The type of the missing enum constant.
+     * @serial The type of the missing enum constant.
      */
     private Class<? extends Enum> enumType;
 
     /**
-     * The name of the missing enum constant.
+     * @serial The name of the missing enum constant.
      */
     private String constantName;
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -64,35 +64,35 @@ public final class StackTraceElement implements java.io.Serializable {
 
     // Normally initialized by VM
     /**
-     * The name of the class loader.
+     * @serial The name of the class loader.
      */
     private String classLoaderName;
     /**
-     * The module name.
+     * @serial The module name.
      */
     private String moduleName;
     /**
-     * The module version.
+     * @serial The module version.
      */
     private String moduleVersion;
     /**
-     * The declaring class.
+     * @serial The declaring class.
      */
     private String declaringClass;
     /**
-     * The method name.
+     * @serial The method name.
      */
     private String methodName;
     /**
-     * The source file name.
+     * @serial The source file name.
      */
     private String fileName;
     /**
-     * The source line number.
+     * @serial The source line number.
      */
     private int    lineNumber;
     /**
-     * Control to show full or partial module, package, and class names.
+     * @serial Control to show full or partial module, package, and class names.
      */
     private byte   format = 0; // Default to show all
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -48,7 +48,7 @@ public class TypeNotPresentException extends RuntimeException {
     private static final long serialVersionUID = -5101214195716534496L;
 
     /**
-     * The type name or the name of a type variable.
+     * @serial The type name or the name of a type variable.
      */
     private String typeName;
 

src/java.base/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -48,7 +48,7 @@ public class AnnotationTypeMismatchException extends RuntimeException {
     private final transient Method element;
 
     /**
-     * The (erroneous) type of data found in the annotation.  This string
+     * @serial The (erroneous) type of data found in the annotation.  This string
      * may, but is not required to, contain the value as well.  The exact
      * format of the string is unspecified.
      */

src/java.base/share/classes/java/lang/annotation/IncompleteAnnotationException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -43,11 +43,11 @@ public class IncompleteAnnotationException extends RuntimeException {
     private static final long serialVersionUID = 8445097402741811912L;
 
     /**
-     * The annotation interface.
+     * @serial The annotation interface.
      */
     private Class<? extends Annotation> annotationType;
     /**
-     * The element name.
+     * @serial The element name.
      */
     private String elementName;
 

src/java.base/share/classes/java/lang/invoke/SerializedLambda.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -65,43 +65,43 @@ public final class SerializedLambda implements Serializable {
     @java.io.Serial
     private static final long serialVersionUID = 8025925345765570181L;
     /**
-     * The capturing class.
+     * @serial The capturing class.
      */
     private final Class<?> capturingClass;
     /**
-     * The functional interface class.
+     * @serial The functional interface class.
      */
     private final String functionalInterfaceClass;
     /**
-     * The functional interface method name.
+     * @serial The functional interface method name.
      */
     private final String functionalInterfaceMethodName;
     /**
-     * The functional interface method signature.
+     * @serial The functional interface method signature.
      */
     private final String functionalInterfaceMethodSignature;
     /**
-     * The implementation class.
+     * @serial The implementation class.
      */
     private final String implClass;
     /**
-     * The implementation method name.
+     * @serial The implementation method name.
      */
     private final String implMethodName;
     /**
-     * The implementation method signature.
+     * @serial The implementation method signature.
      */
     private final String implMethodSignature;
     /**
-     * The implementation method kind.
+     * @serial The implementation method kind.
      */
     private final int implMethodKind;
     /**
-     * The instantiated method type.
+     * @serial The instantiated method type.
      */
     private final String instantiatedMethodType;
     /**
-     * The captured arguments.
+     * @serial The captured arguments.
      */
     @SuppressWarnings("serial") // Not statically typed as Serializable
     private final Object[] capturedArgs;

src/java.base/share/classes/java/net/HttpRetryException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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
@@ -40,12 +40,12 @@ public class HttpRetryException extends IOException {
     private static final long serialVersionUID = -9186022286469111381L;
 
     /**
-     * The response code.
+     * @serial The response code.
      */
     private final int responseCode;
 
     /**
-     * The URL to be redirected to.
+     * @serial The URL to be redirected to.
      */
     private String location;
 

src/java.base/share/classes/java/net/URISyntaxException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -42,12 +42,12 @@ public class URISyntaxException
     private static final long serialVersionUID = 2137979680897488891L;
 
     /**
-     * The input string.
+     * @serial The input string.
      */
     private final String input;
 
     /**
-     * The index at which the parse error occurred,
+     * @serial The index at which the parse error occurred,
      * or {@code -1} if the index is not known.
      */
     private final int index;

src/java.base/share/classes/java/net/URLPermission.java

@@ -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
@@ -168,7 +168,7 @@ public final class URLPermission extends Permission {
 
     // serialized field
     /**
-     * The actions string
+     * @serial The actions string
      */
     private String actions;
 

src/java.base/share/classes/java/nio/charset/MalformedInputException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -42,7 +42,7 @@ public class MalformedInputException
     private static final long serialVersionUID = -3438823399834806194L;
 
     /**
-     * The length of the input.
+     * @serial The length of the input.
      */
     private int inputLength;
 

src/java.base/share/classes/java/nio/charset/UnmappableCharacterException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -42,7 +42,7 @@ public class UnmappableCharacterException
     private static final long serialVersionUID = -7026962371537706123L;
 
     /**
-     * The length of the input character (or byte) sequence.
+     * @serial The length of the input character (or byte) sequence.
      */
     private int inputLength;
 

src/java.base/share/classes/java/nio/file/FileSystemException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -41,12 +41,12 @@ public class FileSystemException
     static final long serialVersionUID = -3055425747967319812L;
 
     /**
-     *  String identifying the file or {@code null} if not known.
+     * @serial String identifying the file or {@code null} if not known.
      */
     private final String file;
 
     /**
-     *  String identifying the other file or {@code null} if there isn't
+     * @serial String identifying the other file or {@code null} if there isn't
      *  another file or if not known.
      */
     private final String other;

src/java.base/share/classes/java/nio/file/InvalidPathException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -40,12 +40,12 @@ public class InvalidPathException
     static final long serialVersionUID = 4355821422286746137L;
 
     /**
-     * The input string.
+     * @serial The input string.
      */
     private String input;
 
     /**
-     * The index of the input string at which the error occurred or
+     * @serial The index of the input string at which the error occurred or
      * {@code -1} if not known.
      */
     private int index;