Merge master HEAD into openj9-staging

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

Author: j9build

make/InitSupport.gmk

@@ -67,14 +67,14 @@ ifeq ($(HAS_SPEC),)
 
   # The variable MAKEOVERRIDES contains variable assignments from the command
   # line, but in reverse order to what the user entered.
-  # The '\#' <=> '\ 'dance is needed to keep values with space in them connected.
-  COMMAND_LINE_VARIABLES := $(subst \#,\ , $(call reverse, $(subst \ ,\#,$(MAKEOVERRIDES))))
+  # The '§' <=> '\ 'dance is needed to keep values with space in them connected.
+  COMMAND_LINE_VARIABLES := $(subst §,\ , $(call reverse, $(subst \ ,§,$(MAKEOVERRIDES))))
 
   # A list like FOO="val1" BAR="val2" containing all user-supplied make
   # variables that we should propagate.
-  # The '\#' <=> '\ 'dance is needed to keep values with space in them connected.
-  USER_MAKE_VARS := $(subst \#,\ , $(filter-out $(addsuffix =%, $(INIT_CONTROL_VARIABLES)), \
-      $(subst \ ,\#,$(MAKEOVERRIDES))))
+  # The '§' <=> '\ 'dance is needed to keep values with space in them connected.
+  USER_MAKE_VARS := $(subst §,\ , $(filter-out $(addsuffix =%, $(INIT_CONTROL_VARIABLES)), \
+      $(subst \ ,§,$(MAKEOVERRIDES))))
 
   # Setup information about available configurations, if any.
   ifneq ($(CUSTOM_ROOT), )

make/jdk/src/classes/build/tools/taglet/SealedGraph.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 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
@@ -107,7 +107,7 @@ public String toString(List<? extends DocTree> tags, Element element) {
             throw new RuntimeException(e);
         }
 
-        String simpleTypeName = element.getSimpleName().toString();
+        String simpleTypeName = packagelessCanonicalName(typeElement).replace('.', '/');
         String imageFile = simpleTypeName + "-sealed-graph.svg";
         int thumbnailHeight = 100; // also appears in the stylesheet
         String hoverImage = "<span>"
@@ -315,14 +315,14 @@ private static Optional<String> packageName(TypeElement element) {
                 case MEMBER -> packageName((TypeElement) element.getEnclosingElement());
             };
         }
+    }
 
-        private static String packagelessCanonicalName(TypeElement element) {
-            String result = element.getSimpleName().toString();
-            while (element.getNestingKind() == NestingKind.MEMBER) {
-                element = (TypeElement) element.getEnclosingElement();
-                result = element.getSimpleName().toString() + '.' + result;
-            }
-            return result;
+    private static String packagelessCanonicalName(TypeElement element) {
+        String result = element.getSimpleName().toString();
+        while (element.getNestingKind() == NestingKind.MEMBER) {
+            element = (TypeElement) element.getEnclosingElement();
+            result = element.getSimpleName().toString() + '.' + result;
         }
+        return result;
     }
 }

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

@@ -64,7 +64,7 @@
  * {@link #getInputStream()}, and
  * {@link #getErrorStream()}.
  * The I/O streams of characters and lines can be written and read using the methods
- * {@link #outputWriter()}, {@link #outputWriter(Charset)}},
+ * {@link #outputWriter()}, {@link #outputWriter(Charset)},
  * {@link #inputReader()}, {@link #inputReader(Charset)},
  * {@link #errorReader()}, and {@link #errorReader(Charset)}.
  * The parent process uses these streams to feed input to and get output

src/java.base/share/classes/java/text/DecimalFormat.java

@@ -2379,8 +2379,8 @@ private final boolean subparse(String text, ParsePosition parsePosition,
         NumericPosition pos = subparseNumber(text, position, digits, true, isExponent, status);
         position = pos.fullPos;
 
-        // First character after the prefix was un-parseable, should
-        // fail regardless if lenient or strict.
+        // First character after the prefix was un-parseable or parsing integer
+        // only with no integer portion. Should fail regardless if lenient or strict.
         if (position == -1) {
             parsePosition.index = oldStart;
             parsePosition.errorIndex = oldStart;
@@ -2421,8 +2421,8 @@ private final boolean subparse(String text, ParsePosition parsePosition,
             }
 
             // When parsing integer only, index should be int pos
-            // If intPos is 0, the entire value was integer
-            if (isParseIntegerOnly() && pos.intPos > 0) {
+            // If intPos is -1, the entire value was integer and index should be full pos
+            if (isParseIntegerOnly() && pos.intPos != -1) {
                 parsePosition.index = pos.intPos;
             } else {
                 // increment the index by the suffix
@@ -2474,7 +2474,7 @@ NumericPosition subparseNumber(String text, int position,
                                    boolean isExponent, boolean[] status) {
         // process digits or Inf, find decimal position
         status[STATUS_INFINITE] = false;
-        int intIndex = 0;
+        int intIndex = -1;
         if (!isExponent && text.regionMatches(position, symbols.getInfinity(), 0,
                 symbols.getInfinity().length())) {
             position += symbols.getInfinity().length();
@@ -2570,6 +2570,10 @@ NumericPosition subparseNumber(String text, int position,
                     // Cancel out backup setting (see grouping handler below)
                     backup = -1;
                 } else if (!isExponent && ch == decimal) {
+                    if (isParseIntegerOnly() && startPos == position) {
+                        // Parsing int only with no integer portion, fail
+                        return new NumericPosition(-1, intIndex);
+                    }
                     // Check grouping size on decimal separator
                     if (parseStrict && isGroupingViolation(position, prevSeparatorIndex)) {
                         return new NumericPosition(

src/java.base/share/classes/jdk/internal/vm/TranslatedException.java

@@ -42,9 +42,13 @@
 
 /**
  * Support for translating exceptions between the HotSpot heap and libjvmci heap.
+ *
+ * Successfully translated exceptions are wrapped in a TranslatedException instance.
+ * This allows callers to distiguish between a translated exception and an error
+ * that arose during translation.
  */
 @SuppressWarnings("serial")
-final class TranslatedException extends Exception {
+public final class TranslatedException extends Exception {
 
     /**
      * The value returned by {@link #encodeThrowable(Throwable)} when encoding
@@ -61,15 +65,18 @@ final class TranslatedException extends Exception {
         maybeFailClinit();
         try {
             FALLBACK_ENCODED_THROWABLE_BYTES =
-                encodeThrowable(new TranslatedException("error during encoding",
-                                                        "<unknown>"), false);
+                encodeThrowable(translationFailure("error during encoding"), false);
             FALLBACK_ENCODED_OUTOFMEMORYERROR_BYTES =
-                encodeThrowable(new OutOfMemoryError(), false);
+                encodeThrowable(translationFailure("OutOfMemoryError during encoding"), false);
         } catch (IOException e) {
             throw new InternalError(e);
         }
     }
 
+    private static InternalError translationFailure(String messageFormat, Object... messageArgs) {
+        return new InternalError(messageFormat.formatted(messageArgs));
+    }
+
     /**
      * Helper to test exception translation.
      */
@@ -86,14 +93,8 @@ private static void maybeFailClinit() {
         }
     }
 
-    /**
-     * Class name of exception that could not be instantiated.
-     */
-    private String originalExceptionClassName;
-
-    private TranslatedException(String message, String originalExceptionClassName) {
-        super(message);
-        this.originalExceptionClassName = originalExceptionClassName;
+    TranslatedException(Throwable translated) {
+        super(translated);
     }
 
     /**
@@ -106,18 +107,6 @@ public Throwable fillInStackTrace() {
         return this;
     }
 
-    @Override
-    public String toString() {
-        String s;
-        if (originalExceptionClassName.equals(TranslatedException.class.getName())) {
-            s = getClass().getName();
-        } else {
-            s = getClass().getName() + "[" + originalExceptionClassName + "]";
-        }
-        String message = getMessage();
-        return (message != null) ? (s + ": " + message) : s;
-    }
-
     /**
      * Prints a stack trace for {@code throwable} if the system property
      * {@code "jdk.internal.vm.TranslatedException.debug"} is true.
@@ -163,7 +152,7 @@ private static Throwable create(String className, String message, Throwable caus
             return initCause((Throwable) cons.newInstance(message), cause, debug);
         } catch (Throwable translationFailure) {
             debugPrintStackTrace(translationFailure, debug);
-            return initCause(new TranslatedException(message, className), cause, debug);
+            return initCause(translationFailure("%s [%s]", message, className), cause, debug);
         }
     }
 
@@ -308,11 +297,10 @@ static Throwable decodeThrowable(byte[] encodedThrowable, boolean debug) {
                 throwable.setStackTrace(stackTrace);
                 cause = throwable;
             }
-            return throwable;
+            return new TranslatedException(throwable);
         } catch (Throwable translationFailure) {
             debugPrintStackTrace(translationFailure, debug);
-            return new TranslatedException("Error decoding exception: " + encodedThrowable,
-                                           translationFailure.getClass().getName());
+            return translationFailure("error decoding exception: %s", encodedThrowable);
         }
     }
 }

src/java.base/share/classes/jdk/internal/vm/VMSupport.java

@@ -122,20 +122,25 @@ public static byte[] serializeAgentPropertiesToByteArray() throws IOException {
      *             2: an OutOfMemoryError was thrown while encoding the exception
      *             3: some other problem occured while encoding the exception. If {@code buffer != 0},
      *                it contains a {@code struct { u4 len; char[len] desc}} where {@code desc} describes the problem
+     *             4: an OutOfMemoryError thrown from within VM code on a
+     *                thread that cannot call Java (OOME has no stack trace)
      *            </pre>
      * @param buffer encoded info about the exception to throw (depends on {@code format})
      * @param inJVMHeap [@code true} if executing in the JVM heap, {@code false} otherwise
      * @param debug specifies whether debug stack traces should be enabled in case of translation failure
      */
     public static void decodeAndThrowThrowable(int format, long buffer, boolean inJVMHeap, boolean debug) throws Throwable {
         if (format != 0) {
+            if (format == 4) {
+                throw new TranslatedException(new OutOfMemoryError("in VM code and current thread cannot call Java"));
+            }
             String context = String.format("while encoding an exception to translate it %s the JVM heap",
                     inJVMHeap ? "to" : "from");
             if (format == 1) {
                 throw new InternalError("native buffer could not be allocated " + context);
             }
             if (format == 2) {
-                throw new OutOfMemoryError("OutOfMemoryError occurred " + context);
+                throw new OutOfMemoryError(context);
             }
             if (format == 3 && buffer != 0L) {
                 byte[] bytes = bufferToBytes(buffer);

src/java.xml/share/classes/org/w3c/dom/Attr.java

@@ -124,65 +124,63 @@
  * </thead>
  * <tbody>
  * <tr>
- * <th scope="row" valign='top' rowspan='1' colspan='1'>
+ * <th scope="row">
  * Character reference</th>
- * <td valign='top' rowspan='1' colspan='1'>
+ * <td>
  * <pre>"x&amp;#178;=5"</pre>
  * </td>
- * <td valign='top' rowspan='1' colspan='1'>
+ * <td>
  * <pre>"x&#178;=5"</pre>
  * </td>
- * <td valign='top' rowspan='1' colspan='1'>
+ * <td>
  * <pre>"x&amp;#178;=5"</pre>
  * </td>
  * </tr>
  * <tr>
- * <th scope="row" valign='top' rowspan='1' colspan='1'>Built-in
- * character entity</th>
- * <td valign='top' rowspan='1' colspan='1'>
+ * <th scope="row">Built-in character entity</th>
+ * <td>
  * <pre>"y&amp;lt;6"</pre>
  * </td>
- * <td valign='top' rowspan='1' colspan='1'>
+ * <td>
  * <pre>"y&lt;6"</pre>
  * </td>
- * <td valign='top' rowspan='1' colspan='1'>
+ * <td>
  * <pre>"y&amp;lt;6"</pre>
  * </td>
  * </tr>
  * <tr>
- * <th scope="row" valign='top' rowspan='1' colspan='1'>Literal newline between</th>
- * <td valign='top' rowspan='1' colspan='1'>
- * <pre>
- * "x=5&amp;#10;y=6"</pre>
+ * <th scope="row">Literal newline between</th>
+ * <td>
+ * <pre>"x=5&amp;#10;y=6"</pre>
  * </td>
- * <td valign='top' rowspan='1' colspan='1'>
+ * <td>
  * <pre>"x=5 y=6"</pre>
  * </td>
- * <td valign='top' rowspan='1' colspan='1'>
+ * <td>
  * <pre>"x=5&amp;#10;y=6"</pre>
  * </td>
  * </tr>
  * <tr>
- * <th scope="row" valign='top' rowspan='1' colspan='1'>Normalized newline between</th>
- * <td valign='top' rowspan='1' colspan='1'>
+ * <th scope="row">Normalized newline between</th>
+ * <td>
  * <pre>"x=5
  * y=6"</pre>
  * </td>
- * <td valign='top' rowspan='1' colspan='1'>
+ * <td>
  * <pre>"x=5 y=6"</pre>
  * </td>
- * <td valign='top' rowspan='1' colspan='1'>
+ * <td>
  * <pre>"x=5 y=6"</pre>
  * </td>
  * </tr>
  * <tr>
- * <th scope="row" valign='top' rowspan='1' colspan='1'>Entity <code>e</code> with literal newline</th>
- * <td valign='top' rowspan='1' colspan='1'>
+ * <th scope="row">Entity <code>e</code> with literal newline</th>
+ * <td>
  * <pre>
  * &lt;!ENTITY e '...&amp;#10;...'&gt; [...]&gt; "x=5&amp;e;y=6"</pre>
  * </td>
- * <td valign='top' rowspan='1' colspan='1'><em>Dependent on Implementation and Load Options</em></td>
- * <td valign='top' rowspan='1' colspan='1'><em>Dependent on Implementation and Load/Save Options</em></td>
+ * <td><em>Dependent on Implementation and Load Options</em></td>
+ * <td><em>Dependent on Implementation and Load/Save Options</em></td>
  * </tr>
  * </tbody>
  * </table>

src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java

@@ -5241,14 +5241,7 @@ public void visitModifiers(JCModifiers tree) {
 
     public void visitAnnotatedType(JCAnnotatedType tree) {
         attribAnnotationTypes(tree.annotations, env);
-        Type underlyingType =
-                attribTree(tree.underlyingType, env, new ResultInfo(KindSelector.TYP_PCK, Type.noType));
-        if (underlyingType.hasTag(PACKAGE)) {
-            // Type annotations are not admissible on packages, but we handle packages here to
-            // report better diagnostics later in validateAnnotatedType.
-            result = tree.type = underlyingType;
-            return;
-        }
+        Type underlyingType = attribType(tree.underlyingType, env);
         Type annotatedType = underlyingType.preannotatedType();
 
         if (!env.info.isNewClass)

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties

@@ -319,10 +319,12 @@ doclet.record_equals_doc.fullbody.head=\
 doclet.record_equals_doc.fullbody.tail.both=\
  Reference components are compared with \
  {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}; \
- primitive components are compared with '=='.
+ primitive components are compared with the <code>compare</code> method from \
+ their corresponding wrapper classes.
 
 doclet.record_equals_doc.fullbody.tail.primitive=\
- All components in this record class are compared with '=='.
+ All components in this record class are compared with the <code>compare</code> \
+ method from their corresponding wrapper classes.
 
 doclet.record_equals_doc.fullbody.tail.reference=\
  All components in this record class are compared with \

src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/HtmlTag.java

@@ -507,7 +507,7 @@ public enum Attr {
         PROFILE,
         REV,
         REVERSED,
-        ROLE,
+        ROLE(true),
         ROWSPAN,
         RULES,
         SCHEME,
@@ -606,26 +606,6 @@ private static class AttrMap extends EnumMap<Attr,AttrKind>  {
         this.attrs = new EnumMap<>(Attr.class);
         for (Map<Attr,AttrKind> m: attrMaps)
             this.attrs.putAll(m);
-        attrs.put(Attr.CLASS, AttrKind.OK);
-        attrs.put(Attr.ID, AttrKind.OK);
-        attrs.put(Attr.STYLE, AttrKind.OK);
-        attrs.put(Attr.ROLE, AttrKind.OK);
-        // for now, assume that all ARIA attributes are allowed on all tags.
-        attrs.put(Attr.ARIA_ACTIVEDESCENDANT, AttrKind.OK);
-        attrs.put(Attr.ARIA_CONTROLS, AttrKind.OK);
-        attrs.put(Attr.ARIA_DESCRIBEDBY, AttrKind.OK);
-        attrs.put(Attr.ARIA_EXPANDED, AttrKind.OK);
-        attrs.put(Attr.ARIA_LABEL, AttrKind.OK);
-        attrs.put(Attr.ARIA_LABELLEDBY, AttrKind.OK);
-        attrs.put(Attr.ARIA_LEVEL, AttrKind.OK);
-        attrs.put(Attr.ARIA_MULTISELECTABLE, AttrKind.OK);
-        attrs.put(Attr.ARIA_OWNS, AttrKind.OK);
-        attrs.put(Attr.ARIA_POSINSET, AttrKind.OK);
-        attrs.put(Attr.ARIA_READONLY, AttrKind.OK);
-        attrs.put(Attr.ARIA_REQUIRED, AttrKind.OK);
-        attrs.put(Attr.ARIA_SELECTED, AttrKind.OK);
-        attrs.put(Attr.ARIA_SETSIZE, AttrKind.OK);
-        attrs.put(Attr.ARIA_SORT, AttrKind.OK);
     }
 
     public boolean accepts(HtmlTag t) {