Merge branch 'openjdk:master' into goetz_backport_8325180

Author: GoeLin

src/hotspot/share/compiler/compileBroker.cpp

@@ -2234,7 +2234,7 @@ void CompileBroker::invoke_compiler_on_method(CompileTask* task) {
         }
       }
     }
-    if (!task->is_success()) {
+    if (!task->is_success() && !JVMCI::in_shutdown()) {
       handle_compile_error(thread, task, nullptr, compilable, failure_reason);
     }
     if (event.should_commit()) {

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

@@ -612,7 +612,8 @@ public void setZoneStrings(String[][] newZoneStrings) {
         for (int i = 0; i < newZoneStrings.length; ++i) {
             int len = newZoneStrings[i].length;
             if (len < 5) {
-                throw new IllegalArgumentException();
+                throw new IllegalArgumentException(String.format(
+                        "Row %s of the input array does not have a length of at least 5", i));
             }
             aCopy[i] = Arrays.copyOf(newZoneStrings[i], len);
         }

src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -57,7 +57,7 @@
  * @author G. Todd Miller
  * @author Morten Jorgensen
  * @author John Howard (johnh@schemasoft.com)
- * @LastModified: Jan 2022
+ * @LastModified: Feb 2025
  */
 public final class XSLTC {
 
@@ -730,7 +730,6 @@ public boolean setDestDirectory(String dstDirName) {
      */
     public void setPackageName(String packageName) {
         _packageName = Objects.requireNonNull(packageName);
-        if (_className != null) setClassName(_className);
     }
 
     /**

src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -88,7 +88,7 @@
  * @author G. Todd Miller
  * @author Morten Jorgensen
  * @author Santiago Pericas-Geertsen
- * @LastModified: Jan 2022
+ * @LastModified: Feb 2025
  */
 public class TransformerFactoryImpl
     extends SAXTransformerFactory implements SourceLoader
@@ -1004,9 +1004,6 @@ public Templates newTemplates(Source source)
         // Set the attributes for translet generation
         int outputType = XSLTC.BYTEARRAY_OUTPUT;
         if (_generateTranslet || _autoTranslet) {
-            // Set the translet name
-            xsltc.setClassName(getTransletBaseName(source));
-
             if (_destinationDirectory != null)
                 xsltc.setDestDirectory(_destinationDirectory);
             else {
@@ -1020,8 +1017,11 @@ public Templates newTemplates(Source source)
                 }
             }
 
+            // set package name
             if (_packageName != null)
                 xsltc.setPackageName(_packageName);
+            // Set the translet name
+            xsltc.setClassName(getTransletBaseName(source));
 
             if (_jarFileName != null) {
                 xsltc.setJarFileName(_jarFileName);

test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/GetStackTraceAndRetransformTest/libGetStackTraceAndRetransformTest.cpp

@@ -25,7 +25,7 @@
 #include <string.h>
 #include "jvmti.h"
 #include "jvmti_common.h"
-#include "../get_stack_trace.h"
+#include "../get_stack_trace.hpp"
 
 
 extern "C" {

test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/GetStackTraceCurrentThreadTest/libGetStackTraceCurrentThreadTest.cpp

@@ -25,7 +25,7 @@
 #include <string.h>
 #include "jvmti.h"
 #include "jvmti_common.h"
-#include "../get_stack_trace.h"
+#include "../get_stack_trace.hpp"
 
 
 extern "C" {

…i/thread/GetStackTrace/get_stack_trace.h …thread/GetStackTrace/get_stack_trace.hpptest/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/get_stack_trace.h renamed to test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/get_stack_trace.hpp test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/get_stack_trace.h renamed to test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/get_stack_trace.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef GET_STACK_TRACE_H
-#define GET_STACK_TRACE_H
+#ifndef GET_STACK_TRACE_HPP
+#define GET_STACK_TRACE_HPP
 #include "jvmti.h"
 
 typedef struct {
@@ -81,18 +81,18 @@ int compare_stack_trace(jvmtiEnv *jvmti, JNIEnv *jni, jthread thread,
         lambda_idx = lambda - expected_frames[exp_idx].cls;
         printf("Comparing only first %zu chars in classname.\n", lambda_idx);
       }
-      if (class_signature == NULL || strncmp(class_signature, expected_frames[exp_idx].cls, lambda_idx) != 0) {
+      if (class_signature == nullptr || strncmp(class_signature, expected_frames[exp_idx].cls, lambda_idx) != 0) {
         printf("(frame#%d) wrong class sig: \"%s\", expected: \"%s\"\n",
                exp_idx, class_signature, expected_frames[exp_idx].cls);
         result = JNI_FALSE;
       }
 
-      if (name == NULL || strcmp(name, expected_frames[exp_idx].name) != 0) {
+      if (name == nullptr || strcmp(name, expected_frames[exp_idx].name) != 0) {
         printf("(frame#%d) wrong method name: \"%s\", expected: \"%s\"\n",
                exp_idx, name, expected_frames[exp_idx].name);
         result = JNI_FALSE;
       }
-      if (sig == NULL || strcmp(sig, expected_frames[exp_idx].sig) != 0) {
+      if (sig == nullptr || strcmp(sig, expected_frames[exp_idx].sig) != 0) {
         printf("(frame#%d) wrong method sig: \"%s\", expected: \"%s\"\n",
                exp_idx, sig, expected_frames[exp_idx].sig);
         result = JNI_FALSE;
@@ -103,4 +103,4 @@ int compare_stack_trace(jvmtiEnv *jvmti, JNIEnv *jni, jthread thread,
 }
 
 
-#endif //GET_STACK_TRACE_H
+#endif //GET_STACK_TRACE_HPP

test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr03/libgetstacktr03.cpp

@@ -25,7 +25,7 @@
 #include <string.h>
 #include "jvmti.h"
 #include "jvmti_common.h"
-#include "../get_stack_trace.h"
+#include "../get_stack_trace.hpp"
 
 extern "C" {
 

test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr04/libgetstacktr04.cpp

@@ -25,7 +25,7 @@
 #include <string.h>
 #include "jvmti.h"
 #include "jvmti_common.h"
-#include "../get_stack_trace.h"
+#include "../get_stack_trace.hpp"
 
 extern "C" {
 

test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr05/libgetstacktr05.cpp

@@ -25,7 +25,7 @@
 #include <string.h>
 #include "jvmti.h"
 #include "jvmti_common.h"
-#include "../get_stack_trace.h"
+#include "../get_stack_trace.hpp"
 
 extern "C" {