Merge master jdk-11.0.24+4 into openj9-staging

Signed-off-by: J9 Build <j9build@ca.ibm.com>

make/data/lsrdata/language-subtag-registry.txt

@@ -1,4 +1,4 @@
-File-Date: 2023-08-02
+File-Date: 2023-10-16
 %%
 Type: language
 Subtag: aa
@@ -44880,6 +44880,11 @@ Description: Cherokee
 Added: 2005-10-16
 %%
 Type: script
+Subtag: Chis
+Description: Chisoi
+Added: 2023-10-16
+%%
+Type: script
 Subtag: Chrs
 Description: Chorasmian
 Added: 2019-09-11
@@ -44975,6 +44980,11 @@ Description: Ge'ez
 Added: 2005-10-16
 %%
 Type: script
+Subtag: Gara
+Description: Garay
+Added: 2023-10-16
+%%
+Type: script
 Subtag: Geok
 Description: Khutsuri (Asomtavruli and Nuskhuri)
 Added: 2005-10-16
@@ -45020,6 +45030,11 @@ Description: Gujarati
 Added: 2005-10-16
 %%
 Type: script
+Subtag: Gukh
+Description: Gurung Khema
+Added: 2023-10-16
+%%
+Type: script
 Subtag: Guru
 Description: Gurmukhi
 Added: 2005-10-16
@@ -45190,6 +45205,11 @@ Description: Kpelle
 Added: 2010-04-10
 %%
 Type: script
+Subtag: Krai
+Description: Kirat Rai
+Added: 2023-10-16
+%%
+Type: script
 Subtag: Kthi
 Description: Kaithi
 Added: 2007-12-05
@@ -45437,6 +45457,11 @@ Description: Santali
 Added: 2006-07-21
 %%
 Type: script
+Subtag: Onao
+Description: Ol Onal
+Added: 2023-10-16
+%%
+Type: script
 Subtag: Orkh
 Description: Old Turkic
 Description: Orkhon Runic
@@ -45616,6 +45641,11 @@ Description: Siddhamātṛkā
 Added: 2013-12-02
 %%
 Type: script
+Subtag: Sidt
+Description: Sidetic
+Added: 2023-10-16
+%%
+Type: script
 Subtag: Sind
 Description: Khudawadi
 Description: Sindhi
@@ -45719,6 +45749,11 @@ Description: Tai Viet
 Added: 2007-12-05
 %%
 Type: script
+Subtag: Tayo
+Description: Tai Yo
+Added: 2023-10-16
+%%
+Type: script
 Subtag: Telu
 Description: Telugu
 Added: 2005-10-16
@@ -45767,11 +45802,26 @@ Description: Tangsa
 Added: 2021-03-05
 %%
 Type: script
+Subtag: Todr
+Description: Todhri
+Added: 2023-10-16
+%%
+Type: script
+Subtag: Tols
+Description: Tolong Siki
+Added: 2023-10-16
+%%
+Type: script
 Subtag: Toto
 Description: Toto
 Added: 2020-05-12
 %%
 Type: script
+Subtag: Tutg
+Description: Tulu-Tigalari
+Added: 2023-10-16
+%%
+Type: script
 Subtag: Ugar
 Description: Ugaritic
 Added: 2005-10-16

test/hotspot/jtreg/gc/g1/plab/TestPLABPromotion.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 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
@@ -26,7 +26,7 @@
  * @bug 8141278 8141141
  * @summary Test PLAB promotion
  * @requires vm.gc.G1
- * @requires !vm.flightRecorder
+ * @requires vm.flagless
  * @library /test/lib /
  * @modules java.base/jdk.internal.misc
  * @modules java.management

test/hotspot/jtreg/gc/g1/plab/TestPLABResize.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 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
@@ -26,7 +26,7 @@
  * @bug 8141278 8141141
  * @summary Test for PLAB resizing
  * @requires vm.gc.G1
- * @requires !vm.flightRecorder
+ * @requires vm.flagless
  * @library /test/lib /
  * @modules java.base/jdk.internal.misc
  * @modules java.management

test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t002.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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
@@ -24,6 +24,7 @@
 package nsk.jvmti.scenarios.hotswap.HS201;
 
 import java.io.PrintStream;
+import java.util.concurrent.CountDownLatch;
 
 import nsk.share.*;
 import nsk.share.jvmti.*;
@@ -73,14 +74,23 @@ public int runIt(String args[], PrintStream out) {
  timeout = argHandler.getWaitTime() * 60 * 1000; // milliseconds
 
  log.display(">>> starting tested thread");
- Thread thread = new hs201t002Thread();
+ hs201t002Thread thread = new hs201t002Thread();
 
  // testing sync
  status = checkStatus(status);
 
- setThread(thread);
  thread.start();
 
+ // setThread(thread) enables JVMTI events, and that can only be done on a live thread,
+ // so wait until the thread has started.
+ try {
+ thread.ready.await();
+ } catch (InterruptedException e) {
+ }
+ setThread(thread);
+
+ thread.go.countDown();
+
  while (currentStep != 4) {
  try {
  Thread.sleep(100);
@@ -114,6 +124,10 @@ public int runIt(String args[], PrintStream out) {
  }
 
  log.display("Thread suspended in a wrong moment. Retrying...");
+ for (int i = 0; i < stackTrace.length; i++) {
+ log.display("\t" + i + ". " + stackTrace[i]);
+ }
+ log.display("Retrying...");
  resumeThread(thread);
  suspendTry++;
  // Test thread will be suspended at the top of the loop. Let it run for a while.
@@ -136,12 +150,20 @@ public int runIt(String args[], PrintStream out) {
 
 class hs201t002Thread extends Thread {
 
+ CountDownLatch ready = new CountDownLatch(1);
+ CountDownLatch go = new CountDownLatch(1);
+
  hs201t002Thread() {
  setName("hs201t002Thread");
  }
 
  public void run() {
  // run method
+ ready.countDown();
+ try {
+ go.await();
+ } catch (InterruptedException e) {
+ }
  try {
  throwException();
  } catch (Exception e) {

test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t002/TestDescription.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -73,7 +73,7 @@
  *
  * @build ExecDriver
  * @run main/othervm/native PropertyResolvingWrapper ExecDriver --java
- * "-agentlib:hs201t002=pathToNewByteCode=./bin -waittime=5"
- * nsk.jvmti.scenarios.hotswap.HS201.hs201t002
+ * -agentlib:hs201t002=pathToNewByteCode=./bin,-waittime=5,-verbose
+ * nsk.jvmti.scenarios.hotswap.HS201.hs201t002 -verbose
  */