Merge pull request #1967 from SAP/pr-jdk-17.0.16+3

Merge to tag jdk-17.0.16+3

Author: RealCLanger

make/data/cacerts/camerfirmachamberscommerceca

@@ -49,7 +49,8 @@ $(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBGTEST, \
         $(GTEST_FRAMEWORK_SRC)/googletest/src \
         $(GTEST_FRAMEWORK_SRC)/googlemock/src, \
     INCLUDE_FILES := gtest-all.cc gmock-all.cc, \
-    DISABLED_WARNINGS_gcc := undef unused-result format-nonliteral maybe-uninitialized, \
+    DISABLED_WARNINGS_gcc := undef unused-result format-nonliteral \
+        maybe-uninitialized zero-as-null-pointer-constant, \
     DISABLED_WARNINGS_clang := undef unused-result format-nonliteral, \
     CFLAGS := $(JVM_CFLAGS) \
         -I$(GTEST_FRAMEWORK_SRC)/googletest \

make/data/cacerts/camerfirmachambersignca

@@ -605,7 +605,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);
         }

make/hotspot/lib/CompileGtest.gmk

@@ -43,26 +43,14 @@ final class CamerfirmaTLSPolicy {
 
     private static final Debug debug = Debug.getInstance("certpath");
 
-    // SHA-256 certificate fingerprints of distrusted roots
-    private static final Set<String> FINGERPRINTS = Set.of(
-        // cacerts alias: camerfirmachamberscommerceca
-        // DN: CN=Chambers of Commerce Root,
-        //     OU=http://www.chambersign.org,
-        //     O=AC Camerfirma SA CIF A82743287, C=EU
-        "0C258A12A5674AEF25F28BA7DCFAECEEA348E541E6F5CC4EE63B71B361606AC3",
-        // cacerts alias: camerfirmachambersca
-        // DN: CN=Chambers of Commerce Root - 2008,
-        //     O=AC Camerfirma S.A., SERIALNUMBER=A82743287,
-        //     L=Madrid (see current address at www.camerfirma.com/address),
-        //     C=EU
-        "063E4AFAC491DFD332F3089B8542E94617D893D7FE944E10A7937EE29D9693C0",
-        // cacerts alias: camerfirmachambersignca
-        // DN: CN=Global Chambersign Root - 2008,
-        //     O=AC Camerfirma S.A., SERIALNUMBER=A82743287,
-        //     L=Madrid (see current address at www.camerfirma.com/address),
-        //     C=EU
-        "136335439334A7698016A0D324DE72284E079D7B5220BB8FBD747816EEBEBACA"
-    );
+    // SHA-256 certificate fingerprint of distrusted root for TLS
+    // cacerts alias: camerfirmachambersca
+    // DN: CN=Chambers of Commerce Root - 2008,
+    //     O=AC Camerfirma S.A., SERIALNUMBER=A82743287,
+    //     L=Madrid (see current address at www.camerfirma.com/address),
+    //     C=EU
+    private static final String FINGERPRINT =
+            "063E4AFAC491DFD332F3089B8542E94617D893D7FE944E10A7937EE29D9693C0";
 
     // Any TLS Server certificate that is anchored by one of the Camerfirma
     // roots above and is issued after this date will be distrusted.
@@ -85,7 +73,7 @@ static void checkDistrust(X509Certificate[] chain)
             throw new ValidatorException("Cannot generate fingerprint for "
                 + "trust anchor of TLS server certificate");
         }
