From 63f32fbe9771b8200f707ed5d1d0e6555ad90f8b Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Mon, 10 Jul 2023 17:07:26 +0000
Subject: [PATCH 01/21] 8311528: Remove IDE specific SuppressWarnings

Reviewed-by: lancea, bpb, jlu
---
 .../share/classes/java/util/Calendar.java     | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/java.base/share/classes/java/util/Calendar.java b/src/java.base/share/classes/java/util/Calendar.java
index 6e3fa4a561d85..e7149c4dfe105 100644
--- a/src/java.base/share/classes/java/util/Calendar.java
+++ b/src/java.base/share/classes/java/util/Calendar.java
@@ -2701,25 +2701,25 @@ public String getCalendarType() {
      * @return {@code true} if this object is equal to {@code obj};
      * {@code false} otherwise.
      */
-    @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
     @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        try {
-            Calendar that = (Calendar)obj;
-            return compareTo(getMillisOf(that)) == 0 &&
-                lenient == that.lenient &&
-                firstDayOfWeek == that.firstDayOfWeek &&
-                minimalDaysInFirstWeek == that.minimalDaysInFirstWeek &&
-                (zone instanceof ZoneInfo ?
-                    zone.equals(that.zone) :
-                    zone.equals(that.getTimeZone()));
-        } catch (Exception e) {
-            // Note: GregorianCalendar.computeTime throws
-            // IllegalArgumentException if the ERA value is invalid
-            // even it's in lenient mode.
+        if (obj instanceof Calendar that) {
+            try {
+                return compareTo(getMillisOf(that)) == 0 &&
+                    lenient == that.lenient &&
+                    firstDayOfWeek == that.firstDayOfWeek &&
+                    minimalDaysInFirstWeek == that.minimalDaysInFirstWeek &&
+                    (zone instanceof ZoneInfo ?
+                        zone.equals(that.zone) :
+                        zone.equals(that.getTimeZone()));
+            } catch (Exception e) {
+                // Note: GregorianCalendar.computeTime throws
+                // IllegalArgumentException if the ERA value is invalid
+                // even it's in lenient mode.
+            }
         }
         return false;
     }

From 57e7e82fa1cfb82bee6ff242d9a730c42bde663f Mon Sep 17 00:00:00 2001
From: Patricio Chilano Mateo <pchilanomate@openjdk.org>
Date: Mon, 10 Jul 2023 19:09:27 +0000
Subject: [PATCH 02/21] 8309637: runtime/handshake/HandshakeTimeoutTest.java
 fails with "has not cleared handshake op" and SIGILL

Reviewed-by: dholmes, coleenp
---
 src/hotspot/share/runtime/java.cpp          |  4 +--
 src/hotspot/share/runtime/nonJavaThread.cpp | 30 ++++++++++++---------
 src/hotspot/share/runtime/nonJavaThread.hpp |  8 +++---
 src/hotspot/share/runtime/task.cpp          |  4 +--
 src/hotspot/share/runtime/threads.cpp       | 22 +++++++--------
 5 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/hotspot/share/runtime/java.cpp b/src/hotspot/share/runtime/java.cpp
index 140d0281e2f33..8746efebc21d9 100644
--- a/src/hotspot/share/runtime/java.cpp
+++ b/src/hotspot/share/runtime/java.cpp
@@ -471,9 +471,7 @@ void before_exit(JavaThread* thread, bool halt) {
 
   // Stop the WatcherThread. We do this before disenrolling various
   // PeriodicTasks to reduce the likelihood of races.
-  if (PeriodicTask::num_tasks() > 0) {
-    WatcherThread::stop();
-  }
+  WatcherThread::stop();
 
   // shut down the StatSampler task
   StatSampler::disengage();
diff --git a/src/hotspot/share/runtime/nonJavaThread.cpp b/src/hotspot/share/runtime/nonJavaThread.cpp
index 3fbfa080e1f88..f537afcaa0634 100644
--- a/src/hotspot/share/runtime/nonJavaThread.cpp
+++ b/src/hotspot/share/runtime/nonJavaThread.cpp
@@ -156,7 +156,7 @@ void NamedThread::print_on(outputStream* st) const {
 // timer interrupts exists on the platform.
 
 WatcherThread* WatcherThread::_watcher_thread   = nullptr;
-bool WatcherThread::_startable = false;
+bool WatcherThread::_run_all_tasks = false;
 volatile bool  WatcherThread::_should_terminate = false;
 
 WatcherThread::WatcherThread() : NonJavaThread() {
@@ -185,6 +185,11 @@ int WatcherThread::sleep() const {
     return 0;  // we did not sleep.
   }
 
+  if (!_run_all_tasks) {
+    ml.wait(100);
+    return 0;
+  }
+
   // remaining will be zero if there are no tasks,
   // causing the WatcherThread to sleep until a task is
   // enrolled
@@ -280,7 +285,10 @@ void WatcherThread::run() {
       break;
     }
 
-    PeriodicTask::real_time_tick(time_waited);
+    // Don't process enrolled tasks until VM is fully initialized.
+    if (_run_all_tasks) {
+      PeriodicTask::real_time_tick(time_waited);
+    }
   }
 
   // Signal that it is terminated
@@ -293,18 +301,16 @@ void WatcherThread::run() {
 }
 
 void WatcherThread::start() {
-  assert(PeriodicTask_lock->owned_by_self(), "PeriodicTask_lock required");
-
-  if (watcher_thread() == nullptr && _startable) {
-    _should_terminate = false;
-    // Create the single instance of WatcherThread
-    new WatcherThread();
-  }
+  MonitorLocker ml(PeriodicTask_lock);
+  _should_terminate = false;
+  // Create the single instance of WatcherThread
+  new WatcherThread();
 }
 
-void WatcherThread::make_startable() {
-  assert(PeriodicTask_lock->owned_by_self(), "PeriodicTask_lock required");
-  _startable = true;
+void WatcherThread::run_all_tasks() {
+  MonitorLocker ml(PeriodicTask_lock);
+  _run_all_tasks = true;
+  ml.notify();
 }
 
 void WatcherThread::stop() {
diff --git a/src/hotspot/share/runtime/nonJavaThread.hpp b/src/hotspot/share/runtime/nonJavaThread.hpp
index 7807af6e22876..6d9095924d98e 100644
--- a/src/hotspot/share/runtime/nonJavaThread.hpp
+++ b/src/hotspot/share/runtime/nonJavaThread.hpp
@@ -110,7 +110,7 @@ class WatcherThread: public NonJavaThread {
  private:
   static WatcherThread* _watcher_thread;
 
-  static bool _startable;
+  static bool _run_all_tasks;
   // volatile due to at least one lock-free read
   volatile static bool _should_terminate;
  public:
@@ -137,9 +137,9 @@ class WatcherThread: public NonJavaThread {
   // Create and start the single instance of WatcherThread, or stop it on shutdown
   static void start();
   static void stop();
-  // Only allow start once the VM is sufficiently initialized
-  // Otherwise the first task to enroll will trigger the start
-  static void make_startable();
+  // Allow executing registered tasks once the VM is sufficiently
+  // initialized. Meanwhile only error reporting will be checked.
+  static void run_all_tasks();
  private:
   int sleep() const;
 };
diff --git a/src/hotspot/share/runtime/task.cpp b/src/hotspot/share/runtime/task.cpp
index d38c1d145d03c..9eccd368d2541 100644
--- a/src/hotspot/share/runtime/task.cpp
+++ b/src/hotspot/share/runtime/task.cpp
@@ -29,6 +29,7 @@
 #include "runtime/mutexLocker.hpp"
 #include "runtime/nonJavaThread.hpp"
 #include "runtime/task.hpp"
+#include "runtime/threads.hpp"
 #include "runtime/timer.hpp"
 
 int PeriodicTask::_num_tasks = 0;
@@ -95,10 +96,9 @@ void PeriodicTask::enroll() {
   }
 
   WatcherThread* thread = WatcherThread::watcher_thread();
+  assert(thread != nullptr || !Threads::is_vm_complete(), "vm created but no WatcherThread");
   if (thread != nullptr) {
     thread->unpark();
-  } else {
-    WatcherThread::start();
   }
 }
 
diff --git a/src/hotspot/share/runtime/threads.cpp b/src/hotspot/share/runtime/threads.cpp
index 4f6fcf76db199..302c3672ce063 100644
--- a/src/hotspot/share/runtime/threads.cpp
+++ b/src/hotspot/share/runtime/threads.cpp
@@ -553,6 +553,10 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
     return status;
   }
 
+  // Create WatcherThread as soon as we can since we need it in case
+  // of hangs during error reporting.
+  WatcherThread::start();
+
   // Add main_thread to threads list to finish barrier setup with
   // on_thread_attach.  Should be before starting to build Java objects in
   // init_globals2, which invokes barriers.
@@ -792,19 +796,11 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
     CLEAR_PENDING_EXCEPTION;
   }
 
-  {
-    MutexLocker ml(PeriodicTask_lock);
-    // Make sure the WatcherThread can be started by WatcherThread::start()
-    // or by dynamic enrollment.
-    WatcherThread::make_startable();
-    // Start up the WatcherThread if there are any periodic tasks
-    // NOTE:  All PeriodicTasks should be registered by now. If they
-    //   aren't, late joiners might appear to start slowly (we might
-    //   take a while to process their first tick).
-    if (PeriodicTask::num_tasks() > 0) {
-      WatcherThread::start();
-    }
-  }
+  // Let WatcherThread run all registered periodic tasks now.
+  // NOTE:  All PeriodicTasks should be registered by now. If they
+  //   aren't, late joiners might appear to start slowly (we might
+  //   take a while to process their first tick).
+  WatcherThread::run_all_tasks();
 
   create_vm_timer.end();
 #ifdef ASSERT

From 940a4e12d1b304fb841f5bcdbd2b62fac692f3b1 Mon Sep 17 00:00:00 2001
From: Eirik Bjorsnos <eirbjo@gmail.com>
Date: Mon, 10 Jul 2023 21:48:03 +0000
Subject: [PATCH 03/21] 8304503: Modernize debugging jvm args in demo netbeans
 projects

Reviewed-by: prr
---
 .../share/nbproject/jfc/FileChooserDemo/build.properties   | 2 +-
 .../jfc/FileChooserDemo/nbproject/netbeans-targets.xml     | 7 ++-----
 src/demo/share/nbproject/jfc/Font2DTest/build.properties   | 2 +-
 .../jfc/Font2DTest/nbproject/netbeans-targets.xml          | 7 ++-----
 src/demo/share/nbproject/jfc/Metalworks/build.properties   | 2 +-
 .../jfc/Metalworks/nbproject/netbeans-targets.xml          | 7 ++-----
 src/demo/share/nbproject/jfc/Notepad/build.properties      | 2 +-
 .../nbproject/jfc/Notepad/nbproject/netbeans-targets.xml   | 7 ++-----
 src/demo/share/nbproject/jfc/SampleTree/build.properties   | 2 +-
 .../jfc/SampleTree/nbproject/netbeans-targets.xml          | 7 ++-----
 src/demo/share/nbproject/jfc/TableExample/build.properties | 2 +-
 .../jfc/TableExample/nbproject/netbeans-targets.xml        | 7 ++-----
 .../share/nbproject/jfc/TransparentRuler/build.properties  | 2 +-
 .../jfc/TransparentRuler/nbproject/netbeans-targets.xml    | 7 ++-----
 14 files changed, 21 insertions(+), 42 deletions(-)

diff --git a/src/demo/share/nbproject/jfc/FileChooserDemo/build.properties b/src/demo/share/nbproject/jfc/FileChooserDemo/build.properties
index cc794cf4f5d68..354c3bbdabc7f 100644
--- a/src/demo/share/nbproject/jfc/FileChooserDemo/build.properties
+++ b/src/demo/share/nbproject/jfc/FileChooserDemo/build.properties
@@ -1,6 +1,6 @@
 main.dir=${basedir}/../../../jfc/FileChooserDemo
 
-src.dir=${main.dir}/src
+src.dir=${main.dir}/
 
 build.dir=build
 classes.dir=${build.dir}/classes
diff --git a/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml
index ac5178cfa3018..a95dd376609ed 100644
--- a/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml
+++ b/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -41,10 +41,7 @@
         </nbjpdastart>
         <java classname="${main.class}" failonerror="true" fork="true">
             <classpath path="${run.cp}"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=none"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,suspend=n,address=${jpda.address}"/>
         </java>
     </target>
     
diff --git a/src/demo/share/nbproject/jfc/Font2DTest/build.properties b/src/demo/share/nbproject/jfc/Font2DTest/build.properties
index 6007cd7519444..4b84026f90a03 100644
--- a/src/demo/share/nbproject/jfc/Font2DTest/build.properties
+++ b/src/demo/share/nbproject/jfc/Font2DTest/build.properties
@@ -1,6 +1,6 @@
 main.dir=${basedir}/../../../jfc/Font2DTest
 
-src.dir=${main.dir}/src
+src.dir=${main.dir}/
 
 build.dir=build
 classes.dir=${build.dir}/classes
diff --git a/src/demo/share/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml
index b40575d3667ad..4a0baefef1129 100644
--- a/src/demo/share/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml
+++ b/src/demo/share/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -41,10 +41,7 @@
         </nbjpdastart>
         <java classname="${main.class}" failonerror="true" fork="true">
             <classpath path="${run.cp}"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=none"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,suspend=n,address=${jpda.address}"/>
         </java>
     </target>
     
diff --git a/src/demo/share/nbproject/jfc/Metalworks/build.properties b/src/demo/share/nbproject/jfc/Metalworks/build.properties
index 7a085159923cc..67842ab17a681 100644
--- a/src/demo/share/nbproject/jfc/Metalworks/build.properties
+++ b/src/demo/share/nbproject/jfc/Metalworks/build.properties
@@ -1,6 +1,6 @@
 main.dir=${basedir}/../../../jfc/Metalworks
 
-src.dir=${main.dir}/src
+src.dir=${main.dir}/
 
 build.dir=build
 classes.dir=${build.dir}/classes
diff --git a/src/demo/share/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml
index b31e670af655c..61600a428815a 100644
--- a/src/demo/share/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml
+++ b/src/demo/share/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -41,10 +41,7 @@
         </nbjpdastart>
         <java classname="${main.class}" failonerror="true" fork="true">
             <classpath path="${run.cp}"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=none"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,suspend=n,address=${jpda.address}"/>
         </java>
     </target>
     
diff --git a/src/demo/share/nbproject/jfc/Notepad/build.properties b/src/demo/share/nbproject/jfc/Notepad/build.properties
index 7d2c25a9088cb..d057d8e0f4bbd 100644
--- a/src/demo/share/nbproject/jfc/Notepad/build.properties
+++ b/src/demo/share/nbproject/jfc/Notepad/build.properties
@@ -1,6 +1,6 @@
 main.dir=${basedir}/../../../jfc/Notepad
 
-src.dir=${main.dir}/src
+src.dir=${main.dir}/
 
 build.dir=build
 classes.dir=${build.dir}/classes
diff --git a/src/demo/share/nbproject/jfc/Notepad/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/Notepad/nbproject/netbeans-targets.xml
index 7a0b1bec5fb9c..ee89bd8ef27b7 100644
--- a/src/demo/share/nbproject/jfc/Notepad/nbproject/netbeans-targets.xml
+++ b/src/demo/share/nbproject/jfc/Notepad/nbproject/netbeans-targets.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -41,10 +41,7 @@
         </nbjpdastart>
         <java classname="${main.class}" failonerror="true" fork="true">
             <classpath path="${run.cp}"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=none"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,suspend=n,address=${jpda.address}"/>
         </java>
     </target>
     
diff --git a/src/demo/share/nbproject/jfc/SampleTree/build.properties b/src/demo/share/nbproject/jfc/SampleTree/build.properties
index 5d90b3bea5ad8..c6ea2c9eabe98 100644
--- a/src/demo/share/nbproject/jfc/SampleTree/build.properties
+++ b/src/demo/share/nbproject/jfc/SampleTree/build.properties
@@ -1,6 +1,6 @@
 main.dir=${basedir}/../../../jfc/SampleTree
 
-src.dir=${main.dir}/src
+src.dir=${main.dir}/
 
 build.dir=build
 classes.dir=${build.dir}/classes
diff --git a/src/demo/share/nbproject/jfc/SampleTree/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/SampleTree/nbproject/netbeans-targets.xml
index 9a7810f4d7139..65550cfd3bb04 100644
--- a/src/demo/share/nbproject/jfc/SampleTree/nbproject/netbeans-targets.xml
+++ b/src/demo/share/nbproject/jfc/SampleTree/nbproject/netbeans-targets.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -41,10 +41,7 @@
         </nbjpdastart>
         <java classname="${main.class}" failonerror="true" fork="true">
             <classpath path="${run.cp}"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=none"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,suspend=n,address=${jpda.address}"/>
         </java>
     </target>
     
diff --git a/src/demo/share/nbproject/jfc/TableExample/build.properties b/src/demo/share/nbproject/jfc/TableExample/build.properties
index b23535ce172c8..35ed324e05603 100644
--- a/src/demo/share/nbproject/jfc/TableExample/build.properties
+++ b/src/demo/share/nbproject/jfc/TableExample/build.properties
@@ -1,6 +1,6 @@
 main.dir=${basedir}/../../../jfc/TableExample
 
-src.dir=${main.dir}/src
+src.dir=${main.dir}/
 
 build.dir=build
 classes.dir=${build.dir}/classes
diff --git a/src/demo/share/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml
index 00822acc57049..56251eb2a82dc 100644
--- a/src/demo/share/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml
+++ b/src/demo/share/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -41,10 +41,7 @@
         </nbjpdastart>
         <java classname="${main.class}" failonerror="true" fork="true">
             <classpath path="${run.cp}"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=none"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,suspend=n,address=${jpda.address}"/>
         </java>
     </target>
     
diff --git a/src/demo/share/nbproject/jfc/TransparentRuler/build.properties b/src/demo/share/nbproject/jfc/TransparentRuler/build.properties
index b1b2ef89b820b..333c6515adb5d 100644
--- a/src/demo/share/nbproject/jfc/TransparentRuler/build.properties
+++ b/src/demo/share/nbproject/jfc/TransparentRuler/build.properties
@@ -1,6 +1,6 @@
 main.dir=${basedir}/../../../jfc/TransparentRuler
 
-src.dir=${main.dir}/src
+src.dir=${main.dir}/
 
 build.dir=build
 classes.dir=${build.dir}/classes
diff --git a/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/netbeans-targets.xml
index 84a0e9b3c5e0f..663b96fc14704 100644
--- a/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/netbeans-targets.xml
+++ b/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/netbeans-targets.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -41,10 +41,7 @@
         </nbjpdastart>
         <java classname="${main.class}" failonerror="true" fork="true">
             <classpath path="${run.cp}"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=none"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,suspend=n,address=${jpda.address}"/>
         </java>
     </target>
     

From 4b1403d06b99b91ddd89ad6e54669b0595f1f8e5 Mon Sep 17 00:00:00 2001
From: Hao Sun <haosun@openjdk.org>
Date: Mon, 10 Jul 2023 22:00:31 +0000
Subject: [PATCH 04/21] 8311548: AArch64: [ZGC] Many tests fail with
 "assert(allocates2(pc)) failed: not in CodeBuffer memory" on some CPUs

Reviewed-by: aboldtch, fyang, kbarrett, tschatzl
---
 src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp
index 76ea4cad7832f..2fcb35a1ae160 100644
--- a/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp
@@ -39,7 +39,7 @@ enum platform_dependent_constants {
   _initial_stubs_code_size      = 10000,
   _continuation_stubs_code_size =  2000,
   _compiler_stubs_code_size     = 30000 ZGC_ONLY(+10000),
-  _final_stubs_code_size        = 20000 ZGC_ONLY(+60000)
+  _final_stubs_code_size        = 20000 ZGC_ONLY(+100000)
 };
 
 class aarch64 {

From a1cfc9695405fe517fae1b9f760ae42b85f66be9 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Tue, 11 Jul 2023 11:03:36 +0000
Subject: [PATCH 05/21] 8311245: JFR: Remove t.printStackTrace() in
 PeriodicEvents

Reviewed-by: mgronlun
---
 .../jdk/jfr/internal/periodic/PeriodicEvents.java    | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/periodic/PeriodicEvents.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/periodic/PeriodicEvents.java
index a441f4515d135..8695a5e0e3918 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/periodic/PeriodicEvents.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/periodic/PeriodicEvents.java
@@ -96,16 +96,8 @@ public static void doChunkEnd() {
 
     // Only to be called from periodic task thread
     public static long doPeriodic() {
-        try {
-            return runPeriodic(JVM.counterTime());
-        } catch (Throwable t) {
-            t.printStackTrace();
-            throw t;
-        }
-    }
-
-    // Code copied from prior native implementation
-    private static long runPeriodic(long eventTimestamp) {
+        long eventTimestamp = JVM.counterTime();
+        // Code copied from prior native implementation
         long last = lastTimeMillis;
         // The interval for periodic events is typically at least 1 s, so
         // System.currentTimeMillis() is sufficient. JVM.counterTime() lacks

From b3f34039fedd3c49404783ec880e1885dceb296b Mon Sep 17 00:00:00 2001
From: Alexey Ivanov <aivanov@openjdk.org>
Date: Tue, 11 Jul 2023 13:43:15 +0000
Subject: [PATCH 06/21] 8311689: Wrong visible amount in Adjustable of
 ScrollPane

Reviewed-by: prr, honkar, serb
---
 .../native/libawt/windows/awt_ScrollPane.cpp  |  4 +-
 .../awt/ScrollPane/ScrollPaneScrollEnd.java   | 95 +++++++++++++++++++
 2 files changed, 97 insertions(+), 2 deletions(-)
 create mode 100644 test/jdk/java/awt/ScrollPane/ScrollPaneScrollEnd.java

diff --git a/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.cpp b/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.cpp
index 5c2a0686af796..0bfba78c09059 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.cpp
@@ -524,8 +524,8 @@ void AwtScrollPane::_SetSpans(void *param)
         DTRACE_PRINTLN5("%x: WScrollPanePeer.setSpans(%d, %d, %d, %d)", self,
             parentWidth, parentHeight, childWidth, childHeight);
         s->RecalcSizes(parentWidth, parentHeight, childWidth, childHeight);
-        s->VerifyState();
         s->SetInsets(env);
+        s->VerifyState();
     }
 ret:
    env->DeleteGlobalRef(self);
@@ -804,7 +804,7 @@ Java_sun_awt_windows_WScrollPanePeer_setSpans(JNIEnv *env, jobject self,
     sss->childWidth = childWidth;
     sss->childHeight = childHeight;
 
-    AwtToolkit::GetInstance().InvokeFunctionLater(AwtScrollPane::_SetSpans, sss);
+    AwtToolkit::GetInstance().InvokeFunction(AwtScrollPane::_SetSpans, sss);
     // global ref and sss are deleted in _SetSpans
 
     CATCH_BAD_ALLOC;
diff --git a/test/jdk/java/awt/ScrollPane/ScrollPaneScrollEnd.java b/test/jdk/java/awt/ScrollPane/ScrollPaneScrollEnd.java
new file mode 100644
index 0000000000000..00ca273d76b29
--- /dev/null
+++ b/test/jdk/java/awt/ScrollPane/ScrollPaneScrollEnd.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2023, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Canvas;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.ScrollPane;
+
+/*
+ * @test
+ * @bug 8311689
+ * @key headful
+ * @requires os.family=="windows"
+ * @summary Verifies ScrollPane allows viewing the whole contents of its child
+ * @run main ScrollPaneScrollEnd
+ */
+public final class ScrollPaneScrollEnd {
+    private static final Color CANVAS_BACKGROUND = new Color(255, 200, 200);
+    private static final Color CANVAS_FOREGROUND = new Color(255, 255, 200);
+    private static final int OFFSET = 12;
+
+    private static final Dimension CANVAS_SIZE = new Dimension(900, 600);
+    private static final Dimension SCROLL_PANE_SIZE =
+            new Dimension(CANVAS_SIZE.width / 3, CANVAS_SIZE.height / 3);
+    private static final int SCROLL_OFFSET = 100;
+
+    private static final int DELAY = 200;
+
+    public static void main(String[] args) throws Exception {
+        Canvas canvas = new Canvas() {
+            @Override
+            public void paint(Graphics g) {
+                g.setColor(CANVAS_BACKGROUND);
+                g.fillRect(0, 0, getWidth(), getHeight());
+
+                g.setColor(CANVAS_FOREGROUND);
+                g.fillRect(OFFSET, OFFSET,
+                           getWidth() - OFFSET * 2, getHeight() - OFFSET * 2);
+            }
+        };
+        canvas.setSize(CANVAS_SIZE);
+
+        ScrollPane scrollPane = new ScrollPane(ScrollPane.SCROLLBARS_AS_NEEDED);
+        scrollPane.add(canvas);
+        scrollPane.setSize(SCROLL_PANE_SIZE);
+
+        Frame frame = new Frame("ScrollPaneScrollEnd");
+        frame.add(scrollPane, "Center");
+        frame.setLocation(100, 100);
+        frame.pack();
+        frame.setVisible(true);
+
+        final Robot robot = new Robot();
+        robot.waitForIdle();
+        robot.delay(DELAY);
+
+        final Dimension vp = scrollPane.getViewportSize();
+        final Point expected = new Point(CANVAS_SIZE.width - vp.width,
+                                         CANVAS_SIZE.height - vp.height);
+
+        scrollPane.setScrollPosition(CANVAS_SIZE.width + SCROLL_OFFSET,
+                                     CANVAS_SIZE.height + SCROLL_OFFSET);
+        try {
+            if (!expected.equals(scrollPane.getScrollPosition())) {
+                throw new Error("Can't scroll to the end of the child component");
+            }
+        } finally {
+            frame.dispose();
+        }
+    }
+}

From caadad4fdc78799dab2d492dba9b9f74b22d036e Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Tue, 11 Jul 2023 15:59:17 +0000
Subject: [PATCH 07/21] 8303279: C2: crash in SubTypeCheckNode::sub() at IGVN
 split if

Reviewed-by: kvn, vlivanov, thartmann, simonis
---
 src/hotspot/share/opto/callGenerator.cpp      |  4 +
 src/hotspot/share/opto/doCall.cpp             |  4 +-
 src/hotspot/share/opto/ifnode.cpp             | 11 ++-
 src/hotspot/share/opto/library_call.cpp       | 18 +++--
 src/hotspot/share/opto/library_call.hpp       | 10 +--
 src/hotspot/share/opto/subtypenode.cpp        |  1 +
 .../TestCrashAtIGVNSplitIfSubType.java        | 74 +++++++++++++++++++
 7 files changed, 106 insertions(+), 16 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/splitif/TestCrashAtIGVNSplitIfSubType.java

diff --git a/src/hotspot/share/opto/callGenerator.cpp b/src/hotspot/share/opto/callGenerator.cpp
index 6f4099d7feb4a..50f9f4b85f34d 100644
--- a/src/hotspot/share/opto/callGenerator.cpp
+++ b/src/hotspot/share/opto/callGenerator.cpp
@@ -706,6 +706,10 @@ void CallGenerator::do_late_inline_helper() {
       result = (result_size == 1) ? kit.pop() : kit.pop_pair();
     }
 
+    if (call->is_CallStaticJava() && call->as_CallStaticJava()->is_boxing_method()) {
+      result = kit.must_be_not_null(result, false);
+    }
+
     if (inline_cg()->is_inline()) {
       C->set_has_loops(C->has_loops() || inline_cg()->method()->has_loops());
       C->env()->notice_inlined_method(inline_cg()->method());
diff --git a/src/hotspot/share/opto/doCall.cpp b/src/hotspot/share/opto/doCall.cpp
index a4f58e2769d0d..0bec5fc47cf4b 100644
--- a/src/hotspot/share/opto/doCall.cpp
+++ b/src/hotspot/share/opto/doCall.cpp
@@ -824,7 +824,9 @@ void Parse::catch_call_exceptions(ciExceptionHandlerStream& handlers) {
 
   if (!default_handler) {
     bcis->append(-1);
-    extypes->append(TypeOopPtr::make_from_klass(env()->Throwable_klass())->is_instptr());
+    const Type* extype = TypeOopPtr::make_from_klass(env()->Throwable_klass())->is_instptr();
+    extype = extype->join(TypeInstPtr::NOTNULL);
+    extypes->append(extype);
   }
 
   int len = bcis->length();
diff --git a/src/hotspot/share/opto/ifnode.cpp b/src/hotspot/share/opto/ifnode.cpp
index 65a58341f3ff3..ef0c720835631 100644
--- a/src/hotspot/share/opto/ifnode.cpp
+++ b/src/hotspot/share/opto/ifnode.cpp
@@ -91,9 +91,14 @@ static Node* split_if(IfNode *iff, PhaseIterGVN *igvn) {
   // See that the merge point contains some constants
   Node *con1=nullptr;
   uint i4;
-  for( i4 = 1; i4 < phi->req(); i4++ ) {
+  RegionNode* phi_region = phi->region();
+  for (i4 = 1; i4 < phi->req(); i4++ ) {
     con1 = phi->in(i4);
-    if( !con1 ) return nullptr;    // Do not optimize partially collapsed merges
+    // Do not optimize partially collapsed merges
+    if (con1 == nullptr || phi_region->in(i4) == nullptr || igvn->type(phi_region->in(i4)) == Type::TOP) {
+      igvn->_worklist.push(iff);
+      return nullptr;
+    }
     if( con1->is_Con() ) break; // Found a constant
     // Also allow null-vs-not-null checks
     const TypePtr *tp = igvn->type(con1)->isa_ptr();
@@ -115,7 +120,7 @@ static Node* split_if(IfNode *iff, PhaseIterGVN *igvn) {
 
   // No intervening control, like a simple Call
   Node* r = iff->in(0);
-  if (!r->is_Region() || r->is_Loop() || phi->region() != r || r->as_Region()->is_copy()) {
+  if (!r->is_Region() || r->is_Loop() || phi_region != r || r->as_Region()->is_copy()) {
     return nullptr;
   }
 
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index f23d8cea58a54..dffd0e3d2d7a8 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -4017,9 +4017,9 @@ bool LibraryCallKit::inline_unsafe_newArray(bool uninitialized) {
     CallJavaNode* slow_call = nullptr;
     if (uninitialized) {
       // Generate optimized virtual call (holder class 'Unsafe' is final)
-      slow_call = generate_method_call(vmIntrinsics::_allocateUninitializedArray, false, false);
+      slow_call = generate_method_call(vmIntrinsics::_allocateUninitializedArray, false, false, true);
     } else {
-      slow_call = generate_method_call_static(vmIntrinsics::_newArray);
+      slow_call = generate_method_call_static(vmIntrinsics::_newArray, true);
     }
     Node* slow_result = set_results_for_java_call(slow_call);
     // this->control() comes from set_results_for_java_call
@@ -4264,7 +4264,7 @@ Node* LibraryCallKit::generate_virtual_guard(Node* obj_klass,
 // not another intrinsic.  (E.g., don't use this for making an
 // arraycopy call inside of the copyOf intrinsic.)
 CallJavaNode*
-LibraryCallKit::generate_method_call(vmIntrinsics::ID method_id, bool is_virtual, bool is_static) {
+LibraryCallKit::generate_method_call(vmIntrinsicID method_id, bool is_virtual, bool is_static, bool res_not_null) {
   // When compiling the intrinsic method itself, do not use this technique.
   guarantee(callee() != C->method(), "cannot make slow-call to self");
 
@@ -4273,6 +4273,14 @@ LibraryCallKit::generate_method_call(vmIntrinsics::ID method_id, bool is_virtual
   guarantee(method_id == method->intrinsic_id(), "must match");
 
   const TypeFunc* tf = TypeFunc::make(method);
+  if (res_not_null) {
+    assert(tf->return_type() == T_OBJECT, "");
+    const TypeTuple* range = tf->range();
+    const Type** fields = TypeTuple::fields(range->cnt());
+    fields[TypeFunc::Parms] = range->field_at(TypeFunc::Parms)->filter_speculative(TypePtr::NOTNULL);
+    const TypeTuple* new_range = TypeTuple::make(range->cnt(), fields);
+    tf = TypeFunc::make(tf->domain(), new_range);
+  }
   CallJavaNode* slow_call;
   if (is_static) {
     assert(!is_virtual, "");
@@ -4422,7 +4430,7 @@ bool LibraryCallKit::inline_native_hashcode(bool is_virtual, bool is_static) {
     // No need for PreserveJVMState, because we're using up the present state.
     set_all_memory(init_mem);
     vmIntrinsics::ID hashCode_id = is_static ? vmIntrinsics::_identityHashCode : vmIntrinsics::_hashCode;
-    CallJavaNode* slow_call = generate_method_call(hashCode_id, is_virtual, is_static);
+    CallJavaNode* slow_call = generate_method_call(hashCode_id, is_virtual, is_static, false);
     Node* slow_result = set_results_for_java_call(slow_call);
     // this->control() comes from set_results_for_java_call
     result_reg->init_req(_slow_path, control());
@@ -4948,7 +4956,7 @@ bool LibraryCallKit::inline_native_clone(bool is_virtual) {
     set_control(_gvn.transform(slow_region));
     if (!stopped()) {
       PreserveJVMState pjvms(this);
-      CallJavaNode* slow_call = generate_method_call(vmIntrinsics::_clone, is_virtual);
+      CallJavaNode* slow_call = generate_method_call(vmIntrinsics::_clone, is_virtual, false, true);
       // We need to deoptimize on exception (see comment above)
       Node* slow_result = set_results_for_java_call(slow_call, false, /* deoptimize */ true);
       // this->control() comes from set_results_for_java_call
diff --git a/src/hotspot/share/opto/library_call.hpp b/src/hotspot/share/opto/library_call.hpp
index 50b6a47971fd8..bec6f2d88299f 100644
--- a/src/hotspot/share/opto/library_call.hpp
+++ b/src/hotspot/share/opto/library_call.hpp
@@ -176,13 +176,9 @@ class LibraryCallKit : public GraphKit {
   Node* generate_array_guard_common(Node* kls, RegionNode* region,
                                     bool obj_array, bool not_array);
   Node* generate_virtual_guard(Node* obj_klass, RegionNode* slow_region);
-  CallJavaNode* generate_method_call(vmIntrinsics::ID method_id,
-                                     bool is_virtual = false, bool is_static = false);
-  CallJavaNode* generate_method_call_static(vmIntrinsics::ID method_id) {
-    return generate_method_call(method_id, false, true);
-  }
-  CallJavaNode* generate_method_call_virtual(vmIntrinsics::ID method_id) {
-    return generate_method_call(method_id, true, false);
+  CallJavaNode* generate_method_call(vmIntrinsicID method_id, bool is_virtual, bool is_static, bool res_not_null);
+  CallJavaNode* generate_method_call_static(vmIntrinsicID method_id, bool res_not_null) {
+    return generate_method_call(method_id, false, true, res_not_null);
   }
   Node* load_field_from_object(Node* fromObj, const char* fieldName, const char* fieldTypeString, DecoratorSet decorators = IN_HEAP, bool is_static = false, ciInstanceKlass* fromKls = nullptr);
   Node* field_address_from_object(Node* fromObj, const char* fieldName, const char* fieldTypeString, bool is_exact = true, bool is_static = false, ciInstanceKlass* fromKls = nullptr);
diff --git a/src/hotspot/share/opto/subtypenode.cpp b/src/hotspot/share/opto/subtypenode.cpp
index bb508f02ea81f..3c50eac2e2546 100644
--- a/src/hotspot/share/opto/subtypenode.cpp
+++ b/src/hotspot/share/opto/subtypenode.cpp
@@ -34,6 +34,7 @@
 
 const Type* SubTypeCheckNode::sub(const Type* sub_t, const Type* super_t) const {
   const TypeKlassPtr* superk = super_t->isa_klassptr();
+  assert(sub_t != Type::TOP && !TypePtr::NULL_PTR->higher_equal(sub_t), "should be not null");
   const TypeKlassPtr* subk = sub_t->isa_klassptr() ? sub_t->is_klassptr() : sub_t->is_oopptr()->as_klass_type();
 
   // Oop can't be a subtype of abstract type that has no subclass.
diff --git a/test/hotspot/jtreg/compiler/splitif/TestCrashAtIGVNSplitIfSubType.java b/test/hotspot/jtreg/compiler/splitif/TestCrashAtIGVNSplitIfSubType.java
new file mode 100644
index 0000000000000..72af0fd132c12
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/splitif/TestCrashAtIGVNSplitIfSubType.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2023, Red Hat, Inc. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8303279
+ * @summary C2: crash in SubTypeCheckNode::sub() at IGVN split if
+ * @run main/othervm -XX:-TieredCompilation -XX:-BackgroundCompilation -XX:+UnlockDiagnosticVMOptions -XX:+StressIGVN -XX:StressSeed=598200189 TestCrashAtIGVNSplitIfSubType
+ * @run main/othervm -XX:-TieredCompilation -XX:-BackgroundCompilation -XX:+UnlockDiagnosticVMOptions -XX:+StressIGVN TestCrashAtIGVNSplitIfSubType
+ */
+
+public class TestCrashAtIGVNSplitIfSubType {
+    private static volatile int barrier;
+
+    public static void main(String[] args) {
+        A a = new A();
+        B b = new B();
+        for (int i = 0; i < 20_000; i++) {
+            test(a);
+            test(b);
+            testHelper1(null, 0);
+        }
+    }
+
+    private static void test(Object o) {
+        int i = 2;
+        for (; i < 4; i *= 2) {
+
+        }
+        o = testHelper1(o, i);
+        if (o instanceof A) {
+            barrier = 0x42;
+        }
+    }
+
+    private static Object testHelper1(Object o, int i) {
+        if (i < 3) {
+            o = null;
+        } else {
+            if (o == null) {
+            }
+        }
+        if (i < 2) {
+            barrier = 42;
+        }
+        return o;
+    }
+
+    private static class A {
+    }
+
+    private static class B {
+    }
+}

From 00c7f914c665a77842d32eb8f760dcbbbda66554 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Tue, 11 Jul 2023 16:10:34 +0000
Subject: [PATCH 08/21] 8310047: Add UTF-32 based Charsets into
 StandardCharsets

Reviewed-by: alanb, lancea, bpb, jpai, jlu
---
 .../classes/java/nio/charset/Charset.java     | 29 +++++++++++++++----
 .../java/nio/charset/StandardCharsets.java    | 21 +++++++++++++-
 .../sun/nio/cs/StandardCharsets.java.template |  3 ++
 .../charset/StandardCharsets/Standard.java    | 17 +++++++++--
 4 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/src/java.base/share/classes/java/nio/charset/Charset.java b/src/java.base/share/classes/java/nio/charset/Charset.java
index b87dfc1643679..83dc81ba259d7 100644
--- a/src/java.base/share/classes/java/nio/charset/Charset.java
+++ b/src/java.base/share/classes/java/nio/charset/Charset.java
@@ -168,37 +168,54 @@
  * <tr><th scope="row" style="vertical-align:top">{@code UTF-16}</th>
  *     <td>Sixteen-bit UCS Transformation Format,
  *         byte&nbsp;order identified by an optional byte-order mark</td></tr>
+ * <tr><th scope="row" style="vertical-align:top">{@code UTF-32BE}</th>
+ *     <td>Thirty-two-bit UCS Transformation Format,
+ *         big-endian byte&nbsp;order</td></tr>
+ * <tr><th scope="row" style="vertical-align:top">{@code UTF-32LE}</th>
+ *     <td>Thirty-two-bit UCS Transformation Format,
+ *         little-endian byte&nbsp;order</td></tr>
+ * <tr><th scope="row" style="vertical-align:top">{@code UTF-32}</th>
+ *     <td>Thirty-two-bit UCS Transformation Format,
+ *         byte&nbsp;order identified by an optional byte-order mark</td></tr>
  * </tbody>
  * </table></blockquote>
  *
  * <p> The {@code UTF-8} charset is specified by <a
  * href="http://www.ietf.org/rfc/rfc2279.txt"><i>RFC&nbsp;2279</i></a>; the
  * transformation format upon which it is based is specified in
- * Amendment&nbsp;2 of ISO&nbsp;10646-1 and is also described in the <a
+ * ISO&nbsp;10646-1 and is also described in the <a
  * href="http://www.unicode.org/standard/standard.html"><i>Unicode
  * Standard</i></a>.
  *
  * <p> The {@code UTF-16} charsets are specified by <a
  * href="http://www.ietf.org/rfc/rfc2781.txt"><i>RFC&nbsp;2781</i></a>; the
  * transformation formats upon which they are based are specified in
- * Amendment&nbsp;1 of ISO&nbsp;10646-1 and are also described in the <a
+ * ISO&nbsp;10646-1 and are also described in the <a
+ * href="http://www.unicode.org/standard/standard.html"><i>Unicode
+ * Standard</i></a>.
+ *
+ * <p> The {@code UTF-32} charsets are based upon transformation formats
+ * which are specified in
+ * ISO&nbsp;10646-1 and are also described in the <a
  * href="http://www.unicode.org/standard/standard.html"><i>Unicode
  * Standard</i></a>.
  *
- * <p> The {@code UTF-16} charsets use sixteen-bit quantities and are
+ * <p> The {@code UTF-16} and {@code UTF-32} charsets use sixteen-bit and thirty-two-bit
+ * quantities respectively, and are
  * therefore sensitive to byte order.  In these encodings the byte order of a
  * stream may be indicated by an initial <i>byte-order mark</i> represented by
- * the Unicode character <code>'&#92;uFEFF'</code>.  Byte-order marks are handled
+ * the Unicode character {@code U+FEFF}.  Byte-order marks are handled
  * as follows:
  *
  * <ul>
  *
- *   <li><p> When decoding, the {@code UTF-16BE} and {@code UTF-16LE}
+ *   <li><p> When decoding, the {@code UTF-16BE}, {@code UTF-16LE},
+ *   {@code UTF-32BE}, and {@code UTF-32LE}
  *   charsets interpret the initial byte-order marks as a <small>ZERO-WIDTH
  *   NON-BREAKING SPACE</small>; when encoding, they do not write
  *   byte-order marks. </p></li>
  *
- *   <li><p> When decoding, the {@code UTF-16} charset interprets the
+ *   <li><p> When decoding, the {@code UTF-16} and {@code UTF-32} charsets interpret the
  *   byte-order mark at the beginning of the input stream to indicate the
  *   byte-order of the stream but defaults to big-endian if there is no
  *   byte-order mark; when encoding, it uses big-endian byte order and writes
diff --git a/src/java.base/share/classes/java/nio/charset/StandardCharsets.java b/src/java.base/share/classes/java/nio/charset/StandardCharsets.java
index 31bc454dbe6a4..c85a9f1605057 100644
--- a/src/java.base/share/classes/java/nio/charset/StandardCharsets.java
+++ b/src/java.base/share/classes/java/nio/charset/StandardCharsets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2023, 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
@@ -74,4 +74,23 @@ private StandardCharsets() {
      * optional byte-order mark.
      */
     public static final Charset UTF_16 = new sun.nio.cs.UTF_16();
+
+    /**
+     * Thirty-two-bit UCS Transformation Format, big-endian byte order.
+     * @since 22
+     */
+    public static final Charset UTF_32BE = new sun.nio.cs.UTF_32BE();
+
+    /**
+     * Thirty-two-bit UCS Transformation Format, little-endian byte order.
+     * @since 22
+     */
+    public static final Charset UTF_32LE = new sun.nio.cs.UTF_32LE();
+
+    /**
+     * Thirty-two-bit UCS Transformation Format, byte order identified by an
+     * optional byte-order mark.
+     * @since 22
+     */
+    public static final Charset UTF_32 = new sun.nio.cs.UTF_32();
 }
diff --git a/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template b/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template
index 339e01de39e6b..6db98fb4fa4fc 100644
--- a/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template
+++ b/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template
@@ -93,6 +93,9 @@ public class StandardCharsets extends CharsetProvider {
             map.put("utf-16", java.nio.charset.StandardCharsets.UTF_16);
             map.put("utf-16be", java.nio.charset.StandardCharsets.UTF_16BE);
             map.put("utf-16le", java.nio.charset.StandardCharsets.UTF_16LE);
+            map.put("utf-32", java.nio.charset.StandardCharsets.UTF_32);
+            map.put("utf-32be", java.nio.charset.StandardCharsets.UTF_32BE);
+            map.put("utf-32le", java.nio.charset.StandardCharsets.UTF_32LE);
             cache = map;
         }
         return map;
diff --git a/test/jdk/java/nio/charset/StandardCharsets/Standard.java b/test/jdk/java/nio/charset/StandardCharsets/Standard.java
index 44c4e86a4f6d1..69783bb5a6270 100644
--- a/test/jdk/java/nio/charset/StandardCharsets/Standard.java
+++ b/test/jdk/java/nio/charset/StandardCharsets/Standard.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2023, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4884238
+ * @bug 4884238 8310047
  * @summary Test standard charset name constants.
  * @author Mike Duigou
  * @run main Standard
@@ -41,7 +41,9 @@ public class Standard {
 
     private final static String standardCharsets[] = {
         "US-ASCII", "ISO-8859-1", "UTF-8",
-        "UTF-16BE", "UTF-16LE", "UTF-16" };
+        "UTF-16BE", "UTF-16LE", "UTF-16",
+        "UTF-32BE", "UTF-32LE", "UTF-32",
+    };
 
     public static void realMain(String[] args) {
         check(StandardCharsets.US_ASCII instanceof Charset);
@@ -50,6 +52,9 @@ public static void realMain(String[] args) {
         check(StandardCharsets.UTF_16BE instanceof Charset);
         check(StandardCharsets.UTF_16LE instanceof Charset);
         check(StandardCharsets.UTF_16 instanceof Charset);
+        check(StandardCharsets.UTF_32BE instanceof Charset);
+        check(StandardCharsets.UTF_32LE instanceof Charset);
+        check(StandardCharsets.UTF_32 instanceof Charset);
 
         check("US-ASCII".equals(StandardCharsets.US_ASCII.name()));
         check("ISO-8859-1".equals(StandardCharsets.ISO_8859_1.name()));
@@ -57,6 +62,9 @@ public static void realMain(String[] args) {
         check("UTF-16BE".equals(StandardCharsets.UTF_16BE.name()));
         check("UTF-16LE".equals(StandardCharsets.UTF_16LE.name()));
         check("UTF-16".equals(StandardCharsets.UTF_16.name()));
+        check("UTF-32BE".equals(StandardCharsets.UTF_32BE.name()));
+        check("UTF-32LE".equals(StandardCharsets.UTF_32LE.name()));
+        check("UTF-32".equals(StandardCharsets.UTF_32.name()));
 
         check(Charset.forName("US-ASCII") == StandardCharsets.US_ASCII);
         check(Charset.forName("ISO-8859-1") == StandardCharsets.ISO_8859_1);
@@ -64,6 +72,9 @@ public static void realMain(String[] args) {
         check(Charset.forName("UTF-16BE") == StandardCharsets.UTF_16BE);
         check(Charset.forName("UTF-16LE") == StandardCharsets.UTF_16LE);
         check(Charset.forName("UTF-16") == StandardCharsets.UTF_16);
+        check(Charset.forName("UTF-32BE") == StandardCharsets.UTF_32BE);
+        check(Charset.forName("UTF-32LE") == StandardCharsets.UTF_32LE);
+        check(Charset.forName("UTF-32") == StandardCharsets.UTF_32);
 
         Set<String> charsets = new HashSet<>();
         Field standardCharsetFields[] = StandardCharsets.class.getFields();

From a03a3a43bb16ddc7df78f64e07db823224bde6fb Mon Sep 17 00:00:00 2001
From: Swati Sharma <swati.sharma@intel.com>
Date: Tue, 11 Jul 2023 16:14:33 +0000
Subject: [PATCH 09/21] 8311178: JMH tests don't scale well when sharing output
 buffers

Co-authored-by: Vladimir Ivanov <vaivanov@openjdk.org>
Reviewed-by: ecaspole, sviswanathan, mli
---
 .../openjdk/bench/java/io/DataOutputStreamTest.java  |  2 +-
 .../org/openjdk/bench/java/lang/ArrayCopyObject.java |  2 +-
 .../org/openjdk/bench/java/lang/ArrayFiddle.java     |  2 +-
 .../java/time/format/DateTimeFormatterBench.java     |  2 +-
 .../jdk/incubator/vector/IndexInRangeBenchmark.java  |  2 +-
 .../jdk/incubator/vector/IndexVectorBenchmark.java   |  2 +-
 .../incubator/vector/MemorySegmentVectorAccess.java  |  2 +-
 .../jdk/incubator/vector/StoreMaskedBenchmark.java   |  2 +-
 .../incubator/vector/StoreMaskedIOOBEBenchmark.java  |  2 +-
 .../vector/VectorFPtoIntCastOperations.java          | 12 ++++++------
 .../org/openjdk/bench/vm/compiler/ArrayFill.java     |  2 +-
 .../org/openjdk/bench/vm/compiler/IndexVector.java   |  2 +-
 12 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/test/micro/org/openjdk/bench/java/io/DataOutputStreamTest.java b/test/micro/org/openjdk/bench/java/io/DataOutputStreamTest.java
index a654739e3da3d..a93ca7b1b3b1a 100644
--- a/test/micro/org/openjdk/bench/java/io/DataOutputStreamTest.java
+++ b/test/micro/org/openjdk/bench/java/io/DataOutputStreamTest.java
@@ -33,7 +33,7 @@
 @Fork(2)
 @Measurement(iterations = 6, time = 1)
 @Warmup(iterations=4, time = 2)
-@State(Scope.Benchmark)
+@State(Scope.Thread)
 public class DataOutputStreamTest {
 
     public enum BasicType {CHAR, SHORT, INT, STRING}
diff --git a/test/micro/org/openjdk/bench/java/lang/ArrayCopyObject.java b/test/micro/org/openjdk/bench/java/lang/ArrayCopyObject.java
index 3a31331127cfe..9b6ab1dd52557 100644
--- a/test/micro/org/openjdk/bench/java/lang/ArrayCopyObject.java
+++ b/test/micro/org/openjdk/bench/java/lang/ArrayCopyObject.java
@@ -61,7 +61,7 @@ public MyClass(int val) {
  }
 }
 
-@State(Scope.Benchmark)
+@State(Scope.Thread)
 @BenchmarkMode(Mode.Throughput)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 @Warmup(iterations = 10, time = 1)
diff --git a/test/micro/org/openjdk/bench/java/lang/ArrayFiddle.java b/test/micro/org/openjdk/bench/java/lang/ArrayFiddle.java
index b95fc2788c626..79a60ffd3886f 100644
--- a/test/micro/org/openjdk/bench/java/lang/ArrayFiddle.java
+++ b/test/micro/org/openjdk/bench/java/lang/ArrayFiddle.java
@@ -60,7 +60,7 @@
 @Measurement(iterations = 5, time = 2)
 @Fork(3)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@State(Scope.Benchmark)
+@State(Scope.Thread)
 public class ArrayFiddle {
     @Param("999")
     public int size;
diff --git a/test/micro/org/openjdk/bench/java/time/format/DateTimeFormatterBench.java b/test/micro/org/openjdk/bench/java/time/format/DateTimeFormatterBench.java
index f9418999a44ff..66485684524c6 100644
--- a/test/micro/org/openjdk/bench/java/time/format/DateTimeFormatterBench.java
+++ b/test/micro/org/openjdk/bench/java/time/format/DateTimeFormatterBench.java
@@ -53,7 +53,7 @@
 @Warmup(iterations = 5, time = 1)
 @Measurement(iterations = 5, time = 1)
 @Fork(3)
-@State(Scope.Benchmark)
+@State(Scope.Thread)
 public class DateTimeFormatterBench {
 
     private static final TimeZone TIME_ZONE = TimeZone.getTimeZone("UTC");
diff --git a/test/micro/org/openjdk/bench/jdk/incubator/vector/IndexInRangeBenchmark.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/IndexInRangeBenchmark.java
index da4842bc34a23..66a9b3fc522da 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/IndexInRangeBenchmark.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/IndexInRangeBenchmark.java
@@ -29,7 +29,7 @@
 
 @BenchmarkMode(Mode.Throughput)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
-@State(Scope.Benchmark)
+@State(Scope.Thread)
 @Warmup(iterations = 3, time = 1)
 @Measurement(iterations = 5, time = 1)
 @Fork(value = 1, jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
diff --git a/test/micro/org/openjdk/bench/jdk/incubator/vector/IndexVectorBenchmark.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/IndexVectorBenchmark.java
index 186e998bc65dd..120ae94bd06ca 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/IndexVectorBenchmark.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/IndexVectorBenchmark.java
@@ -29,7 +29,7 @@
 
 @BenchmarkMode(Mode.Throughput)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
-@State(Scope.Benchmark)
+@State(Scope.Thread)
 @Warmup(iterations = 3, time = 1)
 @Measurement(iterations = 5, time = 1)
 @Fork(value = 1, jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
diff --git a/test/micro/org/openjdk/bench/jdk/incubator/vector/MemorySegmentVectorAccess.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/MemorySegmentVectorAccess.java
index 65b2ccb5165a2..7ee14cbaee3f2 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/MemorySegmentVectorAccess.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/MemorySegmentVectorAccess.java
@@ -46,7 +46,7 @@
 @BenchmarkMode(Mode.AverageTime)
 @Warmup(iterations = 5, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
-@State(org.openjdk.jmh.annotations.Scope.Benchmark)
+@State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 @Fork(value = 1, jvmArgsAppend = {
     "--add-modules=jdk.incubator.vector",
diff --git a/test/micro/org/openjdk/bench/jdk/incubator/vector/StoreMaskedBenchmark.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/StoreMaskedBenchmark.java
index 9e7796994a356..e5c21527e4afc 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/StoreMaskedBenchmark.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/StoreMaskedBenchmark.java
@@ -29,7 +29,7 @@
 
 @BenchmarkMode(Mode.Throughput)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
-@State(Scope.Benchmark)
+@State(Scope.Thread)
 @Warmup(iterations = 3, time = 1)
 @Measurement(iterations = 5, time = 1)
 @Fork(value = 1, jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
diff --git a/test/micro/org/openjdk/bench/jdk/incubator/vector/StoreMaskedIOOBEBenchmark.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/StoreMaskedIOOBEBenchmark.java
index 1794e4f9a2425..1855338552e12 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/StoreMaskedIOOBEBenchmark.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/StoreMaskedIOOBEBenchmark.java
@@ -28,7 +28,7 @@
 
 @BenchmarkMode(Mode.Throughput)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
-@State(Scope.Benchmark)
+@State(Scope.Thread)
 @Warmup(iterations = 3, time = 1)
 @Measurement(iterations = 5, time = 1)
 @Fork(value = 1, jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
diff --git a/test/micro/org/openjdk/bench/jdk/incubator/vector/VectorFPtoIntCastOperations.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/VectorFPtoIntCastOperations.java
index 0318971ffef02..b66fc9646a05d 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/VectorFPtoIntCastOperations.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/VectorFPtoIntCastOperations.java
@@ -52,17 +52,17 @@ public class VectorFPtoIntCastOperations {
        -0.0
     };
 
-    static float [] float_arr;
+    private float [] float_arr;
 
-    static double [] double_arr;
+    private double [] double_arr;
 
-    static long [] long_res;
+    private long [] long_res;
 
-    static int [] int_res;
+    private int [] int_res;
 
-    static short [] short_res;
+    private short [] short_res;
 
-    static byte [] byte_res;
+    private byte [] byte_res;
 
     @Setup(Level.Trial)
     public void BmSetup() {
diff --git a/test/micro/org/openjdk/bench/vm/compiler/ArrayFill.java b/test/micro/org/openjdk/bench/vm/compiler/ArrayFill.java
index 08f0f65b3b897..c86894a6ee5d8 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/ArrayFill.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/ArrayFill.java
@@ -39,7 +39,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.Arrays;
 
-@State(Scope.Benchmark)
+@State(Scope.Thread)
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 @Warmup(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
diff --git a/test/micro/org/openjdk/bench/vm/compiler/IndexVector.java b/test/micro/org/openjdk/bench/vm/compiler/IndexVector.java
index 5b7a4b75a66e0..124dd38d6a801 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/IndexVector.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/IndexVector.java
@@ -28,7 +28,7 @@
 
 import org.openjdk.jmh.annotations.*;
 
-@State(Scope.Benchmark)
+@State(Scope.Thread)
 @Warmup(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
 @Fork(value = 3)

From e154b0d6cdde3071b2c43abd8aacc79c51914564 Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Tue, 11 Jul 2023 16:53:44 +0000
Subject: [PATCH 10/21] 8311606: Change read_icc_profile() to static function
 in java.desktop/share/native/libjavajpeg/imageioJPEG.c

Reviewed-by: serb
---
 src/java.desktop/share/native/libjavajpeg/imageioJPEG.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c b/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
index 6b1b9e4f99b2c..70b146401e3a0 100644
--- a/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
+++ b/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2023, 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
@@ -1291,7 +1291,7 @@ marker_is_icc (jpeg_saved_marker_ptr marker)
  * with an appropriate message.
  */
 
-jbyteArray
+static jbyteArray
 read_icc_profile (JNIEnv *env, j_decompress_ptr cinfo)
 {
     jpeg_saved_marker_ptr marker;

From 401c3dea5d8823bc9c0f40506ddad46e983ebf68 Mon Sep 17 00:00:00 2001
From: Jenny Shivayogi <kspeeyu@amazon.com>
Date: Tue, 11 Jul 2023 16:55:23 +0000
Subject: [PATCH 11/21] 8311645: Memory leak in jspawnhelper spawnChild after
 JDK-8307990

Reviewed-by: shade, simonis, alanb, rriggs
---
 src/java.base/unix/native/libjava/ProcessImpl_md.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/java.base/unix/native/libjava/ProcessImpl_md.c b/src/java.base/unix/native/libjava/ProcessImpl_md.c
index 04a1e5cf6b5ed..9ed0ed30959a6 100644
--- a/src/java.base/unix/native/libjava/ProcessImpl_md.c
+++ b/src/java.base/unix/native/libjava/ProcessImpl_md.c
@@ -562,6 +562,7 @@ spawnChild(JNIEnv *env, jobject process, ChildStuff *c, const char *helperpath)
 
     /* write the two structs and the data buffer */
     if (writeFully(c->childenv[1], (char *)&magic, sizeof(magic)) != sizeof(magic)) { // magic number first
+        free(buf);
         return -1;
     }
 #ifdef DEBUG
@@ -570,6 +571,7 @@ spawnChild(JNIEnv *env, jobject process, ChildStuff *c, const char *helperpath)
     if (writeFully(c->childenv[1], (char *)c, sizeof(*c)) != sizeof(*c) ||
         writeFully(c->childenv[1], (char *)&sp, sizeof(sp)) != sizeof(sp) ||
         writeFully(c->childenv[1], buf, bufsize) != bufsize) {
+        free(buf);
         return -1;
     }
     /* We're done. Let jspwanhelper know he can't expect any more data from us. */

From 6cb9ec32a68634f0b6f7461c9dc7ef0c0e59861d Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Tue, 11 Jul 2023 17:12:02 +0000
Subject: [PATCH 12/21] 6960866: [Fmt-Ch] ChoiceFormat claims impossible and
 unimplemented functionality

Reviewed-by: naoto
---
 src/java.base/share/classes/java/text/ChoiceFormat.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/java.base/share/classes/java/text/ChoiceFormat.java b/src/java.base/share/classes/java/text/ChoiceFormat.java
index 94fa85cf9173c..cf87f4452cfc2 100644
--- a/src/java.base/share/classes/java/text/ChoiceFormat.java
+++ b/src/java.base/share/classes/java/text/ChoiceFormat.java
@@ -343,10 +343,6 @@ public ChoiceFormat(double[] limits, String[] formats) {
      * If the limit array is not in ascending order, the results of formatting
      * will be incorrect.
      * @param formats are the formats you want to use for each limit.
-     * They can be either Format objects or Strings.
-     * When formatting with object Y,
-     * if the object is a NumberFormat, then ((NumberFormat) Y).format(X)
-     * is called. Otherwise Y.toString() is called.
      * @throws    NullPointerException if {@code limits} or
      *            {@code formats} is {@code null}
      */

From 15195e6018c104cbeca0f387ae18bff106792908 Mon Sep 17 00:00:00 2001
From: Alex Menkov <amenkov@openjdk.org>
Date: Tue, 11 Jul 2023 17:31:21 +0000
Subject: [PATCH 13/21] 8310066: Improve test coverage for JVMTI GetThreadState
 on carrier and mounted vthread

Reviewed-by: sspitsyn, cjplummer
---
 .../GetThreadStateMountedTest.java            | 331 ++++++++++++++++++
 .../libGetThreadStateMountedTest.cpp          | 212 +++++++++++
 2 files changed, 543 insertions(+)
 create mode 100644 test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadStateMountedTest/GetThreadStateMountedTest.java
 create mode 100644 test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadStateMountedTest/libGetThreadStateMountedTest.cpp

diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadStateMountedTest/GetThreadStateMountedTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadStateMountedTest/GetThreadStateMountedTest.java
new file mode 100644
index 0000000000000..4b61d0301c33b
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadStateMountedTest/GetThreadStateMountedTest.java
@@ -0,0 +1,331 @@
+/*
+ * Copyright (c) 2023, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8309612 8310584
+ * @summary The test verifies that JVMTI GetThreadState function reports expected state
+ *          for mounted (pinned) virtual thread and its carrier thread
+ * @requires vm.jvmti
+ * @requires vm.continuations
+ * @run main/othervm/native
+ *      -agentlib:GetThreadStateMountedTest
+ *      GetThreadStateMountedTest
+ */
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.locks.LockSupport;
+
+/**
+ * The test implements different scenarios to get desired JVMTI thread states.
+ * For each scenario the test also checks states after carrier and virtual threads suspend/resume
+ * and after virtual thread interrupt.
+ * Special handling is required for WAITING state scenarios:
+ * Spurious wakeups may cause unexpected thread state change and this causes test failure.
+ * To avoid this, the test thread should be suspended (i.e. carrier and/or mounted virtual thread is suspended).
+ */
+public class GetThreadStateMountedTest {
+
+    static final int JVMTI_THREAD_STATE_RUNNABLE                 = 0x0004;
+    static final int JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER = 0x0400;
+    static final int JVMTI_THREAD_STATE_WAITING                  = 0x0080;
+    static final int JVMTI_THREAD_STATE_WAITING_INDEFINITELY     = 0x0010;
+    static final int JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT     = 0x0020;
+    static final int JVMTI_THREAD_STATE_IN_OBJECT_WAIT           = 0x0100;
+    static final int JVMTI_THREAD_STATE_SLEEPING                 = 0x0040;
+    static final int JVMTI_THREAD_STATE_PARKED                   = 0x0200;
+    static final int JVMTI_THREAD_STATE_IN_NATIVE                = 0x400000;
+
+    static void runnable() throws Exception {
+        TestStatus status = new TestStatus("JVMTI_THREAD_STATE_RUNNABLE");
+        CountDownLatch ready = new CountDownLatch(1);
+        final boolean[] stopFlag = new boolean[1];
+        Thread vthread = createPinnedVThread(() -> {
+            ready.countDown();
+            int i = 0;
+            while (!stopFlag[0]) {
+                if (i < 200) {
+                    i++;
+                } else {
+                    i = 0;
+                }
+            }
+        });
+        vthread.start();
+        ready.await();
+        testThreadStates(vthread, false, true, JVMTI_THREAD_STATE_RUNNABLE);
+        stopFlag[0] = true;
+        status.print();
+    }
+
+    static void blockedOnMonitorEnter() throws Exception {
+        // JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER
+        // Thread is waiting to enter a synchronized block/method or,
+        // after an Object.wait(), waiting to re-enter a synchronized block/method.
+        TestStatus status = new TestStatus("JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER");
+        CountDownLatch ready = new CountDownLatch(1);
+        final Object syncObj = new Object();
+        Thread vthread = createPinnedVThread(() -> {
+            ready.countDown();
+            synchronized (syncObj) {
+            }
+        });
+        synchronized (syncObj) {
+            vthread.start();
+            ready.await();
+            Thread.sleep(500); // wait some time to ensure the thread is blocked on monitor
+            testThreadStates(vthread, false, true, JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER);
+        }
+        status.print();
+    }
+
+    static void waiting(boolean withTimeout) throws Exception {
+        // JVMTI_THREAD_STATE_WAITING
+        // Thread is waiting.
+        // JVMTI_THREAD_STATE_WAITING_INDEFINITELY
+        // Thread is waiting without a timeout. For example, Object.wait().
+        // JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT
+        // Thread is waiting with a maximum time to wait specified. For example, Object.wait(long).
+        TestStatus status = new TestStatus(withTimeout
+                                           ? "JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT"
+                                           : "JVMTI_THREAD_STATE_WAITING_INDEFINITELY");
+        CountDownLatch ready = new CountDownLatch(1);
+        // Test thread exits by InterruptedException,
+        // stopFlag is to handle spurious wakeups.
+        final boolean[] stopFlag = new boolean[1];
+        final Object syncObj = new Object();
+        Thread vthread = createPinnedVThread(() -> {
+            synchronized (syncObj) {
+                try {
+                    ready.countDown();
+                    while (!stopFlag[0]) {
+                        if (withTimeout) {
+                            syncObj.wait(60000);
+                        } else {
+                            syncObj.wait();
+                        }
+                    }
+                } catch (InterruptedException ex) {
+                    // expected after testThreadStates
+                }
+            }
+        });
+        vthread.start();
+        ready.await();
+
+        // Suspend test thread in "waiting" state.
+        suspendWaiting(vthread);
+
+        int expectedState = JVMTI_THREAD_STATE_WAITING
+                | JVMTI_THREAD_STATE_IN_OBJECT_WAIT
+                | (withTimeout
+                    ? JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT
+                    : JVMTI_THREAD_STATE_WAITING_INDEFINITELY);
+        testThreadStates(vthread, true,  true, expectedState);
+        // signal test thread to finish (for safety, Object.wait should throw InterruptedException)
+        synchronized (syncObj) {
+            stopFlag[0] = true;
+            syncObj.notifyAll();
+        }
+        status.print();
+    }
+
+    static void sleeping() throws Exception {
+        // JVMTI_THREAD_STATE_SLEEPING
+        // Thread is sleeping -- Thread.sleep.
+        // JVMTI_THREAD_STATE_PARKED
+        // A virtual thread that is sleeping, in Thread.sleep,
+        // may have this state flag set instead of JVMTI_THREAD_STATE_SLEEPING.
+        TestStatus status = new TestStatus("JVMTI_THREAD_STATE_SLEEPING");
+        CountDownLatch ready = new CountDownLatch(1);
+        // Test thread exits by InterruptedException,
+        // stopFlag is to handle spurious wakeups.
+        final boolean[] stopFlag = new boolean[1];
+        Thread vthread = createPinnedVThread(() -> {
+            ready.countDown();
+            try {
+                while (!stopFlag[0]) {
+                    Thread.sleep(60000);
+                }
+            } catch (InterruptedException ex) {
+                // expected, ignore
+            }
+        });
+        vthread.start();
+        ready.await();
+
+        // Suspend test thread in "waiting" state.
+        suspendWaiting(vthread);
+
+        // vthread is suspended, set stopFlag before testThreadStates
+        stopFlag[0] = true;
+
+        // don't test interrupt() - it causes thread state change for parked thread
+        // even if it's suspended
+        testThreadStates(vthread, true, false,
+                JVMTI_THREAD_STATE_WAITING | JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT,
+                JVMTI_THREAD_STATE_SLEEPING | JVMTI_THREAD_STATE_PARKED);
+        status.print();
+    }
+
+    static void parked() throws Exception {
+        // JVMTI_THREAD_STATE_PARKED
+        // Thread is parked, for example: LockSupport.park, LockSupport.parkUtil and LockSupport.parkNanos.
+        TestStatus status = new TestStatus("JVMTI_THREAD_STATE_PARKED");
+        CountDownLatch ready = new CountDownLatch(1);
+        final boolean[] stopFlag = new boolean[1];
+
+        Thread vthread = createPinnedVThread(() -> {
+            ready.countDown();
+            while (!stopFlag[0]) {
+                LockSupport.park(Thread.currentThread());
+            }
+        });
+        vthread.start();
+        ready.await();
+
+        // Suspend test thread in "waiting" state.
+        suspendWaiting(vthread);
+
+        // vthread is suspended, set stopFlag before testThreadStates
+        stopFlag[0] = true;
+
+        // don't test interrupt() - it causes thread state change for parked thread
+        // even if it's suspended
+        testThreadStates(vthread, true, false,
+                JVMTI_THREAD_STATE_WAITING | JVMTI_THREAD_STATE_WAITING_INDEFINITELY | JVMTI_THREAD_STATE_PARKED);
+        // allow test thread to finish
+        LockSupport.unpark(vthread);
+        status.print();
+    }
+
+    static void inNative() throws Exception {
+        TestStatus status = new TestStatus("JVMTI_THREAD_STATE_IN_NATIVE");
+        Thread vthread = createPinnedVThread(() -> {
+            waitInNative();
+        });
+        vthread.start();
+        while (!waitInNativeReady) {
+            Thread.sleep(50);
+        }
+        testThreadStates(vthread, false, true,
+                JVMTI_THREAD_STATE_RUNNABLE | JVMTI_THREAD_STATE_IN_NATIVE,
+                0);
+        endWait();
+        status.print();
+    }
+
+
+    public static void main(String[] args) throws Exception {
+        runnable();
+        /* "waiting" test cases fail due JDK-8310584
+        blockedOnMonitorEnter();
+        waiting(false);
+        waiting(true);
+        sleeping();
+        parked();
+        */
+        inNative();
+
+        int errCount = getErrorCount();
+        if (errCount > 0) {
+            throw new RuntimeException("Test failed, " + errCount + " errors");
+        }
+    }
+
+    private static Thread createPinnedVThread(Runnable runnable) {
+        final Object syncObj = new Object();
+        return Thread.ofVirtual().unstarted(() -> {
+            synchronized (syncObj) {
+                runnable.run();
+            }
+        });
+    }
+
+    // Native implementation of suspendWaiting.
+    // Returns false if the method is not able to reach the desired state in several tries.
+    private static native boolean trySuspendInWaitingState(Thread vthread);
+
+    // Suspends virtual thread and ensures it's suspended in "waiting" state
+    // (to handle possible spurious wakeups).
+    // throws an exception if the method is not able to reach the desired state in several tries.
+    private static void suspendWaiting(Thread vthread) {
+        boolean result = trySuspendInWaitingState(vthread);
+        if (!result) {
+            throw new RuntimeException("Failed to suspend thread in WAITING state");
+        }
+    }
+
+    // Tests thread states (vthread and the carrier thread).
+    // expectedStrong specifies value which must be present in vthreat state;
+    // expectedWeak is a combination of bits which may be set in vthreat state
+    // (at least one of the bit must set, but not all).
+    // Note: Last steps of the testing are interrupt/resume the virtual thread,
+    // so after the call vthread is interrupted.
+    private static native void testThread(Thread vthread, boolean isVThreadSuspended,
+                                          boolean testInterrupt,
+                                          int expectedStrong, int expectedWeak);
+    private static native int getErrorCount();
+    // To retry test case when spurious wakeup detected.
+    private static native int resetErrorCount(int count);
+
+    private static boolean waitInNativeReady = false;
+
+    // Sets waitInNativeReady static field to true
+    // and then waits until endWait() method is called.
+    private static native void waitInNative();
+    // Signals waitInNative() to exit.
+    private static native void endWait();
+
+    private static void testThreadStates(Thread vthread, boolean isVThreadSuspended,
+                                         boolean testInterrupt,
+                                         int expectedStrong, int expectedWeak) {
+        String name = vthread.toString();
+        log("Thread " + name);
+        testThread(vthread, isVThreadSuspended, testInterrupt, expectedStrong, expectedWeak);
+    }
+
+    private static void testThreadStates(Thread vthread, boolean isVThreadSuspended,
+                                         boolean testInterrupt, int expectedState) {
+        testThreadStates(vthread, isVThreadSuspended, testInterrupt, expectedState, 0);
+    }
+
+    // helper class to print status of each test
+    private static class TestStatus {
+        private final String name;
+        private final int startErrorCount;
+        TestStatus(String name) {
+            this.name = name;
+            startErrorCount = getErrorCount();
+            log(">>" + name);
+        }
+        void print() {
+            log("<<" + name + (startErrorCount == getErrorCount() ? " - OK" : " - FAILED"));
+            log("");
+        }
+    }
+
+    private static void log(Object s) {
+        System.out.println(s);
+    }
+}
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadStateMountedTest/libGetThreadStateMountedTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadStateMountedTest/libGetThreadStateMountedTest.cpp
new file mode 100644
index 0000000000000..4de5ebe1e8988
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadStateMountedTest/libGetThreadStateMountedTest.cpp
@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 2023, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <jni.h>
+#include <jvmti.h>
+#include <jvmti_common.h>
+#include <atomic>
+
+static jvmtiEnv *jvmti = nullptr;
+static jint error_count = 0;
+
+extern "C" JNIEXPORT jint JNICALL
+Agent_OnLoad(JavaVM *vm, char *options, void *reserved) {
+  if (vm->GetEnv((void **)&jvmti, JVMTI_VERSION) != JNI_OK) {
+    LOG("Could not initialize JVMTI\n");
+    return JNI_ERR;
+  }
+  jvmtiCapabilities caps;
+  memset(&caps, 0, sizeof(caps));
+  caps.can_support_virtual_threads = 1;
+  caps.can_suspend = 1;
+  caps.can_signal_thread = 1;
+  jvmtiError err = jvmti->AddCapabilities(&caps);
+  if (err != JVMTI_ERROR_NONE) {
+    LOG("JVMTI AddCapabilities error: %d\n", err);
+    return JNI_ERR;
+  }
+
+  return JNI_OK;
+}
+
+
+extern "C" JNIEXPORT jboolean JNICALL
+Java_GetThreadStateMountedTest_trySuspendInWaitingState(JNIEnv* jni, jclass clazz, jthread vthread) {
+  const int max_retries = 10;
+  for (int i = 0; i < max_retries; i++) {
+    // wait a bit
+    sleep_ms(100);
+
+    // suspend the thread
+    LOG("suspend vthread (%d)\n", i);
+    suspend_thread(jvmti, jni, vthread);
+
+    jint state = get_thread_state(jvmti, jni, vthread);
+    if ((state & JVMTI_THREAD_STATE_WAITING) != 0) {
+      LOG("suspended in WAITING state\n");
+      return JNI_TRUE;
+    }
+    LOG("suspended vthread is not waiting: state = %x (%s)\n", state, TranslateState(state));
+    LOG("resume vthread\n");
+    resume_thread(jvmti, jni, vthread);
+  }
+  LOG("ERROR: failed to suspend in WAITING state in %d tries\n", max_retries);
+  return JNI_FALSE;
+
+}
+
+static void verify_thread_state(const char *name, JNIEnv* jni,
+  jthread thread, jint expected_strong, jint expected_weak)
+{
+  jint state = get_thread_state(jvmti, jni, thread);
+  LOG("%s state(%x): %s\n", name, state, TranslateState(state));
+  bool failed = false;
+  // check 1: all expected_strong bits are set
+  jint actual_strong = state & expected_strong;
+  if (actual_strong != expected_strong) {
+    failed = true;
+    jint missed = expected_strong - actual_strong;
+    LOG("  ERROR: some mandatory bits are not set (%x): %s\n",
+        missed, TranslateState(missed));
+  }
+  // check 2: no bits other than (expected_strong | expected_weak) are set
+  jint actual_full = state & (expected_strong | expected_weak);
+  if (actual_full != state) {
+    failed = true;
+    jint unexpected = state - actual_full;
+    LOG("  ERROR: some unexpected bits are set (%x): %s\n",
+        unexpected, TranslateState(unexpected));
+  }
+  // check 3: expected_weak checks
+  if (expected_weak != 0) {
+    // check 3a: at least 1 bit from expected_weak is set
+    if ((state & expected_weak) == 0) {
+      failed = true;
+      LOG("  ERROR: no expected 'weak' bits are set\n");
+    }
+    // check 3b: not all expected_weak bits are set
+    if ((state & expected_weak) == expected_weak) {
+      failed = true;
+      LOG("  ERROR: all expected 'weak' bits are set\n");
+    }
+  }
+
+  if (failed) {
+    LOG("  expected 'strong' state (%x): %s\n", expected_strong, TranslateState(expected_strong));
+    LOG("  expected 'weak' state (%x): %s\n", expected_weak, TranslateState(expected_weak));
+    error_count++;
+  }
+}
+
+extern "C" JNIEXPORT void JNICALL
+Java_GetThreadStateMountedTest_testThread(
+  JNIEnv* jni, jclass clazz, jthread vthread, jboolean is_vthread_suspended,
+  jboolean test_interrupt,
+  jint expected_strong, jint expected_weak)
+{
+  jint exp_ct_state = JVMTI_THREAD_STATE_ALIVE
+                      | JVMTI_THREAD_STATE_WAITING
+                      | JVMTI_THREAD_STATE_WAITING_INDEFINITELY;
+  jint exp_vt_state = expected_strong
+                      | JVMTI_THREAD_STATE_ALIVE;
+
+  jthread cthread = get_carrier_thread(jvmti, jni, vthread);
+
+  verify_thread_state("cthread", jni, cthread,
+                      exp_ct_state, 0);
+  verify_thread_state("vthread", jni, vthread,
+                      exp_vt_state | (is_vthread_suspended ? JVMTI_THREAD_STATE_SUSPENDED : 0),
+                      expected_weak);
+
+  // suspend ctread and verify
+  LOG("suspend cthread\n");
+  suspend_thread(jvmti, jni, cthread);
+  verify_thread_state("cthread", jni, cthread,
+                      exp_ct_state | JVMTI_THREAD_STATE_SUSPENDED, 0);
+  verify_thread_state("vthread", jni, vthread,
+                      exp_vt_state | (is_vthread_suspended ? JVMTI_THREAD_STATE_SUSPENDED : 0),
+                      expected_weak);
+
+  // suspend vthread and verify
+  if (!is_vthread_suspended) {
+    LOG("suspend vthread\n");
+    suspend_thread(jvmti, jni, vthread);
+    verify_thread_state("cthread", jni, cthread,
+                        exp_ct_state | JVMTI_THREAD_STATE_SUSPENDED, 0);
+    verify_thread_state("vthread", jni, vthread,
+                        exp_vt_state | JVMTI_THREAD_STATE_SUSPENDED, expected_weak);
+  }
+
+  // resume cthread and verify
+  LOG("resume cthread\n");
+  resume_thread(jvmti, jni, cthread);
+  verify_thread_state("cthread", jni, cthread,
+                      exp_ct_state, 0);
+  verify_thread_state("vthread", jni, vthread,
+                      exp_vt_state | JVMTI_THREAD_STATE_SUSPENDED, expected_weak);
+
+  if (test_interrupt) {
+    // interrupt vthread (while it's suspended)
+    LOG("interrupt vthread\n");
+    check_jvmti_status(jni, jvmti->InterruptThread(vthread), "error in JVMTI InterruptThread");
+    verify_thread_state("cthread", jni, cthread,
+                        exp_ct_state, 0);
+    verify_thread_state("vthread", jni, vthread,
+                        exp_vt_state | JVMTI_THREAD_STATE_SUSPENDED | JVMTI_THREAD_STATE_INTERRUPTED,
+                        expected_weak);
+  }
+
+  // resume vthread
+  LOG("resume vthread\n");
+  resume_thread(jvmti, jni, vthread);
+
+  // don't verify thread state after InterruptThread and ResumeThread
+}
+
+extern "C" JNIEXPORT int JNICALL
+Java_GetThreadStateMountedTest_getErrorCount(JNIEnv* jni, jclass clazz) {
+  return error_count;
+}
+
+
+static std::atomic<bool> time_to_exit(false);
+
+extern "C" JNIEXPORT void JNICALL
+Java_GetThreadStateMountedTest_waitInNative(JNIEnv* jni, jclass clazz) {
+  // Notify main thread that we are ready
+  jfieldID fid = jni->GetStaticFieldID(clazz, "waitInNativeReady", "Z");
+  if (fid == nullptr) {
+    jni->FatalError("cannot get waitInNativeReady field");
+    return;
+  }
+  jni->SetStaticBooleanField(clazz, fid, JNI_TRUE);
+
+  while (!time_to_exit) {
+    sleep_ms(100);
+  }
+}
+
+extern "C" JNIEXPORT void JNICALL
+Java_GetThreadStateMountedTest_endWait(JNIEnv* jni, jclass clazz) {
+  time_to_exit = true;
+}

From aac903dbfb7dfb42464cad23aa9f1d536b55cfc1 Mon Sep 17 00:00:00 2001
From: Alexey Ivanov <aivanov@openjdk.org>
Date: Tue, 11 Jul 2023 19:41:42 +0000
Subject: [PATCH 14/21] 8311805: Clean up ScrollPane: drop redundant
 initialiser, mark scroller final

Reviewed-by: azvegint, serb, prr
---
 src/java.desktop/share/classes/java/awt/ScrollPane.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/java.desktop/share/classes/java/awt/ScrollPane.java b/src/java.desktop/share/classes/java/awt/ScrollPane.java
index 2b51bb671a348..b566db0561f10 100644
--- a/src/java.desktop/share/classes/java/awt/ScrollPane.java
+++ b/src/java.desktop/share/classes/java/awt/ScrollPane.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2023, 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
@@ -507,7 +507,6 @@ public void layout() {
         Component c = getComponent(0);
         Point p = getScrollPosition();
         Dimension cs = calculateChildSize();
-        Dimension vs = getViewportSize();
 
         c.reshape(- p.x, - p.y, cs.width, cs.height);
         ScrollPanePeer peer = (ScrollPanePeer)this.peer;
@@ -518,7 +517,7 @@ public void layout() {
         // update adjustables... the viewport size may have changed
         // with the scrollbars coming or going so the viewport size
         // is updated before the adjustables.
-        vs = getViewportSize();
+        Dimension vs = getViewportSize();
         hAdjustable.setSpan(0, cs.width, vs.width);
         vAdjustable.setSpan(0, cs.height, vs.height);
     }
@@ -776,7 +775,7 @@ public void adjustmentValueChanged(AdjustmentEvent e) {
             }
         }
 
-        private ScrollPane scroller;
+        private final ScrollPane scroller;
     }
 
 

From d82ade354570a930d8282684a8ffd368c613defc Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Tue, 11 Jul 2023 20:43:03 +0000
Subject: [PATCH 15/21] 8310683: Refactor StandardCharset/standard.java to use
 JUnit

Reviewed-by: naoto
---
 .../charset/StandardCharsets/Standard.java    | 188 ++++++++++--------
 1 file changed, 101 insertions(+), 87 deletions(-)

diff --git a/test/jdk/java/nio/charset/StandardCharsets/Standard.java b/test/jdk/java/nio/charset/StandardCharsets/Standard.java
index 69783bb5a6270..ffe1c98b7293b 100644
--- a/test/jdk/java/nio/charset/StandardCharsets/Standard.java
+++ b/test/jdk/java/nio/charset/StandardCharsets/Standard.java
@@ -24,112 +24,126 @@
 /*
  * @test
  * @bug 4884238 8310047
- * @summary Test standard charset name constants.
+ * @summary Test standard charset name constants and class qualities.
  * @author Mike Duigou
- * @run main Standard
+ * @run junit Standard
  */
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
-import java.io.*;
-import java.nio.charset.*;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class Standard {
 
-    private final static String standardCharsets[] = {
-        "US-ASCII", "ISO-8859-1", "UTF-8",
-        "UTF-16BE", "UTF-16LE", "UTF-16",
-        "UTF-32BE", "UTF-32LE", "UTF-32",
+    // These are the charsets StandardCharsets.java is expected to contain.
+    private static final String[] expectedCharsets = {
+            "US-ASCII", "ISO-8859-1", "UTF-8",
+            "UTF-16BE", "UTF-16LE", "UTF-16",
+            "UTF-32BE", "UTF-32LE", "UTF-32"
     };
 
-    public static void realMain(String[] args) {
-        check(StandardCharsets.US_ASCII instanceof Charset);
-        check(StandardCharsets.ISO_8859_1 instanceof Charset);
-        check(StandardCharsets.UTF_8 instanceof Charset);
-        check(StandardCharsets.UTF_16BE instanceof Charset);
-        check(StandardCharsets.UTF_16LE instanceof Charset);
-        check(StandardCharsets.UTF_16 instanceof Charset);
-        check(StandardCharsets.UTF_32BE instanceof Charset);
-        check(StandardCharsets.UTF_32LE instanceof Charset);
-        check(StandardCharsets.UTF_32 instanceof Charset);
+    private static final Field[] standardCharsetFields =
+            StandardCharsets.class.getFields();
 
-        check("US-ASCII".equals(StandardCharsets.US_ASCII.name()));
-        check("ISO-8859-1".equals(StandardCharsets.ISO_8859_1.name()));
-        check("UTF-8".equals(StandardCharsets.UTF_8.name()));
-        check("UTF-16BE".equals(StandardCharsets.UTF_16BE.name()));
-        check("UTF-16LE".equals(StandardCharsets.UTF_16LE.name()));
-        check("UTF-16".equals(StandardCharsets.UTF_16.name()));
-        check("UTF-32BE".equals(StandardCharsets.UTF_32BE.name()));
-        check("UTF-32LE".equals(StandardCharsets.UTF_32LE.name()));
-        check("UTF-32".equals(StandardCharsets.UTF_32.name()));
+    /**
+     * Validates that the Charset constants from the data provider
+     * are of type Charset.
+     */
+    @ParameterizedTest
+    @MethodSource("charsetProvider")
+    public void typeTest(Charset charset) {
+        // Doubly checked, as it is validated when passed as a param
+        assertTrue(charset instanceof Charset);
+    }
+
+    /**
+     * Validates that calling .name() on a Charset constant is equal
+     * to the matching String value from the data provider.
+     */
+    @ParameterizedTest
+    @MethodSource("charsetProvider")
+    public void nameMethodTest(Charset charset, String charString) {
+        assertEquals(charset.name(), charString);
+    }
 
-        check(Charset.forName("US-ASCII") == StandardCharsets.US_ASCII);
-        check(Charset.forName("ISO-8859-1") == StandardCharsets.ISO_8859_1);
-        check(Charset.forName("UTF-8") == StandardCharsets.UTF_8);
-        check(Charset.forName("UTF-16BE") == StandardCharsets.UTF_16BE);
-        check(Charset.forName("UTF-16LE") == StandardCharsets.UTF_16LE);
-        check(Charset.forName("UTF-16") == StandardCharsets.UTF_16);
-        check(Charset.forName("UTF-32BE") == StandardCharsets.UTF_32BE);
-        check(Charset.forName("UTF-32LE") == StandardCharsets.UTF_32LE);
-        check(Charset.forName("UTF-32") == StandardCharsets.UTF_32);
+    /**
+     * Validates that calling Charset.forName() on a String is equal
+     * to the matching Charset constant from the data provider.
+     */
+    @ParameterizedTest
+    @MethodSource("charsetProvider")
+    public void forNameMethodTest(Charset charset, String charString) {
+        assertEquals(Charset.forName(charString), charset);
+    }
 
-        Set<String> charsets = new HashSet<>();
-        Field standardCharsetFields[] = StandardCharsets.class.getFields();
+    /**
+     * Validates the qualities of a StandardCharsets field are as expected:
+     * The field is final, static, public, and one can access
+     * the underlying value of the field.
+     */
+    @ParameterizedTest
+    @MethodSource("charsetFields")
+    public void charsetModifiersTest(Field charsetField) throws IllegalAccessException {
+        // Check modifiers
+        assertEquals(StandardCharsets.class, charsetField.getDeclaringClass());
+        assertTrue(Modifier.isFinal(charsetField.getModifiers()));
+        assertTrue(Modifier.isStatic(charsetField.getModifiers()));
+        assertTrue(Modifier.isPublic(charsetField.getModifiers()));
+        // Check that the value can be accessed, and it is a Charset
+        Object valueOfField = charsetField.get(null);
+        assertTrue(valueOfField instanceof Charset);
+    }
 
-        for(Field charsetField : standardCharsetFields) {
-            check(StandardCharsets.class == charsetField.getDeclaringClass());
-            check(Modifier.isFinal(charsetField.getModifiers()));
-            check(Modifier.isStatic(charsetField.getModifiers()));
-            check(Modifier.isPublic(charsetField.getModifiers()));
-            Object value;
+    /**
+     * Validates that the Charsets contained in StandardCharsets are equal
+     * to the expected Charsets list defined in the test. This test should fail if
+     * either the actual or expected (standard) Charsets are modified, and
+     * the others are not.
+     */
+    @Test
+    public void correctCharsetsTest() {
+        // Grab the value from each Standard Charset field
+        List<String> actualCharsets = charsetFields().map(field -> {
             try {
-                value = charsetField.get(null);
-            } catch(IllegalAccessException failure) {
-                unexpected(failure);
-                continue;
+                return ((Charset) field.get(null)).name();
+            } catch (IllegalAccessException e) {
+                throw new RuntimeException("Can not test correctCharsetsTest() due to %s", e);
             }
-            check(value instanceof Charset);
-            charsets.add(((Charset)value).name());
-        }
-
-        check(charsets.containsAll(Arrays.asList(standardCharsets)));
-        charsets.removeAll(Arrays.asList(standardCharsets));
-        check(charsets.isEmpty());
+        }).toList();
+        assertEquals(actualCharsets, Arrays.asList(expectedCharsets));
     }
 
-    //--------------------- Infrastructure ---------------------------
-    static volatile int passed = 0, failed = 0;
-    static void pass() { passed++; }
-    static void fail() { failed++; Thread.dumpStack(); }
-    static void fail(String msg) { System.out.println(msg); fail(); }
-    static void unexpected(Throwable t) { failed++; t.printStackTrace(); }
-    static void check(boolean cond) { if (cond) pass(); else fail(); }
-    static void equal(Object x, Object y) {
-        if (x == null ? y == null : x.equals(y)) pass();
-        else {System.out.println(x + " not equal to " + y); fail();}}
-    static void equal2(Object x, Object y) {equal(x, y); equal(y, x);}
-    public static void main(String[] args) throws Throwable {
-        try { realMain(args); } catch (Throwable t) { unexpected(t); }
-
-        System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
-        if (failed > 0) throw new Exception("Some tests failed");
+    /**
+     * Provides the constant Charset and associated String value of
+     * the standard charsets.
+     */
+    private static Stream<Arguments> charsetProvider() {
+        return Stream.of(
+                Arguments.of(StandardCharsets.US_ASCII, "US-ASCII"),
+                Arguments.of(StandardCharsets.ISO_8859_1, "ISO-8859-1"),
+                Arguments.of(StandardCharsets.UTF_8, "UTF-8"),
+                Arguments.of(StandardCharsets.UTF_16BE, "UTF-16BE"),
+                Arguments.of(StandardCharsets.UTF_16LE, "UTF-16LE"),
+                Arguments.of(StandardCharsets.UTF_16, "UTF-16"),
+                Arguments.of(StandardCharsets.UTF_32BE, "UTF-32BE"),
+                Arguments.of(StandardCharsets.UTF_32LE, "UTF-32LE"),
+                Arguments.of(StandardCharsets.UTF_32, "UTF-32")
+        );
     }
-    static byte[] serializedForm(Object obj) {
-        try {
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            new ObjectOutputStream(baos).writeObject(obj);
-            return baos.toByteArray();
-        } catch (IOException e) { throw new Error(e); }}
-    static Object readObject(byte[] bytes)
-        throws IOException, ClassNotFoundException {
-        InputStream is = new ByteArrayInputStream(bytes);
-        return new ObjectInputStream(is).readObject();}
-    @SuppressWarnings("unchecked")
-    static <T> T serialClone(T obj) {
-        try { return (T) readObject(serializedForm(obj)); }
-        catch (Exception e) { throw new Error(e); }}
 
+    private static Stream<Field> charsetFields() {
+        return Arrays.stream(standardCharsetFields);
+    }
 }

From fd7fddb6ed24e0ae4b5e18fb27fd80230941dc0b Mon Sep 17 00:00:00 2001
From: Rajan Halade <rhalade@openjdk.org>
Date: Tue, 11 Jul 2023 23:53:40 +0000
Subject: [PATCH 16/21] 8295894: Remove SECOM certificate that is expiring in
 September 2023

Reviewed-by: xuelei, mullan
---
 .../share/data/cacerts/secomscrootca1         | 27 -------------------
 .../security/lib/cacerts/VerifyCACerts.java   |  8 +++---
 2 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 src/java.base/share/data/cacerts/secomscrootca1

diff --git a/src/java.base/share/data/cacerts/secomscrootca1 b/src/java.base/share/data/cacerts/secomscrootca1
deleted file mode 100644
index d300e31195d34..0000000000000
--- a/src/java.base/share/data/cacerts/secomscrootca1
+++ /dev/null
@@ -1,27 +0,0 @@
-Owner: OU=Security Communication RootCA1, O=SECOM Trust.net, C=JP
-Issuer: OU=Security Communication RootCA1, O=SECOM Trust.net, C=JP
-Serial number: 0
-Valid from: Tue Sep 30 04:20:49 GMT 2003 until: Sat Sep 30 04:20:49 GMT 2023
-Signature algorithm name: SHA1withRSA
-Subject Public Key Algorithm: 2048-bit RSA key
-Version: 3
------BEGIN CERTIFICATE-----
-MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEY
-MBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21t
-dW5pY2F0aW9uIFJvb3RDQTEwHhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5
-WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYD
-VQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw8yl8
-9f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJ
-DKaVv0uMDPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9
-Ms+k2Y7CI9eNqPPYJayX5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/N
-QV3Is00qVUarH9oe4kA92819uZKAnDfdDJZkndwi92SL32HeFZRSFaB9UslLqCHJ
-xrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2JChzAgMBAAGjPzA9MB0G
-A1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYwDwYDVR0T
-AQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vG
-kl3g0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfr
-Uj94nK9NrvjVT8+amCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5
-Bw+SUEmK3TGXX8npN6o7WWWXlDLJs58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJU
-JRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ6rBK+1YWc26sTfcioU+tHXot
-RSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAiFL39vmwLAw==
------END CERTIFICATE-----
diff --git a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
index c6f8da366daf5..752b5bd443f2c 100644
--- a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
+++ b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
@@ -28,7 +28,7 @@
  *      8209452 8209506 8210432 8195793 8216577 8222089 8222133 8222137 8222136
  *      8223499 8225392 8232019 8234245 8233223 8225068 8225069 8243321 8243320
  *      8243559 8225072 8258630 8259312 8256421 8225081 8225082 8225083 8245654
- *      8305975 8304760 8307134
+ *      8305975 8304760 8307134 8295894
  * @summary Check root CA entries in cacerts file
  */
 import java.io.ByteArrayInputStream;
@@ -47,12 +47,12 @@ public class VerifyCACerts {
             + File.separator + "security" + File.separator + "cacerts";
 
     // The numbers of certs now.
-    private static final int COUNT = 97;
+    private static final int COUNT = 96;
 
     // SHA-256 of cacerts, can be generated with
     // shasum -a 256 cacerts | sed -e 's/../&:/g' | tr '[:lower:]' '[:upper:]' | cut -c1-95
     private static final String CHECKSUM
-            = "72:03:89:C2:7B:BF:87:87:E1:65:44:6E:43:5C:65:FF:B5:E8:F9:4C:8A:D1:63:6D:D1:91:4C:AD:1C:9A:CB:3B";
+            = "88:D6:74:27:42:58:D3:C7:40:B2:D7:24:93:4B:09:2D:6C:C1:EB:6A:6D:6A:AD:3D:72:D0:DF:8D:B7:59:99:8E";
 
     // Hex formatter to upper case with ":" delimiter
     private static final HexFormat HEX = HexFormat.ofDelimiter(":").withUpperCase();
@@ -161,8 +161,6 @@ public class VerifyCACerts {
                     "18:F1:FC:7F:20:5D:F8:AD:DD:EB:7F:E0:07:DD:57:E3:AF:37:5A:9C:4D:8D:73:54:6B:F4:F1:FE:D1:E1:8D:35");
             put("quovadisrootca3g3 [jdk]",
                     "88:EF:81:DE:20:2E:B0:18:45:2E:43:F8:64:72:5C:EA:5F:BD:1F:C2:D9:D2:05:73:07:09:C5:D8:B8:69:0F:46");
-            put("secomscrootca1 [jdk]",
-                    "E7:5E:72:ED:9F:56:0E:EC:6E:B4:80:00:73:A4:3F:C3:AD:19:19:5A:39:22:82:01:78:95:97:4A:99:02:6B:6C");
             put("secomscrootca2 [jdk]",
                     "51:3B:2C:EC:B8:10:D4:CD:E5:DD:85:39:1A:DF:C6:C2:DD:60:D8:7B:B7:36:D2:B5:21:48:4A:A4:7A:0E:BE:F6");
             put("swisssigngoldg2ca [jdk]",

From 0b0e064e36082200ace384c92eae02d3f7baa7ba Mon Sep 17 00:00:00 2001
From: Chad Rakoczy <chadrako@amazon.com>
Date: Wed, 12 Jul 2023 07:29:52 +0000
Subject: [PATCH 17/21] 8311656: Shenandoah: Unused
 ShenandoahSATBAndRemarkThreadsClosure::_claim_token

Reviewed-by: ysr, shade
---
 src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
index 1fde1944cac62..6e70996323675 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
@@ -73,7 +73,6 @@ class ShenandoahSATBAndRemarkThreadsClosure : public ThreadClosure {
 private:
   SATBMarkQueueSet& _satb_qset;
   OopClosure* const _cl;
-  uintx _claim_token;
 
 public:
   ShenandoahSATBAndRemarkThreadsClosure(SATBMarkQueueSet& satb_qset, OopClosure* cl) :

From 753bd563ecca6bb5ff9b5ebc0957bc1854dce78d Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Wed, 12 Jul 2023 09:06:53 +0000
Subject: [PATCH 18/21] 8311870: Split CompressedKlassPointers from
 compressedOops.hpp

Reviewed-by: iklam, rkennke
---
 .../aarch64/jvmciCodeInstaller_aarch64.cpp    |   1 +
 .../cpu/aarch64/macroAssembler_aarch64.cpp    |   1 +
 .../cpu/aarch64/macroAssembler_aarch64.hpp    |   1 +
 src/hotspot/cpu/ppc/macroAssembler_ppc.cpp    |   2 +
 .../cpu/riscv/jvmciCodeInstaller_riscv.cpp    |   1 +
 .../cpu/riscv/macroAssembler_riscv.cpp        |   1 +
 src/hotspot/cpu/s390/macroAssembler_s390.cpp  |   1 +
 .../cpu/x86/jvmciCodeInstaller_x86.cpp        |   1 +
 src/hotspot/cpu/x86/macroAssembler_x86.cpp    |   1 +
 src/hotspot/cpu/x86/relocInfo_x86.cpp         |   1 +
 src/hotspot/share/cds/archiveBuilder.cpp      |   1 +
 src/hotspot/share/cds/metaspaceShared.cpp     |   2 +-
 src/hotspot/share/gc/x/xDebug.gdb             |   2 +-
 src/hotspot/share/gc/z/zDebug.gdb             |   2 +-
 .../types/traceid/jfrTraceIdKlassQueue.cpp    |   2 +-
 .../share/jvmci/jvmciCodeInstaller.cpp        |   2 +-
 src/hotspot/share/memory/metaspace.cpp        |   1 +
 .../memory/metaspace/metaspaceCommon.hpp      |   1 +
 src/hotspot/share/memory/virtualspace.cpp     |   1 +
 src/hotspot/share/oops/compressedKlass.cpp    | 131 ++++++++++++++++++
 src/hotspot/share/oops/compressedKlass.hpp    | 102 ++++++++++++++
 .../share/oops/compressedKlass.inline.hpp     |  81 +++++++++++
 src/hotspot/share/oops/compressedOops.cpp     | 105 --------------
 src/hotspot/share/oops/compressedOops.hpp     |  58 +-------
 .../share/oops/compressedOops.inline.hpp      |  46 ------
 src/hotspot/share/oops/oop.cpp                |   1 +
 src/hotspot/share/oops/oop.hpp                |   1 +
 src/hotspot/share/oops/oop.inline.hpp         |   2 +-
 src/hotspot/share/oops/oopsHierarchy.hpp      |   3 -
 src/hotspot/share/opto/matcher.hpp            |   1 +
 src/hotspot/share/runtime/arguments.cpp       |   1 +
 src/hotspot/share/runtime/os.cpp              |   2 +-
 src/hotspot/share/runtime/vmStructs.cpp       |   4 +-
 .../share/utilities/globalDefinitions.hpp     |  10 --
 .../hotspot/oops/CompressedKlassPointers.java |   4 +-
 35 files changed, 345 insertions(+), 232 deletions(-)
 create mode 100644 src/hotspot/share/oops/compressedKlass.cpp
 create mode 100644 src/hotspot/share/oops/compressedKlass.hpp
 create mode 100644 src/hotspot/share/oops/compressedKlass.inline.hpp

diff --git a/src/hotspot/cpu/aarch64/jvmciCodeInstaller_aarch64.cpp b/src/hotspot/cpu/aarch64/jvmciCodeInstaller_aarch64.cpp
index 82f5f994c52b2..fdfab3ab5623b 100644
--- a/src/hotspot/cpu/aarch64/jvmciCodeInstaller_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/jvmciCodeInstaller_aarch64.cpp
@@ -28,6 +28,7 @@
 #include "jvmci/jvmciRuntime.hpp"
 #include "jvmci/jvmciCompilerToVM.hpp"
 #include "jvmci/jvmciJavaClasses.hpp"
+#include "oops/compressedKlass.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/jniHandles.hpp"
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index ffe8698b9b589..e3df32ed60247 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -45,6 +45,7 @@
 #include "memory/universe.hpp"
 #include "nativeInst_aarch64.hpp"
 #include "oops/accessDecorators.hpp"
+#include "oops/compressedKlass.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/klass.inline.hpp"
 #include "runtime/continuation.hpp"
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
index 6b45be8ce43ad..ada0891a5ded9 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
@@ -30,6 +30,7 @@
 #include "code/vmreg.hpp"
 #include "metaprogramming/enableIf.hpp"
 #include "oops/compressedOops.hpp"
+#include "oops/compressedKlass.hpp"
 #include "runtime/vm_version.hpp"
 #include "utilities/powerOfTwo.hpp"
 
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
index 686f2c9d48e9c..4e7d5cde8a5ee 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
@@ -32,6 +32,8 @@
 #include "interpreter/interpreter.hpp"
 #include "memory/resourceArea.hpp"
 #include "nativeInst_ppc.hpp"
+#include "oops/compressedKlass.inline.hpp"
+#include "oops/compressedOops.inline.hpp"
 #include "oops/klass.inline.hpp"
 #include "oops/methodData.hpp"
 #include "prims/methodHandles.hpp"
diff --git a/src/hotspot/cpu/riscv/jvmciCodeInstaller_riscv.cpp b/src/hotspot/cpu/riscv/jvmciCodeInstaller_riscv.cpp
index 6b0fc486f892a..a7160bd724128 100644
--- a/src/hotspot/cpu/riscv/jvmciCodeInstaller_riscv.cpp
+++ b/src/hotspot/cpu/riscv/jvmciCodeInstaller_riscv.cpp
@@ -29,6 +29,7 @@
 #include "jvmci/jvmciRuntime.hpp"
 #include "jvmci/jvmciCompilerToVM.hpp"
 #include "jvmci/jvmciJavaClasses.hpp"
+#include "oops/compressedKlass.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/jniHandles.hpp"
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index da2b9236c9b6e..e0a216ab4a7a5 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -39,6 +39,7 @@
 #include "memory/universe.hpp"
 #include "nativeInst_riscv.hpp"
 #include "oops/accessDecorators.hpp"
+#include "oops/compressedKlass.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/klass.inline.hpp"
 #include "oops/oop.hpp"
diff --git a/src/hotspot/cpu/s390/macroAssembler_s390.cpp b/src/hotspot/cpu/s390/macroAssembler_s390.cpp
index 8055510e6c3f9..08dc39cd41e33 100644
--- a/src/hotspot/cpu/s390/macroAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.cpp
@@ -35,6 +35,7 @@
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/accessDecorators.hpp"
+#include "oops/compressedKlass.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/klass.inline.hpp"
 #include "prims/methodHandles.hpp"
diff --git a/src/hotspot/cpu/x86/jvmciCodeInstaller_x86.cpp b/src/hotspot/cpu/x86/jvmciCodeInstaller_x86.cpp
index 1404617e8e712..09056b374ad29 100644
--- a/src/hotspot/cpu/x86/jvmciCodeInstaller_x86.cpp
+++ b/src/hotspot/cpu/x86/jvmciCodeInstaller_x86.cpp
@@ -23,6 +23,7 @@
 
 #include "precompiled.hpp"
 #include "compiler/disassembler.hpp"
+#include "oops/compressedKlass.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/javaCalls.hpp"
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
index 4d45d3de290a0..6aec03e8db050 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
@@ -38,6 +38,7 @@
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/accessDecorators.hpp"
+#include "oops/compressedKlass.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/klass.inline.hpp"
 #include "prims/methodHandles.hpp"
diff --git a/src/hotspot/cpu/x86/relocInfo_x86.cpp b/src/hotspot/cpu/x86/relocInfo_x86.cpp
index 2d20137e84f5a..8a6da79442155 100644
--- a/src/hotspot/cpu/x86/relocInfo_x86.cpp
+++ b/src/hotspot/cpu/x86/relocInfo_x86.cpp
@@ -27,6 +27,7 @@
 #include "code/relocInfo.hpp"
 #include "memory/universe.hpp"
 #include "nativeInst_x86.hpp"
+#include "oops/compressedKlass.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/klass.inline.hpp"
 #include "oops/oop.inline.hpp"
diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index 65dd5921c824b..636a955ba74e7 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -41,6 +41,7 @@
 #include "memory/allStatic.hpp"
 #include "memory/memRegion.hpp"
 #include "memory/resourceArea.hpp"
+#include "oops/compressedKlass.inline.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "oops/objArrayOop.inline.hpp"
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index b32db56644aab..b87ef1e447c56 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -61,7 +61,7 @@
 #include "memory/metaspaceClosure.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
-#include "oops/compressedOops.inline.hpp"
+#include "oops/compressedKlass.hpp"
 #include "oops/instanceMirrorKlass.hpp"
 #include "oops/klass.inline.hpp"
 #include "oops/objArrayOop.hpp"
diff --git a/src/hotspot/share/gc/x/xDebug.gdb b/src/hotspot/share/gc/x/xDebug.gdb
index d8f79d589c841..2dbf578b07bc3 100644
--- a/src/hotspot/share/gc/x/xDebug.gdb
+++ b/src/hotspot/share/gc/x/xDebug.gdb
@@ -51,7 +51,7 @@ define zpo
     printf "\t Page: %llu\n", ((uintptr_t)$obj & XAddressOffsetMask) >> XGranuleSizeShift
     x/16gx $obj
     if (UseCompressedClassPointers)
-        set $klass = (Klass*)(void*)((uintptr_t)CompressedKlassPointers::_narrow_klass._base +((uintptr_t)$obj->_metadata->_compressed_klass << CompressedKlassPointers::_narrow_klass._shift))
+        set $klass = (Klass*)(void*)((uintptr_t)CompressedKlassPointers::_base +((uintptr_t)$obj->_metadata->_compressed_klass << CompressedKlassPointers::_shift))
     else
         set $klass = $obj->_metadata->_klass
     end
diff --git a/src/hotspot/share/gc/z/zDebug.gdb b/src/hotspot/share/gc/z/zDebug.gdb
index 181da66b9c924..d502eea7ce340 100644
--- a/src/hotspot/share/gc/z/zDebug.gdb
+++ b/src/hotspot/share/gc/z/zDebug.gdb
@@ -51,7 +51,7 @@ define zpo
     printf "\t Page: %llu\n", ((uintptr_t)$obj & ZAddressOffsetMask) >> ZGranuleSizeShift
     x/16gx $obj
     if (UseCompressedClassPointers)
-        set $klass = (Klass*)(void*)((uintptr_t)CompressedKlassPointers::_narrow_klass._base +((uintptr_t)$obj->_metadata->_compressed_klass << CompressedKlassPointers::_narrow_klass._shift))
+        set $klass = (Klass*)(void*)((uintptr_t)CompressedKlassPointers::_base +((uintptr_t)$obj->_metadata->_compressed_klass << CompressedKlassPointers::_shift))
     else
         set $klass = $obj->_metadata->_klass
     end
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdKlassQueue.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdKlassQueue.cpp
index c76048218e162..a341d31b0d644 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdKlassQueue.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdKlassQueue.cpp
@@ -31,7 +31,7 @@
 #include "jfr/utilities/jfrEpochQueue.inline.hpp"
 #include "jfr/utilities/jfrTypes.hpp"
 #include "memory/metaspace.hpp"
-#include "oops/compressedOops.hpp"
+#include "oops/compressedKlass.inline.hpp"
 #include "utilities/macros.hpp"
 
 #ifdef VM_LITTLE_ENDIAN
diff --git a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
index fab377076c77a..dd8badcecdc93 100644
--- a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
+++ b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
@@ -32,7 +32,7 @@
 #include "jvmci/jvmciCompilerToVM.hpp"
 #include "jvmci/jvmciRuntime.hpp"
 #include "memory/universe.hpp"
-#include "oops/compressedOops.inline.hpp"
+#include "oops/compressedKlass.inline.hpp"
 #include "oops/klass.inline.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "prims/methodHandles.hpp"
diff --git a/src/hotspot/share/memory/metaspace.cpp b/src/hotspot/share/memory/metaspace.cpp
index 10524082f193f..3f4b9d0ea0834 100644
--- a/src/hotspot/share/memory/metaspace.cpp
+++ b/src/hotspot/share/memory/metaspace.cpp
@@ -47,6 +47,7 @@
 #include "memory/metaspaceUtils.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
+#include "oops/compressedKlass.inline.hpp"
 #include "oops/compressedOops.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "runtime/atomic.hpp"
diff --git a/src/hotspot/share/memory/metaspace/metaspaceCommon.hpp b/src/hotspot/share/memory/metaspace/metaspaceCommon.hpp
index e2c85e97a4cd5..a13ef1b325156 100644
--- a/src/hotspot/share/memory/metaspace/metaspaceCommon.hpp
+++ b/src/hotspot/share/memory/metaspace/metaspaceCommon.hpp
@@ -26,6 +26,7 @@
 #ifndef SHARE_MEMORY_METASPACE_METASPACECOMMON_HPP
 #define SHARE_MEMORY_METASPACE_METASPACECOMMON_HPP
 
+#include "oops/compressedKlass.hpp"
 #include "runtime/globals.hpp"
 #include "utilities/align.hpp"
 #include "utilities/debug.hpp"
diff --git a/src/hotspot/share/memory/virtualspace.cpp b/src/hotspot/share/memory/virtualspace.cpp
index ae898bec3af94..dbbf5a3dd5fd5 100644
--- a/src/hotspot/share/memory/virtualspace.cpp
+++ b/src/hotspot/share/memory/virtualspace.cpp
@@ -26,6 +26,7 @@
 #include "logging/log.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/virtualspace.hpp"
+#include "oops/compressedKlass.hpp"
 #include "oops/compressedOops.hpp"
 #include "oops/markWord.hpp"
 #include "oops/oop.inline.hpp"
diff --git a/src/hotspot/share/oops/compressedKlass.cpp b/src/hotspot/share/oops/compressedKlass.cpp
new file mode 100644
index 0000000000000..3821e967af9b8
--- /dev/null
+++ b/src/hotspot/share/oops/compressedKlass.cpp
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2019, 2023, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "oops/compressedKlass.hpp"
+#include "runtime/globals.hpp"
+#include "utilities/debug.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/ostream.hpp"
+
+address CompressedKlassPointers::_base = nullptr;
+int CompressedKlassPointers::_shift = 0;
+size_t CompressedKlassPointers::_range = 0;
+
+#ifdef _LP64
+
+// Given a klass range [addr, addr+len) and a given encoding scheme, assert that this scheme covers the range, then
+// set this encoding scheme. Used by CDS at runtime to re-instate the scheme used to pre-compute klass ids for
+// archived heap objects.
+void CompressedKlassPointers::initialize_for_given_encoding(address addr, size_t len, address requested_base, int requested_shift) {
+  assert(is_valid_base(requested_base), "Address must be a valid encoding base");
+  address const end = addr + len;
+
+  const int narrow_klasspointer_bits = sizeof(narrowKlass) * 8;
+  const size_t encoding_range_size = nth_bit(narrow_klasspointer_bits + requested_shift);
+  address encoding_range_end = requested_base + encoding_range_size;
+
+  // Note: it would be technically valid for the encoding base to precede the start of the Klass range. But we only call
+  // this function from CDS, and therefore know this to be true.
+  assert(requested_base == addr, "Invalid requested base");
+  assert(encoding_range_end >= end, "Encoding does not cover the full Klass range");
+
+  set_base(requested_base);
+  set_shift(requested_shift);
+  set_range(encoding_range_size);
+}
+
+// Given an address range [addr, addr+len) which the encoding is supposed to
+//  cover, choose base, shift and range.
+//  The address range is the expected range of uncompressed Klass pointers we
+//  will encounter (and the implicit promise that there will be no Klass
+//  structures outside this range).
+void CompressedKlassPointers::initialize(address addr, size_t len) {
+  assert(is_valid_base(addr), "Address must be a valid encoding base");
+  address const end = addr + len;
+
+  address base;
+  int shift;
+  size_t range;
+
+  // Attempt to run with encoding base == zero
+  if (end <= (address)KlassEncodingMetaspaceMax) {
+    base = 0;
+  } else {
+    base = addr;
+  }
+
+  // Highest offset a Klass* can ever have in relation to base.
+  range = end - base;
+
+  // We may not even need a shift if the range fits into 32bit:
+  const uint64_t UnscaledClassSpaceMax = (uint64_t(max_juint) + 1);
+  if (range < UnscaledClassSpaceMax) {
+    shift = 0;
+  } else {
+    shift = LogKlassAlignmentInBytes;
+  }
+
+  set_base(base);
+  set_shift(shift);
+  set_range(range);
+}
+
+// Given an address p, return true if p can be used as an encoding base.
+//  (Some platforms have restrictions of what constitutes a valid base address).
+bool CompressedKlassPointers::is_valid_base(address p) {
+#ifdef AARCH64
+  // Below 32G, base must be aligned to 4G.
+  // Above that point, base must be aligned to 32G
+  if (p < (address)(32 * G)) {
+    return is_aligned(p, 4 * G);
+  }
+  return is_aligned(p, (4 << LogKlassAlignmentInBytes) * G);
+#else
+  return true;
+#endif
+}
+
+void CompressedKlassPointers::print_mode(outputStream* st) {
+  st->print_cr("Narrow klass base: " PTR_FORMAT ", Narrow klass shift: %d, "
+               "Narrow klass range: " SIZE_FORMAT_X, p2i(base()), shift(),
+               range());
+}
+
+void CompressedKlassPointers::set_base(address base) {
+  assert(UseCompressedClassPointers, "no compressed klass ptrs?");
+  _base   = base;
+}
+
+void CompressedKlassPointers::set_shift(int shift)       {
+  assert(shift == 0 || shift == LogKlassAlignmentInBytes, "invalid shift for klass ptrs");
+  _shift   = shift;
+}
+
+void CompressedKlassPointers::set_range(size_t range) {
+  assert(UseCompressedClassPointers, "no compressed klass ptrs?");
+  _range = range;
+}
+
+#endif // _LP64
diff --git a/src/hotspot/share/oops/compressedKlass.hpp b/src/hotspot/share/oops/compressedKlass.hpp
new file mode 100644
index 0000000000000..e4a2550a5996b
--- /dev/null
+++ b/src/hotspot/share/oops/compressedKlass.hpp
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2019, 2023, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_OOPS_COMPRESSEDKLASS_HPP
+#define SHARE_OOPS_COMPRESSEDKLASS_HPP
+
+#include "memory/allStatic.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+class outputStream;
+class Klass;
+
+// If compressed klass pointers then use narrowKlass.
+typedef juint  narrowKlass;
+
+const int LogKlassAlignmentInBytes = 3;
+const int KlassAlignmentInBytes    = 1 << LogKlassAlignmentInBytes;
+
+// Maximal size of compressed class space. Above this limit compression is not possible.
+// Also upper bound for placement of zero based class space. (Class space is further limited
+// to be < 3G, see arguments.cpp.)
+const  uint64_t KlassEncodingMetaspaceMax = (uint64_t(max_juint) + 1) << LogKlassAlignmentInBytes;
+
+// For UseCompressedClassPointers.
+class CompressedKlassPointers : public AllStatic {
+  friend class VMStructs;
+
+  static address _base;
+  static int _shift;
+
+  // Together with base, this defines the address range within which Klass
+  //  structures will be located: [base, base+range). While the maximal
+  //  possible encoding range is 4|32G for shift 0|3, if we know beforehand
+  //  the expected range of Klass* pointers will be smaller, a platform
+  //  could use this info to optimize encoding.
+  static size_t _range;
+
+  static void set_base(address base);
+  static void set_range(size_t range);
+  static void set_shift(int shift);
+
+public:
+
+  // Given an address p, return true if p can be used as an encoding base.
+  //  (Some platforms have restrictions of what constitutes a valid base
+  //   address).
+  static bool is_valid_base(address p);
+
+  // Given a klass range [addr, addr+len) and a given encoding scheme, assert that this scheme covers the range, then
+  // set this encoding scheme. Used by CDS at runtime to re-instate the scheme used to pre-compute klass ids for
+  // archived heap objects.
+  static void initialize_for_given_encoding(address addr, size_t len, address requested_base, int requested_shift);
+
+  // Given an address range [addr, addr+len) which the encoding is supposed to
+  //  cover, choose base, shift and range.
+  //  The address range is the expected range of uncompressed Klass pointers we
+  //  will encounter (and the implicit promise that there will be no Klass
+  //  structures outside this range).
+  static void initialize(address addr, size_t len);
+
+  static void     print_mode(outputStream* st);
+
+  static address  base()               { return  _base; }
+  static size_t   range()              { return  _range; }
+  static int      shift()              { return  _shift; }
+
+  static bool is_null(Klass* v)      { return v == nullptr; }
+  static bool is_null(narrowKlass v) { return v == 0; }
+
+  static inline Klass* decode_raw(narrowKlass v, address base, int shift);
+  static inline Klass* decode_raw(narrowKlass v);
+  static inline Klass* decode_not_null(narrowKlass v);
+  static inline Klass* decode_not_null(narrowKlass v, address base, int shift);
+  static inline Klass* decode(narrowKlass v);
+  static inline narrowKlass encode_not_null(Klass* v);
+  static inline narrowKlass encode_not_null(Klass* v, address base, int shift);
+  static inline narrowKlass encode(Klass* v);
+
+};
+
+#endif // SHARE_OOPS_COMPRESSEDKLASS_HPP
diff --git a/src/hotspot/share/oops/compressedKlass.inline.hpp b/src/hotspot/share/oops/compressedKlass.inline.hpp
new file mode 100644
index 0000000000000..134e9fec8630f
--- /dev/null
+++ b/src/hotspot/share/oops/compressedKlass.inline.hpp
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2017, 2023, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_OOPS_COMPRESSEDKLASS_INLINE_HPP
+#define SHARE_OOPS_COMPRESSEDKLASS_INLINE_HPP
+
+#include "oops/compressedKlass.hpp"
+
+#include "memory/universe.hpp"
+#include "oops/oop.hpp"
+#include "utilities/align.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+static inline bool check_alignment(Klass* v) {
+  return (intptr_t)v % KlassAlignmentInBytes == 0;
+}
+
+inline Klass* CompressedKlassPointers::decode_raw(narrowKlass v) {
+  return decode_raw(v, base(), shift());
+}
+
+inline Klass* CompressedKlassPointers::decode_raw(narrowKlass v, address narrow_base, int shift) {
+  return (Klass*)((uintptr_t)narrow_base +((uintptr_t)v << shift));
+}
+
+inline Klass* CompressedKlassPointers::decode_not_null(narrowKlass v) {
+  return decode_not_null(v, base(), shift());
+}
+
+inline Klass* CompressedKlassPointers::decode_not_null(narrowKlass v, address narrow_base, int shift) {
+  assert(!is_null(v), "narrow klass value can never be zero");
+  Klass* result = decode_raw(v, narrow_base, shift);
+  assert(check_alignment(result), "address not aligned: " PTR_FORMAT, p2i(result));
+  return result;
+}
+
+inline Klass* CompressedKlassPointers::decode(narrowKlass v) {
+  return is_null(v) ? nullptr : decode_not_null(v);
+}
+
+inline narrowKlass CompressedKlassPointers::encode_not_null(Klass* v) {
+  return encode_not_null(v, base(), shift());
+}
+
+inline narrowKlass CompressedKlassPointers::encode_not_null(Klass* v, address narrow_base, int shift) {
+  assert(!is_null(v), "klass value can never be zero");
+  assert(check_alignment(v), "Address not aligned");
+  uint64_t pd = (uint64_t)(pointer_delta(v, narrow_base, 1));
+  assert(KlassEncodingMetaspaceMax > pd, "change encoding max if new encoding");
+  uint64_t result = pd >> shift;
+  assert((result & CONST64(0xffffffff00000000)) == 0, "narrow klass pointer overflow");
+  assert(decode_not_null((narrowKlass)result, narrow_base, shift) == v, "reversibility");
+  return (narrowKlass)result;
+}
+
+inline narrowKlass CompressedKlassPointers::encode(Klass* v) {
+  return is_null(v) ? (narrowKlass)0 : encode_not_null(v);
+}
+
+#endif // SHARE_OOPS_COMPRESSEDKLASS_INLINE_HPP
diff --git a/src/hotspot/share/oops/compressedOops.cpp b/src/hotspot/share/oops/compressedOops.cpp
index 3ee5e431c4ded..08f78b1d7734c 100644
--- a/src/hotspot/share/oops/compressedOops.cpp
+++ b/src/hotspot/share/oops/compressedOops.cpp
@@ -177,108 +177,3 @@ void CompressedOops::print_mode(outputStream* st) {
   }
   st->cr();
 }
-
-// For UseCompressedClassPointers.
-NarrowPtrStruct CompressedKlassPointers::_narrow_klass = { nullptr, 0, true };
-
-// CompressedClassSpaceSize set to 1GB, but appear 3GB away from _narrow_ptrs_base during CDS dump.
-// (Todo: we should #ifdef out CompressedKlassPointers for 32bit completely and fix all call sites which
-//  are compiled for 32bit to LP64_ONLY).
-size_t CompressedKlassPointers::_range = 0;
-
-#ifdef _LP64
-
-// Given a klass range [addr, addr+len) and a given encoding scheme, assert that this scheme covers the range, then
-// set this encoding scheme. Used by CDS at runtime to re-instate the scheme used to pre-compute klass ids for
-// archived heap objects.
-void CompressedKlassPointers::initialize_for_given_encoding(address addr, size_t len, address requested_base, int requested_shift) {
-  assert(is_valid_base(requested_base), "Address must be a valid encoding base");
-  address const end = addr + len;
-
-  const int narrow_klasspointer_bits = sizeof(narrowKlass) * 8;
-  const size_t encoding_range_size = nth_bit(narrow_klasspointer_bits + requested_shift);
-  address encoding_range_end = requested_base + encoding_range_size;
-
-  // Note: it would be technically valid for the encoding base to precede the start of the Klass range. But we only call
-  // this function from CDS, and therefore know this to be true.
-  assert(requested_base == addr, "Invalid requested base");
-  assert(encoding_range_end >= end, "Encoding does not cover the full Klass range");
-
-  set_base(requested_base);
-  set_shift(requested_shift);
-  set_range(encoding_range_size);
-}
-
-// Given an address range [addr, addr+len) which the encoding is supposed to
-//  cover, choose base, shift and range.
-//  The address range is the expected range of uncompressed Klass pointers we
-//  will encounter (and the implicit promise that there will be no Klass
-//  structures outside this range).
-void CompressedKlassPointers::initialize(address addr, size_t len) {
-  assert(is_valid_base(addr), "Address must be a valid encoding base");
-  address const end = addr + len;
-
-  address base;
-  int shift;
-  size_t range;
-
-  // Attempt to run with encoding base == zero
-  if (end <= (address)KlassEncodingMetaspaceMax) {
-    base = 0;
-  } else {
-    base = addr;
-  }
-
-  // Highest offset a Klass* can ever have in relation to base.
-  range = end - base;
-
-  // We may not even need a shift if the range fits into 32bit:
-  const uint64_t UnscaledClassSpaceMax = (uint64_t(max_juint) + 1);
-  if (range < UnscaledClassSpaceMax) {
-    shift = 0;
-  } else {
-    shift = LogKlassAlignmentInBytes;
-  }
-
-  set_base(base);
-  set_shift(shift);
-  set_range(range);
-}
-
-// Given an address p, return true if p can be used as an encoding base.
-//  (Some platforms have restrictions of what constitutes a valid base address).
-bool CompressedKlassPointers::is_valid_base(address p) {
-#ifdef AARCH64
-  // Below 32G, base must be aligned to 4G.
-  // Above that point, base must be aligned to 32G
-  if (p < (address)(32 * G)) {
-    return is_aligned(p, 4 * G);
-  }
-  return is_aligned(p, (4 << LogKlassAlignmentInBytes) * G);
-#else
-  return true;
-#endif
-}
-
-void CompressedKlassPointers::print_mode(outputStream* st) {
-  st->print_cr("Narrow klass base: " PTR_FORMAT ", Narrow klass shift: %d, "
-               "Narrow klass range: " SIZE_FORMAT_X, p2i(base()), shift(),
-               range());
-}
-
-void CompressedKlassPointers::set_base(address base) {
-  assert(UseCompressedClassPointers, "no compressed klass ptrs?");
-  _narrow_klass._base   = base;
-}
-
-void CompressedKlassPointers::set_shift(int shift)       {
-  assert(shift == 0 || shift == LogKlassAlignmentInBytes, "invalid shift for klass ptrs");
-  _narrow_klass._shift   = shift;
-}
-
-void CompressedKlassPointers::set_range(size_t range) {
-  assert(UseCompressedClassPointers, "no compressed klass ptrs?");
-  _range = range;
-}
-
-#endif // _LP64
diff --git a/src/hotspot/share/oops/compressedOops.hpp b/src/hotspot/share/oops/compressedOops.hpp
index 28bb6982abf7a..cd3f00393ca44 100644
--- a/src/hotspot/share/oops/compressedOops.hpp
+++ b/src/hotspot/share/oops/compressedOops.hpp
@@ -40,7 +40,7 @@ struct NarrowPtrStruct {
   address _base;
   // Number of shift bits for encoding/decoding narrow ptrs.
   // 0 if using wide ptrs or zero based unscaled narrow ptrs,
-  // LogMinObjAlignmentInBytes/LogKlassAlignmentInBytes otherwise.
+  // LogMinObjAlignmentInBytes otherwise.
   int     _shift;
   // Generate code with implicit null checks for narrow ptrs.
   bool    _use_implicit_null_checks;
@@ -140,60 +140,4 @@ class CompressedOops : public AllStatic {
   static inline narrowOop narrow_oop_cast(T i);
 };
 
-// For UseCompressedClassPointers.
-class CompressedKlassPointers : public AllStatic {
-  friend class VMStructs;
-
-  static NarrowPtrStruct _narrow_klass;
-
-  // Together with base, this defines the address range within which Klass
-  //  structures will be located: [base, base+range). While the maximal
-  //  possible encoding range is 4|32G for shift 0|3, if we know beforehand
-  //  the expected range of Klass* pointers will be smaller, a platform
-  //  could use this info to optimize encoding.
-  static size_t _range;
-
-  static void set_base(address base);
-  static void set_range(size_t range);
-  static void set_shift(int shift);
-
-public:
-
-  // Given an address p, return true if p can be used as an encoding base.
-  //  (Some platforms have restrictions of what constitutes a valid base
-  //   address).
-  static bool is_valid_base(address p);
-
-  // Given a klass range [addr, addr+len) and a given encoding scheme, assert that this scheme covers the range, then
-  // set this encoding scheme. Used by CDS at runtime to re-instate the scheme used to pre-compute klass ids for
-  // archived heap objects.
-  static void initialize_for_given_encoding(address addr, size_t len, address requested_base, int requested_shift);
-
-  // Given an address range [addr, addr+len) which the encoding is supposed to
-  //  cover, choose base, shift and range.
-  //  The address range is the expected range of uncompressed Klass pointers we
-  //  will encounter (and the implicit promise that there will be no Klass
-  //  structures outside this range).
-  static void initialize(address addr, size_t len);
-
-  static void     print_mode(outputStream* st);
-
-  static address  base()               { return  _narrow_klass._base; }
-  static size_t   range()              { return  _range; }
-  static int      shift()              { return  _narrow_klass._shift; }
-
-  static bool is_null(Klass* v)      { return v == nullptr; }
-  static bool is_null(narrowKlass v) { return v == 0; }
-
-  static inline Klass* decode_raw(narrowKlass v, address base, int shift);
-  static inline Klass* decode_raw(narrowKlass v);
-  static inline Klass* decode_not_null(narrowKlass v);
-  static inline Klass* decode_not_null(narrowKlass v, address base, int shift);
-  static inline Klass* decode(narrowKlass v);
-  static inline narrowKlass encode_not_null(Klass* v);
-  static inline narrowKlass encode_not_null(Klass* v, address base, int shift);
-  static inline narrowKlass encode(Klass* v);
-
-};
-
 #endif // SHARE_OOPS_COMPRESSEDOOPS_HPP
diff --git a/src/hotspot/share/oops/compressedOops.inline.hpp b/src/hotspot/share/oops/compressedOops.inline.hpp
index eb662530b50b3..191c376686cf6 100644
--- a/src/hotspot/share/oops/compressedOops.inline.hpp
+++ b/src/hotspot/share/oops/compressedOops.inline.hpp
@@ -118,50 +118,4 @@ inline narrowOop CompressedOops::narrow_oop_cast(T i) {
   return static_cast<narrowOop>(narrow_value);
 }
 
-static inline bool check_alignment(Klass* v) {
-  return (intptr_t)v % KlassAlignmentInBytes == 0;
-}
-
-inline Klass* CompressedKlassPointers::decode_raw(narrowKlass v) {
-  return decode_raw(v, base(), shift());
-}
-
-inline Klass* CompressedKlassPointers::decode_raw(narrowKlass v, address narrow_base, int shift) {
-  return (Klass*)((uintptr_t)narrow_base +((uintptr_t)v << shift));
-}
-
-inline Klass* CompressedKlassPointers::decode_not_null(narrowKlass v) {
-  return decode_not_null(v, base(), shift());
-}
-
-inline Klass* CompressedKlassPointers::decode_not_null(narrowKlass v, address narrow_base, int shift) {
-  assert(!is_null(v), "narrow klass value can never be zero");
-  Klass* result = decode_raw(v, narrow_base, shift);
-  assert(check_alignment(result), "address not aligned: " PTR_FORMAT, p2i(result));
-  return result;
-}
-
-inline Klass* CompressedKlassPointers::decode(narrowKlass v) {
-  return is_null(v) ? nullptr : decode_not_null(v);
-}
-
-inline narrowKlass CompressedKlassPointers::encode_not_null(Klass* v) {
-  return encode_not_null(v, base(), shift());
-}
-
-inline narrowKlass CompressedKlassPointers::encode_not_null(Klass* v, address narrow_base, int shift) {
-  assert(!is_null(v), "klass value can never be zero");
-  assert(check_alignment(v), "Address not aligned");
-  uint64_t pd = (uint64_t)(pointer_delta(v, narrow_base, 1));
-  assert(KlassEncodingMetaspaceMax > pd, "change encoding max if new encoding");
-  uint64_t result = pd >> shift;
-  assert((result & CONST64(0xffffffff00000000)) == 0, "narrow klass pointer overflow");
-  assert(decode_not_null((narrowKlass)result, narrow_base, shift) == v, "reversibility");
-  return (narrowKlass)result;
-}
-
-inline narrowKlass CompressedKlassPointers::encode(Klass* v) {
-  return is_null(v) ? (narrowKlass)0 : encode_not_null(v);
-}
-
 #endif // SHARE_OOPS_COMPRESSEDOOPS_INLINE_HPP
diff --git a/src/hotspot/share/oops/oop.cpp b/src/hotspot/share/oops/oop.cpp
index a0b3de5364948..c2c78ce581ed4 100644
--- a/src/hotspot/share/oops/oop.cpp
+++ b/src/hotspot/share/oops/oop.cpp
@@ -30,6 +30,7 @@
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
+#include "oops/compressedKlass.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/verifyOopClosure.hpp"
diff --git a/src/hotspot/share/oops/oop.hpp b/src/hotspot/share/oops/oop.hpp
index 933847fe3773b..50d8b6041b674 100644
--- a/src/hotspot/share/oops/oop.hpp
+++ b/src/hotspot/share/oops/oop.hpp
@@ -27,6 +27,7 @@
 
 #include "memory/iterator.hpp"
 #include "memory/memRegion.hpp"
+#include "oops/compressedKlass.hpp"
 #include "oops/accessDecorators.hpp"
 #include "oops/markWord.hpp"
 #include "oops/metadata.hpp"
diff --git a/src/hotspot/share/oops/oop.inline.hpp b/src/hotspot/share/oops/oop.inline.hpp
index a0477ce376ebb..a9b88e32651d8 100644
--- a/src/hotspot/share/oops/oop.inline.hpp
+++ b/src/hotspot/share/oops/oop.inline.hpp
@@ -32,7 +32,7 @@
 #include "oops/access.inline.hpp"
 #include "oops/arrayKlass.hpp"
 #include "oops/arrayOop.hpp"
-#include "oops/compressedOops.inline.hpp"
+#include "oops/compressedKlass.inline.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/markWord.hpp"
 #include "oops/oopsHierarchy.hpp"
diff --git a/src/hotspot/share/oops/oopsHierarchy.hpp b/src/hotspot/share/oops/oopsHierarchy.hpp
index 060c1b97d1018..b01153da46d54 100644
--- a/src/hotspot/share/oops/oopsHierarchy.hpp
+++ b/src/hotspot/share/oops/oopsHierarchy.hpp
@@ -37,9 +37,6 @@
 // Global offset instead of address for an oop within a java object.
 enum class narrowOop : uint32_t { null = 0 };
 
-// If compressed klass pointers then use narrowKlass.
-typedef juint  narrowKlass;
-
 typedef void* OopOrNarrowOopStar;
 
 #ifndef CHECK_UNHANDLED_OOPS
diff --git a/src/hotspot/share/opto/matcher.hpp b/src/hotspot/share/opto/matcher.hpp
index d7cff3d3f43d5..bac09c8e4114f 100644
--- a/src/hotspot/share/opto/matcher.hpp
+++ b/src/hotspot/share/opto/matcher.hpp
@@ -27,6 +27,7 @@
 
 #include "libadt/vectset.hpp"
 #include "memory/resourceArea.hpp"
+#include "oops/compressedKlass.hpp"
 #include "oops/compressedOops.hpp"
 #include "opto/node.hpp"
 #include "opto/phaseX.hpp"
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 83df87bbb137c..bbf912f00809d 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -41,6 +41,7 @@
 #include "logging/logStream.hpp"
 #include "logging/logTag.hpp"
 #include "memory/allocation.inline.hpp"
+#include "oops/compressedKlass.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/jvmtiAgentList.hpp"
diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index fe9772982a85f..89511362dc10c 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -39,7 +39,7 @@
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
-#include "oops/compressedOops.inline.hpp"
+#include "oops/compressedKlass.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/jvmtiAgent.hpp"
 #include "prims/jvm_misc.hpp"
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index 537f063a2b13d..dd7ed0e8a4247 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -379,8 +379,8 @@
   /* CompressedKlassPointers */                                                                                                      \
   /***************************/                                                                                                      \
                                                                                                                                      \
-     static_field(CompressedKlassPointers,     _narrow_klass._base,                           address)                               \
-     static_field(CompressedKlassPointers,     _narrow_klass._shift,                          int)                                   \
+     static_field(CompressedKlassPointers,     _base,                                         address)                               \
+     static_field(CompressedKlassPointers,     _shift,                                        int)                                   \
                                                                                                                                      \
   /**********/                                                                                                                       \
   /* Memory */                                                                                                                       \
diff --git a/src/hotspot/share/utilities/globalDefinitions.hpp b/src/hotspot/share/utilities/globalDefinitions.hpp
index 6cb00d338ff00..a1547e7ed4301 100644
--- a/src/hotspot/share/utilities/globalDefinitions.hpp
+++ b/src/hotspot/share/utilities/globalDefinitions.hpp
@@ -584,11 +584,6 @@ extern int MinObjAlignmentInBytesMask;
 extern int LogMinObjAlignment;
 extern int LogMinObjAlignmentInBytes;
 
-const int LogKlassAlignmentInBytes = 3;
-const int LogKlassAlignment        = LogKlassAlignmentInBytes - LogHeapWordSize;
-const int KlassAlignmentInBytes    = 1 << LogKlassAlignmentInBytes;
-const int KlassAlignment           = KlassAlignmentInBytes / HeapWordSize;
-
 // Maximal size of heap where unscaled compression can be used. Also upper bound
 // for heap placement: 4GB.
 const  uint64_t UnscaledOopHeapMax = (uint64_t(max_juint) + 1);
@@ -596,11 +591,6 @@ const  uint64_t UnscaledOopHeapMax = (uint64_t(max_juint) + 1);
 // placement for zero based compression algorithm: UnscaledOopHeapMax << LogMinObjAlignmentInBytes.
 extern uint64_t OopEncodingHeapMax;
 
-// Maximal size of compressed class space. Above this limit compression is not possible.
-// Also upper bound for placement of zero based class space. (Class space is further limited
-// to be < 3G, see arguments.cpp.)
-const  uint64_t KlassEncodingMetaspaceMax = (uint64_t(max_juint) + 1) << LogKlassAlignmentInBytes;
-
 // Machine dependent stuff
 
 // The maximum size of the code cache.  Can be overridden by targets.
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CompressedKlassPointers.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CompressedKlassPointers.java
index b8c0ead9e4528..ac397aea4e28f 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CompressedKlassPointers.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/CompressedKlassPointers.java
@@ -58,8 +58,8 @@ private static boolean typeExists(TypeDataBase db, String type) {
   private static synchronized void initialize(TypeDataBase db) {
     Type type = db.lookupType("CompressedKlassPointers");
 
-    baseField = type.getAddressField("_narrow_klass._base");
-    shiftField = type.getCIntegerField("_narrow_klass._shift");
+    baseField = type.getAddressField("_base");
+    shiftField = type.getCIntegerField("_shift");
   }
 
   public CompressedKlassPointers() {

From aa7367f1ecc5da15591963e56e1435aa7b830f79 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Wed, 12 Jul 2023 10:39:28 +0000
Subject: [PATCH 19/21] 8311921: Inform about MaxExpectedDataSegmentSize in
 case of pthread_create failures on AIX

Reviewed-by: jbechberger, stuefe
---
 src/hotspot/os/aix/os_aix.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index 91a9bbcff7137..fef735ca10137 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -828,7 +828,8 @@ bool os::create_thread(Thread* thread, ThreadType thr_type,
     log_warning(os, thread)("Failed to start thread \"%s\" - pthread_create failed (%d=%s) for attributes: %s.",
                             thread->name(), ret, os::errno_name(ret), os::Posix::describe_pthread_attr(buf, sizeof(buf), &attr));
     // Log some OS information which might explain why creating the thread failed.
-    log_info(os, thread)("Number of threads approx. running in the VM: %d", Threads::number_of_threads());
+    log_warning(os, thread)("Number of threads approx. running in the VM: %d", Threads::number_of_threads());
+    log_warning(os, thread)("Checking JVM parameter MaxExpectedDataSegmentSize (currently " SIZE_FORMAT "k)  might be helpful", MaxExpectedDataSegmentSize/K);
     LogStream st(Log(os, thread)::info());
     os::Posix::print_rlimit_info(&st);
     os::print_memory_info(&st);

From 7304316a8c55a4c0f2a96d1b99ba9e97e49ed7f4 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Wed, 12 Jul 2023 15:44:41 +0000
Subject: [PATCH 20/21] 8311926: java/lang/ScopedValue/StressStackOverflow.java
 takes 9mins in tier1

Reviewed-by: jpai
---
 test/jdk/ProblemList-Virtual.txt              |  4 +++-
 .../lang/ScopedValue/StressStackOverflow.java | 21 ++++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/test/jdk/ProblemList-Virtual.txt b/test/jdk/ProblemList-Virtual.txt
index c427fdee79acc..6d4ff89855116 100644
--- a/test/jdk/ProblemList-Virtual.txt
+++ b/test/jdk/ProblemList-Virtual.txt
@@ -44,7 +44,9 @@ javax/management/remote/mandatory/loading/RMIDownloadTest.java 8308366 windows-x
 
 java/lang/instrument/NativeMethodPrefixAgent.java 8307169 generic-all
 
-java/lang/ScopedValue/StressStackOverflow.java#default 8309646 linux-all
+java/lang/ScopedValue/StressStackOverflow.java#default 8309646 generic-all
+java/lang/ScopedValue/StressStackOverflow.java#no-TieredCompilation 8309646 generic-all
+java/lang/ScopedValue/StressStackOverflow.java#TieredStopAtLevel1 8309646 generic-all
 
 javax/management/remote/mandatory/connection/DeadLockTest.java 8309069 windows-x64
 
diff --git a/test/jdk/java/lang/ScopedValue/StressStackOverflow.java b/test/jdk/java/lang/ScopedValue/StressStackOverflow.java
index 0c2f9c4e08eed..a1254c7fef792 100644
--- a/test/jdk/java/lang/ScopedValue/StressStackOverflow.java
+++ b/test/jdk/java/lang/ScopedValue/StressStackOverflow.java
@@ -23,11 +23,21 @@
 
 /*
  * @test id=default
- * @summary StressStackOverflow the recovery path for ScopedValue
+ * @summary Stress ScopedValue stack overflow recovery path
+ * @enablePreview
+ * @run main/othervm/timeout=300 StressStackOverflow
+ */
+
+/*
+ * @test id=no-TieredCompilation
  * @enablePreview
  * @run main/othervm/timeout=300 -XX:-TieredCompilation StressStackOverflow
+ */
+
+/*
+ * @test id=TieredStopAtLevel1
+ * @enablePreview
  * @run main/othervm/timeout=300 -XX:TieredStopAtLevel=1 StressStackOverflow
- * @run main/othervm/timeout=300 StressStackOverflow
  */
 
 /*
@@ -37,6 +47,7 @@
  * @run main/othervm/timeout=300 -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations StressStackOverflow
  */
 
+import java.time.Duration;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.StructureViolationException;
@@ -55,7 +66,7 @@ static class TestFailureException extends RuntimeException {
         TestFailureException(String s) { super(s); }
     }
 
-    static final long MINUTES = 60 * 1_000_000_000L; // 60 * 10**9 ns
+    static final long DURATION_IN_NANOS = Duration.ofMinutes(2).toNanos();
 
     // Test the ScopedValue recovery mechanism for stack overflows. We implement both Callable
     // and Runnable interfaces. Which one gets tested depends on the constructor argument.
@@ -78,7 +89,7 @@ public DeepRecursion(Behaviour behaviour) {
         public void run() {
             final var last = el.get();
             while (ITERS-- > 0) {
-                if (System.nanoTime() - startTime > 3 * MINUTES) { // 3 minutes is long enough
+                if (System.nanoTime() - startTime > DURATION_IN_NANOS) {
                     return;
                 }
 
@@ -232,7 +243,7 @@ public void run() {
     public static void main(String[] args) {
         var torture = new StressStackOverflow();
         while (torture.ITERS > 0
-                && System.nanoTime() - startTime <= 3 * MINUTES) { // 3 minutes is long enough
+                && System.nanoTime() - startTime <= DURATION_IN_NANOS) {
             try {
                 torture.run();
                 if (inheritedValue.isBound()) {

From f82c8184b26142da4018ae096cfa39d87a4c6540 Mon Sep 17 00:00:00 2001
From: Stuart Marks <smarks@openjdk.org>
Date: Wed, 12 Jul 2023 16:10:41 +0000
Subject: [PATCH 21/21] 8308694: Clarify reversed() default methods'
 implementation requirements

Reviewed-by: rriggs
---
 src/java.base/share/classes/java/util/Deque.java     | 10 ++++++++--
 src/java.base/share/classes/java/util/List.java      | 10 ++++++++--
 src/java.base/share/classes/java/util/SortedMap.java | 10 ++++++++--
 src/java.base/share/classes/java/util/SortedSet.java | 10 ++++++++--
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/java.base/share/classes/java/util/Deque.java b/src/java.base/share/classes/java/util/Deque.java
index 13a2e150d97c6..fd42bc356de0d 100644
--- a/src/java.base/share/classes/java/util/Deque.java
+++ b/src/java.base/share/classes/java/util/Deque.java
@@ -617,8 +617,14 @@ public interface Deque<E> extends Queue<E>, SequencedCollection<E> {
      * {@inheritDoc}
      *
      * @implSpec
-     * The implementation in this interface returns an instance of a reverse-ordered
-     * Deque that delegates its operations to this Deque.
+     * The implementation in this interface returns a reverse-ordered Deque
+     * view. The {@code reversed()} method of the view returns a reference
+     * to this Deque. Other operations on the view are implemented via calls to
+     * public methods on this Deque. The exact relationship between calls on the
+     * view and calls on this Deque is unspecified. However, order-sensitive
+     * operations generally delegate to the appropriate method with the opposite
+     * orientation. For example, calling {@code getFirst} on the view results in
+     * a call to {@code getLast} on this Deque.
      *
      * @return a reverse-ordered view of this collection, as a {@code Deque}
      * @since 21
diff --git a/src/java.base/share/classes/java/util/List.java b/src/java.base/share/classes/java/util/List.java
index e9576455ca70a..17cf635aa7ac0 100644
--- a/src/java.base/share/classes/java/util/List.java
+++ b/src/java.base/share/classes/java/util/List.java
@@ -888,8 +888,14 @@ default E removeLast() {
      * {@inheritDoc}
      *
      * @implSpec
-     * The implementation in this interface returns an instance of a reverse-ordered
-     * List that delegates its operations to this List.
+     * The implementation in this interface returns a reverse-ordered List
+     * view. The {@code reversed()} method of the view returns a reference
+     * to this List. Other operations on the view are implemented via calls to
+     * public methods on this List. The exact relationship between calls on the
+     * view and calls on this List is unspecified. However, order-sensitive
+     * operations generally delegate to the appropriate method with the opposite
+     * orientation. For example, calling {@code getFirst} on the view results in
+     * a call to {@code getLast} on this List.
      *
      * @return a reverse-ordered view of this collection, as a {@code List}
      * @since 21
diff --git a/src/java.base/share/classes/java/util/SortedMap.java b/src/java.base/share/classes/java/util/SortedMap.java
index 1af9d59e83e14..447b0a2c7e796 100644
--- a/src/java.base/share/classes/java/util/SortedMap.java
+++ b/src/java.base/share/classes/java/util/SortedMap.java
@@ -316,8 +316,14 @@ default V putLast(K k, V v) {
      * {@inheritDoc}
      *
      * @implSpec
-     * The implementation in this interface returns an instance of a reverse-ordered
-     * SortedMap that delegates its operations to this SortedMap.
+     * The implementation in this interface returns a reverse-ordered SortedMap
+     * view. The {@code reversed()} method of the view returns a reference
+     * to this SortedMap. Other operations on the view are implemented via calls to
+     * public methods on this SortedMap. The exact relationship between calls on the
+     * view and calls on this SortedMap is unspecified. However, order-sensitive
+     * operations generally delegate to the appropriate method with the opposite
+     * orientation. For example, calling {@code firstEntry} on the view results in
+     * a call to {@code lastEntry} on this SortedMap.
      *
      * @return a reverse-ordered view of this map, as a {@code SortedMap}
      * @since 21
diff --git a/src/java.base/share/classes/java/util/SortedSet.java b/src/java.base/share/classes/java/util/SortedSet.java
index 48473a1fed531..3b4612457c6e4 100644
--- a/src/java.base/share/classes/java/util/SortedSet.java
+++ b/src/java.base/share/classes/java/util/SortedSet.java
@@ -360,8 +360,14 @@ default E removeLast() {
      * {@inheritDoc}
      *
      * @implSpec
-     * The implementation in this interface returns an instance of a reverse-ordered
-     * SortedSet that delegates its operations to this SortedSet.
+     * The implementation in this interface returns a reverse-ordered SortedSet
+     * view. The {@code reversed()} method of the view returns a reference
+     * to this SortedSet. Other operations on the view are implemented via calls to
+     * public methods on this SortedSet. The exact relationship between calls on the
+     * view and calls on this SortedSet is unspecified. However, order-sensitive
+     * operations generally delegate to the appropriate method with the opposite
+     * orientation. For example, calling {@code getFirst} on the view results in
+     * a call to {@code getLast} on this SortedSet.
      *
      * @return a reverse-ordered view of this collection, as a {@code SortedSet}
      * @since 21