-        if (FINGERPRINTS.contains(fp)) {
+        if (FINGERPRINT.equalsIgnoreCase(fp)) {
             Date notBefore = chain[0].getNotBefore();
             LocalDate ldNotBefore = LocalDate.ofInstant(notBefore.toInstant(),
                                                         ZoneOffset.UTC);

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

@@ -2073,6 +2073,10 @@ static int findDisplayedMnemonicIndex(String text, int mnemonic) {
             return -1;
         }
 
+        if (mnemonic >= 'a' && mnemonic <= 'z') {
+            return -1;
+        }
+
         char uc = Character.toUpperCase((char)mnemonic);
         char lc = Character.toLowerCase((char)mnemonic);
 

src/java.base/share/classes/sun/security/validator/CamerfirmaTLSPolicy.java

@@ -1087,7 +1087,9 @@ public void addAnnotation(Address addr, OopHandle handle) {
                           G1CollectedHeap heap = (G1CollectedHeap)collHeap;
                           HeapRegion region = heap.hrm().getByAddress(handle);
 
-                          if (region.isFree()) {
+                          if (region == null) {
+                            // intentionally skip
+                          } else if (region.isFree()) {
                             anno = "Free ";
                             bad = false;
                           } else if (region.isYoung()) {

src/java.desktop/share/classes/javax/swing/SwingUtilities.java

@@ -334,7 +334,7 @@ static void run_in_new_thread(const args_t* args) {
 extern "C" void* thread_wrapper(void* p) {
   const args_t* const p_args = (const args_t*) p;
   runUnitTestsInner(p_args->argc, p_args->argv);
-  return 0;
+  return nullptr;
 }
 
 static void run_in_new_thread(const args_t* args) {

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java

@@ -1,4 +1,4 @@
-Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, 2022, 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
@@ -37,5 +37,5 @@ The */Test.java files should never be modified directly, because they are
 generated by TestGenerator and therefore all required changes must be made in
 that class.
 
-[1] https://wiki.openjdk.java.net/display/CodeTools/jcstress
+[1] https://wiki.openjdk.org/display/CodeTools/jcstress
 

test/hotspot/gtest/gtestMain.cpp

@@ -56,7 +56,7 @@
  * added to classpath. One can replace @notest by @test in jtreg test
  * description above to run this class with jtreg.
  *
- * @see <a href=https://wiki.openjdk.java.net/display/CodeTools/jcstress>jcstress</a>
+ * @see <a href=https://wiki.openjdk.org/display/CodeTools/jcstress>jcstress</a>
  */
 public class TestGenerator {
     private static final String COPYRIGHT;

test/hotspot/jtreg/applications/jcstress/README

@@ -52,7 +52,7 @@
 // an incorrect result on 32-bit server VMs on SPARC due to a regression
 // introduced by the change: "6420645: Create a vm that uses compressed oops
 // for up to 32gb heapsizes"
-// (http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/ba764ed4b6f2).  Further
+// (https://git.openjdk.org/jdk/commit/4a831d4).  Further
 // investigation showed that change 6420645 is not really the root cause of
 // this error but only reveals a problem with the float register encodings in
 // sparc.ad which was hidden until now.

test/hotspot/jtreg/applications/jcstress/TestGenerator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, 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
@@ -63,8 +63,8 @@
 /**
  * Tests support for Dynamic constants.
  *
- * @see "https://openjdk.java.net/jeps/309"
- * @see "https://bugs.openjdk.java.net/browse/JDK-8177279"
+ * @see "https://openjdk.org/jeps/309"
+ * @see "https://bugs.openjdk.org/browse/JDK-8177279"
  */
 public class TestDynamicConstant implements Opcodes {
 

test/hotspot/jtreg/compiler/c2/Test6880034.java

@@ -123,7 +123,7 @@ More information about the internals and the workflow of the framework can be fo
 ## 4. Internal Framework Tests
 There are various tests to verify the correctness of the test framework. These tests can be found in [ir_framework](../../../testlibrary_tests/ir_framework) and can directly be run with JTreg. The tests are part of the normal JTreg tests of HotSpot and should be run upon changing the framework code as a minimal form of testing.
 
-Additional testing was performed by converting all compiler Inline Types tests that used the currently present IR test framework in Valhalla (see [JDK-8263024](https://bugs.openjdk.java.net/browse/JDK-8263024)). It is strongly advised to make sure a change to the framework still lets these converted tests in Valhalla pass as part of an additional testing step.
+Additional testing was performed by converting all compiler Inline Types tests that used the currently present IR test framework in Valhalla (see [JDK-8263024](https://bugs.openjdk.org/browse/JDK-8263024)). It is strongly advised to make sure a change to the framework still lets these converted tests in Valhalla pass as part of an additional testing step.
 
 ## 5. Framework Package Structure
 A user only needs to import classes from the package `compiler.lib.ir_framework` (e.g. `import compiler.lib.ir_framework.*;`) which represents the interface classes to the framework. The remaining framework internal classes are kept in separate subpackages and should not directly be imported:
@@ -134,4 +134,4 @@ A user only needs to import classes from the package `compiler.lib.ir_framework`
 - `compiler.lib.ir_framework.shared`: These classes can be called from either the driver, flag, or test VM.
 
 ## 6. Summary
-The initial design and feature set was kept simple and straight forward and serves well for small to medium sized tests. There are a lot of possibilities to further enhance the framework and make it more powerful. This can be tackled in additional RFEs. A few ideas can be found as subtasks of the [initial RFE](https://bugs.openjdk.java.net/browse/JDK-8254129) for this framework.
+The initial design and feature set was kept simple and straight forward and serves well for small to medium sized tests. There are a lot of possibilities to further enhance the framework and make it more powerful. This can be tackled in additional RFEs. A few ideas can be found as subtasks of the [initial RFE](https://bugs.openjdk.org/browse/JDK-8254129) for this framework.

test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestDynamicConstant.java

@@ -47,7 +47,7 @@ public class DekkerTest {
     /*
       Read After Write Test (basically a simple Dekker test with volatile variables)
       Derived from the original jcstress test, available at:
-        http://hg.openjdk.java.net/code-tools/jcstress/file/6c339a5aa00d/
+        hhttps://git.openjdk.org/jcstress/commit/15acd86
         tests-custom/src/main/java/org/openjdk/jcstress/tests/volatiles/DekkerTest.java
      */
 

test/hotspot/jtreg/compiler/lib/ir_framework/README.md

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, 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
@@ -55,7 +55,7 @@ public static void main(String[] args) throws Throwable {
 
         options.add(Alloc.class.getName());
 
-        // According to https://bugs.openjdk.java.net/browse/JDK-8146009 failure happens not every time.
+        // According to https://bugs.openjdk.org/browse/JDK-8146009 failure happens not every time.
         // Will try to reproduce this failure.
         for (int iteration = 0; iteration < 40; ++iteration) {
             startVM(options);

test/hotspot/jtreg/compiler/membars/DekkerTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, 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,7 +28,7 @@
 /**
  * Represents a performance counter in the JVM.
  *
- * See http://openjdk.java.net/groups/hotspot/docs/Serviceability.html#bjvmstat
+ * See https://openjdk.org/groups/hotspot/docs/Serviceability.html#bjvmstat
  * for more details about performance counters.
  */
 public class PerfCounter {

test/hotspot/jtreg/gc/g1/logging/TestG1LoggingFailure.java

@@ -89,14 +89,19 @@ void *thread_runner(void *threadid) {
 
 int main (int argc, char* argv[]) {
   pthread_t threads[NUM_THREADS];
+  pthread_attr_t attr;
+  pthread_attr_init(&attr);
+  size_t stack_size = 0x100000;
+  pthread_attr_setstacksize(&attr, stack_size);
   for (int i = 0; i < NUM_THREADS; i++ ) {
     printf("[*] Creating thread %d\n", i);
-    int status = pthread_create(&threads[i], NULL, thread_runner, (void *)(intptr_t)i);
+    int status = pthread_create(&threads[i], &attr, thread_runner, (void *)(intptr_t)i);
     if (status != 0) {
       printf("[*] Error creating thread %d - %d\n", i, status);
       exit(-1);
     }
   }
+  pthread_attr_destroy(&attr);
   for (int i = 0; i < NUM_THREADS; i++ ) {
     pthread_join(threads[i], NULL);
   }

test/hotspot/jtreg/gc/testlibrary/PerfCounter.java

@@ -109,11 +109,18 @@ Java_TestNativeStack_triggerJNIStackTrace
 
   warning = warn;
 
-  if ((res = pthread_create(&thread, NULL, thread_start, NULL)) != 0) {
+  pthread_attr_t attr;
+  pthread_attr_init(&attr);
+  size_t stack_size = 0x100000;
+  pthread_attr_setstacksize(&attr, stack_size);
+
+  if ((res = pthread_create(&thread, &attr, thread_start, NULL)) != 0) {
     fprintf(stderr, "TEST ERROR: pthread_create failed: %s (%d)\n", strerror(res), res);
     exit(1);
   }
 
+  pthread_attr_destroy(&attr);
+
   if ((res = pthread_join(thread, NULL)) != 0) {
     fprintf(stderr, "TEST ERROR: pthread_join failed: %s (%d)\n", strerror(res), res);
     exit(1);