From 194425d7875ef42fce52516ed59c81ee97720399 Mon Sep 17 00:00:00 2001
From: Shaojin Wen <shaojin.wensj@alibaba-inc.com>
Date: Fri, 5 Jul 2024 12:50:09 +0000
Subject: [PATCH 001/401] 8335645: j.u.Formatter#trailingZeros improved with
 String repeat

Reviewed-by: liach, jlu, naoto
---
 src/java.base/share/classes/java/util/Formatter.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/util/Formatter.java b/src/java.base/share/classes/java/util/Formatter.java
index 41b9540001c83..dfdb77cc6ace2 100644
--- a/src/java.base/share/classes/java/util/Formatter.java
+++ b/src/java.base/share/classes/java/util/Formatter.java
@@ -4249,8 +4249,8 @@ private int adjustWidth(int width, int flags, boolean neg) {
 
         // Add trailing zeros
         private void trailingZeros(StringBuilder sb, int nzeros) {
-            for (int i = 0; i < nzeros; i++) {
-                sb.append('0');
+            if (nzeros > 0) {
+                sb.repeat('0', nzeros);
             }
         }
 

From ff49f677ee5017019c90823bc412ceb90068ffbd Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@openjdk.org>
Date: Fri, 5 Jul 2024 13:44:35 +0000
Subject: [PATCH 002/401] 8335775: Remove extraneous 's' in comment of
 rawmonitor.cpp test file

Reviewed-by: gdams, stuefe
---
 .../nsk/jvmti/unit/functions/rawmonitor/rawmonitor.cpp           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/functions/rawmonitor/rawmonitor.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/functions/rawmonitor/rawmonitor.cpp
index 11ef7e18d7bd9..6ee955ae420dd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/functions/rawmonitor/rawmonitor.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/functions/rawmonitor/rawmonitor.cpp
@@ -1,5 +1,4 @@
 /*
-s
  * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *

From 7efe16038e5df9894a265ea1214068060f595c4e Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Fri, 5 Jul 2024 16:44:41 +0000
Subject: [PATCH 003/401] 8335730: JFR: Clean up jdk.jfr

Reviewed-by: mgronlun
---
 .../share/classes/jdk/jfr/consumer/RecordedClass.java     | 4 ++--
 .../share/classes/jdk/jfr/consumer/RecordedFrame.java     | 6 +++---
 .../share/classes/jdk/jfr/consumer/RecordedMethod.java    | 4 ++--
 .../share/classes/jdk/jfr/consumer/RecordedObject.java    | 5 ++++-
 .../share/classes/jdk/jfr/consumer/RecordedThread.java    | 6 +++---
 .../jdk/jfr/events/AbstractBufferStatisticsEvent.java     | 4 ++--
 .../classes/jdk/jfr/events/ActiveRecordingEvent.java      | 1 -
 .../share/classes/jdk/jfr/events/ActiveSettingEvent.java  | 1 -
 .../classes/jdk/jfr/events/ExceptionStatisticsEvent.java  | 1 -
 .../share/classes/jdk/jfr/internal/EventControl.java      | 1 -
 .../classes/jdk/jfr/internal/MetadataRepository.java      | 2 --
 .../share/classes/jdk/jfr/internal/OldObjectSample.java   | 3 +--
 .../share/classes/jdk/jfr/internal/RepositoryChunk.java   | 5 +----
 .../share/classes/jdk/jfr/internal/ShutdownHook.java      | 2 --
 .../classes/jdk/jfr/internal/dcmd/QueryRecording.java     | 7 +------
 src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/JFC.java   | 4 ++--
 .../classes/jdk/jfr/internal/jfc/model/XmlSetting.java    | 4 ++--
 src/jdk.jfr/share/classes/jdk/jfr/internal/query/Row.java | 4 ++--
 .../share/classes/jdk/jfr/internal/query/TableSorter.java | 5 +----
 .../classes/jdk/jfr/internal/settings/LevelSetting.java   | 4 ++--
 .../share/classes/jdk/jfr/internal/tool/Disassemble.java  | 8 ++++----
 .../share/classes/jdk/jfr/internal/tool/PrettyWriter.java | 3 +--
 src/jdk.jfr/share/classes/jdk/jfr/internal/tool/View.java | 3 +--
 .../share/classes/jdk/jfr/internal/util/ValueParser.java  | 4 ++--
 24 files changed, 36 insertions(+), 55 deletions(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedClass.java b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedClass.java
index 8d6b5647f2f58..d0ae1e7d297e1 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedClass.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@ public final class RecordedClass extends RecordedObject {
      * @see java.lang.reflect.Modifier
      */
     public int getModifiers() {
-        return getTyped("modifiers", Integer.class, -1);
+        return getTyped("modifiers", Integer.class, INTEGER_MINUS_ONE);
     }
 
     /**
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedFrame.java b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedFrame.java
index 9640330fca2fc..cdb893274acd0 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedFrame.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,7 +65,7 @@ public boolean isJavaFrame() {
      * @return byte code index, or {@code -1} if doesn't exist
      */
     public int getBytecodeIndex() {
-        return getTyped("bytecodeIndex", Integer.class, Integer.valueOf(-1));
+        return getTyped("bytecodeIndex", Integer.class, INTEGER_MINUS_ONE);
     }
 
     /**
@@ -75,7 +75,7 @@ public int getBytecodeIndex() {
      * @return the line number, or {@code -1} if doesn't exist
      */
     public int getLineNumber() {
-        return getTyped("lineNumber", Integer.class, Integer.valueOf(-1));
+        return getTyped("lineNumber", Integer.class, INTEGER_MINUS_ONE);
     }
 
     /**
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedMethod.java b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedMethod.java
index a82b43ffc363b..6c8f23aa02a86 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedMethod.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -94,7 +94,7 @@ public String getDescriptor() {
      * @see RecordedFrame#isJavaFrame
      */
     public int getModifiers() {
-        return getTyped("modifiers", Integer.class, Integer.valueOf(0));
+        return getTyped("modifiers", Integer.class, INTEGER_ZERO);
     }
 
     /**
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedObject.java b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedObject.java
index e5825b8ea07c5..21bd30a8248d1 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedObject.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -154,6 +154,9 @@ public MetadataEvent newMetadataEvent(List<EventType> previous, List<EventType>
 
     private static final record UnsignedValue(Object value) {
     }
+    static final Integer INTEGER_MINUS_ONE = Integer.valueOf(-1);
+    static final Integer INTEGER_ZERO = Integer.valueOf(0);
+    static final Long LONG_MINUS_ONE = Long.valueOf(-1L);
 
     final Object[] objects;
     final ObjectContext objectContext;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedThread.java b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedThread.java
index 4031e70d24b56..d12d65faf10ea 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedThread.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedThread.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,7 +59,7 @@ public long getOSThreadId() {
         if (isVirtual()) {
             return -1L;
         }
-        Long l = getTyped("osThreadId", Long.class, -1L);
+        Long l = getTyped("osThreadId", Long.class, LONG_MINUS_ONE);
         return l.longValue();
     }
 
@@ -92,7 +92,7 @@ public String getJavaName() {
      * @see java.lang.Thread#threadId()
      */
     public long getJavaThreadId() {
-        Long l = getTyped("javaThreadId", Long.class, -1L);
+        Long l = getTyped("javaThreadId", Long.class, LONG_MINUS_ONE);
         long id = l.longValue();
         return id == 0 ? -1L : id;
     }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/AbstractBufferStatisticsEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/AbstractBufferStatisticsEvent.java
index d436b32db83e3..f7a03c7446e84 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/AbstractBufferStatisticsEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/AbstractBufferStatisticsEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
 import jdk.jfr.*;
 
 @Category({ "Java Application", "Statistics" })
-public abstract class AbstractBufferStatisticsEvent extends AbstractPeriodicEvent {
+abstract class AbstractBufferStatisticsEvent extends AbstractPeriodicEvent {
 
     protected AbstractBufferStatisticsEvent(BufferPool bufferPool) {
         count = bufferPool.getCount();
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/ActiveRecordingEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/ActiveRecordingEvent.java
index 352a8b6a07397..ffb45caa42cf9 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/ActiveRecordingEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/ActiveRecordingEvent.java
@@ -29,7 +29,6 @@
 import jdk.jfr.Label;
 import jdk.jfr.DataAmount;
 import jdk.jfr.Name;
-import jdk.jfr.StackTrace;
 import jdk.jfr.Timespan;
 import jdk.jfr.Timestamp;
 import jdk.jfr.internal.RemoveFields;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/ActiveSettingEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/ActiveSettingEvent.java
index 3658b06eb14a8..6aade8e01f5d5 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/ActiveSettingEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/ActiveSettingEvent.java
@@ -28,7 +28,6 @@
 import jdk.jfr.Category;
 import jdk.jfr.Label;
 import jdk.jfr.Name;
-import jdk.jfr.StackTrace;
 import jdk.jfr.internal.RemoveFields;
 import jdk.jfr.internal.Type;
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/ExceptionStatisticsEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/ExceptionStatisticsEvent.java
index 795f618b4e62a..0cdd987227193 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/ExceptionStatisticsEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/ExceptionStatisticsEvent.java
@@ -29,7 +29,6 @@
 import jdk.jfr.Description;
 import jdk.jfr.Label;
 import jdk.jfr.Name;
-import jdk.jfr.StackTrace;
 import jdk.jfr.internal.MirrorEvent;
 import jdk.jfr.internal.RemoveFields;
 import jdk.jfr.internal.Type;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
index 2a758aa8addc6..71569c30273be 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
@@ -46,7 +46,6 @@
 import jdk.jfr.Threshold;
 import jdk.jfr.events.ActiveSettingEvent;
 import jdk.jfr.events.StackFilter;
-import jdk.jfr.internal.JVM;
 import jdk.jfr.internal.settings.CutoffSetting;
 import jdk.jfr.internal.settings.EnabledSetting;
 import jdk.jfr.internal.settings.LevelSetting;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
index 75be70a0d1dae..4a7bc734d7571 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
@@ -44,8 +44,6 @@
 import jdk.jfr.EventType;
 import jdk.jfr.Name;
 import jdk.jfr.Period;
-import jdk.jfr.StackTrace;
-import jdk.jfr.Threshold;
 import jdk.jfr.ValueDescriptor;
 import jdk.jfr.internal.consumer.RepositoryFiles;
 import jdk.jfr.internal.event.EventConfiguration;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/OldObjectSample.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/OldObjectSample.java
index 5fa9eb709ef08..21079fab3a912 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/OldObjectSample.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/OldObjectSample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
 import jdk.jfr.RecordingState;
 import jdk.jfr.internal.settings.CutoffSetting;
 import jdk.jfr.internal.test.WhiteBox;
-import jdk.jfr.internal.util.Utils;
 
 // The Old Object event could have been implemented as a periodic event, but
 // due to chunk rotations and how settings are calculated when multiple recordings
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/RepositoryChunk.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/RepositoryChunk.java
index 72d3a719452f4..e46b6020d5dbd 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/RepositoryChunk.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/RepositoryChunk.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,10 +29,7 @@
 import java.io.RandomAccessFile;
 import java.nio.channels.ReadableByteChannel;
 import java.time.Instant;
-import java.time.Period;
-import java.time.Duration;
 import java.util.Comparator;
-import java.util.Optional;
 
 import jdk.jfr.internal.SecuritySupport.SafePath;
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/ShutdownHook.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/ShutdownHook.java
index afd9ec09bd9f1..8375dab0bcce3 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/ShutdownHook.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/ShutdownHook.java
@@ -25,14 +25,12 @@
 
 package jdk.jfr.internal;
 
-import java.io.IOException;
 import java.security.AccessControlContext;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 
 import jdk.jfr.RecordingState;
-import jdk.jfr.internal.util.Utils;
 
 /**
  * Class responsible for dumping recordings on exit
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/QueryRecording.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/QueryRecording.java
index 75fefca0f08af..fa60079b52247 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/QueryRecording.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/QueryRecording.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
 import java.io.IOException;
 import java.time.Duration;
 import java.time.Instant;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.ListIterator;
 
@@ -37,12 +36,8 @@
 import jdk.jfr.internal.PrivateAccess;
 import jdk.jfr.internal.RepositoryChunk;
 import jdk.jfr.internal.query.Configuration;
-import jdk.jfr.internal.query.QueryPrinter;
-import jdk.jfr.internal.query.ViewPrinter;
 import jdk.jfr.internal.query.Configuration.Truncate;
 import jdk.jfr.internal.util.UserDataException;
-import jdk.jfr.internal.util.UserSyntaxException;
-import jdk.jfr.internal.util.Output;
 
 /**
  * Helper class that holds recording chunks alive during a query. It also helps
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/JFC.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/JFC.java
index 6d7cccfb2a6d0..0511ce57001c6 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/JFC.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/JFC.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -293,7 +293,7 @@ public static Reader newReader(SafePath sf) throws IOException {
     public static String formatException(String prefix, Exception e, String input) {
         String message = prefix + " " + JFC.exceptionToVerb(e) + " file '" + input + "'";
         String details = e.getMessage();
-        if (e instanceof JFCModelException m) {
+        if (e instanceof JFCModelException) {
             return message +  ". " + details;
         }
         if (e instanceof ParseException && !details.isEmpty()) {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlSetting.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlSetting.java
index 56f2208ded313..536c5051f54e1 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlSetting.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlSetting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,7 +59,7 @@ public void onChange() {
     @Override
     final void setContent(String value) {
         super.setContent(value);
-        if (getParent() instanceof XmlEvent event) {
+        if (getParent() instanceof XmlEvent) {
             SettingsLog.log(this, value);
         }
     }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/Row.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/Row.java
index da32f86c171ba..cb54b6b651abd 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/Row.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/Row.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,6 +53,6 @@ public void putText(int index, String text) {
 
     @Override
     public String toString() {
-        return Arrays.asList(values).toString();
+        return Arrays.toString(values);
     }
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/TableSorter.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/TableSorter.java
index 65f664018bab2..8869516280960 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/TableSorter.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/TableSorter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,10 +24,7 @@
  */
 package jdk.jfr.internal.query;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
-import java.util.List;
 import java.util.function.Predicate;
 
 import jdk.jfr.internal.query.Query.OrderElement;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/LevelSetting.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/LevelSetting.java
index acf67c0aa06a5..b6aa7500d4b68 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/LevelSetting.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/LevelSetting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,7 @@
 @MetadataDefinition
 @Label("Level")
 @Name(Type.SETTINGS_PREFIX + "Level")
-public class LevelSetting extends JDKSettingControl {
+public final class LevelSetting extends JDKSettingControl {
     private final PlatformEventType eventType;
     private final List<String> levels;
     private String value;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Disassemble.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Disassemble.java
index 06616771cf9cf..48dd52475685a 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Disassemble.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Disassemble.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -223,9 +223,9 @@ private void splitFile(Path directory, Path file, List<Long> splitPositions) thr
                 Path p = directory.resolve(formattedFilename);
                 File splittedFile = p.toFile();
                 println("Writing " + splittedFile + " ... " + bytes.length);
-                FileOutputStream fos = new FileOutputStream(splittedFile);
-                fos.write(bytes);
-                fos.close();
+                try (var fos = new FileOutputStream(splittedFile)) {
+                    fos.write(bytes);
+                }
             }
         } catch (IOException ioe) {
             throw new UserDataException("i/o error writing file " + file);
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.java
index aec1f18546c77..77b3f4d1e8c41 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.StringJoiner;
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/View.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/View.java
index a22c64c931e8f..613e315ff1390 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/View.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/View.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,6 @@
 import java.util.List;
 
 import jdk.jfr.consumer.EventStream;
-import jdk.jfr.internal.util.Columnizer;
 import jdk.jfr.internal.query.ViewPrinter;
 import jdk.jfr.internal.query.Configuration;
 import jdk.jfr.internal.query.Configuration.Truncate;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ValueParser.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ValueParser.java
index 1c6561f45c4a6..730c83daaae67 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ValueParser.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ValueParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
-public class ValueParser {
+public final class ValueParser {
     private static final String INFINITY = "infinity";
 
     public static long parseTimespanWithInfinity(String s) {

From b83766e59063a41ea8801ac9e7c15dce67727c62 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Fri, 5 Jul 2024 17:07:22 +0000
Subject: [PATCH 004/401] 8335632:
 jdk/jfr/api/consumer/streaming/TestJVMExit.java failed with "Process [...] is
 no longer alive"

Reviewed-by: mgronlun
---
 .../jfr/api/consumer/streaming/TestJVMExit.java | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/test/jdk/jdk/jfr/api/consumer/streaming/TestJVMExit.java b/test/jdk/jdk/jfr/api/consumer/streaming/TestJVMExit.java
index 5b30a52e4b757..77eba735d7a3b 100644
--- a/test/jdk/jdk/jfr/api/consumer/streaming/TestJVMExit.java
+++ b/test/jdk/jdk/jfr/api/consumer/streaming/TestJVMExit.java
@@ -34,12 +34,29 @@
  * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @modules jdk.jfr jdk.attach java.base/jdk.internal.misc
+ * @build jdk.jfr.api.consumer.streaming.TestProcess
  *
  * @run main/othervm -Dsun.tools.attach.attachTimeout=100000 jdk.jfr.api.consumer.streaming.TestJVMExit
  */
 public class TestJVMExit {
 
     public static void main(String... args) throws Exception {
+        while (true) {
+            try {
+                testExit();
+                return;
+            } catch (RuntimeException e) {
+                String message = String.valueOf(e.getMessage());
+                // If the test application crashes during startup, retry.
+                if (!message.contains("is no longer alive")) {
+                    throw e;
+                }
+                System.out.println("Application not alive when trying to get repository. Retrying.");
+            }
+        }
+    }
+
+    private static void testExit() throws Exception {
         try (TestProcess process = new TestProcess("exit-application")) {
             AtomicInteger eventCounter = new AtomicInteger();
             try (EventStream es = EventStream.openRepository(process.getRepository())) {

From 6f7f0f1de05fdc0f6a88ccd90b806e8a5c5074ef Mon Sep 17 00:00:00 2001
From: Per Minborg <pminborg@openjdk.org>
Date: Sat, 6 Jul 2024 15:05:26 +0000
Subject: [PATCH 005/401] 8333884: MemorySegment::reinterpret removes read-only
 property

Reviewed-by: jvernee, mcimadamore
---
 .../java/lang/foreign/MemorySegment.java      | 21 +++++++++++++++++++
 .../foreign/AbstractMemorySegmentImpl.java    |  2 +-
 .../internal/foreign/SegmentFactories.java    | 10 ++++++---
 test/jdk/java/foreign/TestSegments.java       | 12 +++++++----
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/foreign/MemorySegment.java b/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
index aa1f1762aec65..83a8b09f9d453 100644
--- a/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
+++ b/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
@@ -633,6 +633,9 @@ public sealed interface MemorySegment permits AbstractMemorySegmentImpl {
      * asSlice(offset, newSize, 1);
      * }
      * <p>
+     * If this segment is {@linkplain MemorySegment#isReadOnly() read-only},
+     * the returned segment is also {@linkplain MemorySegment#isReadOnly() read-only}.
+     * <p>
      * The returned memory segment shares a region of backing memory with this segment.
      * Hence, no memory will be allocated or freed by this method.
      *
@@ -652,6 +655,9 @@ public sealed interface MemorySegment permits AbstractMemorySegmentImpl {
      * alignment constraint. The returned segment's address is the address of this
      * segment plus the given offset; its size is specified by the given argument.
      * <p>
+     * If this segment is {@linkplain MemorySegment#isReadOnly() read-only},
+     * the returned segment is also {@linkplain MemorySegment#isReadOnly() read-only}.
+     * <p>
      * The returned memory segment shares a region of backing memory with this segment.
      * Hence, no memory will be allocated or freed by this method.
      *
@@ -679,6 +685,9 @@ public sealed interface MemorySegment permits AbstractMemorySegmentImpl {
      * asSlice(offset, layout.byteSize(), layout.byteAlignment());
      * }
      * <p>
+     * If this segment is {@linkplain MemorySegment#isReadOnly() read-only},
+     * the returned segment is also {@linkplain MemorySegment#isReadOnly() read-only}.
+     * <p>
      * The returned memory segment shares a region of backing memory with this segment.
      * Hence, no memory will be allocated or freed by this method.
      *
@@ -705,6 +714,9 @@ public sealed interface MemorySegment permits AbstractMemorySegmentImpl {
      * asSlice(offset, byteSize() - offset);
      * }
      * <p>
+     * If this segment is {@linkplain MemorySegment#isReadOnly() read-only},
+     * the returned segment is also {@linkplain MemorySegment#isReadOnly() read-only}.
+     * <p>
      * The returned memory segment shares a region of backing memory with this segment.
      * Hence, no memory will be allocated or freed by this method.
      *
@@ -721,6 +733,9 @@ public sealed interface MemorySegment permits AbstractMemorySegmentImpl {
      * Returns a new memory segment that has the same address and scope as this segment,
      * but with the provided size.
      * <p>
+     * If this segment is {@linkplain MemorySegment#isReadOnly() read-only},
+     * the returned segment is also {@linkplain MemorySegment#isReadOnly() read-only}.
+     * <p>
      * The returned memory segment shares a region of backing memory with this segment.
      * Hence, no memory will be allocated or freed by this method.
      *
@@ -759,6 +774,9 @@ public sealed interface MemorySegment permits AbstractMemorySegmentImpl {
      * scope, and is accessible from any thread. The size of the segment accepted by the
      * cleanup action is {@link #byteSize()}.
      * <p>
+     * If this segment is {@linkplain MemorySegment#isReadOnly() read-only},
+     * the returned segment is also {@linkplain MemorySegment#isReadOnly() read-only}.
+     * <p>
      * The returned memory segment shares a region of backing memory with this segment.
      * Hence, no memory will be allocated or freed by this method.
      *
@@ -807,6 +825,9 @@ public sealed interface MemorySegment permits AbstractMemorySegmentImpl {
      * scope, and is accessible from any thread. The size of the segment accepted by the
      * cleanup action is {@code newSize}.
      * <p>
+     * If this segment is {@linkplain MemorySegment#isReadOnly() read-only},
+     * the returned segment is also {@linkplain MemorySegment#isReadOnly() read-only}.
+     * <p>
      * The returned memory segment shares a region of backing memory with this segment.
      * Hence, no memory will be allocated or freed by this method.
      *
diff --git a/src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java b/src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java
index f9f6ac2022a2b..325dbe1093f25 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java
@@ -159,7 +159,7 @@ public MemorySegment reinterpretInternal(Class<?> callerClass, long newSize, Sco
                 () -> cleanup.accept(SegmentFactories.makeNativeSegmentUnchecked(address(), newSize)) :
                 null;
         return SegmentFactories.makeNativeSegmentUnchecked(address(), newSize,
-                (MemorySessionImpl)scope, action);
+                (MemorySessionImpl)scope, readOnly, action);
     }
 
     private AbstractMemorySegmentImpl asSliceNoCheck(long offset, long newSize) {
diff --git a/src/java.base/share/classes/jdk/internal/foreign/SegmentFactories.java b/src/java.base/share/classes/jdk/internal/foreign/SegmentFactories.java
index 17f141b4e8c64..133631e2aa4d8 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/SegmentFactories.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/SegmentFactories.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,14 +57,18 @@ public class SegmentFactories {
     // associated with MemorySegment::ofAddress.
 
     @ForceInline
-    public static MemorySegment makeNativeSegmentUnchecked(long min, long byteSize, MemorySessionImpl sessionImpl, Runnable action) {
+    public static MemorySegment makeNativeSegmentUnchecked(long min,
+                                                           long byteSize,
+                                                           MemorySessionImpl sessionImpl,
+                                                           boolean readOnly,
+                                                           Runnable action) {
         ensureInitialized();
         if (action == null) {
             sessionImpl.checkValidState();
         } else {
             sessionImpl.addCloseAction(action);
         }
-        return new NativeMemorySegmentImpl(min, byteSize, false, sessionImpl);
+        return new NativeMemorySegmentImpl(min, byteSize, readOnly, sessionImpl);
     }
 
     @ForceInline
diff --git a/test/jdk/java/foreign/TestSegments.java b/test/jdk/java/foreign/TestSegments.java
index 44ecd12ba5ebd..b361abac3dfa4 100644
--- a/test/jdk/java/foreign/TestSegments.java
+++ b/test/jdk/java/foreign/TestSegments.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,6 @@
 import java.util.function.Supplier;
 
 import static java.lang.foreign.ValueLayout.JAVA_INT;
-import static java.lang.foreign.ValueLayout.JAVA_LONG;
 import static org.testng.Assert.*;
 
 public class TestSegments {
@@ -383,9 +382,14 @@ void testReinterpret() {
             assertEquals(MemorySegment.ofAddress(42).reinterpret(100, Arena.ofAuto(), null).byteSize(), 100);
             // check scope and cleanup
             assertEquals(MemorySegment.ofAddress(42).reinterpret(100, arena, s -> counter.incrementAndGet()).scope(), arena.scope());
-            assertEquals(MemorySegment.ofAddress(42).reinterpret(arena, s -> counter.incrementAndGet()).scope(), arena.scope());
+            assertEquals(MemorySegment.ofAddress(42).reinterpret(arena, _ -> counter.incrementAndGet()).scope(), arena.scope());
+            // check read-only state
+            assertFalse(MemorySegment.ofAddress(42).reinterpret(100).isReadOnly());
+            assertTrue(MemorySegment.ofAddress(42).asReadOnly().reinterpret(100).isReadOnly());
+            assertTrue(MemorySegment.ofAddress(42).asReadOnly().reinterpret(100, Arena.ofAuto(), null).isReadOnly());
+            assertTrue(MemorySegment.ofAddress(42).asReadOnly().reinterpret(arena, _ -> counter.incrementAndGet()).isReadOnly());
         }
-        assertEquals(counter.get(), 2);
+        assertEquals(counter.get(), 3);
     }
 
     @Test

From 3f37c5718d676b7001e6a084aed3ba645745a144 Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Mon, 8 Jul 2024 01:19:36 +0000
Subject: [PATCH 006/401] 8335806: RISC-V: Corrected typos Bizarrely

Reviewed-by: aph, amitkumar
---
 src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp | 2 +-
 src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
index 7e3ceb1f02029..251ea3813ff84 100644
--- a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
@@ -1154,7 +1154,7 @@ void C2_MacroAssembler::string_compare(Register str1, Register str2,
 
   BLOCK_COMMENT("string_compare {");
 
-  // Bizzarely, the counts are passed in bytes, regardless of whether they
+  // Bizarrely, the counts are passed in bytes, regardless of whether they
   // are L or U strings, however the result is always in characters.
   if (!str1_isL) asrw(cnt1, cnt1, 1);
   if (!str2_isL) asrw(cnt2, cnt2, 1);
diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
index 887baa4a506d1..3cb2e52c8cb93 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
@@ -1322,7 +1322,7 @@ void C2_MacroAssembler::string_compare(Register str1, Register str2,
 
   BLOCK_COMMENT("string_compare {");
 
-  // Bizzarely, the counts are passed in bytes, regardless of whether they
+  // Bizarrely, the counts are passed in bytes, regardless of whether they
   // are L or U strings, however the result is always in characters.
   if (!str1_isL) {
     sraiw(cnt1, cnt1, 1);

From 02956ab6e161ca8556a73f328f79bcbfba997cbc Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Mon, 8 Jul 2024 06:23:03 +0000
Subject: [PATCH 007/401] 8332163: C2 SuperWord: refactor PacksetGraph and
 SuperWord::output into VTransformGraph

Reviewed-by: chagedorn, kvn
---
 src/hotspot/share/opto/superword.cpp          | 816 +++---------------
 src/hotspot/share/opto/superword.hpp          |  18 +-
 .../share/opto/superwordVTransformBuilder.cpp | 308 +++++++
 .../share/opto/superwordVTransformBuilder.hpp |  87 ++
 .../share/opto/traceAutoVectorizationTag.hpp  |   1 +
 src/hotspot/share/opto/vectorization.cpp      |   1 -
 src/hotspot/share/opto/vectorization.hpp      |  16 +-
 src/hotspot/share/opto/vtransform.cpp         | 450 ++++++++++
 src/hotspot/share/opto/vtransform.hpp         | 515 +++++++++++
 9 files changed, 1489 insertions(+), 723 deletions(-)
 create mode 100644 src/hotspot/share/opto/superwordVTransformBuilder.cpp
 create mode 100644 src/hotspot/share/opto/superwordVTransformBuilder.hpp
 create mode 100644 src/hotspot/share/opto/vtransform.cpp
 create mode 100644 src/hotspot/share/opto/vtransform.hpp

diff --git a/src/hotspot/share/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp
index f78a9b63926fd..ba2dd423bf51d 100644
--- a/src/hotspot/share/opto/superword.cpp
+++ b/src/hotspot/share/opto/superword.cpp
@@ -22,22 +22,13 @@
  */
 
 #include "precompiled.hpp"
-#include "libadt/vectset.hpp"
-#include "memory/allocation.inline.hpp"
-#include "memory/resourceArea.hpp"
 #include "opto/addnode.hpp"
-#include "opto/c2compiler.hpp"
 #include "opto/castnode.hpp"
 #include "opto/convertnode.hpp"
-#include "opto/matcher.hpp"
-#include "opto/memnode.hpp"
-#include "opto/opcodes.hpp"
-#include "opto/opaquenode.hpp"
-#include "opto/rootnode.hpp"
 #include "opto/superword.hpp"
+#include "opto/superwordVTransformBuilder.hpp"
 #include "opto/vectornode.hpp"
 #include "opto/movenode.hpp"
-#include "utilities/powerOfTwo.hpp"
 
 SuperWord::SuperWord(const VLoopAnalyzer &vloop_analyzer) :
   _vloop_analyzer(vloop_analyzer),
@@ -707,7 +698,7 @@ bool SuperWord::can_pack_into_pair(Node* s1, Node* s2) {
   }
 
   // Forbid anything that looks like a PopulateIndex to be packed. It does not need to be packed,
-  // and will still be vectorized by SuperWord::vector_opd.
+  // and will still be vectorized by SuperWordVTransformBuilder::get_or_make_vtnode_vector_input_at_index.
   if (isomorphic(s1, s2) && !is_populate_index(s1, s2)) {
     if ((independent(s1, s2) && have_similar_inputs(s1, s2)) || reduction(s1, s2)) {
       if (!_pairset.is_left(s1) && !_pairset.is_right(s2)) {
@@ -769,8 +760,9 @@ bool SuperWord::isomorphic(Node* s1, Node* s2) {
   }
 }
 
-// Look for pattern n1 = (iv + c) and n2 = (iv + c + 1), which may lead to PopulateIndex vector node.
-// We skip the pack creation of these nodes. They will be vectorized by SuperWord::vector_opd.
+// Look for pattern n1 = (iv + c) and n2 = (iv + c + 1), which may lead to
+// PopulateIndex vector node. We skip the pack creation of these nodes. They
+// will be vectorized by SuperWordVTransformBuilder::get_or_make_vtnode_vector_input_at_index.
 bool SuperWord::is_populate_index(const Node* n1, const Node* n2) const {
   return n1->is_Add() &&
          n2->is_Add() &&
@@ -1858,307 +1850,74 @@ void PackSet::verify() const {
 }
 #endif
 
-// The PacksetGraph combines the dependency graph with the packset. In the PackSet
-// graph, we have two kinds of nodes:
-//  (1) pack-node:   Represents all nodes of some pack p in a single node, which
-//                   shall later become a vector node.
-//  (2) scalar-node: Represents a node that is not in any pack.
-// For any edge (n1, n2) in the dependency graph, we add an edge to the PacksetGraph for
-// the PacksetGraph nodes corresponding to n1 and n2.
-// We work from the dependency graph, because it gives us all the data-dependencies,
-// as well as more refined memory-dependencies than the C2 graph. The dependency graph
-// does not have cycles. But packing nodes can introduce cyclic dependencies. Example:
-//
-//                                                       +--------+
-//  A -> X                                               |        v
-//                     Pack [A,B] and [X,Y]             [A,B]    [X,Y]
-//  Y -> B                                                 ^        |
-//                                                         +--------+
-//
-class PacksetGraph {
-private:
-  // pid: packset graph node id.
-  GrowableArray<int> _pid;                 // bb_idx(n) -> pid
-  GrowableArray<Node*> _pid_to_node;       // one node per pid, find rest via _packset.pack
-  GrowableArray<GrowableArray<int>> _out;  // out-edges
-  GrowableArray<int> _incnt;               // number of (implicit) in-edges
-  int _max_pid = 0;
-
-  bool _schedule_success;
-
-  SuperWord* _slp;
-public:
-  PacksetGraph(SuperWord* slp)
-  : _pid(8, 0, /* default */ 0), _slp(slp) {
-  }
-  // Get pid, if there is a packset node that n belongs to. Else return 0.
-  int get_pid_or_zero(const Node* n) const {
-    if (!_slp->in_bb(n)) {
-      return 0;
-    }
-    int idx = _slp->bb_idx(n);
-    if (idx >= _pid.length()) {
-      return 0;
-    } else {
-      return _pid.at(idx);
-    }
-  }
-  int get_pid(const Node* n) {
-    int poz = get_pid_or_zero(n);
-    assert(poz != 0, "pid should not be zero");
-    return poz;
-  }
-  void set_pid(Node* n, int pid) {
-    assert(n != nullptr && pid > 0, "sane inputs");
-    assert(_slp->in_bb(n), "must be");
-    int idx = _slp->bb_idx(n);
-    _pid.at_put_grow(idx, pid);
-    _pid_to_node.at_put_grow(pid - 1, n, nullptr);
-  }
-  Node* get_node(int pid) {
-    assert(pid > 0 && pid <= _pid_to_node.length(), "pid must be mapped");
-    Node* n = _pid_to_node.at(pid - 1);
-    assert(n != nullptr, "sanity");
-    return n;
-  }
-  int new_pid() {
-    _incnt.push(0);
-    _out.push(GrowableArray<int>());
-    return ++_max_pid;
-  }
-  int incnt(int pid) { return _incnt.at(pid - 1); }
-  void incnt_set(int pid, int cnt) { return _incnt.at_put(pid - 1, cnt); }
-  GrowableArray<int>& out(int pid) { return _out.at(pid - 1); }
-  bool schedule_success() const { return _schedule_success; }
-
-  // Create nodes (from packs and scalar-nodes), and add edges, based on the dependency graph.
-  void build() {
-    const PackSet& packset = _slp->packset();
-    const GrowableArray<Node*>& body = _slp->body();
-    // Map nodes in packsets
-    for (int i = 0; i < packset.length(); i++) {
-      Node_List* p = packset.at(i);
-      int pid = new_pid();
-      for (uint k = 0; k < p->size(); k++) {
-        Node* n = p->at(k);
-        set_pid(n, pid);
-        assert(packset.get_pack(n) == p, "matching packset");
-      }
-    }
-
-    int max_pid_packset = _max_pid;
-
-    // Map nodes not in packset
-    for (int i = 0; i < body.length(); i++) {
-      Node* n = body.at(i);
-      if (n->is_Phi() || n->is_CFG()) {
-        continue; // ignore control flow
-      }
-      int pid = get_pid_or_zero(n);
-      if (pid == 0) {
-        pid = new_pid();
-        set_pid(n, pid);
-        assert(packset.get_pack(n) == nullptr, "no packset");
-      }
-    }
-
-    // Map edges for packset nodes
-    VectorSet set;
-    for (int i = 0; i < packset.length(); i++) {
-      Node_List* p = packset.at(i);
-      set.clear();
-      int pid = get_pid(p->at(0));
-      for (uint k = 0; k < p->size(); k++) {
-        Node* n = p->at(k);
-        assert(pid == get_pid(n), "all nodes in pack have same pid");
-        for (VLoopDependencyGraph::PredsIterator preds(_slp->dependency_graph(), n); !preds.done(); preds.next()) {
-          Node* pred = preds.current();
-          int pred_pid = get_pid_or_zero(pred);
-          if (pred_pid == pid && _slp->is_marked_reduction(n)) {
-            continue; // reduction -> self-cycle is not a cyclic dependency
-          }
-          // Only add edges once, and only for mapped nodes (in body)
-          if (pred_pid > 0 && !set.test_set(pred_pid)) {
-            incnt_set(pid, incnt(pid) + 1); // increment
-            out(pred_pid).push(pid);
-          }
-        }
-      }
-    }
-
-    // Map edges for nodes not in packset
-    for (int i = 0; i < body.length(); i++) {
-      Node* n = body.at(i);
-      int pid = get_pid_or_zero(n); // zero for Phi or CFG
-      if (pid <= max_pid_packset) {
-        continue; // Only scalar-nodes
-      }
-      for (VLoopDependencyGraph::PredsIterator preds(_slp->dependency_graph(), n); !preds.done(); preds.next()) {
-        Node* pred = preds.current();
-        int pred_pid = get_pid_or_zero(pred);
-        // Only add edges for mapped nodes (in body)
-        if (pred_pid > 0) {
-          incnt_set(pid, incnt(pid) + 1); // increment
-          out(pred_pid).push(pid);
-        }
-      }
-    }
-  }
-
-  // Schedule nodes of PacksetGraph to worklist, using topsort: schedule a node
-  // that has zero incnt. If a PacksetGraph node corresponds to memops, then add
-  // those to the memops_schedule. At the end, we return the memops_schedule, and
-  // note if topsort was successful.
-  Node_List schedule() {
-    Node_List memops_schedule;
-    GrowableArray<int> worklist;
-    // Directly schedule all nodes without precedence
-    for (int pid = 1; pid <= _max_pid; pid++) {
-      if (incnt(pid) == 0) {
-        worklist.push(pid);
-      }
-    }
-    // Continue scheduling via topological sort
-    for (int i = 0; i < worklist.length(); i++) {
-      int pid = worklist.at(i);
-
-      // Add memops to memops_schedule
-      Node* n = get_node(pid);
-      Node_List* p = _slp->packset().get_pack(n);
-      if (n->is_Mem()) {
-        if (p == nullptr) {
-          memops_schedule.push(n);
-        } else {
-          for (uint k = 0; k < p->size(); k++) {
-            memops_schedule.push(p->at(k));
-            assert(p->at(k)->is_Mem(), "only schedule memops");
-          }
-        }
-      }
+bool SuperWord::schedule_and_apply() const {
+  if (_packset.is_empty()) { return false; }
 
-      // Decrement incnt for all successors
-      for (int j = 0; j < out(pid).length(); j++){
-        int pid_use = out(pid).at(j);
-        int incnt_use = incnt(pid_use) - 1;
-        incnt_set(pid_use, incnt_use);
-        // Did use lose its last input?
-        if (incnt_use == 0) {
-          worklist.push(pid_use);
-        }
-      }
-    }
-
-    // Was every pid scheduled? If not, we found some cycles in the PacksetGraph.
-    _schedule_success = (worklist.length() == _max_pid);
-    return memops_schedule;
-  }
-
-  // Print the PacksetGraph.
-  // print_nodes = true: print all C2 nodes beloning to PacksetGrahp node.
-  // print_zero_incnt = false: do not print nodes that have no in-edges (any more).
-  void print(bool print_nodes, bool print_zero_incnt) {
-    const GrowableArray<Node*> &body = _slp->body();
-    tty->print_cr("PacksetGraph");
-    for (int pid = 1; pid <= _max_pid; pid++) {
-      if (incnt(pid) == 0 && !print_zero_incnt) {
-        continue;
-      }
-      tty->print("Node %d. incnt %d [", pid, incnt(pid));
-      for (int j = 0; j < out(pid).length(); j++) {
-        tty->print("%d ", out(pid).at(j));
-      }
-      tty->print_cr("]");
+  // Make an empty transform.
 #ifndef PRODUCT
-      if (print_nodes) {
-        for (int i = 0; i < body.length(); i++) {
-          Node* n = body.at(i);
-          if (get_pid_or_zero(n) == pid) {
-            tty->print("    ");
-            n->dump();
-          }
-        }
-      }
+  VTransformTrace trace(_vloop.vtrace(),
+                        is_trace_superword_rejections(),
+                        is_trace_align_vector(),
+                        is_trace_superword_info());
 #endif
-    }
-  }
-};
-
-// We want to replace the packed scalars from the PackSet and replace them
-// with vector operations. This requires scheduling and re-ordering the memory
-// graph. We take these steps:
-// (1) Build the PacksetGraph. It combines the dependency graph with the
-//     packset. The PacksetGraph gives us the dependencies that must be
-//     respected after scheduling.
-// (2) Schedule the PacksetGraph to the memops_schedule, which represents
-//     a linear order of all memops in the body. The order respects the
-//     dependencies of the PacksetGraph.
-// (3) If the PacksetGraph has cycles, we cannot schedule. Abort.
-// (4) Apply the vectorization, including re-ordering the memops and replacing
-//     packed scalars with vector operations.
-bool SuperWord::schedule_and_apply() {
-  if (_packset.is_empty()) {
-    return false;
-  }
-  ResourceMark rm;
+  VTransform vtransform(_vloop_analyzer,
+                        _mem_ref_for_main_loop_alignment,
+                        _aw_for_main_loop_alignment
+                        NOT_PRODUCT(COMMA trace)
+                        );
 
-  // (1) Build the PacksetGraph.
-  PacksetGraph graph(this);
-  graph.build();
+  // Build the transform from the packset.
+  {
+    ResourceMark rm;
+    SuperWordVTransformBuilder builder(_packset, vtransform);
+  }
 
-  // (2) Schedule the PacksetGraph.
-  Node_List memops_schedule = graph.schedule();
+  if (!vtransform.schedule()) { return false; }
+  vtransform.apply();
+  return true;
+}
 
-  // (3) Check if the PacksetGraph schedule succeeded (had no cycles).
-  // We now know that we only have independent packs, see verify_packs.
-  // This is a necessary but not a sufficient condition for an acyclic
-  // graph (DAG) after scheduling. Thus, we must check if the packs have
-  // introduced a cycle. The SuperWord paper mentions the need for this
-  // in "3.7 Scheduling".
-  if (!graph.schedule_success()) {
+// Apply the vectorization, i.e. we irreversibly edit the C2 graph. At this point, all
+// correctness and profitability checks have passed, and the graph was successfully scheduled.
+void VTransform::apply() {
 #ifndef PRODUCT
-    if (is_trace_superword_rejections()) {
-      tty->print_cr("SuperWord::schedule found cycle in PacksetGraph:");
-      graph.print(true, false);
-      tty->print_cr("removing all packs from packset.");
-    }
-#endif
-    _packset.clear();
-    return false;
+  if (_trace._info || TraceLoopOpts) {
+    tty->print_cr("\nVTransform::apply:");
+    lpt()->dump_head();
+    lpt()->head()->dump();
   }
+  assert(cl()->is_main_loop(), "auto vectorization only for main loops");
+  assert(_graph.is_scheduled(), "must already be scheduled");
+#endif
 
-  // (4) Apply the vectorization, including re-ordering the memops.
-  return apply(memops_schedule);
-}
-
-bool SuperWord::apply(Node_List& memops_schedule) {
   Compile* C = phase()->C;
-  CountedLoopNode* cl = lpt()->_head->as_CountedLoop();
-  C->print_method(PHASE_AUTO_VECTORIZATION1_BEFORE_APPLY, 4, cl);
+  C->print_method(PHASE_AUTO_VECTORIZATION1_BEFORE_APPLY, 4, cl());
 
-  apply_memops_reordering_with_schedule(memops_schedule);
-  C->print_method(PHASE_AUTO_VECTORIZATION2_AFTER_REORDER, 4, cl);
+  _graph.apply_memops_reordering_with_schedule();
+  C->print_method(PHASE_AUTO_VECTORIZATION2_AFTER_REORDER, 4, cl());
 
   adjust_pre_loop_limit_to_align_main_loop_vectors();
-  C->print_method(PHASE_AUTO_VECTORIZATION3_AFTER_ADJUST_LIMIT, 4, cl);
-
-  bool is_success = apply_vectorization();
-  C->print_method(PHASE_AUTO_VECTORIZATION4_AFTER_APPLY, 4, cl);
+  C->print_method(PHASE_AUTO_VECTORIZATION3_AFTER_ADJUST_LIMIT, 4, cl());
 
-  return is_success;
+  apply_vectorization();
+  C->print_method(PHASE_AUTO_VECTORIZATION4_AFTER_APPLY, 4, cl());
 }
 
-// Reorder the memory graph for all slices in parallel. We walk over the schedule once,
-// and track the current memory state of each slice.
-void SuperWord::apply_memops_reordering_with_schedule(Node_List& memops_schedule) {
+// We prepare the memory graph for the replacement of scalar memops with vector memops.
+// We reorder all slices in parallel, ensuring that the memops inside each slice are
+// ordered according to the _schedule. This means that all packed memops are consecutive
+// in the memory graph after the reordering.
+void VTransformGraph::apply_memops_reordering_with_schedule() const {
 #ifndef PRODUCT
-  if (is_trace_superword_info()) {
-    tty->print_cr("\nSuperWord::apply_memops_reordering_with_schedule:");
-    memops_schedule.dump();
+  assert(is_scheduled(), "must be already scheduled");
+  if (_trace._info) {
+    print_memops_schedule();
   }
 #endif
 
+  ResourceMark rm;
   int max_slices = phase()->C->num_alias_types();
-  // When iterating over the memops_schedule, we keep track of the current memory state,
+  // When iterating over the schedule, we keep track of the current memory state,
   // which is the Phi or a store in the loop.
   GrowableArray<Node*> current_state_in_slice(max_slices, max_slices, nullptr);
   // The memory state after the loop is the last store inside the loop. If we reorder the
@@ -2179,10 +1938,9 @@ void SuperWord::apply_memops_reordering_with_schedule(Node_List& memops_schedule
     old_last_store_in_slice.at_put(alias_idx, last_store);
   }
 
-  // (2) Walk over memops_schedule, append memops to the current state
+  // (2) Walk over schedule, append memops to the current state
   //     of that slice. If it is a Store, we take it as the new state.
-  for (uint i = 0; i < memops_schedule.size(); i++) {
-    MemNode* n = memops_schedule.at(i)->as_Mem();
+  for_each_memop_in_schedule([&] (MemNode* n) {
     assert(n->is_Load() || n->is_Store(), "only loads or stores");
     int alias_idx = phase()->C->get_alias_index(n->adr_type());
     Node* current_state = current_state_in_slice.at(alias_idx);
@@ -2198,12 +1956,12 @@ void SuperWord::apply_memops_reordering_with_schedule(Node_List& memops_schedule
         current_state_in_slice.at_put(alias_idx, n);
       }
     }
-  }
+  });
 
   // (3) For each slice, we add the current state to the backedge
   //     in the Phi. Further, we replace uses of the old last store
   //     with uses of the new last store (current_state).
-  Node_List uses_after_loop;
+  GrowableArray<Node*> uses_after_loop;
   for (int i = 0; i < mem_slice_head.length(); i++) {
     Node* phi  = mem_slice_head.at(i);
     int alias_idx = phase()->C->get_alias_index(phi->adr_type());
@@ -2225,7 +1983,7 @@ void SuperWord::apply_memops_reordering_with_schedule(Node_List& memops_schedule
         uses_after_loop.push(use);
       }
     }
-    for (uint k = 0; k < uses_after_loop.size(); k++) {
+    for (int k = 0; k < uses_after_loop.length(); k++) {
       Node* use = uses_after_loop.at(k);
       for (uint j = 0; j < use->req(); j++) {
         Node* def = use->in(j);
@@ -2237,396 +1995,65 @@ void SuperWord::apply_memops_reordering_with_schedule(Node_List& memops_schedule
   }
 }
 
-// Convert packs into vector node operations
-// At this point, all correctness and profitability checks have passed.
-// We start the irreversible process of editing the C2 graph. Should
-// there be an unexpected situation (assert fails), then we can only
-// bail out of the compilation, as the graph has already been partially
-// modified. We bail out, and retry without SuperWord.
-bool SuperWord::apply_vectorization() {
-  CountedLoopNode *cl = lpt()->_head->as_CountedLoop();
-  assert(cl->is_main_loop(), "SLP should only work on main loops");
-  Compile* C = phase()->C;
-  assert(!_packset.is_empty(), "vectorization requires non-empty packset");
-
-#ifndef PRODUCT
-  if (TraceLoopOpts) {
-    tty->print("SuperWord::apply_vectorization ");
-    lpt()->dump_head();
-  }
-#endif
-
-  uint max_vlen_in_bytes = 0;
-  uint max_vlen = 0;
-
-  for (int i = 0; i < body().length(); i++) {
-    Node* n = body().at(i);
-    Node_List* p = get_pack(n);
-    if (p != nullptr && n == p->at(p->size()-1)) {
-      // After apply_memops_reordering_with_schedule, we know that the memops have the same order in the pack
-      // as in the memory slice. Hence, "first" is the first memop in the slice from the pack,
-      // and "n" is the last node in the slice from the pack.
-      Node* first = p->at(0);
-      uint vlen = p->size();
-      uint vlen_in_bytes = 0;
-      Node* vn = nullptr;
-      int   opc = n->Opcode();
-      if (n->is_Load()) {
-        Node* ctl = n->in(MemNode::Control);
-        Node* mem = first->in(MemNode::Memory);
-        // Set the memory dependency of the LoadVector as early as possible.
-        // Walk up the memory chain, and ignore any StoreVector that provably
-        // does not have any memory dependency.
-        while (mem->is_StoreVector()) {
-          VPointer p_store(mem->as_Mem(), _vloop);
-          if (p_store.overlap_possible_with_any_in(p)) {
-            break;
-          } else {
-            mem = mem->in(MemNode::Memory);
-          }
-        }
-        Node* adr = first->in(MemNode::Address);
-        const TypePtr* atyp = n->adr_type();
-        vn = LoadVectorNode::make(opc, ctl, mem, adr, atyp, vlen, velt_basic_type(n), control_dependency(p));
-        vlen_in_bytes = vn->as_LoadVector()->memory_size();
-      } else if (n->is_Store()) {
-        // Promote value to be stored to vector
-        Node* val = vector_opd(p, MemNode::ValueIn);
-        if (val == nullptr) {
-          assert(false, "input to vector store was not created");
-          C->record_failure(C2Compiler::retry_no_superword());
-          return false; // bailout
-        }
+void VTransformGraph::apply_vectorization_for_each_vtnode(uint& max_vector_length, uint& max_vector_width) const {
+  ResourceMark rm;
+  // We keep track of the resulting Nodes from every "VTransformNode::apply" call.
+  // Since "apply" is called on defs before uses, this allows us to find the
+  // generated def (input) nodes when we are generating the use nodes in "apply".
+  int length = _vtnodes.length();
+  GrowableArray<Node*> vtnode_idx_to_transformed_node(length, length, nullptr);
 
-        Node* ctl = n->in(MemNode::Control);
-        Node* mem = first->in(MemNode::Memory);
-        Node* adr = first->in(MemNode::Address);
-        const TypePtr* atyp = n->adr_type();
-        vn = StoreVectorNode::make(opc, ctl, mem, adr, atyp, val, vlen);
-        vlen_in_bytes = vn->as_StoreVector()->memory_size();
-      } else if (VectorNode::is_scalar_rotate(n)) {
-        Node* in1 = vector_opd(p, 1);
-        Node* in2 = first->in(2);
-        // If rotation count is non-constant or greater than 8bit value create a vector.
-        if (!in2->is_Con() || !Matcher::supports_vector_constant_rotates(in2->get_int())) {
-          in2 =  vector_opd(p, 2);
-        }
-        vn = VectorNode::make(opc, in1, in2, vlen, velt_basic_type(n));
-        vlen_in_bytes = vn->as_Vector()->length_in_bytes();
-      } else if (VectorNode::is_roundopD(n)) {
-        Node* in1 = vector_opd(p, 1);
-        Node* in2 = first->in(2);
-        assert(in2->is_Con(), "Constant rounding mode expected.");
-        vn = VectorNode::make(opc, in1, in2, vlen, velt_basic_type(n));
-        vlen_in_bytes = vn->as_Vector()->length_in_bytes();
-      } else if (VectorNode::is_muladds2i(n)) {
-        assert(n->req() == 5u, "MulAddS2I should have 4 operands.");
-        Node* in1 = vector_opd(p, 1);
-        Node* in2 = vector_opd(p, 2);
-        vn = VectorNode::make(opc, in1, in2, vlen, velt_basic_type(n));
-        vlen_in_bytes = vn->as_Vector()->length_in_bytes();
-      } else if (opc == Op_SignumF || opc == Op_SignumD) {
-        assert(n->req() == 4, "four inputs expected");
-        Node* in = vector_opd(p, 1);
-        Node* zero = vector_opd(p, 2);
-        Node* one = vector_opd(p, 3);
-        vn = VectorNode::make(opc, in, zero, one, vlen, velt_basic_type(n));
-        vlen_in_bytes = vn->as_Vector()->length_in_bytes();
-      } else if (n->is_Cmp()) {
-        // Bool + Cmp + CMove -> VectorMaskCmp + VectorBlend
-        continue;
-      } else if (n->is_Bool()) {
-        // Bool + Cmp + CMove -> VectorMaskCmp + VectorBlend
-        continue;
-      } else if (n->is_CMove()) {
-        // Bool + Cmp + CMove -> VectorMaskCmp + VectorBlend
-
-        BoolNode* bol = n->in(1)->as_Bool();
-        assert(bol != nullptr, "must have Bool above CMove");
-        Node_List* bool_pack = get_pack(bol);
-        assert(bool_pack != nullptr, "CMove must have matching Bool pack");
-
-        CmpNode* cmp = bol->in(1)->as_Cmp();
-        assert(cmp != nullptr, "must have cmp above CMove");
-        Node_List* cmp_pack = get_pack(cmp);
-        assert(cmp_pack != nullptr, "Bool must have matching Cmp pack");
-
-        Node* cmp_in1 = vector_opd(cmp_pack, 1);
-        Node* cmp_in2 = vector_opd(cmp_pack, 2);
-
-        Node* blend_in1 = vector_opd(p, 2);
-        Node* blend_in2 = vector_opd(p, 3);
-
-        VTransformBoolTest bool_test = _packset.get_bool_test(bool_pack);
-        BoolTest::mask test_mask = bool_test._mask;
-        if (bool_test._is_negated) {
-           // We can cancel out the negation by swapping the blend inputs.
-           swap(blend_in1, blend_in2);
-        }
+  for (int i = 0; i < _schedule.length(); i++) {
+    VTransformNode* vtn = _schedule.at(i);
+    VTransformApplyResult result = vtn->apply(_vloop_analyzer,
+                                              vtnode_idx_to_transformed_node);
+    NOT_PRODUCT( if (_trace._verbose) { result.trace(vtn); } )
 
-        // VectorMaskCmp
-        ConINode* test_mask_node  = igvn().intcon((int)test_mask);
-        BasicType bt = velt_basic_type(cmp);
-        const TypeVect* vt = TypeVect::make(bt, vlen);
-        VectorNode* mask = new VectorMaskCmpNode(test_mask, cmp_in1, cmp_in2, test_mask_node, vt);
-        phase()->register_new_node_with_ctrl_of(mask, p->at(0));
-        igvn()._worklist.push(mask);
-
-        // VectorBlend
-        vn = new VectorBlendNode(blend_in1, blend_in2, mask);
-      } else if (n->req() == 3) {
-        // Promote operands to vector
-        Node* in1 = nullptr;
-        bool node_isa_reduction = is_marked_reduction(n);
-        if (node_isa_reduction) {
-          // the input to the first reduction operation is retained
-          in1 = first->in(1);
-        } else {
-          in1 = vector_opd(p, 1);
-          if (in1 == nullptr) {
-            assert(false, "input in1 to vector operand was not created");
-            C->record_failure(C2Compiler::retry_no_superword());
-            return false; // bailout
-          }
-        }
-        Node* in2 = vector_opd(p, 2);
-        if (in2 == nullptr) {
-          assert(false, "input in2 to vector operand was not created");
-          C->record_failure(C2Compiler::retry_no_superword());
-          return false; // bailout
-        }
-        if (in1->Opcode() == Op_Replicate && (node_isa_reduction == false) && (n->is_Add() || n->is_Mul())) {
-          // Move invariant vector input into second position to avoid register spilling.
-          Node* tmp = in1;
-          in1 = in2;
-          in2 = tmp;
-        }
-        if (node_isa_reduction) {
-          const Type *arith_type = n->bottom_type();
-          vn = ReductionNode::make(opc, nullptr, in1, in2, arith_type->basic_type());
-          if (in2->is_Load()) {
-            vlen_in_bytes = in2->as_LoadVector()->memory_size();
-          } else {
-            vlen_in_bytes = in2->as_Vector()->length_in_bytes();
-          }
-        } else {
-          if (VectorNode::can_use_RShiftI_instead_of_URShiftI(n, velt_basic_type(n))) {
-            opc = Op_RShiftI;
-          }
-          vn = VectorNode::make(opc, in1, in2, vlen, velt_basic_type(n));
-          vlen_in_bytes = vn->as_Vector()->length_in_bytes();
-        }
-      } else if (VectorNode::is_scalar_unary_op_with_equal_input_and_output_types(opc)) {
-        assert(n->req() == 2, "only one input expected");
-        Node* in = vector_opd(p, 1);
-        vn = VectorNode::make(opc, in, nullptr, vlen, velt_basic_type(n));
-        vlen_in_bytes = vn->as_Vector()->length_in_bytes();
-      } else if (VectorNode::is_scalar_op_that_returns_int_but_vector_op_returns_long(opc)) {
-        assert(n->req() == 2, "only one input expected");
-        Node* in = vector_opd(p, 1);
-        Node* longval = VectorNode::make(opc, in, nullptr, vlen, T_LONG);
-        phase()->register_new_node_with_ctrl_of(longval, first);
-        // Requires extra vector long -> int conversion.
-        vn = VectorCastNode::make(Op_VectorCastL2X, longval, T_INT, vlen);
-        vlen_in_bytes = vn->as_Vector()->length_in_bytes();
-      } else if (VectorNode::is_convert_opcode(opc)) {
-        assert(n->req() == 2, "only one input expected");
-        BasicType bt = velt_basic_type(n);
-        Node* in = vector_opd(p, 1);
-        int vopc = VectorCastNode::opcode(opc, in->bottom_type()->is_vect()->element_basic_type());
-        vn = VectorCastNode::make(vopc, in, bt, vlen);
-        vlen_in_bytes = vn->as_Vector()->length_in_bytes();
-      } else if (opc == Op_FmaD || opc == Op_FmaF) {
-        // Promote operands to vector
-        Node* in1 = vector_opd(p, 1);
-        Node* in2 = vector_opd(p, 2);
-        Node* in3 = vector_opd(p, 3);
-        vn = VectorNode::make(opc, in1, in2, in3, vlen, velt_basic_type(n));
-        vlen_in_bytes = vn->as_Vector()->length_in_bytes();
-      } else {
-        assert(false, "Unhandled scalar opcode (%s)", NodeClassNames[opc]);
-        C->record_failure(C2Compiler::retry_no_superword());
-        return false; // bailout
-      }
-
-      if (vn == nullptr) {
-        assert(false, "got null node instead of vector node");
-        C->record_failure(C2Compiler::retry_no_superword());
-        return false; // bailout
-      }
+    vtnode_idx_to_transformed_node.at_put(vtn->_idx, result.node());
+    max_vector_length = MAX2(max_vector_length, result.vector_length());
+    max_vector_width  = MAX2(max_vector_width,  result.vector_width());
+  }
+}
 
-#ifdef ASSERT
-      // Mark Load/Store Vector for alignment verification
-      if (VerifyAlignVector) {
-        if (vn->Opcode() == Op_LoadVector) {
-          vn->as_LoadVector()->set_must_verify_alignment();
-        } else if (vn->Opcode() == Op_StoreVector) {
-          vn->as_StoreVector()->set_must_verify_alignment();
-        }
-      }
+// We call "apply" on every VTransformNode, which replaces the packed scalar nodes with vector nodes.
+void VTransform::apply_vectorization() const {
+  Compile* C = phase()->C;
+#ifndef PRODUCT
+  if (_trace._verbose) {
+    tty->print_cr("\nVTransform::apply_vectorization:");
+  }
 #endif
 
-      phase()->register_new_node_with_ctrl_of(vn, first);
-      for (uint j = 0; j < p->size(); j++) {
-        Node* pm = p->at(j);
-        igvn().replace_node(pm, vn);
-      }
-      igvn()._worklist.push(vn);
+  uint max_vector_length = 0; // number of elements
+  uint max_vector_width  = 0; // total width in bytes
+  _graph.apply_vectorization_for_each_vtnode(max_vector_length, max_vector_width);
 
-      if (vlen > max_vlen) {
-        max_vlen = vlen;
-      }
-      if (vlen_in_bytes > max_vlen_in_bytes) {
-        max_vlen_in_bytes = vlen_in_bytes;
-      }
-      VectorNode::trace_new_vector(vn, "SuperWord");
-    }
-  }//for (int i = 0; i < body().length(); i++)
+  assert(max_vector_length > 0 && max_vector_width > 0, "must have vectorized");
+  cl()->mark_loop_vectorized();
 
-  if (max_vlen_in_bytes > C->max_vector_size()) {
-    C->set_max_vector_size(max_vlen_in_bytes);
-  }
-  if (max_vlen_in_bytes > 0) {
-    cl->mark_loop_vectorized();
+  if (max_vector_width > C->max_vector_size()) {
+    C->set_max_vector_size(max_vector_width);
   }
 
   if (SuperWordLoopUnrollAnalysis) {
-    if (cl->has_passed_slp()) {
-      uint slp_max_unroll_factor = cl->slp_max_unroll();
-      if (slp_max_unroll_factor == max_vlen) {
+    if (cl()->has_passed_slp()) {
+      uint slp_max_unroll_factor = cl()->slp_max_unroll();
+      if (slp_max_unroll_factor == max_vector_length) {
 #ifndef PRODUCT
         if (TraceSuperWordLoopUnrollAnalysis) {
-          tty->print_cr("vector loop(unroll=%d, len=%d)\n", max_vlen, max_vlen_in_bytes*BitsPerByte);
+          tty->print_cr("vector loop(unroll=%d, len=%d)\n", max_vector_length, max_vector_width * BitsPerByte);
         }
 #endif
         // For atomic unrolled loops which are vector mapped, instigate more unrolling
-        cl->set_notpassed_slp();
+        cl()->set_notpassed_slp();
         // if vector resources are limited, do not allow additional unrolling
         if (Matcher::float_pressure_limit() > 8) {
           C->set_major_progress();
-          cl->mark_do_unroll_only();
+          cl()->mark_do_unroll_only();
         }
       }
     }
   }
-
-  return true;
-}
-
-//------------------------------vector_opd---------------------------
-// Create a vector operand for the nodes in pack p for operand: in(opd_idx)
-Node* SuperWord::vector_opd(Node_List* p, int opd_idx) {
-  Node* p0 = p->at(0);
-  uint vlen = p->size();
-  Node* opd = p0->in(opd_idx);
-  CountedLoopNode *cl = lpt()->_head->as_CountedLoop();
-  Node* same_input = _packset.same_inputs_at_index_or_null(p, opd_idx);
-
-  // Insert index population operation to create a vector of increasing
-  // indices starting from the iv value. In some special unrolled loops
-  // (see JDK-8286125), we need scalar replications of the iv value if
-  // all inputs are the same iv, so we do a same inputs check here.
-  if (opd == iv() && same_input == nullptr) {
-    BasicType p0_bt = velt_basic_type(p0);
-    BasicType iv_bt = is_subword_type(p0_bt) ? p0_bt : T_INT;
-    assert(VectorNode::is_populate_index_supported(iv_bt), "Should support");
-    const TypeVect* vt = TypeVect::make(iv_bt, vlen);
-    Node* vn = new PopulateIndexNode(iv(), igvn().intcon(1), vt);
-    VectorNode::trace_new_vector(vn, "SuperWord");
-    phase()->register_new_node_with_ctrl_of(vn, opd);
-    return vn;
-  }
-
-  if (same_input != nullptr) {
-    if (opd->is_Vector() || opd->is_LoadVector()) {
-      if (opd_idx == 2 && VectorNode::is_shift(p0)) {
-        assert(false, "shift's count can't be vector");
-        return nullptr;
-      }
-      return opd; // input is matching vector
-    }
-    if ((opd_idx == 2) && VectorNode::is_shift(p0)) {
-      Node* cnt = opd;
-      // Vector instructions do not mask shift count, do it here.
-      juint mask = (p0->bottom_type() == TypeInt::INT) ? (BitsPerInt - 1) : (BitsPerLong - 1);
-      const TypeInt* t = opd->find_int_type();
-      if (t != nullptr && t->is_con()) {
-        juint shift = t->get_con();
-        if (shift > mask) { // Unsigned cmp
-          cnt = igvn().intcon(shift & mask);
-          phase()->set_ctrl(cnt, phase()->C->root());
-        }
-      } else {
-        if (t == nullptr || t->_lo < 0 || t->_hi > (int)mask) {
-          cnt = igvn().intcon(mask);
-          cnt = new AndINode(opd, cnt);
-          phase()->register_new_node_with_ctrl_of(cnt, opd);
-        }
-        if (!opd->bottom_type()->isa_int()) {
-          assert(false, "int type only");
-          return nullptr;
-        }
-      }
-      // Move shift count into vector register.
-      cnt = VectorNode::shift_count(p0->Opcode(), cnt, vlen, velt_basic_type(p0));
-      phase()->register_new_node_with_ctrl_of(cnt, opd);
-      return cnt;
-    }
-    if (opd->is_StoreVector()) {
-      assert(false, "StoreVector is not expected here");
-      return nullptr;
-    }
-    // Convert scalar input to vector with the same number of elements as
-    // p0's vector. Use p0's type because size of operand's container in
-    // vector should match p0's size regardless operand's size.
-    const Type* p0_t = nullptr;
-    VectorNode* vn = nullptr;
-    if (opd_idx == 2 && VectorNode::is_scalar_rotate(p0)) {
-       Node* conv = opd;
-       p0_t =  TypeInt::INT;
-       if (p0->bottom_type()->isa_long()) {
-         p0_t = TypeLong::LONG;
-         conv = new ConvI2LNode(opd);
-         phase()->register_new_node_with_ctrl_of(conv, opd);
-       }
-       vn = VectorNode::scalar2vector(conv, vlen, p0_t);
-    } else {
-       p0_t =  velt_type(p0);
-       vn = VectorNode::scalar2vector(opd, vlen, p0_t);
-    }
-
-    phase()->register_new_node_with_ctrl_of(vn, opd);
-    VectorNode::trace_new_vector(vn, "SuperWord");
-    return vn;
-  }
-
-  // Insert pack operation
-  BasicType bt = velt_basic_type(p0);
-  PackNode* pk = PackNode::make(opd, vlen, bt);
-  DEBUG_ONLY( const BasicType opd_bt = opd->bottom_type()->basic_type(); )
-
-  for (uint i = 1; i < vlen; i++) {
-    Node* pi = p->at(i);
-    Node* in = pi->in(opd_idx);
-    if (get_pack(in) != nullptr) {
-      assert(false, "Should already have been unpacked");
-      return nullptr;
-    }
-    assert(opd_bt == in->bottom_type()->basic_type(), "all same type");
-    pk->add_opd(in);
-    if (VectorNode::is_muladds2i(pi)) {
-      Node* in2 = pi->in(opd_idx + 2);
-      if (get_pack(in2) != nullptr) {
-        assert(false, "Should already have been unpacked");
-        return nullptr;
-      }
-      assert(opd_bt == in2->bottom_type()->basic_type(), "all same type");
-      pk->add_opd(in2);
-    }
-  }
-  phase()->register_new_node_with_ctrl_of(pk, opd);
-  VectorNode::trace_new_vector(pk, "SuperWord");
-  return pk;
 }
 
 #ifdef ASSERT
@@ -2797,18 +2224,7 @@ bool SuperWord::is_vector_use(Node* use, int u_idx) const {
     return _packset.is_muladds2i_pack_with_pack_inputs(u_pk);
   }
 
-  if (u_pk->size() != d_pk->size()) {
-    return false;
-  }
-
-  for (uint i = 0; i < u_pk->size(); i++) {
-    Node* ui = u_pk->at(i);
-    Node* di = d_pk->at(i);
-    if (ui->in(u_idx) != di) {
-      return false;
-    }
-  }
-  return true;
+  return _packset.pack_input_at_index_or_null(u_pk, u_idx) != nullptr;
 }
 
 // MulAddS2I takes 4 shorts and produces an int. We can reinterpret
@@ -3182,10 +2598,10 @@ bool VLoopMemorySlices::same_memory_slice(MemNode* m1, MemNode* m2) const {
          _vloop.phase()->C->get_alias_index(m2->adr_type());
 }
 
-LoadNode::ControlDependency SuperWord::control_dependency(Node_List* p) {
+LoadNode::ControlDependency VTransformLoadVectorNode::control_dependency() const {
   LoadNode::ControlDependency dep = LoadNode::DependsOnlyOnTest;
-  for (uint i = 0; i < p->size(); i++) {
-    Node* n = p->at(i);
+  for (int i = 0; i < nodes().length(); i++) {
+    Node* n = nodes().at(i);
     assert(n->is_Load(), "only meaningful for loads");
     if (!n->depends_only_on_test()) {
       if (n->as_Load()->has_unknown_control_dependency() &&
@@ -3202,8 +2618,8 @@ LoadNode::ControlDependency SuperWord::control_dependency(Node_List* p) {
 }
 
 // Find the memop pack with the maximum vector width, unless they were already
-// determined by SuperWord::filter_packs_for_alignment().
-void SuperWord::determine_mem_ref_and_aw_for_main_loop_alignment() {
+// determined (e.g. by SuperWord::filter_packs_for_alignment()).
+void VTransform::determine_mem_ref_and_aw_for_main_loop_alignment() {
   if (_mem_ref_for_main_loop_alignment != nullptr) {
     assert(VLoop::vectors_should_be_aligned(), "mem_ref only set if filtered for alignment");
     return;
@@ -3211,15 +2627,18 @@ void SuperWord::determine_mem_ref_and_aw_for_main_loop_alignment() {
 
   MemNode const* mem_ref = nullptr;
   int max_aw = 0;
-  for (int i = 0; i < _packset.length(); i++) {
-    Node_List* pack = _packset.at(i);
-    MemNode* first = pack->at(0)->isa_Mem();
-    if (first == nullptr) { continue; }
 
-    int vw = first->memory_size() * pack->size();
+  const GrowableArray<VTransformNode*>& vtnodes = _graph.vtnodes();
+  for (int i = 0; i < vtnodes.length(); i++) {
+    VTransformVectorNode* vtn = vtnodes.at(i)->isa_Vector();
+    if (vtn == nullptr) { continue; }
+    MemNode* p0 = vtn->nodes().at(0)->isa_Mem();
+    if (p0 == nullptr) { continue; }
+
+    int vw = p0->memory_size() * vtn->nodes().length();
     if (vw > max_aw) {
       max_aw = vw;
-      mem_ref = first;
+      mem_ref = p0;
     }
   }
   assert(mem_ref != nullptr && max_aw > 0, "found mem_ref and aw");
@@ -3229,7 +2648,7 @@ void SuperWord::determine_mem_ref_and_aw_for_main_loop_alignment() {
 
 #define TRACE_ALIGN_VECTOR_NODE(node) { \
   DEBUG_ONLY(                           \
-    if (is_trace_align_vector()) {      \
+    if (_trace._align_vector) {         \
       tty->print("  " #node ": ");      \
       node->dump();                     \
     }                                   \
@@ -3240,7 +2659,7 @@ void SuperWord::determine_mem_ref_and_aw_for_main_loop_alignment() {
 // the address of "_mem_ref_for_main_loop_alignment" to "_aw_for_main_loop_alignment", which is a
 // sufficiently large alignment width. We adjust the pre-loop iteration count by adjusting the
 // pre-loop limit.
-void SuperWord::adjust_pre_loop_limit_to_align_main_loop_vectors() {
+void VTransform::adjust_pre_loop_limit_to_align_main_loop_vectors() {
   determine_mem_ref_and_aw_for_main_loop_alignment();
   const MemNode* align_to_ref = _mem_ref_for_main_loop_alignment;
   const int aw                = _aw_for_main_loop_alignment;
@@ -3397,8 +2816,8 @@ void SuperWord::adjust_pre_loop_limit_to_align_main_loop_vectors() {
   Node* invar        = align_to_ref_p.invar();
 
 #ifdef ASSERT
-  if (is_trace_align_vector()) {
-    tty->print_cr("\nadjust_pre_loop_limit_to_align_main_loop_vectors:");
+  if (_trace._align_vector) {
+    tty->print_cr("\nVTransform::adjust_pre_loop_limit_to_align_main_loop_vectors:");
     tty->print("  align_to_ref:");
     align_to_ref->dump();
     tty->print_cr("  aw:       %d", aw);
@@ -3424,7 +2843,7 @@ void SuperWord::adjust_pre_loop_limit_to_align_main_loop_vectors() {
       scale  == 0 || !is_power_of_2(abs(scale))  ||
       abs(scale) >= aw) {
 #ifdef ASSERT
-    if (is_trace_align_vector()) {
+    if (_trace._align_vector) {
       tty->print_cr(" Alignment cannot be affected by changing pre-loop limit because");
       tty->print_cr(" stride or scale are not power of 2, or abs(scale) >= aw.");
     }
@@ -3440,7 +2859,7 @@ void SuperWord::adjust_pre_loop_limit_to_align_main_loop_vectors() {
   const int AW = aw / abs(scale);
 
 #ifdef ASSERT
-  if (is_trace_align_vector()) {
+  if (_trace._align_vector) {
     tty->print_cr("  AW = aw(%d) / abs(scale(%d)) = %d", aw, scale, AW);
   }
 #endif
@@ -3595,10 +3014,10 @@ void PackSet::print_pack(Node_List* pack) {
 
 #ifndef PRODUCT
 void VLoopBody::print() const {
-  tty->print_cr("\nBlock");
+  tty->print_cr("\nVLoopBody::print");
   for (int i = 0; i < body().length(); i++) {
     Node* n = body().at(i);
-    tty->print("%d ", i);
+    tty->print("%4d ", i);
     if (n != nullptr) {
       n->dump();
     }
@@ -3615,3 +3034,4 @@ bool SuperWord::same_origin_idx(Node* a, Node* b) const {
 bool SuperWord::same_generation(Node* a, Node* b) const {
   return a != nullptr && b != nullptr && _clone_map.same_gen(a->_idx, b->_idx);
 }
+
diff --git a/src/hotspot/share/opto/superword.hpp b/src/hotspot/share/opto/superword.hpp
index fb91d014faebb..65f870825251f 100644
--- a/src/hotspot/share/opto/superword.hpp
+++ b/src/hotspot/share/opto/superword.hpp
@@ -25,6 +25,7 @@
 #define SHARE_OPTO_SUPERWORD_HPP
 
 #include "opto/vectorization.hpp"
+#include "opto/vtransform.hpp"
 #include "utilities/growableArray.hpp"
 
 //
@@ -367,6 +368,10 @@ class PackSet : public StackObj {
   Node* same_inputs_at_index_or_null(const Node_List* pack, const int index) const;
   VTransformBoolTest get_bool_test(const Node_List* bool_pack) const;
 
+  Node_List* pack_input_at_index_or_null(const Node_List* pack, const int index) const {
+    return strided_pack_input_at_index_or_null(pack, index, 1, 0);
+  }
+
 private:
   SplitStatus split_pack(const char* split_name, Node_List* pack, SplitTask task);
 public:
@@ -599,13 +604,6 @@ class SuperWord : public ResourceObj {
 
   DEBUG_ONLY(void verify_packs() const;)
 
-  bool schedule_and_apply();
-  bool apply(Node_List& memops_schedule);
-  void apply_memops_reordering_with_schedule(Node_List& memops_schedule);
-  bool apply_vectorization();
-  // Create a vector operand for the nodes in pack p for operand: in(opd_idx)
-  Node* vector_opd(Node_List* p, int opd_idx);
-
   // Can code be generated for the pack, restricted to size nodes?
   bool implemented(const Node_List* pack, const uint size) const;
   // Find the maximal implemented size smaller or equal to the packs size
@@ -630,11 +628,7 @@ class SuperWord : public ResourceObj {
 
   bool is_velt_basic_type_compatible_use_def(Node* use, Node* def) const;
 
-  static LoadNode::ControlDependency control_dependency(Node_List* p);
-
-  // Ensure that the main loop vectors are aligned by adjusting the pre loop limit.
-  void determine_mem_ref_and_aw_for_main_loop_alignment();
-  void adjust_pre_loop_limit_to_align_main_loop_vectors();
+  bool schedule_and_apply() const;
 };
 
 #endif // SHARE_OPTO_SUPERWORD_HPP
diff --git a/src/hotspot/share/opto/superwordVTransformBuilder.cpp b/src/hotspot/share/opto/superwordVTransformBuilder.cpp
new file mode 100644
index 0000000000000..b0a0c97cb1676
--- /dev/null
+++ b/src/hotspot/share/opto/superwordVTransformBuilder.cpp
@@ -0,0 +1,308 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 "opto/superwordVTransformBuilder.hpp"
+#include "opto/vectornode.hpp"
+
+void SuperWordVTransformBuilder::build() {
+  assert(!_packset.is_empty(), "must have non-empty packset");
+  assert(!_vtransform.has_graph(), "start with empty vtransform");
+
+  // Create vtnodes for all nodes in the loop.
+  build_vector_vtnodes_for_packed_nodes();
+  build_scalar_vtnodes_for_non_packed_nodes();
+
+  // Connect all vtnodes with their inputs. Possibly create vtnodes for input
+  // nodes that are outside the loop.
+  VectorSet vtn_dependencies; // Shared, but cleared for every vtnode.
+  build_inputs_for_vector_vtnodes(vtn_dependencies);
+  build_inputs_for_scalar_vtnodes(vtn_dependencies);
+}
+
+void SuperWordVTransformBuilder::build_vector_vtnodes_for_packed_nodes() {
+  for (int i = 0; i < _packset.length(); i++) {
+    Node_List* pack = _packset.at(i);
+    VTransformVectorNode* vtn = make_vector_vtnode_for_pack(pack);
+    for (uint k = 0; k < pack->size(); k++) {
+      map_node_to_vtnode(pack->at(k), vtn);
+    }
+  }
+}
+
+void SuperWordVTransformBuilder::build_scalar_vtnodes_for_non_packed_nodes() {
+  for (int i = 0; i < _vloop_analyzer.body().body().length(); i++) {
+    Node* n = _vloop_analyzer.body().body().at(i);
+    if (_packset.get_pack(n) != nullptr) { continue; }
+    VTransformScalarNode* vtn = new (_vtransform.arena()) VTransformScalarNode(_vtransform, n);
+    map_node_to_vtnode(n, vtn);
+  }
+}
+
+void SuperWordVTransformBuilder::build_inputs_for_vector_vtnodes(VectorSet& vtn_dependencies) {
+  for (int i = 0; i < _packset.length(); i++) {
+    Node_List* pack = _packset.at(i);
+    Node* p0 = pack->at(0);
+
+    VTransformVectorNode* vtn = get_vtnode(p0)->isa_Vector();
+    assert(vtn != nullptr, "all packs must have vector vtnodes");
+    vtn_dependencies.clear(); // Add every dependency only once per vtn.
+
+    if (p0->is_Load()) {
+      set_req_with_scalar(p0,   vtn, vtn_dependencies, MemNode::Address);
+    } else if (p0->is_Store()) {
+      set_req_with_scalar(p0,   vtn, vtn_dependencies, MemNode::Address);
+      set_req_with_vector(pack, vtn, vtn_dependencies, MemNode::ValueIn);
+    } else if (vtn->isa_ReductionVector() != nullptr) {
+      set_req_with_scalar(p0,   vtn, vtn_dependencies, 1); // scalar init
+      set_req_with_vector(pack, vtn, vtn_dependencies, 2); // vector
+    } else {
+      assert(vtn->isa_ElementWiseVector() != nullptr, "all other vtnodes are handled above");
+      if (VectorNode::is_scalar_rotate(p0) &&
+          p0->in(2)->is_Con() &&
+          Matcher::supports_vector_constant_rotates(p0->in(2)->get_int())) {
+        set_req_with_vector(pack, vtn, vtn_dependencies, 1);
+        set_req_with_scalar(p0,   vtn, vtn_dependencies, 2); // constant rotation
+      } else if (VectorNode::is_roundopD(p0)) {
+        set_req_with_vector(pack, vtn, vtn_dependencies, 1);
+        set_req_with_scalar(p0,   vtn, vtn_dependencies, 2); // constant rounding mode
+      } else if (p0->is_CMove()) {
+        // Cmp + Bool + CMove -> VectorMaskCmp + VectorBlend.
+        set_all_req_with_vectors(pack, vtn, vtn_dependencies);
+        VTransformBoolVectorNode* vtn_mask_cmp = vtn->in(1)->isa_BoolVector();
+        if (vtn_mask_cmp->test()._is_negated) {
+          vtn->swap_req(2, 3); // swap if test was negated.
+        }
+      } else {
+        set_all_req_with_vectors(pack, vtn, vtn_dependencies);
+      }
+    }
+
+    for (uint k = 0; k < pack->size(); k++) {
+      add_dependencies_of_node_to_vtnode(pack->at(k), vtn, vtn_dependencies);
+    }
+  }
+}
+
+void SuperWordVTransformBuilder::build_inputs_for_scalar_vtnodes(VectorSet& vtn_dependencies) {
+  for (int i = 0; i < _vloop_analyzer.body().body().length(); i++) {
+    Node* n = _vloop_analyzer.body().body().at(i);
+    VTransformScalarNode* vtn = get_vtnode(n)->isa_Scalar();
+    if (vtn == nullptr) { continue; }
+    vtn_dependencies.clear(); // Add every dependency only once per vtn.
+
+    if (n->is_Load()) {
+      set_req_with_scalar(n, vtn, vtn_dependencies, MemNode::Address);
+    } else if (n->is_Store()) {
+      set_req_with_scalar(n, vtn, vtn_dependencies, MemNode::Address);
+      set_req_with_scalar(n, vtn, vtn_dependencies, MemNode::ValueIn);
+    } else if (n->is_CountedLoop()) {
+      continue; // Is "root", has no dependency.
+    } else if (n->is_Phi()) {
+      // CountedLoop Phi's: ignore backedge (and entry value).
+      assert(n->in(0) == _vloop.cl(), "only Phi's from the CountedLoop allowed");
+      set_req_with_scalar(n, vtn, vtn_dependencies, 0);
+      continue;
+    } else {
+      set_all_req_with_scalars(n, vtn, vtn_dependencies);
+    }
+
+    add_dependencies_of_node_to_vtnode(n, vtn, vtn_dependencies);
+  }
+}
+
+// Create a vtnode for each pack. No in/out edges set yet.
+VTransformVectorNode* SuperWordVTransformBuilder::make_vector_vtnode_for_pack(const Node_List* pack) const {
+  uint pack_size = pack->size();
+  Node* p0 = pack->at(0);
+  int opc = p0->Opcode();
+  VTransformVectorNode* vtn = nullptr;
+
+  if (p0->is_Load()) {
+    vtn = new (_vtransform.arena()) VTransformLoadVectorNode(_vtransform, pack_size);
+  } else if (p0->is_Store()) {
+    vtn = new (_vtransform.arena()) VTransformStoreVectorNode(_vtransform, pack_size);
+  } else if (p0->is_Bool()) {
+    VTransformBoolTest kind = _packset.get_bool_test(pack);
+    vtn = new (_vtransform.arena()) VTransformBoolVectorNode(_vtransform, pack_size, kind);
+  } else if (_vloop_analyzer.reductions().is_marked_reduction(p0)) {
+    vtn = new (_vtransform.arena()) VTransformReductionVectorNode(_vtransform, pack_size);
+  } else if (VectorNode::is_muladds2i(p0)) {
+    // A special kind of binary element-wise vector op: the inputs are "ints" a and b,
+    // but reinterpreted as two "shorts" [a0, a1] and [b0, b1]:
+    //   v = MulAddS2I(a, b) = a0 * b0 + a1 + b1
+    assert(p0->req() == 5, "MulAddS2I should have 4 operands");
+    vtn = new (_vtransform.arena()) VTransformElementWiseVectorNode(_vtransform, 3, pack_size);
+  } else {
+    assert(p0->req() == 3 ||
+           p0->is_CMove() ||
+           VectorNode::is_scalar_op_that_returns_int_but_vector_op_returns_long(opc) ||
+           VectorNode::is_convert_opcode(opc) ||
+           VectorNode::is_scalar_unary_op_with_equal_input_and_output_types(opc) ||
+           opc == Op_FmaD ||
+           opc == Op_FmaF ||
+           opc == Op_SignumF ||
+           opc == Op_SignumD,
+           "pack type must be in this list");
+    vtn = new (_vtransform.arena()) VTransformElementWiseVectorNode(_vtransform, p0->req(), pack_size);
+  }
+  vtn->set_nodes(pack);
+  return vtn;
+}
+
+void SuperWordVTransformBuilder::set_req_with_scalar(Node* n, VTransformNode* vtn, VectorSet& vtn_dependencies, const int index) {
+  VTransformNode* req = get_vtnode_or_wrap_as_input_scalar(n->in(index));
+  vtn->set_req(index, req);
+  vtn_dependencies.set(req->_idx);
+}
+
+// Either get the existing vtnode vector input (when input is a pack), or else make a
+// new vector vtnode for the input (e.g. for Replicate or PopulateIndex).
+VTransformNode* SuperWordVTransformBuilder::get_or_make_vtnode_vector_input_at_index(const Node_List* pack, const int index) {
+  Node* p0 = pack->at(0);
+
+  Node_List* pack_in = _packset.pack_input_at_index_or_null(pack, index);
+  if (pack_in != nullptr) {
+    // Input is a matching pack -> vtnode already exists.
+    assert(index != 2 || !VectorNode::is_shift(p0), "shift's count cannot be vector");
+    return get_vtnode(pack_in->at(0));
+  }
+
+  if (VectorNode::is_muladds2i(p0)) {
+    assert(_packset.is_muladds2i_pack_with_pack_inputs(pack), "inputs must all be packs");
+    // All inputs are strided (stride = 2), either with offset 0 or 1.
+    Node_List* pack_in0 = _packset.strided_pack_input_at_index_or_null(pack, index, 2, 0);
+    if (pack_in0 != nullptr) {
+      return get_vtnode(pack_in0->at(0));
+    }
+    Node_List* pack_in1 = _packset.strided_pack_input_at_index_or_null(pack, index, 2, 1);
+    if (pack_in1 != nullptr) {
+      return get_vtnode(pack_in1->at(0));
+    }
+  }
+
+  Node* same_input = _packset.same_inputs_at_index_or_null(pack, index);
+  if (same_input == nullptr && p0->in(index) == _vloop.iv()) {
+    // PopulateIndex: [iv+0, iv+1, iv+2, ...]
+    VTransformNode* iv_vtn = get_vtnode_or_wrap_as_input_scalar(_vloop.iv());
+    BasicType p0_bt = _vloop_analyzer.types().velt_basic_type(p0);
+    // If we have subword type, take that type directly. If p0 is some ConvI2L/F/D,
+    // then the p0_bt can also be L/F/D but we need to produce ints for the input of
+    // the ConvI2L/F/D.
+    BasicType element_bt = is_subword_type(p0_bt) ? p0_bt : T_INT;
+    VTransformNode* populate_index = new (_vtransform.arena()) VTransformPopulateIndexNode(_vtransform, pack->size(), element_bt);
+    populate_index->set_req(1, iv_vtn);
+    return populate_index;
+  }
+
+  if (same_input != nullptr) {
+    VTransformNode* same_input_vtn = get_vtnode_or_wrap_as_input_scalar(same_input);
+    if (index == 2 && VectorNode::is_shift(p0)) {
+      // Scalar shift count for vector shift operation: vec2 = shiftV(vec1, scalar_count)
+      // Scalar shift operations masks the shift count, but the vector shift does not, so
+      // create a special ShiftCount node.
+      BasicType element_bt = _vloop_analyzer.types().velt_basic_type(p0);
+      juint mask = (p0->bottom_type() == TypeInt::INT) ? (BitsPerInt - 1) : (BitsPerLong - 1);
+      VTransformNode* shift_count = new (_vtransform.arena()) VTransformShiftCountNode(_vtransform, pack->size(), element_bt, mask, p0->Opcode());
+      shift_count->set_req(1, same_input_vtn);
+      return shift_count;
+    } else {
+      // Replicate the scalar same_input to every vector element.
+      const Type* element_type = _vloop_analyzer.types().velt_type(p0);
+      if (index == 2 && VectorNode::is_scalar_rotate(p0) && element_type->isa_long()) {
+        // Scalar rotate has int rotation value, but the scalar rotate expects longs.
+        assert(same_input->bottom_type()->isa_int(), "scalar rotate expects int rotation");
+        VTransformNode* conv = new (_vtransform.arena()) VTransformConvI2LNode(_vtransform);
+        conv->set_req(1, same_input_vtn);
+        same_input_vtn = conv;
+      }
+      VTransformNode* replicate = new (_vtransform.arena()) VTransformReplicateNode(_vtransform, pack->size(), element_type);
+      replicate->set_req(1, same_input_vtn);
+      return replicate;
+    }
+  }
+
+  // The input is neither a pack not a same_input node. SuperWord::profitable does not allow
+  // any other case. In the future, we could insert a PackNode.
+#ifdef ASSERT
+  tty->print_cr("\nSuperWordVTransformBuilder::get_or_make_vtnode_vector_input_at_index: index=%d", index);
+  pack->dump();
+  assert(false, "Pack input was neither a pack nor a same_input node");
+#endif
+  ShouldNotReachHere();
+}
+
+VTransformNode* SuperWordVTransformBuilder::get_vtnode_or_wrap_as_input_scalar(Node* n) {
+  VTransformNode* vtn = get_vtnode_or_null(n);
+  if (vtn != nullptr) { return vtn; }
+
+  assert(!_vloop.in_bb(n), "only nodes outside the loop can be input nodes to the loop");
+  vtn = new (_vtransform.arena()) VTransformInputScalarNode(_vtransform, n);
+  map_node_to_vtnode(n, vtn);
+  return vtn;
+}
+
+void SuperWordVTransformBuilder::set_req_with_vector(const Node_List* pack, VTransformNode* vtn, VectorSet& vtn_dependencies, int j) {
+  VTransformNode* req = get_or_make_vtnode_vector_input_at_index(pack, j);
+  vtn->set_req(j, req);
+  vtn_dependencies.set(req->_idx);
+}
+
+void SuperWordVTransformBuilder::set_all_req_with_scalars(Node* n, VTransformNode* vtn, VectorSet& vtn_dependencies) {
+  assert(vtn->req() == n->req(), "scalars must have same number of reqs");
+  for (uint j = 0; j < n->req(); j++) {
+    Node* def = n->in(j);
+    if (def == nullptr) { continue; }
+    set_req_with_scalar(n, vtn, vtn_dependencies, j);
+  }
+}
+
+void SuperWordVTransformBuilder::set_all_req_with_vectors(const Node_List* pack, VTransformNode* vtn, VectorSet& vtn_dependencies) {
+  Node* p0 = pack->at(0);
+  assert(vtn->req() <= p0->req(), "must have at at most as many reqs");
+  // Vectors have no ctrl, so ignore it.
+  for (uint j = 1; j < vtn->req(); j++) {
+    Node* def = p0->in(j);
+    if (def == nullptr) { continue; }
+    set_req_with_vector(pack, vtn, vtn_dependencies, j);
+  }
+}
+
+void SuperWordVTransformBuilder::add_dependencies_of_node_to_vtnode(Node*n, VTransformNode* vtn, VectorSet& vtn_dependencies) {
+  for (VLoopDependencyGraph::PredsIterator preds(_vloop_analyzer.dependency_graph(), n); !preds.done(); preds.next()) {
+    Node* pred = preds.current();
+    if (!_vloop.in_bb(pred)) { continue; }
+
+    // Only add memory dependencies to memory nodes. All others are taken care of with the req.
+    if (n->is_Mem() && !pred->is_Mem()) { continue; }
+
+    VTransformNode* dependency = get_vtnode(pred);
+
+    // Reduction self-cycle?
+    if (vtn == dependency && _vloop_analyzer.reductions().is_marked_reduction(n)) { continue; }
+
+    if (vtn_dependencies.test_set(dependency->_idx)) { continue; }
+    vtn->add_dependency(dependency); // Add every dependency only once per vtn.
+  }
+}
+
diff --git a/src/hotspot/share/opto/superwordVTransformBuilder.hpp b/src/hotspot/share/opto/superwordVTransformBuilder.hpp
new file mode 100644
index 0000000000000..847f870bef616
--- /dev/null
+++ b/src/hotspot/share/opto/superwordVTransformBuilder.hpp
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 "opto/vtransform.hpp"
+#include "opto/superword.hpp"
+
+#ifndef SHARE_OPTO_SUPERWORD_VTRANSFORM_BUILDER_HPP
+#define SHARE_OPTO_SUPERWORD_VTRANSFORM_BUILDER_HPP
+
+// Facility class that builds a VTransform from a SuperWord PackSet.
+class SuperWordVTransformBuilder : public StackObj {
+private:
+  const VLoopAnalyzer& _vloop_analyzer;
+  const VLoop& _vloop;
+  const PackSet& _packset;
+  VTransform& _vtransform;
+
+  ResourceHashtable</* Node::_idx*/ int, VTransformNode* /* or null*/> _idx_to_vtnode;
+
+public:
+  SuperWordVTransformBuilder(const PackSet& packset,
+                             VTransform& vtransform) :
+      _vloop_analyzer(vtransform.vloop_analyzer()),
+      _vloop(_vloop_analyzer.vloop()),
+      _packset(packset),
+      _vtransform(vtransform)
+  {
+    assert(!_vtransform.has_graph(), "constructor is passed an empty vtransform");
+    build();
+    assert(_vtransform.has_graph(), "vtransform must contain some vtnodes now");
+  }
+
+private:
+  void build();
+  void build_vector_vtnodes_for_packed_nodes();
+  void build_scalar_vtnodes_for_non_packed_nodes();
+  void build_inputs_for_vector_vtnodes(VectorSet& vtn_dependencies);
+  void build_inputs_for_scalar_vtnodes(VectorSet& vtn_dependencies);
+
+  // Helper methods for building VTransform.
+  VTransformNode* get_vtnode_or_null(Node* n) const {
+    VTransformNode** ptr = _idx_to_vtnode.get(n->_idx);
+    return (ptr == nullptr) ? nullptr : *ptr;
+  }
+
+  VTransformNode* get_vtnode(Node* n) const {
+    VTransformNode* vtn = get_vtnode_or_null(n);
+    assert(vtn != nullptr, "expect non-null vtnode");
+    return vtn;
+  }
+
+  void map_node_to_vtnode(Node* n, VTransformNode* vtn) {
+    assert(vtn != nullptr, "only set non-null vtnodes");
+    _idx_to_vtnode.put_when_absent(n->_idx, vtn);
+  }
+
+  VTransformVectorNode* make_vector_vtnode_for_pack(const Node_List* pack) const;
+  VTransformNode* get_or_make_vtnode_vector_input_at_index(const Node_List* pack, const int index);
+  VTransformNode* get_vtnode_or_wrap_as_input_scalar(Node* n);
+  void set_req_with_scalar(Node* n, VTransformNode* vtn, VectorSet& vtn_dependencies, const int index);
+  void set_req_with_vector(const Node_List* pack, VTransformNode* vtn, VectorSet& vtn_dependencies, const int index);
+  void set_all_req_with_scalars(Node* n, VTransformNode* vtn, VectorSet& vtn_dependencies);
+  void set_all_req_with_vectors(const Node_List* pack, VTransformNode* vtn, VectorSet& vtn_dependencies);
+  void add_dependencies_of_node_to_vtnode(Node* n, VTransformNode* vtn, VectorSet& vtn_dependencies);
+};
+
+#endif // SHARE_OPTO_SUPERWORD_VTRANSFORM_BUILDER_HPP
diff --git a/src/hotspot/share/opto/traceAutoVectorizationTag.hpp b/src/hotspot/share/opto/traceAutoVectorizationTag.hpp
index 3aae04c9453f5..038e04fe0c50b 100644
--- a/src/hotspot/share/opto/traceAutoVectorizationTag.hpp
+++ b/src/hotspot/share/opto/traceAutoVectorizationTag.hpp
@@ -43,6 +43,7 @@
   flags(SW_INFO,              "Trace SuperWord info (equivalent to TraceSuperWord)") \
   flags(SW_VERBOSE,           "Trace SuperWord verbose (all SW tags enabled)") \
   flags(ALIGN_VECTOR,         "Trace AlignVector") \
+  flags(VTRANSFORM,           "Trace VTransform Graph") \
   flags(ALL,                  "Trace everything (very verbose)")
 
 #define table_entry(name, description) name,
diff --git a/src/hotspot/share/opto/vectorization.cpp b/src/hotspot/share/opto/vectorization.cpp
index 01b235e8b27e8..8d2d3868fe635 100644
--- a/src/hotspot/share/opto/vectorization.cpp
+++ b/src/hotspot/share/opto/vectorization.cpp
@@ -26,7 +26,6 @@
 #include "opto/addnode.hpp"
 #include "opto/connode.hpp"
 #include "opto/convertnode.hpp"
-#include "opto/matcher.hpp"
 #include "opto/mulnode.hpp"
 #include "opto/rootnode.hpp"
 #include "opto/vectorization.hpp"
diff --git a/src/hotspot/share/opto/vectorization.hpp b/src/hotspot/share/opto/vectorization.hpp
index c9f54594910ab..3984407c5654b 100644
--- a/src/hotspot/share/opto/vectorization.hpp
+++ b/src/hotspot/share/opto/vectorization.hpp
@@ -25,7 +25,7 @@
 #ifndef SHARE_OPTO_VECTORIZATION_HPP
 #define SHARE_OPTO_VECTORIZATION_HPP
 
-#include "opto/node.hpp"
+#include "opto/matcher.hpp"
 #include "opto/loopnode.hpp"
 #include "opto/traceAutoVectorizationTag.hpp"
 #include "utilities/pair.hpp"
@@ -763,9 +763,9 @@ class VPointer : public ArenaObj {
     }
   }
 
-  bool overlap_possible_with_any_in(const Node_List* p) const {
-    for (uint k = 0; k < p->size(); k++) {
-      MemNode* mem = p->at(k)->as_Mem();
+  bool overlap_possible_with_any_in(const GrowableArray<Node*>& nodes) const {
+    for (int i = 0; i < nodes.length(); i++) {
+      MemNode* mem = nodes.at(i)->as_Mem();
       VPointer p_mem(mem, _vloop);
       // Only if we know that we have Less or Greater can we
       // be sure that there can never be an overlap between
@@ -1323,12 +1323,4 @@ class AlignmentSolver {
 #endif
 };
 
-struct VTransformBoolTest {
-  const BoolTest::mask _mask;
-  const bool _is_negated;
-
-  VTransformBoolTest(const BoolTest::mask mask, bool is_negated) :
-    _mask(mask), _is_negated(is_negated) {}
-};
-
 #endif // SHARE_OPTO_VECTORIZATION_HPP
diff --git a/src/hotspot/share/opto/vtransform.cpp b/src/hotspot/share/opto/vtransform.cpp
new file mode 100644
index 0000000000000..e40157caa362b
--- /dev/null
+++ b/src/hotspot/share/opto/vtransform.cpp
@@ -0,0 +1,450 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 "opto/vtransform.hpp"
+#include "opto/vectornode.hpp"
+#include "opto/convertnode.hpp"
+
+void VTransformGraph::add_vtnode(VTransformNode* vtnode) {
+  assert(vtnode->_idx == _vtnodes.length(), "position must match idx");
+  _vtnodes.push(vtnode);
+}
+
+// Compute a linearization of the graph. We do this with a reverse-post-order of a DFS.
+// This only works if the graph is a directed acyclic graph (DAG). The C2 graph, and
+// the VLoopDependencyGraph are both DAGs, but after introduction of vectors/packs, the
+// graph has additional constraints which can introduce cycles. Example:
+//
+//                                                       +--------+
+//  A -> X                                               |        v
+//                     Pack [A,B] and [X,Y]             [A,B]    [X,Y]
+//  Y -> B                                                 ^        |
+//                                                         +--------+
+//
+// We return "true" IFF we find no cycle, i.e. if the linearization succeeds.
+bool VTransformGraph::schedule() {
+  assert(!is_scheduled(), "not yet scheduled");
+
+#ifndef PRODUCT
+  if (_trace._verbose) {
+    print_vtnodes();
+  }
+#endif
+
+  ResourceMark rm;
+  GrowableArray<VTransformNode*> stack;
+  VectorSet pre_visited;
+  VectorSet post_visited;
+
+  collect_nodes_without_req_or_dependency(stack);
+
+  // We create a reverse-post-visit order. This gives us a linearization, if there are
+  // no cycles. Then, we simply reverse the order, and we have a schedule.
+  int rpo_idx = _vtnodes.length() - 1;
+  while (!stack.is_empty()) {
+    VTransformNode* vtn = stack.top();
+    if (!pre_visited.test_set(vtn->_idx)) {
+      // Forward arc in graph (pre-visit).
+    } else if (!post_visited.test(vtn->_idx)) {
+      // Forward arc in graph. Check if all uses were already visited:
+      //   Yes -> post-visit.
+      //   No  -> we are mid-visit.
+      bool all_uses_already_visited = true;
+
+      for (int i = 0; i < vtn->outs(); i++) {
+        VTransformNode* use = vtn->out(i);
+        if (post_visited.test(use->_idx)) { continue; }
+        if (pre_visited.test(use->_idx)) {
+          // Cycle detected!
+          // The nodes that are pre_visited but not yet post_visited form a path from
+          // the "root" to the current vtn. Now, we are looking at an edge (vtn, use),
+          // and discover that use is also pre_visited but not post_visited. Thus, use
+          // lies on that path from "root" to vtn, and the edge (vtn, use) closes a
+          // cycle.
+          NOT_PRODUCT(if (_trace._rejections) { trace_schedule_cycle(stack, pre_visited, post_visited); } )
+          return false;
+        }
+        stack.push(use);
+        all_uses_already_visited = false;
+      }
+
+      if (all_uses_already_visited) {
+        stack.pop();
+        post_visited.set(vtn->_idx);           // post-visit
+        _schedule.at_put_grow(rpo_idx--, vtn); // assign rpo_idx
+      }
+    } else {
+      stack.pop(); // Already post-visited. Ignore secondary edge.
+    }
+  }
+
+#ifndef PRODUCT
+  if (_trace._verbose) {
+    print_schedule();
+  }
+#endif
+
+  assert(rpo_idx == -1, "used up all rpo_idx, rpo_idx=%d", rpo_idx);
+  return true;
+}
+
+// Push all "root" nodes, i.e. those that have no inputs (req or dependency):
+void VTransformGraph::collect_nodes_without_req_or_dependency(GrowableArray<VTransformNode*>& stack) const {
+  for (int i = 0; i < _vtnodes.length(); i++) {
+    VTransformNode* vtn = _vtnodes.at(i);
+    if (!vtn->has_req_or_dependency()) {
+      stack.push(vtn);
+    }
+  }
+}
+
+#ifndef PRODUCT
+void VTransformGraph::trace_schedule_cycle(const GrowableArray<VTransformNode*>& stack,
+                                           const VectorSet& pre_visited,
+                                           const VectorSet& post_visited) const {
+  tty->print_cr("\nVTransform::schedule found a cycle on path (P), vectorization attempt fails.");
+  for (int j = 0; j < stack.length(); j++) {
+    VTransformNode* n = stack.at(j);
+    bool on_path = pre_visited.test(n->_idx) && !post_visited.test(n->_idx);
+    tty->print("  %s ", on_path ? "P" : "_");
+    n->print();
+  }
+}
+
+void VTransformApplyResult::trace(VTransformNode* vtnode) const {
+  tty->print("  apply: ");
+  vtnode->print();
+  tty->print("    ->   ");
+  if (_node == nullptr) {
+    tty->print_cr("nullptr");
+  } else {
+    _node->dump();
+  }
+}
+#endif
+
+Node* VTransformNode::find_transformed_input(int i, const GrowableArray<Node*>& vnode_idx_to_transformed_node) const {
+  Node* n = vnode_idx_to_transformed_node.at(in(i)->_idx);
+  assert(n != nullptr, "must find input IR node");
+  return n;
+}
+
+VTransformApplyResult VTransformScalarNode::apply(const VLoopAnalyzer& vloop_analyzer,
+                                                  const GrowableArray<Node*>& vnode_idx_to_transformed_node) const {
+  // This was just wrapped. Now we simply unwap without touching the inputs.
+  return VTransformApplyResult::make_scalar(_node);
+}
+
+VTransformApplyResult VTransformReplicateNode::apply(const VLoopAnalyzer& vloop_analyzer,
+                                                     const GrowableArray<Node*>& vnode_idx_to_transformed_node) const {
+  Node* val = find_transformed_input(1, vnode_idx_to_transformed_node);
+  VectorNode* vn = VectorNode::scalar2vector(val, _vlen, _element_type);
+  register_new_node_from_vectorization(vloop_analyzer, vn, val);
+  return VTransformApplyResult::make_vector(vn, _vlen, vn->length_in_bytes());
+}
+
+VTransformApplyResult VTransformConvI2LNode::apply(const VLoopAnalyzer& vloop_analyzer,
+                                                   const GrowableArray<Node*>& vnode_idx_to_transformed_node) const {
+  Node* val = find_transformed_input(1, vnode_idx_to_transformed_node);
+  Node* n = new ConvI2LNode(val);
+  register_new_node_from_vectorization(vloop_analyzer, n, val);
+  return VTransformApplyResult::make_scalar(n);
+}
+
+VTransformApplyResult VTransformShiftCountNode::apply(const VLoopAnalyzer& vloop_analyzer,
+                                                      const GrowableArray<Node*>& vnode_idx_to_transformed_node) const {
+  PhaseIdealLoop* phase = vloop_analyzer.vloop().phase();
+  Node* shift_count_in = find_transformed_input(1, vnode_idx_to_transformed_node);
+  assert(shift_count_in->bottom_type()->isa_int(), "int type only for shift count");
+  // The shift_count_in would be automatically truncated to the lowest _mask
+  // bits in a scalar shift operation. But vector shift does not truncate, so
+  // we must apply the mask now.
+  Node* shift_count_masked = new AndINode(shift_count_in, phase->igvn().intcon(_mask));
+  register_new_node_from_vectorization(vloop_analyzer, shift_count_masked, shift_count_in);
+  // Now that masked value is "boadcast" (some platforms only set the lowest element).
+  VectorNode* vn = VectorNode::shift_count(_shift_opcode, shift_count_masked, _vlen, _element_bt);
+  register_new_node_from_vectorization(vloop_analyzer, vn, shift_count_in);
+  return VTransformApplyResult::make_vector(vn, _vlen, vn->length_in_bytes());
+}
+
+
+VTransformApplyResult VTransformPopulateIndexNode::apply(const VLoopAnalyzer& vloop_analyzer,
+                                                         const GrowableArray<Node*>& vnode_idx_to_transformed_node) const {
+  PhaseIdealLoop* phase = vloop_analyzer.vloop().phase();
+  Node* val = find_transformed_input(1, vnode_idx_to_transformed_node);
+  assert(val->is_Phi(), "expected to be iv");
+  assert(VectorNode::is_populate_index_supported(_element_bt), "should support");
+  const TypeVect* vt = TypeVect::make(_element_bt, _vlen);
+  VectorNode* vn = new PopulateIndexNode(val, phase->igvn().intcon(1), vt);
+  register_new_node_from_vectorization(vloop_analyzer, vn, val);
+  return VTransformApplyResult::make_vector(vn, _vlen, vn->length_in_bytes());
+}
+
+VTransformApplyResult VTransformElementWiseVectorNode::apply(const VLoopAnalyzer& vloop_analyzer,
+                                                             const GrowableArray<Node*>& vnode_idx_to_transformed_node) const {
+  Node* first = nodes().at(0);
+  uint  vlen = nodes().length();
+  int   opc  = first->Opcode();
+  BasicType bt = vloop_analyzer.types().velt_basic_type(first);
+
+  if (first->is_Cmp()) {
+    // Cmp + Bool -> VectorMaskCmp
+    // Handled by Bool / VTransformBoolVectorNode, so we do not generate any nodes here.
+    return VTransformApplyResult::make_empty();
+  }
+
+  assert(2 <= req() && req() <= 4, "Must have 1-3 inputs");
+  VectorNode* vn = nullptr;
+  Node* in1 =                find_transformed_input(1, vnode_idx_to_transformed_node);
+  Node* in2 = (req() >= 3) ? find_transformed_input(2, vnode_idx_to_transformed_node) : nullptr;
+  Node* in3 = (req() >= 4) ? find_transformed_input(3, vnode_idx_to_transformed_node) : nullptr;
+
+  if (first->is_CMove()) {
+    assert(req() == 4, "three inputs expected: mask, blend1, blend2");
+    vn = new VectorBlendNode(/* blend1 */ in2, /* blend2 */ in3, /* mask */ in1);
+  } else if (VectorNode::is_convert_opcode(opc)) {
+    assert(first->req() == 2 && req() == 2, "only one input expected");
+    int vopc = VectorCastNode::opcode(opc, in1->bottom_type()->is_vect()->element_basic_type());
+    vn = VectorCastNode::make(vopc, in1, bt, vlen);
+  } else if (VectorNode::can_use_RShiftI_instead_of_URShiftI(first, bt)) {
+    opc = Op_RShiftI;
+    vn = VectorNode::make(opc, in1, in2, vlen, bt);
+  } else if (VectorNode::is_scalar_op_that_returns_int_but_vector_op_returns_long(opc)) {
+    // The scalar operation was a long -> int operation.
+    // However, the vector operation is long -> long.
+    VectorNode* long_vn = VectorNode::make(opc, in1, nullptr, vlen, T_LONG);
+    register_new_node_from_vectorization(vloop_analyzer, long_vn, first);
+    // Cast long -> int, to mimic the scalar long -> int operation.
+    vn = VectorCastNode::make(Op_VectorCastL2X, long_vn, T_INT, vlen);
+  } else if (req() == 3 ||
+             VectorNode::is_scalar_unary_op_with_equal_input_and_output_types(opc)) {
+    assert(!VectorNode::is_roundopD(first) || in2->is_Con(), "rounding mode must be constant");
+    vn = VectorNode::make(opc, in1, in2, vlen, bt); // unary and binary
+  } else {
+    assert(req() == 4, "three inputs expected");
+    assert(opc == Op_FmaD ||
+           opc == Op_FmaF ||
+           opc == Op_SignumF ||
+           opc == Op_SignumD,
+           "element wise operation must be from this list");
+    vn = VectorNode::make(opc, in1, in2, in3, vlen, bt); // ternary
+  }
+
+  register_new_node_from_vectorization_and_replace_scalar_nodes(vloop_analyzer, vn);
+  return VTransformApplyResult::make_vector(vn, vlen, vn->length_in_bytes());
+}
+
+VTransformApplyResult VTransformBoolVectorNode::apply(const VLoopAnalyzer& vloop_analyzer,
+                                                      const GrowableArray<Node*>& vnode_idx_to_transformed_node) const {
+  BoolNode* first = nodes().at(0)->as_Bool();
+  uint  vlen = nodes().length();
+  BasicType bt = vloop_analyzer.types().velt_basic_type(first);
+
+  // Cmp + Bool -> VectorMaskCmp
+  VTransformElementWiseVectorNode* vtn_cmp = in(1)->isa_ElementWiseVector();
+  assert(vtn_cmp != nullptr && vtn_cmp->nodes().at(0)->is_Cmp(),
+         "bool vtn expects cmp vtn as input");
+
+  Node* cmp_in1 = vtn_cmp->find_transformed_input(1, vnode_idx_to_transformed_node);
+  Node* cmp_in2 = vtn_cmp->find_transformed_input(2, vnode_idx_to_transformed_node);
+  BoolTest::mask mask = test()._mask;
+
+  PhaseIdealLoop* phase = vloop_analyzer.vloop().phase();
+  ConINode* mask_node  = phase->igvn().intcon((int)mask);
+  const TypeVect* vt = TypeVect::make(bt, vlen);
+  VectorNode* vn = new VectorMaskCmpNode(mask, cmp_in1, cmp_in2, mask_node, vt);
+  register_new_node_from_vectorization_and_replace_scalar_nodes(vloop_analyzer, vn);
+  return VTransformApplyResult::make_vector(vn, vlen, vn->vect_type()->length_in_bytes());
+}
+
+VTransformApplyResult VTransformReductionVectorNode::apply(const VLoopAnalyzer& vloop_analyzer,
+                                                           const GrowableArray<Node*>& vnode_idx_to_transformed_node) const {
+  Node* first = nodes().at(0);
+  uint  vlen = nodes().length();
+  int   opc  = first->Opcode();
+  BasicType bt = first->bottom_type()->basic_type();
+
+  Node* init = find_transformed_input(1, vnode_idx_to_transformed_node);
+  Node* vec  = find_transformed_input(2, vnode_idx_to_transformed_node);
+
+  ReductionNode* vn = ReductionNode::make(opc, nullptr, init, vec, bt);
+  register_new_node_from_vectorization_and_replace_scalar_nodes(vloop_analyzer, vn);
+  return VTransformApplyResult::make_vector(vn, vlen, vn->vect_type()->length_in_bytes());
+}
+
+VTransformApplyResult VTransformLoadVectorNode::apply(const VLoopAnalyzer& vloop_analyzer,
+                                                      const GrowableArray<Node*>& vnode_idx_to_transformed_node) const {
+  LoadNode* first = nodes().at(0)->as_Load();
+  uint  vlen = nodes().length();
+  Node* ctrl = first->in(MemNode::Control);
+  Node* mem  = first->in(MemNode::Memory);
+  Node* adr  = first->in(MemNode::Address);
+  int   opc  = first->Opcode();
+  const TypePtr* adr_type = first->adr_type();
+  BasicType bt = vloop_analyzer.types().velt_basic_type(first);
+
+  // Set the memory dependency of the LoadVector as early as possible.
+  // Walk up the memory chain, and ignore any StoreVector that provably
+  // does not have any memory dependency.
+  while (mem->is_StoreVector()) {
+    VPointer p_store(mem->as_Mem(), vloop_analyzer.vloop());
+    if (p_store.overlap_possible_with_any_in(nodes())) {
+      break;
+    } else {
+      mem = mem->in(MemNode::Memory);
+    }
+  }
+
+  LoadVectorNode* vn = LoadVectorNode::make(opc, ctrl, mem, adr, adr_type, vlen, bt,
+                                            control_dependency());
+  DEBUG_ONLY( if (VerifyAlignVector) { vn->set_must_verify_alignment(); } )
+  register_new_node_from_vectorization_and_replace_scalar_nodes(vloop_analyzer, vn);
+  return VTransformApplyResult::make_vector(vn, vlen, vn->memory_size());
+}
+
+VTransformApplyResult VTransformStoreVectorNode::apply(const VLoopAnalyzer& vloop_analyzer,
+                                                       const GrowableArray<Node*>& vnode_idx_to_transformed_node) const {
+  StoreNode* first = nodes().at(0)->as_Store();
+  uint  vlen = nodes().length();
+  Node* ctrl = first->in(MemNode::Control);
+  Node* mem  = first->in(MemNode::Memory);
+  Node* adr  = first->in(MemNode::Address);
+  int   opc  = first->Opcode();
+  const TypePtr* adr_type = first->adr_type();
+
+  Node* value = find_transformed_input(MemNode::ValueIn, vnode_idx_to_transformed_node);
+  StoreVectorNode* vn = StoreVectorNode::make(opc, ctrl, mem, adr, adr_type, value, vlen);
+  DEBUG_ONLY( if (VerifyAlignVector) { vn->set_must_verify_alignment(); } )
+  register_new_node_from_vectorization_and_replace_scalar_nodes(vloop_analyzer, vn);
+  return VTransformApplyResult::make_vector(vn, vlen, vn->memory_size());
+}
+
+void VTransformVectorNode::register_new_node_from_vectorization_and_replace_scalar_nodes(const VLoopAnalyzer& vloop_analyzer, Node* vn) const {
+  PhaseIdealLoop* phase = vloop_analyzer.vloop().phase();
+  Node* first = nodes().at(0);
+
+  register_new_node_from_vectorization(vloop_analyzer, vn, first);
+
+  for (int i = 0; i < _nodes.length(); i++) {
+    Node* n = _nodes.at(i);
+    phase->igvn().replace_node(n, vn);
+  }
+}
+
+void VTransformNode::register_new_node_from_vectorization(const VLoopAnalyzer& vloop_analyzer, Node* vn, Node* old_node) const {
+  PhaseIdealLoop* phase = vloop_analyzer.vloop().phase();
+  phase->register_new_node_with_ctrl_of(vn, old_node);
+  phase->igvn()._worklist.push(vn);
+  VectorNode::trace_new_vector(vn, "AutoVectorization");
+}
+
+#ifndef PRODUCT
+void VTransformGraph::print_vtnodes() const {
+  tty->print_cr("\nVTransformGraph::print_vtnodes:");
+  for (int i = 0; i < _vtnodes.length(); i++) {
+    _vtnodes.at(i)->print();
+  }
+}
+
+void VTransformGraph::print_schedule() const {
+  tty->print_cr("\nVTransformGraph::print_schedule:");
+  for (int i = 0; i < _schedule.length(); i++) {
+    tty->print(" %3d: ", i);
+    VTransformNode* vtn = _schedule.at(i);
+    if (vtn == nullptr) {
+      tty->print_cr("nullptr");
+    } else {
+      vtn->print();
+    }
+  }
+}
+
+void VTransformGraph::print_memops_schedule() const {
+  tty->print_cr("\nVTransformGraph::print_memops_schedule:");
+  int i = 0;
+  for_each_memop_in_schedule([&] (MemNode* mem) {
+    tty->print(" %3d: ", i++);
+    mem->dump();
+  });
+}
+
+void VTransformNode::print() const {
+  tty->print("%3d %s (", _idx, name());
+  for (uint i = 0; i < _req; i++) {
+    print_node_idx(_in.at(i));
+  }
+  if ((uint)_in.length() > _req) {
+    tty->print(" |");
+    for (int i = _req; i < _in.length(); i++) {
+      print_node_idx(_in.at(i));
+    }
+  }
+  tty->print(") [");
+  for (int i = 0; i < _out.length(); i++) {
+    print_node_idx(_out.at(i));
+  }
+  tty->print("] ");
+  print_spec();
+  tty->cr();
+}
+
+void VTransformNode::print_node_idx(const VTransformNode* vtn) {
+  if (vtn == nullptr) {
+    tty->print(" _");
+  } else {
+    tty->print(" %d", vtn->_idx);
+  }
+}
+
+void VTransformScalarNode::print_spec() const {
+  tty->print("node[%d %s]", _node->_idx, _node->Name());
+}
+
+void VTransformReplicateNode::print_spec() const {
+  tty->print("vlen=%d element_type=", _vlen);
+  _element_type->dump();
+}
+
+void VTransformShiftCountNode::print_spec() const {
+  tty->print("vlen=%d element_bt=%s mask=%d shift_opcode=%s",
+             _vlen, type2name(_element_bt), _mask,
+             NodeClassNames[_shift_opcode]);
+}
+
+void VTransformPopulateIndexNode::print_spec() const {
+  tty->print("vlen=%d element_bt=%s", _vlen, type2name(_element_bt));
+}
+
+void VTransformVectorNode::print_spec() const {
+  tty->print("%d-pack[", _nodes.length());
+  for (int i = 0; i < _nodes.length(); i++) {
+    Node* n = _nodes.at(i);
+    if (i > 0) {
+      tty->print(", ");
+    }
+    tty->print("%d %s", n->_idx, n->Name());
+  }
+  tty->print("]");
+}
+#endif
diff --git a/src/hotspot/share/opto/vtransform.hpp b/src/hotspot/share/opto/vtransform.hpp
new file mode 100644
index 0000000000000..071674533a798
--- /dev/null
+++ b/src/hotspot/share/opto/vtransform.hpp
@@ -0,0 +1,515 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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_OPTO_VTRANSFORM_HPP
+#define SHARE_OPTO_VTRANSFORM_HPP
+
+#include "opto/node.hpp"
+#include "opto/vectorization.hpp"
+
+// VTransform:
+// - Models the transformation of the scalar loop to vectorized loop:
+//   It is a "C2 subgraph" -> "C2 subgraph" mapping.
+// - The VTransform contains a graph (VTransformGraph), which consists of
+//   many vtnodes (VTransformNode).
+// - Each vtnode models a part of the transformation, and is supposed
+//   to represent the output C2 nodes after the vectorization as closely
+//   as possible.
+//
+// This is the life-cycle of a VTransform:
+// - Construction:
+//   - From SuperWord, with the SuperWordVTransformBuilder.
+//
+// - Future Plans: optimize, if-conversion, etc.
+//
+// - Schedule:
+//   - Compute linearization of the VTransformGraph, into an order that respects
+//     all edges in the graph (bailout if cycle detected).
+//
+// - Apply:
+//   - Changes to the C2 IR are only made once the "apply" method is called.
+//   - Each vtnode generates its corresponding scalar and vector C2 nodes,
+//     possibly replacing old scalar C2 nodes.
+//
+// Future Plans with VTransform:
+// - Cost model: estimate if vectorization is profitable.
+// - Optimizations: moving unordered reductions out of the loop, whih decreases cost.
+// - Pack/Unpack/Shuffle: introduce additional nodes not present in the scalar loop.
+//                        This is difficult to do with the SuperWord packset approach.
+// - If-conversion: convert predicated nodes into CFG.
+
+typedef int VTransformNodeIDX;
+class VTransformNode;
+class VTransformScalarNode;
+class VTransformInputScalarNode;
+class VTransformVectorNode;
+class VTransformElementWiseVectorNode;
+class VTransformBoolVectorNode;
+class VTransformReductionVectorNode;
+
+// Result from VTransformNode::apply
+class VTransformApplyResult {
+private:
+  Node* const _node;
+  const uint _vector_length; // number of elements
+  const uint _vector_width;  // total width in bytes
+
+  VTransformApplyResult(Node* n, uint vector_length, uint vector_width) :
+    _node(n),
+    _vector_length(vector_length),
+    _vector_width(vector_width) {}
+
+public:
+  static VTransformApplyResult make_scalar(Node* n) {
+    return VTransformApplyResult(n, 0, 0);
+  }
+
+  static VTransformApplyResult make_vector(Node* n, uint vector_length, uint vector_width) {
+    assert(vector_length > 0 && vector_width > 0, "must have nonzero size");
+    return VTransformApplyResult(n, vector_length, vector_width);
+  }
+
+  static VTransformApplyResult make_empty() {
+    return VTransformApplyResult(nullptr, 0, 0);
+  }
+
+  Node* node() const { return _node; }
+  uint vector_length() const { return _vector_length; }
+  uint vector_width() const { return _vector_width; }
+  NOT_PRODUCT( void trace(VTransformNode* vtnode) const; )
+};
+
+#ifndef PRODUCT
+// Convenience class for tracing flags.
+class VTransformTrace {
+public:
+  const bool _verbose;
+  const bool _rejections;
+  const bool _align_vector;
+  const bool _info;
+
+  VTransformTrace(const VTrace& vtrace,
+                  const bool is_trace_rejections,
+                  const bool is_trace_align_vector,
+                  const bool is_trace_info) :
+    _verbose     (vtrace.is_trace(TraceAutoVectorizationTag::ALL)),
+    _rejections  (_verbose | is_trace_vtransform(vtrace) | is_trace_rejections),
+    _align_vector(_verbose | is_trace_vtransform(vtrace) | is_trace_align_vector),
+    _info        (_verbose | is_trace_vtransform(vtrace) | is_trace_info) {}
+
+  static bool is_trace_vtransform(const VTrace& vtrace) {
+    return vtrace.is_trace(TraceAutoVectorizationTag::VTRANSFORM);
+  }
+};
+#endif
+
+// VTransformGraph: component of VTransform
+// See description at top of this file.
+class VTransformGraph : public StackObj {
+private:
+  const VLoopAnalyzer& _vloop_analyzer;
+  const VLoop& _vloop;
+
+  NOT_PRODUCT(const VTransformTrace _trace;)
+
+  VTransformNodeIDX _next_idx;
+  GrowableArray<VTransformNode*> _vtnodes;
+
+  // Schedule (linearization) of the graph. We use this to reorder the memory graph
+  // before inserting vector operations.
+  GrowableArray<VTransformNode*> _schedule;
+
+public:
+  VTransformGraph(const VLoopAnalyzer& vloop_analyzer,
+                  Arena& arena
+                  NOT_PRODUCT( COMMA const VTransformTrace trace)) :
+    _vloop_analyzer(vloop_analyzer),
+    _vloop(vloop_analyzer.vloop()),
+    NOT_PRODUCT(_trace(trace) COMMA)
+    _next_idx(0),
+    _vtnodes(&arena, _vloop.estimated_body_length(), 0, nullptr),
+    _schedule(&arena, _vloop.estimated_body_length(), 0, nullptr) {}
+
+  VTransformNodeIDX new_idx() { return _next_idx++; }
+  void add_vtnode(VTransformNode* vtnode);
+  DEBUG_ONLY( bool is_empty() const { return _vtnodes.is_empty(); } )
+  DEBUG_ONLY( bool is_scheduled() const { return _schedule.is_nonempty(); } )
+  const GrowableArray<VTransformNode*>& vtnodes() const { return _vtnodes; }
+
+  bool schedule();
+  void apply_memops_reordering_with_schedule() const;
+  void apply_vectorization_for_each_vtnode(uint& max_vector_length, uint& max_vector_width) const;
+
+private:
+  // VLoop accessors
+  PhaseIdealLoop* phase()     const { return _vloop.phase(); }
+  PhaseIterGVN& igvn()        const { return _vloop.phase()->igvn(); }
+  bool in_bb(const Node* n)   const { return _vloop.in_bb(n); }
+
+  void collect_nodes_without_req_or_dependency(GrowableArray<VTransformNode*>& stack) const;
+
+  template<typename Callback>
+  void for_each_memop_in_schedule(Callback callback) const;
+
+#ifndef PRODUCT
+  void print_vtnodes() const;
+  void print_schedule() const;
+  void print_memops_schedule() const;
+  void trace_schedule_cycle(const GrowableArray<VTransformNode*>& stack,
+                            const VectorSet& pre_visited,
+                            const VectorSet& post_visited) const;
+#endif
+};
+
+// VTransform: models the transformation of the scalar loop to vectorized loop.
+// It is a "C2 subgraph" to "C2 subgraph" mapping.
+// See description at top of this file.
+class VTransform : public StackObj {
+private:
+  const VLoopAnalyzer& _vloop_analyzer;
+  const VLoop& _vloop;
+
+  NOT_PRODUCT(const VTransformTrace _trace;)
+
+  // Everything in the vtransform is allocated from this arena, including all vtnodes.
+  Arena _arena;
+
+  VTransformGraph _graph;
+
+  // Memory reference, and the alignment width (aw) for which we align the main-loop,
+  // by adjusting the pre-loop limit.
+  MemNode const* _mem_ref_for_main_loop_alignment;
+  int _aw_for_main_loop_alignment;
+
+public:
+  VTransform(const VLoopAnalyzer& vloop_analyzer,
+             MemNode const* mem_ref_for_main_loop_alignment,
+             int aw_for_main_loop_alignment
+             NOT_PRODUCT( COMMA const VTransformTrace trace)
+             ) :
+    _vloop_analyzer(vloop_analyzer),
+    _vloop(vloop_analyzer.vloop()),
+    NOT_PRODUCT(_trace(trace) COMMA)
+    _arena(mtCompiler),
+    _graph(_vloop_analyzer, _arena NOT_PRODUCT(COMMA _trace)),
+    _mem_ref_for_main_loop_alignment(mem_ref_for_main_loop_alignment),
+    _aw_for_main_loop_alignment(aw_for_main_loop_alignment) {}
+
+  const VLoopAnalyzer& vloop_analyzer() const { return _vloop_analyzer; }
+  Arena* arena() { return &_arena; }
+  DEBUG_ONLY( bool has_graph() const { return !_graph.is_empty(); } )
+  VTransformGraph& graph() { return _graph; }
+
+  bool schedule() { return _graph.schedule(); }
+  void apply();
+
+private:
+  // VLoop accessors
+  PhaseIdealLoop* phase()     const { return _vloop.phase(); }
+  PhaseIterGVN& igvn()        const { return _vloop.phase()->igvn(); }
+  IdealLoopTree* lpt()        const { return _vloop.lpt(); }
+  CountedLoopNode* cl()       const { return _vloop.cl(); }
+  int iv_stride()             const { return cl()->stride_con(); }
+
+  // VLoopVPointers accessors
+  const VPointer& vpointer(const MemNode* mem) const {
+    return _vloop_analyzer.vpointers().vpointer(mem);
+  }
+
+  // Ensure that the main loop vectors are aligned by adjusting the pre loop limit.
+  void determine_mem_ref_and_aw_for_main_loop_alignment();
+  void adjust_pre_loop_limit_to_align_main_loop_vectors();
+
+  void apply_vectorization() const;
+};
+
+// The vtnodes (VTransformNode) resemble the C2 IR Nodes, and model a part of the
+// VTransform. Many such vtnodes make up the VTransformGraph. The vtnodes represent
+// the resulting scalar and vector nodes as closely as possible.
+// See description at top of this file.
+class VTransformNode : public ArenaObj {
+public:
+  const VTransformNodeIDX _idx;
+
+private:
+  // _in is split into required inputs (_req), and additional dependencies.
+  const uint _req;
+  GrowableArray<VTransformNode*> _in;
+  GrowableArray<VTransformNode*> _out;
+
+public:
+  VTransformNode(VTransform& vtransform, const uint req) :
+    _idx(vtransform.graph().new_idx()),
+    _req(req),
+    _in(vtransform.arena(),  req, req, nullptr),
+    _out(vtransform.arena(), 4, 0, nullptr)
+  {
+    vtransform.graph().add_vtnode(this);
+  }
+
+  void set_req(uint i, VTransformNode* n) {
+    assert(i < _req, "must be a req");
+    assert(_in.at(i) == nullptr && n != nullptr, "only set once");
+    _in.at_put(i, n);
+    n->add_out(this);
+  }
+
+  void swap_req(uint i, uint j) {
+    assert(i < _req, "must be a req");
+    assert(j < _req, "must be a req");
+    VTransformNode* tmp = _in.at(i);
+    _in.at_put(i, _in.at(j));
+    _in.at_put(j, tmp);
+  }
+
+  void add_dependency(VTransformNode* n) {
+    assert(n != nullptr, "no need to add nullptr");
+    _in.push(n);
+    n->add_out(this);
+  }
+
+  void add_out(VTransformNode* n) {
+    _out.push(n);
+  }
+
+  uint req() const { return _req; }
+  VTransformNode* in(int i) const { return _in.at(i); }
+  int outs() const { return _out.length(); }
+  VTransformNode* out(int i) const { return _out.at(i); }
+
+  bool has_req_or_dependency() const {
+    for (int i = 0; i < _in.length(); i++) {
+      if (_in.at(i) != nullptr) { return true; }
+    }
+    return false;
+  }
+
+  virtual VTransformScalarNode* isa_Scalar() { return nullptr; }
+  virtual VTransformInputScalarNode* isa_InputScalar() { return nullptr; }
+  virtual VTransformVectorNode* isa_Vector() { return nullptr; }
+  virtual VTransformElementWiseVectorNode* isa_ElementWiseVector() { return nullptr; }
+  virtual VTransformBoolVectorNode* isa_BoolVector() { return nullptr; }
+  virtual VTransformReductionVectorNode* isa_ReductionVector() { return nullptr; }
+
+  virtual VTransformApplyResult apply(const VLoopAnalyzer& vloop_analyzer,
+                                      const GrowableArray<Node*>& vnode_idx_to_transformed_node) const = 0;
+
+  Node* find_transformed_input(int i, const GrowableArray<Node*>& vnode_idx_to_transformed_node) const;
+
+  void register_new_node_from_vectorization(const VLoopAnalyzer& vloop_analyzer, Node* vn, Node* old_node) const;
+
+  NOT_PRODUCT(virtual const char* name() const = 0;)
+  NOT_PRODUCT(void print() const;)
+  NOT_PRODUCT(virtual void print_spec() const {};)
+  NOT_PRODUCT(static void print_node_idx(const VTransformNode* vtn);)
+};
+
+// Identity transform for scalar nodes.
+class VTransformScalarNode : public VTransformNode {
+private:
+  Node* _node;
+public:
+  VTransformScalarNode(VTransform& vtransform, Node* n) :
+    VTransformNode(vtransform, n->req()), _node(n) {}
+  Node* node() const { return _node; }
+  virtual VTransformScalarNode* isa_Scalar() override { return this; }
+  virtual VTransformApplyResult apply(const VLoopAnalyzer& vloop_analyzer,
+                                      const GrowableArray<Node*>& vnode_idx_to_transformed_node) const override;
+  NOT_PRODUCT(virtual const char* name() const override { return "Scalar"; };)
+  NOT_PRODUCT(virtual void print_spec() const override;)
+};
+
+// Wrapper node for nodes outside the loop that are inputs to nodes in the loop.
+// Since we want the loop-internal nodes to be able to reference all inputs as vtnodes,
+// we must wrap the inputs that are outside the loop into special vtnodes, too.
+class VTransformInputScalarNode : public VTransformScalarNode {
+public:
+  VTransformInputScalarNode(VTransform& vtransform, Node* n) :
+    VTransformScalarNode(vtransform, n) {}
+  virtual VTransformInputScalarNode* isa_InputScalar() override { return this; }
+  NOT_PRODUCT(virtual const char* name() const override { return "InputScalar"; };)
+};
+
+// Transform produces a ReplicateNode, replicating the input to all vector lanes.
+class VTransformReplicateNode : public VTransformNode {
+private:
+  int _vlen;
+  const Type* _element_type;
+public:
+  VTransformReplicateNode(VTransform& vtransform, int vlen, const Type* element_type) :
+    VTransformNode(vtransform, 2), _vlen(vlen), _element_type(element_type) {}
+  virtual VTransformApplyResult apply(const VLoopAnalyzer& vloop_analyzer,
+                                      const GrowableArray<Node*>& vnode_idx_to_transformed_node) const override;
+  NOT_PRODUCT(virtual const char* name() const override { return "Replicate"; };)
+  NOT_PRODUCT(virtual void print_spec() const override;)
+};
+
+// Transform introduces a scalar ConvI2LNode that was not previously in the C2 graph.
+class VTransformConvI2LNode : public VTransformNode {
+public:
+  VTransformConvI2LNode(VTransform& vtransform) : VTransformNode(vtransform, 2) {}
+  virtual VTransformApplyResult apply(const VLoopAnalyzer& vloop_analyzer,
+                                      const GrowableArray<Node*>& vnode_idx_to_transformed_node) const override;
+  NOT_PRODUCT(virtual const char* name() const override { return "ConvI2L"; };)
+};
+
+// Transform introduces a shift-count node that truncates the shift count for a vector shift.
+class VTransformShiftCountNode : public VTransformNode {
+private:
+  int _vlen;
+  const BasicType _element_bt;
+  juint _mask;
+  int _shift_opcode;
+public:
+  VTransformShiftCountNode(VTransform& vtransform, int vlen, BasicType element_bt, juint mask, int shift_opcode) :
+    VTransformNode(vtransform, 2), _vlen(vlen), _element_bt(element_bt), _mask(mask), _shift_opcode(shift_opcode) {}
+  virtual VTransformApplyResult apply(const VLoopAnalyzer& vloop_analyzer,
+                                      const GrowableArray<Node*>& vnode_idx_to_transformed_node) const override;
+  NOT_PRODUCT(virtual const char* name() const override { return "ShiftCount"; };)
+  NOT_PRODUCT(virtual void print_spec() const override;)
+};
+
+// Transform introduces a PopulateIndex node: [phi, phi+1, phi+2, phi+3, ...].
+class VTransformPopulateIndexNode : public VTransformNode {
+private:
+  int _vlen;
+  const BasicType _element_bt;
+public:
+  VTransformPopulateIndexNode(VTransform& vtransform, int vlen, const BasicType element_bt) :
+    VTransformNode(vtransform, 2), _vlen(vlen), _element_bt(element_bt) {}
+  virtual VTransformApplyResult apply(const VLoopAnalyzer& vloop_analyzer,
+                                      const GrowableArray<Node*>& vnode_idx_to_transformed_node) const override;
+  NOT_PRODUCT(virtual const char* name() const override { return "PopulateIndex"; };)
+  NOT_PRODUCT(virtual void print_spec() const override;)
+};
+
+// Base class for all vector vtnodes.
+class VTransformVectorNode : public VTransformNode {
+private:
+  GrowableArray<Node*> _nodes;
+public:
+  VTransformVectorNode(VTransform& vtransform, const uint req, const uint number_of_nodes) :
+    VTransformNode(vtransform, req), _nodes(vtransform.arena(), number_of_nodes, number_of_nodes, nullptr) {}
+
+  void set_nodes(const Node_List* pack) {
+    for (uint k = 0; k < pack->size(); k++) {
+      _nodes.at_put(k, pack->at(k));
+    }
+  }
+
+  const GrowableArray<Node*>& nodes() const { return _nodes; }
+  virtual VTransformVectorNode* isa_Vector() override { return this; }
+  void register_new_node_from_vectorization_and_replace_scalar_nodes(const VLoopAnalyzer& vloop_analyzer, Node* vn) const;
+  NOT_PRODUCT(virtual void print_spec() const override;)
+};
+
+// Catch all for all element-wise vector operations.
+class VTransformElementWiseVectorNode : public VTransformVectorNode {
+public:
+  VTransformElementWiseVectorNode(VTransform& vtransform, uint req, uint number_of_nodes) :
+    VTransformVectorNode(vtransform, req, number_of_nodes) {}
+  virtual VTransformElementWiseVectorNode* isa_ElementWiseVector() override { return this; }
+  virtual VTransformApplyResult apply(const VLoopAnalyzer& vloop_analyzer,
+                                      const GrowableArray<Node*>& vnode_idx_to_transformed_node) const override;
+  NOT_PRODUCT(virtual const char* name() const override { return "ElementWiseVector"; };)
+};
+
+struct VTransformBoolTest {
+  const BoolTest::mask _mask;
+  const bool _is_negated;
+
+  VTransformBoolTest(const BoolTest::mask mask, bool is_negated) :
+    _mask(mask), _is_negated(is_negated) {}
+};
+
+class VTransformBoolVectorNode : public VTransformElementWiseVectorNode {
+private:
+  const VTransformBoolTest _test;
+public:
+  VTransformBoolVectorNode(VTransform& vtransform, uint number_of_nodes, VTransformBoolTest test) :
+    VTransformElementWiseVectorNode(vtransform, 2, number_of_nodes), _test(test) {}
+  VTransformBoolTest test() const { return _test; }
+  virtual VTransformBoolVectorNode* isa_BoolVector() override { return this; }
+  virtual VTransformApplyResult apply(const VLoopAnalyzer& vloop_analyzer,
+                                      const GrowableArray<Node*>& vnode_idx_to_transformed_node) const override;
+  NOT_PRODUCT(virtual const char* name() const override { return "BoolVector"; };)
+};
+
+class VTransformReductionVectorNode : public VTransformVectorNode {
+public:
+  // req = 3 -> [ctrl, scalar init, vector]
+  VTransformReductionVectorNode(VTransform& vtransform, uint number_of_nodes) :
+    VTransformVectorNode(vtransform, 3, number_of_nodes) {}
+  virtual VTransformReductionVectorNode* isa_ReductionVector() override { return this; }
+  virtual VTransformApplyResult apply(const VLoopAnalyzer& vloop_analyzer,
+                                      const GrowableArray<Node*>& vnode_idx_to_transformed_node) const override;
+  NOT_PRODUCT(virtual const char* name() const override { return "ReductionVector"; };)
+};
+
+class VTransformLoadVectorNode : public VTransformVectorNode {
+public:
+  // req = 3 -> [ctrl, mem, adr]
+  VTransformLoadVectorNode(VTransform& vtransform, uint number_of_nodes) :
+    VTransformVectorNode(vtransform, 3, number_of_nodes) {}
+  LoadNode::ControlDependency control_dependency() const;
+  virtual VTransformApplyResult apply(const VLoopAnalyzer& vloop_analyzer,
+                                      const GrowableArray<Node*>& vnode_idx_to_transformed_node) const override;
+  NOT_PRODUCT(virtual const char* name() const override { return "LoadVector"; };)
+};
+
+class VTransformStoreVectorNode : public VTransformVectorNode {
+public:
+  // req = 4 -> [ctrl, mem, adr, val]
+  VTransformStoreVectorNode(VTransform& vtransform, uint number_of_nodes) :
+    VTransformVectorNode(vtransform, 4, number_of_nodes) {}
+  virtual VTransformApplyResult apply(const VLoopAnalyzer& vloop_analyzer,
+                                      const GrowableArray<Node*>& vnode_idx_to_transformed_node) const override;
+  NOT_PRODUCT(virtual const char* name() const override { return "StoreVector"; };)
+};
+
+// Invoke callback on all memops, in the order of the schedule.
+template<typename Callback>
+void VTransformGraph::for_each_memop_in_schedule(Callback callback) const {
+  assert(_schedule.length() == _vtnodes.length(), "schedule was computed");
+
+  for (int i = 0; i < _schedule.length(); i++) {
+    VTransformNode* vtn = _schedule.at(i);
+
+    // We can ignore input nodes, they are outside the loop.
+    if (vtn->isa_InputScalar() != nullptr) { continue; }
+
+    VTransformScalarNode* scalar = vtn->isa_Scalar();
+    if (scalar != nullptr && scalar->node()->is_Mem()) {
+      callback(scalar->node()->as_Mem());
+    }
+
+    VTransformVectorNode* vector = vtn->isa_Vector();
+    if (vector != nullptr && vector->nodes().at(0)->is_Mem()) {
+      for (int j = 0; j < vector->nodes().length(); j++) {
+        callback(vector->nodes().at(j)->as_Mem());
+      }
+    }
+  }
+}
+
+#endif // SHARE_OPTO_VTRANSFORM_HPP

From 55fd1ed228ea3c42aaf92579e5dcb818fe14351d Mon Sep 17 00:00:00 2001
From: Jatin Bhateja <jbhateja@openjdk.org>
Date: Mon, 8 Jul 2024 06:42:46 +0000
Subject: [PATCH 008/401] 8333890: Fatal error in auto-vectorizer with float16
 kernel.

Reviewed-by: kvn
---
 src/hotspot/share/opto/superword.cpp          |  6 ++
 .../TestFloat16VectorConvChain.java           | 65 +++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorConvChain.java

diff --git a/src/hotspot/share/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp
index ba2dd423bf51d..5721f7bcd5420 100644
--- a/src/hotspot/share/opto/superword.cpp
+++ b/src/hotspot/share/opto/superword.cpp
@@ -2586,6 +2586,12 @@ const Type* VLoopTypes::container_type(Node* n) const {
   }
   const Type* t = _vloop.phase()->igvn().type(n);
   if (t->basic_type() == T_INT) {
+    // Float to half float conversion may be succeeded by a conversion from
+    // half float to float, in such a case back propagation of narrow type (SHORT)
+    // may not be possible.
+    if (n->Opcode() == Op_ConvF2HF) {
+      return TypeInt::SHORT;
+    }
     // A narrow type of arithmetic operations will be determined by
     // propagating the type of memory operations.
     return TypeInt::INT;
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorConvChain.java b/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorConvChain.java
new file mode 100644
index 0000000000000..6b090c965bb8c
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorConvChain.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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
+* @summary Test Float16 vector conversion chain.
+* @requires vm.compiler2.enabled
+* @library /test/lib /
+* @run driver compiler.vectorization.TestFloat16VectorConvChain
+*/
+
+package compiler.vectorization;
+
+import compiler.lib.ir_framework.*;
+import java.util.Random;
+import java.util.Arrays;
+
+
+public class TestFloat16VectorConvChain {
+
+    @Test
+    @IR(counts = {IRNode.VECTOR_CAST_HF2F, IRNode.VECTOR_SIZE_ANY, ">= 1", IRNode.VECTOR_CAST_F2HF, IRNode.VECTOR_SIZE_ANY, " >= 1"})
+    public static void test(short [] res, short [] src1, short [] src2) {
+        for (int i = 0; i < res.length; i++) {
+            res[i] = (short)Float.float16ToFloat(Float.floatToFloat16(Float.float16ToFloat(src1[i]) + Float.float16ToFloat(src2[i])));
+        }
+    }
+
+    @Run(test = {"test"})
+    @Warmup(1000)
+    public static void micro() {
+        short [] res = new short[1024];
+        short [] src1 = new short[1024];
+        short [] src2 = new short[1024];
+        Arrays.fill(src1, (short)Float.floatToFloat16(1.0f));
+        Arrays.fill(src2, (short)Float.floatToFloat16(2.0f));
+        for (int i = 0; i < 1000; i++) {
+            test(res, src1, src2);
+        }
+    }
+
+    public static void main(String [] args) {
+        TestFramework.run(TestFloat16VectorConvChain.class);
+    }
+}

From 3cce31ad8877ec62429981871bcb0067770f9ccb Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Mon, 8 Jul 2024 08:06:56 +0000
Subject: [PATCH 009/401] 8335643: serviceability/dcmd/vm tests fail for ZGC
 after JDK-8322475

Reviewed-by: sgehwolf, dholmes
---
 test/hotspot/jtreg/ProblemList-generational-zgc.txt           | 3 ---
 test/hotspot/jtreg/ProblemList-zgc.txt                        | 3 ---
 .../jtreg/serviceability/dcmd/vm/SystemMapTestBase.java       | 4 +++-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/test/hotspot/jtreg/ProblemList-generational-zgc.txt b/test/hotspot/jtreg/ProblemList-generational-zgc.txt
index bdeed9947c571..db8182641ac54 100644
--- a/test/hotspot/jtreg/ProblemList-generational-zgc.txt
+++ b/test/hotspot/jtreg/ProblemList-generational-zgc.txt
@@ -114,7 +114,4 @@ serviceability/sa/sadebugd/PmapOnDebugdTest.java              8307393   generic-
 serviceability/sa/sadebugd/RunCommandOnServerTest.java        8307393   generic-all
 serviceability/sa/sadebugd/SADebugDTest.java                  8307393   generic-all
 
-serviceability/dcmd/vm/SystemMapTest.java                     8335643   generic-all
-serviceability/dcmd/vm/SystemDumpMapTest.java                 8335643   generic-all
-
 vmTestbase/gc/gctests/MemoryEaterMT/MemoryEaterMT.java        8289582   windows-x64
diff --git a/test/hotspot/jtreg/ProblemList-zgc.txt b/test/hotspot/jtreg/ProblemList-zgc.txt
index 892c980b0696d..1afe56c99f8af 100644
--- a/test/hotspot/jtreg/ProblemList-zgc.txt
+++ b/test/hotspot/jtreg/ProblemList-zgc.txt
@@ -45,7 +45,4 @@ serviceability/sa/TestSysProps.java                           8302055   generic-
 
 serviceability/sa/TestHeapDumpForInvokeDynamic.java           8315646   generic-all
 
-serviceability/dcmd/vm/SystemMapTest.java                     8335643   generic-all
-serviceability/dcmd/vm/SystemDumpMapTest.java                 8335643   generic-all
-
 vmTestbase/gc/gctests/MemoryEaterMT/MemoryEaterMT.java        8289582   windows-x64
diff --git a/test/hotspot/jtreg/serviceability/dcmd/vm/SystemMapTestBase.java b/test/hotspot/jtreg/serviceability/dcmd/vm/SystemMapTestBase.java
index 20dc8d70d7a47..000e977a590e5 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/vm/SystemMapTestBase.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/vm/SystemMapTestBase.java
@@ -42,6 +42,8 @@ public class SystemMapTestBase {
     private static final String regexBase_committed = regexBase + "com.*";
     private static final String regexBase_shared_and_committed = regexBase + "shrd,com.*";
 
+    // java heap is either committed, non-shared, or - in case of ZGC - committed and shared.
+    private static final String regexBase_java_heap = regexBase + "(shrd,)?com.*";
     protected static final String shouldMatchUnconditionally[] = {
         // java launcher
         regexBase_committed + "/bin/java",
@@ -54,7 +56,7 @@ public class SystemMapTestBase {
     };
 
     protected static final String shouldMatchIfNMTIsEnabled[] = {
-        regexBase_committed + "JAVAHEAP.*",
+        regexBase_java_heap + "JAVAHEAP.*",
         // metaspace
         regexBase_committed + "META.*",
         // parts of metaspace should be uncommitted

From 540188fdebd089d4145eca18c0f95bf338cbcefc Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Mon, 8 Jul 2024 10:03:39 +0000
Subject: [PATCH 010/401] 8334445: Parallel: Decouple maximum compaction from
 SoftReference clearing

Reviewed-by: zgu, lmao
---
 .../gc/parallel/parallelScavengeHeap.cpp      |  6 +--
 .../share/gc/parallel/psParallelCompact.cpp   | 50 +++++++++----------
 .../share/gc/parallel/psParallelCompact.hpp   |  9 ++--
 src/hotspot/share/gc/parallel/psScavenge.cpp  |  4 +-
 4 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
index 665b14bb1eabf..33a499ce47134 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
@@ -441,11 +441,7 @@ HeapWord* ParallelScavengeHeap::mem_allocate_old_gen(size_t size) {
 }
 
 void ParallelScavengeHeap::do_full_collection(bool clear_all_soft_refs) {
-  // The do_full_collection() parameter clear_all_soft_refs
-  // is interpreted here as maximum_compaction which will
-  // cause SoftRefs to be cleared.
-  bool maximum_compaction = clear_all_soft_refs;
-  PSParallelCompact::invoke(maximum_compaction);
+  PSParallelCompact::invoke(clear_all_soft_refs);
 }
 
 // Failed allocation policy. Must be called from the VM thread, and
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index b4fe706d1e410..d4a24b710cfae 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -826,15 +826,21 @@ void PSParallelCompact::fill_dense_prefix_end(SpaceId id) {
   }
 }
 
-bool PSParallelCompact::reassess_maximum_compaction(bool maximum_compaction,
-                                                    size_t total_live_words,
-                                                    MutableSpace* const old_space,
-                                                    HeapWord* full_region_prefix_end) {
+bool PSParallelCompact::check_maximum_compaction(size_t total_live_words,
+                                                 MutableSpace* const old_space,
+                                                 HeapWord* full_region_prefix_end) {
+
+  ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
+
+  // Check System.GC
+  bool is_max_on_system_gc = UseMaximumCompactionOnSystemGC
+                          && GCCause::is_user_requested_gc(heap->gc_cause());
+
   // Check if all live objs are larger than old-gen.
   const bool is_old_gen_overflowing = (total_live_words > old_space->capacity_in_words());
 
   // JVM flags
-  const uint total_invocations = ParallelScavengeHeap::heap()->total_full_collections();
+  const uint total_invocations = heap->total_full_collections();
   assert(total_invocations >= _maximum_compaction_gc_num, "sanity");
   const size_t gcs_since_max = total_invocations - _maximum_compaction_gc_num;
   const bool is_interval_ended = gcs_since_max > HeapMaximumCompactionInterval;
@@ -843,7 +849,7 @@ bool PSParallelCompact::reassess_maximum_compaction(bool maximum_compaction,
   const bool is_region_full =
     full_region_prefix_end >= _summary_data.region_align_down(old_space->top());
 
-  if (maximum_compaction || is_old_gen_overflowing || is_interval_ended || is_region_full) {
+  if (is_max_on_system_gc || is_old_gen_overflowing || is_interval_ended || is_region_full) {
     _maximum_compaction_gc_num = total_invocations;
     return true;
   }
@@ -851,7 +857,7 @@ bool PSParallelCompact::reassess_maximum_compaction(bool maximum_compaction,
   return false;
 }
 
-void PSParallelCompact::summary_phase(bool maximum_compaction)
+void PSParallelCompact::summary_phase()
 {
   GCTraceTime(Info, gc, phases) tm("Summary Phase", &_gc_timer);
 
@@ -874,10 +880,9 @@ void PSParallelCompact::summary_phase(bool maximum_compaction)
       _space_info[i].set_dense_prefix(space->bottom());
     }
 
-    maximum_compaction = reassess_maximum_compaction(maximum_compaction,
-                                                     total_live_words,
-                                                     old_space,
-                                                     full_region_prefix_end);
+    bool maximum_compaction = check_maximum_compaction(total_live_words,
+                                                       old_space,
+                                                       full_region_prefix_end);
     HeapWord* dense_prefix_end =
       maximum_compaction ? full_region_prefix_end
                          : compute_dense_prefix_for_old_space(old_space,
@@ -958,26 +963,23 @@ void PSParallelCompact::summary_phase(bool maximum_compaction)
 // may be true because this method can be called without intervening
 // activity.  For example when the heap space is tight and full measure
 // are being taken to free space.
-bool PSParallelCompact::invoke(bool maximum_heap_compaction) {
+bool PSParallelCompact::invoke(bool clear_all_soft_refs) {
   assert(SafepointSynchronize::is_at_safepoint(), "should be at safepoint");
   assert(Thread::current() == (Thread*)VMThread::vm_thread(),
          "should be in vm thread");
 
-  ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
-  assert(!heap->is_stw_gc_active(), "not reentrant");
-
   IsSTWGCActiveMark mark;
 
-  const bool clear_all_soft_refs =
-    heap->soft_ref_policy()->should_clear_all_soft_refs();
+  ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
+  clear_all_soft_refs = clear_all_soft_refs
+                     || heap->soft_ref_policy()->should_clear_all_soft_refs();
 
-  return PSParallelCompact::invoke_no_policy(clear_all_soft_refs ||
-                                             maximum_heap_compaction);
+  return PSParallelCompact::invoke_no_policy(clear_all_soft_refs);
 }
 
 // This method contains no policy. You should probably
 // be calling invoke() instead.
-bool PSParallelCompact::invoke_no_policy(bool maximum_heap_compaction) {
+bool PSParallelCompact::invoke_no_policy(bool clear_all_soft_refs) {
   assert(SafepointSynchronize::is_at_safepoint(), "must be at a safepoint");
   assert(ref_processor() != nullptr, "Sanity");
 
@@ -998,7 +1000,7 @@ bool PSParallelCompact::invoke_no_policy(bool maximum_heap_compaction) {
 
   // The scope of casr should end after code that can change
   // SoftRefPolicy::_should_clear_all_soft_refs.
-  ClearedAllSoftRefs casr(maximum_heap_compaction,
+  ClearedAllSoftRefs casr(clear_all_soft_refs,
                           heap->soft_ref_policy());
 
   // Make sure data structures are sane, make the heap parsable, and do other
@@ -1033,7 +1035,7 @@ bool PSParallelCompact::invoke_no_policy(bool maximum_heap_compaction) {
     DerivedPointerTable::clear();
 #endif
 
-    ref_processor()->start_discovery(maximum_heap_compaction);
+    ref_processor()->start_discovery(clear_all_soft_refs);
 
     ClassUnloadingContext ctx(1 /* num_nmethod_unlink_workers */,
                               false /* unregister_nmethods_during_purge */,
@@ -1041,9 +1043,7 @@ bool PSParallelCompact::invoke_no_policy(bool maximum_heap_compaction) {
 
     marking_phase(&_gc_tracer);
 
-    bool max_on_system_gc = UseMaximumCompactionOnSystemGC
-      && GCCause::is_user_requested_gc(gc_cause);
-    summary_phase(maximum_heap_compaction || max_on_system_gc);
+    summary_phase();
 
 #if COMPILER2_OR_JVMCI
     assert(DerivedPointerTable::is_active(), "Sanity");
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.hpp
index 93ea7aed78e9f..1e04beb8c66f6 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.hpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.hpp
@@ -723,10 +723,9 @@ class PSParallelCompact : AllStatic {
   static void pre_compact();
   static void post_compact();
 
-  static bool reassess_maximum_compaction(bool maximum_compaction,
-                                          size_t total_live_words,
-                                          MutableSpace* const old_space,
-                                          HeapWord* full_region_prefix_end);
+  static bool check_maximum_compaction(size_t total_live_words,
+                                       MutableSpace* const old_space,
+                                       HeapWord* full_region_prefix_end);
 
   // Mark live objects
   static void marking_phase(ParallelOldTracer *gc_tracer);
@@ -739,7 +738,7 @@ class PSParallelCompact : AllStatic {
   // make the heap parsable.
   static void fill_dense_prefix_end(SpaceId id);
 
-  static void summary_phase(bool maximum_compaction);
+  static void summary_phase();
 
   static void adjust_pointers();
   static void forward_to_new_addr();
diff --git a/src/hotspot/share/gc/parallel/psScavenge.cpp b/src/hotspot/share/gc/parallel/psScavenge.cpp
index 865bbd170997d..708bb9da48af7 100644
--- a/src/hotspot/share/gc/parallel/psScavenge.cpp
+++ b/src/hotspot/share/gc/parallel/psScavenge.cpp
@@ -235,7 +235,6 @@ bool PSScavenge::invoke() {
   assert(!ParallelScavengeHeap::heap()->is_stw_gc_active(), "not reentrant");
 
   ParallelScavengeHeap* const heap = ParallelScavengeHeap::heap();
-  PSAdaptiveSizePolicy* policy = heap->size_policy();
   IsSTWGCActiveMark mark;
 
   const bool scavenge_done = PSScavenge::invoke_no_policy();
@@ -250,8 +249,7 @@ bool PSScavenge::invoke() {
 
   if (need_full_gc) {
     GCCauseSetter gccs(heap, GCCause::_adaptive_size_policy);
-    SoftRefPolicy* srp = heap->soft_ref_policy();
-    const bool clear_all_softrefs = srp->should_clear_all_soft_refs();
+    const bool clear_all_softrefs = heap->soft_ref_policy()->should_clear_all_soft_refs();
 
     full_gc_done = PSParallelCompact::invoke_no_policy(clear_all_softrefs);
   }

From c5a668bb653feb3408a9efa3274ceabf9f01a2c7 Mon Sep 17 00:00:00 2001
From: Xiaolong Peng <xpeng@openjdk.org>
Date: Mon, 8 Jul 2024 10:33:08 +0000
Subject: [PATCH 011/401] 8334231: Optimize MethodData layout

Reviewed-by: dholmes, chagedorn, shade
---
 src/hotspot/share/oops/methodData.hpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/hotspot/share/oops/methodData.hpp b/src/hotspot/share/oops/methodData.hpp
index b6e2a1c965212..5071c29f1d774 100644
--- a/src/hotspot/share/oops/methodData.hpp
+++ b/src/hotspot/share/oops/methodData.hpp
@@ -1946,7 +1946,6 @@ class ciMethodData;
 class MethodData : public Metadata {
   friend class VMStructs;
   friend class JVMCIVMStructs;
-private:
   friend class ProfileData;
   friend class TypeEntriesAtCall;
   friend class ciMethodData;
@@ -2080,8 +2079,8 @@ class MethodData : public Metadata {
 
 #if INCLUDE_JVMCI
   // Support for HotSpotMethodData.setCompiledIRSize(int)
-  int                _jvmci_ir_size;
   FailedSpeculation* _failed_speculations;
+  int                _jvmci_ir_size;
 #endif
 
   // Size of _data array in bytes.  (Excludes header and extra_data fields.)

From c34a1b7013b27a8a214f63387bd528a90342a416 Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <thartmann@openjdk.org>
Date: Mon, 8 Jul 2024 10:53:03 +0000
Subject: [PATCH 012/401] 8335861: Problem list
 compiler/vectorization/TestFloat16VectorConvChain.java

Reviewed-by: epeter
---
 test/hotspot/jtreg/ProblemList.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index d7088408ab887..76dc9f6f033fa 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -69,6 +69,8 @@ compiler/startup/StartupOutput.java 8326615 generic-x64
 
 compiler/codecache/CodeCacheFullCountTest.java 8332954 generic-all
 
+compiler/vectorization/TestFloat16VectorConvChain.java 8335860 generic-all
+
 #############################################################################
 
 # :hotspot_gc

From 953c35eb5bff49ec5f7dbb25edd8a324b94318eb Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Mon, 8 Jul 2024 11:44:04 +0000
Subject: [PATCH 013/401] 8335824: Test
 gc/arguments/TestMinInitialErgonomics.java is timing out

Reviewed-by: ayang, kbarrett
---
 test/hotspot/jtreg/gc/arguments/TestMinInitialErgonomics.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/gc/arguments/TestMinInitialErgonomics.java b/test/hotspot/jtreg/gc/arguments/TestMinInitialErgonomics.java
index 6b03401a563df..6912499e53f00 100644
--- a/test/hotspot/jtreg/gc/arguments/TestMinInitialErgonomics.java
+++ b/test/hotspot/jtreg/gc/arguments/TestMinInitialErgonomics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test TestMinInitialErgonomics
  * @bug 8006088
  * @requires vm.gc.Parallel
+ * @requires vm.compMode != "Xcomp"
  * @summary Test Parallel GC ergonomics decisions related to minimum and initial heap size.
  * @library /test/lib
  * @library /

From cec222e46065fc15db3f2eb241d3607d605ab580 Mon Sep 17 00:00:00 2001
From: Jorn Vernee <jvernee@openjdk.org>
Date: Mon, 8 Jul 2024 12:39:33 +0000
Subject: [PATCH 014/401] 8317611: Add a tool like jdeprscan to find usage of
 restricted methods

Reviewed-by: alanb, ihse, mcimadamore, jlahoda, jwaters
---
 make/modules/jdk.jdeps/Launcher.gmk           |   9 +
 .../javac/platform/JDKPlatformProvider.java   |  11 +-
 .../share/classes/module-info.java            |   8 +-
 .../classes/com/sun/tools/jdeprscan/Main.java |   4 +-
 .../tools/jnativescan/ClassFileSource.java    | 124 +++++++++
 .../sun/tools/jnativescan/ClassResolver.java  | 163 +++++++++++
 .../jnativescan/JNativeScanFatalError.java    |  45 ++++
 .../tools/jnativescan/JNativeScanTask.java    | 195 ++++++++++++++
 .../com/sun/tools/jnativescan/Main.java       | 234 ++++++++++++++++
 .../com/sun/tools/jnativescan/MethodRef.java  |  48 ++++
 .../tools/jnativescan/NativeMethodFinder.java | 141 ++++++++++
 .../sun/tools/jnativescan/RestrictedUse.java  |  32 +++
 src/jdk.jdeps/share/classes/module-info.java  |  23 +-
 src/jdk.jdeps/share/man/jnativescan.1         | 220 +++++++++++++++
 test/jdk/tools/launcher/HelpFlagsTest.java    |   1 +
 test/langtools/TEST.groups                    |   4 +
 .../jnativescan/JNativeScanTestBase.java      |  86 ++++++
 .../tools/jnativescan/TestArrayTypeRefs.java  |  56 ++++
 .../tools/jnativescan/TestJNativeScan.java    | 252 ++++++++++++++++++
 .../jnativescan/TestMissingSystemClass.java   |  60 +++++
 .../tools/jnativescan/TestSubclassRefs.java   |  56 ++++
 .../jnativescan/cases/classpath/app/App.java  |  31 +++
 .../cases/classpath/arrayref/App.java         |  32 +++
 .../jnativescan/cases/classpath/lib/Lib.java  |  33 +++
 .../cases/classpath/missingsystem/App.java    |  32 +++
 .../cases/classpath/singlejar/main/Main.java  |  34 +++
 .../cases/classpath/subclassref/App.java      |  32 +++
 .../unnamed_package/UnnamedPackage.java       |  32 +++
 .../cases/modules/org.lib/module-info.java    |  26 ++
 .../cases/modules/org.lib/org/lib/Lib.java    |  34 +++
 .../modules/org.lib/org/lib/Service.java      |  26 ++
 .../cases/modules/org.myapp/module-info.java  |  28 ++
 .../org.myapp/org/myapp/main/Main.java        |  32 +++
 .../modules/org.service/module-info.java      |  27 ++
 .../org.service/org/service/ServiceImpl.java  |  35 +++
 .../modules/org.singlejar/module-info.java    |  25 ++
 .../org/singlejar/main/Main.java              |  34 +++
 37 files changed, 2250 insertions(+), 15 deletions(-)
 create mode 100644 src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/ClassFileSource.java
 create mode 100644 src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/ClassResolver.java
 create mode 100644 src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/JNativeScanFatalError.java
 create mode 100644 src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/JNativeScanTask.java
 create mode 100644 src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/Main.java
 create mode 100644 src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/MethodRef.java
 create mode 100644 src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/NativeMethodFinder.java
 create mode 100644 src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/RestrictedUse.java
 create mode 100644 src/jdk.jdeps/share/man/jnativescan.1
 create mode 100644 test/langtools/tools/jnativescan/JNativeScanTestBase.java
 create mode 100644 test/langtools/tools/jnativescan/TestArrayTypeRefs.java
 create mode 100644 test/langtools/tools/jnativescan/TestJNativeScan.java
 create mode 100644 test/langtools/tools/jnativescan/TestMissingSystemClass.java
 create mode 100644 test/langtools/tools/jnativescan/TestSubclassRefs.java
 create mode 100644 test/langtools/tools/jnativescan/cases/classpath/app/App.java
 create mode 100644 test/langtools/tools/jnativescan/cases/classpath/arrayref/App.java
 create mode 100644 test/langtools/tools/jnativescan/cases/classpath/lib/Lib.java
 create mode 100644 test/langtools/tools/jnativescan/cases/classpath/missingsystem/App.java
 create mode 100644 test/langtools/tools/jnativescan/cases/classpath/singlejar/main/Main.java
 create mode 100644 test/langtools/tools/jnativescan/cases/classpath/subclassref/App.java
 create mode 100644 test/langtools/tools/jnativescan/cases/classpath/unnamed_package/UnnamedPackage.java
 create mode 100644 test/langtools/tools/jnativescan/cases/modules/org.lib/module-info.java
 create mode 100644 test/langtools/tools/jnativescan/cases/modules/org.lib/org/lib/Lib.java
 create mode 100644 test/langtools/tools/jnativescan/cases/modules/org.lib/org/lib/Service.java
 create mode 100644 test/langtools/tools/jnativescan/cases/modules/org.myapp/module-info.java
 create mode 100644 test/langtools/tools/jnativescan/cases/modules/org.myapp/org/myapp/main/Main.java
 create mode 100644 test/langtools/tools/jnativescan/cases/modules/org.service/module-info.java
 create mode 100644 test/langtools/tools/jnativescan/cases/modules/org.service/org/service/ServiceImpl.java
 create mode 100644 test/langtools/tools/jnativescan/cases/modules/org.singlejar/module-info.java
 create mode 100644 test/langtools/tools/jnativescan/cases/modules/org.singlejar/org/singlejar/main/Main.java

diff --git a/make/modules/jdk.jdeps/Launcher.gmk b/make/modules/jdk.jdeps/Launcher.gmk
index ceab793124584..1aa54e16f4564 100644
--- a/make/modules/jdk.jdeps/Launcher.gmk
+++ b/make/modules/jdk.jdeps/Launcher.gmk
@@ -51,3 +51,12 @@ $(eval $(call SetupBuildLauncher, jdeprscan, \
     MAIN_CLASS := com.sun.tools.jdeprscan.Main, \
     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
 ))
+
+################################################################################
+## Build jnativescan
+################################################################################
+
+$(eval $(call SetupBuildLauncher, jnativescan, \
+    MAIN_CLASS := com.sun.tools.jnativescan.Main, \
+    CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
+))
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/JDKPlatformProvider.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/JDKPlatformProvider.java
index 487fe969f9774..4c24f9892a673 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/JDKPlatformProvider.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/JDKPlatformProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -83,7 +83,14 @@ public Iterable<String> getSupportedPlatformNames() {
     }
 
     @Override
-    public PlatformDescription getPlatform(String platformName, String options) {
+    public PlatformDescription getPlatform(String platformName, String options) throws PlatformNotSupported {
+        if (!SUPPORTED_JAVA_PLATFORM_VERSIONS.contains(platformName)) {
+            throw new PlatformNotSupported();
+        }
+        return getPlatformTrusted(platformName);
+    }
+
+    public PlatformDescription getPlatformTrusted(String platformName) {
         return new PlatformDescriptionImpl(platformName);
     }
 
diff --git a/src/jdk.internal.opt/share/classes/module-info.java b/src/jdk.internal.opt/share/classes/module-info.java
index 67ed1410560df..ba6987f1ea93c 100644
--- a/src/jdk.internal.opt/share/classes/module-info.java
+++ b/src/jdk.internal.opt/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,11 +31,13 @@
 module jdk.internal.opt {
     exports jdk.internal.joptsimple to
         jdk.jlink,
-        jdk.jshell;
+        jdk.jshell,
+        jdk.jdeps;
     exports jdk.internal.opt to
         jdk.compiler,
         jdk.jartool,
         jdk.javadoc,
         jdk.jlink,
-        jdk.jpackage;
+        jdk.jpackage,
+        jdk.jdeps;
 }
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/Main.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/Main.java
index c67510de441da..f77d29a8bfa5b 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/Main.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -414,7 +414,7 @@ boolean processRelease(String release, Collection<String> classes) throws IOExce
                              .noneMatch(n -> n.equals(release))) {
                 return false;
             }
-            JavaFileManager fm = pp.getPlatform(release, "").getFileManager();
+            JavaFileManager fm = pp.getPlatformTrusted(release).getFileManager();
             List<String> classNames = new ArrayList<>();
             for (JavaFileObject fo : fm.list(StandardLocation.PLATFORM_CLASS_PATH,
                                              "",
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/ClassFileSource.java b/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/ClassFileSource.java
new file mode 100644
index 0000000000000..754904c9c7f24
--- /dev/null
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/ClassFileSource.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package com.sun.tools.jnativescan;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UncheckedIOException;
+import java.lang.module.ModuleReader;
+import java.lang.module.ModuleReference;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.jar.JarFile;
+import java.util.stream.Stream;
+import java.util.zip.ZipFile;
+
+sealed interface ClassFileSource {
+    String moduleName();
+    Path path();
+
+    Stream<byte[]> classFiles(Runtime.Version version) throws IOException;
+
+    record Module(ModuleReference reference) implements ClassFileSource {
+        @Override
+        public String moduleName() {
+            return reference.descriptor().name();
+        }
+
+        @Override
+        public Path path() {
+            URI location = reference.location().orElseThrow();
+            return Path.of(location);
+        }
+
+        @Override
+        public Stream<byte[]> classFiles(Runtime.Version version) throws IOException {
+            ModuleReader reader = reference().open();
+            return reader.list()
+                .filter(resourceName -> resourceName.endsWith(".class"))
+                .map(resourceName -> {
+                    try (InputStream stream = reader.open(resourceName).orElseThrow()) {
+                        return stream.readAllBytes();
+                    } catch (IOException e) {
+                        throw new UncheckedIOException(e);
+                    }
+                }).onClose(() -> {
+                    try {
+                        reader.close();
+                    } catch (IOException e) {
+                        throw new UncheckedIOException(e);
+                    }
+                });
+        }
+    }
+
+    record ClassPathJar(Path path) implements ClassFileSource {
+        @Override
+        public String moduleName() {
+            return "ALL-UNNAMED";
+        }
+
+        @Override
+        public Stream<byte[]> classFiles(Runtime.Version version) throws IOException {
+            JarFile jf = new JarFile(path().toFile(), false, ZipFile.OPEN_READ, version);
+            return jf.versionedStream()
+                .filter(je -> je.getName().endsWith(".class"))
+                .map(je -> {
+                    try (InputStream stream = jf.getInputStream(je)){
+                        return stream.readAllBytes();
+                    } catch (IOException e) {
+                        throw new UncheckedIOException(e);
+                    }
+                }).onClose(() -> {
+                    try {
+                        jf.close();
+                    } catch (IOException e) {
+                        throw new UncheckedIOException(e);
+                    }
+                });
+        }
+    }
+
+    record ClassPathDirectory(Path path) implements ClassFileSource {
+        @Override
+        public String moduleName() {
+            return "ALL-UNNAMED";
+        }
+
+        @Override
+        public Stream<byte[]> classFiles(Runtime.Version version) throws IOException {
+            return Files.walk(path)
+                .filter(file -> Files.isRegularFile(file) && file.toString().endsWith(".class"))
+                .map(file -> {
+                    try (InputStream stream = Files.newInputStream(file)){
+                        return stream.readAllBytes();
+                    } catch (IOException e) {
+                        throw new UncheckedIOException(e);
+                    }
+                });
+        }
+    }
+}
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/ClassResolver.java b/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/ClassResolver.java
new file mode 100644
index 0000000000000..7a267a58aa5a3
--- /dev/null
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/ClassResolver.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package com.sun.tools.jnativescan;
+
+import com.sun.tools.javac.platform.PlatformDescription;
+import com.sun.tools.javac.platform.PlatformProvider;
+
+import javax.tools.JavaFileManager;
+import javax.tools.JavaFileObject;
+import javax.tools.StandardLocation;
+import java.io.IOException;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.constant.ClassDesc;
+import java.lang.module.ModuleDescriptor;
+import java.util.*;
+import java.util.function.BiConsumer;
+import java.util.stream.Stream;
+
+abstract class ClassResolver implements AutoCloseable {
+
+    static ClassResolver forClassFileSources(List<ClassFileSource> sources, Runtime.Version version) throws IOException {
+        Map<ClassDesc, Info> classMap = new HashMap<>();
+        for (ClassFileSource source : sources) {
+            try (Stream<byte[]> classFiles = source.classFiles(version)) {
+                classFiles.forEach(bytes -> {
+                    ClassModel model = ClassFile.of().parse(bytes);
+                    ClassDesc desc = model.thisClass().asSymbol();
+                    classMap.put(desc, new Info(source, model));
+                });
+            }
+        }
+        return new SimpleClassResolver(classMap);
+    }
+
+    static ClassResolver forSystemModules(Runtime.Version version) {
+        String platformName = String.valueOf(version.feature());
+        PlatformProvider platformProvider = ServiceLoader.load(PlatformProvider.class).findFirst().orElseThrow();
+        PlatformDescription platform;
+        try {
+            platform = platformProvider.getPlatform(platformName, null);
+        } catch (PlatformProvider.PlatformNotSupported e) {
+            throw new JNativeScanFatalError("Release: " + platformName + " not supported", e);
+        }
+        JavaFileManager fm = platform.getFileManager();
+        return new SystemModuleClassResolver(fm);
+    }
+
+    record Info(ClassFileSource source, ClassModel model) {}
+
+    public abstract void forEach(BiConsumer<ClassDesc, ClassResolver.Info> action);
+    public abstract Optional<ClassResolver.Info> lookup(ClassDesc desc);
+
+    @Override
+    public abstract void close() throws IOException;
+
+    private static class SimpleClassResolver extends ClassResolver {
+
+        private final Map<ClassDesc, ClassResolver.Info> classMap;
+
+        public SimpleClassResolver(Map<ClassDesc, Info> classMap) {
+            this.classMap = classMap;
+        }
+
+        public void forEach(BiConsumer<ClassDesc, ClassResolver.Info> action) {
+            classMap.forEach(action);
+        }
+
+        public Optional<ClassResolver.Info> lookup(ClassDesc desc) {
+            return Optional.ofNullable(classMap.get(desc));
+        }
+
+        @Override
+        public void close() {}
+    }
+
+    private static class SystemModuleClassResolver extends ClassResolver {
+
+        private final JavaFileManager platformFileManager;
+        private final Map<String, String> packageToSystemModule;
+        private final Map<ClassDesc, Info> cache = new HashMap<>();
+
+        public SystemModuleClassResolver(JavaFileManager platformFileManager) {
+            this.platformFileManager = platformFileManager;
+            this.packageToSystemModule = packageToSystemModule(platformFileManager);
+        }
+
+        private static Map<String, String> packageToSystemModule(JavaFileManager platformFileManager) {
+            try {
+                Set<JavaFileManager.Location> locations = platformFileManager.listLocationsForModules(
+                        StandardLocation.SYSTEM_MODULES).iterator().next();
+
+                Map<String, String> result = new HashMap<>();
+                for (JavaFileManager.Location loc : locations) {
+                    JavaFileObject jfo = platformFileManager.getJavaFileForInput(loc, "module-info", JavaFileObject.Kind.CLASS);
+                    ModuleDescriptor descriptor = ModuleDescriptor.read(jfo.openInputStream());
+                    for (ModuleDescriptor.Exports export : descriptor.exports()) {
+                        if (!export.isQualified()) {
+                            result.put(export.source(), descriptor.name());
+                        }
+                    }
+                }
+                return result;
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        @Override
+        public void forEach(BiConsumer<ClassDesc, Info> action) {
+            throw new UnsupportedOperationException("NYI");
+        }
+
+        @Override
+        public Optional<Info> lookup(ClassDesc desc) {
+            return Optional.ofNullable(cache.computeIfAbsent(desc, _ -> {
+                String qualName = JNativeScanTask.qualName(desc);
+                String moduleName = packageToSystemModule.get(desc.packageName());
+                if (moduleName != null) {
+                    try {
+                        JavaFileManager.Location loc = platformFileManager.getLocationForModule(StandardLocation.SYSTEM_MODULES, moduleName);
+                        JavaFileObject jfo = platformFileManager.getJavaFileForInput(loc, qualName, JavaFileObject.Kind.CLASS);
+                        if (jfo == null) {
+                            throw new JNativeScanFatalError("System class can not be found: " + qualName);
+                        }
+                        ClassModel model = ClassFile.of().parse(jfo.openInputStream().readAllBytes());
+                        return new Info(null, model);
+                    } catch (IOException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+                return null;
+            }));
+        }
+
+        @Override
+        public void close() throws IOException {
+            platformFileManager.close();
+        }
+    }
+}
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/JNativeScanFatalError.java b/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/JNativeScanFatalError.java
new file mode 100644
index 0000000000000..15cf86e03c333
--- /dev/null
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/JNativeScanFatalError.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package com.sun.tools.jnativescan;
+
+import java.io.Serial;
+
+// Exception used in case of fatal error that is reasonably expected and handled.
+public class JNativeScanFatalError extends RuntimeException {
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    public JNativeScanFatalError(String message) {
+        super(message);
+    }
+
+    public JNativeScanFatalError(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public JNativeScanFatalError(Throwable cause) {
+        super(cause);
+    }
+}
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/JNativeScanTask.java b/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/JNativeScanTask.java
new file mode 100644
index 0000000000000..2ff172e9c1b71
--- /dev/null
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/JNativeScanTask.java
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package com.sun.tools.jnativescan;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.lang.constant.ClassDesc;
+import java.lang.module.Configuration;
+import java.lang.module.ModuleFinder;
+import java.lang.module.ResolvedModule;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
+import java.util.stream.Collectors;
+import java.util.zip.ZipFile;
+
+class JNativeScanTask {
+
+    private final PrintWriter out;
+    private final List<Path> classPaths;
+    private final List<Path> modulePaths;
+    private final List<String> cmdRootModules;
+    private final Runtime.Version version;
+    private final Action action;
+
+    public JNativeScanTask(PrintWriter out, List<Path> classPaths, List<Path> modulePaths,
+                           List<String> cmdRootModules, Runtime.Version version, Action action) {
+        this.out = out;
+        this.classPaths = classPaths;
+        this.modulePaths = modulePaths;
+        this.version = version;
+        this.action = action;
+        this.cmdRootModules = cmdRootModules;
+    }
+
+    public void run() throws JNativeScanFatalError {
+        List<ClassFileSource> toScan = new ArrayList<>(findAllClassPathJars());
+
+        ModuleFinder moduleFinder = ModuleFinder.of(modulePaths.toArray(Path[]::new));
+        List<String> rootModules = cmdRootModules;
+        if (rootModules.contains("ALL-MODULE-PATH")) {
+            rootModules = allModuleNames(moduleFinder);
+        }
+        Configuration config = systemConfiguration().resolveAndBind(ModuleFinder.of(), moduleFinder, rootModules);
+        for (ResolvedModule m : config.modules()) {
+            toScan.add(new ClassFileSource.Module(m.reference()));
+        }
+
+        SortedMap<ClassFileSource, SortedMap<ClassDesc, List<RestrictedUse>>> allRestrictedMethods;
+        try(ClassResolver classesToScan = ClassResolver.forClassFileSources(toScan, version);
+            ClassResolver systemClassResolver = ClassResolver.forSystemModules(version)) {
+            NativeMethodFinder finder = NativeMethodFinder.create(classesToScan, systemClassResolver);
+            allRestrictedMethods = finder.findAll();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        switch (action) {
+            case PRINT -> printNativeAccess(allRestrictedMethods);
+            case DUMP_ALL -> dumpAll(allRestrictedMethods);
+        }
+    }
+
+    private List<ClassFileSource> findAllClassPathJars() throws JNativeScanFatalError {
+        List<ClassFileSource> result = new ArrayList<>();
+        for (Path path : classPaths) {
+            if (isJarFile(path)) {
+                Deque<Path> jarsToScan  = new ArrayDeque<>();
+                jarsToScan.offer(path);
+
+                // recursively look for all class path jars, starting at the root jars
+                // in this.classPaths, and recursively following all Class-Path manifest
+                // attributes
+                while (!jarsToScan.isEmpty()) {
+                    Path jar = jarsToScan.poll();
+                    String[] classPathAttribute = classPathAttribute(jar);
+                    Path parentDir = jar.getParent();
+                    for (String classPathEntry : classPathAttribute) {
+                        Path otherJar = parentDir != null
+                                ? parentDir.resolve(classPathEntry)
+                                : Path.of(classPathEntry);
+                        if (Files.exists(otherJar)) {
+                            // Class-Path attribute specifies that jars that
+                            // are not found are simply ignored. Do the same here
+                            jarsToScan.offer(otherJar);
+                        }
+                    }
+                    result.add(new ClassFileSource.ClassPathJar(jar));
+                }
+            } else if (Files.isDirectory(path)) {
+                result.add(new ClassFileSource.ClassPathDirectory(path));
+            } else {
+                throw new JNativeScanFatalError(
+                    "Path does not appear to be a jar file, or directory containing classes: " + path);
+            }
+        }
+        return result;
+    }
+
+    private String[] classPathAttribute(Path jar) {
+        try (JarFile jf = new JarFile(jar.toFile(), false, ZipFile.OPEN_READ, version)) {
+           Manifest manifest = jf.getManifest();
+           if (manifest != null) {
+               String attrib = manifest.getMainAttributes().getValue("Class-Path");
+               if (attrib != null) {
+                   return attrib.split("\\s+");
+               }
+           }
+           return new String[0];
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private Configuration systemConfiguration() {
+        ModuleFinder systemFinder = ModuleFinder.ofSystem();
+        Configuration system = Configuration.resolve(systemFinder, List.of(Configuration.empty()), ModuleFinder.of(),
+                allModuleNames(systemFinder)); // resolve all of them
+        return system;
+    }
+
+    private List<String> allModuleNames(ModuleFinder finder) {
+        return finder.findAll().stream().map(mr -> mr.descriptor().name()).toList();
+    }
+
+    private void printNativeAccess(SortedMap<ClassFileSource, SortedMap<ClassDesc, List<RestrictedUse>>> allRestrictedMethods) {
+        String nativeAccess = allRestrictedMethods.keySet().stream()
+                .map(ClassFileSource::moduleName)
+                .distinct()
+                .collect(Collectors.joining(","));
+        out.println(nativeAccess);
+    }
+
+    private void dumpAll(SortedMap<ClassFileSource, SortedMap<ClassDesc, List<RestrictedUse>>> allRestrictedMethods) {
+        if (allRestrictedMethods.isEmpty()) {
+            out.println("  <no restricted methods>");
+        } else {
+            allRestrictedMethods.forEach((module, perClass) -> {
+                out.println(module.path() + " (" + module.moduleName() + "):");
+                perClass.forEach((classDesc, restrictedUses) -> {
+                    out.println("  " + qualName(classDesc) + ":");
+                    restrictedUses.forEach(use -> {
+                        switch (use) {
+                            case RestrictedUse.NativeMethodDecl(MethodRef nmd) ->
+                                out.println("    " + nmd + " is a native method declaration");
+                            case RestrictedUse.RestrictedMethodRefs(MethodRef referent, Set<MethodRef> referees) -> {
+                                out.println("    " + referent + " references restricted methods:");
+                                referees.forEach(referee -> out.println("      " + referee));
+                            }
+                        }
+                    });
+                });
+            });
+        }
+    }
+
+    private static boolean isJarFile(Path path) throws JNativeScanFatalError {
+        return Files.exists(path) && Files.isRegularFile(path) && path.toString().endsWith(".jar");
+    }
+
+    public enum Action {
+        DUMP_ALL,
+        PRINT
+    }
+
+    public static String qualName(ClassDesc desc) {
+        String packagePrefix = desc.packageName().isEmpty() ? "" : desc.packageName() + ".";
+        return packagePrefix + desc.displayName();
+    }
+}
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/Main.java b/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/Main.java
new file mode 100644
index 0000000000000..425a106d599f0
--- /dev/null
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/Main.java
@@ -0,0 +1,234 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package com.sun.tools.jnativescan;
+
+import jdk.internal.joptsimple.*;
+import jdk.internal.opt.CommandLine;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.spi.ToolProvider;
+
+public class Main {
+
+    private static boolean DEBUG = Boolean.getBoolean("com.sun.tools.jnativescan.DEBUG");
+
+    private static final int SUCCESS_CODE = 0;
+    private static final int FATAL_ERROR_CODE = 1;
+
+    private final PrintWriter out;
+    private final PrintWriter err;
+
+    private Main(PrintWriter out, PrintWriter err) {
+        this.out = out;
+        this.err = err;
+    }
+
+    private void printError(String message) {
+        err.println("ERROR: " + message);
+    }
+
+    private void printUsage()  {
+        out.print("""
+            Use 'jnativescan --help' for help
+            """);
+    }
+
+    private void printVersion() {
+        out.println(System.getProperty("java.version"));
+    }
+
+    public int run(String[] args) {
+        if (args.length < 1) {
+            printUsage();
+            return FATAL_ERROR_CODE;
+        }
+
+        try {
+            String[] expandedArgs = expandArgFiles(args);
+            parseOptionsAndRun(expandedArgs);
+        } catch (JNativeScanFatalError fatalError) {
+            printError(fatalError.getMessage());
+            for (Throwable cause = fatalError.getCause();
+                     cause instanceof JNativeScanFatalError jNativeScanFatalError;
+                     cause = jNativeScanFatalError.getCause()) {
+                err.println("CAUSED BY: " + jNativeScanFatalError.getMessage());
+            }
+            if (DEBUG) {
+                fatalError.printStackTrace(err);
+            }
+            return FATAL_ERROR_CODE;
+        } catch (Throwable e) {
+            printError("Unexpected exception encountered");
+            e.printStackTrace(err);
+            return FATAL_ERROR_CODE;
+        }
+
+        return SUCCESS_CODE;
+    }
+
+    private void parseOptionsAndRun(String[] expandedArgs) throws JNativeScanFatalError {
+        OptionParser parser = new OptionParser(false);
+        OptionSpec<Void> helpOpt = parser.acceptsAll(List.of("?", "h", "help"), "help").forHelp();
+        OptionSpec<Void> versionOpt = parser.accepts("version", "Print version information and exit");
+        OptionSpec<Path> classPathOpt = parser.accepts(
+                "class-path",
+                "The class path as used at runtime")
+                .withRequiredArg()
+                .withValuesSeparatedBy(File.pathSeparatorChar)
+                .withValuesConvertedBy(PARSE_PATH);
+        OptionSpec<Path> modulePathOpt = parser.accepts(
+                "module-path",
+                "The module path as used at runtime")
+                .withRequiredArg()
+                .withValuesSeparatedBy(File.pathSeparatorChar)
+                .withValuesConvertedBy(PARSE_PATH);
+        OptionSpec<Runtime.Version> releaseOpt = parser.accepts(
+                "release",
+                "The runtime version that will run the application")
+                .withRequiredArg()
+                .withValuesConvertedBy(PARSE_VERSION);
+        OptionSpec<String> addModulesOpt = parser.accepts(
+                "add-modules",
+                "List of root modules to scan")
+                .requiredIf(modulePathOpt)
+                .withRequiredArg()
+                .withValuesSeparatedBy(',');
+        OptionSpec<Void> printNativeAccessOpt = parser.accepts(
+                "print-native-access",
+                "print a comma separated list of modules that may perform native access operations." +
+                        " ALL-UNNAMED is used to indicate unnamed modules.");
+
+        OptionSet optionSet;
+        try {
+            optionSet = parser.parse(expandedArgs);
+        } catch (OptionException oe) {
+            throw new JNativeScanFatalError("Parsing options failed: " + oe.getMessage(), oe);
+        }
+
+        if (optionSet.nonOptionArguments().size() != 0) {
+            throw new JNativeScanFatalError("jnativescan does not accept positional arguments");
+        }
+
+        if (optionSet.has(helpOpt)) {
+            out.println("""
+                The jnativescan tool can be used to find methods that may access native functionality when
+                run. This includes restricted method calls and 'native' method declarations.
+                """);
+            try {
+                parser.printHelpOn(out);
+                return;
+            } catch (IOException e) {
+                throw new IllegalStateException(e);
+            }
+        }
+
+        if (optionSet.has(versionOpt)) {
+            printVersion();
+            return;
+        }
+
+        List<Path> classPathJars = optionSet.valuesOf(classPathOpt);
+        List<Path> modulePaths = optionSet.valuesOf(modulePathOpt);
+        List<String> rootModules = optionSet.valuesOf(addModulesOpt);
+        Runtime.Version version = Optional.ofNullable(optionSet.valueOf(releaseOpt)).orElse(Runtime.version());
+
+        JNativeScanTask.Action action = JNativeScanTask.Action.DUMP_ALL;
+        if (optionSet.has(printNativeAccessOpt)) {
+            action = JNativeScanTask.Action.PRINT;
+        }
+
+        new JNativeScanTask(out, classPathJars, modulePaths, rootModules, version, action).run();
+    }
+
+    private static String[] expandArgFiles(String[] args) throws JNativeScanFatalError {
+        try {
+            return CommandLine.parse(args);
+        } catch (IOException e) { // file not found
+            throw new JNativeScanFatalError(e.getMessage(), e);
+        }
+    }
+
+    public static void main(String[] args) {
+        System.exit(new Main.Provider().run(System.out, System.err, args));
+    }
+
+    public static class Provider implements ToolProvider {
+
+        @Override
+        public String name() {
+            return "jnativescan";
+        }
+
+        @Override
+        public int run(PrintWriter out, PrintWriter err, String... args) {
+            return new Main(out, err).run(args);
+        }
+    }
+
+    // where
+    private static final ValueConverter<Path> PARSE_PATH = new ValueConverter<>() {
+        @Override
+        public Path convert(String value) {
+            return Path.of(value);
+        }
+
+        @Override
+        public Class<? extends Path> valueType() {
+            return Path.class;
+        }
+
+        @Override
+        public String valuePattern() {
+            return "Path";
+        }
+    };
+
+    private static final ValueConverter<Runtime.Version> PARSE_VERSION = new ValueConverter<>() {
+        @Override
+        public Runtime.Version convert(String value) {
+            try {
+                return Runtime.Version.parse(value);
+            } catch (IllegalArgumentException e) {
+                throw new JNativeScanFatalError("Invalid release: " + value + ": " + e.getMessage());
+            }
+        }
+
+        @Override
+        public Class<? extends Runtime.Version> valueType() {
+            return Runtime.Version.class;
+        }
+
+        @Override
+        public String valuePattern() {
+            return "Version";
+        }
+    };
+}
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/MethodRef.java b/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/MethodRef.java
new file mode 100644
index 0000000000000..b19e4e7ec8f2b
--- /dev/null
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/MethodRef.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package com.sun.tools.jnativescan;
+
+import java.lang.classfile.MethodModel;
+import java.lang.classfile.constantpool.MemberRefEntry;
+import java.lang.classfile.instruction.InvokeInstruction;
+import java.lang.constant.ClassDesc;
+import java.lang.constant.MethodTypeDesc;
+
+record MethodRef(ClassDesc owner, String name, MethodTypeDesc type) {
+    public static MethodRef ofModel(MethodModel model) {
+        return new MethodRef(model.parent().orElseThrow().thisClass().asSymbol(),
+                model.methodName().stringValue(), model.methodTypeSymbol());
+    }
+
+    public static MethodRef ofInvokeInstruction(InvokeInstruction instruction) {
+        return new MethodRef(instruction.owner().asSymbol(),
+                instruction.name().stringValue(), instruction.typeSymbol());
+    }
+
+    @Override
+    public String toString() {
+        return JNativeScanTask.qualName(owner) + "::" + name + type.displayDescriptor();
+    }
+}
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/NativeMethodFinder.java b/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/NativeMethodFinder.java
new file mode 100644
index 0000000000000..681b954d4cdd9
--- /dev/null
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/NativeMethodFinder.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package com.sun.tools.jnativescan;
+
+import com.sun.tools.jnativescan.RestrictedUse.NativeMethodDecl;
+import com.sun.tools.jnativescan.RestrictedUse.RestrictedMethodRefs;
+
+import java.io.IOException;
+import java.lang.classfile.Attributes;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.MethodModel;
+import java.lang.classfile.instruction.InvokeInstruction;
+import java.lang.constant.ClassDesc;
+import java.lang.constant.MethodTypeDesc;
+import java.lang.reflect.AccessFlag;
+import java.util.*;
+
+class NativeMethodFinder {
+
+    // ct.sym uses this fake name for the restricted annotation instead
+    // see make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java
+    private static final String RESTRICTED_NAME = "Ljdk/internal/javac/Restricted+Annotation;";
+
+    private final Map<MethodRef, Boolean> cache = new HashMap<>();
+    private final ClassResolver classesToScan;
+    private final ClassResolver systemClassResolver;
+
+    private NativeMethodFinder(ClassResolver classesToScan, ClassResolver systemClassResolver) {
+        this.classesToScan = classesToScan;
+        this.systemClassResolver = systemClassResolver;
+    }
+
+    public static NativeMethodFinder create(ClassResolver classesToScan, ClassResolver systemClassResolver) throws JNativeScanFatalError, IOException {
+        return new NativeMethodFinder(classesToScan, systemClassResolver);
+    }
+
+    public SortedMap<ClassFileSource, SortedMap<ClassDesc, List<RestrictedUse>>> findAll() throws JNativeScanFatalError {
+        SortedMap<ClassFileSource, SortedMap<ClassDesc, List<RestrictedUse>>> restrictedMethods
+                = new TreeMap<>(Comparator.comparing(ClassFileSource::path));
+        classesToScan.forEach((_, info) -> {
+            ClassModel classModel = info.model();
+            List<RestrictedUse> perClass = new ArrayList<>();
+            classModel.methods().forEach(methodModel -> {
+                if (methodModel.flags().has(AccessFlag.NATIVE)) {
+                    perClass.add(new NativeMethodDecl(MethodRef.ofModel(methodModel)));
+                } else {
+                    SortedSet<MethodRef> perMethod = new TreeSet<>(Comparator.comparing(MethodRef::toString));
+                    methodModel.code().ifPresent(code -> {
+                         try {
+                             code.forEach(e -> {
+                                 switch (e) {
+                                     case InvokeInstruction invoke -> {
+                                         MethodRef ref = MethodRef.ofInvokeInstruction(invoke);
+                                         if (isRestrictedMethod(ref)) {
+                                             perMethod.add(ref);
+                                         }
+                                     }
+                                     default -> {
+                                     }
+                                 }
+                             });
+                         } catch (JNativeScanFatalError e) {
+                             throw new JNativeScanFatalError("Error while processing method: " +
+                                     MethodRef.ofModel(methodModel), e);
+                         }
+                    });
+                    if (!perMethod.isEmpty()) {
+                        perClass.add(new RestrictedMethodRefs(MethodRef.ofModel(methodModel), perMethod));
+                    }
+                }
+            });
+            if (!perClass.isEmpty()) {
+                restrictedMethods.computeIfAbsent(info.source(),
+                                _ -> new TreeMap<>(Comparator.comparing(JNativeScanTask::qualName)))
+                        .put(classModel.thisClass().asSymbol(), perClass);
+            }
+        });
+        return restrictedMethods;
+    }
+
+    private boolean isRestrictedMethod(MethodRef ref) throws JNativeScanFatalError {
+        return cache.computeIfAbsent(ref, methodRef -> {
+            if (methodRef.owner().isArray()) {
+                // no restricted methods in arrays atm, and we can't look them up since they have no class file
+                return false;
+            }
+            Optional<ClassResolver.Info> info = systemClassResolver.lookup(methodRef.owner());
+            if (!info.isPresent()) {
+                return false;
+            }
+            ClassModel classModel = info.get().model();
+            Optional<MethodModel> methodModel = findMethod(classModel, methodRef.name(), methodRef.type());
+            if (!methodModel.isPresent()) {
+                // If we are here, the method was referenced through a subclass of the class containing the actual
+                // method declaration. We could implement a method resolver (that needs to be version aware
+                // as well) to find the method model of the declaration, but it's not really worth it.
+                // None of the restricted methods (atm) are exposed through more than 1 public type, so it's not
+                // possible for user code to reference them through a subclass.
+                return false;
+            }
+
+            return hasRestrictedAnnotation(methodModel.get());
+        });
+    }
+
+    private static boolean hasRestrictedAnnotation(MethodModel method) {
+        return method.findAttribute(Attributes.runtimeVisibleAnnotations())
+                .map(rva -> rva.annotations().stream().anyMatch(ann ->
+                        ann.className().stringValue().equals(RESTRICTED_NAME)))
+                .orElse(false);
+    }
+
+    private static Optional<MethodModel> findMethod(ClassModel classModel, String name, MethodTypeDesc type) {
+        return classModel.methods().stream()
+                .filter(m -> m.methodName().stringValue().equals(name)
+                        && m.methodType().stringValue().equals(type.descriptorString()))
+                .findFirst();
+    }
+}
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/RestrictedUse.java b/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/RestrictedUse.java
new file mode 100644
index 0000000000000..58c5798d33f07
--- /dev/null
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jnativescan/RestrictedUse.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package com.sun.tools.jnativescan;
+
+import java.util.SortedSet;
+
+sealed interface RestrictedUse {
+    record RestrictedMethodRefs(MethodRef referent, SortedSet<MethodRef> referees) implements RestrictedUse {}
+    record NativeMethodDecl(MethodRef decl) implements RestrictedUse {}
+}
diff --git a/src/jdk.jdeps/share/classes/module-info.java b/src/jdk.jdeps/share/classes/module-info.java
index e8ad319d70c55..3fdd3ca32d270 100644
--- a/src/jdk.jdeps/share/classes/module-info.java
+++ b/src/jdk.jdeps/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,12 +28,13 @@
 /**
  * Defines tools for analysing dependencies in Java libraries and programs,
  * including the <em>{@index jdeps jdeps tool}</em>,
- * <em>{@index javap javap tool}</em>, and
- * <em>{@index jdeprscan jdeprscan tool}</em> tools.
+ * <em>{@index javap javap tool}</em>,
+ * <em>{@index jdeprscan jdeprscan tool}</em>, and
+ * <em>{@index jnativescan jnativescan tool}</em> tools.
  *
  * <p>
  * This module provides the equivalent of command-line access to the
- * <em>javap</em> and <em>jdeps</em> tools via the
+ * <em>javap</em>, <em>jdeps</em>, and <em>jnativescan</em> tools via the
  * {@link java.util.spi.ToolProvider ToolProvider} service provider
  * interface (SPI)</p>
  *
@@ -49,12 +50,14 @@
  * @toolGuide javap
  * @toolGuide jdeprscan
  * @toolGuide jdeps
+ * @toolGuide jnativescan
  *
  * @provides java.util.spi.ToolProvider
- *     Use {@link java.util.spi.ToolProvider#findFirst ToolProvider.findFirst("javap")}
- *     or {@link java.util.spi.ToolProvider#findFirst ToolProvider.findFirst("jdeps")}
+ *     Use {@link java.util.spi.ToolProvider#findFirst ToolProvider.findFirst("javap")},
+ *     {@link java.util.spi.ToolProvider#findFirst ToolProvider.findFirst("jdeps")},
+ *     or {@link java.util.spi.ToolProvider#findFirst ToolProvider.findFirst("jnativescan")}
  *     to obtain an instance of a {@code ToolProvider} that provides the equivalent
- *     of command-line access to the {@code javap} or {@code jdeps} tool.
+ *     of command-line access to the {@code javap}, {@code jdeps}, {@code jnativescan} tool.
  *
  * @moduleGraph
  * @since 9
@@ -63,10 +66,14 @@
 module jdk.jdeps {
     requires java.compiler;
     requires jdk.compiler;
+    requires jdk.internal.opt;
+
+    uses com.sun.tools.javac.platform.PlatformProvider;
 
     exports com.sun.tools.classfile to jdk.jlink;
 
     provides java.util.spi.ToolProvider with
         com.sun.tools.javap.Main.JavapToolProvider,
-        com.sun.tools.jdeps.Main.JDepsToolProvider;
+        com.sun.tools.jdeps.Main.JDepsToolProvider,
+        com.sun.tools.jnativescan.Main.Provider;
 }
diff --git a/src/jdk.jdeps/share/man/jnativescan.1 b/src/jdk.jdeps/share/man/jnativescan.1
new file mode 100644
index 0000000000000..ff7f18277f260
--- /dev/null
+++ b/src/jdk.jdeps/share/man/jnativescan.1
@@ -0,0 +1,220 @@
+.\" Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+.\"
+.\" This code is free software; you can redistribute it and/or modify it
+.\" 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.
+.\"
+.\" Automatically generated by Pandoc 2.19.2
+.\"
+.\" Define V font for inline verbatim, using C font in formats
+.\" that render this, and otherwise B font.
+.ie "\f[CB]x\f[R]"x" \{\
+. ftr V B
+. ftr VI BI
+. ftr VB B
+. ftr VBI BI
+.\}
+.el \{\
+. ftr V CR
+. ftr VI CI
+. ftr VB CB
+. ftr VBI CBI
+.\}
+.TH "JNATIVESCAN" "1" "2025" "JDK 24-ea" "JDK Commands"
+.hy
+.SH NAME
+.PP
+jnativescan - static analysis tool that scans one or more jar files for
+uses of native functionalities, such as restricted method calls or
+\f[V]native\f[R] method declarations.
+.SH SYNOPSIS
+.PP
+\f[V]jnativescan\f[R] [\f[I]options\f[R]]
+.TP
+\f[I]options\f[R]
+See \f[B]Options for the jnativescan Command\f[R]
+.SH DESCRIPTION
+.PP
+The \f[V]jnative\f[R] tool is a static analysis tool provided by the JDK
+that scans a JAR file for uses of native functionalities, such as
+restricted method calls or \f[V]native\f[R] method declarations.
+.PP
+\f[V]jnativescan\f[R] accepts a runtime class path and module path
+configuration, as well as a set of root modules, and a target release.
+It scans the jars on the class and module paths, and reports uses of
+native functionalities either in a tree like structure, which also
+identifies that calling classes and methods, or as a list of module
+names when the \f[V]--print-native-access\f[R] flag is specified.
+.SH OPTIONS FOR THE JNATIVESCAN COMMAND
+.PP
+The following options are available:
+.TP
+\f[V]--class-path\f[R] \f[I]path\f[R]
+Used to specify a list of paths pointing to jar files to be scanned.
+.PP
+All jar files specified through this list will be scanned.
+If a jar file contains a \f[V]Class-Path\f[R] attribute in its manifest,
+jar files listed there will be scanned as well.
+Jar files listed in the \f[V]Class-Path\f[R] manifest attribute that can
+not be found are ignored.
+All the jar files found are treated as if they belonged to the unnamed
+module.
+.TP
+\f[V]--module-path\f[R] \f[I]path\f[R]
+Used to specify a list of paths pointing to jar files or directories
+containing jar files, that the tool can use to find modules that need to
+be scanned.
+The list of jar files that will be scanned depends on the
+\f[V]--add-modules\f[R] option.
+.RS
+.PP
+For both the \f[V]--class-path\f[R] and \f[V]--module-path\f[R] options,
+\f[I]path\f[R] should be a search path that consists of one or more jar
+files, separated by the system-specific path separator.
+For example:
+.IP \[bu] 2
+\f[B]Linux and macOS:\f[R]
+.RS 2
+.RS
+.PP
+\f[V]--class-path /some/foo.jar:/another/different/bar.jar\f[R]
+.RE
+.RE
+.PP
+\f[B]Note:\f[R]
+.PP
+On Windows, use a semicolon (\f[V];\f[R]) as the separator instead of a
+colon (\f[V]:\f[R]).
+.IP \[bu] 2
+\f[B]Windows:\f[R]
+.RS 2
+.RS
+.PP
+\f[V]--class-path C:\[rs]some\[rs]foo.jar;C:\[rs]another\[rs]different\[rs]bar.jar\f[R]
+.RE
+.RE
+.RE
+.TP
+\f[V]--add-modules\f[R] \f[I]module[,module...]\f[R]
+Used to specify a comma-separated list of module names that indicate the
+root modules to scan.
+All the root modules will be scanned, as well as any modules that they
+depend on.
+This includes dependencies on service implementations specified through
+the \f[V]uses\f[R] directive in a module\[aq]s \f[V]module-info\f[R]
+file.
+All modules found on the module path that provide an implementation of
+such a service will be scanned as well.
+.TP
+\f[V]--release\f[R] \f[I]version\f[R]
+Used to specify the Java SE release that specifies the set of restricted
+methods to scan for.
+For multi-release jar files, this option also indicates the version of
+class file that should be loaded from the jar.
+This option should be set to the version of the runtime under which the
+application is eventually intended to be run.
+If this flag is omitted, the version of \f[V]jnativescan\f[R] is used as
+release version, which is the same as the version of the JDK that the
+tool belongs to.
+.TP
+\f[V]--print-native-access\f[R]
+Print a comma-separated list of module names that use native
+functionalities, instead of the default tree structure.
+.TP
+\f[V]--help\f[R] or \f[V]-h\f[R]
+Prints out a full help message.
+.TP
+\f[V]--version\f[R]
+Prints out the abbreviated version string of the tool.
+.SH EXAMPLE OF \f[V]jnativescan\f[R] USE
+.PP
+\f[V]jnativescan\f[R] accepts a runtime configuration in the form of a
+class path, module path, set of root modules, and a target release
+version.
+For the class path, the tool will scan all jar files, including those
+found recursively through the \f[V]Class-Path\f[R] manifest attribute.
+For the module path, the tool scans all root modules specified through
+\f[V]--add-modules\f[R], and any (transitive) dependence of the root
+modules, including any modules that contain service implementations that
+are used by a scanned module.
+.PP
+By default, the tool prints out which jars, classes, and methods use
+native functionalities, in a tree-like structure.
+The following is an example output:
+.IP
+.nf
+\f[CB]
+$ jnativescan --class-path app.jar
+app.jar (ALL-UNNAMED):
+  foo.Main:
+    foo.Main::main(String[])void references restricted methods:
+      java.lang.foreign.MemorySegment::reinterpret(long)MemorySegment
+    foo.Main::nativeMethod()void is a native method declaration
+\f[R]
+.fi
+.PP
+\f[V]app.jar (ALL-UNNAMED)\f[R] is the path to the jar file, with the
+module name in parentheses behind it.
+Since in this case the jar file appears on the class path,
+\f[V]ALL-UNNAMED\f[R] is printed to indicate the unnamed module.
+The second line of the output, \f[V]foo.Main\f[R], indicates that
+methods using native functionalities were found in the
+\f[V]foo.Main\f[R] class.
+The next line:
+.IP
+.nf
+\f[CB]
+    foo.Main::main(String[])void references restricted methods:
+\f[R]
+.fi
+.PP
+Indicates that the \f[V]main(String[])\f[R] method in the
+\f[V]foo.Main\f[R] class references a restricted method, which is listed
+on the following line as:
+.IP
+.nf
+\f[CB]
+      java.lang.foreign.MemorySegment::reinterpret(long)MemorySegment
+\f[R]
+.fi
+.PP
+Lastly, the text:
+.IP
+.nf
+\f[CB]
+    foo.Main::nativeMethod()void is a native method declaration
+\f[R]
+.fi
+.PP
+Indicates that the \f[V]foo.Main\f[R] class contains a declaration of a
+\f[V]native\f[R] method named \f[V]nativeMethod\f[R].
+.PP
+If we add \f[V]--print-native-access\f[R] to the example command line,
+we instead get a list of the names of modules that contain accesses to
+native functionalities:
+.IP
+.nf
+\f[CB]
+$ jnativescan --class-path app.jar --print-native-access
+ALL-UNNAMED
+\f[R]
+.fi
+.PP
+In this case the output consists of just \f[V]ALL-UNNAMED\f[R], which
+indicates a jar file on the class path, that is, in the unnamed module,
+contains an access to native functionalities.
diff --git a/test/jdk/tools/launcher/HelpFlagsTest.java b/test/jdk/tools/launcher/HelpFlagsTest.java
index dda649b9f41ba..15c6c101dd0c1 100644
--- a/test/jdk/tools/launcher/HelpFlagsTest.java
+++ b/test/jdk/tools/launcher/HelpFlagsTest.java
@@ -141,6 +141,7 @@ private static class ToolHelpSpec {
         new ToolHelpSpec("jlink",       1,   1,   1,   0,         0,    0,     2),     // -?, -h, --help
         new ToolHelpSpec("jmap",        1,   1,   1,   0,         1,    0,     1),     // -?, -h, --help, -help accepted but not documented.
         new ToolHelpSpec("jmod",        1,   1,   1,   0,         1,    0,     2),     // -?, -h, --help, -help accepted but not documented.
+        new ToolHelpSpec("jnativescan", 1,   1,   1,   0,         1,    0,     1),     // -?, -h, --help, -help accepted but not documented.
         new ToolHelpSpec("jps",         1,   1,   1,   0,         1,    1,     1),     // -?, -h, --help -help, Documents -help
         new ToolHelpSpec("jrunscript",  1,   1,   1,   0,         1,    1,     7),     // -?, -h, --help -help, Documents -help
         new ToolHelpSpec("jshell",      1,   1,   1,   0,         1,    0,     1),     // -?, -h, --help, -help accepted but not documented.
diff --git a/test/langtools/TEST.groups b/test/langtools/TEST.groups
index 74503501da9b9..e290a1431a3c5 100644
--- a/test/langtools/TEST.groups
+++ b/test/langtools/TEST.groups
@@ -63,6 +63,10 @@ langtools_jdeps = \
     tools/all \
     tools/jdeps
 
+langtools_jnativescan = \
+    tools/all \
+    tools/jnativescan
+
 langtools_slow = \
     jdk/internal/shellsupport/doc/FullJavadocHelperTest.java
 
diff --git a/test/langtools/tools/jnativescan/JNativeScanTestBase.java b/test/langtools/tools/jnativescan/JNativeScanTestBase.java
new file mode 100644
index 0000000000000..97c0b21a738a2
--- /dev/null
+++ b/test/langtools/tools/jnativescan/JNativeScanTestBase.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.io.IOException;
+import java.io.PrintWriter;
+import java.nio.file.Path;
+import java.util.Arrays;
+
+import java.io.StringWriter;
+import java.util.spi.ToolProvider;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.util.JarUtils;
+
+public class JNativeScanTestBase {
+
+    public static final String MODULE_PATH = "mods";
+
+    private static final ToolProvider JNATIVESCAN_TOOL = ToolProvider.findFirst("jnativescan")
+            .orElseThrow(() -> new RuntimeException("jnativescan tool not found"));
+
+    public static OutputAnalyzer jnativescan(String... args) {
+        return run(JNATIVESCAN_TOOL, args);
+    }
+
+    private static OutputAnalyzer run(ToolProvider tp, String[] commands) {
+        int rc;
+        StringWriter sw = new StringWriter();
+        StringWriter esw = new StringWriter();
+
+        try (PrintWriter pw = new PrintWriter(sw);
+             PrintWriter epw = new PrintWriter(esw)) {
+            System.out.println("Running " + tp.name() + ", Command: " + Arrays.toString(commands));
+            rc = tp.run(pw, epw, commands);
+        }
+        OutputAnalyzer output = new OutputAnalyzer(sw.toString(), esw.toString(), rc);
+        output.outputTo(System.out);
+        output.errorTo(System.err);
+        return output;
+    }
+
+    public static Path makeModularJar(String moduleName) throws IOException {
+        Path jarPath = Path.of(MODULE_PATH, moduleName + ".jar");
+        Path moduleRoot = moduleRoot(moduleName);
+        JarUtils.createJarFile(jarPath, moduleRoot);
+        return jarPath;
+    }
+
+    public static Path moduleRoot(String name) {
+        return Path.of(System.getProperty("test.module.path")).resolve(name);
+    }
+
+    public static OutputAnalyzer assertSuccess(OutputAnalyzer output) {
+        if (output.getExitValue() != 0) {
+            throw new IllegalStateException("tool run failed");
+        }
+        return output;
+    }
+
+    public static OutputAnalyzer assertFailure(OutputAnalyzer output) {
+        if (output.getExitValue() == 0) {
+            throw new IllegalStateException("tool run succeeded");
+        }
+        return output;
+    }
+}
diff --git a/test/langtools/tools/jnativescan/TestArrayTypeRefs.java b/test/langtools/tools/jnativescan/TestArrayTypeRefs.java
new file mode 100644
index 0000000000000..a439fdfdef967
--- /dev/null
+++ b/test/langtools/tools/jnativescan/TestArrayTypeRefs.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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
+ * @library /test/lib .. ./cases/modules
+ * @build JNativeScanTestBase
+ *     cases.classpath.arrayref.App
+ * @run junit TestArrayTypeRefs
+ */
+
+import jdk.test.lib.util.JarUtils;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.nio.file.Path;
+
+public class TestArrayTypeRefs extends JNativeScanTestBase {
+
+    static Path ARRAY_REF;
+
+    @BeforeAll
+    public static void before() throws IOException {
+        ARRAY_REF = Path.of("arrayref.jar");
+        Path testClasses = Path.of(System.getProperty("test.classes", ""));
+        JarUtils.createJarFile(ARRAY_REF, testClasses, Path.of("arrayref", "App.class"));
+    }
+
+    @Test
+    public void testSingleJarClassPath() {
+        assertSuccess(jnativescan("--class-path", ARRAY_REF.toString()))
+                .stderrShouldBeEmpty()
+                .stdoutShouldContain("<no restricted methods>");
+    }
+}
diff --git a/test/langtools/tools/jnativescan/TestJNativeScan.java b/test/langtools/tools/jnativescan/TestJNativeScan.java
new file mode 100644
index 0000000000000..94db492441263
--- /dev/null
+++ b/test/langtools/tools/jnativescan/TestJNativeScan.java
@@ -0,0 +1,252 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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
+ * @library /test/lib .. ./cases/modules
+ * @build JNativeScanTestBase
+ *     org.singlejar/* org.lib/* org.myapp/* org.service/*
+ *     cases.classpath.singlejar.main.Main
+ *     cases.classpath.lib.Lib
+ *     cases.classpath.app.App
+ *     cases.classpath.unnamed_package.UnnamedPackage
+ * @run junit TestJNativeScan
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.util.JarUtils;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class TestJNativeScan extends JNativeScanTestBase {
+
+    static Path TEST_CLASSES;
+
+    static Path CLASS_PATH_APP;
+    static Path SINGLE_JAR_CLASS_PATH;
+    static Path SINGLE_JAR_MODULAR;
+    static Path ORG_MYAPP;
+    static Path ORG_LIB;
+    static Path UNNAMED_PACKAGE_JAR;
+    static Path LIB_JAR;
+
+    @BeforeAll
+    public static void before() throws IOException {
+        SINGLE_JAR_CLASS_PATH = Path.of("singleJar.jar");
+        TEST_CLASSES = Path.of(System.getProperty("test.classes", ""));
+        JarUtils.createJarFile(SINGLE_JAR_CLASS_PATH, TEST_CLASSES, Path.of("main", "Main.class"));
+
+        LIB_JAR = Path.of("lib.jar");
+        JarUtils.createJarFile(LIB_JAR, TEST_CLASSES, Path.of("lib", "Lib.class"));
+        Manifest manifest = new Manifest();
+        Attributes mainAttrs = manifest.getMainAttributes();
+        mainAttrs.put(Attributes.Name.MANIFEST_VERSION, "1.0"); // need version or other attributes will be ignored
+        mainAttrs.putValue("Class-Path", "lib.jar non-existent.jar");
+        CLASS_PATH_APP = Path.of("app.jar");
+        JarUtils.createJarFile(CLASS_PATH_APP, manifest, TEST_CLASSES, Path.of("app", "App.class"));
+
+        SINGLE_JAR_MODULAR = makeModularJar("org.singlejar");
+        ORG_MYAPP = makeModularJar("org.myapp");
+        ORG_LIB = makeModularJar("org.lib");
+        makeModularJar("org.service");
+
+        UNNAMED_PACKAGE_JAR = Path.of("unnamed_package.jar");
+        JarUtils.createJarFile(UNNAMED_PACKAGE_JAR, TEST_CLASSES, Path.of("UnnamedPackage.class"));
+    }
+
+    @Test
+    public void testSingleJarClassPath() {
+        assertSuccess(jnativescan("--class-path", SINGLE_JAR_CLASS_PATH.toString()))
+                .stderrShouldBeEmpty()
+                .stdoutShouldContain("ALL-UNNAMED")
+                .stdoutShouldContain("main.Main")
+                .stdoutShouldContain("main.Main::m()void is a native method declaration")
+                .stdoutShouldContain("main.Main::main(String[])void references restricted methods")
+                .stdoutShouldContain("java.lang.foreign.MemorySegment::reinterpret(long)MemorySegment");
+    }
+
+    @Test
+    public void testSingleJarModulePath() {
+        assertSuccess(jnativescan("--module-path", MODULE_PATH, "--add-modules", "org.singlejar"))
+                .stderrShouldBeEmpty()
+                .stdoutShouldContain("org.singlejar")
+                .stdoutShouldContain("org.singlejar.main.Main")
+                .stdoutShouldContain("org.singlejar.main.Main::m()void is a native method declaration")
+                .stdoutShouldContain("org.singlejar.main.Main::main(String[])void references restricted methods")
+                .stdoutShouldContain("java.lang.foreign.MemorySegment::reinterpret(long)MemorySegment");
+    }
+
+    @Test
+    public void testWithDepModule() {
+        assertSuccess(jnativescan("--module-path", MODULE_PATH, "--add-modules", "org.myapp"))
+                .stderrShouldBeEmpty()
+                .stdoutShouldContain("org.lib")
+                .stdoutShouldContain("org.lib.Lib")
+                .stdoutShouldContain("org.lib.Lib::m()void is a native method declaration")
+                .stdoutShouldContain("org.lib.Lib::doIt()void references restricted methods")
+                .stdoutShouldContain("java.lang.foreign.MemorySegment::reinterpret(long)MemorySegment")
+                .stdoutShouldContain("org.service")
+                .stdoutShouldContain("org.service.ServiceImpl")
+                .stdoutShouldContain("org.service.ServiceImpl::m()void is a native method declaration")
+                .stdoutShouldContain("org.service.ServiceImpl::doIt()void references restricted methods")
+                .stdoutShouldContain("java.lang.foreign.MemorySegment::reinterpret(long)MemorySegment");
+    }
+
+    @Test
+    public void testAllModulePath() {
+        assertSuccess(jnativescan("--module-path", MODULE_PATH, "--add-modules", "ALL-MODULE-PATH"))
+                .stderrShouldBeEmpty()
+                .stdoutShouldContain("org.singlejar")
+                .stdoutShouldContain("org.lib")
+                .stdoutShouldContain("org.service");
+    }
+
+    @Test
+    public void testClassPathAttribute() {
+        assertSuccess(jnativescan("--class-path", CLASS_PATH_APP.toString()))
+                .stderrShouldBeEmpty()
+                .stdoutShouldContain("ALL-UNNAMED")
+                .stdoutShouldContain("lib.Lib")
+                .stdoutShouldContain("lib.Lib::m()void is a native method declaration")
+                .stdoutShouldContain("lib.Lib::doIt()void references restricted methods")
+                .stdoutShouldContain("java.lang.foreign.MemorySegment::reinterpret(long)MemorySegment");
+    }
+
+    @Test
+    public void testInvalidRelease() {
+        assertFailure(jnativescan("--module-path", MODULE_PATH, "--add-modules", "ALL-MODULE-PATH", "--release", "asdf"))
+                .stderrShouldContain("Invalid release");
+    }
+
+    @Test
+    public void testReleaseNotSupported() {
+        assertFailure(jnativescan("--module-path", MODULE_PATH, "--add-modules", "ALL-MODULE-PATH", "--release", "9999999"))
+                .stderrShouldContain("Release: 9999999 not supported");
+    }
+
+    @Test
+    public void testFileDoesNotExist() {
+        assertFailure(jnativescan("--class-path", "non-existent.jar"))
+                .stderrShouldContain("Path does not appear to be a jar file, or directory containing classes");
+    }
+
+    @Test
+    public void testModuleNotAJarFile() {
+        String modulePath = moduleRoot("org.myapp").toString() + File.pathSeparator + ORG_LIB.toString();
+        assertSuccess(jnativescan("--module-path", modulePath,
+                        "--add-modules", "ALL-MODULE-PATH"))
+                .stdoutShouldContain("lib.Lib")
+                .stdoutShouldContain("lib.Lib::m()void is a native method declaration")
+                .stdoutShouldContain("lib.Lib::doIt()void references restricted methods")
+                .stdoutShouldContain("java.lang.foreign.MemorySegment::reinterpret(long)MemorySegment");
+    }
+
+    @Test
+    public void testPrintNativeAccess() {
+        assertSuccess(jnativescan("--module-path", MODULE_PATH,
+                                  "-add-modules", "org.singlejar,org.myapp",
+                                  "--print-native-access"))
+                .stdoutShouldMatch("org.lib,org.service,org.singlejar");
+    }
+
+    @Test
+    public void testNoDuplicateNames() {
+        String classPath = SINGLE_JAR_CLASS_PATH + File.pathSeparator + CLASS_PATH_APP;
+        OutputAnalyzer output = assertSuccess(jnativescan("--class-path", classPath, "--print-native-access"));
+        String[] moduleNames = output.getStdout().split(",");
+        Set<String> names = new HashSet<>();
+        for (String name : moduleNames) {
+            assertTrue(names.add(name.strip()));
+        }
+    }
+
+    @Test
+    public void testUnnamedPackage() {
+        assertSuccess(jnativescan("--class-path", UNNAMED_PACKAGE_JAR.toString()))
+                .stderrShouldBeEmpty()
+                .stdoutShouldContain("ALL-UNNAMED")
+                .stdoutShouldNotContain(".UnnamedPackage")
+                .stdoutShouldContain("UnnamedPackage")
+                .stdoutShouldContain("UnnamedPackage::m()void is a native method declaration")
+                .stdoutShouldContain("UnnamedPackage::main(String[])void references restricted methods")
+                .stdoutShouldContain("java.lang.foreign.MemorySegment::reinterpret(long)MemorySegment");
+    }
+
+    @Test
+    public void testPositionalArguments() {
+        assertFailure(jnativescan("foo"))
+                .stdoutShouldBeEmpty()
+                .stderrShouldContain("jnativescan does not accept positional arguments");
+    }
+
+    @Test
+    public void testMissingRootModules() {
+        assertFailure(jnativescan("--module-path", MODULE_PATH))
+                .stdoutShouldBeEmpty()
+                .stderrShouldContain("Missing required option(s) [add-modules]");
+    }
+
+    @Test
+    public void testClassPathDirectory() {
+        assertSuccess(jnativescan("--class-path", TEST_CLASSES.toString()))
+                .stderrShouldBeEmpty()
+                .stdoutShouldContain("ALL-UNNAMED")
+                .stdoutShouldContain("UnnamedPackage")
+                .stdoutShouldContain("UnnamedPackage::m()void is a native method declaration")
+                .stdoutShouldContain("UnnamedPackage::main(String[])void references restricted methods")
+                .stdoutShouldContain("main.Main")
+                .stdoutShouldContain("main.Main::m()void is a native method declaration")
+                .stdoutShouldContain("main.Main::main(String[])void references restricted methods")
+                .stdoutShouldContain("lib.Lib")
+                .stdoutShouldContain("lib.Lib::m()void is a native method declaration")
+                .stdoutShouldContain("lib.Lib::doIt()void references restricted methods")
+                .stdoutShouldContain("java.lang.foreign.MemorySegment::reinterpret(long)MemorySegment");
+    }
+
+    @Test
+    public void testMultipleClassPathJars() {
+        // make sure all of these are reported, even when they are all in the ALL-UNNAMED module
+        String classPath = UNNAMED_PACKAGE_JAR
+                + File.pathSeparator + SINGLE_JAR_CLASS_PATH
+                + File.pathSeparator + LIB_JAR;
+        assertSuccess(jnativescan("--class-path", classPath))
+                .stderrShouldBeEmpty()
+                .stdoutShouldContain("ALL-UNNAMED")
+                .stdoutShouldContain("UnnamedPackage")
+                .stdoutShouldContain(UNNAMED_PACKAGE_JAR.toString())
+                .stdoutShouldContain("lib.Lib")
+                .stdoutShouldContain(LIB_JAR.toString())
+                .stdoutShouldContain("main.Main")
+                .stdoutShouldContain(SINGLE_JAR_CLASS_PATH.toString());
+    }
+}
diff --git a/test/langtools/tools/jnativescan/TestMissingSystemClass.java b/test/langtools/tools/jnativescan/TestMissingSystemClass.java
new file mode 100644
index 0000000000000..5806590d0e081
--- /dev/null
+++ b/test/langtools/tools/jnativescan/TestMissingSystemClass.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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
+ * @library /test/lib .. ./cases/modules
+ * @build JNativeScanTestBase
+ * @compile --release 20 cases/classpath/missingsystem/App.java
+ * @run junit TestMissingSystemClass
+ */
+
+import jdk.test.lib.util.JarUtils;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.nio.file.Path;
+
+public class TestMissingSystemClass extends JNativeScanTestBase {
+
+    static Path MISSING_SYSTEM;
+
+    @BeforeAll
+    public static void before() throws IOException {
+        MISSING_SYSTEM = Path.of("missingsystem.jar");
+        Path testClasses = Path.of(System.getProperty("test.classes", ""));
+        JarUtils.createJarFile(MISSING_SYSTEM, testClasses, Path.of("missingsystem", "App.class"));
+    }
+
+    @Test
+    public void testSingleJarClassPath() {
+        assertFailure(jnativescan("--class-path", MISSING_SYSTEM.toString(), "--release", "21"))
+                .stdoutShouldBeEmpty()
+                .stderrShouldContain("Error while processing method")
+                .stderrShouldContain("missingsystem.App::main(String[])void")
+                .stderrShouldContain("CAUSED BY:")
+                .stderrShouldContain("System class can not be found")
+                .stderrShouldContain("java.lang.Compiler");
+    }
+}
diff --git a/test/langtools/tools/jnativescan/TestSubclassRefs.java b/test/langtools/tools/jnativescan/TestSubclassRefs.java
new file mode 100644
index 0000000000000..c8eed0439ee75
--- /dev/null
+++ b/test/langtools/tools/jnativescan/TestSubclassRefs.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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
+ * @library /test/lib .. ./cases/modules
+ * @build JNativeScanTestBase
+ *     cases.classpath.subclassref.App
+ * @run junit TestSubclassRefs
+ */
+
+import jdk.test.lib.util.JarUtils;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.nio.file.Path;
+
+public class TestSubclassRefs extends JNativeScanTestBase {
+
+    static Path SUBCLASS_REF;
+
+    @BeforeAll
+    public static void before() throws IOException {
+        SUBCLASS_REF = Path.of("subclassref.jar");
+        Path testClasses = Path.of(System.getProperty("test.classes", ""));
+        JarUtils.createJarFile(SUBCLASS_REF, testClasses, Path.of("subclassref", "App.class"));
+    }
+
+    @Test
+    public void testSingleJarClassPath() {
+        assertSuccess(jnativescan("--class-path", SUBCLASS_REF.toString()))
+                .stderrShouldBeEmpty()
+                .stdoutShouldContain("<no restricted methods>");
+    }
+}
diff --git a/test/langtools/tools/jnativescan/cases/classpath/app/App.java b/test/langtools/tools/jnativescan/cases/classpath/app/App.java
new file mode 100644
index 0000000000000..f96ab11e5764a
--- /dev/null
+++ b/test/langtools/tools/jnativescan/cases/classpath/app/App.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+package app;
+
+import lib.Lib;
+
+public class App {
+    public static void main(String[] args) {
+        Lib.doIt();
+    }
+}
diff --git a/test/langtools/tools/jnativescan/cases/classpath/arrayref/App.java b/test/langtools/tools/jnativescan/cases/classpath/arrayref/App.java
new file mode 100644
index 0000000000000..aa480f392fbf2
--- /dev/null
+++ b/test/langtools/tools/jnativescan/cases/classpath/arrayref/App.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+package arrayref;
+
+public class App {
+    public static void main(String[] args) {
+        // reference an array method to see that
+        // RestrictedMethodFinder correctly handles
+        // references to array methods
+        args.clone();
+    }
+}
diff --git a/test/langtools/tools/jnativescan/cases/classpath/lib/Lib.java b/test/langtools/tools/jnativescan/cases/classpath/lib/Lib.java
new file mode 100644
index 0000000000000..ec92696364c9d
--- /dev/null
+++ b/test/langtools/tools/jnativescan/cases/classpath/lib/Lib.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+package lib;
+
+import java.lang.foreign.MemorySegment;
+
+public class Lib {
+    public static void doIt() {
+        MemorySegment.ofAddress(1234).reinterpret(10);
+    }
+
+    private static native void m();
+}
diff --git a/test/langtools/tools/jnativescan/cases/classpath/missingsystem/App.java b/test/langtools/tools/jnativescan/cases/classpath/missingsystem/App.java
new file mode 100644
index 0000000000000..0e20fe81eecd0
--- /dev/null
+++ b/test/langtools/tools/jnativescan/cases/classpath/missingsystem/App.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+package missingsystem;
+
+public class App {
+    public static void main(String[] args) {
+        // this class was present in Java 20, but removed in 21
+        // if we compile with --release 20, but run jnativescan
+        // with --release 21, we should get an error
+        java.lang.Compiler.enable();
+    }
+}
diff --git a/test/langtools/tools/jnativescan/cases/classpath/singlejar/main/Main.java b/test/langtools/tools/jnativescan/cases/classpath/singlejar/main/Main.java
new file mode 100644
index 0000000000000..280e8646f9ff4
--- /dev/null
+++ b/test/langtools/tools/jnativescan/cases/classpath/singlejar/main/Main.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+package main;
+
+import java.lang.foreign.*;
+
+public class Main {
+    public static void main(String[] args) {
+        MemorySegment.ofAddress(1234).reinterpret(10);
+    }
+
+    private static native void m();
+}
diff --git a/test/langtools/tools/jnativescan/cases/classpath/subclassref/App.java b/test/langtools/tools/jnativescan/cases/classpath/subclassref/App.java
new file mode 100644
index 0000000000000..abe9e41265e4c
--- /dev/null
+++ b/test/langtools/tools/jnativescan/cases/classpath/subclassref/App.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+package subclassref;
+
+import java.util.List;
+
+public class App {
+    public static void main(String[] args) {
+        List<String> l = List.of(args);
+        l.stream(); // List does not declare stream()
+    }
+}
diff --git a/test/langtools/tools/jnativescan/cases/classpath/unnamed_package/UnnamedPackage.java b/test/langtools/tools/jnativescan/cases/classpath/unnamed_package/UnnamedPackage.java
new file mode 100644
index 0000000000000..4e8dfe69b5a19
--- /dev/null
+++ b/test/langtools/tools/jnativescan/cases/classpath/unnamed_package/UnnamedPackage.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.lang.foreign.*;
+
+public class UnnamedPackage {
+    public static void main(String[] args) {
+        MemorySegment.ofAddress(1234).reinterpret(10);
+    }
+
+    private static native void m();
+}
diff --git a/test/langtools/tools/jnativescan/cases/modules/org.lib/module-info.java b/test/langtools/tools/jnativescan/cases/modules/org.lib/module-info.java
new file mode 100644
index 0000000000000..8572ed80e431d
--- /dev/null
+++ b/test/langtools/tools/jnativescan/cases/modules/org.lib/module-info.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+module org.lib {
+    exports org.lib;
+}
diff --git a/test/langtools/tools/jnativescan/cases/modules/org.lib/org/lib/Lib.java b/test/langtools/tools/jnativescan/cases/modules/org.lib/org/lib/Lib.java
new file mode 100644
index 0000000000000..3f9ea0e1ada26
--- /dev/null
+++ b/test/langtools/tools/jnativescan/cases/modules/org.lib/org/lib/Lib.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+package org.lib;
+
+import java.lang.foreign.*;
+
+public class Lib {
+    public static void doIt() {
+        MemorySegment.ofAddress(1234).reinterpret(10);
+    }
+
+    private static native void m();
+}
diff --git a/test/langtools/tools/jnativescan/cases/modules/org.lib/org/lib/Service.java b/test/langtools/tools/jnativescan/cases/modules/org.lib/org/lib/Service.java
new file mode 100644
index 0000000000000..2e406d926a662
--- /dev/null
+++ b/test/langtools/tools/jnativescan/cases/modules/org.lib/org/lib/Service.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+package org.lib;
+
+public interface Service {
+}
diff --git a/test/langtools/tools/jnativescan/cases/modules/org.myapp/module-info.java b/test/langtools/tools/jnativescan/cases/modules/org.myapp/module-info.java
new file mode 100644
index 0000000000000..8155fb5d8f260
--- /dev/null
+++ b/test/langtools/tools/jnativescan/cases/modules/org.myapp/module-info.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+module org.myapp {
+    requires org.lib;
+
+    uses org.lib.Service;
+}
diff --git a/test/langtools/tools/jnativescan/cases/modules/org.myapp/org/myapp/main/Main.java b/test/langtools/tools/jnativescan/cases/modules/org.myapp/org/myapp/main/Main.java
new file mode 100644
index 0000000000000..c2329b2ceeb2f
--- /dev/null
+++ b/test/langtools/tools/jnativescan/cases/modules/org.myapp/org/myapp/main/Main.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+package org.myapp.main;
+
+import org.lib.Lib;
+
+public class Main {
+    public static void main(String[] args) {
+        Lib.doIt();
+    }
+}
diff --git a/test/langtools/tools/jnativescan/cases/modules/org.service/module-info.java b/test/langtools/tools/jnativescan/cases/modules/org.service/module-info.java
new file mode 100644
index 0000000000000..431dd64172dd4
--- /dev/null
+++ b/test/langtools/tools/jnativescan/cases/modules/org.service/module-info.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+module org.service {
+    requires org.lib;
+
+    provides org.lib.Service with org.service.ServiceImpl;
+}
diff --git a/test/langtools/tools/jnativescan/cases/modules/org.service/org/service/ServiceImpl.java b/test/langtools/tools/jnativescan/cases/modules/org.service/org/service/ServiceImpl.java
new file mode 100644
index 0000000000000..6e643f1c649f1
--- /dev/null
+++ b/test/langtools/tools/jnativescan/cases/modules/org.service/org/service/ServiceImpl.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+package org.service;
+
+import org.lib.Service;
+
+import java.lang.foreign.MemorySegment;
+
+public class ServiceImpl implements Service {
+    public void doIt() {
+        MemorySegment.ofAddress(1234).reinterpret(10);
+    }
+
+    private native void m();
+}
diff --git a/test/langtools/tools/jnativescan/cases/modules/org.singlejar/module-info.java b/test/langtools/tools/jnativescan/cases/modules/org.singlejar/module-info.java
new file mode 100644
index 0000000000000..c9f96e4f77147
--- /dev/null
+++ b/test/langtools/tools/jnativescan/cases/modules/org.singlejar/module-info.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+module org.singlejar {
+
+}
diff --git a/test/langtools/tools/jnativescan/cases/modules/org.singlejar/org/singlejar/main/Main.java b/test/langtools/tools/jnativescan/cases/modules/org.singlejar/org/singlejar/main/Main.java
new file mode 100644
index 0000000000000..c6925eaf64996
--- /dev/null
+++ b/test/langtools/tools/jnativescan/cases/modules/org.singlejar/org/singlejar/main/Main.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+package org.singlejar.main;
+
+import java.lang.foreign.*;
+
+public class Main {
+    public static void main(String[] args) {
+        MemorySegment.ofAddress(1234).reinterpret(10);
+    }
+
+    private static native void m();
+}

From be3676f6bbc2d8041e43cf7bcfaee7fb9d864378 Mon Sep 17 00:00:00 2001
From: Matias Saavedra Silva <matsaave@openjdk.org>
Date: Mon, 8 Jul 2024 14:04:32 +0000
Subject: [PATCH 015/401] 8304484: CDS dynamic dumping incorrectly leads to
 "Error occurred during initialization of VM"

Reviewed-by: ccheung, iklam
---
 src/hotspot/share/classfile/classLoader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/classfile/classLoader.cpp b/src/hotspot/share/classfile/classLoader.cpp
index 910cbe48c5c19..e410824e3001c 100644
--- a/src/hotspot/share/classfile/classLoader.cpp
+++ b/src/hotspot/share/classfile/classLoader.cpp
@@ -470,7 +470,7 @@ bool ClassPathImageEntry::is_modules_image() const {
 void ClassLoader::exit_with_path_failure(const char* error, const char* message) {
   assert(CDSConfig::is_dumping_archive(), "sanity");
   tty->print_cr("Hint: enable -Xlog:class+path=info to diagnose the failure");
-  vm_exit_during_initialization(error, message);
+  vm_exit_during_cds_dumping(error, message);
 }
 #endif
 

From d8c1c6ab0543c986280dcfa1c6c79e010a7b35fb Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Mon, 8 Jul 2024 15:45:26 +0000
Subject: [PATCH 016/401] 8335604: Serial: Inline
 Generation::contiguous_available

Reviewed-by: tschatzl
---
 src/hotspot/share/gc/serial/defNewGeneration.cpp  | 5 -----
 src/hotspot/share/gc/serial/defNewGeneration.hpp  | 2 --
 src/hotspot/share/gc/serial/generation.hpp        | 4 ----
 src/hotspot/share/gc/serial/tenuredGeneration.cpp | 6 +-----
 src/hotspot/share/gc/serial/tenuredGeneration.hpp | 2 --
 5 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/hotspot/share/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp
index acf7e23910367..715b82fd38d32 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.cpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.cpp
@@ -533,11 +533,6 @@ size_t DefNewGeneration::capacity_before_gc() const {
   return eden()->capacity();
 }
 
-size_t DefNewGeneration::contiguous_available() const {
-  return eden()->free();
-}
-
-
 void DefNewGeneration::object_iterate(ObjectClosure* blk) {
   eden()->object_iterate(blk);
   from()->object_iterate(blk);
diff --git a/src/hotspot/share/gc/serial/defNewGeneration.hpp b/src/hotspot/share/gc/serial/defNewGeneration.hpp
index a7ee555902a25..011b79fdabd6b 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.hpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.hpp
@@ -172,8 +172,6 @@ class DefNewGeneration: public Generation {
   // heuristic resizing decisions.
   size_t unsafe_max_alloc_nogc() const;
 
-  size_t contiguous_available() const;
-
   size_t max_eden_size() const              { return _max_eden_size; }
   size_t max_survivor_size() const          { return _max_survivor_size; }
 
diff --git a/src/hotspot/share/gc/serial/generation.hpp b/src/hotspot/share/gc/serial/generation.hpp
index 5e5aad5d0c1b2..a757c97c5cb15 100644
--- a/src/hotspot/share/gc/serial/generation.hpp
+++ b/src/hotspot/share/gc/serial/generation.hpp
@@ -96,10 +96,6 @@ class Generation: public CHeapObj<mtGC> {
   // for the allocation of objects.
   virtual size_t max_capacity() const;
 
-  // The largest number of contiguous free bytes in the generation,
-  // including expansion  (Assumes called at a safepoint.)
-  virtual size_t contiguous_available() const = 0;
-
   MemRegion reserved() const { return _reserved; }
 
   /* Returns "TRUE" iff "p" points into the reserved area of the generation. */
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.cpp b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
index f1389b48557f8..b1b7507094771 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.cpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
@@ -377,7 +377,7 @@ void TenuredGeneration::update_counters() {
 }
 
 bool TenuredGeneration::promotion_attempt_is_safe(size_t max_promotion_in_bytes) const {
-  size_t available = contiguous_available();
+  size_t available = _the_space->free() + _virtual_space.uncommitted_size();
   size_t av_promo  = (size_t)_avg_promoted->padded_average();
   bool   res = (available >= av_promo) || (available >= max_promotion_in_bytes);
 
@@ -413,10 +413,6 @@ TenuredGeneration::expand_and_allocate(size_t word_size, bool is_tlab) {
   return allocate(word_size, is_tlab);
 }
 
-size_t TenuredGeneration::contiguous_available() const {
-  return _the_space->free() + _virtual_space.uncommitted_size();
-}
-
 void TenuredGeneration::assert_correct_size_change_locking() {
   assert_locked_or_safepoint(Heap_lock);
 }
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
index bcb2d668213e8..dcec912d4887f 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.hpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
@@ -124,8 +124,6 @@ class TenuredGeneration: public Generation {
   const char* name() const { return "tenured generation"; }
   const char* short_name() const { return "Tenured"; }
 
-  size_t contiguous_available() const;
-
   // Iteration
   void object_iterate(ObjectClosure* blk);
 

From a9b7f42f29120a3cca0d341350ff03cae485e68b Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Mon, 8 Jul 2024 16:20:01 +0000
Subject: [PATCH 017/401] 8333826: Update --release 23 symbol information for
 JDK 23 build 29

Reviewed-by: iris, jlahoda
---
 src/jdk.compiler/share/data/symbols/java.desktop-N.sym.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/jdk.compiler/share/data/symbols/java.desktop-N.sym.txt b/src/jdk.compiler/share/data/symbols/java.desktop-N.sym.txt
index fdc899578cf82..577ff91c7caad 100644
--- a/src/jdk.compiler/share/data/symbols/java.desktop-N.sym.txt
+++ b/src/jdk.compiler/share/data/symbols/java.desktop-N.sym.txt
@@ -119,6 +119,10 @@ class name javax/swing/JScrollBar
 method name setMinimumSize descriptor (Ljava/awt/Dimension;)V flags 1
 method name setMaximumSize descriptor (Ljava/awt/Dimension;)V flags 1
 
+class name javax/swing/plaf/basic/BasicSliderUI
+-method name <init> descriptor ()V
+method name <init> descriptor ()V flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="23")
+
 class name javax/swing/plaf/synth/SynthTreeUI
 method name getCollapsedIcon descriptor ()Ljavax/swing/Icon; flags 1
 

From 284671a1e4fb5bfe15b20b7f41fc24415b1235ed Mon Sep 17 00:00:00 2001
From: Calvin Cheung <ccheung@openjdk.org>
Date: Mon, 8 Jul 2024 16:44:22 +0000
Subject: [PATCH 018/401] 8335449: runtime/cds/DeterministicDump.java fails
 with File content different at byte ...

Reviewed-by: matsaave, iklam
---
 test/hotspot/jtreg/runtime/cds/DeterministicDump.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/runtime/cds/DeterministicDump.java b/test/hotspot/jtreg/runtime/cds/DeterministicDump.java
index 8f9bb4a582985..cc8d8c2b1dde9 100644
--- a/test/hotspot/jtreg/runtime/cds/DeterministicDump.java
+++ b/test/hotspot/jtreg/runtime/cds/DeterministicDump.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8241071
  * @summary The same JDK build should always generate the same archive file (no randomness).
- * @requires vm.cds
+ * @requires vm.cds & vm.flagless
  * @library /test/lib
  * @run driver DeterministicDump
  */

From 3a87eb5c4606ce39970962895315567e8606eba7 Mon Sep 17 00:00:00 2001
From: Kelvin Nilsen <kdnilsen@openjdk.org>
Date: Mon, 8 Jul 2024 18:03:19 +0000
Subject: [PATCH 019/401] 8335126: Shenandoah: Improve OOM handling

Reviewed-by: shade, ysr, wkemper, rkennke
---
 .../gc/shenandoah/shenandoahControlThread.cpp |  3 +-
 .../gc/shenandoah/shenandoahDegeneratedGC.cpp |  1 -
 .../share/gc/shenandoah/shenandoahHeap.cpp    | 48 ++++++++++++-------
 3 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
index e538ca024678f..95a70de5790e9 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
@@ -318,7 +318,8 @@ void ShenandoahControlThread::service_concurrent_normal_cycle(GCCause::Cause cau
 
   ShenandoahConcurrentGC gc;
   if (gc.collect(cause)) {
-    // Cycle is complete
+    // Cycle is complete.  There were no failed allocation requests and no degeneration, so count this as good progress.
+    heap->notify_gc_progress();
     heap->heuristics()->record_success_concurrent();
     heap->shenandoah_policy()->record_success_concurrent(gc.abbreviated());
   } else {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
index fb5283bb1d88d..6b597d9b2d7b3 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
@@ -228,7 +228,6 @@ void ShenandoahDegenGC::op_degenerated() {
   // Check for futility and fail. There is no reason to do several back-to-back Degenerated cycles,
   // because that probably means the heap is overloaded and/or fragmented.
   if (!metrics.is_good_progress()) {
-    heap->notify_gc_no_progress();
     heap->cancel_gc(GCCause::_shenandoah_upgrade_to_full_gc);
     op_degenerated_futile();
   } else {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index ee3f4e7d8eb8c..5c5b6f7ebe58d 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -945,24 +945,36 @@ HeapWord* ShenandoahHeap::allocate_memory(ShenandoahAllocRequest& req) {
       return nullptr;
     }
 
-    // Block until control thread reacted, then retry allocation.
-    //
-    // It might happen that one of the threads requesting allocation would unblock
-    // way later after GC happened, only to fail the second allocation, because
-    // other threads have already depleted the free storage. In this case, a better
-    // strategy is to try again, as long as GC makes progress (or until at least
-    // one full GC has completed).
-    size_t original_count = shenandoah_policy()->full_gc_count();
-    while (result == nullptr
-        && (get_gc_no_progress_count() == 0 || original_count == shenandoah_policy()->full_gc_count())) {
-      control_thread()->handle_alloc_failure(req, true);
-      result = allocate_memory_under_lock(req, in_new_region);
-    }
-
-    if (log_is_enabled(Debug, gc, alloc)) {
-      ResourceMark rm;
-      log_debug(gc, alloc)("Thread: %s, Result: " PTR_FORMAT ", Request: %s, Size: " SIZE_FORMAT ", Original: " SIZE_FORMAT ", Latest: " SIZE_FORMAT,
-                           Thread::current()->name(), p2i(result), req.type_string(), req.size(), original_count, get_gc_no_progress_count());
+    if (result == nullptr) {
+      // Block until control thread reacted, then retry allocation.
+      //
+      // It might happen that one of the threads requesting allocation would unblock
+      // way later after GC happened, only to fail the second allocation, because
+      // other threads have already depleted the free storage. In this case, a better
+      // strategy is to try again, until at least one full GC has completed.
+      //
+      // Stop retrying and return nullptr to cause OOMError exception if our allocation failed even after:
+      //   a) We experienced a GC that had good progress, or
+      //   b) We experienced at least one Full GC (whether or not it had good progress)
+      //
+      // TODO: Consider GLOBAL GC rather than Full GC to remediate OOM condition: https://bugs.openjdk.org/browse/JDK-8335910
+
+      size_t original_count = shenandoah_policy()->full_gc_count();
+      while ((result == nullptr) && (original_count == shenandoah_policy()->full_gc_count())) {
+        control_thread()->handle_alloc_failure(req, true);
+        result = allocate_memory_under_lock(req, in_new_region);
+      }
+      if (result != nullptr) {
+        // If our allocation request has been satisifed after it initially failed, we count this as good gc progress
+        notify_gc_progress();
+      }
+      if (log_is_enabled(Debug, gc, alloc)) {
+        ResourceMark rm;
+        log_debug(gc, alloc)("Thread: %s, Result: " PTR_FORMAT ", Request: %s, Size: " SIZE_FORMAT
+                             ", Original: " SIZE_FORMAT ", Latest: " SIZE_FORMAT,
+                             Thread::current()->name(), p2i(result), req.type_string(), req.size(),
+                             original_count, get_gc_no_progress_count());
+      }
     }
   } else {
     assert(req.is_gc_alloc(), "Can only accept GC allocs here");

From 3733fe3a207078b585421cd2a098e808fafaa817 Mon Sep 17 00:00:00 2001
From: "lawrence.andrews" <lawrence.andrews@oracle.com>
Date: Mon, 8 Jul 2024 19:14:33 +0000
Subject: [PATCH 020/401] 8335789: [TESTBUG] XparColor.java test fails with
 Error. Parse Exception: Invalid or unrecognized bugid: @

Reviewed-by: aivanov
---
 test/jdk/java/awt/print/PrinterJob/XparColor.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/jdk/java/awt/print/PrinterJob/XparColor.java b/test/jdk/java/awt/print/PrinterJob/XparColor.java
index 9a85a78af558a..30713b1424e53 100644
--- a/test/jdk/java/awt/print/PrinterJob/XparColor.java
+++ b/test/jdk/java/awt/print/PrinterJob/XparColor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /**
  * @test
  * @bug 4179262
- @ @key printer
+ * @key printer
  * @summary Confirm that transparent colors are printed correctly. The
  * printout should show transparent rings with increasing darkness toward
  * the center.

From babf6df7d97e4beedb25e689634d999412c1e950 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@openjdk.org>
Date: Mon, 8 Jul 2024 20:09:07 +0000
Subject: [PATCH 021/401] 8334757: AssertionError: Missing type variable in
 where clause

Reviewed-by: jlahoda, vromero
---
 .../javac/util/RichDiagnosticFormatter.java   |  3 +++
 .../CantAnnotateClassWithTypeVariable.java    | 19 +++++++++++++++++++
 .../CantAnnotateClassWithTypeVariable.out     |  2 ++
 3 files changed, 24 insertions(+)
 create mode 100644 test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateClassWithTypeVariable.java
 create mode 100644 test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateClassWithTypeVariable.out

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
index e1faa02bd38af..3bc5c671bfda2 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
@@ -184,6 +184,9 @@ protected void preprocessArgument(Object arg) {
         if (arg instanceof Type type) {
             preprocessType(type);
         }
+        else if (arg instanceof JCDiagnostic.AnnotatedType type) {
+            preprocessType(type.type());
+        }
         else if (arg instanceof Symbol symbol) {
             preprocessSymbol(symbol);
         }
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateClassWithTypeVariable.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateClassWithTypeVariable.java
new file mode 100644
index 0000000000000..8d575caec57c2
--- /dev/null
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateClassWithTypeVariable.java
@@ -0,0 +1,19 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8334757
+ * @compile/fail/ref=CantAnnotateClassWithTypeVariable.out -XDrawDiagnostics CantAnnotateClassWithTypeVariable.java
+ */
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+public class CantAnnotateClassWithTypeVariable {
+  @Target(ElementType.TYPE_USE)
+  @interface TA {}
+
+  static class A {
+    static class B<T> {}
+  }
+
+  <T> @TA A.B<T> f() {}
+}
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateClassWithTypeVariable.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateClassWithTypeVariable.out
new file mode 100644
index 0000000000000..80fa9f2cdd9c9
--- /dev/null
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateClassWithTypeVariable.out
@@ -0,0 +1,2 @@
+CantAnnotateClassWithTypeVariable.java:18:14: compiler.err.type.annotation.inadmissible: (compiler.misc.type.annotation.1: @CantAnnotateClassWithTypeVariable.TA), CantAnnotateClassWithTypeVariable.A, @CantAnnotateClassWithTypeVariable.TA CantAnnotateClassWithTypeVariable.A.B<T>
+1 error

From bb1f8a1698553d5962569ac8912edd0d7ef010dd Mon Sep 17 00:00:00 2001
From: Xiaolong Peng <xpeng@openjdk.org>
Date: Mon, 8 Jul 2024 20:10:27 +0000
Subject: [PATCH 022/401] 8335904: Fix invalid comment in ShenandoahLock

Reviewed-by: shade
---
 src/hotspot/share/gc/shenandoah/shenandoahLock.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahLock.cpp b/src/hotspot/share/gc/shenandoah/shenandoahLock.cpp
index 6fc74c53e6390..63c6c9ea88624 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahLock.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahLock.cpp
@@ -44,7 +44,7 @@ void ShenandoahLock::contended_lock(bool allow_block_for_safepoint) {
 template<bool ALLOW_BLOCK>
 void ShenandoahLock::contended_lock_internal(JavaThread* java_thread) {
   assert(!ALLOW_BLOCK || java_thread != nullptr, "Must have a Java thread when allowing block.");
-  // Spin this much on multi-processor, do not spin on multi-processor.
+  // Spin this much, but only on multi-processor systems.
   int ctr = os::is_MP() ? 0xFF : 0;
   // Apply TTAS to avoid more expensive CAS calls if the lock is still held by other thread.
   while (Atomic::load(&_state) == locked ||

From 9c7a6eabb93c570fdb74076edc931576ed6be3e0 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Mon, 8 Jul 2024 20:14:26 +0000
Subject: [PATCH 023/401] 8312125: Refactor CDS enum class handling

Reviewed-by: matsaave, ccheung
---
 src/hotspot/share/cds/cdsEnumKlass.cpp   | 136 +++++++++++++++++++++++
 src/hotspot/share/cds/cdsEnumKlass.hpp   |  50 +++++++++
 src/hotspot/share/cds/heapShared.cpp     |  94 +---------------
 src/hotspot/share/cds/heapShared.hpp     |   4 -
 src/hotspot/share/oops/instanceKlass.cpp |   3 +-
 5 files changed, 192 insertions(+), 95 deletions(-)
 create mode 100644 src/hotspot/share/cds/cdsEnumKlass.cpp
 create mode 100644 src/hotspot/share/cds/cdsEnumKlass.hpp

diff --git a/src/hotspot/share/cds/cdsEnumKlass.cpp b/src/hotspot/share/cds/cdsEnumKlass.cpp
new file mode 100644
index 0000000000000..b77f2fd9d16ad
--- /dev/null
+++ b/src/hotspot/share/cds/cdsEnumKlass.cpp
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 "cds/archiveHeapLoader.hpp"
+#include "cds/cdsEnumKlass.hpp"
+#include "cds/heapShared.hpp"
+#include "classfile/vmClasses.hpp"
+#include "classfile/systemDictionaryShared.hpp"
+#include "memory/resourceArea.hpp"
+#include "oops/fieldStreams.inline.hpp"
+#include "oops/oop.inline.hpp"
+#include "runtime/fieldDescriptor.inline.hpp"
+
+#if INCLUDE_CDS_JAVA_HEAP
+
+bool CDSEnumKlass::is_enum_obj(oop orig_obj) {
+  Klass* k = orig_obj->klass();
+  Klass* buffered_k = ArchiveBuilder::get_buffered_klass(k);
+  return k->is_instance_klass() &&
+         InstanceKlass::cast(k)->java_super() == vmClasses::Enum_klass();
+}
+
+// -- Handling of Enum objects
+// Java Enum classes have synthetic <clinit> methods that look like this
+//     enum MyEnum {FOO, BAR}
+//     MyEnum::<clinint> {
+//        /*static final MyEnum*/ MyEnum::FOO = new MyEnum("FOO");
+//        /*static final MyEnum*/ MyEnum::BAR = new MyEnum("BAR");
+//     }
+//
+// If MyEnum::FOO object is referenced by any of the archived subgraphs, we must
+// ensure the archived value equals (in object address) to the runtime value of
+// MyEnum::FOO.
+//
+// However, since MyEnum::<clinint> is synthetically generated by javac, there's
+// no way of programmatically handling this inside the Java code (as you would handle
+// ModuleLayer::EMPTY_LAYER, for example).
+//
+// Instead, we archive all static field of such Enum classes. At runtime,
+// HeapShared::initialize_enum_klass() skips the <clinit> method and instead pulls
+// the static fields out of the archived heap.
+void CDSEnumKlass::handle_enum_obj(int level,
+                                   KlassSubGraphInfo* subgraph_info,
+                                   oop orig_obj) {
+  assert(level > 1, "must never be called at the first (outermost) level");
+  assert(is_enum_obj(orig_obj), "must be");
+
+  InstanceKlass* ik = InstanceKlass::cast(orig_obj->klass());
+  if (ik->has_archived_enum_objs()) {
+    return;
+  }
+
+  ik->set_has_archived_enum_objs();
+  ArchiveBuilder::get_buffered_klass(ik)->set_has_archived_enum_objs();
+
+  oop mirror = ik->java_mirror();
+  for (JavaFieldStream fs(ik); !fs.done(); fs.next()) {
+    if (fs.access_flags().is_static()) {
+      archive_static_field(level, subgraph_info, ik, mirror, fs);
+    }
+  }
+}
+
+void CDSEnumKlass::archive_static_field(int level, KlassSubGraphInfo* subgraph_info,
+                                        InstanceKlass* ik, oop mirror, JavaFieldStream& fs) {
+  ResourceMark rm;
+  fieldDescriptor& fd = fs.field_descriptor();
+  if (fd.field_type() != T_OBJECT && fd.field_type() != T_ARRAY) {
+    guarantee(false, "static field %s::%s must be T_OBJECT or T_ARRAY",
+              ik->external_name(), fd.name()->as_C_string());
+  }
+  oop oop_field = mirror->obj_field(fd.offset());
+  if (oop_field == nullptr) {
+    guarantee(false, "static field %s::%s must not be null",
+              ik->external_name(), fd.name()->as_C_string());
+  } else if (oop_field->klass() != ik && oop_field->klass() != ik->array_klass_or_null()) {
+    guarantee(false, "static field %s::%s is of the wrong type",
+              ik->external_name(), fd.name()->as_C_string());
+  }
+  bool success = HeapShared::archive_reachable_objects_from(level, subgraph_info, oop_field);
+  assert(success, "VM should have exited with unarchivable objects for _level > 1");
+  int root_index = HeapShared::append_root(oop_field);
+  log_info(cds, heap)("Archived enum obj @%d %s::%s (" INTPTR_FORMAT ")",
+                      root_index, ik->external_name(), fd.name()->as_C_string(),
+                      p2i((oopDesc*)oop_field));
+  SystemDictionaryShared::add_enum_klass_static_field(ik, root_index);
+}
+
+bool CDSEnumKlass::initialize_enum_klass(InstanceKlass* k, TRAPS) {
+  if (!ArchiveHeapLoader::is_in_use()) {
+    return false;
+  }
+
+  RunTimeClassInfo* info = RunTimeClassInfo::get_for(k);
+  assert(info != nullptr, "sanity");
+
+  if (log_is_enabled(Info, cds, heap)) {
+    ResourceMark rm;
+    log_info(cds, heap)("Initializing Enum class: %s", k->external_name());
+  }
+
+  oop mirror = k->java_mirror();
+  int i = 0;
+  for (JavaFieldStream fs(k); !fs.done(); fs.next()) {
+    if (fs.access_flags().is_static()) {
+      int root_index = info->enum_klass_static_field_root_index_at(i++);
+      fieldDescriptor& fd = fs.field_descriptor();
+      assert(fd.field_type() == T_OBJECT || fd.field_type() == T_ARRAY, "must be");
+      mirror->obj_field_put(fd.offset(), HeapShared::get_root(root_index, /*clear=*/true));
+    }
+  }
+  return true;
+}
+#endif // INCLUDE_CDS_JAVA_HEAP
diff --git a/src/hotspot/share/cds/cdsEnumKlass.hpp b/src/hotspot/share/cds/cdsEnumKlass.hpp
new file mode 100644
index 0000000000000..c898bfec60d45
--- /dev/null
+++ b/src/hotspot/share/cds/cdsEnumKlass.hpp
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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_CDS_CDSENUMKLASS_HPP
+#define SHARE_CDS_CDSENUMKLASS_HPP
+
+#include "memory/allStatic.hpp"
+#include "oops/oop.hpp"
+#include "utilities/exceptions.hpp"
+#include "utilities/macros.hpp"
+
+class InstanceKlass;
+class JavaFieldStream;
+class KlassSubGraphInfo;
+
+class CDSEnumKlass: AllStatic {
+public:
+  static bool is_enum_obj(oop orig_obj);
+  static void handle_enum_obj(int level,
+                              KlassSubGraphInfo* subgraph_info,
+                              oop orig_obj);
+  static bool initialize_enum_klass(InstanceKlass* k, TRAPS) NOT_CDS_JAVA_HEAP_RETURN_(false);
+
+private:
+  static void archive_static_field(int level, KlassSubGraphInfo* subgraph_info,
+                                   InstanceKlass* ik, oop mirror, JavaFieldStream& fs);
+};
+
+#endif // SHARE_CDS_CDSENUMKLASS_HPP
diff --git a/src/hotspot/share/cds/heapShared.cpp b/src/hotspot/share/cds/heapShared.cpp
index 7b519a57d57cd..ff84ddc13fc6c 100644
--- a/src/hotspot/share/cds/heapShared.cpp
+++ b/src/hotspot/share/cds/heapShared.cpp
@@ -28,6 +28,7 @@
 #include "cds/archiveHeapWriter.hpp"
 #include "cds/archiveUtils.hpp"
 #include "cds/cdsConfig.hpp"
+#include "cds/cdsEnumKlass.hpp"
 #include "cds/cdsHeapVerifier.hpp"
 #include "cds/heapShared.hpp"
 #include "cds/metaspaceShared.hpp"
@@ -451,95 +452,6 @@ void HeapShared::set_has_native_pointers(oop src_obj) {
   info->set_has_native_pointers();
 }
 
-// -- Handling of Enum objects
-// Java Enum classes have synthetic <clinit> methods that look like this
-//     enum MyEnum {FOO, BAR}
-//     MyEnum::<clinint> {
-//        /*static final MyEnum*/ MyEnum::FOO = new MyEnum("FOO");
-//        /*static final MyEnum*/ MyEnum::BAR = new MyEnum("BAR");
-//     }
-//
-// If MyEnum::FOO object is referenced by any of the archived subgraphs, we must
-// ensure the archived value equals (in object address) to the runtime value of
-// MyEnum::FOO.
-//
-// However, since MyEnum::<clinint> is synthetically generated by javac, there's
-// no way of programmatically handling this inside the Java code (as you would handle
-// ModuleLayer::EMPTY_LAYER, for example).
-//
-// Instead, we archive all static field of such Enum classes. At runtime,
-// HeapShared::initialize_enum_klass() will skip the <clinit> method and pull
-// the static fields out of the archived heap.
-void HeapShared::check_enum_obj(int level,
-                                KlassSubGraphInfo* subgraph_info,
-                                oop orig_obj) {
-  assert(level > 1, "must never be called at the first (outermost) level");
-  Klass* k = orig_obj->klass();
-  Klass* buffered_k = ArchiveBuilder::get_buffered_klass(k);
-  if (!k->is_instance_klass()) {
-    return;
-  }
-  InstanceKlass* ik = InstanceKlass::cast(k);
-  if (ik->java_super() == vmClasses::Enum_klass() && !ik->has_archived_enum_objs()) {
-    ResourceMark rm;
-    ik->set_has_archived_enum_objs();
-    buffered_k->set_has_archived_enum_objs();
-    oop mirror = ik->java_mirror();
-
-    for (JavaFieldStream fs(ik); !fs.done(); fs.next()) {
-      if (fs.access_flags().is_static()) {
-        fieldDescriptor& fd = fs.field_descriptor();
-        if (fd.field_type() != T_OBJECT && fd.field_type() != T_ARRAY) {
-          guarantee(false, "static field %s::%s must be T_OBJECT or T_ARRAY",
-                    ik->external_name(), fd.name()->as_C_string());
-        }
-        oop oop_field = mirror->obj_field(fd.offset());
-        if (oop_field == nullptr) {
-          guarantee(false, "static field %s::%s must not be null",
-                    ik->external_name(), fd.name()->as_C_string());
-        } else if (oop_field->klass() != ik && oop_field->klass() != ik->array_klass_or_null()) {
-          guarantee(false, "static field %s::%s is of the wrong type",
-                    ik->external_name(), fd.name()->as_C_string());
-        }
-        bool success = archive_reachable_objects_from(level, subgraph_info, oop_field);
-        assert(success, "VM should have exited with unarchivable objects for _level > 1");
-        int root_index = append_root(oop_field);
-        log_info(cds, heap)("Archived enum obj @%d %s::%s (" INTPTR_FORMAT ")",
-                            root_index, ik->external_name(), fd.name()->as_C_string(),
-                            p2i((oopDesc*)oop_field));
-        SystemDictionaryShared::add_enum_klass_static_field(ik, root_index);
-      }
-    }
-  }
-}
-
-// See comments in HeapShared::check_enum_obj()
-bool HeapShared::initialize_enum_klass(InstanceKlass* k, TRAPS) {
-  if (!ArchiveHeapLoader::is_in_use()) {
-    return false;
-  }
-
-  RunTimeClassInfo* info = RunTimeClassInfo::get_for(k);
-  assert(info != nullptr, "sanity");
-
-  if (log_is_enabled(Info, cds, heap)) {
-    ResourceMark rm;
-    log_info(cds, heap)("Initializing Enum class: %s", k->external_name());
-  }
-
-  oop mirror = k->java_mirror();
-  int i = 0;
-  for (JavaFieldStream fs(k); !fs.done(); fs.next()) {
-    if (fs.access_flags().is_static()) {
-      int root_index = info->enum_klass_static_field_root_index_at(i++);
-      fieldDescriptor& fd = fs.field_descriptor();
-      assert(fd.field_type() == T_OBJECT || fd.field_type() == T_ARRAY, "must be");
-      mirror->obj_field_put(fd.offset(), get_root(root_index, /*clear=*/true));
-    }
-  }
-  return true;
-}
-
 void HeapShared::archive_objects(ArchiveHeapInfo *heap_info) {
   {
     NoSafepointVerifier nsv;
@@ -1241,7 +1153,9 @@ bool HeapShared::archive_reachable_objects_from(int level,
   WalkOopAndArchiveClosure walker(level, record_klasses_only, subgraph_info, orig_obj);
   orig_obj->oop_iterate(&walker);
 
-  check_enum_obj(level + 1, subgraph_info, orig_obj);
+  if (CDSEnumKlass::is_enum_obj(orig_obj)) {
+    CDSEnumKlass::handle_enum_obj(level + 1, subgraph_info, orig_obj);
+  }
   return true;
 }
 
diff --git a/src/hotspot/share/cds/heapShared.hpp b/src/hotspot/share/cds/heapShared.hpp
index aa8c1dd3bc4f9..fa34289a38eda 100644
--- a/src/hotspot/share/cds/heapShared.hpp
+++ b/src/hotspot/share/cds/heapShared.hpp
@@ -212,9 +212,6 @@ class HeapShared: AllStatic {
   };
 
 private:
-  static void check_enum_obj(int level, KlassSubGraphInfo* subgraph_info,
-                             oop orig_obj);
-
   static const int INITIAL_TABLE_SIZE = 15889; // prime number
   static const int MAX_TABLE_SIZE     = 1000000;
   typedef ResizeableResourceHashtable<oop, CachedOopInfo,
@@ -428,7 +425,6 @@ class HeapShared: AllStatic {
   static void write_subgraph_info_table() NOT_CDS_JAVA_HEAP_RETURN;
   static void init_roots(oop roots_oop) NOT_CDS_JAVA_HEAP_RETURN;
   static void serialize_tables(SerializeClosure* soc) NOT_CDS_JAVA_HEAP_RETURN;
-  static bool initialize_enum_klass(InstanceKlass* k, TRAPS) NOT_CDS_JAVA_HEAP_RETURN_(false);
 
   static bool is_a_test_class_in_unnamed_module(Klass* ik) NOT_CDS_JAVA_HEAP_RETURN_(false);
 };
diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index 9c40bc1cee811..930f8cf177116 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "cds/archiveUtils.hpp"
 #include "cds/cdsConfig.hpp"
+#include "cds/cdsEnumKlass.hpp"
 #include "cds/classListWriter.hpp"
 #include "cds/heapShared.hpp"
 #include "cds/metaspaceShared.hpp"
@@ -1576,7 +1577,7 @@ void InstanceKlass::call_class_initializer(TRAPS) {
   // This is needed to ensure the consistency of the archived heap objects.
   if (has_archived_enum_objs()) {
     assert(is_shared(), "must be");
-    bool initialized = HeapShared::initialize_enum_klass(this, CHECK);
+    bool initialized = CDSEnumKlass::initialize_enum_klass(this, CHECK);
     if (initialized) {
       return;
     }

From 564a72e1dba0f145600c8e7eff66992fbf294df0 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Tue, 9 Jul 2024 08:10:55 +0000
Subject: [PATCH 024/401] 8335955: JDK-8335742 wrongly used a "JDK-" prefix in
 the problemlist bug number

Reviewed-by: iwalulya
---
 test/hotspot/jtreg/ProblemList-Virtual.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/ProblemList-Virtual.txt b/test/hotspot/jtreg/ProblemList-Virtual.txt
index ac35f60e66153..06110ddcbc1a8 100644
--- a/test/hotspot/jtreg/ProblemList-Virtual.txt
+++ b/test/hotspot/jtreg/ProblemList-Virtual.txt
@@ -89,7 +89,7 @@ vmTestbase/nsk/jdi/VMOutOfMemoryException/VMOutOfMemoryException001/VMOutOfMemor
 ###
 # Fails on Windows because of additional memory allocation.
 
-gc/g1/TestMixedGCLiveThreshold.java#25percent JDK-8334759 windows-x64
+gc/g1/TestMixedGCLiveThreshold.java#25percent 8334759 windows-x64
 
 ##########
 ## Tests incompatible with  with virtual test thread factory.

From 2a2964759c73b3b9ab6afaad109383c89952977b Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevinw@openjdk.org>
Date: Tue, 9 Jul 2024 08:25:00 +0000
Subject: [PATCH 025/401] 8334777: Test
 javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java
 failed with NullPointerException

Reviewed-by: cjplummer, dholmes
---
 .../remote/mandatory/notif/NotifReconnectDeadlockTest.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/jdk/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java b/test/jdk/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java
index 72ae57663079c..8f8ef54eade22 100644
--- a/test/jdk/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java
+++ b/test/jdk/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 6199899
  * @summary Tests reconnection done by a fetching notif thread.
  * @author Shanliang JIANG
+ * @requires vm.compMode != "Xcomp"
+ * @comment Running with -Xcomp is likely to cause a timeout from ServerCommunicatorAdmin
+ *          before addNotificationListener can complete.
  *
  * @run clean NotifReconnectDeadlockTest
  * @run build NotifReconnectDeadlockTest

From 8f62f31dff564289a2422d58e8ecd5062d443b81 Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkumar@openjdk.org>
Date: Tue, 9 Jul 2024 08:26:25 +0000
Subject: [PATCH 026/401] 8335906: [s390x] Test Failure: GTestWrapper.java

Reviewed-by: stuefe
---
 src/hotspot/share/runtime/os.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index 7b766707b0d0e..490a04aa6f132 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -959,7 +959,7 @@ static void print_ascii_form(stringStream& ascii_form, uint64_t value, int units
     uint8_t c[sizeof(v)];
   } u = { value };
   for (int i = 0; i < unitsize; i++) {
-    const int idx = LITTLE_ENDIAN_ONLY(i) BIG_ENDIAN_ONLY(sizeof(u.v) - 1 - i);
+    const int idx = LITTLE_ENDIAN_ONLY(i) BIG_ENDIAN_ONLY(sizeof(u.v) - unitsize + i);
     const uint8_t c = u.c[idx];
     ascii_form.put(isprint(c) && isascii(c) ? c : '.');
   }

From f3ff4f7427c3c3f5cb2a115a61462bb9d28de1cd Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@openjdk.org>
Date: Tue, 9 Jul 2024 10:21:47 +0000
Subject: [PATCH 027/401] 8335882: platform/cgroup/TestSystemSettings.java
 fails on Alpine Linux

Reviewed-by: stuefe, mbaesken
---
 test/jdk/jdk/internal/platform/cgroup/TestSystemSettings.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/jdk/jdk/internal/platform/cgroup/TestSystemSettings.java b/test/jdk/jdk/internal/platform/cgroup/TestSystemSettings.java
index 8d9279e1603c1..0e668b1f969d4 100644
--- a/test/jdk/jdk/internal/platform/cgroup/TestSystemSettings.java
+++ b/test/jdk/jdk/internal/platform/cgroup/TestSystemSettings.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * @key cgroups
- * @requires os.family == "linux"
+ * @requires (os.family == "linux" & !vm.musl)
  * @requires vm.flagless
  * @library /test/lib
  * @build TestSystemSettings

From 0e0dfca21f64ecfcb3e5ed7cdc2a173834faa509 Mon Sep 17 00:00:00 2001
From: Aleksei Voitylov <avoitylov@openjdk.org>
Date: Tue, 9 Jul 2024 10:27:44 +0000
Subject: [PATCH 028/401] 8330806:
 test/hotspot/jtreg/compiler/c1/TestLargeMonitorOffset.java fails on ARM32

Reviewed-by: snazarki, dsamersoff
---
 src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
index 688790f07e548..999f8fe590472 100644
--- a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
@@ -152,8 +152,14 @@ void LIR_Assembler::osr_entry() {
   int monitor_offset = (method()->max_locals() + 2 * (number_of_locks - 1)) * BytesPerWord;
   for (int i = 0; i < number_of_locks; i++) {
     int slot_offset = monitor_offset - (i * 2 * BytesPerWord);
-    __ ldr(R1, Address(OSR_buf, slot_offset + 0*BytesPerWord));
-    __ ldr(R2, Address(OSR_buf, slot_offset + 1*BytesPerWord));
+    if (slot_offset >= 4096 - BytesPerWord) {
+      __ add_slow(R2, OSR_buf, slot_offset);
+      __ ldr(R1, Address(R2, 0*BytesPerWord));
+      __ ldr(R2, Address(R2, 1*BytesPerWord));
+    } else {
+      __ ldr(R1, Address(OSR_buf, slot_offset + 0*BytesPerWord));
+      __ ldr(R2, Address(OSR_buf, slot_offset + 1*BytesPerWord));
+    }
     __ str(R1, frame_map()->address_for_monitor_lock(i));
     __ str(R2, frame_map()->address_for_monitor_object(i));
   }

From 531a6d85b00b88688668ab1ced0db6ce0214a5f1 Mon Sep 17 00:00:00 2001
From: Volker Simonis <simonis@openjdk.org>
Date: Tue, 9 Jul 2024 13:11:07 +0000
Subject: [PATCH 029/401] 8335911: Document ccls indexer in doc/ide.md

Reviewed-by: erikj
---
 doc/ide.html | 11 ++++++-----
 doc/ide.md   |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/doc/ide.html b/doc/ide.html
index 0dd16b7b9e6e7..ef6f434013ed1 100644
--- a/doc/ide.html
+++ b/doc/ide.html
@@ -63,11 +63,12 @@ <h5 id="alternative-indexers">Alternative indexers</h5>
 <p>The main <code>vscode-project</code> target configures the default
 C++ support in Visual Studio Code. There are also other source indexers
 that can be installed, that may provide additional features. It's
-currently possible to generate configuration for two such indexers, <a
-href="https://clang.llvm.org/extra/clangd/">clangd</a> and <a
-href="https://github.com/Andersbakken/rtags">rtags</a>. These can be
-configured by appending the name of the indexer to the make target, such
-as:</p>
+currently possible to generate configuration for three such indexers, <a
+href="https://clang.llvm.org/extra/clangd/">clangd</a>, <a
+href="https://github.com/MaskRay/ccls/wiki/Visual-Studio-Code">ccls</a>
+and <a href="https://github.com/Andersbakken/rtags">rtags</a>. These can
+be configured by appending the name of the indexer to the make target,
+such as:</p>
 <pre class="shell"><code>make vscode-project-clangd</code></pre>
 <p>Additional instructions for configuring the given indexer will be
 displayed after the workspace has been generated.</p>
diff --git a/doc/ide.md b/doc/ide.md
index 40e3430a43875..d6ebb7b742a61 100644
--- a/doc/ide.md
+++ b/doc/ide.md
@@ -32,7 +32,8 @@ choose `File -> Open Workspace...` in Visual Studio Code.
 The main `vscode-project` target configures the default C++ support in Visual
 Studio Code. There are also other source indexers that can be installed, that
 may provide additional features. It's currently possible to generate
-configuration for two such indexers, [clangd](https://clang.llvm.org/extra/clangd/)
+configuration for three such indexers, [clangd](https://clang.llvm.org/extra/clangd/),
+[ccls](https://github.com/MaskRay/ccls/wiki/Visual-Studio-Code)
 and [rtags](https://github.com/Andersbakken/rtags). These can be configured by
 appending the name of the indexer to the make target, such as:
 

From 7e11fb702696df733ca89d325200f2e9414402d9 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Tue, 9 Jul 2024 13:11:20 +0000
Subject: [PATCH 030/401] 8335688: Fix -Wzero-as-null-pointer-constant warnings
 from fflush calls in jvmti tests

Reviewed-by: jwaters, coleenp
---
 .../libAddModuleUsesAndProvidesTest.c         |  6 +-
 .../GenerateEvents/libGenerateEvents1.cpp     |  2 +-
 .../GenerateEvents/libGenerateEvents2.cpp     |  4 +-
 .../FilteredFields/libFilteredFieldsTest.cpp  |  4 +-
 .../libMissedStackMapFrames.cpp               |  2 +-
 .../libRedefineRetransform.cpp                |  2 +-
 .../FramePop/framepop02/libframepop02.cpp     |  4 +-
 .../thread/GetStackTrace/get_stack_trace.hpp  |  2 +-
 .../SuspendResume1/libSuspendResume1.cpp      |  6 +-
 .../getclfld007/getclfld007.cpp               |  6 +-
 .../followref001/followref001.cpp             | 58 ++++++++--------
 .../followref002/followref002.cpp             | 62 ++++++++---------
 .../followref003/followref003.cpp             | 68 +++++++++----------
 .../followref004/followref004.cpp             | 12 ++--
 .../followref005/followref005.cpp             |  2 +-
 .../followref006/followref006.cpp             |  2 +-
 .../earlyretbase/earlyretbase.cpp             | 12 ++--
 .../earlyretfp/earlyretfp.cpp                 | 18 ++---
 .../earlyretint/earlyretint.cpp               | 14 ++--
 .../earlyretlong/earlyretlong.cpp             | 14 ++--
 .../earlyretobj/earlyretobj.cpp               | 14 ++--
 .../earlyretstr/earlyretstr.cpp               | 12 ++--
 .../earlyretvoid/earlyretvoid.cpp             | 12 ++--
 .../getallstktr001/getallstktr001.cpp         |  6 +-
 .../getcpool001/getcpool001.cpp               |  6 +-
 25 files changed, 175 insertions(+), 175 deletions(-)

diff --git a/test/hotspot/jtreg/serviceability/jvmti/AddModuleUsesAndProvides/libAddModuleUsesAndProvidesTest.c b/test/hotspot/jtreg/serviceability/jvmti/AddModuleUsesAndProvides/libAddModuleUsesAndProvidesTest.c
index 86f9993c70334..a979d1f913e0a 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/AddModuleUsesAndProvides/libAddModuleUsesAndProvidesTest.c
+++ b/test/hotspot/jtreg/serviceability/jvmti/AddModuleUsesAndProvides/libAddModuleUsesAndProvidesTest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -200,7 +200,7 @@ Java_MyPackage_AddModuleUsesAndProvidesTest_checkUses(JNIEnv *env,
         throw_exc(env, "Check #UC3: service can not be used unexpectedly");
         return FAILED;
     }
-    fflush(0);
+    fflush(NULL);
     return PASSED;
 }
 
@@ -275,7 +275,7 @@ Java_MyPackage_AddModuleUsesAndProvidesTest_checkProvides(JNIEnv *env,
         throw_exc(env, "Check #PC2: error in add provides to baseModule with correct service and serviceImpl");
         return FAILED;
     }
-    fflush(0);
+    fflush(NULL);
     return PASSED;
 }
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/GenerateEvents/libGenerateEvents1.cpp b/test/hotspot/jtreg/serviceability/jvmti/GenerateEvents/libGenerateEvents1.cpp
index fa60c07f8db41..0f040175bf953 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/GenerateEvents/libGenerateEvents1.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/GenerateEvents/libGenerateEvents1.cpp
@@ -71,7 +71,7 @@ CompiledMethodLoad(jvmtiEnv* jvmti, jmethodID method,
   check_jvmti_status(env, err, "CompiledMethodLoad: Error in JVMTI GetMethodName");
 
   printf("%s: CompiledMethodLoad: %s%s\n", AGENT_NAME, name, sign);
-  fflush(0);
+  fflush(nullptr);
 }
 
 JNIEXPORT jint JNICALL
diff --git a/test/hotspot/jtreg/serviceability/jvmti/GenerateEvents/libGenerateEvents2.cpp b/test/hotspot/jtreg/serviceability/jvmti/GenerateEvents/libGenerateEvents2.cpp
index 7af061196a157..d582a9648920e 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/GenerateEvents/libGenerateEvents2.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/GenerateEvents/libGenerateEvents2.cpp
@@ -71,7 +71,7 @@ CompiledMethodLoad(jvmtiEnv* jvmti, jmethodID method,
   check_jvmti_status(env, err, "CompiledMethodLoad: Error in JVMTI GetMethodName");
 
   printf("%s: CompiledMethodLoad: %s%s\n", AGENT_NAME, name, sign);
-  fflush(0);
+  fflush(nullptr);
 }
 
 JNIEXPORT jint JNICALL
@@ -132,7 +132,7 @@ Java_MyPackage_GenerateEventsTest_agent2FailStatus(JNIEnv *env, jclass cls) {
     printf("check2: Unexpected non-zero event count in agent2: %d\n", agent2_event_count);
   }
   printf("\n");
-  fflush(0);
+  fflush(nullptr);
 
   return fail_status;
 }
diff --git a/test/hotspot/jtreg/serviceability/jvmti/GetClassFields/FilteredFields/libFilteredFieldsTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/GetClassFields/FilteredFields/libFilteredFieldsTest.cpp
index 28bfaaa03bd6f..fbefb1219e602 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/GetClassFields/FilteredFields/libFilteredFieldsTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/GetClassFields/FilteredFields/libFilteredFieldsTest.cpp
@@ -35,7 +35,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     jint res = jvm->GetEnv((void **)&jvmti, JVMTI_VERSION_1_1);
     if (res != JNI_OK || jvmti == nullptr) {
         printf("Wrong result of a valid call to GetEnv!\n");
-        fflush(0);
+        fflush(nullptr);
         return JNI_ERR;
     }
     return JNI_OK;
@@ -72,7 +72,7 @@ Java_FilteredFieldsTest_getJVMTIFieldCount(JNIEnv *env, jclass cls, jclass clazz
         printf("  [%d]: %s\n", i, name);
         jvmti->Deallocate((unsigned char *)name);
     }
-    fflush(0);
+    fflush(nullptr);
     return fcount;
 }
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/MissedStackMapFrames/libMissedStackMapFrames.cpp b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/MissedStackMapFrames/libMissedStackMapFrames.cpp
index 5cebf608c3484..066794d1d6077 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/MissedStackMapFrames/libMissedStackMapFrames.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/MissedStackMapFrames/libMissedStackMapFrames.cpp
@@ -31,7 +31,7 @@ static void _log(const char* format, ...) {
   va_start(args, format);
   vprintf(format, args);
   va_end(args);
-  fflush(0);
+  fflush(nullptr);
 }
 
 static jvmtiEnv* jvmti = nullptr;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineRetransform/libRedefineRetransform.cpp b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineRetransform/libRedefineRetransform.cpp
index 518e147c94278..450b0f35918b6 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineRetransform/libRedefineRetransform.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineRetransform/libRedefineRetransform.cpp
@@ -36,7 +36,7 @@ static void _log(const char* format, ...) {
     va_start(args, format);
     vprintf(format, args);
     va_end(args);
-    fflush(0);
+    fflush(nullptr);
 }
 
 static bool isTestClass(const char* name) {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop02/libframepop02.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop02/libframepop02.cpp
index 61c9a91184bab..93df7f98277bf 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop02/libframepop02.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop02/libframepop02.cpp
@@ -194,7 +194,7 @@ void JNICALL MethodEntry(jvmtiEnv *jvmti, JNIEnv *jni,
   {
     if (printdump == JNI_TRUE) {
       print_current_time();
-      fflush(0);
+      fflush(nullptr);
       LOG(">>> %sMethod entry\n>>>", (isNative == JNI_TRUE) ? "Native " : "");
       printInfo(jni, jvmti, thr, method, frameCount);
     }
@@ -231,7 +231,7 @@ void JNICALL FramePop(jvmtiEnv *jvmti, JNIEnv *jni,
   {
     if (printdump == JNI_TRUE) {
       print_current_time();
-      fflush(0);
+      fflush(nullptr);
       LOG(" >>> Frame Pop\n>>>");
       printInfo(jni, jvmti, thr, method, frameCount);
     }
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/get_stack_trace.hpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/get_stack_trace.hpp
index d7c85704275f2..b8828b0e80f29 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/get_stack_trace.hpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/get_stack_trace.hpp
@@ -70,7 +70,7 @@ int compare_stack_trace(jvmtiEnv *jvmti, JNIEnv *jni, jthread thread,
 
     int exp_idx = expected_frames_length - 1 - i;
     printf("expected idx %d\n", exp_idx);
-    fflush(0);
+    fflush(nullptr);
     if (i < expected_frames_length) {
 
       // for generated classes don't compare lambda indicies
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/libSuspendResume1.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/libSuspendResume1.cpp
index f05e619e0bd7d..93ad399b121ac 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/libSuspendResume1.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/libSuspendResume1.cpp
@@ -138,7 +138,7 @@ check_suspended_state(JNIEnv* jni, jthread thread, int thr_idx, char* tname, con
 
       LOG("## Agent: %s:  virtual thread of carrier thread has state: %s (%d)\n",
           func_name, TranslateState(state), (int)state);
-      fflush(0);
+      fflush(nullptr);
     }
     set_agent_fail_status();
     fatal(jni, "check_resumed_state: expected SUSPENDED flag in thread state");
@@ -169,7 +169,7 @@ check_resumed_state(JNIEnv* jni, jthread thread, int thr_idx, char* tname, const
 
       LOG("## Agent: %s:  virtual thread of carrier thread has state: %s (%d)\n",
           func_name, TranslateState(state), (int)state);
-      fflush(0);
+      fflush(nullptr);
     }
     set_agent_fail_status();
     fatal(jni, "check_resumed_state: NOT expected SUSPENDED flag in thread state");
@@ -210,7 +210,7 @@ test_thread_resume(JNIEnv* jni, jthread thread, int thr_idx, char* tname) {
 
     LOG("## Agent: test_thread_resume:  virtual thread of carrier thread has state: %s (%d)\n",
         TranslateState(state), (int)state);
-    fflush(0);
+    fflush(nullptr);
   }
   check_jvmti_status(jni, err, "test_thread_resume: error in JVMTI ResumeThread");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld007/getclfld007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld007/getclfld007.cpp
index 3cd333843308c..89a62346ca9f0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld007/getclfld007.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld007/getclfld007.cpp
@@ -86,7 +86,7 @@ Java_nsk_jvmti_GetClassFields_getclfld007_check(JNIEnv *env, jclass cls, jclass
 
     if (jvmti == nullptr) {
         printf("JVMTI client was not properly loaded!\n");
-        fflush(0);
+        fflush(nullptr);
         result = STATUS_FAILED;
         return;
     }
@@ -98,7 +98,7 @@ Java_nsk_jvmti_GetClassFields_getclfld007_check(JNIEnv *env, jclass cls, jclass
     if (err != JVMTI_ERROR_NONE) {
         printf("GetClassFields unexpected error: %s (%d)\n",
                TranslateError(err), err);
-        fflush(0);
+        fflush(nullptr);
         result = STATUS_FAILED;
         return;
     }
@@ -132,7 +132,7 @@ Java_nsk_jvmti_GetClassFields_getclfld007_check(JNIEnv *env, jclass cls, jclass
         jvmti->Deallocate((unsigned char *)name);
         jvmti->Deallocate((unsigned char *)sig);
     }
-    fflush(0);
+    fflush(nullptr);
 }
 
 JNIEXPORT int JNICALL
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref001/followref001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref001/followref001.cpp
index ff431aa2203e9..b33128b491626 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref001/followref001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref001/followref001.cpp
@@ -137,14 +137,14 @@ static bool initObjectDescList(jvmtiEnv*    jvmti,
     *objectsCount = 1 + 2 * chainLength;
 
     printf("Allocate memory for objects list: %d objects\n", *objectsCount);
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_JVMTI_VERIFY(jvmti->Allocate((*objectsCount * sizeof(ObjectDesc)),
                                           (unsigned char**) objectDescList))) {
         nsk_jvmti_setFailStatus();
         return false;
     }
     printf("  ... allocated array: 0x%p\n", (void*)objectDescList);
-    fflush(0);
+    fflush(nullptr);
 
     {
         int k;
@@ -179,7 +179,7 @@ static bool getAndTagClasses(jvmtiEnv*    jvmti,
     }
     printf("\nFound debugee class: 0x%p\n  %s\n",
            (void*) *debugeeClass, DEBUGEE_CLASS_NAME);
-    fflush(0);
+    fflush(nullptr);
 
     if (!NSK_JNI_VERIFY(jni, (*rootObjectClass =
             jni->FindClass(ROOT_OBJECT_CLASS_NAME)) != nullptr)) {
@@ -194,7 +194,7 @@ static bool getAndTagClasses(jvmtiEnv*    jvmti,
     printf("\nFound root object class: 0x%p, tag=%ld\n  %s\n",
            (void*) *rootObjectClass,(long) ROOT_CLASS_TAG,
            ROOT_OBJECT_CLASS_NAME);
-    fflush(0);
+    fflush(nullptr);
 
 
     if (!NSK_JNI_VERIFY(jni, (*chainObjectClass =
@@ -209,7 +209,7 @@ static bool getAndTagClasses(jvmtiEnv*    jvmti,
     printf("\nFound chain object class: 0x%p, tag=%ld\n  %s\n",
            (void*) *chainObjectClass, (long) CHAIN_CLASS_TAG,
            CHAIN_OBJECT_CLASS_NAME);
-    fflush(0);
+    fflush(nullptr);
 
      return true;
 } /* getAndTagClasses */
@@ -234,7 +234,7 @@ static bool getFieldsAndObjects(jvmtiEnv*  jvmti,
     }
     printf("\nFound fieldID: 0x%p - \'%s\' static field in debugee class\n",
            (void*) rootObjectField, OBJECT_FIELD_NAME);
-    fflush(0);
+    fflush(nullptr);
 
     if (!NSK_JNI_VERIFY(jni, (*reachableChainField =
             jni->GetFieldID(rootObjectClass, REACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != nullptr)) {
@@ -243,7 +243,7 @@ static bool getFieldsAndObjects(jvmtiEnv*  jvmti,
     }
     printf("\nFound fieldID: 0x%p - \'%s\' field in root object class\n",
            (void*) reachableChainField, REACHABLE_CHAIN_FIELD_NAME);
-    fflush(0);
+    fflush(nullptr);
 
     if (!NSK_JNI_VERIFY(jni, (*unreachableChainField =
             jni->GetFieldID(rootObjectClass, UNREACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != nullptr)) {
@@ -253,7 +253,7 @@ static bool getFieldsAndObjects(jvmtiEnv*  jvmti,
 
     printf("\nFound fieldID: 0x%p - \'%s\' field in root object class\n",
            (void*) unreachableChainField, UNREACHABLE_CHAIN_FIELD_NAME);
-    fflush(0);
+    fflush(nullptr);
 
     if (!NSK_JNI_VERIFY(jni, (*nextField =
             jni->GetFieldID(chainObjectClass, NEXT_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != nullptr)) {
@@ -262,7 +262,7 @@ static bool getFieldsAndObjects(jvmtiEnv*  jvmti,
     }
     printf("\nFound fieldID: 0x%p - \'%s\' field in chain object class\n",
            (void*) nextField, NEXT_FIELD_NAME);
-    fflush(0);
+    fflush(nullptr);
 
     if (!NSK_JNI_VERIFY(jni, (*rootObjectPtr =
             jni->GetStaticObjectField(debugeeClass, rootObjectField)) != nullptr)) {
@@ -270,14 +270,14 @@ static bool getFieldsAndObjects(jvmtiEnv*  jvmti,
         return false;
     }
     printf("\nFound root object: 0x%p\n", (void*) *rootObjectPtr);
-    fflush(0);
+    fflush(nullptr);
 
     if (!NSK_JNI_VERIFY(jni, (*rootObjectPtr = jni->NewGlobalRef(*rootObjectPtr)) != nullptr)) {
         nsk_jvmti_setFailStatus();
         return false;
     }
     printf("Created root object global ref: 0x%p\n", (void*)*rootObjectPtr);
-    fflush(0);
+    fflush(nullptr);
 
      return true;
 } /* getFieldsAndObjects */
@@ -318,7 +318,7 @@ static bool getAndTagChainObjects(
         nsk_jvmti_setFailStatus();
     }
     printf("        tag=%-5ld object=0x%p\n", (long)objTag, (void*)nextObj);
-    fflush(0);
+    fflush(nullptr);
 
     /* To continue traversing objects in the chain */
     if (!getAndTagChainObjects(jvmti,
@@ -394,7 +394,7 @@ static int getAndTagTestedObjects(
            (long) ROOT_OBJECT_TAG, (void*) *rootObjectPtr);
 
     printf("    reachable objects chain: %d objects\n", chainLength);
-    fflush(0);
+    fflush(nullptr);
 
     if (!getAndTagChainObjects(jvmti,
                                jni,
@@ -453,7 +453,7 @@ static bool checkTestedObjects(jvmtiEnv*  jvmti,
     }
 
     printf("\nReachable objects:\n");
-    fflush(0);
+    fflush(nullptr);
     for (i = 0; i < chainLength; i++) {
         idx = i + 1;
         printf("Reachable object:\n"
@@ -488,7 +488,7 @@ static bool checkTestedObjects(jvmtiEnv*  jvmti,
             NSK_COMPLAIN0("Unreachable object was iterated\n");
             nsk_jvmti_setFailStatus();
         }
-        fflush(0);
+        fflush(nullptr);
     }
 
     return true;
@@ -514,7 +514,7 @@ static void releaseTestedObjects(jvmtiEnv*   jvmti,
         }
     }
 
-    fflush(0);
+    fflush(nullptr);
 } /* releaseTestedObjects */
 
 
@@ -542,7 +542,7 @@ jint JNICALL heapReferenceCallback(
                           /* ss45998: class_tag=>referrence_class_tag */
     printf("   size: %" LL "d, tag_ptr: 0x%p, referrer_tag_ptr: 0x%p, length: %-d\n",
                size,         tag_ptr,       referrer_tag_ptr,       length);
-    fflush(0);
+    fflush(nullptr);
 
     if (((uintptr_t) tag_ptr & FULL_32_BIT_MASK) == FULL_32_BIT_MASK) {
         NSK_COMPLAIN1("wrong tag_ptr passed to "
@@ -567,7 +567,7 @@ jint JNICALL heapReferenceCallback(
     printf("   class_tag=%" LL "d, tag=%" LL "d, size=%" LL "d,"
            " ref_tag=%" LL "d, referrer_index=%d\n\n",
                class_tag, tag, size, ref_tag, referrer_index);
-    fflush(0);
+    fflush(nullptr);
 
     if (length != -1) {
         NSK_COMPLAIN1("wrong length passed to heapReferenceCallback: "
@@ -647,7 +647,7 @@ jint JNICALL heapReferenceCallback(
         case JVMTI_HEAP_REFERENCE_OTHER: {
             NSK_COMPLAIN1("This reference kind was not expected: %s\n",
                            ref_kind_str[reference_kind]);
-            fflush(0);
+            fflush(nullptr);
             nsk_jvmti_setFailStatus();
             return 0;
         }
@@ -674,7 +674,7 @@ jint JNICALL primitiveFieldCallback(
                (long) class_tag,
                (long) DEREF(tag_ptr),
                (int) value_type);
-    fflush(0);
+    fflush(nullptr);
     return 0;
 } /* primitiveFieldCallback */
 
@@ -694,7 +694,7 @@ jint JNICALL arrayPrimitiveValueCallback(
            (long) DEREF(tag_ptr),
            (int) element_count,
            (int) element_type);
-    fflush(0);
+    fflush(nullptr);
     return 0;
 } /* arrayPrimitiveValueCallback */
 
@@ -711,7 +711,7 @@ jint JNICALL stringPrimitiveValueCallback(
            (long) class_tag,
            (long) DEREF(tag_ptr),
            (int) value_length);
-    fflush(0);
+    fflush(nullptr);
     return 0;
 } /* stringPrimitiveValueCallback */
 
@@ -725,14 +725,14 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     jobject rootObject = nullptr;
 
     printf("Wait for tested objects created\n");
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_VERIFY(nsk_jvmti_waitForSync(timeout))) {
         return;
     }
 
 
     printf(">>> Obtain and tag tested objects from debugee class\n");
-    fflush(0);
+    fflush(nullptr);
 
     if (!NSK_VERIFY(getAndTagTestedObjects(jvmti,
                                            jni,
@@ -745,7 +745,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     }
 
     printf(">>> Let debugee to clean links to unreachable objects\n");
-    fflush(0);
+    fflush(nullptr);
 
     if (!NSK_VERIFY(nsk_jvmti_resumeSync())) {
         return;
@@ -755,7 +755,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     }
 
     printf(">>> Start iteration from root tested object: 0x%p\n\n", rootObject);
-    fflush(0);
+    fflush(nullptr);
 
     if (!NSK_JVMTI_VERIFY(jvmti->FollowReferences((jint)   0,    /* heap_filter    */
                                                   (jclass) nullptr, /* class          */
@@ -767,19 +767,19 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     }
 
     printf(">>> Check if reachable objects were iterated:\n");
-    fflush(0);
+    fflush(nullptr);
 
     if (!checkTestedObjects(jvmti, jni, chainLength, objectDescList)) {
         nsk_jvmti_setFailStatus();
     }
 
     printf(">>> Clean used data\n");
-    fflush(0);
+    fflush(nullptr);
 
     releaseTestedObjects(jvmti, jni, chainLength, objectDescList, rootObject);
 
     printf(">>> Let debugee to finish\n");
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_VERIFY(nsk_jvmti_resumeSync())) {
         return;
     }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref002/followref002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref002/followref002.cpp
index 6366b430776c9..9ea3a5d0d01c0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref002/followref002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref002/followref002.cpp
@@ -131,7 +131,7 @@ static int getAndTagChainObjects(
         nsk_jvmti_setFailStatus();
     }
     printf("        tag=%-5ld object=0x%p\n", (long)objTag, (void*)obj);
-    fflush(0);
+    fflush(nullptr);
     if (!getAndTagChainObjects(jvmti, jni, obj,
                                nextField,
                                nextFieldName,
@@ -170,14 +170,14 @@ static int getAndTagTestedObjects(
     *objectsCount = 1 + 2 * chainLength;
 
     printf("Allocate memory for objects list: %d objects\n", *objectsCount);
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_JVMTI_VERIFY(jvmti->Allocate((*objectsCount * sizeof(ObjectDesc)),
                                           (unsigned char**)objectDescList))) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
     printf("  ... allocated array: 0x%p\n", (void*)objectDescList);
-    fflush(0);
+    fflush(nullptr);
 
     {
         int k;
@@ -191,7 +191,7 @@ static int getAndTagTestedObjects(
     (*objectDescList)[0].exp_class_tag = rootClassTag;
 
     printf("Find debugee class: %s\n", DEBUGEE_CLASS_NAME);
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_JNI_VERIFY(jni, (debugeeClass = jni->FindClass(DEBUGEE_CLASS_NAME)) != nullptr)) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
@@ -199,7 +199,7 @@ static int getAndTagTestedObjects(
     printf("  ... found class: 0x%p\n", (void*)debugeeClass);
 
     printf("Find root object class: %s\n", ROOT_OBJECT_CLASS_NAME);
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_JNI_VERIFY(jni, (rootObjectClass = jni->FindClass(ROOT_OBJECT_CLASS_NAME)) != nullptr)) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
@@ -212,7 +212,7 @@ static int getAndTagTestedObjects(
     printf("        tag=%-5ld rootClass=0x%p\n", (long)rootClassTag, (void*)rootObjectClass);
 
     printf("Find chain object class: %s\n", CHAIN_OBJECT_CLASS_NAME);
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_JNI_VERIFY(jni, (chainObjectClass =
             jni->FindClass(CHAIN_OBJECT_CLASS_NAME)) != nullptr)) {
         nsk_jvmti_setFailStatus();
@@ -226,7 +226,7 @@ static int getAndTagTestedObjects(
     printf("        tag=%-5ld chainClass=0x%p\n", (long)chainClassTag, (void*)chainObjectClass);
 
     printf("Find static field in debugee class: %s\n", OBJECT_FIELD_NAME);
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_JNI_VERIFY(jni, (objectField =
             jni->GetStaticFieldID(debugeeClass, OBJECT_FIELD_NAME, ROOT_OBJECT_CLASS_SIG)) != nullptr)) {
         nsk_jvmti_setFailStatus();
@@ -235,7 +235,7 @@ static int getAndTagTestedObjects(
     printf("  ... got fieldID: 0x%p\n", (void*)objectField);
 
     printf("Find instance field in root object class: %s\n", REACHABLE_CHAIN_FIELD_NAME);
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_JNI_VERIFY(jni, (reachableChainField =
             jni->GetFieldID(rootObjectClass, REACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != nullptr)) {
         nsk_jvmti_setFailStatus();
@@ -244,7 +244,7 @@ static int getAndTagTestedObjects(
     printf("  ... got fieldID: 0x%p\n", (void*)reachableChainField);
 
     printf("Find instance field in root object class: %s\n", UNREACHABLE_CHAIN_FIELD_NAME);
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_JNI_VERIFY(jni, (unreachableChainField =
             jni->GetFieldID(rootObjectClass, UNREACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != nullptr)) {
         nsk_jvmti_setFailStatus();
@@ -253,7 +253,7 @@ static int getAndTagTestedObjects(
     printf("  ... got fieldID: 0x%p\n", (void*)unreachableChainField);
 
     printf("Find instance field in chain object class: %s\n", TAIL_FIELD_NAME);
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_JNI_VERIFY(jni, (tailField =
             jni->GetFieldID(chainObjectClass, TAIL_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != nullptr)) {
         nsk_jvmti_setFailStatus();
@@ -262,14 +262,14 @@ static int getAndTagTestedObjects(
     printf("  ... got fieldID: 0x%p\n", (void*)tailField);
 
     printf("Get root object from static field: %s\n", OBJECT_FIELD_NAME);
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_JNI_VERIFY(jni, (*rootObject =
             jni->GetStaticObjectField(debugeeClass, objectField)) != nullptr)) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
     printf("  ... got object: 0x%p\n", (void*)*rootObject);
-    fflush(0);
+    fflush(nullptr);
 
     if (!NSK_JNI_VERIFY(jni, (*rootObject = jni->NewGlobalRef(*rootObject)) != nullptr)) {
         nsk_jvmti_setFailStatus();
@@ -280,7 +280,7 @@ static int getAndTagTestedObjects(
     printf("Obtain and tag chain objects:\n");
 
     printf("    root tested object:\n");
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_JVMTI_VERIFY(jvmti->SetTag(*rootObject, rootObjectTag))) {
         nsk_jvmti_setFailStatus();
     }
@@ -295,7 +295,7 @@ static int getAndTagTestedObjects(
     (*objectDescList)[chainLength].exp_found = 1;
 
     printf("    reachable objects chain: %d objects\n", chainLength);
-    fflush(0);
+    fflush(nullptr);
     if (!getAndTagChainObjects(jvmti, jni, *rootObject,
                                reachableChainField,
                                REACHABLE_CHAIN_FIELD_NAME,
@@ -348,7 +348,7 @@ static int checkTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni,
     }
 
     printf("\nReachable objects:\n");
-    fflush(0);
+    fflush(nullptr);
     for (i = 0; i < chainLength; i++) {
         idx = i + 1;
         printf("Reachable object:\n"
@@ -383,7 +383,7 @@ static int checkTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni,
             NSK_COMPLAIN0("Unreachable object was iterated\n");
             nsk_jvmti_setFailStatus();
         }
-        fflush(0);
+        fflush(nullptr);
     }
 
     return NSK_TRUE;
@@ -404,7 +404,7 @@ static int releaseTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength,
         }
     }
 
-    fflush(0);
+    fflush(nullptr);
     return NSK_TRUE;
 } /* releaseTestedObjects */
 
@@ -456,7 +456,7 @@ jint JNICALL heapReferenceCallback(
            (long) size,
            (long) ref_tag,
            (int) referrer_index);
-    fflush(0);
+    fflush(nullptr);
 
     if (tag_ptr == nullptr) {
         NSK_COMPLAIN1("null tag_ptr is passed to heapReferenceCallback:"
@@ -531,7 +531,7 @@ jint JNICALL heapReferenceCallback(
         case JVMTI_HEAP_REFERENCE_OTHER: {
             NSK_COMPLAIN1("This reference kind was not expected: %s\n",
                            ref_kind_str[reference_kind]);
-            fflush(0);
+            fflush(nullptr);
             nsk_jvmti_setFailStatus();
             return 0;
         }
@@ -556,7 +556,7 @@ jint JNICALL primitiveFieldCallback(
            (long) class_tag,
            (long) DEREF(tag_ptr),
            (int) value_type);
-    fflush(0);
+    fflush(nullptr);
     return 0;
 }
 
@@ -574,7 +574,7 @@ jint JNICALL arrayPrimitiveValueCallback(
            (long) DEREF(tag_ptr),
            (int) element_count,
            (int) element_type);
-    fflush(0);
+    fflush(nullptr);
     return 0;
 }
 
@@ -590,7 +590,7 @@ jint JNICALL stringPrimitiveValueCallback(
            (long) class_tag,
            (long) DEREF(tag_ptr),
            (int) value_length);
-    fflush(0);
+    fflush(nullptr);
     return 0;
 }
 
@@ -602,13 +602,13 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     jobject rootObject = nullptr;
 
     printf("Wait for tested objects created\n");
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_VERIFY(nsk_jvmti_waitForSync(timeout))) {
         return;
     }
 
     printf(">>> Obtain and tag tested objects from debugee class\n");
-    fflush(0);
+    fflush(nullptr);
     {
         if (!NSK_VERIFY(getAndTagTestedObjects(jvmti, jni,
                                                chainLength, &objectsCount,
@@ -618,7 +618,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     }
 
     printf(">>> Let debugee to clean links to unreachable objects\n");
-    fflush(0);
+    fflush(nullptr);
     {
         if (!NSK_VERIFY(nsk_jvmti_resumeSync())) {
             return;
@@ -629,7 +629,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     }
 
     printf("\n\n>>> Start 1-st iteration for root tested object: 0x%p\n", rootObject);
-    fflush(0);
+    fflush(nullptr);
     {
         jint heap_filter = JVMTI_HEAP_FILTER_UNTAGGED | JVMTI_HEAP_FILTER_CLASS_UNTAGGED;
         if (!NSK_JVMTI_VERIFY(jvmti->FollowReferences(heap_filter,
@@ -643,7 +643,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     }
 
     printf(">>> Check if reachable objects were iterated\n");
-    fflush(0);
+    fflush(nullptr);
     {
         if (!checkTestedObjects(jvmti, jni, chainLength, objectDescList)) {
             nsk_jvmti_setFailStatus();
@@ -660,7 +660,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     }
 
     printf("\n\n>>> Start 2-nd iteration for root tested object: 0x%p\n", rootObject);
-    fflush(0);
+    fflush(nullptr);
     {
         /* This time everythig is filtered out */
         jint heap_filter = JVMTI_HEAP_FILTER_UNTAGGED | JVMTI_HEAP_FILTER_CLASS_UNTAGGED |
@@ -676,7 +676,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     }
 
     printf(">>> Check if reachable objects were not reported this time\n");
-    fflush(0);
+    fflush(nullptr);
     {
         if (!checkTestedObjects(jvmti, jni, chainLength, objectDescList)) {
             nsk_jvmti_setFailStatus();
@@ -684,7 +684,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     }
 
     printf(">>> Clean used data\n");
-    fflush(0);
+    fflush(nullptr);
     {
         if (!NSK_VERIFY(releaseTestedObjects(jvmti, jni, chainLength, objectDescList, rootObject))) {
             return;
@@ -692,7 +692,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     }
 
     printf("Let debugee to finish\n");
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_VERIFY(nsk_jvmti_resumeSync()))
         return;
 }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref003/followref003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref003/followref003.cpp
index cb0385ee6535b..80cbf856f4504 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref003/followref003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref003/followref003.cpp
@@ -146,7 +146,7 @@ static int getChainObjects(jvmtiEnv* jvmti, JNIEnv* jni, jobject firstObject,
         nsk_jvmti_setFailStatus();
     }
     printf("        tag=%-5ld object=0x%p\n", (long)objTag, (void*)obj);
-    fflush(0);
+    fflush(nullptr);
     if (!getChainObjects(jvmti, jni, obj, nextField, nextFieldName,
                                 nextField, nextFieldName,
                                 count, objectDescList, tag, reachable)) {
@@ -173,14 +173,14 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength,
     *objectsCount = 1 + 2 * chainLength;
 
     printf("Allocate memory for objects list: %d objects\n", *objectsCount);
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_JVMTI_VERIFY(jvmti->Allocate((*objectsCount * sizeof(ObjectDesc)),
                                           (unsigned char**)objectDescList))) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
     printf("  ... allocated array: 0x%p\n", (void*)objectDescList);
-    fflush(0);
+    fflush(nullptr);
 
     {
         int k;
@@ -194,7 +194,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength,
     (*objectDescList)[0].exp_class_tag = rootClassTag;
 
     printf("Find debugee class: %s\n", DEBUGEE_CLASS_NAME);
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_JNI_VERIFY(jni, (debugeeClass = jni->FindClass(DEBUGEE_CLASS_NAME)) != nullptr)) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
@@ -202,7 +202,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength,
     printf("  ... found class: 0x%p\n", (void*)debugeeClass);
 
     printf("Find root object class: %s\n", ROOT_OBJECT_CLASS_NAME);
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_JNI_VERIFY(jni, (rootObjectClass = jni->FindClass(ROOT_OBJECT_CLASS_NAME)) != nullptr)) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
@@ -216,7 +216,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength,
            (long)rootClassTag, (void*)rootObjectClass);
 
     printf("Find chain object class: %s\n", CHAIN_OBJECT_CLASS_NAME);
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_JNI_VERIFY(jni, (chainObjectClass =
             jni->FindClass(CHAIN_OBJECT_CLASS_NAME)) != nullptr)) {
         nsk_jvmti_setFailStatus();
@@ -232,7 +232,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength,
            (long)chainClassTag, (void*)chainObjectClass);
 
     printf("Find static field in debugee class: %s\n", OBJECT_FIELD_NAME);
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_JNI_VERIFY(jni, (objectField =
             jni->GetStaticFieldID(debugeeClass, OBJECT_FIELD_NAME, ROOT_OBJECT_CLASS_SIG)) != nullptr)) {
         nsk_jvmti_setFailStatus();
@@ -241,7 +241,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength,
     printf("  ... got fieldID: 0x%p\n", (void*)objectField);
 
     printf("Find instance field in root object class: %s\n", REACHABLE_CHAIN_FIELD_NAME);
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_JNI_VERIFY(jni, (reachableChainField =
             jni->GetFieldID(rootObjectClass, REACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != nullptr)) {
         nsk_jvmti_setFailStatus();
@@ -250,7 +250,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength,
     printf("  ... got fieldID: 0x%p\n", (void*)reachableChainField);
 
     printf("Find instance field in root object class: %s\n", UNREACHABLE_CHAIN_FIELD_NAME);
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_JNI_VERIFY(jni, (unreachableChainField =
             jni->GetFieldID(rootObjectClass, UNREACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != nullptr)) {
         nsk_jvmti_setFailStatus();
@@ -259,7 +259,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength,
     printf("  ... got fieldID: 0x%p\n", (void*)unreachableChainField);
 
     printf("Find instance field in chain object class: %s\n", TAIL_FIELD_NAME);
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_JNI_VERIFY(jni, (tailField =
             jni->GetFieldID(chainObjectClass, TAIL_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != nullptr)) {
         nsk_jvmti_setFailStatus();
@@ -268,14 +268,14 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength,
     printf("  ... got fieldID: 0x%p\n", (void*)tailField);
 
     printf("Get root object from static field: %s\n", OBJECT_FIELD_NAME);
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_JNI_VERIFY(jni, (*rootObject =
             jni->GetStaticObjectField(debugeeClass, objectField)) != nullptr)) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
     printf("  ... got object: 0x%p\n", (void*)*rootObject);
-    fflush(0);
+    fflush(nullptr);
 
     if (!NSK_JNI_VERIFY(jni, (*rootObject = jni->NewGlobalRef(*rootObject)) != nullptr)) {
         nsk_jvmti_setFailStatus();
@@ -286,7 +286,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength,
     printf("Obtain and tag chain objects:\n");
 
     printf("    root tested object\n");
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_JVMTI_VERIFY(jvmti->SetTag(*rootObject, rootObjectTag))) {
         nsk_jvmti_setFailStatus();
     }
@@ -298,7 +298,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength,
     (*objectDescList)[0].tag = rootObjectTag;
 
     printf("    reachable objects chain: %d objects\n", chainLength);
-    fflush(0);
+    fflush(nullptr);
     if (!getChainObjects(jvmti, jni, *rootObject,
                                 reachableChainField, REACHABLE_CHAIN_FIELD_NAME,
                                 tailField, TAIL_FIELD_NAME,
@@ -347,7 +347,7 @@ static int checkTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni,
     }
 
     printf("\nReachable objects:\n");
-    fflush(0);
+    fflush(nullptr);
     for (i = 0; i < chainLength; i++) {
         idx = i + 1;
         printf("Reachable object:\n"
@@ -382,7 +382,7 @@ static int checkTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni,
             NSK_COMPLAIN0("Unreachable object was iterated\n");
             nsk_jvmti_setFailStatus();
         }
-        fflush(0);
+        fflush(nullptr);
     }
 
     return NSK_TRUE;
@@ -403,7 +403,7 @@ static int releaseTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength,
         }
     }
 
-    fflush(0);
+    fflush(nullptr);
     return NSK_TRUE;
 }
 
@@ -646,7 +646,7 @@ jint JNICALL heapReferenceCallback(
                    (long) size);
         }
 
-        fflush(0);
+        fflush(nullptr);
         return 0;
     }
 
@@ -665,7 +665,7 @@ jint JNICALL heapReferenceCallback(
            method,
            (long) location,
            (int) index);
-    fflush(0);
+    fflush(nullptr);
 
     if (tag_ptr == nullptr) {
         NSK_COMPLAIN1("null tag_ptr is passed to heapReferenceCallback:"
@@ -748,7 +748,7 @@ jint JNICALL heapReferenceCallback(
             if (tag != rootObjectTag || class_tag != rootClassTag) {
                  NSK_COMPLAIN1("This reference kind was not expected: %s\n",
                                ref_kind_str[ref_kind]);
-                 fflush(0);
+                 fflush(nullptr);
                  nsk_jvmti_setFailStatus();
             }
             break;
@@ -818,7 +818,7 @@ jint JNICALL heapReferenceCallback(
         default: {
             NSK_COMPLAIN1("This reference kind was not expected: %s\n\n",
                            ref_kind_str[ref_kind]);
-            fflush(0);
+            fflush(nullptr);
             nsk_jvmti_setFailStatus();
             break;
         }
@@ -840,7 +840,7 @@ jint JNICALL primitiveFieldCallback
            (long) class_tag,
            (long) DEREF(tag_ptr),
            (int) value_type);
-    fflush(0);
+    fflush(nullptr);
     return 0;
 }
 
@@ -853,7 +853,7 @@ jint JNICALL arrayPrimitiveValueCallback
            (long) DEREF(tag_ptr),
            (int) element_count,
            (int) element_type);
-    fflush(0);
+    fflush(nullptr);
     return 0;
 }
 
@@ -865,7 +865,7 @@ jint JNICALL stringPrimitiveValueCallback
            (long) class_tag,
            (long) DEREF(tag_ptr),
            (int) value_length);
-    fflush(0);
+    fflush(nullptr);
     return 0;
 }
 
@@ -902,13 +902,13 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     jobject rootObject = nullptr;
 
     printf("Wait for tested objects created\n");
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_VERIFY(nsk_jvmti_waitForSync(timeout))) {
         return;
     }
 
     printf(">>> Obtain and tag tested objects from debugee class\n");
-    fflush(0);
+    fflush(nullptr);
     {
         if (!NSK_VERIFY(getTestedObjects(jvmti, jni, chainLength, &objectsCount,
                                          &objectDescList, &rootObject))) {
@@ -917,7 +917,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     }
 
     printf(">>> Let debugee to clean links to unreachable objects\n");
-    fflush(0);
+    fflush(nullptr);
     {
         if (!NSK_VERIFY(nsk_jvmti_resumeSync())) {
             return;
@@ -933,7 +933,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     }
 
     printf("\n\n>>> Start 1-st iteration starting from the heap root\n");
-    fflush(0);
+    fflush(nullptr);
     {
         if (!NSK_JVMTI_VERIFY(jvmti->FollowReferences((jint)   0,     /* heap_filter    */
                                                       (jclass)  nullptr, /* class          */
@@ -946,7 +946,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     }
 
     printf(">>> Check if reachable objects were iterated\n");
-    fflush(0);
+    fflush(nullptr);
     {
         if (!checkTestedObjects(jvmti, jni, chainLength, objectDescList)) {
             nsk_jvmti_setFailStatus();
@@ -968,7 +968,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     }
 
     printf("\n\n>>> Start 2-nd iteration starting from the heap root\n");
-    fflush(0);
+    fflush(nullptr);
     first_followref = 0;
     {
         jint heap_filter = JVMTI_HEAP_FILTER_UNTAGGED
@@ -985,7 +985,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
 
     printf(">>> Check that both reachable and unreachable "
            "objects were not iterated\n");
-    fflush(0);
+    fflush(nullptr);
     {
         if (!checkTestedObjects(jvmti, jni, chainLength, objectDescList)) {
             nsk_jvmti_setFailStatus();
@@ -994,7 +994,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
 
 
     printf(">>> Clean used data\n");
-    fflush(0);
+    fflush(nullptr);
     {
         if (!NSK_VERIFY(releaseTestedObjects(jvmti, jni, chainLength,
                         objectDescList, rootObject))) {
@@ -1003,7 +1003,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     }
 
     printf("Let debugee to finish\n");
-    fflush(0);
+    fflush(nullptr);
     if (!NSK_VERIFY(nsk_jvmti_resumeSync()))
         return;
 }
@@ -1047,7 +1047,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
                 info = INFO_HEAPOBJ;
             else {
                 printf("Unknown option value: info=%s\n", infoOpt);
-                fflush(0);
+                fflush(nullptr);
                 return JNI_ERR;
             }
         }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref004/followref004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref004/followref004.cpp
index e73534de8b6b4..2446b5f7caf93 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref004/followref004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref004/followref004.cpp
@@ -86,7 +86,7 @@ jint JNICALL primitiveFieldCallback(
                (long) DEREF(tag_ptr),
                (int) value_type);
 
-    fflush(0);
+    fflush(nullptr);
 
     markTagVisited(DEREF(tag_ptr));
 
@@ -111,7 +111,7 @@ jint JNICALL arrayPrimitiveValueCallback(
            (long) DEREF(tag_ptr),
            (int) element_count,
            (int) element_type);
-    fflush(0);
+    fflush(nullptr);
 
     markTagVisited(DEREF(tag_ptr));
 
@@ -132,7 +132,7 @@ jint JNICALL stringPrimitiveValueCallback(
            (long) class_tag,
            (long) DEREF(tag_ptr),
            (int) value_length);
-    fflush(0);
+    fflush(nullptr);
 
     markTagVisited(DEREF(tag_ptr));
 
@@ -168,14 +168,14 @@ static void JNICALL agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg)
     jvmtiError retCode;
 
     printf(">>> Sync with Java code\n");
-    fflush(0);
+    fflush(nullptr);
 
     if (!NSK_VERIFY(nsk_jvmti_waitForSync(g_timeout))) {
         return;
     }
 
     printf(">>> Create JNI global references\n");
-    fflush(0);
+    fflush(nullptr);
 
     createGlobalRefs(jni);
 
@@ -192,7 +192,7 @@ static void JNICALL agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg)
     checkThatAllTagsVisited();
 
     printf(">>> Let debugee to finish\n");
-    fflush(0);
+    fflush(nullptr);
 
     if (!NSK_VERIFY(nsk_jvmti_resumeSync())) {
         return;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref005/followref005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref005/followref005.cpp
index 333ddcccf831a..d0194feab0288 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref005/followref005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref005/followref005.cpp
@@ -88,7 +88,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     }
 
     printf(">>> Let debugee to finish\n");
-    fflush(0);
+    fflush(nullptr);
 
     if (!NSK_VERIFY(nsk_jvmti_waitForSync(g_timeout))) {
         return;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref006/followref006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref006/followref006.cpp
index 54485fb809ae2..5c5e37803211d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref006/followref006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref006/followref006.cpp
@@ -181,7 +181,7 @@ static void JNICALL agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg)
     checkNoObjIterated(jni, jvmti, JAVA_UTIL_CALENDAR_CLASS_NAME);
 
     NSK_DISPLAY0("Let debugee to finish");
-    fflush(0);
+    fflush(nullptr);
 
     if (!NSK_VERIFY(nsk_jvmti_waitForSync(g_timeout))) {
         return;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretbase/earlyretbase.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretbase/earlyretbase.cpp
index 47b9618d19c88..6c57004fc5f59 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretbase/earlyretbase.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretbase/earlyretbase.cpp
@@ -33,7 +33,7 @@ extern "C" {
 #define STATUS_FAILED 2
 #define PASSED 0
 
-#define RETURN_FAILED errCode = STATUS_FAILED; fflush(0); return errCode
+#define RETURN_FAILED errCode = STATUS_FAILED; fflush(nullptr); return errCode
 
 static jvmtiEnv *jvmti = nullptr;
 static jvmtiCapabilities caps;
@@ -59,7 +59,7 @@ MethodExit(jvmtiEnv *jvmti_env, JNIEnv *env, jthread thr,
 
     if (method == midActiveMethod) {
         printf("#### MethodExit event occurred ####\n");
-        fflush(0);
+        fflush(nullptr);
         meth_exit_gen_events++;
     }
 }
@@ -70,7 +70,7 @@ FramePop(jvmtiEnv *jvmti_env, JNIEnv *env, jthread thread,
 
     if (method == midActiveMethod) {
         printf("#### FramePop event occurred ####\n");
-        fflush(0);
+        fflush(nullptr);
         pop_frame_gen_events++;
     }
 }
@@ -120,7 +120,7 @@ Java_nsk_jvmti_unit_ForceEarlyReturn_earlyretbase_resThread(JNIEnv *env,
         return JNI_ERR;
     }
     printf("<<<<<<<< ResumeThread() is successfully done\n");
-    fflush(0);
+    fflush(nullptr);
     return PASSED;
 }
 
@@ -176,7 +176,7 @@ Java_nsk_jvmti_unit_ForceEarlyReturn_earlyretbase_doForceEarlyReturn(JNIEnv *env
         RETURN_FAILED;
     }
     printf("Check #1 PASSED: ForceEarlyReturn() is successfully done\n");
-    fflush(0);
+    fflush(nullptr);
 
     return(errCode);
 }
@@ -268,7 +268,7 @@ Java_nsk_jvmti_unit_ForceEarlyReturn_earlyretbase_check(JNIEnv *env, jclass cls)
                "events generated correctly\n");
         errCode = PASSED;
     }
-    fflush(0);
+    fflush(nullptr);
     return errCode;
 }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretfp/earlyretfp.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretfp/earlyretfp.cpp
index 9a0ce3d85508b..5e7506a871e3c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretfp/earlyretfp.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretfp/earlyretfp.cpp
@@ -33,7 +33,7 @@ extern "C" {
 #define PASSED 0
 #define STATUS_FAILED 2
 
-#define RETURN_FAILED errCode = STATUS_FAILED; fflush(0); return
+#define RETURN_FAILED errCode = STATUS_FAILED; fflush(nullptr); return
 
 #define METHCNT 2
 static jvmtiEnv *jvmti = nullptr;
@@ -175,7 +175,7 @@ void check(jvmtiEnv *jvmti_env, jthread thr, jmethodID mid,
         printf(" expected: %d\n", framesCount + 1);
         RETURN_FAILED;
     }
-    fflush(0);
+    fflush(nullptr);
 }
 
 void JNICALL Breakpoint(jvmtiEnv *jvmti_env, JNIEnv *env,
@@ -220,7 +220,7 @@ void JNICALL Breakpoint(jvmtiEnv *jvmti_env, JNIEnv *env,
                TranslateError(err), err);
         RETURN_FAILED;
     }
-    fflush(0);
+    fflush(nullptr);
 }
 
 void JNICALL SingleStep(jvmtiEnv *jvmti_env, JNIEnv *env,
@@ -256,7 +256,7 @@ void JNICALL SingleStep(jvmtiEnv *jvmti_env, JNIEnv *env,
             RETURN_FAILED;
         }
     }
-    fflush(0);
+    fflush(nullptr);
 }
 
 void JNICALL MethodExit(jvmtiEnv *jvmti_env, JNIEnv *env, jthread thread,
@@ -289,7 +289,7 @@ void JNICALL MethodExit(jvmtiEnv *jvmti_env, JNIEnv *env, jthread thread,
         printf("Method was_popped_by_exception unexpectedly\n");
         errCode = STATUS_FAILED;
     }
-    fflush(0);
+    fflush(nullptr);
 }
 
 #ifdef STATIC_BUILD
@@ -361,7 +361,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         printf("Warning: Breakpoint or SingleStep event are not implemented\n");
     }
 
-    fflush(0);
+    fflush(nullptr);
     return JNI_OK;
 }
 
@@ -431,7 +431,7 @@ Java_nsk_jvmti_unit_ForceEarlyReturn_earlyretfp_printFloat(
       JNIEnv *env, jclass cls, jfloat val) {
 
     printf("\n>>> Returned value is %8.4f, hex: %#a\n", val, val);
-    fflush(0);
+    fflush(nullptr);
     return;
 }
 
@@ -440,7 +440,7 @@ Java_nsk_jvmti_unit_ForceEarlyReturn_earlyretfp_printDouble(
       JNIEnv *env, jclass cls, jdouble val) {
 
     printf("\n>>> Returned value is %8.4f, hex: %#a\n", val, val);
-    fflush(0);
+    fflush(nullptr);
     return;
 }
 
@@ -451,7 +451,7 @@ Java_nsk_jvmti_unit_ForceEarlyReturn_earlyretfp_check(JNIEnv *env, jclass cls) {
             framesCount, framesExpected);
         errCode = STATUS_FAILED;
     }
-    fflush(0);
+    fflush(nullptr);
     return errCode;
 }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretint/earlyretint.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretint/earlyretint.cpp
index feb51d5fc407d..16cd4c3856712 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretint/earlyretint.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretint/earlyretint.cpp
@@ -33,7 +33,7 @@ extern "C" {
 #define PASSED 0
 #define STATUS_FAILED 2
 
-#define RETURN_FAILED errCode = STATUS_FAILED; fflush(0); return
+#define RETURN_FAILED errCode = STATUS_FAILED; fflush(nullptr); return
 
 static jvmtiEnv *jvmti = nullptr;
 static jvmtiCapabilities caps;
@@ -184,7 +184,7 @@ void check(jvmtiEnv *jvmti_env, jthread thr, jmethodID mid,
         printf(" expected: %d\n", framesCount + 1);
         RETURN_FAILED;
     }
-    fflush(0);
+    fflush(nullptr);
 }
 
 void JNICALL Breakpoint(jvmtiEnv *jvmti_env, JNIEnv *env,
@@ -229,7 +229,7 @@ void JNICALL Breakpoint(jvmtiEnv *jvmti_env, JNIEnv *env,
                TranslateError(err), err);
         RETURN_FAILED;
     }
-    fflush(0);
+    fflush(nullptr);
 }
 
 void JNICALL SingleStep(jvmtiEnv *jvmti_env, JNIEnv *env,
@@ -270,7 +270,7 @@ void JNICALL SingleStep(jvmtiEnv *jvmti_env, JNIEnv *env,
             RETURN_FAILED;
         }
     }
-    fflush(0);
+    fflush(nullptr);
 }
 
 void JNICALL MethodExit(jvmtiEnv *jvmti_env, JNIEnv *env, jthread thread,
@@ -295,7 +295,7 @@ void JNICALL MethodExit(jvmtiEnv *jvmti_env, JNIEnv *env, jthread thread,
         printf("Method was_popped_by_exception unexpectedly\n");
         errCode = STATUS_FAILED;
     }
-    fflush(0);
+    fflush(nullptr);
 }
 
 #ifdef STATIC_BUILD
@@ -452,7 +452,7 @@ Java_nsk_jvmti_unit_ForceEarlyReturn_earlyretint_printInt(
       JNIEnv *env, jclass cls, jint val) {
 
     printf("\n>>> Returned value: dec %d, hex: %#x\n", val, val);
-    fflush(0);
+    fflush(nullptr);
     return;
 }
 
@@ -463,7 +463,7 @@ Java_nsk_jvmti_unit_ForceEarlyReturn_earlyretint_check(JNIEnv *env, jclass cls)
             framesCount, framesExpected);
         errCode = STATUS_FAILED;
     }
-    fflush(0);
+    fflush(nullptr);
     return errCode;
 }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretlong/earlyretlong.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretlong/earlyretlong.cpp
index 170d6839bef09..2cb1a318d4492 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretlong/earlyretlong.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretlong/earlyretlong.cpp
@@ -34,7 +34,7 @@ extern "C" {
 #define PASSED 0
 #define STATUS_FAILED 2
 
-#define RETURN_FAILED errCode = STATUS_FAILED; fflush(0); return
+#define RETURN_FAILED errCode = STATUS_FAILED; fflush(nullptr); return
 
 static jvmtiEnv *jvmti = nullptr;
 static jvmtiCapabilities caps;
@@ -168,7 +168,7 @@ void check(jvmtiEnv *jvmti_env, jthread thr, jmethodID mid,
         printf(" expected: %d\n", framesCount + 1);
         RETURN_FAILED;
     }
-    fflush(0);
+    fflush(nullptr);
 }
 
 void JNICALL Breakpoint(jvmtiEnv *jvmti_env, JNIEnv *env,
@@ -213,7 +213,7 @@ void JNICALL Breakpoint(jvmtiEnv *jvmti_env, JNIEnv *env,
                TranslateError(err), err);
         RETURN_FAILED;
     }
-    fflush(0);
+    fflush(nullptr);
 }
 
 void JNICALL SingleStep(jvmtiEnv *jvmti_env, JNIEnv *env,
@@ -251,7 +251,7 @@ void JNICALL SingleStep(jvmtiEnv *jvmti_env, JNIEnv *env,
             RETURN_FAILED;
         }
     }
-    fflush(0);
+    fflush(nullptr);
 }
 
 void JNICALL MethodExit(jvmtiEnv *jvmti_env, JNIEnv *env, jthread thread,
@@ -276,7 +276,7 @@ void JNICALL MethodExit(jvmtiEnv *jvmti_env, JNIEnv *env, jthread thread,
             errCode = STATUS_FAILED;
         }
     }
-    fflush(0);
+    fflush(nullptr);
 }
 
 #ifdef STATIC_BUILD
@@ -412,7 +412,7 @@ Java_nsk_jvmti_unit_ForceEarlyReturn_earlyretlong_printLong(
 
     printf("\n>>> Returned value: dec: %" LL "d, hex: %#x %#x\n",
             val, iptr[0], iptr[1]);
-    fflush(0);
+    fflush(nullptr);
     return;
 }
 
@@ -423,7 +423,7 @@ Java_nsk_jvmti_unit_ForceEarlyReturn_earlyretlong_check(JNIEnv *env, jclass cls)
             framesCount, framesExpected);
         errCode = STATUS_FAILED;
     }
-    fflush(0);
+    fflush(nullptr);
     return errCode;
 }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretobj/earlyretobj.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretobj/earlyretobj.cpp
index 6faf82f9ed90e..ee3b79632d5c2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretobj/earlyretobj.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretobj/earlyretobj.cpp
@@ -34,7 +34,7 @@ extern "C" {
 #define PASSED 0
 #define STATUS_FAILED 2
 
-#define RETURN_FAILED errCode = STATUS_FAILED; fflush(0); return
+#define RETURN_FAILED errCode = STATUS_FAILED; fflush(nullptr); return
 
 static jvmtiEnv *jvmti = nullptr;
 static jvmtiCapabilities caps;
@@ -168,7 +168,7 @@ void check(jvmtiEnv *jvmti_env, jthread thr, jmethodID mid,
         printf(" expected: %d\n", framesCount + 1);
         RETURN_FAILED;
     }
-    fflush(0);
+    fflush(nullptr);
 }
 
 void JNICALL Breakpoint(jvmtiEnv *jvmti_env, JNIEnv *env,
@@ -213,7 +213,7 @@ void JNICALL Breakpoint(jvmtiEnv *jvmti_env, JNIEnv *env,
                TranslateError(err), err);
         RETURN_FAILED;
     }
-    fflush(0);
+    fflush(nullptr);
 }
 
 void JNICALL SingleStep(jvmtiEnv *jvmti_env, JNIEnv *env,
@@ -251,7 +251,7 @@ void JNICALL SingleStep(jvmtiEnv *jvmti_env, JNIEnv *env,
             RETURN_FAILED;
         }
     }
-    fflush(0);
+    fflush(nullptr);
 }
 
 void JNICALL MethodExit(jvmtiEnv *jvmti_env, JNIEnv *env, jthread thread,
@@ -274,7 +274,7 @@ void JNICALL MethodExit(jvmtiEnv *jvmti_env, JNIEnv *env, jthread thread,
             errCode = STATUS_FAILED;
         }
     }
-    fflush(0);
+    fflush(nullptr);
 }
 
 #ifdef STATIC_BUILD
@@ -410,7 +410,7 @@ Java_nsk_jvmti_unit_ForceEarlyReturn_earlyretobj_check(JNIEnv *env, jclass cls)
             framesCount, framesExpected);
         errCode = STATUS_FAILED;
     }
-    fflush(0);
+    fflush(nullptr);
     return errCode;
 }
 
@@ -419,7 +419,7 @@ Java_nsk_jvmti_unit_ForceEarlyReturn_earlyretobj_printObject(
          JNIEnv *env, jclass cls, jobject obj) {
 
     printf("\nReturned jobject: %#" PRIxPTR "\n", (uintptr_t)obj);
-    fflush(0);
+    fflush(nullptr);
     return;
 }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretstr/earlyretstr.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretstr/earlyretstr.cpp
index 6ebb50026a34a..8465d05f9561a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretstr/earlyretstr.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretstr/earlyretstr.cpp
@@ -33,7 +33,7 @@ extern "C" {
 #define PASSED 0
 #define STATUS_FAILED 2
 
-#define RETURN_FAILED errCode = STATUS_FAILED; fflush(0); return
+#define RETURN_FAILED errCode = STATUS_FAILED; fflush(nullptr); return
 
 static jvmtiEnv *jvmti = nullptr;
 static jvmtiCapabilities caps;
@@ -167,7 +167,7 @@ void check(jvmtiEnv *jvmti_env, jthread thr, jmethodID mid,
         printf(" expected: %d\n", framesCount + 1);
         RETURN_FAILED;
     }
-    fflush(0);
+    fflush(nullptr);
 }
 
 void JNICALL Breakpoint(jvmtiEnv *jvmti_env, JNIEnv *env,
@@ -212,7 +212,7 @@ void JNICALL Breakpoint(jvmtiEnv *jvmti_env, JNIEnv *env,
                TranslateError(err), err);
         RETURN_FAILED;
     }
-    fflush(0);
+    fflush(nullptr);
 }
 
 void JNICALL SingleStep(jvmtiEnv *jvmti_env, JNIEnv *env,
@@ -249,7 +249,7 @@ void JNICALL SingleStep(jvmtiEnv *jvmti_env, JNIEnv *env,
             RETURN_FAILED;
         }
     }
-    fflush(0);
+    fflush(nullptr);
 }
 
 void JNICALL MethodExit(jvmtiEnv *jvmti_env, JNIEnv *env, jthread thread,
@@ -273,7 +273,7 @@ void JNICALL MethodExit(jvmtiEnv *jvmti_env, JNIEnv *env, jthread thread,
           errCode = STATUS_FAILED;
       }
     }
-    fflush(0);
+    fflush(nullptr);
 }
 
 #ifdef STATIC_BUILD
@@ -409,7 +409,7 @@ Java_nsk_jvmti_unit_ForceEarlyReturn_earlyretstr_check(JNIEnv *env, jclass cls)
             framesCount, framesExpected);
         errCode = STATUS_FAILED;
     }
-    fflush(0);
+    fflush(nullptr);
     return errCode;
 }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretvoid/earlyretvoid.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretvoid/earlyretvoid.cpp
index 4919d27e9e7c7..e66b9fc97acd6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretvoid/earlyretvoid.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretvoid/earlyretvoid.cpp
@@ -33,7 +33,7 @@ extern "C" {
 #define PASSED 0
 #define STATUS_FAILED 2
 
-#define RETURN_FAILED errCode = STATUS_FAILED; fflush(0); return
+#define RETURN_FAILED errCode = STATUS_FAILED; fflush(nullptr); return
 
 static jvmtiEnv *jvmti = nullptr;
 static jvmtiCapabilities caps;
@@ -155,7 +155,7 @@ void check(jvmtiEnv *jvmti_env, jthread thr, jmethodID mid,
         }
         jvmti_env->Deallocate((unsigned char*)table);
     }
-    fflush(0);
+    fflush(nullptr);
 }
 
 void JNICALL Breakpoint(jvmtiEnv *jvmti_env, JNIEnv *env,
@@ -192,7 +192,7 @@ void JNICALL Breakpoint(jvmtiEnv *jvmti_env, JNIEnv *env,
                TranslateError(err), err);
         RETURN_FAILED;
     }
-    fflush(0);
+    fflush(nullptr);
 }
 
 void JNICALL SingleStep(jvmtiEnv *jvmti_env, JNIEnv *env,
@@ -223,7 +223,7 @@ void JNICALL SingleStep(jvmtiEnv *jvmti_env, JNIEnv *env,
             RETURN_FAILED;
         }
     }
-    fflush(0);
+    fflush(nullptr);
 }
 
 #ifdef STATIC_BUILD
@@ -339,7 +339,7 @@ Java_nsk_jvmti_unit_ForceEarlyReturn_earlyretvoid_getReady(
     } else {
         framesExpected = depth;
     }
-    fflush(0);
+    fflush(nullptr);
 }
 
 JNIEXPORT jint JNICALL
@@ -349,7 +349,7 @@ Java_nsk_jvmti_unit_ForceEarlyReturn_earlyretvoid_check(JNIEnv *env, jclass cls)
             framesCount, framesExpected);
         errCode = STATUS_FAILED;
     }
-    fflush(0);
+    fflush(nullptr);
     return errCode;
 }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetAllStackTraces/getallstktr001/getallstktr001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetAllStackTraces/getallstktr001/getallstktr001.cpp
index c1f0443186f20..8916186531d58 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetAllStackTraces/getallstktr001/getallstktr001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetAllStackTraces/getallstktr001/getallstktr001.cpp
@@ -179,7 +179,7 @@ void compare_all_frames(int ti, int frames_count,
         printf("thr #%d: compare frame #%d: fields are the same: "
                " method: 0x%p, location: %#" LL "x\n",
                ti, fi, fr1->method, fr1->location);
-        fflush(0);
+        fflush(nullptr);
     }
 }
 
@@ -225,7 +225,7 @@ void compare_one_stack_trace(int ti,
            " jthread: 0x%p, state: %d, frame_count: %d\n",
            ti, stk1->thread, stk1->state, stk1->frame_count);
 
-    fflush(0);
+    fflush(nullptr);
     compare_all_frames(ti,
                        stk1->frame_count,
                        stk1->frame_buffer,
@@ -291,7 +291,7 @@ Java_nsk_jvmti_unit_GetAllStackTraces_getallstktr001_GetThreadsInfo(
             iGlobalStatus = STATUS_FAILED;
         }
         printf("GetThreadInfo %d: thread: %s\n", ti, thread_info[ti].name);
-        fflush(0);
+        fflush(nullptr);
     }
 }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetConstantPool/getcpool001/getcpool001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetConstantPool/getcpool001/getcpool001.cpp
index 997e6c667e60a..d3905ad65ebcf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetConstantPool/getcpool001/getcpool001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetConstantPool/getcpool001/getcpool001.cpp
@@ -36,7 +36,7 @@ extern "C" {
 static jvmtiCapabilities caps;
 static jvmtiEventCallbacks callbacks;
 
-#define RETURN_FAILED errCode = STATUS_FAILED; fflush(0); return
+#define RETURN_FAILED errCode = STATUS_FAILED; fflush(nullptr); return
 
 static jint      errCode       = PASSED;
 static jvmtiEnv *jvmti         = nullptr;
@@ -63,7 +63,7 @@ Java_nsk_jvmti_unit_GetConstantPool_getcpool001_getCP(
     /* Print Constant Pool attrs*/
     printf("getCP: id = %d, cnt = %03d, bytes_cnt = %04d\n",
             id, cp_cnt, cp_bytes_cnt);
-    fflush(0);
+    fflush(nullptr);
 }
 
 void JNICALL Breakpoint(jvmtiEnv *jvmti_env, JNIEnv *env,
@@ -83,7 +83,7 @@ void JNICALL Breakpoint(jvmtiEnv *jvmti_env, JNIEnv *env,
                TranslateError(err), err);
         RETURN_FAILED;
     }
-    fflush(0);
+    fflush(nullptr);
 }
 
 #ifdef STATIC_BUILD

From 1472124489c841642996ae984e21c533ffec8091 Mon Sep 17 00:00:00 2001
From: Mark Powers <mpowers@openjdk.org>
Date: Tue, 9 Jul 2024 20:38:09 +0000
Subject: [PATCH 031/401] 8333364: Minor cleanup could be done in
 com.sun.crypto.provider

Reviewed-by: mullan, valeriep
---
 .../sun/crypto/provider/AESKeyGenerator.java  |  12 +-
 .../com/sun/crypto/provider/AESKeyWrap.java   |  30 ++---
 .../sun/crypto/provider/AESKeyWrapPadded.java |  34 ++---
 .../sun/crypto/provider/ARCFOURCipher.java    |   8 +-
 .../sun/crypto/provider/ChaCha20Cipher.java   |  35 +++--
 .../provider/ChaCha20Poly1305Parameters.java  |   7 +-
 .../crypto/provider/CipherBlockChaining.java  |   4 +-
 .../com/sun/crypto/provider/CipherCore.java   |  21 ++-
 .../crypto/provider/CipherTextStealing.java   |   5 +-
 .../sun/crypto/provider/ConstructKeys.java    |   6 +-
 .../com/sun/crypto/provider/DESCrypt.java     | 126 +++++++++---------
 .../sun/crypto/provider/DESKeyFactory.java    |   4 +-
 .../sun/crypto/provider/DESedeKeyFactory.java |   4 +-
 .../crypto/provider/DESedeKeyGenerator.java   |   4 +-
 .../sun/crypto/provider/DESedeWrapCipher.java |  15 +--
 .../com/sun/crypto/provider/DHKEM.java        |  20 +--
 .../sun/crypto/provider/DHKeyAgreement.java   |  30 ++---
 .../crypto/provider/DHKeyPairGenerator.java   |   5 +-
 .../crypto/provider/ElectronicCodeBook.java   |   6 +-
 .../sun/crypto/provider/FeedbackCipher.java   |   6 +-
 .../classes/com/sun/crypto/provider/GCTR.java |   5 +-
 .../com/sun/crypto/provider/GHASH.java        |   7 +-
 .../crypto/provider/GaloisCounterMode.java    |  34 ++---
 .../com/sun/crypto/provider/HmacCore.java     |  27 ++--
 .../com/sun/crypto/provider/HmacMD5.java      |   9 +-
 .../crypto/provider/HmacMD5KeyGenerator.java  |   5 +-
 .../com/sun/crypto/provider/HmacSHA1.java     |   9 +-
 .../crypto/provider/HmacSHA1KeyGenerator.java |   5 +-
 .../sun/crypto/provider/ISO10126Padding.java  |   5 +-
 .../com/sun/crypto/provider/JceKeyStore.java  |  14 +-
 .../com/sun/crypto/provider/KWUtil.java       |  10 +-
 .../com/sun/crypto/provider/KeyProtector.java |   6 +-
 .../sun/crypto/provider/KeyWrapCipher.java    |  20 +--
 .../sun/crypto/provider/OAEPParameters.java   |  12 +-
 .../sun/crypto/provider/OutputFeedback.java   |   4 +-
 .../sun/crypto/provider/PBEKeyFactory.java    |   4 +-
 .../com/sun/crypto/provider/PBES1Core.java    |   6 +-
 .../sun/crypto/provider/PBES2Parameters.java  |  20 ++-
 .../sun/crypto/provider/PBKDF2KeyImpl.java    |  21 +--
 .../com/sun/crypto/provider/PBMAC1Core.java   |   4 +-
 .../com/sun/crypto/provider/PKCS5Padding.java |   5 +-
 .../com/sun/crypto/provider/Poly1305.java     |  12 +-
 .../com/sun/crypto/provider/RC2Crypt.java     |   4 +-
 .../com/sun/crypto/provider/RSACipher.java    |   7 +-
 .../com/sun/crypto/provider/SslMacCore.java   |  23 ++--
 .../provider/TlsKeyMaterialGenerator.java     |  12 +-
 .../sun/crypto/provider/TlsPrfGenerator.java  |   8 +-
 47 files changed, 313 insertions(+), 367 deletions(-)

diff --git a/src/java.base/share/classes/com/sun/crypto/provider/AESKeyGenerator.java b/src/java.base/share/classes/com/sun/crypto/provider/AESKeyGenerator.java
index 2672807aaddae..51671fdf25d0a 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/AESKeyGenerator.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/AESKeyGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,19 +25,19 @@
 
 package com.sun.crypto.provider;
 
-import java.security.SecureRandom;
-import java.security.InvalidParameterException;
 import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
+import java.security.InvalidParameterException;
+import java.security.SecureRandom;
 import java.security.spec.AlgorithmParameterSpec;
 import java.util.Arrays;
 import javax.crypto.KeyGeneratorSpi;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
+
 import sun.security.util.SecurityProviderConstants;
 
 /**
- * This class generates a AES key.
+ * This class generates an AES key.
  *
  * @author Valerie Peng
  *
@@ -105,7 +105,7 @@ protected void engineInit(int keysize, SecureRandom random) {
      * @return the new AES key
      */
     protected SecretKey engineGenerateKey() {
-        SecretKeySpec aesKey = null;
+        SecretKeySpec aesKey;
 
         if (this.random == null) {
             this.random = SunJCE.getRandom();
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/AESKeyWrap.java b/src/java.base/share/classes/com/sun/crypto/provider/AESKeyWrap.java
index 9cb338996406e..7fad0b84d0715 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/AESKeyWrap.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/AESKeyWrap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,11 @@
 
 package com.sun.crypto.provider;
 
-import java.util.Arrays;
-import java.security.*;
-import java.security.spec.*;
-import javax.crypto.*;
-import javax.crypto.spec.*;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.MessageDigest;
+import javax.crypto.IllegalBlockSizeException;
+
 import static com.sun.crypto.provider.KWUtil.*;
 
 /**
@@ -66,7 +66,7 @@ String getFeedback() {
     @Override
     void save() {
         throw new UnsupportedOperationException("save not supported");
-    };
+    }
 
     /**
      * Restores the content of this cipher to the previous saved one.
@@ -74,7 +74,7 @@ void save() {
     @Override
     void restore() {
         throw new UnsupportedOperationException("restore not supported");
-    };
+    }
 
     /**
      * Initializes the cipher in the specified mode with the given key
@@ -112,20 +112,20 @@ void init(boolean decrypting, String algorithm, byte[] key, byte[] iv)
     @Override
     void reset() {
         throw new UnsupportedOperationException("reset not supported");
-    };
+    }
 
 
-    // no support for multi-part encryption
+    // no support for multipart encryption
     @Override
     int encrypt(byte[] pt, int ptOfs, int ptLen, byte[] ct, int ctOfs) {
-        throw new UnsupportedOperationException("multi-part not supported");
-    };
+        throw new UnsupportedOperationException("multipart not supported");
+    }
 
-    // no support for multi-part decryption
+    // no support for multipart decryption
     @Override
     int decrypt(byte[] ct, int ctOfs, int ctLen, byte[] pt, int ptOfs) {
-        throw new UnsupportedOperationException("multi-part not supported");
-    };
+        throw new UnsupportedOperationException("multipart not supported");
+    }
 
     /**
      * Performs single-part encryption operation.
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/AESKeyWrapPadded.java b/src/java.base/share/classes/com/sun/crypto/provider/AESKeyWrapPadded.java
index 4ae96acbca853..1e4e7236c8cae 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/AESKeyWrapPadded.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/AESKeyWrapPadded.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,12 @@
 
 package com.sun.crypto.provider;
 
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
 import java.util.Arrays;
 import java.util.HexFormat;
-import java.security.*;
-import java.security.spec.*;
-import javax.crypto.*;
-import javax.crypto.spec.*;
+import javax.crypto.IllegalBlockSizeException;
+
 import static com.sun.crypto.provider.KWUtil.*;
 
 /**
@@ -49,7 +49,7 @@ class AESKeyWrapPadded extends FeedbackCipher {
 
     private static final byte[] PAD_BLK = new byte[SEMI_BLKSIZE - 1];
 
-    // set the first semiblock of dest with iv and inLen
+    // set the first semi-block of dest with iv and inLen
     private static void setIvAndLen(byte[] dest, byte[] iv, int inLen) {
         assert(dest.length >= SEMI_BLKSIZE) : "buffer needs at least 8 bytes";
 
@@ -60,7 +60,7 @@ private static void setIvAndLen(byte[] dest, byte[] iv, int inLen) {
         dest[7] = (byte) (inLen & 0xFF);
     }
 
-    // validate the recovered internal ivAndLen semiblock against iv and
+    // validate the recovered internal ivAndLen semi-block against iv and
     // return the recovered input length
     private static int validateIV(byte[] ivAndLen, byte[] iv)
             throws IllegalBlockSizeException {
@@ -103,7 +103,7 @@ String getFeedback() {
     @Override
     void save() {
         throw new UnsupportedOperationException("save not supported");
-    };
+    }
 
     /**
      * Restores the content of this cipher to the previous saved one.
@@ -111,7 +111,7 @@ void save() {
     @Override
     void restore() {
         throw new UnsupportedOperationException("restore not supported");
-    };
+    }
 
     /**
      * Initializes the cipher in the specified mode with the given key
@@ -151,19 +151,19 @@ void init(boolean decrypting, String algorithm, byte[] key, byte[] iv)
     @Override
     void reset() {
         throw new UnsupportedOperationException("reset not supported");
-    };
+    }
 
-    // no support for multi-part encryption
+    // no support for multipart encryption
     @Override
     int encrypt(byte[] pt, int ptOfs, int ptLen, byte[] ct, int ctOfs) {
-        throw new UnsupportedOperationException("multi-part not supported");
-    };
+        throw new UnsupportedOperationException("multipart not supported");
+    }
 
-    // no support for multi-part decryption
+    // no support for multipart decryption
     @Override
     int decrypt(byte[] ct, int ctOfs, int ctLen, byte[] pt, int ptOfs) {
-        throw new UnsupportedOperationException("multi-part not supported");
-    };
+        throw new UnsupportedOperationException("multipart not supported");
+    }
 
     /**
      * Performs single-part encryption operation.
@@ -199,7 +199,7 @@ int encryptFinal(byte[] pt, int dummy1, int ptLen, byte[] dummy2,
         }
 
         if (ptLen <= BLKSIZE) {
-            // overwrite the first semiblock with iv and input length
+            // overwrite the first semi-block with iv and input length
             setIvAndLen(pt, iv, actualLen);
             embeddedCipher.encryptBlock(pt, 0, pt, 0);
         } else {
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/ARCFOURCipher.java b/src/java.base/share/classes/com/sun/crypto/provider/ARCFOURCipher.java
index 09d5a8cddebfb..d7c0f3dd35dae 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/ARCFOURCipher.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/ARCFOURCipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -114,7 +114,7 @@ private void crypt(byte[] in, int inOfs, int inLen, byte[] out,
     // Modes do not make sense with stream ciphers, but allow ECB
     // see JCE spec.
     protected void engineSetMode(String mode) throws NoSuchAlgorithmException {
-        if (mode.equalsIgnoreCase("ECB") == false) {
+        if (!mode.equalsIgnoreCase("ECB")) {
             throw new NoSuchAlgorithmException("Unsupported mode " + mode);
         }
     }
@@ -123,7 +123,7 @@ protected void engineSetMode(String mode) throws NoSuchAlgorithmException {
     // see JCE spec.
     protected void engineSetPadding(String padding)
             throws NoSuchPaddingException {
-        if (padding.equalsIgnoreCase("NoPadding") == false) {
+        if (!padding.equalsIgnoreCase("NoPadding")) {
             throw new NoSuchPaddingException("Padding must be NoPadding");
         }
     }
@@ -201,7 +201,7 @@ private static byte[] getEncodedKey(Key key) throws InvalidKeyException {
         if (!keyAlg.equals("RC4") && !keyAlg.equals("ARCFOUR")) {
             throw new InvalidKeyException("Not an ARCFOUR key: " + keyAlg);
         }
-        if ("RAW".equals(key.getFormat()) == false) {
+        if (!"RAW".equals(key.getFormat())) {
             throw new InvalidKeyException("Key encoding format must be RAW");
         }
         byte[] encodedKey = key.getEncoded();
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/ChaCha20Cipher.java b/src/java.base/share/classes/com/sun/crypto/provider/ChaCha20Cipher.java
index ed2fda5bf0086..fc39b4ed63480 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/ChaCha20Cipher.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/ChaCha20Cipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -156,7 +156,7 @@ protected ChaCha20Cipher() { }
      */
     @Override
     protected void engineSetMode(String mode) throws NoSuchAlgorithmException {
-        if (mode.equalsIgnoreCase("None") == false) {
+        if (!mode.equalsIgnoreCase("None")) {
             throw new NoSuchAlgorithmException("Mode must be None");
         }
     }
@@ -174,7 +174,7 @@ protected void engineSetMode(String mode) throws NoSuchAlgorithmException {
     @Override
     protected void engineSetPadding(String padding)
             throws NoSuchPaddingException {
-        if (padding.equalsIgnoreCase("NoPadding") == false) {
+        if (!padding.equalsIgnoreCase("NoPadding")) {
             throw new NoSuchPaddingException("Padding must be NoPadding");
         }
     }
@@ -326,7 +326,7 @@ protected void engineInit(int opmode, Key key,
 
         // We will ignore the secure random implementation and use the nonce
         // from the AlgorithmParameterSpec instead.
-        byte[] newNonce = null;
+        byte[] newNonce;
         switch (mode) {
             case MODE_NONE:
                 if (!(params instanceof ChaCha20ParameterSpec)) {
@@ -360,7 +360,7 @@ protected void engineInit(int opmode, Key key,
 
     /**
      * Initialize the engine using the {@code AlgorithmParameter} initialization
-     * format.  This cipher does supports initialization with
+     * format.  This cipher supports initialization with
      * {@code AlgorithmParameter} objects for ChaCha20-Poly1305 but not for
      * ChaCha20 as a simple stream cipher.  In the latter case, it will throw
      * an {@code InvalidAlgorithmParameterException} if the value is non-null.
@@ -618,7 +618,7 @@ private void checkKeyAndNonce(byte[] newKeyBytes, byte[] newNonce)
      *      or if the key encoding format is not {@code RAW}.
      */
     private static byte[] getEncodedKey(Key key) throws InvalidKeyException {
-        if ("RAW".equals(key.getFormat()) == false) {
+        if (!"RAW".equals(key.getFormat())) {
             throw new InvalidKeyException("Key encoding format must be RAW");
         }
         byte[] encodedKey = key.getEncoded();
@@ -675,7 +675,7 @@ protected byte[] engineUpdate(byte[] in, int inOfs, int inLen) {
     @Override
     protected int engineUpdate(byte[] in, int inOfs, int inLen,
             byte[] out, int outOfs) throws ShortBufferException {
-        int bytesUpdated = 0;
+        int bytesUpdated;
         try {
             bytesUpdated = engine.doUpdate(in, inOfs, inLen, out, outOfs);
         } catch (KeyException ke) {
@@ -691,10 +691,10 @@ protected int engineUpdate(byte[] in, int inOfs, int inLen,
      * @param output ByteBuffer that will hold the resulting data.  This
      *      must be large enough to hold the resulting data.
      *
-     * @return the length in bytes of the data written into the {@code out}
+     * @return the length in bytes of the data written into the {@code output}
      *      buffer.
      *
-     * @throws ShortBufferException if the buffer {@code out} does not have
+     * @throws ShortBufferException if the buffer {@code output} does not have
      *      enough space to hold the resulting data.
      */
     @Override
@@ -763,7 +763,7 @@ protected byte[] engineDoFinal(byte[] in, int inOfs, int inLen)
     protected int engineDoFinal(byte[] in, int inOfs, int inLen, byte[] out,
             int outOfs) throws ShortBufferException, AEADBadTagException {
 
-        int bytesUpdated = 0;
+        int bytesUpdated;
         try {
             bytesUpdated = engine.doFinal(in, inOfs, inLen, out, outOfs);
         } catch (KeyException ke) {
@@ -785,6 +785,9 @@ protected int engineDoFinal(byte[] in, int inOfs, int inLen, byte[] out,
      *
      * @return the resulting plaintext or ciphertext bytes.
      *
+     * @throws ShortBufferException if the buffer {@code output} does not have
+     *      enough space to hold the resulting data.
+     *
      * @throws AEADBadTagException if, during decryption, the provided tag
      *      does not match the calculated tag.
      */
@@ -947,12 +950,8 @@ protected int engineGetKeySize(Key key) throws InvalidKeyException {
      * key and nonce into their proper locations.  The counter field is not
      * set here.
      *
-     * @throws IllegalArgumentException if the key or nonce are not in
-     *      their proper lengths (32 bytes for the key, 12 bytes for the
-     *      nonce).
-     * @throws InvalidKeyException if the key does not support an encoded form.
      */
-    private void setInitialState() throws InvalidKeyException {
+    private void setInitialState() {
         // Apply constants to first 4 words
         startState[0] = STATE_CONST_0;
         startState[1] = STATE_CONST_1;
@@ -1257,11 +1256,11 @@ private int authUpdate(byte[] data, int offset, int length) {
      * @param out the array to write the resulting tag into
      * @param outOff the offset to begin writing the data.
      *
-     * @throws ShortBufferException if there is insufficient room to
+     * @throws ProviderException if there is insufficient room to
      *      write the tag.
      */
     private void authFinalizeData(byte[] data, int dataOff, int length,
-            byte[] out, int outOff) throws ShortBufferException {
+            byte[] out, int outOff) {
         // Update with the final chunk of ciphertext, then pad to a
         // multiple of 16.
         if (data != null) {
@@ -1300,7 +1299,7 @@ private void authPad16(long dataLen) {
      * @param dLen the length of the application data.
      * @param buf the buffer to write the two lengths into.
      *
-     * @note it is the caller's responsibility to provide an array large
+     * @implNote it is the caller's responsibility to provide an array large
      *      enough to hold the two longs.
      */
     private void authWriteLengths(long aLen, long dLen, byte[] buf) {
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/ChaCha20Poly1305Parameters.java b/src/java.base/share/classes/com/sun/crypto/provider/ChaCha20Poly1305Parameters.java
index 762827d0152ff..ab9d4a23e6098 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/ChaCha20Poly1305Parameters.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/ChaCha20Poly1305Parameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -206,8 +206,7 @@ protected byte[] engineGetEncoded(String encodingMethod)
     protected String engineToString() {
         String LINE_SEP = System.lineSeparator();
         HexDumpEncoder encoder = new HexDumpEncoder();
-        StringBuilder sb = new StringBuilder(LINE_SEP + "nonce:" +
-                LINE_SEP + "[" + encoder.encodeBuffer(nonce) + "]");
-        return sb.toString();
+        return LINE_SEP + "nonce:" +
+                LINE_SEP + "[" + encoder.encodeBuffer(nonce) + "]";
     }
 }
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/CipherBlockChaining.java b/src/java.base/share/classes/com/sun/crypto/provider/CipherBlockChaining.java
index 5d756e2684746..4bd7faea72257 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/CipherBlockChaining.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/CipherBlockChaining.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -180,7 +180,7 @@ private int implEncrypt(byte[] plain, int plainOffset, int plainLen,
      *
      * <p>It is also the application's responsibility to make sure that
      * <code>init</code> has been called before this method is called.
-     * (This check is omitted here, to avoid double checking.)
+     * (This check is omitted here, to avoid double-checking.)
      *
      * @param cipher the buffer with the input data to be decrypted
      * @param cipherOffset the offset in <code>cipherOffset</code>
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/CipherCore.java b/src/java.base/share/classes/com/sun/crypto/provider/CipherCore.java
index 2555448e3c011..c808756fa1d7a 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/CipherCore.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/CipherCore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,7 +67,7 @@ final class CipherCore {
     /*
      * unit size (number of input bytes that can be processed at a time)
      */
-    private int unitBytes = 0;
+    private int unitBytes;
 
     /*
      * index of the content size left in the buffer
@@ -91,17 +91,17 @@ final class CipherCore {
      * input bytes that are processed at a time is different from the block
      * size)
      */
-    private int diffBlocksize = 0;
+    private int diffBlocksize;
 
     /*
      * padding class
      */
-    private Padding padding = null;
+    private Padding padding;
 
     /*
      * internal cipher engine
      */
-    private FeedbackCipher cipher = null;
+    private FeedbackCipher cipher;
 
     /*
      * the cipher mode
@@ -136,7 +136,7 @@ final class CipherCore {
         /*
          * The buffer should be usable for all cipher mode and padding
          * schemes. Thus, it has to be at least (blockSize+1) for CTS.
-         * In decryption mode, it also hold the possible padding block.
+         * In decryption mode, it also holds the possible padding block.
          */
         buffer = new byte[blockSize*2];
 
@@ -334,7 +334,7 @@ AlgorithmParameters getParameters(String algName) {
         if (cipherMode == ECB_MODE) {
             return null;
         }
-        AlgorithmParameters params = null;
+        AlgorithmParameters params;
         AlgorithmParameterSpec spec;
         byte[] iv = getIV();
         if (iv == null) {
@@ -545,7 +545,7 @@ static byte[] getKeyBytes(Key key) throws InvalidKeyException {
      */
     byte[] update(byte[] input, int inputOffset, int inputLen) {
 
-        byte[] output = null;
+        byte[] output;
         try {
             output = new byte[getOutputSizeByOperation(inputLen, false)];
             int len = update(input, inputOffset, inputLen, output,
@@ -930,8 +930,7 @@ private byte[] prepareInputBuffer(byte[] input, int inputOffset,
 
     private int fillOutputBuffer(byte[] finalBuf, int finalOffset,
         byte[] output, int outOfs, int finalBufLen, byte[] input)
-        throws ShortBufferException, BadPaddingException,
-        IllegalBlockSizeException {
+        throws BadPaddingException, IllegalBlockSizeException {
 
         int len;
         try {
@@ -967,7 +966,7 @@ private int checkOutputCapacity(byte[] output, int outputOffset,
 
     private int finalNoPadding(byte[] in, int inOfs, byte[] out, int outOfs,
                                int len)
-        throws IllegalBlockSizeException, ShortBufferException {
+        throws IllegalBlockSizeException {
 
         if (in == null || len == 0) {
             return 0;
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/CipherTextStealing.java b/src/java.base/share/classes/com/sun/crypto/provider/CipherTextStealing.java
index 630f8707fdeb7..da46f220825a5 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/CipherTextStealing.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/CipherTextStealing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 package com.sun.crypto.provider;
 
 import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.ShortBufferException;
 
 /**
  * This class represents ciphers in cipher text stealing (CTS) mode.
@@ -153,7 +152,7 @@ int encryptFinal(byte[] plain, int plainOffset, int plainLen,
      *
      * <p>It is also the application's responsibility to make sure that
      * <code>init</code> has been called before this method is called.
-     * (This check is omitted here, to avoid double checking.)
+     * (This check is omitted here, to avoid double-checking.)
      *
      * @param cipher the buffer with the input data to be decrypted
      * @param cipherOffset the offset in <code>cipherOffset</code>
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/ConstructKeys.java b/src/java.base/share/classes/com/sun/crypto/provider/ConstructKeys.java
index e8375d1eb8182..2019104941efd 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/ConstructKeys.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/ConstructKeys.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,7 @@ final class ConstructKeys {
     private static final PublicKey constructPublicKey(byte[] encodedKey,
             int ofs, int len, String encodedKeyAlgorithm)
             throws InvalidKeyException, NoSuchAlgorithmException {
-        PublicKey key = null;
+        PublicKey key;
         byte[] keyBytes = (ofs == 0 && encodedKey.length == len)
                 ? encodedKey : Arrays.copyOfRange(encodedKey, ofs, ofs + len);
         X509EncodedKeySpec keySpec = new X509EncodedKeySpec(keyBytes);
@@ -88,7 +88,7 @@ private static final PublicKey constructPublicKey(byte[] encodedKey,
     private static final PrivateKey constructPrivateKey(byte[] encodedKey,
             int ofs, int len, String encodedKeyAlgorithm)
             throws InvalidKeyException, NoSuchAlgorithmException {
-        PrivateKey key = null;
+        PrivateKey key;
         byte[] keyBytes = (ofs == 0 && encodedKey.length == len)
                 ? encodedKey : Arrays.copyOfRange(encodedKey, ofs, ofs + len);
         PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(keyBytes);
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/DESCrypt.java b/src/java.base/share/classes/com/sun/crypto/provider/DESCrypt.java
index acbde75cd8426..29a5ba2540860 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/DESCrypt.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/DESCrypt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,7 @@
  */
 
 class DESCrypt extends SymmetricCipher implements DESConstants {
-    private static final int s0p[] = {
+    private static final int[] s0p = {
         0x00410100, 0x00010000, 0x40400000, 0x40410100, 0x00400000,
         0x40010100, 0x40010000, 0x40400000, 0x40010100, 0x00410100,
         0x00410000, 0x40000100, 0x40400100, 0x00400000, 0x00000000,
@@ -56,7 +56,7 @@ class DESCrypt extends SymmetricCipher implements DESConstants {
         0x40000000, 0x40410000, 0x00000100, 0x40010100,
     };
 
-    private static final int s1p[] = {
+    private static final int[] s1p = {
         0x08021002, 0x00000000, 0x00021000, 0x08020000, 0x08000002,
         0x00001002, 0x08001000, 0x00021000, 0x00001000, 0x08020002,
         0x00000002, 0x08001000, 0x00020002, 0x08021000, 0x08020000,
@@ -72,7 +72,7 @@ class DESCrypt extends SymmetricCipher implements DESConstants {
         0x08001002, 0x00000002, 0x08020000, 0x00021000,
     };
 
-    private static final int s2p[] = {
+    private static final int[] s2p = {
         0x20800000, 0x00808020, 0x00000020, 0x20800020, 0x20008000,
         0x00800000, 0x20800020, 0x00008020, 0x00800020, 0x00008000,
         0x00808000, 0x20000000, 0x20808020, 0x20000020, 0x20000000,
@@ -88,7 +88,7 @@ class DESCrypt extends SymmetricCipher implements DESConstants {
         0x20800000, 0x20008020, 0x00000020, 0x00808000,
     };
 
-    private static final int s3p[] = {
+    private static final int[] s3p = {
         0x00080201, 0x02000200, 0x00000001, 0x02080201, 0x00000000,
         0x02080000, 0x02000201, 0x00080001, 0x02080200, 0x02000001,
         0x02000000, 0x00000201, 0x02000001, 0x00080201, 0x00080000,
@@ -104,7 +104,7 @@ class DESCrypt extends SymmetricCipher implements DESConstants {
         0x00000201, 0x02000000, 0x02000001, 0x02080200,
     };
 
-    private static final int s4p[] = {
+    private static final int[] s4p = {
         0x01000000, 0x00002000, 0x00000080, 0x01002084, 0x01002004,
         0x01000080, 0x00002084, 0x01002000, 0x00002000, 0x00000004,
         0x01000004, 0x00002080, 0x01000084, 0x01002004, 0x01002080,
@@ -120,7 +120,7 @@ class DESCrypt extends SymmetricCipher implements DESConstants {
         0x00000004, 0x00002084, 0x01002000, 0x01000004,
     };
 
-    private static final int s5p[] = {
+    private static final int[] s5p = {
         0x10000008, 0x00040008, 0x00000000, 0x10040400, 0x00040008,
         0x00000400, 0x10000408, 0x00040000, 0x00000408, 0x10040408,
         0x00040400, 0x10000000, 0x10000400, 0x10000008, 0x10040000,
@@ -136,7 +136,7 @@ class DESCrypt extends SymmetricCipher implements DESConstants {
         0x10040000, 0x00000408, 0x00000008, 0x10040008,
     };
 
-    private static final int s6p[] = {
+    private static final int[] s6p = {
         0x00000800, 0x00000040, 0x00200040, 0x80200000, 0x80200840,
         0x80000800, 0x00000840, 0x00000000, 0x00200000, 0x80200040,
         0x80000040, 0x00200800, 0x80000000, 0x00200840, 0x00200800,
@@ -152,7 +152,7 @@ class DESCrypt extends SymmetricCipher implements DESConstants {
         0x80200000, 0x00200840, 0x00200800, 0x80000800,
     };
 
-    private static final int s7p[] = {
+    private static final int[] s7p = {
         0x04100010, 0x04104000, 0x00004010, 0x00000000, 0x04004000,
         0x00100010, 0x04100000, 0x04104010, 0x00000010, 0x04000000,
         0x00104000, 0x00004010, 0x00104010, 0x04004010, 0x04000010,
@@ -168,112 +168,112 @@ class DESCrypt extends SymmetricCipher implements DESConstants {
         0x04000000, 0x04100010, 0x00004000, 0x00104010,
     };
 
-    private static final int permRight0[] = {
+    private static final int[] permRight0 = {
         0x00000000, 0x40000000, 0x00400000, 0x40400000, 0x00004000,
         0x40004000, 0x00404000, 0x40404000, 0x00000040, 0x40000040,
         0x00400040, 0x40400040, 0x00004040, 0x40004040, 0x00404040,
         0x40404040,
     };
 
-    private static final int permLeft1[] = {
+    private static final int[] permLeft1 = {
         0x00000000, 0x40000000, 0x00400000, 0x40400000, 0x00004000,
         0x40004000, 0x00404000, 0x40404000, 0x00000040, 0x40000040,
         0x00400040, 0x40400040, 0x00004040, 0x40004040, 0x00404040,
         0x40404040,
     };
 
-    private static final int permRight2[] = {
+    private static final int[] permRight2 = {
         0x00000000, 0x10000000, 0x00100000, 0x10100000, 0x00001000,
         0x10001000, 0x00101000, 0x10101000, 0x00000010, 0x10000010,
         0x00100010, 0x10100010, 0x00001010, 0x10001010, 0x00101010,
         0x10101010,
     };
 
-    private static final int permLeft3[] = {
+    private static final int[] permLeft3 = {
         0x00000000, 0x10000000, 0x00100000, 0x10100000, 0x00001000,
         0x10001000, 0x00101000, 0x10101000, 0x00000010, 0x10000010,
         0x00100010, 0x10100010, 0x00001010, 0x10001010, 0x00101010,
         0x10101010,
     };
 
-    private static final int permRight4[] = {
+    private static final int[] permRight4 = {
         0x00000000, 0x04000000, 0x00040000, 0x04040000, 0x00000400,
         0x04000400, 0x00040400, 0x04040400, 0x00000004, 0x04000004,
         0x00040004, 0x04040004, 0x00000404, 0x04000404, 0x00040404,
         0x04040404,
     };
 
-    private static final int permLeft5[] = {
+    private static final int[] permLeft5 = {
         0x00000000, 0x04000000, 0x00040000, 0x04040000, 0x00000400,
         0x04000400, 0x00040400, 0x04040400, 0x00000004, 0x04000004,
         0x00040004, 0x04040004, 0x00000404, 0x04000404, 0x00040404,
         0x04040404,
     };
 
-    private static final int permRight6[] = {
+    private static final int[] permRight6 = {
         0x00000000, 0x01000000, 0x00010000, 0x01010000, 0x00000100,
         0x01000100, 0x00010100, 0x01010100, 0x00000001, 0x01000001,
         0x00010001, 0x01010001, 0x00000101, 0x01000101, 0x00010101,
         0x01010101,
     };
 
-    private static final int permLeft7[] = {
+    private static final int[] permLeft7 = {
         0x00000000, 0x01000000, 0x00010000, 0x01010000, 0x00000100,
         0x01000100, 0x00010100, 0x01010100, 0x00000001, 0x01000001,
         0x00010001, 0x01010001, 0x00000101, 0x01000101, 0x00010101,
         0x01010101,
     };
 
-    private static final int permRight8[] = {
+    private static final int[] permRight8 = {
         0x00000000, 0x80000000, 0x00800000, 0x80800000, 0x00008000,
         0x80008000, 0x00808000, 0x80808000, 0x00000080, 0x80000080,
         0x00800080, 0x80800080, 0x00008080, 0x80008080, 0x00808080,
         0x80808080,
     };
 
-    private static final int permLeft9[] = {
+    private static final int[] permLeft9 = {
         0x00000000, 0x80000000, 0x00800000, 0x80800000, 0x00008000,
         0x80008000, 0x00808000, 0x80808000, 0x00000080, 0x80000080,
         0x00800080, 0x80800080, 0x00008080, 0x80008080, 0x00808080,
         0x80808080,
     };
 
-    private static final int permRightA[] = {
+    private static final int[] permRightA = {
         0x00000000, 0x20000000, 0x00200000, 0x20200000, 0x00002000,
         0x20002000, 0x00202000, 0x20202000, 0x00000020, 0x20000020,
         0x00200020, 0x20200020, 0x00002020, 0x20002020, 0x00202020,
         0x20202020,
     };
 
-    private static final int permLeftB[] = {
+    private static final int[] permLeftB = {
         0x00000000, 0x20000000, 0x00200000, 0x20200000, 0x00002000,
         0x20002000, 0x00202000, 0x20202000, 0x00000020, 0x20000020,
         0x00200020, 0x20200020, 0x00002020, 0x20002020, 0x00202020,
         0x20202020,
     };
 
-    private static final int permRightC[] = {
+    private static final int[] permRightC = {
         0x00000000, 0x08000000, 0x00080000, 0x08080000, 0x00000800,
         0x08000800, 0x00080800, 0x08080800, 0x00000008, 0x08000008,
         0x00080008, 0x08080008, 0x00000808, 0x08000808, 0x00080808,
         0x08080808,
     };
 
-    private static final int permLeftD[] = {
+    private static final int[] permLeftD = {
         0x00000000, 0x08000000, 0x00080000, 0x08080000, 0x00000800,
         0x08000800, 0x00080800, 0x08080800, 0x00000008, 0x08000008,
         0x00080008, 0x08080008, 0x00000808, 0x08000808, 0x00080808,
         0x08080808,
     };
 
-    private static final int permRightE[] = {
+    private static final int[] permRightE = {
         0x00000000, 0x02000000, 0x00020000, 0x02020000, 0x00000200,
         0x02000200, 0x00020200, 0x02020200, 0x00000002, 0x02000002,
         0x00020002, 0x02020002, 0x00000202, 0x02000202, 0x00020202,
         0x02020202,
     };
 
-    private static final int permLeftF[] = {
+    private static final int[] permLeftF = {
         0x00000000, 0x02000000, 0x00020000, 0x02020000, 0x00000200,
         0x02000200, 0x00020200, 0x02020200, 0x00000002, 0x02000002,
         0x00020002, 0x02020002, 0x00000202, 0x02000202, 0x00020202,
@@ -283,224 +283,224 @@ class DESCrypt extends SymmetricCipher implements DESConstants {
     /*
      *        Initial Permutation
      */
-    private static final int initPermLeft0[] = {
+    private static final int[] initPermLeft0 = {
        0x00000000, 0x00008000, 0x00000000, 0x00008000, 0x00000080,
        0x00008080, 0x00000080, 0x00008080, 0x00000000, 0x00008000,
        0x00000000, 0x00008000, 0x00000080, 0x00008080, 0x00000080,
        0x00008080,
     };
 
-    private static final int initPermRight0[] = {
+    private static final int[] initPermRight0 = {
        0x00000000, 0x00000000, 0x00008000, 0x00008000, 0x00000000,
        0x00000000, 0x00008000, 0x00008000, 0x00000080, 0x00000080,
        0x00008080, 0x00008080, 0x00000080, 0x00000080, 0x00008080,
        0x00008080,
     };
 
-    private static final int initPermLeft1[] = {
+    private static final int[] initPermLeft1 = {
        0x00000000, 0x80000000, 0x00000000, 0x80000000, 0x00800000,
        0x80800000, 0x00800000, 0x80800000, 0x00000000, 0x80000000,
        0x00000000, 0x80000000, 0x00800000, 0x80800000, 0x00800000,
        0x80800000,
     };
 
-    private static final int initPermRight1[] = {
+    private static final int[] initPermRight1 = {
        0x00000000, 0x00000000, 0x80000000, 0x80000000, 0x00000000,
        0x00000000, 0x80000000, 0x80000000, 0x00800000, 0x00800000,
        0x80800000, 0x80800000, 0x00800000, 0x00800000, 0x80800000,
        0x80800000,
     };
 
-    private static final int initPermLeft2[] = {
+    private static final int[] initPermLeft2 = {
        0x00000000, 0x00004000, 0x00000000, 0x00004000, 0x00000040,
        0x00004040, 0x00000040, 0x00004040, 0x00000000, 0x00004000,
        0x00000000, 0x00004000, 0x00000040, 0x00004040, 0x00000040,
        0x00004040,
     };
 
-    private static final int initPermRight2[] = {
+    private static final int[] initPermRight2 = {
        0x00000000, 0x00000000, 0x00004000, 0x00004000, 0x00000000,
        0x00000000, 0x00004000, 0x00004000, 0x00000040, 0x00000040,
        0x00004040, 0x00004040, 0x00000040, 0x00000040, 0x00004040,
        0x00004040,
     };
 
-    private static final int initPermLeft3[] = {
+    private static final int[] initPermLeft3 = {
        0x00000000, 0x40000000, 0x00000000, 0x40000000, 0x00400000,
        0x40400000, 0x00400000, 0x40400000, 0x00000000, 0x40000000,
        0x00000000, 0x40000000, 0x00400000, 0x40400000, 0x00400000,
        0x40400000,
     };
 
-    private static final int initPermRight3[] = {
+    private static final int[] initPermRight3 = {
        0x00000000, 0x00000000, 0x40000000, 0x40000000, 0x00000000,
        0x00000000, 0x40000000, 0x40000000, 0x00400000, 0x00400000,
        0x40400000, 0x40400000, 0x00400000, 0x00400000, 0x40400000,
        0x40400000,
     };
 
-    private static final int initPermLeft4[] = {
+    private static final int[] initPermLeft4 = {
        0x00000000, 0x00002000, 0x00000000, 0x00002000, 0x00000020,
        0x00002020, 0x00000020, 0x00002020, 0x00000000, 0x00002000,
        0x00000000, 0x00002000, 0x00000020, 0x00002020, 0x00000020,
        0x00002020,
     };
 
-    private static final int initPermRight4[] = {
+    private static final int[] initPermRight4 = {
        0x00000000, 0x00000000, 0x00002000, 0x00002000, 0x00000000,
        0x00000000, 0x00002000, 0x00002000, 0x00000020, 0x00000020,
        0x00002020, 0x00002020, 0x00000020, 0x00000020, 0x00002020,
        0x00002020,
     };
 
-    private static final int initPermLeft5[] = {
+    private static final int[] initPermLeft5 = {
        0x00000000, 0x20000000, 0x00000000, 0x20000000, 0x00200000,
        0x20200000, 0x00200000, 0x20200000, 0x00000000, 0x20000000,
        0x00000000, 0x20000000, 0x00200000, 0x20200000, 0x00200000,
        0x20200000,
     };
 
-    private static final int initPermRight5[] = {
+    private static final int[] initPermRight5 = {
        0x00000000, 0x00000000, 0x20000000, 0x20000000, 0x00000000,
        0x00000000, 0x20000000, 0x20000000, 0x00200000, 0x00200000,
        0x20200000, 0x20200000, 0x00200000, 0x00200000, 0x20200000,
        0x20200000,
     };
 
-    private static final int initPermLeft6[] = {
+    private static final int[] initPermLeft6 = {
        0x00000000, 0x00001000, 0x00000000, 0x00001000, 0x00000010,
        0x00001010, 0x00000010, 0x00001010, 0x00000000, 0x00001000,
        0x00000000, 0x00001000, 0x00000010, 0x00001010, 0x00000010,
        0x00001010,
     };
 
-    private static final int initPermRight6[] = {
+    private static final int[] initPermRight6 = {
        0x00000000, 0x00000000, 0x00001000, 0x00001000, 0x00000000,
        0x00000000, 0x00001000, 0x00001000, 0x00000010, 0x00000010,
        0x00001010, 0x00001010, 0x00000010, 0x00000010, 0x00001010,
        0x00001010,
     };
 
-    private static final int initPermLeft7[] = {
+    private static final int[] initPermLeft7 = {
        0x00000000, 0x10000000, 0x00000000, 0x10000000, 0x00100000,
        0x10100000, 0x00100000, 0x10100000, 0x00000000, 0x10000000,
        0x00000000, 0x10000000, 0x00100000, 0x10100000, 0x00100000,
        0x10100000,
     };
 
-    private static final int initPermRight7[] = {
+    private static final int[] initPermRight7 = {
        0x00000000, 0x00000000, 0x10000000, 0x10000000, 0x00000000,
        0x00000000, 0x10000000, 0x10000000, 0x00100000, 0x00100000,
        0x10100000, 0x10100000, 0x00100000, 0x00100000, 0x10100000,
        0x10100000,
     };
 
-    private static final int initPermLeft8[] = {
+    private static final int[] initPermLeft8 = {
        0x00000000, 0x00000800, 0x00000000, 0x00000800, 0x00000008,
        0x00000808, 0x00000008, 0x00000808, 0x00000000, 0x00000800,
        0x00000000, 0x00000800, 0x00000008, 0x00000808, 0x00000008,
        0x00000808,
     };
 
-    private static final int initPermRight8[] = {
+    private static final int[] initPermRight8 = {
        0x00000000, 0x00000000, 0x00000800, 0x00000800, 0x00000000,
        0x00000000, 0x00000800, 0x00000800, 0x00000008, 0x00000008,
        0x00000808, 0x00000808, 0x00000008, 0x00000008, 0x00000808,
        0x00000808,
     };
 
-    private static final int initPermLeft9[] = {
+    private static final int[] initPermLeft9 = {
        0x00000000, 0x08000000, 0x00000000, 0x08000000, 0x00080000,
        0x08080000, 0x00080000, 0x08080000, 0x00000000, 0x08000000,
        0x00000000, 0x08000000, 0x00080000, 0x08080000, 0x00080000,
        0x08080000,
     };
 
-    private static final int initPermRight9[] = {
+    private static final int[] initPermRight9 = {
        0x00000000, 0x00000000, 0x08000000, 0x08000000, 0x00000000,
        0x00000000, 0x08000000, 0x08000000, 0x00080000, 0x00080000,
        0x08080000, 0x08080000, 0x00080000, 0x00080000, 0x08080000,
        0x08080000,
     };
 
-    private static final int initPermLeftA[] = {
+    private static final int[] initPermLeftA = {
        0x00000000, 0x00000400, 0x00000000, 0x00000400, 0x00000004,
        0x00000404, 0x00000004, 0x00000404, 0x00000000, 0x00000400,
        0x00000000, 0x00000400, 0x00000004, 0x00000404, 0x00000004,
        0x00000404,
     };
 
-    private static final int initPermRightA[] = {
+    private static final int[] initPermRightA = {
        0x00000000, 0x00000000, 0x00000400, 0x00000400, 0x00000000,
        0x00000000, 0x00000400, 0x00000400, 0x00000004, 0x00000004,
        0x00000404, 0x00000404, 0x00000004, 0x00000004, 0x00000404,
        0x00000404,
     };
 
-    private static final int initPermLeftB[] = {
+    private static final int[] initPermLeftB = {
        0x00000000, 0x04000000, 0x00000000, 0x04000000, 0x00040000,
        0x04040000, 0x00040000, 0x04040000, 0x00000000, 0x04000000,
        0x00000000, 0x04000000, 0x00040000, 0x04040000, 0x00040000,
        0x04040000,
     };
 
-    private static final int initPermRightB[] = {
+    private static final int[] initPermRightB = {
        0x00000000, 0x00000000, 0x04000000, 0x04000000, 0x00000000,
        0x00000000, 0x04000000, 0x04000000, 0x00040000, 0x00040000,
        0x04040000, 0x04040000, 0x00040000, 0x00040000, 0x04040000,
        0x04040000,
     };
 
-    private static final int initPermLeftC[] = {
+    private static final int[] initPermLeftC = {
        0x00000000, 0x00000200, 0x00000000, 0x00000200, 0x00000002,
        0x00000202, 0x00000002, 0x00000202, 0x00000000, 0x00000200,
        0x00000000, 0x00000200, 0x00000002, 0x00000202, 0x00000002,
        0x00000202,
     };
 
-    private static final int initPermRightC[] = {
+    private static final int[] initPermRightC = {
        0x00000000, 0x00000000, 0x00000200, 0x00000200, 0x00000000,
        0x00000000, 0x00000200, 0x00000200, 0x00000002, 0x00000002,
        0x00000202, 0x00000202, 0x00000002, 0x00000002, 0x00000202,
        0x00000202,
     };
 
-    private static final int initPermLeftD[] = {
+    private static final int[] initPermLeftD = {
        0x00000000, 0x02000000, 0x00000000, 0x02000000, 0x00020000,
        0x02020000, 0x00020000, 0x02020000, 0x00000000, 0x02000000,
        0x00000000, 0x02000000, 0x00020000, 0x02020000, 0x00020000,
        0x02020000,
     };
 
-    private static final int initPermRightD[] = {
+    private static final int[] initPermRightD = {
        0x00000000, 0x00000000, 0x02000000, 0x02000000, 0x00000000,
        0x00000000, 0x02000000, 0x02000000, 0x00020000, 0x00020000,
        0x02020000, 0x02020000, 0x00020000, 0x00020000, 0x02020000,
        0x02020000,
     };
 
-    private static final int initPermLeftE[] = {
+    private static final int[] initPermLeftE = {
        0x00000000, 0x00000100, 0x00000000, 0x00000100, 0x00000001,
        0x00000101, 0x00000001, 0x00000101, 0x00000000, 0x00000100,
        0x00000000, 0x00000100, 0x00000001, 0x00000101, 0x00000001,
        0x00000101,
     };
 
-    private static final int initPermRightE[] = {
+    private static final int[] initPermRightE = {
        0x00000000, 0x00000000, 0x00000100, 0x00000100, 0x00000000,
        0x00000000, 0x00000100, 0x00000100, 0x00000001, 0x00000001,
        0x00000101, 0x00000101, 0x00000001, 0x00000001, 0x00000101,
        0x00000101,
     };
 
-    private static final int initPermLeftF[] = {
+    private static final int[] initPermLeftF = {
        0x00000000, 0x01000000, 0x00000000, 0x01000000, 0x00010000,
        0x01010000, 0x00010000, 0x01010000, 0x00000000, 0x01000000,
        0x00000000, 0x01000000, 0x00010000, 0x01010000, 0x00010000,
        0x01010000,
     };
 
-    private static final int initPermRightF[] = {
+    private static final int[] initPermRightF = {
        0x00000000, 0x00000000, 0x01000000, 0x01000000, 0x00000000,
        0x00000000, 0x01000000, 0x01000000, 0x00010000, 0x00010000,
        0x01010000, 0x01010000, 0x00010000, 0x00010000, 0x01010000,
@@ -586,7 +586,7 @@ void decryptBlock(byte[] cipher, int cipherOffset,
 
 
     void cipherBlock(byte[] in, int inOffset, byte[] out, int outOffset) {
-        byte key[];
+        byte[] key;
         int temp;
         int i, j;
         int offset;
@@ -638,7 +638,7 @@ void cipherBlock(byte[] in, int inOffset, byte[] out, int outOffset) {
     }
 
     private static void perm(int left, int right,
-                             byte out[], int offset) {
+                             byte[] out, int offset) {
         int low, high, temp;
 
         temp = left;
@@ -687,7 +687,7 @@ private static void perm(int left, int right,
 
     }
 
-    private static int initialPermutationLeft(byte block[], int offset) {
+    private static int initialPermutationLeft(byte[] block, int offset) {
         int l;
 
         l  = initPermLeft1[block[offset] & 0xf];
@@ -709,7 +709,7 @@ private static int initialPermutationLeft(byte block[], int offset) {
         return l;
     }
 
-    private static int initialPermutationRight(byte block[], int offset) {
+    private static int initialPermutationRight(byte[] block, int offset) {
         int l;
 
         l  = initPermRight1[block[offset] & 0xf];
@@ -731,9 +731,9 @@ private static int initialPermutationRight(byte block[], int offset) {
         return l;
     }
 
-    void expandKey(byte key[]) {
+    void expandKey(byte[] key) {
         int octet;
-        byte ek[] = new byte[128];
+        byte[] ek = new byte[128];
 
         octet = key[0];
         if ((octet & 0x80) != 0) {
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/DESKeyFactory.java b/src/java.base/share/classes/com/sun/crypto/provider/DESKeyFactory.java
index fa06797abc293..fd3320b070d54 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/DESKeyFactory.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/DESKeyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -104,7 +104,7 @@ protected KeySpec engineGetKeySpec(SecretKey key, Class<?> keySpec)
 
         try {
 
-            if ((key instanceof SecretKey)
+            if ((key != null)
                 && (key.getAlgorithm().equalsIgnoreCase("DES"))
                 && (key.getFormat().equalsIgnoreCase("RAW"))) {
 
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/DESedeKeyFactory.java b/src/java.base/share/classes/com/sun/crypto/provider/DESedeKeyFactory.java
index fd20415bb2d4a..b769aab417b22 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/DESedeKeyFactory.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/DESedeKeyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -103,7 +103,7 @@ protected KeySpec engineGetKeySpec(SecretKey key, Class<?> keySpec)
         throws InvalidKeySpecException {
 
         try {
-            if ((key instanceof SecretKey)
+            if ((key != null)
                 && (key.getAlgorithm().equalsIgnoreCase("DESede"))
                 && (key.getFormat().equalsIgnoreCase("RAW"))) {
 
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/DESedeKeyGenerator.java b/src/java.base/share/classes/com/sun/crypto/provider/DESedeKeyGenerator.java
index 28684b0f9e7af..325c0588777d1 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/DESedeKeyGenerator.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/DESedeKeyGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -130,7 +130,7 @@ protected SecretKey engineGenerateKey() {
             java.util.Arrays.fill(tmpkey, (byte)0x00);
         }
 
-        DESedeKey desEdeKey = null;
+        DESedeKey desEdeKey;
         try {
             desEdeKey = new DESedeKey(rawkey);
         } catch (InvalidKeyException ike) {
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java b/src/java.base/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java
index 92d25b57a7e50..f9281ae929536 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -137,13 +137,13 @@ protected int engineGetBlockSize() {
      */
     protected int engineGetOutputSize(int inputLen) {
         // can only return an upper-limit if not initialized yet.
-        int result = 0;
+        int result;
         if (decrypting) {
             result = inputLen - 16; // CHECKSUM_LEN + IV_LEN;
         } else {
             result = Math.addExact(inputLen, 16);
         }
-        return (result < 0? 0:result);
+        return (Math.max(result, 0));
     }
 
     /**
@@ -210,7 +210,7 @@ protected void engineInit(int opmode, Key key,
                               AlgorithmParameterSpec params,
                               SecureRandom random)
         throws InvalidKeyException, InvalidAlgorithmParameterException {
-        byte[] currIv = null;
+        byte[] currIv;
         if (opmode == Cipher.WRAP_MODE) {
             decrypting = false;
             if (params == null) {
@@ -380,7 +380,7 @@ protected int engineDoFinal(byte[] input, int inputOffset, int inputLen,
     /**
      * Returns the parameters used with this cipher.
      * Note that null maybe returned if this cipher does not use any
-     * parameters or when it has not be set, e.g. initialized with
+     * parameters or when it has not been set, e.g. initialized with
      * UNWRAP_MODE but wrapped key data has not been given.
      *
      * @return the parameters used with this cipher; can be null.
@@ -556,9 +556,8 @@ protected Key engineUnwrap(byte[] wrappedKey,
                     buffer2, 0);
             int keyValLen = buffer2.length - CHECKSUM_LEN;
             byte[] cks = getChecksum(buffer2, 0, keyValLen);
-            int offset = keyValLen;
             for (int i = 0; i < CHECKSUM_LEN; i++) {
-                if (buffer2[offset + i] != cks[i]) {
+                if (buffer2[keyValLen + i] != cks[i]) {
                     throw new InvalidKeyException("Checksum comparison failed");
                 }
             }
@@ -588,7 +587,7 @@ private static final byte[] getChecksum(byte[] in) {
         return getChecksum(in, 0, in.length);
     }
     private static final byte[] getChecksum(byte[] in, int offset, int len) {
-        MessageDigest md = null;
+        MessageDigest md;
         try {
             md = MessageDigest.getInstance("SHA1");
         } catch (NoSuchAlgorithmException nsae) {
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/DHKEM.java b/src/java.base/share/classes/com/sun/crypto/provider/DHKEM.java
index bd1c3f7c38053..3fa6b14762ac2 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/DHKEM.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/DHKEM.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,21 +24,23 @@
  */
 package com.sun.crypto.provider;
 
-import sun.security.jca.JCAUtil;
-import sun.security.ssl.HKDF;
-import sun.security.util.*;
-
-import javax.crypto.*;
-import javax.crypto.spec.SecretKeySpec;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.math.BigInteger;
-import java.nio.charset.StandardCharsets;
 import java.security.*;
-import java.security.interfaces.*;
+import java.security.interfaces.ECKey;
+import java.security.interfaces.ECPublicKey;
+import java.security.interfaces.XECKey;
+import java.security.interfaces.XECPublicKey;
 import java.security.spec.*;
 import java.util.Arrays;
 import java.util.Objects;
+import javax.crypto.*;
+import javax.crypto.spec.SecretKeySpec;
+
+import sun.security.jca.JCAUtil;
+import sun.security.ssl.HKDF;
+import sun.security.util.*;
 
 // Implementing DHKEM defined inside https://www.rfc-editor.org/rfc/rfc9180.html,
 // without the AuthEncap and AuthDecap functions
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/DHKeyAgreement.java b/src/java.base/share/classes/com/sun/crypto/provider/DHKeyAgreement.java
index 01f978fff615f..5eebf98acc3d8 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/DHKeyAgreement.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/DHKeyAgreement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,23 +25,15 @@
 
 package com.sun.crypto.provider;
 
-import java.util.*;
-import java.lang.*;
 import java.math.BigInteger;
-import java.security.AccessController;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.security.PrivilegedAction;
-import java.security.ProviderException;
+import java.security.*;
 import java.security.spec.AlgorithmParameterSpec;
-import java.security.spec.InvalidKeySpecException;
+import java.util.Arrays;
 import javax.crypto.KeyAgreementSpi;
-import javax.crypto.ShortBufferException;
 import javax.crypto.SecretKey;
-import javax.crypto.spec.*;
+import javax.crypto.ShortBufferException;
+import javax.crypto.spec.DHParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
 
 import sun.security.util.KeyUtil;
 
@@ -180,7 +172,7 @@ protected void engineInit(Key key, AlgorithmParameterSpec params,
      * @param key the key for this phase. For example, in the case of
      * Diffie-Hellman between 2 parties, this would be the other party's
      * Diffie-Hellman public key.
-     * @param lastPhase flag which indicates whether or not this is the last
+     * @param lastPhase flag which indicates if this is the last
      * phase of this key agreement.
      *
      * @return the (intermediate) key resulting from this phase, or null if
@@ -227,7 +219,7 @@ protected Key engineDoPhase(Key key, boolean lastPhase)
         // intermediate secret, in which case we wrap it into a
         // Diffie-Hellman public key object and return it.
         generateSecret = true;
-        if (lastPhase == false) {
+        if (!lastPhase) {
             byte[] intermediate = engineGenerateSecret();
             return new DHPublicKey(new BigInteger(1, intermediate),
                                    init_p, init_g);
@@ -293,7 +285,7 @@ protected byte[] engineGenerateSecret()
     protected int engineGenerateSecret(byte[] sharedSecret, int offset)
         throws IllegalStateException, ShortBufferException
     {
-        if (generateSecret == false) {
+        if (!generateSecret) {
             throw new IllegalStateException
                 ("Key agreement has not been completed yet");
         }
@@ -413,9 +405,7 @@ protected SecretKey engineGenerateSecret(String algorithm)
             int keysize = secret.length;
             if (keysize >= BlowfishConstants.BLOWFISH_MAX_KEYSIZE)
                 keysize = BlowfishConstants.BLOWFISH_MAX_KEYSIZE;
-            SecretKeySpec skey = new SecretKeySpec(secret, 0, keysize,
-                                                   "Blowfish");
-            return skey;
+            return new SecretKeySpec(secret, 0, keysize, "Blowfish");
         } else if (algorithm.equalsIgnoreCase("AES")) {
             // AES
             int keysize = secret.length;
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java b/src/java.base/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java
index 4cc979cb29a89..89d4fcfc402cb 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,11 +28,10 @@
 import java.math.BigInteger;
 import java.security.*;
 import java.security.spec.AlgorithmParameterSpec;
-import java.security.spec.InvalidParameterSpecException;
 import javax.crypto.spec.DHParameterSpec;
-import javax.crypto.spec.DHGenParameterSpec;
 
 import sun.security.provider.ParameterCache;
+
 import static sun.security.util.SecurityProviderConstants.DEF_DH_KEY_SIZE;
 import static sun.security.util.SecurityProviderConstants.getDefDHPrivateExpSize;
 
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/ElectronicCodeBook.java b/src/java.base/share/classes/com/sun/crypto/provider/ElectronicCodeBook.java
index c2085816453d5..ba8a564be11f8 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/ElectronicCodeBook.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/ElectronicCodeBook.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,9 +27,9 @@
 
 import java.security.InvalidKeyException;
 import java.security.ProviderException;
-import sun.security.util.ArrayUtil;
-import java.util.Objects;
+
 import jdk.internal.vm.annotation.IntrinsicCandidate;
+import sun.security.util.ArrayUtil;
 
 /**
  * This class represents ciphers in electronic codebook (ECB) mode.
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/FeedbackCipher.java b/src/java.base/share/classes/com/sun/crypto/provider/FeedbackCipher.java
index 6c0e10eb6d0a4..985c1b81f4393 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/FeedbackCipher.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/FeedbackCipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -157,7 +157,7 @@ abstract int encrypt(byte[] plain, int plainOffset, int plainLen,
      */
      int encryptFinal(byte[] plain, int plainOffset, int plainLen,
                       byte[] cipher, int cipherOffset)
-         throws IllegalBlockSizeException, ShortBufferException {
+         throws IllegalBlockSizeException {
          return encrypt(plain, plainOffset, plainLen, cipher, cipherOffset);
     }
     /**
@@ -199,7 +199,7 @@ abstract int decrypt(byte[] cipher, int cipherOffset, int cipherLen,
      */
      int decryptFinal(byte[] cipher, int cipherOffset, int cipherLen,
                       byte[] plain, int plainOffset)
-         throws IllegalBlockSizeException, ShortBufferException {
+         throws IllegalBlockSizeException {
          return decrypt(cipher, cipherOffset, cipherLen, plain, plainOffset);
      }
 }
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/GCTR.java b/src/java.base/share/classes/com/sun/crypto/provider/GCTR.java
index 7aaec3d6c1ae1..926a56c140b66 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/GCTR.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/GCTR.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -79,8 +79,7 @@ private long blocksUntilRollover() {
         ByteBuffer buf = ByteBuffer.wrap(counter, counter.length - 4, 4);
         buf.order(ByteOrder.BIG_ENDIAN);
         long ctr32 = 0xFFFFFFFFL & buf.getInt();
-        long blocksLeft = (1L << 32) - ctr32;
-        return blocksLeft;
+        return (1L << 32) - ctr32;
     }
 
     private void checkBlock() {
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/GHASH.java b/src/java.base/share/classes/com/sun/crypto/provider/GHASH.java
index b7aaf6059d535..6b8c2e9c1a965 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/GHASH.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/GHASH.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -190,9 +190,8 @@ int update(ByteBuffer ct, int inLen) {
 
         // If ct is a direct bytebuffer, send it directly to the intrinsic
         if (ct.isDirect()) {
-            int processed = inLen;
             processBlocksDirect(ct, inLen);
-            return processed;
+            return inLen;
         } else if (!ct.isReadOnly()) {
             // If a non-read only heap bytebuffer, use the array update method
             int processed = update(ct.array(),
@@ -273,7 +272,7 @@ private static void ghashRangeCheck(byte[] in, int inOfs, int inLen,
     /*
      * This is an intrinsified method.  The method's argument list must match
      * the hotspot signature.  This method and methods called by it, cannot
-     * throw exceptions or allocate arrays as it will breaking intrinsics
+     * throw exceptions or allocate arrays as it will break intrinsics.
      */
     @IntrinsicCandidate
     private static void processBlocks(byte[] data, int inOfs, int blocks,
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/GaloisCounterMode.java b/src/java.base/share/classes/com/sun/crypto/provider/GaloisCounterMode.java
index 8cfd7d13f12b2..44cfb76d1628e 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/GaloisCounterMode.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/GaloisCounterMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,38 +25,24 @@
 
 package com.sun.crypto.provider;
 
-import jdk.internal.access.JavaNioAccess;
-import jdk.internal.access.SharedSecrets;
-import jdk.internal.misc.Unsafe;
-import sun.nio.ch.DirectBuffer;
-import sun.security.jca.JCAUtil;
-import sun.security.util.ArrayUtil;
-
-import javax.crypto.AEADBadTagException;
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.CipherSpi;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.ShortBufferException;
-import javax.crypto.spec.GCMParameterSpec;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.security.AlgorithmParameters;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.ProviderException;
-import java.security.SecureRandom;
+import java.security.*;
 import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.InvalidParameterSpecException;
 import java.util.Arrays;
+import javax.crypto.*;
+import javax.crypto.spec.GCMParameterSpec;
 
+import jdk.internal.access.JavaNioAccess;
+import jdk.internal.access.SharedSecrets;
+import jdk.internal.misc.Unsafe;
 import jdk.internal.vm.annotation.IntrinsicCandidate;
+import sun.nio.ch.DirectBuffer;
+import sun.security.jca.JCAUtil;
+import sun.security.util.ArrayUtil;
 
 /**
  * This class represents ciphers in GaloisCounter (GCM) mode.
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/HmacCore.java b/src/java.base/share/classes/com/sun/crypto/provider/HmacCore.java
index fecc30a5a085d..c6707fb994113 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/HmacCore.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/HmacCore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,16 +25,12 @@
 
 package com.sun.crypto.provider;
 
-import java.util.Arrays;
-
 import java.nio.ByteBuffer;
-
+import java.security.*;
+import java.security.spec.AlgorithmParameterSpec;
+import java.util.Arrays;
 import javax.crypto.MacSpi;
 import javax.crypto.SecretKey;
-import java.security.*;
-import java.security.spec.*;
-
-import sun.security.x509.AlgorithmId;
 
 /**
  * This class constitutes the core of HMAC-<MD> algorithms, where
@@ -87,8 +83,7 @@ abstract class HmacCore extends MacSpi implements Cloneable {
                                 break;
                             }
                         }
-                    } catch (NoSuchAlgorithmException nsae) {
-                        continue;
+                    } catch (NoSuchAlgorithmException ignored) {
                     }
                 }
                 if (md == null) {
@@ -169,7 +164,7 @@ protected void engineInit(Key key, AlgorithmParameterSpec params)
      * @param input the input byte to be processed.
      */
     protected void engineUpdate(byte input) {
-        if (first == true) {
+        if (first) {
             // compute digest for 1st pass; start with inner pad
             md.update(k_ipad);
             first = false;
@@ -187,8 +182,8 @@ protected void engineUpdate(byte input) {
      * @param offset the offset in <code>input</code> where the input starts.
      * @param len the number of bytes to process.
      */
-    protected void engineUpdate(byte input[], int offset, int len) {
-        if (first == true) {
+    protected void engineUpdate(byte[] input, int offset, int len) {
+        if (first) {
             // compute digest for 1st pass; start with inner pad
             md.update(k_ipad);
             first = false;
@@ -205,7 +200,7 @@ protected void engineUpdate(byte input[], int offset, int len) {
      * @param input the input byte buffer.
      */
     protected void engineUpdate(ByteBuffer input) {
-        if (first == true) {
+        if (first) {
             // compute digest for 1st pass; start with inner pad
             md.update(k_ipad);
             first = false;
@@ -221,7 +216,7 @@ protected void engineUpdate(ByteBuffer input) {
      * @return the HMAC result.
      */
     protected byte[] engineDoFinal() {
-        if (first == true) {
+        if (first) {
             // compute digest for 1st pass; start with inner pad
             md.update(k_ipad);
         } else {
@@ -250,7 +245,7 @@ protected byte[] engineDoFinal() {
      * HMAC was initialized with.
      */
     protected void engineReset() {
-        if (first == false) {
+        if (!first) {
             md.reset();
             first = true;
         }
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/HmacMD5.java b/src/java.base/share/classes/com/sun/crypto/provider/HmacMD5.java
index ccf85561db9ec..3e85ad51bb3bd 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/HmacMD5.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/HmacMD5.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,7 @@
 
 package com.sun.crypto.provider;
 
-import java.nio.ByteBuffer;
-
-import javax.crypto.MacSpi;
-import javax.crypto.SecretKey;
-import java.security.*;
-import java.security.spec.*;
+import java.security.NoSuchAlgorithmException;
 
 /**
  * This is an implementation of the HMAC-MD5 algorithm.
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/HmacMD5KeyGenerator.java b/src/java.base/share/classes/com/sun/crypto/provider/HmacMD5KeyGenerator.java
index ba29e3c74793e..2634128dd286a 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/HmacMD5KeyGenerator.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/HmacMD5KeyGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,8 @@
 
 package com.sun.crypto.provider;
 
-import java.security.SecureRandom;
-import java.security.InvalidParameterException;
 import java.security.InvalidAlgorithmParameterException;
+import java.security.SecureRandom;
 import java.security.spec.AlgorithmParameterSpec;
 import java.util.Arrays;
 import javax.crypto.KeyGeneratorSpi;
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/HmacSHA1.java b/src/java.base/share/classes/com/sun/crypto/provider/HmacSHA1.java
index b79dc9d96584c..0a17cad0ea397 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/HmacSHA1.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/HmacSHA1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,12 +25,7 @@
 
 package com.sun.crypto.provider;
 
-import java.nio.ByteBuffer;
-
-import javax.crypto.MacSpi;
-import javax.crypto.SecretKey;
-import java.security.*;
-import java.security.spec.*;
+import java.security.NoSuchAlgorithmException;
 
 /**
  * This is an implementation of the HMAC-SHA1 algorithm.
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/HmacSHA1KeyGenerator.java b/src/java.base/share/classes/com/sun/crypto/provider/HmacSHA1KeyGenerator.java
index 9d92d60ae3656..1997777750348 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/HmacSHA1KeyGenerator.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/HmacSHA1KeyGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,8 @@
 
 package com.sun.crypto.provider;
 
-import java.security.SecureRandom;
-import java.security.InvalidParameterException;
 import java.security.InvalidAlgorithmParameterException;
+import java.security.SecureRandom;
 import java.security.spec.AlgorithmParameterSpec;
 import java.util.Arrays;
 import javax.crypto.KeyGeneratorSpi;
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/ISO10126Padding.java b/src/java.base/share/classes/com/sun/crypto/provider/ISO10126Padding.java
index a86f313e2c9e1..43f153422849b 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/ISO10126Padding.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/ISO10126Padding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -119,7 +119,6 @@ public int unpad(byte[] in, int off, int len) {
      * @return the length of the padding
      */
     public int padLength(int len) {
-        int paddingOctet = blockSize - (len % blockSize);
-        return paddingOctet;
+        return blockSize - (len % blockSize);
     }
 }
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java b/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java
index fcc450387af9c..ab8f2d7097b04 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -75,7 +75,7 @@ private static final class PrivateKeyEntry {
         Date date; // the creation date of this entry
         byte[] protectedKey;
         Certificate[] chain;
-    };
+    }
 
     // Secret key
     private static final class SecretKeyEntry {
@@ -93,7 +93,7 @@ private static final class SecretKeyEntry {
     private static final class TrustedCertEntry {
         Date date; // the creation date of this entry
         Certificate cert;
-    };
+    }
 
     /**
      * Private keys and certificates are stored in a hashtable.
@@ -119,7 +119,7 @@ private static final class TrustedCertEntry {
     public Key engineGetKey(String alias, char[] password)
         throws NoSuchAlgorithmException, UnrecoverableKeyException
     {
-        Key key = null;
+        Key key;
 
         Object entry = entries.get(alias.toLowerCase(Locale.ENGLISH));
 
@@ -652,7 +652,7 @@ public void engineStore(OutputStream stream, char[] password)
                  * the keystore (such as deleting or modifying key or
                  * certificate entries).
                  */
-                byte digest[] = md.digest();
+                byte[] digest = md.digest();
 
                 dos.write(digest);
                 dos.flush();
@@ -691,8 +691,8 @@ public void engineLoad(InputStream stream, char[] password)
             MessageDigest md = null;
             CertificateFactory cf = null;
             Hashtable<String, CertificateFactory> cfs = null;
-            ByteArrayInputStream bais = null;
-            byte[] encoded = null;
+            ByteArrayInputStream bais;
+            byte[] encoded;
             int trustedKeyCount = 0, privateKeyCount = 0, secretKeyCount = 0;
 
             if (stream == null)
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/KWUtil.java b/src/java.base/share/classes/com/sun/crypto/provider/KWUtil.java
index 7892ca198a8e6..e5dc892032694 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/KWUtil.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/KWUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,10 +26,6 @@
 package com.sun.crypto.provider;
 
 import java.util.Arrays;
-import java.security.*;
-import java.security.spec.*;
-import javax.crypto.*;
-import javax.crypto.spec.*;
 
 /**
  * This class acts as the base class for AES KeyWrap algorithms as defined
@@ -58,7 +54,7 @@ static final int W(byte[] icvIn, byte[] in, int inLen,
                 ("Invalid data length for W: " + inLen);
         assert(icvIn.length == SEMI_BLKSIZE) : "Invalid ICV buffer size";
 
-        // overwrite the first block of in with the icv semiblock
+        // overwrite the first block of in with the icv semi-block
         System.arraycopy(icvIn, 0, in, 0, SEMI_BLKSIZE);
 
         int n = inLen / SEMI_BLKSIZE - 1;
@@ -93,7 +89,7 @@ static final int W(byte[] icvIn, byte[] in, int inLen,
      *   data until the initial value and padding bytes are verified.
      * @param in input bytes, i.e. the to-be-processed data
      * @param inLen length of the to-be-processed bytes
-     * @param ivOut buffer for holding the recovered ICV semiblock
+     * @param ivOut buffer for holding the recovered ICV semi-block
      * @param cipher the initialized cipher object used
      * @return the recovered data length, i.e. {@code (inLen - icvOut.length)}
      */
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/KeyProtector.java b/src/java.base/share/classes/com/sun/crypto/provider/KeyProtector.java
index eadc032b36ac6..f2d3efd685c06 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/KeyProtector.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/KeyProtector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -98,7 +98,7 @@ final class KeyProtector {
                         iterationCount > MAX_ITERATION_COUNT) {
                     iterationCount = DEFAULT_ITERATION_COUNT;
                 }
-            } catch (NumberFormatException e) {}
+            } catch (NumberFormatException ignored) {}
         }
         ITERATION_COUNT = iterationCount;
     }
@@ -369,7 +369,7 @@ Key unseal(SealedObject so, int maxLength)
             sKey = new PBEKey(pbeKeySpec, "PBEWithMD5AndTripleDES");
             pbeKeySpec.clearPassword();
 
-            SealedObjectForKeyProtector soForKeyProtector = null;
+            SealedObjectForKeyProtector soForKeyProtector;
             if (!(so instanceof SealedObjectForKeyProtector)) {
                 soForKeyProtector = new SealedObjectForKeyProtector(so);
             } else {
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/KeyWrapCipher.java b/src/java.base/share/classes/com/sun/crypto/provider/KeyWrapCipher.java
index dfd2ec2b04bb5..fb69a27c62d51 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/KeyWrapCipher.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/KeyWrapCipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -285,7 +285,7 @@ protected int engineGetOutputSize(int inLen) {
                     padLen = SEMI_BLKSIZE - n;
                 }
             }
-            // then add the first semiblock and padLen to result
+            // then add the first semi-block and padLen to result
             result = Math.addExact(result, SEMI_BLKSIZE + padLen);
         } else {
             result = inLen - SEMI_BLKSIZE;
@@ -339,7 +339,7 @@ private void implInit(int opmode, Key key, byte[] iv, SecureRandom random)
     protected void engineInit(int opmode, Key key, SecureRandom random)
         throws InvalidKeyException {
         try {
-            implInit(opmode, key, (byte[])null, random);
+            implInit(opmode, key, null, random);
         } catch (InvalidAlgorithmParameterException iae) {
             // should never happen
             throw new AssertionError(iae);
@@ -394,9 +394,9 @@ protected void engineInit(int opmode, Key key, AlgorithmParameters params,
         byte[] iv = null;
         if (params != null) {
             try {
-                AlgorithmParameterSpec spec =
+                IvParameterSpec spec =
                         params.getParameterSpec(IvParameterSpec.class);
-                iv = ((IvParameterSpec)spec).getIV();
+                iv = spec.getIV();
             } catch (InvalidParameterSpecException ispe) {
                 throw new InvalidAlgorithmParameterException(
                     "Only IvParameterSpec is accepted");
@@ -462,7 +462,7 @@ private void implUpdate(byte[] in, int inOfs, int inLen) {
         if (inLen <= 0) return;
 
         if (opmode == Cipher.ENCRYPT_MODE && dataIdx == 0) {
-            // the first semiblock is for iv, store data after it
+            // the first semi-block is for iv, store data after it
             dataIdx = SEMI_BLKSIZE;
         }
         store(in, inOfs, inLen);
@@ -595,8 +595,8 @@ private int implDoFinal(byte[] in, int inOfs, int inLen, byte[] out)
     }
 
     // helper routine for in-place encryption.
-    // 'inBuf' = semiblock | plain text | extra bytes if padding is used
-    // 'inLen' = semiblock length + plain text length
+    // 'inBuf' = semi-block | plain text | extra bytes if padding is used
+    // 'inLen' = semi-block length + plain text length
     private int helperEncrypt(byte[] inBuf, int inLen)
             throws IllegalBlockSizeException, ShortBufferException {
 
@@ -646,7 +646,7 @@ private int helperDecrypt(byte[] inBuf, int inLen)
      */
     @Override
     protected AlgorithmParameters engineGetParameters() {
-        AlgorithmParameters params = null;
+        AlgorithmParameters params;
 
         byte[] iv = cipher.getIV();
         if (iv == null) {
@@ -711,7 +711,7 @@ protected byte[] engineWrap(Key key)
         // output size is known, allocate output buffer
         byte[] out = new byte[engineGetOutputSize(encoded.length)];
 
-        // reserve the first semiblock and do not write data
+        // reserve the first semi-block and do not write data
         int len = SEMI_BLKSIZE;
         System.arraycopy(encoded, 0, out, len, encoded.length);
         len += encoded.length;
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/OAEPParameters.java b/src/java.base/share/classes/com/sun/crypto/provider/OAEPParameters.java
index 9d72472889357..3b826aa38f283 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/OAEPParameters.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/OAEPParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -225,11 +225,9 @@ protected byte[] engineGetEncoded(String encodingMethod)
     }
 
     protected String engineToString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("MD: " + mdName + "\n");
-        sb.append("MGF: MGF1" + mgfSpec.getDigestAlgorithm() + "\n");
-        sb.append("PSource: PSpecified " +
-            (p.length==0? "":Debug.toHexString(new BigInteger(p))) + "\n");
-        return sb.toString();
+        return "MD: " + mdName + "\n" +
+                "MGF: MGF1" + mgfSpec.getDigestAlgorithm() + "\n" +
+                "PSource: PSpecified " +
+                (p.length == 0 ? "" : Debug.toHexString(new BigInteger(p))) + "\n";
     }
 }
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/OutputFeedback.java b/src/java.base/share/classes/com/sun/crypto/provider/OutputFeedback.java
index aa56144f09052..414659fcf3d40 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/OutputFeedback.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/OutputFeedback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@ final class OutputFeedback extends FeedbackCipher {
     private final byte[] register;
 
     /*
-     * number of bytes for each stream unit, defaults to the blocksize
+     * number of bytes for each stream unit, defaults to the block size
      * of the embedded cipher
      */
     private final int numBytes;
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/PBEKeyFactory.java b/src/java.base/share/classes/com/sun/crypto/provider/PBEKeyFactory.java
index 02451e536c677..da73d0bc7ce95 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/PBEKeyFactory.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/PBEKeyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -261,7 +261,7 @@ protected SecretKey engineGenerateSecret(KeySpec keySpec)
      */
     protected KeySpec engineGetKeySpec(SecretKey key, Class<?> keySpecCl)
         throws InvalidKeySpecException {
-        if ((key instanceof SecretKey)
+        if ((key != null)
             && (validTypes.contains(key.getAlgorithm().toUpperCase(Locale.ENGLISH)))
             && (key.getFormat().equalsIgnoreCase("RAW"))) {
 
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/PBES1Core.java b/src/java.base/share/classes/com/sun/crypto/provider/PBES1Core.java
index 68b1771d7d967..e10b0b1a7cfb5 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/PBES1Core.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/PBES1Core.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -161,7 +161,7 @@ byte[] getIV() {
      * does not use any parameters.
      */
     AlgorithmParameters getParameters() {
-        AlgorithmParameters params = null;
+        AlgorithmParameters params;
         if (salt == null) {
             salt = new byte[8];
             SunJCE.getRandom().nextBytes(salt);
@@ -303,7 +303,7 @@ private byte[] deriveCipherKey(byte[] passwdBytes) {
             // Concatenate the output from each digest round with the
             // password, and use the result as the input to the next digest
             // operation.
-            byte[] toBeHashed = null;
+            byte[] toBeHashed;
             result = new byte[DESedeKeySpec.DES_EDE_KEY_LEN +
                               DESConstants.DES_BLOCK_SIZE];
             for (i = 0; i < 2; i++) {
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/PBES2Parameters.java b/src/java.base/share/classes/com/sun/crypto/provider/PBES2Parameters.java
index fb3dfa00148e0..d6b7d00d360df 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/PBES2Parameters.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/PBES2Parameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -131,8 +131,8 @@ abstract class PBES2Parameters extends AlgorithmParametersSpi {
 
     PBES2Parameters(String pbes2AlgorithmName) throws NoSuchAlgorithmException {
         int and;
-        String kdfAlgo = null;
-        String cipherAlgo = null;
+        String kdfAlgo;
+        String cipherAlgo;
 
         // Extract the KDF and encryption algorithm names
         this.pbes2AlgorithmName = pbes2AlgorithmName;
@@ -210,9 +210,6 @@ protected void engineInit(AlgorithmParameterSpec paramSpec)
     protected void engineInit(byte[] encoded)
         throws IOException
     {
-        String kdfAlgo = null;
-        String cipherAlgo = null;
-
         DerValue pBES2_params = new DerValue(encoded);
         if (pBES2_params.tag != DerValue.tag_Sequence) {
             throw new IOException("PBE parameter parsing error: "
@@ -231,16 +228,15 @@ protected void engineInit(byte[] encoded)
             kdf = pBES2_params.data.getDerValue();
         }
 
-        kdfAlgo = parseKDF(kdf);
+        String kdfAlgo = parseKDF(kdf);
 
         if (pBES2_params.tag != DerValue.tag_Sequence) {
             throw new IOException("PBE parameter parsing error: "
                 + "not an ASN.1 SEQUENCE tag");
         }
-        cipherAlgo = parseES(pBES2_params.data.getDerValue());
+        String cipherAlgo = parseES(pBES2_params.data.getDerValue());
 
-        this.pbes2AlgorithmName = new StringBuilder().append("PBEWith")
-            .append(kdfAlgo).append("And").append(cipherAlgo).toString();
+        this.pbes2AlgorithmName = "PBEWith" + kdfAlgo + "And" + cipherAlgo;
     }
 
     @SuppressWarnings("deprecation")
@@ -305,7 +301,7 @@ private String parseKDF(DerValue keyDerivationFunc) throws IOException {
 
     @SuppressWarnings("deprecation")
     private String parseES(DerValue encryptionScheme) throws IOException {
-        String cipherAlgo = null;
+        String cipherAlgo;
 
         cipherAlgo_OID = encryptionScheme.data.getOID();
         if (aes128CBC_OID.equals(cipherAlgo_OID)) {
@@ -399,7 +395,7 @@ protected byte[] engineGetEncoded(String encodingMethod)
     /*
      * Returns a formatted string describing the parameters.
      *
-     * The algorithn name pattern is: "PBEWith<prf>And<encryption>"
+     * The algorithm name pattern is: "PBEWith<prf>And<encryption>"
      * where <prf> is one of: HmacSHA1, HmacSHA224, HmacSHA256, HmacSHA384,
      * HmacSHA512, HmacSHA512/224, or HmacSHA512/256 and <encryption> is
      * AES with a keysize suffix.
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java b/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java
index a02ce2d15511a..c8b9c392a4b49 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,26 +25,29 @@
 
 package com.sun.crypto.provider;
 
-import java.io.*;
-import java.lang.ref.Reference;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.ObjectStreamException;
 import java.lang.ref.Cleaner;
+import java.lang.ref.Reference;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
-import java.util.Arrays;
-import java.util.Locale;
-import java.security.MessageDigest;
-import java.security.KeyRep;
 import java.security.GeneralSecurityException;
+import java.security.KeyRep;
+import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.spec.InvalidKeySpecException;
+import java.util.Arrays;
+import java.util.Locale;
 import javax.crypto.Mac;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.PBEKeySpec;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
-
 import jdk.internal.ref.CleanerFactory;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 /**
  * This class represents a PBE key derived using PBKDF2 defined
  * in PKCS#5 v2.0. meaning that
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/PBMAC1Core.java b/src/java.base/share/classes/com/sun/crypto/provider/PBMAC1Core.java
index 56059a89264a7..146999e35ce7d 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/PBMAC1Core.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/PBMAC1Core.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,7 @@ abstract class PBMAC1Core extends HmacCore {
     }
 
     private static PBKDF2Core getKDFImpl(String algo) {
-        PBKDF2Core kdf = null;
+        PBKDF2Core kdf;
         switch(algo) {
         case "HmacSHA1":
                 kdf = new PBKDF2Core.HmacSHA1();
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/PKCS5Padding.java b/src/java.base/share/classes/com/sun/crypto/provider/PKCS5Padding.java
index af072c6f5d708..a8ba711d658c3 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/PKCS5Padding.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/PKCS5Padding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -120,7 +120,6 @@ public int unpad(byte[] in, int off, int len) {
      * @return the length of the padding
      */
     public int padLength(int len) {
-        int paddingOctet = blockSize - (len % blockSize);
-        return paddingOctet;
+        return blockSize - (len % blockSize);
     }
 }
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/Poly1305.java b/src/java.base/share/classes/com/sun/crypto/provider/Poly1305.java
index 1752bb8ddddfd..1473cf4aba147 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/Poly1305.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/Poly1305.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,16 +26,18 @@
 package com.sun.crypto.provider;
 
 import java.nio.ByteBuffer;
-import java.security.Key;
 import java.security.InvalidKeyException;
+import java.security.Key;
 import java.security.spec.AlgorithmParameterSpec;
 import java.util.Arrays;
 import java.util.Objects;
 
-import sun.security.util.math.*;
-import sun.security.util.math.intpoly.*;
-import jdk.internal.vm.annotation.IntrinsicCandidate;
 import jdk.internal.vm.annotation.ForceInline;
+import jdk.internal.vm.annotation.IntrinsicCandidate;
+import sun.security.util.math.IntegerFieldModuloP;
+import sun.security.util.math.IntegerModuloP;
+import sun.security.util.math.MutableIntegerModuloP;
+import sun.security.util.math.intpoly.IntegerPolynomial1305;
 
 /**
  * This class represents the Poly1305 function defined in RFC 7539.
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/RC2Crypt.java b/src/java.base/share/classes/com/sun/crypto/provider/RC2Crypt.java
index aa3100c1b7d10..78f25f33b2df8 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/RC2Crypt.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/RC2Crypt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -108,7 +108,7 @@ void initEffectiveKeyBits(int effectiveKeyBits) {
 
     static void checkKey(String algorithm, int keyLength)
             throws InvalidKeyException {
-        if (algorithm.equals("RC2") == false) {
+        if (!algorithm.equals("RC2")) {
             throw new InvalidKeyException("Key algorithm must be RC2");
         }
         if ((keyLength < 5) || (keyLength > 128)) {
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java b/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java
index df76f78bfb5e0..b48917e755713 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
 import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.InvalidParameterSpecException;
 import java.security.spec.MGF1ParameterSpec;
+import java.util.Objects;
 
 import javax.crypto.*;
 import javax.crypto.spec.PSource;
@@ -126,7 +127,7 @@ public RSACipher() {
     // modes do not make sense for RSA, but allow ECB
     // see JCE spec
     protected void engineSetMode(String mode) throws NoSuchAlgorithmException {
-        if (mode.equalsIgnoreCase("ECB") == false) {
+        if (!mode.equalsIgnoreCase("ECB")) {
             throw new NoSuchAlgorithmException("Unsupported mode " + mode);
         }
     }
@@ -468,7 +469,7 @@ protected Key engineUnwrap(byte[] wrappedKey, String algorithm,
 
         boolean isTlsRsaPremasterSecret =
                 algorithm.equals("TlsRsaPremasterSecret");
-        byte[] encoded = null;
+        byte[] encoded;
 
         update(wrappedKey, 0, wrappedKey.length);
         try {
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/SslMacCore.java b/src/java.base/share/classes/com/sun/crypto/provider/SslMacCore.java
index 057c139b5945c..0d25c0064c4f1 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/SslMacCore.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/SslMacCore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,11 +26,10 @@
 package com.sun.crypto.provider;
 
 import java.nio.ByteBuffer;
-
-import javax.crypto.MacSpi;
-import javax.crypto.SecretKey;
 import java.security.*;
 import java.security.spec.AlgorithmParameterSpec;
+import javax.crypto.MacSpi;
+import javax.crypto.SecretKey;
 
 import static com.sun.crypto.provider.TlsPrfGenerator.genPad;
 
@@ -109,7 +108,7 @@ void init(Key key, AlgorithmParameterSpec params)
      * @param input the input byte to be processed.
      */
     void update(byte input) {
-        if (first == true) {
+        if (first) {
             // compute digest for 1st pass; start with inner pad
             md.update(secret);
             md.update(pad1);
@@ -128,8 +127,8 @@ void update(byte input) {
      * @param offset the offset in <code>input</code> where the input starts.
      * @param len the number of bytes to process.
      */
-    void update(byte input[], int offset, int len) {
-        if (first == true) {
+    void update(byte[] input, int offset, int len) {
+        if (first) {
             // compute digest for 1st pass; start with inner pad
             md.update(secret);
             md.update(pad1);
@@ -141,7 +140,7 @@ void update(byte input[], int offset, int len) {
     }
 
     void update(ByteBuffer input) {
-        if (first == true) {
+        if (first) {
             // compute digest for 1st pass; start with inner pad
             md.update(secret);
             md.update(pad1);
@@ -158,7 +157,7 @@ void update(ByteBuffer input) {
      * @return the Mac result.
      */
     byte[] doFinal() {
-        if (first == true) {
+        if (first) {
             // compute digest for 1st pass; start with inner pad
             md.update(secret);
             md.update(pad1);
@@ -189,7 +188,7 @@ byte[] doFinal() {
      * Mac was initialized with.
      */
     void reset() {
-        if (first == false) {
+        if (!first) {
             md.reset();
             first = true;
         }
@@ -211,7 +210,7 @@ protected void engineInit(Key key, AlgorithmParameterSpec params)
         protected void engineUpdate(byte input) {
             core.update(input);
         }
-        protected void engineUpdate(byte input[], int offset, int len) {
+        protected void engineUpdate(byte[] input, int offset, int len) {
             core.update(input, offset, len);
         }
         protected void engineUpdate(ByteBuffer input) {
@@ -244,7 +243,7 @@ protected void engineInit(Key key, AlgorithmParameterSpec params)
         protected void engineUpdate(byte input) {
             core.update(input);
         }
-        protected void engineUpdate(byte input[], int offset, int len) {
+        protected void engineUpdate(byte[] input, int offset, int len) {
             core.update(input, offset, len);
         }
         protected void engineUpdate(ByteBuffer input) {
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java b/src/java.base/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java
index 56e4dd976632a..2440b45a2ae60 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,11 +62,11 @@ protected void engineInit(SecureRandom random) {
     @SuppressWarnings("deprecation")
     protected void engineInit(AlgorithmParameterSpec params,
             SecureRandom random) throws InvalidAlgorithmParameterException {
-        if (params instanceof TlsKeyMaterialParameterSpec == false) {
+        if (!(params instanceof TlsKeyMaterialParameterSpec)) {
             throw new InvalidAlgorithmParameterException(MSG);
         }
         this.spec = (TlsKeyMaterialParameterSpec)params;
-        if ("RAW".equals(spec.getMasterSecret().getFormat()) == false) {
+        if (!"RAW".equals(spec.getMasterSecret().getFormat())) {
             throw new InvalidAlgorithmParameterException(
                 "Key format must be RAW");
         }
@@ -105,8 +105,6 @@ private SecretKey engineGenerateKey0(byte[] masterSecret) throws GeneralSecurity
 
         SecretKey clientMacKey = null;
         SecretKey serverMacKey = null;
-        SecretKey clientCipherKey = null;
-        SecretKey serverCipherKey = null;
         IvParameterSpec clientIv = null;
         IvParameterSpec serverIv = null;
 
@@ -194,8 +192,10 @@ private SecretKey engineGenerateKey0(byte[] masterSecret) throws GeneralSecurity
         System.arraycopy(keyBlock, ofs, serverKeyBytes, 0, keyLength);
         ofs += keyLength;
 
+        SecretKey clientCipherKey;
+        SecretKey serverCipherKey;
         try {
-            if (isExportable == false) {
+            if (!isExportable) {
                 // cipher keys
                 clientCipherKey = new SecretKeySpec(clientKeyBytes, alg);
                 serverCipherKey = new SecretKeySpec(serverKeyBytes, alg);
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java b/src/java.base/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java
index 1102f4b94ee1a..f8f733b6d2f74 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -132,12 +132,12 @@ protected void engineInit(SecureRandom random) {
     @SuppressWarnings("deprecation")
     protected void engineInit(AlgorithmParameterSpec params,
             SecureRandom random) throws InvalidAlgorithmParameterException {
-        if (params instanceof TlsPrfParameterSpec == false) {
+        if (!(params instanceof TlsPrfParameterSpec)) {
             throw new InvalidAlgorithmParameterException(MSG);
         }
         this.spec = (TlsPrfParameterSpec)params;
         SecretKey key = spec.getSecret();
-        if ((key != null) && ("RAW".equals(key.getFormat()) == false)) {
+        if ((key != null) && (!"RAW".equals(key.getFormat()))) {
             throw new InvalidAlgorithmParameterException(
                 "Key encoding format must be RAW");
         }
@@ -378,7 +378,7 @@ private static void expand(MessageDigest digest, int hmacSize,
      * TLS 1.2 uses a different hash algorithm than 1.0/1.1 for the PRF
      * calculations.  As of 2010, there is no PKCS11-level support for TLS
      * 1.2 PRF calculations, and no known OS's have an internal variant
-     * we could use.  Therefore for TLS 1.2, we are updating JSSE to request
+     * we could use.  Therefore, for TLS 1.2, we are updating JSSE to request
      * a different provider algorithm:  "SunTls12Prf".  If we reused the
      * name "SunTlsPrf", the PKCS11 provider would need be updated to
      * fail correctly when presented with the wrong version number

From dcf4e0d51f392afe2711223484e932e3826e8864 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Wed, 10 Jul 2024 03:30:19 +0000
Subject: [PATCH 032/401] 8335966: Remove incorrect problem listing of
 java/lang/instrument/NativeMethodPrefixAgent.java in ProblemList-Virtual.txt

Reviewed-by: kevinw, amenkov
---
 test/jdk/ProblemList-Virtual.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/jdk/ProblemList-Virtual.txt b/test/jdk/ProblemList-Virtual.txt
index c45353e65edb7..d7692b578cd04 100644
--- a/test/jdk/ProblemList-Virtual.txt
+++ b/test/jdk/ProblemList-Virtual.txt
@@ -36,8 +36,6 @@ javax/management/remote/mandatory/loading/MissingClassTest.java 8145413 windows-
 
 javax/management/remote/mandatory/loading/RMIDownloadTest.java 8308366 windows-x64
 
-java/lang/instrument/NativeMethodPrefixAgent.java 8307169 generic-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

From b5909cabeef22954f4d9c642b1cbf288b3454562 Mon Sep 17 00:00:00 2001
From: Koichi Sakata <ksakata@openjdk.org>
Date: Wed, 10 Jul 2024 05:57:11 +0000
Subject: [PATCH 033/401] 8323242: Remove vestigial DONT_USE_REGISTER_DEFINES

Reviewed-by: gli, kvn
---
 src/hotspot/cpu/zero/register_zero.hpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/hotspot/cpu/zero/register_zero.hpp b/src/hotspot/cpu/zero/register_zero.hpp
index 1b6f52879ef16..fd30f2067623c 100644
--- a/src/hotspot/cpu/zero/register_zero.hpp
+++ b/src/hotspot/cpu/zero/register_zero.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -114,8 +114,6 @@ class ConcreteRegisterImpl : public AbstractRegisterImpl {
 };
 
 CONSTANT_REGISTER_DECLARATION(Register, noreg, (-1));
-#ifndef DONT_USE_REGISTER_DEFINES
 #define noreg ((Register)(noreg_RegisterEnumValue))
-#endif
 
 #endif // CPU_ZERO_REGISTER_ZERO_HPP

From a44b60c8c14ad998e51239f48e64779304aaac50 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Wed, 10 Jul 2024 07:53:52 +0000
Subject: [PATCH 034/401] 8335778:
 runtime/ClassInitErrors/TestStackOverflowDuringInit.java fails on ppc64
 platforms after JDK-8334545

Reviewed-by: dholmes, asteiner
---
 .../runtime/ClassInitErrors/TestStackOverflowDuringInit.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/runtime/ClassInitErrors/TestStackOverflowDuringInit.java b/test/hotspot/jtreg/runtime/ClassInitErrors/TestStackOverflowDuringInit.java
index 3917abe85ad57..180dc539795fa 100644
--- a/test/hotspot/jtreg/runtime/ClassInitErrors/TestStackOverflowDuringInit.java
+++ b/test/hotspot/jtreg/runtime/ClassInitErrors/TestStackOverflowDuringInit.java
@@ -31,7 +31,7 @@
  * @requires vm.flagless
  * @comment Run with the smallest stack possible to limit the execution time.
  *          This is the smallest stack that is supported by all platforms.
- * @run main/othervm -Xss240K -Xint TestStackOverflowDuringInit
+ * @run main/othervm -Xss384K -Xint TestStackOverflowDuringInit
  */
 
 import java.io.ByteArrayOutputStream;

From 537d20afbff255489a7b1bdb0410b9d1aba715b7 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Wed, 10 Jul 2024 09:55:56 +0000
Subject: [PATCH 035/401] 8335766: Switch case with pattern matching and guard
 clause compiles inconsistently

Reviewed-by: abimpoudis
---
 .../com/sun/tools/javac/parser/JavacParser.java        | 10 +++++++++-
 .../tools/javac/patterns/DisambiguatePatterns.java     |  6 +++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
index ef2d71831dc59..f570ad54c58e8 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
@@ -3436,7 +3436,15 @@ PatternResult analyzePattern(int lookahead) {
                                 : PatternResult.PATTERN;
                     }
                     parenDepth++; break;
-                case RPAREN: parenDepth--; break;
+                case RPAREN:
+                    parenDepth--;
+                    if (parenDepth == 0 &&
+                        typeDepth == 0 &&
+                        peekToken(lookahead, TokenKind.IDENTIFIER) &&
+                        S.token(lookahead + 1).name() == names.when) {
+                        return PatternResult.PATTERN;
+                    }
+                    break;
                 case ARROW: return parenDepth > 0 ? PatternResult.EXPRESSION
                                                    : pendingResult;
                 case FINAL:
diff --git a/test/langtools/tools/javac/patterns/DisambiguatePatterns.java b/test/langtools/tools/javac/patterns/DisambiguatePatterns.java
index ef4d065f91295..d6180c1810f90 100644
--- a/test/langtools/tools/javac/patterns/DisambiguatePatterns.java
+++ b/test/langtools/tools/javac/patterns/DisambiguatePatterns.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -109,6 +109,10 @@ public static void main(String... args) throws Throwable {
                                  ExpressionType.EXPRESSION);
         test.disambiguationTest("a & b",
                                  ExpressionType.EXPRESSION);
+        test.disambiguationTest("R r when (x > 0)",
+                                 ExpressionType.PATTERN);
+        test.disambiguationTest("R(int x) when (x > 0)",
+                                 ExpressionType.PATTERN);
     }
 
     private final ParserFactory factory;

From e0fb949460d0c7e2ab1697a6466e7d4831a20a33 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Wed, 10 Jul 2024 14:28:20 +0000
Subject: [PATCH 036/401] 8335779: JFR: Hide sleep events

Reviewed-by: mgronlun
---
 .../share/jfr/support/jfrIntrinsics.hpp       |  2 +-
 src/hotspot/share/runtime/objectMonitor.cpp   |  2 +-
 .../share/classes/jdk/jfr/internal/JVM.java   |  1 +
 .../classes/jdk/jfr/internal/JVMSupport.java  |  4 +-
 .../jdk/jfr/internal/MetadataRepository.java  |  4 +-
 .../jfr/internal/consumer/OngoingStream.java  | 16 ++--
 .../jfr/internal/consumer/RecordingInput.java |  7 +-
 .../internal/consumer/RepositoryFiles.java    | 19 ++--
 .../internal/{ => management}/HiddenWait.java | 12 ++-
 .../internal/management/StreamBarrier.java    | 48 ++++++----
 .../classes/jdk/jfr/internal/util/Utils.java  | 23 +----
 .../jdk/management/jfr/DownLoadThread.java    | 14 +--
 .../classes/jdk/management/jfr/FileDump.java  | 52 ++++++-----
 test/jdk/jdk/jfr/jvm/TestHiddenWait.java      | 88 +++++++++++++++++++
 14 files changed, 192 insertions(+), 100 deletions(-)
 rename src/jdk.jfr/share/classes/jdk/jfr/internal/{ => management}/HiddenWait.java (82%)
 create mode 100644 test/jdk/jdk/jfr/jvm/TestHiddenWait.java

diff --git a/src/hotspot/share/jfr/support/jfrIntrinsics.hpp b/src/hotspot/share/jfr/support/jfrIntrinsics.hpp
index 6520f3cb00ca0..77affc69926f0 100644
--- a/src/hotspot/share/jfr/support/jfrIntrinsics.hpp
+++ b/src/hotspot/share/jfr/support/jfrIntrinsics.hpp
@@ -47,7 +47,7 @@ class JfrIntrinsicSupport : AllStatic {
 #define JFR_HAVE_INTRINSICS
 
 #define JFR_TEMPLATES(template)                                                                                      \
-  template(jdk_jfr_internal_HiddenWait,                               "jdk/jfr/internal/HiddenWait")                 \
+  template(jdk_jfr_internal_management_HiddenWait,                    "jdk/jfr/internal/management/HiddenWait")      \
   template(jdk_jfr_internal_JVM,                                      "jdk/jfr/internal/JVM")                        \
   template(jdk_jfr_internal_event_EventWriterFactory,                 "jdk/jfr/internal/event/EventWriterFactory")   \
   template(jdk_jfr_internal_event_EventConfiguration_signature,       "Ljdk/jfr/internal/event/EventConfiguration;") \
diff --git a/src/hotspot/share/runtime/objectMonitor.cpp b/src/hotspot/share/runtime/objectMonitor.cpp
index ba463231592c5..c509ed691cdb8 100644
--- a/src/hotspot/share/runtime/objectMonitor.cpp
+++ b/src/hotspot/share/runtime/objectMonitor.cpp
@@ -1442,7 +1442,7 @@ bool ObjectMonitor::check_owner(TRAPS) {
 static inline bool is_excluded(const Klass* monitor_klass) {
   assert(monitor_klass != nullptr, "invariant");
   NOT_JFR_RETURN_(false);
-  JFR_ONLY(return vmSymbols::jdk_jfr_internal_HiddenWait() == monitor_klass->name();)
+  JFR_ONLY(return vmSymbols::jdk_jfr_internal_management_HiddenWait() == monitor_klass->name();)
 }
 
 static void post_monitor_wait_event(EventJavaMonitorWait* event,
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java
index 2e600c8c02974..cc0ee05a948a5 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java
@@ -31,6 +31,7 @@
 import jdk.jfr.Event;
 import jdk.jfr.internal.event.EventConfiguration;
 import jdk.jfr.internal.event.EventWriter;
+import jdk.jfr.internal.management.HiddenWait;
 
 /**
  * Interface against the JVM.
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/JVMSupport.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/JVMSupport.java
index 114052ecea250..7fde28a3d21fc 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/JVMSupport.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/JVMSupport.java
@@ -30,6 +30,7 @@
 
 import jdk.jfr.Recording;
 import jdk.jfr.internal.event.EventConfiguration;
+import jdk.jfr.internal.management.HiddenWait;
 import jdk.jfr.internal.util.Utils;
 import jdk.jfr.internal.util.ValueFormatter;
 
@@ -118,7 +119,8 @@ private static void awaitUniqueTimestamp() {
                 lastTimestamp = time;
                 return;
             }
-            Utils.takeNap(1);
+            HiddenWait hiddenWait = new HiddenWait();
+            hiddenWait.takeNap(1);
         }
     }
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
index 4a7bc734d7571..49afd0082d8a9 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
@@ -47,6 +47,7 @@
 import jdk.jfr.ValueDescriptor;
 import jdk.jfr.internal.consumer.RepositoryFiles;
 import jdk.jfr.internal.event.EventConfiguration;
+import jdk.jfr.internal.management.HiddenWait;
 import jdk.jfr.internal.periodic.PeriodicEvents;
 import jdk.jfr.internal.util.Utils;
 
@@ -57,6 +58,7 @@ public final class MetadataRepository {
     private final Map<String, EventType> nativeEventTypes = LinkedHashMap.newHashMap(150);
     private final Map<String, EventControl> nativeControls = LinkedHashMap.newHashMap(150);
     private final SettingsManager settingsManager = new SettingsManager();
+    private final HiddenWait threadSleeper = new HiddenWait();
     private Constructor<EventConfiguration> cachedEventConfigurationConstructor;
     private boolean staleMetadata = true;
     private boolean unregistered;
@@ -341,7 +343,7 @@ private void awaitEpochMilliShift() {
                 lastMillis = millis;
                 return;
             }
-            Utils.takeNap(1);
+            threadSleeper.takeNap(1);
         }
     }
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/OngoingStream.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/OngoingStream.java
index 1816d00f345a7..e0dd7fa2ad8d5 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/OngoingStream.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/OngoingStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
 import jdk.jfr.internal.SecuritySupport;
 import jdk.jfr.internal.SecuritySupport.SafePath;
 import jdk.jfr.internal.management.EventByteStream;
+import jdk.jfr.internal.management.HiddenWait;
 import jdk.jfr.internal.management.ManagementSupport;
 
 public final class OngoingStream extends EventByteStream {
@@ -44,6 +45,7 @@ public final class OngoingStream extends EventByteStream {
 
     private final RepositoryFiles repositoryFiles;
     private final Recording recording;
+    private final HiddenWait threadSleeper = new HiddenWait();
     private final int blockSize;
     private final long endTimeNanos;
     private final byte[] headerBytes = new byte[HEADER_SIZE];
@@ -195,19 +197,13 @@ private byte[] readWithHeader(int size) throws IOException {
                     return bytes;
                 }
             }
-            takeNap();
+            if (!threadSleeper.takeNap(10)) {
+                throw new IOException("Read operation interrupted");
+            }
         }
         return EMPTY_ARRAY;
     }
 
-    private void takeNap() throws IOException {
-        try {
-            Thread.sleep(10);
-        } catch (InterruptedException ie) {
-            throw new IOException("Read operation interrupted", ie);
-        }
-    }
-
     private boolean ensureInput() throws IOException {
         if (input == null) {
             if (SecuritySupport.getFileSize(new SafePath(path)) < HEADER_SIZE) {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/RecordingInput.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/RecordingInput.java
index 90a03130f4990..69ec73f57fd6f 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/RecordingInput.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/RecordingInput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,8 @@
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.nio.file.Path;
+
+import jdk.jfr.internal.management.HiddenWait;
 import jdk.jfr.internal.util.Utils;
 
 public final class RecordingInput implements DataInput, AutoCloseable {
@@ -67,6 +69,7 @@ public void reset() {
     }
     private final int blockSize;
     private final FileAccess fileAccess;
+    private final HiddenWait threadSleeper = new HiddenWait();
     private long pollCount = 1000;
     private RandomAccessFile file;
     private String filename;
@@ -453,6 +456,6 @@ public void pollWait() throws IOException {
         if (pollCount < 0) {
             throw new IOException("Recording file is stuck in locked stream state.");
         }
-        Utils.takeNap(1);
+        threadSleeper.takeNap(1);
     }
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/RepositoryFiles.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/RepositoryFiles.java
index 6ef88ecad3750..3f0611f998173 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/RepositoryFiles.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/RepositoryFiles.java
@@ -46,9 +46,10 @@
 import jdk.jfr.internal.Logger;
 import jdk.jfr.internal.Repository;
 import jdk.jfr.internal.SecuritySupport.SafePath;
+import jdk.jfr.internal.management.HiddenWait;;
 
 public final class RepositoryFiles {
-    private static final Object WAIT_OBJECT = new Object();
+    private static final HiddenWait WAIT_OBJECT = new HiddenWait();
     private static final String DIRECTORY_PATTERN = "DDDD_DD_DD_DD_DD_DD_";
     public static void notifyNewFile() {
         synchronized (WAIT_OBJECT) {
@@ -59,7 +60,7 @@ public static void notifyNewFile() {
     private final FileAccess fileAccess;
     private final NavigableMap<Long, Path> pathSet = new TreeMap<>();
     private final Map<Path, Long> pathLookup = new HashMap<>();
-    private final Object waitObject;
+    private final HiddenWait waitObject;
     private boolean allowSubDirectory;
     private volatile boolean closed;
     private Path repository;
@@ -67,7 +68,7 @@ public static void notifyNewFile() {
     public RepositoryFiles(FileAccess fileAccess, Path repository, boolean allowSubDirectory) {
         this.repository = repository;
         this.fileAccess = fileAccess;
-        this.waitObject = repository == null ? WAIT_OBJECT : new Object();
+        this.waitObject = repository == null ? WAIT_OBJECT : new HiddenWait();
         this.allowSubDirectory = allowSubDirectory;
     }
 
@@ -108,7 +109,7 @@ private boolean updatePaths(boolean wait) {
                 // was accessed. Just ignore, and retry later.
             }
             if (wait) {
-                nap();
+                waitObject.takeNap(1000);
             } else {
                 return pathLookup.size() > beforeSize;
             }
@@ -157,16 +158,6 @@ private Path path(long timestamp, boolean wait) {
         }
     }
 
-    private void nap() {
-        try {
-            synchronized (waitObject) {
-                waitObject.wait(1000);
-            }
-        } catch (InterruptedException e) {
-            // ignore
-        }
-    }
-
     private boolean updatePaths() throws IOException, DirectoryIteratorException {
         boolean foundNew = false;
         Path repoPath = repository;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/HiddenWait.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/management/HiddenWait.java
similarity index 82%
rename from src/jdk.jfr/share/classes/jdk/jfr/internal/HiddenWait.java
rename to src/jdk.jfr/share/classes/jdk/jfr/internal/management/HiddenWait.java
index 26505990332c9..9070faad5a658 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/HiddenWait.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/management/HiddenWait.java
@@ -22,11 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.jfr.internal;
+package jdk.jfr.internal.management;
 
 /**
  * The HiddenWait class is used to exclude jdk.JavaMonitorWait events
  * from being generated when Object.wait() is called on an object of this type.
  */
 public final class HiddenWait {
+
+    public synchronized boolean takeNap(long timeoutMillis) {
+        try {
+            this.wait(timeoutMillis);
+            return true;
+        } catch (InterruptedException e) {
+            // Ok, ignore
+            return false;
+        }
+    }
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/management/StreamBarrier.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/management/StreamBarrier.java
index 0b3132da2178b..7f1db163b4e3d 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/management/StreamBarrier.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/management/StreamBarrier.java
@@ -39,45 +39,57 @@
  * processing should not continue.
  */
 public final class StreamBarrier implements Closeable {
-
+    private final HiddenWait lock = new HiddenWait();
     private boolean activated = false;
     private boolean used = false;
     private long end = Long.MAX_VALUE;
 
     // Blocks thread until barrier is deactivated
-    public synchronized void check() {
-        while (activated) {
-            try {
-                this.wait();
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
+    public void check() {
+        synchronized (lock) {
+            while (activated) {
+                try {
+                    lock.wait();
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                }
             }
         }
     }
 
-    public synchronized void setStreamEnd(long timestamp) {
-        end = timestamp;
+    public void setStreamEnd(long timestamp) {
+        synchronized(lock) {
+            end = timestamp;
+        }
     }
 
-    public synchronized long getStreamEnd() {
-        return end;
+    public long getStreamEnd() {
+        synchronized(lock) {
+            return end;
+        }
     }
 
-    public synchronized void activate() {
-        activated = true;
-        used = true;
+    public void activate() {
+        synchronized (lock) {
+            activated = true;
+            used = true;
+        }
     }
 
     @Override
     public synchronized void close() throws IOException {
-        activated = false;
-        this.notifyAll();
+        synchronized (lock) {
+            activated = false;
+            lock.notifyAll();
+        }
     }
 
     /**
      * Returns {@code true) if barrier is, or has been, in active state, {@code false) otherwise.
      */
-    public synchronized boolean used() {
-        return used;
+    public boolean used() {
+        synchronized (lock) {
+            return used;
+        }
     }
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java
index 5e04a25fe7ddf..ae83727096a2a 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java
@@ -48,19 +48,19 @@
 import jdk.jfr.Event;
 import jdk.jfr.EventType;
 import jdk.jfr.RecordingState;
-import jdk.jfr.internal.HiddenWait;
 import jdk.jfr.internal.LogLevel;
 import jdk.jfr.internal.LogTag;
 import jdk.jfr.internal.Logger;
 import jdk.jfr.internal.MirrorEvent;
 import jdk.jfr.internal.SecuritySupport;
 import jdk.jfr.internal.Type;
+import jdk.jfr.internal.management.HiddenWait;
 import jdk.jfr.internal.settings.PeriodSetting;
 import jdk.jfr.internal.settings.StackTraceSetting;
 import jdk.jfr.internal.settings.ThresholdSetting;
 
 public final class Utils {
-    private static final Object flushObject = new Object();
+    private static final HiddenWait flushObject = new HiddenWait();
     private static final String LEGACY_EVENT_NAME_PREFIX = "com.oracle.jdk.";
 
     /**
@@ -351,17 +351,6 @@ private static boolean isSupportedType(Class<?> type) {
         return Type.isValidJavaFieldType(type.getName());
     }
 
-    public static void takeNap(long millis) {
-        HiddenWait hiddenWait = new HiddenWait();
-        try {
-            synchronized(hiddenWait) {
-                hiddenWait.wait(millis);
-            }
-        } catch (InterruptedException e) {
-            // ok
-        }
-    }
-
     public static void notifyFlush() {
         synchronized (flushObject) {
             flushObject.notifyAll();
@@ -369,13 +358,7 @@ public static void notifyFlush() {
     }
 
     public static void waitFlush(long timeOut) {
-        synchronized (flushObject) {
-            try {
-                flushObject.wait(timeOut);
-            } catch (InterruptedException e) {
-                // OK
-            }
-        }
+        flushObject.takeNap(timeOut);
     }
 
     public static Instant epochNanosToInstant(long epochNanos) {
diff --git a/src/jdk.management.jfr/share/classes/jdk/management/jfr/DownLoadThread.java b/src/jdk.management.jfr/share/classes/jdk/management/jfr/DownLoadThread.java
index 5ce66692537cb..05895f0f4a99b 100644
--- a/src/jdk.management.jfr/share/classes/jdk/management/jfr/DownLoadThread.java
+++ b/src/jdk.management.jfr/share/classes/jdk/management/jfr/DownLoadThread.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,12 +30,14 @@
 import java.util.Map;
 
 import jdk.jfr.internal.management.ManagementSupport;
+import jdk.jfr.internal.management.HiddenWait;
 
 final class DownLoadThread extends Thread {
     private final RemoteRecordingStream stream;
     private final Instant startTime;
     private final Instant endTime;
     private final DiskRepository diskRepository;
+    private final HiddenWait threadSleeper = new HiddenWait();
 
     DownLoadThread(RemoteRecordingStream stream, String name) {
         super(name);
@@ -64,7 +66,7 @@ public void run() {
                 if (bytes.length != 0) {
                     diskRepository.write(bytes);
                 } else {
-                    takeNap();
+                    threadSleeper.takeNap(1000);
                 }
             }
         } catch (IOException ioe) {
@@ -73,12 +75,4 @@ public void run() {
            diskRepository.complete();
         }
     }
-
-    private void takeNap() {
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException ie) {
-            // ignore
-        }
-    }
 }
diff --git a/src/jdk.management.jfr/share/classes/jdk/management/jfr/FileDump.java b/src/jdk.management.jfr/share/classes/jdk/management/jfr/FileDump.java
index 7da0fe351c450..37ba296732635 100644
--- a/src/jdk.management.jfr/share/classes/jdk/management/jfr/FileDump.java
+++ b/src/jdk.management.jfr/share/classes/jdk/management/jfr/FileDump.java
@@ -32,8 +32,10 @@
 import java.util.Deque;
 
 import jdk.management.jfr.DiskRepository.DiskChunk;
+import jdk.jfr.internal.management.HiddenWait;
 
 final class FileDump {
+    private final HiddenWait lock = new HiddenWait();
     private final Deque<DiskChunk> chunks = new ArrayDeque<>();
     private final long stopTimeMillis;
     private boolean complete;
@@ -42,45 +44,53 @@ final class FileDump {
         this.stopTimeMillis = stopTimeMillis;
     }
 
-    public synchronized void add(DiskChunk dc) {
-        if (isComplete()) {
-            return;
-        }
-        dc.acquire();
-        chunks.addFirst(dc);
-        long endMillis = dc.endTimeNanos / 1_000_000;
-        if (endMillis >= stopTimeMillis) {
-            setComplete();
+    public void add(DiskChunk dc) {
+        synchronized (lock) {
+            if (isComplete()) {
+                return;
+            }
+            dc.acquire();
+            chunks.addFirst(dc);
+            long endMillis = dc.endTimeNanos / 1_000_000;
+            if (endMillis >= stopTimeMillis) {
+                setComplete();
+            }
         }
     }
 
-    public synchronized boolean isComplete() {
-        return complete;
+    public boolean isComplete() {
+        synchronized (lock) {
+            return complete;
+        }
     }
 
-    public synchronized void setComplete() {
-        complete = true;
-        this.notifyAll();
+    public void setComplete() {
+        synchronized (lock) {
+            complete = true;
+            lock.notifyAll();
+        }
     }
 
-    public synchronized void close() {
-        for (DiskChunk dc : chunks) {
-            dc.release();
+    public void close() {
+        synchronized (lock) {
+            for (DiskChunk dc : chunks) {
+                dc.release();
+            }
+            chunks.clear();
+            complete = true;
         }
-        chunks.clear();
-        complete = true;
     }
 
     private DiskChunk oldestChunk() throws InterruptedException {
         while (true) {
-            synchronized (this) {
+            synchronized (lock) {
                 if (!chunks.isEmpty()) {
                     return chunks.pollLast();
                 }
                 if (complete) {
                     return null;
                 }
-                this.wait();
+                lock.wait();
             }
         }
     }
diff --git a/test/jdk/jdk/jfr/jvm/TestHiddenWait.java b/test/jdk/jdk/jfr/jvm/TestHiddenWait.java
new file mode 100644
index 0000000000000..f4b810f192e48
--- /dev/null
+++ b/test/jdk/jdk/jfr/jvm/TestHiddenWait.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+package jdk.jfr.jvm;
+
+import java.nio.file.Path;
+import java.time.Duration;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+
+import jdk.jfr.Recording;
+import jdk.jfr.Name;
+import jdk.jfr.Event;
+import jdk.jfr.FlightRecorder;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordingStream;
+import jdk.test.lib.jfr.Events;
+
+/**
+ * @test TestHiddenWait
+ * @key jfr
+ * @summary Checks that JFR code don't emit noise in the form of ThreadSleep and JavaMonitorWait events.
+ * @requires vm.hasJFR
+ * @library /test/lib
+ * @run main/othervm jdk.jfr.jvm.TestHiddenWait
+ */
+public class TestHiddenWait {
+    static final String PERIODIC_EVENT_NAME = "test.Periodic";
+
+    @Name(PERIODIC_EVENT_NAME)
+    public static class PeriodicEvent extends Event {
+    }
+
+    public static void main(String... args) throws Exception {
+        FlightRecorder.addPeriodicEvent(PeriodicEvent.class,  () -> {
+            PeriodicEvent event = new PeriodicEvent();
+            event.commit();
+        });
+        try (Recording r = new Recording()) {
+            AtomicLong counter = new AtomicLong();
+            r.enable("jdk.ThreadSleep").withoutThreshold();
+            r.enable("jdk.JavaMonitorWait").withoutThreshold();
+            r.enable(PERIODIC_EVENT_NAME).withPeriod(Duration.ofMillis(100));
+            r.start();
+            // Triggers Object.wait() in stream barrier
+            try (RecordingStream b = new RecordingStream()) {
+                b.startAsync();
+                b.stop();
+            }
+            // Wait for for periodic events
+            try (RecordingStream s = new RecordingStream()) {
+                s.onEvent(PERIODIC_EVENT_NAME, e -> {
+                    if (counter.incrementAndGet() >= 2) {
+                        s.close();
+                    }
+                });
+                s.start();
+            }
+            List<RecordedEvent> events = Events.fromRecording(r);
+            for (RecordedEvent event : events) {
+                if (!event.getEventType().getName().equals(PERIODIC_EVENT_NAME)) {
+                    System.out.println(event);
+                    throw new Exception("Didn't expect ThreadSleep or JavaMonitorWait events");
+                }
+            }
+        }
+    }
+}

From e6c5aa7a6cb54c647d261facdcffa6a410849627 Mon Sep 17 00:00:00 2001
From: Christian Stein <cstein@openjdk.org>
Date: Wed, 10 Jul 2024 15:12:49 +0000
Subject: [PATCH 037/401] 8336012: Fix usages of jtreg-reserved properties

Reviewed-by: jjg
---
 test/jdk/java/lang/invoke/PrivateInvokeTest.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/jdk/java/lang/invoke/PrivateInvokeTest.java b/test/jdk/java/lang/invoke/PrivateInvokeTest.java
index 12edf8e326316..8ae78d96713c6 100644
--- a/test/jdk/java/lang/invoke/PrivateInvokeTest.java
+++ b/test/jdk/java/lang/invoke/PrivateInvokeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,8 +67,6 @@ public class PrivateInvokeTest {
         String vstr = System.getProperty(THIS_CLASS.getSimpleName()+".verbose");
         if (vstr == null)
             vstr = System.getProperty(THIS_CLASS.getName()+".verbose");
-        if (vstr == null)
-            vstr = System.getProperty("test.verbose");
         if (vstr != null)  verbose = Integer.parseInt(vstr);
     }
     private static int referenceKind(Method m) {

From fb9a227e02ebf826edb762283e15dd7e402f8433 Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Wed, 10 Jul 2024 15:34:27 +0000
Subject: [PATCH 038/401] 8313909: [JVMCI]
 assert(cp->tag_at(index).is_unresolved_klass()) in lookupKlassInPool

Reviewed-by: yzheng, never
---
 src/hotspot/share/jvmci/jvmciCompilerToVM.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
index d92d193017362..68168c56b9aac 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
@@ -897,7 +897,9 @@ C2V_VMENTRY_NULL(jobject, lookupKlassInPool, (JNIEnv* env, jobject, ARGUMENT_PAI
     } else if (tag.is_symbol()) {
       symbol = cp->symbol_at(index);
     } else {
-      assert(cp->tag_at(index).is_unresolved_klass(), "wrong tag");
+      if (!tag.is_unresolved_klass()) {
+        JVMCI_THROW_MSG_NULL(InternalError, err_msg("Expected %d at index %d, got %d", JVM_CONSTANT_UnresolvedClassInError, index, tag.value()));
+      }
       symbol = cp->klass_name_at(index);
     }
   }

From fb66716a1bc914db194c5b0b833cc2317704f166 Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Wed, 10 Jul 2024 16:12:40 +0000
Subject: [PATCH 039/401] 8331725: ubsan: pc may not always be the entry point
 for a VtableStub

Reviewed-by: kvn, mbaesken
---
 src/hotspot/share/code/vtableStubs.cpp | 24 ++++++++++++++++++++----
 src/hotspot/share/code/vtableStubs.hpp | 23 +++++++++++++----------
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/hotspot/share/code/vtableStubs.cpp b/src/hotspot/share/code/vtableStubs.cpp
index 5a54426d6a420..a65852e247fae 100644
--- a/src/hotspot/share/code/vtableStubs.cpp
+++ b/src/hotspot/share/code/vtableStubs.cpp
@@ -255,6 +255,19 @@ inline uint VtableStubs::hash(bool is_vtable_stub, int vtable_index){
 }
 
 
+inline uint VtableStubs::unsafe_hash(address entry_point) {
+  // The entrypoint may or may not be a VtableStub. Generate a hash as if it was.
+  address vtable_stub_addr = entry_point - VtableStub::entry_offset();
+  assert(CodeCache::contains(vtable_stub_addr), "assumed to always be the case");
+  address vtable_type_addr = vtable_stub_addr + offset_of(VtableStub, _type);
+  address vtable_index_addr = vtable_stub_addr + offset_of(VtableStub, _index);
+  bool is_vtable_stub = *vtable_type_addr == static_cast<uint8_t>(VtableStub::Type::vtable_stub);
+  int vtable_index;
+  memcpy(&vtable_index, vtable_index_addr, sizeof(vtable_index));
+  return hash(is_vtable_stub, vtable_index);
+}
+
+
 VtableStub* VtableStubs::lookup(bool is_vtable_stub, int vtable_index) {
   assert_lock_strong(VtableStubs_lock);
   unsigned hash = VtableStubs::hash(is_vtable_stub, vtable_index);
@@ -275,12 +288,15 @@ void VtableStubs::enter(bool is_vtable_stub, int vtable_index, VtableStub* s) {
 }
 
 VtableStub* VtableStubs::entry_point(address pc) {
+  // The pc may or may not be the entry point for a VtableStub. Use unsafe_hash
+  // to generate the hash that would have been used if it was. The lookup in the
+  // _table will only succeed if there is a VtableStub with an entry point at
+  // the pc.
   MutexLocker ml(VtableStubs_lock, Mutex::_no_safepoint_check_flag);
-  VtableStub* stub = (VtableStub*)(pc - VtableStub::entry_offset());
-  uint hash = VtableStubs::hash(stub->is_vtable_stub(), stub->index());
+  uint hash = VtableStubs::unsafe_hash(pc);
   VtableStub* s;
-  for (s = Atomic::load(&_table[hash]); s != nullptr && s != stub; s = s->next()) {}
-  return (s == stub) ? s : nullptr;
+  for (s = Atomic::load(&_table[hash]); s != nullptr && s->entry_point() != pc; s = s->next()) {}
+  return (s != nullptr && s->entry_point() == pc) ? s : nullptr;
 }
 
 bool VtableStubs::contains(address pc) {
diff --git a/src/hotspot/share/code/vtableStubs.hpp b/src/hotspot/share/code/vtableStubs.hpp
index 426753ef00813..06acd8f25b921 100644
--- a/src/hotspot/share/code/vtableStubs.hpp
+++ b/src/hotspot/share/code/vtableStubs.hpp
@@ -28,7 +28,6 @@
 #include "asm/macroAssembler.hpp"
 #include "code/vmreg.hpp"
 #include "memory/allStatic.hpp"
-#include "sanitizers/ub.hpp"
 #include "utilities/checkedCast.hpp"
 
 // A VtableStub holds an individual code stub for a pair (vtable index, #args) for either itables or vtables
@@ -94,6 +93,7 @@ class VtableStubs : AllStatic {
   static VtableStub* lookup            (bool is_vtable_stub, int vtable_index);
   static void        enter             (bool is_vtable_stub, int vtable_index, VtableStub* s);
   static inline uint hash              (bool is_vtable_stub, int vtable_index);
+  static inline uint unsafe_hash       (address entry_point);
   static address     find_stub         (bool is_vtable_stub, int vtable_index);
   static void        bookkeeping(MacroAssembler* masm, outputStream* out, VtableStub* s,
                                  address npe_addr, address ame_addr,   bool is_vtable_stub,
@@ -119,6 +119,12 @@ class VtableStub {
  private:
   friend class VtableStubs;
 
+  enum class Type : uint8_t {
+    itable_stub,
+    vtable_stub,
+  };
+
+
   static address _chunk;             // For allocation
   static address _chunk_end;         // For allocation
   static VMReg   _receiver_location; // Where to find receiver
@@ -127,14 +133,14 @@ class VtableStub {
   const short    _index;             // vtable index
   short          _ame_offset;        // Where an AbstractMethodError might occur
   short          _npe_offset;        // Where a NullPointerException might occur
-  bool           _is_vtable_stub;    // True if vtable stub, false, is itable stub
+  Type           _type;              // Type, either vtable stub or itable stub
   /* code follows here */            // The vtableStub code
 
   void* operator new(size_t size, int code_size) throw();
 
   VtableStub(bool is_vtable_stub, short index)
         : _next(nullptr), _index(index), _ame_offset(-1), _npe_offset(-1),
-          _is_vtable_stub(is_vtable_stub) {}
+          _type(is_vtable_stub ? Type::vtable_stub : Type::itable_stub) {}
   VtableStub* next() const                       { return _next; }
   int index() const                              { return _index; }
   static VMReg receiver_location()               { return _receiver_location; }
@@ -142,12 +148,12 @@ class VtableStub {
 
  public:
   address code_begin() const                     { return (address)(this + 1); }
-  address code_end() const                       { return code_begin() + VtableStubs::code_size_limit(_is_vtable_stub); }
+  address code_end() const                       { return code_begin() + VtableStubs::code_size_limit(is_vtable_stub()); }
   address entry_point() const                    { return code_begin(); }
   static int entry_offset()                      { return sizeof(class VtableStub); }
 
   bool matches(bool is_vtable_stub, int index) const {
-    return _index == index && _is_vtable_stub == is_vtable_stub;
+    return _index == index && this->is_vtable_stub() == is_vtable_stub;
   }
   bool contains(address pc) const                { return code_begin() <= pc && pc < code_end(); }
 
@@ -173,11 +179,8 @@ class VtableStub {
 
  public:
   // Query
-  bool is_itable_stub()                          { return !_is_vtable_stub; }
-  // We reinterpret arbitrary memory as VtableStub. This does not cause failures because the lookup/equality
-  // check will reject false objects. Disabling UBSan is a temporary workaround until JDK-8331725 is fixed.
-  ATTRIBUTE_NO_UBSAN
-  bool is_vtable_stub()                          { return  _is_vtable_stub; }
+  bool is_itable_stub() const                    { return _type == Type::itable_stub; }
+  bool is_vtable_stub() const                    { return _type == Type::vtable_stub; }
   bool is_abstract_method_error(address epc)     { return epc == code_begin()+_ame_offset; }
   bool is_null_pointer_exception(address epc)    { return epc == code_begin()+_npe_offset; }
 

From 7ab96c74e2c39f430a5c2f65a981da7314a2385b Mon Sep 17 00:00:00 2001
From: Patricio Chilano Mateo <pchilanomate@openjdk.org>
Date: Wed, 10 Jul 2024 16:26:16 +0000
Subject: [PATCH 040/401] 8335409: Can't allocate and retain memory from
 resource area in frame::oops_interpreted_do oop closure after 8329665

Reviewed-by: dholmes, stuefe, coleenp, shade
---
 src/hotspot/share/interpreter/oopMapCache.cpp | 60 ++++++++-----------
 src/hotspot/share/interpreter/oopMapCache.hpp | 23 ++++---
 src/hotspot/share/runtime/frame.cpp           |  1 -
 3 files changed, 35 insertions(+), 49 deletions(-)

diff --git a/src/hotspot/share/interpreter/oopMapCache.cpp b/src/hotspot/share/interpreter/oopMapCache.cpp
index a10f8c439eaa4..87b124e9d7968 100644
--- a/src/hotspot/share/interpreter/oopMapCache.cpp
+++ b/src/hotspot/share/interpreter/oopMapCache.cpp
@@ -66,9 +66,6 @@ class OopMapCacheEntry: private InterpreterOopMap {
  public:
   OopMapCacheEntry() : InterpreterOopMap() {
     _next = nullptr;
-#ifdef ASSERT
-    _resource_allocate_bit_mask = false;
-#endif
   }
 };
 
@@ -177,9 +174,13 @@ class VerifyClosure : public OffsetClosure {
 
 InterpreterOopMap::InterpreterOopMap() {
   initialize();
-#ifdef ASSERT
-  _resource_allocate_bit_mask = true;
-#endif
+}
+
+InterpreterOopMap::~InterpreterOopMap() {
+  if (has_valid_mask() && mask_size() > small_mask_limit) {
+    assert(_bit_mask[0] != 0, "should have pointer to C heap");
+    FREE_C_HEAP_ARRAY(uintptr_t, _bit_mask[0]);
+  }
 }
 
 bool InterpreterOopMap::is_empty() const {
@@ -399,37 +400,24 @@ void OopMapCacheEntry::deallocate(OopMapCacheEntry* const entry) {
 
 // Implementation of OopMapCache
 
-void InterpreterOopMap::resource_copy(OopMapCacheEntry* from) {
-  assert(_resource_allocate_bit_mask,
-    "Should not resource allocate the _bit_mask");
-  assert(from->has_valid_mask(),
-    "Cannot copy entry with an invalid mask");
+void InterpreterOopMap::copy_from(const OopMapCacheEntry* src) {
+  // The expectation is that this InterpreterOopMap is recently created
+  // and empty. It is used to get a copy of a cached entry.
+  assert(!has_valid_mask(), "InterpreterOopMap object can only be filled once");
+  assert(src->has_valid_mask(), "Cannot copy entry with an invalid mask");
 
-  set_method(from->method());
-  set_bci(from->bci());
-  set_mask_size(from->mask_size());
-  set_expression_stack_size(from->expression_stack_size());
-  _num_oops = from->num_oops();
+  set_method(src->method());
+  set_bci(src->bci());
+  set_mask_size(src->mask_size());
+  set_expression_stack_size(src->expression_stack_size());
+  _num_oops = src->num_oops();
 
   // Is the bit mask contained in the entry?
-  if (from->mask_size() <= small_mask_limit) {
-    memcpy((void *)_bit_mask, (void *)from->_bit_mask,
-      mask_word_size() * BytesPerWord);
+  if (src->mask_size() <= small_mask_limit) {
+    memcpy(_bit_mask, src->_bit_mask, mask_word_size() * BytesPerWord);
   } else {
-    // The expectation is that this InterpreterOopMap is a recently created
-    // and empty. It is used to get a copy of a cached entry.
-    // If the bit mask has a value, it should be in the
-    // resource area.
-    assert(_bit_mask[0] == 0 ||
-      Thread::current()->resource_area()->contains((void*)_bit_mask[0]),
-      "The bit mask should have been allocated from a resource area");
-    // Allocate the bit_mask from a Resource area for performance.  Allocating
-    // from the C heap as is done for OopMapCache has a significant
-    // performance impact.
-    _bit_mask[0] = (uintptr_t) NEW_RESOURCE_ARRAY(uintptr_t, mask_word_size());
-    assert(_bit_mask[0] != 0, "bit mask was not allocated");
-    memcpy((void*) _bit_mask[0], (void*) from->_bit_mask[0],
-      mask_word_size() * BytesPerWord);
+    _bit_mask[0] = (uintptr_t) NEW_C_HEAP_ARRAY(uintptr_t, mask_word_size(), mtClass);
+    memcpy((void*) _bit_mask[0], (void*) src->_bit_mask[0], mask_word_size() * BytesPerWord);
   }
 }
 
@@ -512,7 +500,7 @@ void OopMapCache::lookup(const methodHandle& method,
     for (int i = 0; i < probe_depth; i++) {
       OopMapCacheEntry *entry = entry_at(probe + i);
       if (entry != nullptr && !entry->is_empty() && entry->match(method, bci)) {
-        entry_for->resource_copy(entry);
+        entry_for->copy_from(entry);
         assert(!entry_for->is_empty(), "A non-empty oop map should be returned");
         log_debug(interpreter, oopmap)("- found at hash %d", probe + i);
         return;
@@ -526,7 +514,7 @@ void OopMapCache::lookup(const methodHandle& method,
   OopMapCacheEntry* tmp = NEW_C_HEAP_OBJ(OopMapCacheEntry, mtClass);
   tmp->initialize();
   tmp->fill(method, bci);
-  entry_for->resource_copy(tmp);
+  entry_for->copy_from(tmp);
 
   if (method->should_not_be_cached()) {
     // It is either not safe or not a good idea to cache this Method*
@@ -627,7 +615,7 @@ void OopMapCache::compute_one_oop_map(const methodHandle& method, int bci, Inter
   tmp->initialize();
   tmp->fill(method, bci);
   if (tmp->has_valid_mask()) {
-    entry->resource_copy(tmp);
+    entry->copy_from(tmp);
   }
   OopMapCacheEntry::deallocate(tmp);
 }
diff --git a/src/hotspot/share/interpreter/oopMapCache.hpp b/src/hotspot/share/interpreter/oopMapCache.hpp
index 7037b2c7d1fcf..062b4178ce06e 100644
--- a/src/hotspot/share/interpreter/oopMapCache.hpp
+++ b/src/hotspot/share/interpreter/oopMapCache.hpp
@@ -36,13 +36,14 @@
 // OopMapCache's are allocated lazily per InstanceKlass.
 
 // The oopMap (InterpreterOopMap) is stored as a bit mask. If the
-// bit_mask can fit into two words it is stored in
+// bit_mask can fit into four words it is stored in
 // the _bit_mask array, otherwise it is allocated on the heap.
 // For OopMapCacheEntry the bit_mask is allocated in the C heap
 // because these entries persist between garbage collections.
-// For InterpreterOopMap the bit_mask is allocated in
-// a resource area for better performance.  InterpreterOopMap
-// should only be created and deleted during same garbage collection.
+// For InterpreterOopMap the bit_mask is allocated in the C heap
+// to avoid issues with allocations from the resource area that have
+// to live accross the oop closure. InterpreterOopMap should only be
+// created and deleted during the same garbage collection.
 //
 // If ENABBLE_ZAP_DEAD_LOCALS is defined, two bits are used
 // per entry instead of one. In all cases,
@@ -88,9 +89,6 @@ class InterpreterOopMap: ResourceObj {
   unsigned short _bci;            // the bci    for which the mask is valid
 
  protected:
-#ifdef ASSERT
-  bool _resource_allocate_bit_mask;
-#endif
   int            _num_oops;
   intptr_t       _bit_mask[N];    // the bit mask if
                                   // mask_size <= small_mask_limit,
@@ -128,12 +126,13 @@ class InterpreterOopMap: ResourceObj {
 
  public:
   InterpreterOopMap();
+  ~InterpreterOopMap();
 
-  // Copy the OopMapCacheEntry in parameter "from" into this
-  // InterpreterOopMap.  If the _bit_mask[0] in "from" points to
-  // allocated space (i.e., the bit mask was to large to hold
-  // in-line), allocate the space from a Resource area.
-  void resource_copy(OopMapCacheEntry* from);
+  // Copy the OopMapCacheEntry in parameter "src" into this
+  // InterpreterOopMap.  If the _bit_mask[0] in "src" points to
+  // allocated space (i.e., the bit mask was too large to hold
+  // in-line), allocate the space from the C heap.
+  void copy_from(const OopMapCacheEntry* src);
 
   void iterate_oop(OffsetClosure* oop_closure) const;
   void print() const;
diff --git a/src/hotspot/share/runtime/frame.cpp b/src/hotspot/share/runtime/frame.cpp
index 8f5d2ad4acbf1..1aed46d58804f 100644
--- a/src/hotspot/share/runtime/frame.cpp
+++ b/src/hotspot/share/runtime/frame.cpp
@@ -947,7 +947,6 @@ void frame::oops_interpreted_do(OopClosure* f, const RegisterMap* map, bool quer
   InterpreterFrameClosure blk(this, max_locals, m->max_stack(), f);
 
   // process locals & expression stack
-  ResourceMark rm(thread);
   InterpreterOopMap mask;
   if (query_oop_map_cache) {
     m->mask_for(m, bci, &mask);

From 66db71563c3ebd715a1192a9b399b618d7bdb8d0 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Wed, 10 Jul 2024 16:36:39 +0000
Subject: [PATCH 041/401] 8335637: Add explicit non-null return value
 expectations to Object.toString()

Reviewed-by: jpai, alanb, smarks, prappo
---
 src/java.base/share/classes/java/lang/Object.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/java.base/share/classes/java/lang/Object.java b/src/java.base/share/classes/java/lang/Object.java
index b8bfdc3e3f9bf..d9813df57a4f0 100644
--- a/src/java.base/share/classes/java/lang/Object.java
+++ b/src/java.base/share/classes/java/lang/Object.java
@@ -237,6 +237,10 @@ public boolean equals(Object obj) {
 
     /**
      * {@return a string representation of the object}
+     *
+     * Satisfying this method's contract implies a non-{@code null}
+     * result must be returned.
+     *
      * @apiNote
      * In general, the
      * {@code toString} method returns a string that

From 242f1133f8e1b373de3714cefc7f6701c39707fe Mon Sep 17 00:00:00 2001
From: Yudi Zheng <yzheng@openjdk.org>
Date: Wed, 10 Jul 2024 19:42:23 +0000
Subject: [PATCH 042/401] 8334481: [JVMCI] add LINK_TO_NATIVE to
 MethodHandleAccessProvider.IntrinsicMethod

Reviewed-by: dnsimon
---
 src/hotspot/share/jvmci/vmStructs_jvmci.cpp                   | 1 +
 .../jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java  | 2 ++
 .../share/classes/jdk/vm/ci/hotspot/HotSpotVMConfig.java      | 1 +
 .../classes/jdk/vm/ci/meta/MethodHandleAccessProvider.java    | 4 +++-
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index 8f83d483bcf4b..f55c7bf91a9b6 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -778,6 +778,7 @@
   declare_constant(vmIntrinsics::_linkToStatic)                           \
   declare_constant(vmIntrinsics::_linkToSpecial)                          \
   declare_constant(vmIntrinsics::_linkToInterface)                        \
+  declare_constant(vmIntrinsics::_linkToNative)                           \
                                                                           \
   declare_constant(vmSymbols::FIRST_SID)                                  \
   declare_constant(vmSymbols::SID_LIMIT)                                  \
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java
index 7e47196a42b89..3d3d140b1ca79 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java
@@ -146,6 +146,8 @@ public static IntrinsicMethod getMethodHandleIntrinsic(int intrinsicId) {
             return IntrinsicMethod.LINK_TO_STATIC;
         } else if (intrinsicId == config.vmIntrinsicLinkToVirtual) {
             return IntrinsicMethod.LINK_TO_VIRTUAL;
+        } else if (intrinsicId == config.vmIntrinsicLinkToNative) {
+            return IntrinsicMethod.LINK_TO_NATIVE;
         }
         return null;
     }
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotVMConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotVMConfig.java
index c49f24efed51e..57f9473c90209 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotVMConfig.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotVMConfig.java
@@ -342,6 +342,7 @@ final int baseVtableLength() {
     final int vmIntrinsicLinkToStatic = getConstant("vmIntrinsics::_linkToStatic", Integer.class);
     final int vmIntrinsicLinkToSpecial = getConstant("vmIntrinsics::_linkToSpecial", Integer.class);
     final int vmIntrinsicLinkToInterface = getConstant("vmIntrinsics::_linkToInterface", Integer.class);
+    final int vmIntrinsicLinkToNative = getConstant("vmIntrinsics::_linkToNative", Integer.class);
 
     final int codeInstallResultOk = getConstant("JVMCI::ok", Integer.class);
     final int codeInstallResultDependenciesFailed = getConstant("JVMCI::dependencies_failed", Integer.class);
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/MethodHandleAccessProvider.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/MethodHandleAccessProvider.java
index f053905b160c9..eb8b9721d49ce 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/MethodHandleAccessProvider.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/MethodHandleAccessProvider.java
@@ -45,7 +45,9 @@ enum IntrinsicMethod {
         /** The method {@code MethodHandle.linkToVirtual}. */
         LINK_TO_VIRTUAL,
         /** The method {@code MethodHandle.linkToInterface}. */
-        LINK_TO_INTERFACE
+        LINK_TO_INTERFACE,
+        /** The method {@code MethodHandle.linkToNative}. */
+        LINK_TO_NATIVE
     }
 
     /**

From cad68e06ecad1e19091d1af9c0f9b8145d6842fb Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Wed, 10 Jul 2024 21:06:39 +0000
Subject: [PATCH 043/401] 8335935: Chained builders not sending transformed
 models to next transforms

Reviewed-by: asotona
---
 .../java/lang/classfile/CodeBuilder.java      |   4 +-
 .../classfile/impl/BlockCodeBuilderImpl.java  |  16 +-
 .../classfile/impl/BufferedCodeBuilder.java   |   4 +-
 .../classfile/impl/ChainedClassBuilder.java   |  16 +-
 .../classfile/impl/ChainedMethodBuilder.java  |  10 +-
 .../classfile/impl/DirectCodeBuilder.java     |   4 +-
 .../internal/classfile/impl/LabelContext.java |   4 +-
 .../classfile/impl/TerminalCodeBuilder.java   |   8 +-
 .../impl/TransformingCodeBuilder.java         |  91 ----------
 test/jdk/jdk/classfile/TransformTests.java    | 163 ++++++++++++++++++
 10 files changed, 196 insertions(+), 124 deletions(-)
 delete mode 100644 src/java.base/share/classes/jdk/internal/classfile/impl/TransformingCodeBuilder.java

diff --git a/src/java.base/share/classes/java/lang/classfile/CodeBuilder.java b/src/java.base/share/classes/java/lang/classfile/CodeBuilder.java
index cffa560bef305..a166637509174 100644
--- a/src/java.base/share/classes/java/lang/classfile/CodeBuilder.java
+++ b/src/java.base/share/classes/java/lang/classfile/CodeBuilder.java
@@ -86,7 +86,7 @@
 
 import static java.util.Objects.requireNonNull;
 import static jdk.internal.classfile.impl.BytecodeHelpers.handleDescToHandleInfo;
-import jdk.internal.classfile.impl.TransformingCodeBuilder;
+
 import jdk.internal.javac.PreviewFeature;
 
 /**
@@ -192,7 +192,7 @@ public sealed interface CodeBuilder
     default CodeBuilder transforming(CodeTransform transform, Consumer<CodeBuilder> handler) {
         var resolved = transform.resolve(this);
         resolved.startHandler().run();
-        handler.accept(new TransformingCodeBuilder(this, resolved.consumer()));
+        handler.accept(new ChainedCodeBuilder(this, resolved.consumer()));
         resolved.endHandler().run();
         return this;
     }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BlockCodeBuilderImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BlockCodeBuilderImpl.java
index ffe1a2bd6160f..66e974b4a51b6 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BlockCodeBuilderImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BlockCodeBuilderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,13 +51,13 @@ public BlockCodeBuilderImpl(CodeBuilder parent, Label breakLabel) {
 
     public void start() {
         topLocal = topLocal(parent);
-        terminalMaxLocals = topLocal(terminal);
-        terminal.with((LabelTarget) startLabel);
+        terminalMaxLocals = terminal.curTopLocal();
+        parent.with((LabelTarget) startLabel);
     }
 
     public void end() {
-        terminal.with((LabelTarget) endLabel);
-        if (terminalMaxLocals != topLocal(terminal)) {
+        parent.with((LabelTarget) endLabel);
+        if (terminalMaxLocals != terminal.curTopLocal()) {
             throw new IllegalStateException("Interference in local variable slot management");
         }
     }
@@ -73,10 +73,8 @@ public boolean isEmpty() {
     private int topLocal(CodeBuilder parent) {
         return switch (parent) {
             case BlockCodeBuilderImpl b -> b.topLocal;
-            case ChainedCodeBuilder b -> topLocal(b.terminal);
-            case DirectCodeBuilder b -> b.curTopLocal();
-            case BufferedCodeBuilder b -> b.curTopLocal();
-            case TransformingCodeBuilder b -> topLocal(b.delegate);
+            case ChainedCodeBuilder b -> b.terminal.curTopLocal();
+            case TerminalCodeBuilder b -> b.curTopLocal();
         };
     }
 
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedCodeBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedCodeBuilder.java
index 60e73cdd987c0..8603c77ab8b2a 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedCodeBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedCodeBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@
 import java.util.function.Consumer;
 
 public final class BufferedCodeBuilder
-        implements TerminalCodeBuilder, LabelContext {
+        implements TerminalCodeBuilder {
     private final SplitConstantPool constantPool;
     private final ClassFileImpl context;
     private final List<CodeElement> elements = new ArrayList<>();
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedClassBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedClassBuilder.java
index cc19bf9d31c8d..b33d192f9b355 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedClassBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedClassBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,13 +33,11 @@
 
 public final class ChainedClassBuilder
         implements ClassBuilder, Consumer<ClassElement> {
-    private final ClassBuilder downstream;
     private final DirectClassBuilder terminal;
     private final Consumer<ClassElement> consumer;
 
     public ChainedClassBuilder(ClassBuilder downstream,
                                Consumer<ClassElement> consumer) {
-        this.downstream = downstream;
         this.consumer = consumer;
         this.terminal = switch (downstream) {
             case ChainedClassBuilder cb -> cb.terminal;
@@ -60,10 +58,11 @@ public Optional<ClassModel> original() {
 
     @Override
     public ClassBuilder withField(Utf8Entry name, Utf8Entry descriptor, Consumer<? super FieldBuilder> handler) {
-        return downstream.with(new BufferedFieldBuilder(terminal.constantPool, terminal.context,
+        consumer.accept(new BufferedFieldBuilder(terminal.constantPool, terminal.context,
                                                         name, descriptor, null)
                                        .run(handler)
                                        .toModel());
+        return this;
     }
 
     @Override
@@ -72,16 +71,18 @@ public ClassBuilder transformField(FieldModel field, FieldTransform transform) {
                                                                 field.fieldName(), field.fieldType(),
                                                                 field);
         builder.transform(field, transform);
-        return downstream.with(builder.toModel());
+        consumer.accept(builder.toModel());
+        return this;
     }
 
     @Override
     public ClassBuilder withMethod(Utf8Entry name, Utf8Entry descriptor, int flags,
                                    Consumer<? super MethodBuilder> handler) {
-        return downstream.with(new BufferedMethodBuilder(terminal.constantPool, terminal.context,
+        consumer.accept(new BufferedMethodBuilder(terminal.constantPool, terminal.context,
                                                          name, descriptor, null)
                                        .run(handler)
                                        .toModel());
+        return this;
     }
 
     @Override
@@ -89,7 +90,8 @@ public ClassBuilder transformMethod(MethodModel method, MethodTransform transfor
         BufferedMethodBuilder builder = new BufferedMethodBuilder(terminal.constantPool, terminal.context,
                                                                   method.methodName(), method.methodType(), method);
         builder.transform(method, transform);
-        return downstream.with(builder.toModel());
+        consumer.accept(builder.toModel());
+        return this;
     }
 
     @Override
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedMethodBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedMethodBuilder.java
index 38850aec10978..866dda2c5bc53 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedMethodBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedMethodBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,13 +36,11 @@
 import java.lang.classfile.constantpool.ConstantPoolBuilder;
 
 public final class ChainedMethodBuilder implements MethodBuilder {
-    final MethodBuilder downstream;
     final TerminalMethodBuilder terminal;
     final Consumer<MethodElement> consumer;
 
     public ChainedMethodBuilder(MethodBuilder downstream,
                                 Consumer<MethodElement> consumer) {
-        this.downstream = downstream;
         this.consumer = consumer;
         this.terminal = switch (downstream) {
             case ChainedMethodBuilder cb -> cb.terminal;
@@ -58,16 +56,18 @@ public MethodBuilder with(MethodElement element) {
 
     @Override
     public MethodBuilder withCode(Consumer<? super CodeBuilder> handler) {
-        return downstream.with(terminal.bufferedCodeBuilder(null)
+        consumer.accept(terminal.bufferedCodeBuilder(null)
                                        .run(handler)
                                        .toModel());
+        return this;
     }
 
     @Override
     public MethodBuilder transformCode(CodeModel code, CodeTransform transform) {
         BufferedCodeBuilder builder = terminal.bufferedCodeBuilder(code);
         builder.transform(code, transform);
-        return downstream.with(builder.toModel());
+        consumer.accept(builder.toModel());
+        return this;
     }
 
     @Override
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/DirectCodeBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/DirectCodeBuilder.java
index b961a12031f59..0b6549a82da9e 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/DirectCodeBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/DirectCodeBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -75,7 +75,7 @@
 
 public final class DirectCodeBuilder
         extends AbstractDirectBuilder<CodeModel>
-        implements TerminalCodeBuilder, LabelContext {
+        implements TerminalCodeBuilder {
     private final List<CharacterRange> characterRanges = new ArrayList<>();
     final List<AbstractPseudoInstruction.ExceptionCatchImpl> handlers = new ArrayList<>();
     private final List<LocalVariable> localVariables = new ArrayList<>();
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/LabelContext.java b/src/java.base/share/classes/jdk/internal/classfile/impl/LabelContext.java
index e17adcbcf121f..749abbed23b6d 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/LabelContext.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/LabelContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
 import java.lang.classfile.Label;
 
 public sealed interface LabelContext
-        permits BufferedCodeBuilder, CodeImpl, DirectCodeBuilder {
+        permits TerminalCodeBuilder, CodeImpl {
     Label newLabel();
     Label getLabel(int bci);
     void setLabelTarget(Label label, int bci);
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/TerminalCodeBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/TerminalCodeBuilder.java
index e13b09b0a4d0d..6e3ca516bf480 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/TerminalCodeBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/TerminalCodeBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 
 import java.lang.classfile.CodeBuilder;
 
-public sealed interface TerminalCodeBuilder extends CodeBuilder
-        permits DirectCodeBuilder, BufferedCodeBuilder, TransformingCodeBuilder {
-
+public sealed interface TerminalCodeBuilder extends CodeBuilder, LabelContext
+        permits DirectCodeBuilder, BufferedCodeBuilder {
+    int curTopLocal();
 }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/TransformingCodeBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/TransformingCodeBuilder.java
deleted file mode 100644
index 4ffc75d3edc82..0000000000000
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/TransformingCodeBuilder.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-package jdk.internal.classfile.impl;
-
-import java.lang.classfile.CodeBuilder;
-import java.lang.classfile.CodeModel;
-import java.util.Optional;
-import java.util.function.Consumer;
-import java.lang.classfile.CodeElement;
-import java.lang.classfile.Label;
-import java.lang.classfile.TypeKind;
-import java.lang.classfile.constantpool.ConstantPoolBuilder;
-
-public final class TransformingCodeBuilder implements TerminalCodeBuilder {
-
-    final CodeBuilder delegate;
-    final Consumer<CodeElement> consumer;
-
-    public TransformingCodeBuilder(CodeBuilder delegate, Consumer<CodeElement> consumer) {
-        this.delegate = delegate;
-        this.consumer = consumer;
-    }
-
-    @Override
-    public CodeBuilder with(CodeElement e) {
-        consumer.accept(e);
-        return this;
-    }
-
-    @Override
-    public Optional<CodeModel> original() {
-        return delegate.original();
-    }
-
-    @Override
-    public Label newLabel() {
-        return delegate.newLabel();
-    }
-
-    @Override
-    public Label startLabel() {
-        return delegate.startLabel();
-    }
-
-    @Override
-    public Label endLabel() {
-        return delegate.endLabel();
-    }
-
-    @Override
-    public int receiverSlot() {
-        return delegate.receiverSlot();
-    }
-
-    @Override
-    public int parameterSlot(int paramNo) {
-        return delegate.parameterSlot(paramNo);
-    }
-
-    @Override
-    public int allocateLocal(TypeKind typeKind) {
-        return delegate.allocateLocal(typeKind);
-    }
-
-    @Override
-    public ConstantPoolBuilder constantPool() {
-        return delegate.constantPool();
-    }
-}
diff --git a/test/jdk/jdk/classfile/TransformTests.java b/test/jdk/jdk/classfile/TransformTests.java
index 1df7b73bda56a..0cc1dafdf3274 100644
--- a/test/jdk/jdk/classfile/TransformTests.java
+++ b/test/jdk/jdk/classfile/TransformTests.java
@@ -23,9 +23,22 @@
 
 /*
  * @test
+ * @bug 8336010
  * @summary Testing ClassFile transformations.
  * @run junit TransformTests
  */
+import java.lang.classfile.ClassBuilder;
+import java.lang.classfile.CodeBuilder;
+import java.lang.classfile.CodeElement;
+import java.lang.classfile.FieldModel;
+import java.lang.classfile.FieldTransform;
+import java.lang.classfile.Label;
+import java.lang.classfile.MethodTransform;
+import java.lang.classfile.instruction.BranchInstruction;
+import java.lang.classfile.instruction.LabelTarget;
+import java.lang.constant.ClassDesc;
+import java.lang.constant.MethodTypeDesc;
+import java.lang.reflect.AccessFlag;
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -39,8 +52,13 @@
 import java.lang.classfile.CodeTransform;
 import java.lang.classfile.MethodModel;
 import java.lang.classfile.instruction.ConstantInstruction;
+import java.util.HashSet;
+import java.util.Set;
+
 import org.junit.jupiter.api.Test;
 
+import static java.lang.classfile.ClassFile.*;
+import static java.lang.constant.ConstantDescs.*;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -126,6 +144,151 @@ void testSeqN() throws Exception {
         assertEquals(invoke(cc.transformClass(cm, transformCode(foo2foo.andThen(foo2bar).andThen(bar2baz)))), "baz");
     }
 
+    /**
+     * Test to ensure class elements, such as field and
+     * methods defined with transform/with, are visible
+     * to next transforms.
+     */
+    @Test
+    void testClassChaining() throws Exception {
+        var bytes = Files.readAllBytes(testClassPath);
+        var cf = ClassFile.of();
+        var cm = cf.parse(bytes);
+        var otherCm = cf.parse(cf.build(ClassDesc.of("Temp"), clb -> clb
+            .withMethodBody("baz", MTD_void, ACC_STATIC, CodeBuilder::return_)
+            .withField("baz", CD_long, ACC_STATIC)));
+
+        var methodBaz = otherCm.methods().getFirst();
+        var fieldBaz = otherCm.fields().getFirst();
+
+        ClassTransform transform1 = ClassTransform.endHandler(cb -> {
+            ClassBuilder ret;
+            ret = cb.withMethodBody("bar", MTD_void, ACC_STATIC, CodeBuilder::return_);
+            assertSame(cb, ret);
+            ret = cb.transformMethod(methodBaz, MethodTransform.ACCEPT_ALL);
+            assertSame(cb, ret);
+            ret = cb.withField("bar", CD_int, ACC_STATIC);
+            assertSame(cb, ret);
+            ret = cb.transformField(fieldBaz, FieldTransform.ACCEPT_ALL);
+            assertSame(cb, ret);
+        });
+
+        Set<String> methodNames = new HashSet<>();
+        Set<String> fieldNames = new HashSet<>();
+        ClassTransform transform2 = (cb, ce) -> {
+            if (ce instanceof MethodModel mm) {
+                methodNames.add(mm.methodName().stringValue());
+            }
+            if (ce instanceof FieldModel fm) {
+                fieldNames.add(fm.fieldName().stringValue());
+            }
+            cb.with(ce);
+        };
+
+        cf.transformClass(cm, transform1.andThen(transform2));
+
+        assertEquals(Set.of(INIT_NAME, "foo", "bar", "baz"), methodNames);
+        assertEquals(Set.of("bar", "baz"), fieldNames);
+    }
+
+    /**
+     * Test to ensure method elements, such as generated
+     * or transformed code, are visible to transforms.
+     */
+    @Test
+    void testMethodChaining() throws Exception {
+        var mtd = MethodTypeDesc.of(CD_String);
+
+        var cf = ClassFile.of();
+
+        // withCode
+        var cm = cf.parse(cf.build(ClassDesc.of("Temp"), clb -> clb
+            .withMethod("baz", mtd, ACC_STATIC | ACC_NATIVE, _ -> {})));
+
+        MethodTransform transform1 = MethodTransform.endHandler(mb -> {
+            var ret = mb.withCode(cob -> cob.loadConstant("foo").areturn());
+            assertSame(mb, ret);
+        });
+
+        boolean[] sawWithCode = { false };
+        MethodTransform transform2 = (mb, me) -> {
+            if (me instanceof CodeModel) {
+                sawWithCode[0] = true;
+            }
+            mb.with(me);
+        };
+
+        cf.transformClass(cm, ClassTransform.transformingMethods(transform1.andThen(transform2)));
+
+        assertTrue(sawWithCode[0], "Code attribute generated not visible");
+
+        // transformCode
+        var outerCm = cf.parse(testClassPath);
+        var foo = outerCm.methods().stream()
+            .filter(m -> m.flags().has(AccessFlag.STATIC))
+            .findFirst().orElseThrow();
+
+        MethodTransform transform3 = MethodTransform.endHandler(mb -> {
+            var ret = mb.transformCode(foo.code().orElseThrow(), CodeTransform.ACCEPT_ALL);
+            assertSame(mb, ret);
+        });
+
+        boolean[] sawTransformCode = { false };
+        MethodTransform transform4 = (mb, me) -> {
+            if (me instanceof CodeModel) {
+                sawTransformCode[0] = true;
+            }
+            mb.with(me);
+        };
+
+        cf.transformClass(cm, ClassTransform.transformingMethods(transform3.andThen(transform4)));
+
+        assertTrue(sawTransformCode[0], "Code attribute transformed not visible");
+    }
+
+    /**
+     * Test to ensure code elements, such as code block
+     * begin and end labels, are visible to transforms.
+     */
+    @Test
+    void testCodeChaining() throws Exception {
+        var bytes = Files.readAllBytes(testClassPath);
+        var cf = ClassFile.of();
+        var cm = cf.parse(bytes);
+
+        CodeTransform transform1 = new CodeTransform() {
+            @Override
+            public void atStart(CodeBuilder builder) {
+                builder.block(bcb -> {
+                    bcb.loadConstant(9876L);
+                    bcb.goto_(bcb.endLabel());
+                });
+            }
+
+            @Override
+            public void accept(CodeBuilder builder, CodeElement element) {
+                builder.with(element);
+            }
+        };
+        Set<Label> leaveLabels = new HashSet<>();
+        Set<Label> targetedLabels = new HashSet<>();
+        CodeTransform transform2 = (cb, ce) -> {
+            if (ce instanceof BranchInstruction bi) {
+                leaveLabels.add(bi.target());
+            }
+            if (ce instanceof LabelTarget lt) {
+                targetedLabels.add(lt.label());
+            }
+            cb.with(ce);
+        };
+
+        cf.transformClass(cm, ClassTransform.transformingMethods(MethodTransform
+            .transformingCode(transform1.andThen(transform2))));
+
+        leaveLabels.removeIf(targetedLabels::contains);
+        assertTrue(leaveLabels.isEmpty(), () -> "Some labels are not bounded: " + leaveLabels);
+    }
+
     public static class TestClass {
         static public String foo() {
             return "foo";

From d6c6847e32673d36a1958cefd1851ec9f3b1e2ad Mon Sep 17 00:00:00 2001
From: KIRIYAMA Takuya <kiriyama.takuya@fujitsu.com>
Date: Thu, 11 Jul 2024 02:44:12 +0000
Subject: [PATCH 044/401] 8335743: jhsdb jstack cannot print some information
 on the waiting thread

Reviewed-by: dholmes, cjplummer, kevinw
---
 .../sun/jvm/hotspot/runtime/JavaVFrame.java    |  4 ++--
 .../serviceability/sa/LingeredAppWithLock.java | 18 ++++++++++++++++--
 .../sa/TestClhsdbJstackLock.java               |  6 ++++--
 .../serviceability/sa/TestJhsdbJstackLock.java |  4 +++-
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaVFrame.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaVFrame.java
index 7a3609425724b..60bcb7bb86dbe 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaVFrame.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaVFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -100,7 +100,7 @@ public void printLockInfo(PrintStream tty, int frameCount) {
     // then print out the receiver. Locals are not always available,
     // e.g., compiled native frames have no scope so there are no locals.
     if (frameCount == 0) {
-      if (getMethod().getName().asString().equals("wait") &&
+      if (getMethod().getName().asString().equals("wait0") &&
           getMethod().getMethodHolder().getName().asString().equals("java/lang/Object")) {
         String waitState = "waiting on"; // assume we are waiting
         // If earlier in the output we reported java.lang.Thread.State ==
diff --git a/test/hotspot/jtreg/serviceability/sa/LingeredAppWithLock.java b/test/hotspot/jtreg/serviceability/sa/LingeredAppWithLock.java
index 4140a3e338104..4319d576590cf 100644
--- a/test/hotspot/jtreg/serviceability/sa/LingeredAppWithLock.java
+++ b/test/hotspot/jtreg/serviceability/sa/LingeredAppWithLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 
 
 public class LingeredAppWithLock extends LingeredApp {
+    private static Object lockObj = new Object();
 
     public static void lockMethod(Object lock) {
         synchronized (lock) {
@@ -36,16 +37,28 @@ public static void lockMethod(Object lock) {
         }
     }
 
+    public static void waitMethod() {
+        synchronized (lockObj) {
+            try {
+                lockObj.wait(300000);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
     public static void main(String args[]) {
         Thread classLock1 = new Thread(() -> lockMethod(LingeredAppWithLock.class));
         Thread classLock2 = new Thread(() -> lockMethod(LingeredAppWithLock.class));
         Thread objectLock = new Thread(() -> lockMethod(classLock1));
         Thread primitiveLock = new Thread(() -> lockMethod(int.class));
+        Thread objectWait = new Thread(() -> waitMethod());
 
         classLock1.start();
         classLock2.start();
         objectLock.start();
         primitiveLock.start();
+        objectWait.start();
 
         // Wait until all threads have reached their blocked or timed wait state
         while ((classLock1.getState() != Thread.State.BLOCKED &&
@@ -53,7 +66,8 @@ public static void main(String args[]) {
                (classLock2.getState() != Thread.State.BLOCKED &&
                 classLock2.getState() != Thread.State.TIMED_WAITING) ||
                (objectLock.getState() != Thread.State.TIMED_WAITING) ||
-               (primitiveLock.getState() != Thread.State.TIMED_WAITING)) {
+               (primitiveLock.getState() != Thread.State.TIMED_WAITING) ||
+               (objectWait.getState() != Thread.State.TIMED_WAITING)) {
             try {
                 Thread.sleep(100);
             } catch (InterruptedException ex) {
diff --git a/test/hotspot/jtreg/serviceability/sa/TestClhsdbJstackLock.java b/test/hotspot/jtreg/serviceability/sa/TestClhsdbJstackLock.java
index cac6dac44a057..e4d4361e6512b 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestClhsdbJstackLock.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestClhsdbJstackLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
 
 /**
  * @test
+ * @bug 8185796 8335743
  * @requires vm.hasSA
  * @library /test/lib
  * @run main/othervm TestClhsdbJstackLock
@@ -57,7 +58,8 @@ public static void main (String... args) throws Exception {
                 "^\\s+- locked <0x[0-9a-f]+> \\(a java\\.lang\\.Class for LingeredAppWithLock\\)$",
                 "^\\s+- waiting to lock <0x[0-9a-f]+> \\(a java\\.lang\\.Class for LingeredAppWithLock\\)$",
                 "^\\s+- locked <0x[0-9a-f]+> \\(a java\\.lang\\.Thread\\)$",
-                "^\\s+- locked <0x[0-9a-f]+> \\(a java\\.lang\\.Class for int\\)$"));
+                "^\\s+- locked <0x[0-9a-f]+> \\(a java\\.lang\\.Class for int\\)$",
+                "^\\s+- waiting on <0x[0-9a-f]+> \\(a java\\.lang\\.Object\\)$"));
             unExpStrMap.put("jstack", List.of(
                 "missing reason for "));
             test.run(app.getPid(), cmds, expStrMap, unExpStrMap);
diff --git a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackLock.java b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackLock.java
index 02a2a07f25087..98c4286609178 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackLock.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackLock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
 
 /**
  * @test
+ * @bug 8185796 8335743
  * @requires vm.hasSA
  * @library /test/lib
  * @run driver TestJhsdbJstackLock
@@ -64,6 +65,7 @@ public static void main (String... args) throws Exception {
             out.shouldMatch("^\\s+- waiting to lock <0x[0-9a-f]+> \\(a java\\.lang\\.Class for LingeredAppWithLock\\)$");
             out.shouldMatch("^\\s+- locked <0x[0-9a-f]+> \\(a java\\.lang\\.Thread\\)$");
             out.shouldMatch("^\\s+- locked <0x[0-9a-f]+> \\(a java\\.lang\\.Class for int\\)$");
+            out.shouldMatch("^\\s+- waiting on <0x[0-9a-f]+> \\(a java\\.lang\\.Object\\)$");
 
             out.stderrShouldBeEmptyIgnoreDeprecatedWarnings();
 

From b363de8c9fbf7d9e4aade41a2e883cc83ced320b Mon Sep 17 00:00:00 2001
From: Kuai Wei <kuaiwei.kw@alibaba-inc.com>
Date: Thu, 11 Jul 2024 02:44:25 +0000
Subject: [PATCH 045/401] 8335946: DTrace code snippets should be generated
 when DTrace flags are enabled

Reviewed-by: coleenp, dholmes
---
 .../cpu/aarch64/interp_masm_aarch64.cpp       |  6 +-
 .../cpu/aarch64/sharedRuntime_aarch64.cpp     | 71 ++++++++---------
 .../cpu/aarch64/templateTable_aarch64.cpp     |  3 +-
 src/hotspot/cpu/ppc/templateTable_ppc_64.cpp  |  9 ++-
 src/hotspot/cpu/riscv/interp_masm_riscv.cpp   |  6 +-
 src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp | 76 ++++++++-----------
 src/hotspot/cpu/riscv/templateTable_riscv.cpp |  3 +-
 src/hotspot/cpu/s390/templateTable_s390.cpp   |  3 +-
 src/hotspot/cpu/x86/interp_masm_x86.cpp       |  6 +-
 src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp  |  6 +-
 src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp  |  6 +-
 src/hotspot/cpu/x86/templateTable_x86.cpp     |  3 +-
 12 files changed, 85 insertions(+), 113 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
index 5fea0b8d925b0..ca359fea9da77 100644
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
@@ -1418,8 +1418,7 @@ void InterpreterMacroAssembler::notify_method_entry() {
     bind(L);
   }
 
-  {
-    SkipIfEqual skip(this, &DTraceMethodProbes, false);
+  if (DTraceMethodProbes) {
     get_method(c_rarg1);
     call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_entry),
                  rthread, c_rarg1);
@@ -1458,8 +1457,7 @@ void InterpreterMacroAssembler::notify_method_exit(
     pop(state);
   }
 
-  {
-    SkipIfEqual skip(this, &DTraceMethodProbes, false);
+  if (DTraceMethodProbes) {
     push(state);
     get_method(c_rarg1);
     call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit),
diff --git a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
index a260082562288..bb2554e65ce83 100644
--- a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
@@ -1754,11 +1754,8 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
   __ set_last_Java_frame(sp, noreg, native_return, rscratch1);
 
   Label dtrace_method_entry, dtrace_method_entry_done;
-  {
-    uint64_t offset;
-    __ adrp(rscratch1, ExternalAddress((address)&DTraceMethodProbes), offset);
-    __ ldrb(rscratch1, Address(rscratch1, offset));
-    __ cbnzw(rscratch1, dtrace_method_entry);
+  if (DTraceMethodProbes) {
+    __ b(dtrace_method_entry);
     __ bind(dtrace_method_entry_done);
   }
 
@@ -1990,11 +1987,8 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
   }
 
   Label dtrace_method_exit, dtrace_method_exit_done;
-  {
-    uint64_t offset;
-    __ adrp(rscratch1, ExternalAddress((address)&DTraceMethodProbes), offset);
-    __ ldrb(rscratch1, Address(rscratch1, offset));
-    __ cbnzw(rscratch1, dtrace_method_exit);
+  if (DTraceMethodProbes) {
+    __ b(dtrace_method_exit);
     __ bind(dtrace_method_exit_done);
   }
 
@@ -2138,37 +2132,38 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
   }
 
   // SLOW PATH dtrace support
-  {
-    __ block_comment("dtrace entry {");
-    __ bind(dtrace_method_entry);
-
-    // We have all of the arguments setup at this point. We must not touch any register
-    // argument registers at this point (what if we save/restore them there are no oop?
-
-    save_args(masm, total_c_args, c_arg, out_regs);
-    __ mov_metadata(c_rarg1, method());
-    __ call_VM_leaf(
-      CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_entry),
-      rthread, c_rarg1);
-    restore_args(masm, total_c_args, c_arg, out_regs);
-    __ b(dtrace_method_entry_done);
-    __ block_comment("} dtrace entry");
-  }
+  if (DTraceMethodProbes) {
+    {
+      __ block_comment("dtrace entry {");
+      __ bind(dtrace_method_entry);
+
+      // We have all of the arguments setup at this point. We must not touch any register
+      // argument registers at this point (what if we save/restore them there are no oop?
+
+      save_args(masm, total_c_args, c_arg, out_regs);
+      __ mov_metadata(c_rarg1, method());
+      __ call_VM_leaf(
+        CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_entry),
+        rthread, c_rarg1);
+      restore_args(masm, total_c_args, c_arg, out_regs);
+      __ b(dtrace_method_entry_done);
+      __ block_comment("} dtrace entry");
+    }
 
-  {
-    __ block_comment("dtrace exit {");
-    __ bind(dtrace_method_exit);
-    save_native_result(masm, ret_type, stack_slots);
-    __ mov_metadata(c_rarg1, method());
-    __ call_VM_leaf(
-         CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit),
-         rthread, c_rarg1);
-    restore_native_result(masm, ret_type, stack_slots);
-    __ b(dtrace_method_exit_done);
-    __ block_comment("} dtrace exit");
+    {
+      __ block_comment("dtrace exit {");
+      __ bind(dtrace_method_exit);
+      save_native_result(masm, ret_type, stack_slots);
+      __ mov_metadata(c_rarg1, method());
+      __ call_VM_leaf(
+        CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit),
+        rthread, c_rarg1);
+      restore_native_result(masm, ret_type, stack_slots);
+      __ b(dtrace_method_exit_done);
+      __ block_comment("} dtrace exit");
+    }
   }
 
-
   __ flush();
 
   nmethod *nm = nmethod::new_native_nmethod(method,
diff --git a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
index f32a4ee7372a7..f7cf99381578b 100644
--- a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
@@ -3648,8 +3648,7 @@ void TemplateTable::_new() {
     __ store_klass_gap(r0, zr);  // zero klass gap for compressed oops
     __ store_klass(r0, r4);      // store klass last
 
-    {
-      SkipIfEqual skip(_masm, &DTraceAllocProbes, false);
+    if (DTraceAllocProbes) {
       // Trigger dtrace event for fastpath
       __ push(atos); // save the return value
       __ call_VM_leaf(
diff --git a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
index 770b2bfa68f0c..0ee9348dde810 100644
--- a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
+++ b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
@@ -3859,10 +3859,11 @@ void TemplateTable::_new() {
     __ store_klass(RallocatedObject, RinstanceKlass, Rscratch); // klass (last for cms)
 
     // Check and trigger dtrace event.
-    SkipIfEqualZero::skip_to_label_if_equal_zero(_masm, Rscratch, &DTraceAllocProbes, Ldone);
-    __ push(atos);
-    __ call_VM_leaf(CAST_FROM_FN_PTR(address, static_cast<int (*)(oopDesc*)>(SharedRuntime::dtrace_object_alloc)));
-    __ pop(atos);
+    if (DTraceAllocProbes) {
+      __ push(atos);
+      __ call_VM_leaf(CAST_FROM_FN_PTR(address, static_cast<int (*)(oopDesc*)>(SharedRuntime::dtrace_object_alloc)));
+      __ pop(atos);
+    }
 
     __ b(Ldone);
   }
diff --git a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
index c5f97b60c4239..af6d043d1d63e 100644
--- a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
+++ b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
@@ -1467,8 +1467,7 @@ void InterpreterMacroAssembler::notify_method_entry() {
     bind(L);
   }
 
-  {
-    SkipIfEqual skip(this, &DTraceMethodProbes, false);
+  if (DTraceMethodProbes) {
     get_method(c_rarg1);
     call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_entry),
                  xthread, c_rarg1);
@@ -1506,8 +1505,7 @@ void InterpreterMacroAssembler::notify_method_exit(
     pop(state);
   }
 
-  {
-    SkipIfEqual skip(this, &DTraceMethodProbes, false);
+  if (DTraceMethodProbes) {
     push(state);
     get_method(c_rarg1);
     call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit),
diff --git a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
index 9e6c8ce2e5e3b..3af203a95b039 100644
--- a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
+++ b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
@@ -1638,14 +1638,8 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
   __ set_last_Java_frame(sp, noreg, native_return, t0);
 
   Label dtrace_method_entry, dtrace_method_entry_done;
-  {
-    ExternalAddress target((address)&DTraceMethodProbes);
-    __ relocate(target.rspec(), [&] {
-      int32_t offset;
-      __ la(t0, target.target(), offset);
-      __ lbu(t0, Address(t0, offset));
-    });
-    __ bnez(t0, dtrace_method_entry);
+  if (DTraceMethodProbes) {
+    __ j(dtrace_method_entry);
     __ bind(dtrace_method_entry_done);
   }
 
@@ -1861,14 +1855,8 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
   }
 
   Label dtrace_method_exit, dtrace_method_exit_done;
-  {
-    ExternalAddress target((address)&DTraceMethodProbes);
-    __ relocate(target.rspec(), [&] {
-      int32_t offset;
-      __ la(t0, target.target(), offset);
-      __ lbu(t0, Address(t0, offset));
-    });
-    __ bnez(t0, dtrace_method_exit);
+  if (DTraceMethodProbes) {
+    __ j(dtrace_method_exit);
     __ bind(dtrace_method_exit_done);
   }
 
@@ -2009,34 +1997,36 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
   }
 
   // SLOW PATH dtrace support
-  {
-    __ block_comment("dtrace entry {");
-    __ bind(dtrace_method_entry);
-
-    // We have all of the arguments setup at this point. We must not touch any register
-    // argument registers at this point (what if we save/restore them there are no oop?
-
-    save_args(masm, total_c_args, c_arg, out_regs);
-    __ mov_metadata(c_rarg1, method());
-    __ call_VM_leaf(
-      CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_entry),
-      xthread, c_rarg1);
-    restore_args(masm, total_c_args, c_arg, out_regs);
-    __ j(dtrace_method_entry_done);
-    __ block_comment("} dtrace entry");
-  }
+  if (DTraceMethodProbes) {
+    {
+      __ block_comment("dtrace entry {");
+      __ bind(dtrace_method_entry);
+
+      // We have all of the arguments setup at this point. We must not touch any register
+      // argument registers at this point (what if we save/restore them there are no oop?
+
+      save_args(masm, total_c_args, c_arg, out_regs);
+      __ mov_metadata(c_rarg1, method());
+      __ call_VM_leaf(
+        CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_entry),
+        xthread, c_rarg1);
+      restore_args(masm, total_c_args, c_arg, out_regs);
+      __ j(dtrace_method_entry_done);
+      __ block_comment("} dtrace entry");
+    }
 
-  {
-    __ block_comment("dtrace exit {");
-    __ bind(dtrace_method_exit);
-    save_native_result(masm, ret_type, stack_slots);
-    __ mov_metadata(c_rarg1, method());
-    __ call_VM_leaf(
-         CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit),
-         xthread, c_rarg1);
-    restore_native_result(masm, ret_type, stack_slots);
-    __ j(dtrace_method_exit_done);
-    __ block_comment("} dtrace exit");
+    {
+      __ block_comment("dtrace exit {");
+      __ bind(dtrace_method_exit);
+      save_native_result(masm, ret_type, stack_slots);
+      __ mov_metadata(c_rarg1, method());
+      __ call_VM_leaf(
+           CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit),
+           xthread, c_rarg1);
+      restore_native_result(masm, ret_type, stack_slots);
+      __ j(dtrace_method_exit_done);
+      __ block_comment("} dtrace exit");
+    }
   }
 
   __ flush();
diff --git a/src/hotspot/cpu/riscv/templateTable_riscv.cpp b/src/hotspot/cpu/riscv/templateTable_riscv.cpp
index 5c72ddc9f81de..fa542343949ac 100644
--- a/src/hotspot/cpu/riscv/templateTable_riscv.cpp
+++ b/src/hotspot/cpu/riscv/templateTable_riscv.cpp
@@ -3592,8 +3592,7 @@ void TemplateTable::_new() {
     __ store_klass_gap(x10, zr);   // zero klass gap for compressed oops
     __ store_klass(x10, x14);      // store klass last
 
-    {
-      SkipIfEqual skip(_masm, &DTraceAllocProbes, false);
+    if (DTraceAllocProbes) {
       // Trigger dtrace event for fastpath
       __ push(atos); // save the return value
       __ call_VM_leaf(CAST_FROM_FN_PTR(address, static_cast<int (*)(oopDesc*)>(SharedRuntime::dtrace_object_alloc)), x10);
diff --git a/src/hotspot/cpu/s390/templateTable_s390.cpp b/src/hotspot/cpu/s390/templateTable_s390.cpp
index 02b9405ad31d5..ef68a5ac83ac7 100644
--- a/src/hotspot/cpu/s390/templateTable_s390.cpp
+++ b/src/hotspot/cpu/s390/templateTable_s390.cpp
@@ -3976,8 +3976,7 @@ void TemplateTable::_new() {
     __ store_klass_gap(Rzero, RallocatedObject);  // Zero klass gap for compressed oops.
     __ store_klass(iklass, RallocatedObject);     // Store klass last.
 
-    {
-      SkipIfEqual skip(_masm, &DTraceAllocProbes, false, Z_ARG5 /*scratch*/);
+    if (DTraceAllocProbes) {
       // Trigger dtrace event for fastpath.
       __ push(atos); // Save the return value.
       __ call_VM_leaf(CAST_FROM_FN_PTR(address, static_cast<int (*)(oopDesc*)>(SharedRuntime::dtrace_object_alloc)), RallocatedObject);
diff --git a/src/hotspot/cpu/x86/interp_masm_x86.cpp b/src/hotspot/cpu/x86/interp_masm_x86.cpp
index 4329b0b6411bb..57d77bafd4b73 100644
--- a/src/hotspot/cpu/x86/interp_masm_x86.cpp
+++ b/src/hotspot/cpu/x86/interp_masm_x86.cpp
@@ -1955,8 +1955,7 @@ void InterpreterMacroAssembler::notify_method_entry() {
     bind(L);
   }
 
-  {
-    SkipIfEqual skip(this, &DTraceMethodProbes, false, rscratch1);
+  if (DTraceMethodProbes) {
     NOT_LP64(get_thread(rthread);)
     get_method(rarg);
     call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_entry),
@@ -2000,8 +1999,7 @@ void InterpreterMacroAssembler::notify_method_exit(
     pop(state);
   }
 
-  {
-    SkipIfEqual skip(this, &DTraceMethodProbes, false, rscratch1);
+  if (DTraceMethodProbes) {
     push(state);
     NOT_LP64(get_thread(rthread);)
     get_method(rarg);
diff --git a/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
index 79a573763dcc1..6303c279195ca 100644
--- a/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
@@ -1612,8 +1612,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
   // We have all of the arguments setup at this point. We must not touch any register
   // argument registers at this point (what if we save/restore them there are no oop?
 
-  {
-    SkipIfEqual skip_if(masm, &DTraceMethodProbes, 0, noreg);
+  if (DTraceMethodProbes) {
     __ mov_metadata(rax, method());
     __ call_VM_leaf(
          CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_entry),
@@ -1857,8 +1856,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
     __ bind(fast_done);
   }
 
-  {
-    SkipIfEqual skip_if(masm, &DTraceMethodProbes, 0, noreg);
+  if (DTraceMethodProbes) {
     // Tell dtrace about this method exit
     save_native_result(masm, ret_type, stack_slots);
     __ mov_metadata(rax, method());
diff --git a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
index 4029e486c9cdf..decaa9d1ee914 100644
--- a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
@@ -2200,8 +2200,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
   // We have all of the arguments setup at this point. We must not touch any register
   // argument registers at this point (what if we save/restore them there are no oop?
 
-  {
-    SkipIfEqual skip(masm, &DTraceMethodProbes, false, rscratch1);
+  if (DTraceMethodProbes) {
     // protect the args we've loaded
     save_args(masm, total_c_args, c_arg, out_regs);
     __ mov_metadata(c_rarg1, method());
@@ -2439,8 +2438,7 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
 
     __ bind(fast_done);
   }
-  {
-    SkipIfEqual skip(masm, &DTraceMethodProbes, false, rscratch1);
+  if (DTraceMethodProbes) {
     save_native_result(masm, ret_type, stack_slots);
     __ mov_metadata(c_rarg1, method());
     __ call_VM_leaf(
diff --git a/src/hotspot/cpu/x86/templateTable_x86.cpp b/src/hotspot/cpu/x86/templateTable_x86.cpp
index 248055337d824..6446ec6598791 100644
--- a/src/hotspot/cpu/x86/templateTable_x86.cpp
+++ b/src/hotspot/cpu/x86/templateTable_x86.cpp
@@ -4123,8 +4123,7 @@ void TemplateTable::_new() {
 #endif
     __ store_klass(rax, rcx, rscratch1);  // klass
 
-    {
-      SkipIfEqual skip_if(_masm, &DTraceAllocProbes, 0, rscratch1);
+    if (DTraceAllocProbes) {
       // Trigger dtrace event for fastpath
       __ push(atos);
       __ call_VM_leaf(

From cf940e139a76e5aabd52379b8a87065d82b2284c Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Thu, 11 Jul 2024 07:03:44 +0000
Subject: [PATCH 046/401] 8335553: [Graal] Compiler thread calls into
 jdk.internal.vm.VMSupport.decodeAndThrowThrowable and crashes in OOM
 situation

Reviewed-by: yzheng, never, dholmes
---
 src/hotspot/share/jvmci/jvmciCompilerToVM.cpp | 29 ++++++++++++
 src/hotspot/share/jvmci/jvmciEnv.cpp          | 10 ++++-
 src/hotspot/share/utilities/exceptions.cpp    |  8 ++--
 .../jdk/internal/vm/TranslatedException.java  | 44 +++++++------------
 .../classes/jdk/internal/vm/VMSupport.java    |  7 ++-
 .../internal/vm/TestTranslatedException.java  | 24 +++++++---
 6 files changed, 81 insertions(+), 41 deletions(-)

diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
index 68168c56b9aac..5583ad8a6f5be 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
@@ -757,6 +757,35 @@ C2V_VMENTRY_NULL(jobject, lookupConstantInPool, (JNIEnv* env, jobject, ARGUMENT_
       return JVMCIENV->get_jobject(result);
     }
   }
+#ifdef ASSERT
+  // Support for testing an OOME raised in a context where the current thread cannot call Java
+  // 1. Put -Dtest.jvmci.oome_in_lookupConstantInPool=<trace> on the command line to
+  //    discover possible values for step 2.
+  //    Example output:
+  //
+  //      CompilerToVM.lookupConstantInPool: "Overflow: String length out of range"{0x00000007ffeb2960}
+  //      CompilerToVM.lookupConstantInPool: "null"{0x00000007ffebdfe8}
+  //      CompilerToVM.lookupConstantInPool: "Maximum lock count exceeded"{0x00000007ffec4f90}
+  //      CompilerToVM.lookupConstantInPool: "Negative length"{0x00000007ffec4468}
+  //
+  // 2. Choose a value shown in step 1.
+  //    Example: -Dtest.jvmci.oome_in_lookupConstantInPool=Negative
+  const char* val = Arguments::PropertyList_get_value(Arguments::system_properties(), "test.jvmci.oome_in_lookupConstantInPool");
+  if (val != nullptr) {
+    const char* str = obj->print_value_string();
+    if (strstr(val, "<trace>") != nullptr) {
+      tty->print_cr("CompilerToVM.lookupConstantInPool: %s", str);
+    } else if (strstr(str, val) != nullptr) {
+      Handle garbage;
+      while (true) {
+        // Trigger an OutOfMemoryError
+        objArrayOop next = oopFactory::new_objectArray(0x7FFFFFFF, CHECK_NULL);
+        next->obj_at_put(0, garbage());
+        garbage = Handle(THREAD, next);
+      }
+    }
+  }
+#endif
   return JVMCIENV->get_jobject(JVMCIENV->get_object_constant(obj));
 C2V_END
 
diff --git a/src/hotspot/share/jvmci/jvmciEnv.cpp b/src/hotspot/share/jvmci/jvmciEnv.cpp
index 01b78b45b2a8e..129a88ac4d7fb 100644
--- a/src/hotspot/share/jvmci/jvmciEnv.cpp
+++ b/src/hotspot/share/jvmci/jvmciEnv.cpp
@@ -399,9 +399,11 @@ class ExceptionTranslation: public StackObj {
     _encoded_ok        = 0, // exception was successfully encoded into buffer
     _buffer_alloc_fail = 1, // native memory for buffer could not be allocated
     _encode_oome_fail  = 2, // OutOfMemoryError thrown during encoding
-    _encode_fail       = 3  // some other problem occured during encoding. If buffer != 0,
+    _encode_fail       = 3, // some other problem occured during encoding. If buffer != 0,
                             // buffer contains a `struct { u4 len; char[len] desc}`
                             // describing the problem
+    _encode_oome_in_vm = 4  // an OutOfMemoryError thrown from within VM code on a
+                            // thread that cannot call Java (OOME has no stack trace)
   };
 
   JVMCIEnv*  _from_env; // Source of translation. Can be null.
@@ -488,6 +490,12 @@ class HotSpotToSharedLibraryExceptionTranslation : public ExceptionTranslation {
 
   int encode(JavaThread* THREAD, jlong buffer, int buffer_size) {
     if (!THREAD->can_call_java()) {
+      Symbol *ex_name = _throwable->klass()->name();
+      if (ex_name == vmSymbols::java_lang_OutOfMemoryError()) {
+        JVMCI_event_1("translating exception: OutOfMemoryError within VM code");
+        decode(THREAD, _encode_oome_in_vm, 0L);
+        return 0;
+      }
       char* char_buffer = print_throwable_to_buffer(_throwable, buffer, buffer_size);
       const char* detail = log_is_enabled(Info, exceptions) ? "" : " (-Xlog:exceptions may give more detail)";
       JVMCI_event_1("cannot call Java to translate exception%s: %s", detail, char_buffer);
diff --git a/src/hotspot/share/utilities/exceptions.cpp b/src/hotspot/share/utilities/exceptions.cpp
index a99c36e7eb61b..78147ea4089ca 100644
--- a/src/hotspot/share/utilities/exceptions.cpp
+++ b/src/hotspot/share/utilities/exceptions.cpp
@@ -111,11 +111,9 @@ bool Exceptions::special_exception(JavaThread* thread, const char* file, int lin
   }
 #endif // ASSERT
 
-  if (!thread->can_call_java()) {
+  if (h_exception.is_null() && !thread->can_call_java()) {
     ResourceMark rm(thread);
-    const char* exc_value = h_exception.not_null() ? h_exception->print_value_string() :
-                      h_name != nullptr ? h_name->as_C_string() :
-                      "null";
+    const char* exc_value = h_name != nullptr ? h_name->as_C_string() : "null";
     log_info(exceptions)("Thread cannot call Java so instead of throwing exception <%s%s%s> (" PTR_FORMAT ") \n"
                         "at [%s, line %d]\nfor thread " PTR_FORMAT ",\n"
                         "throwing pre-allocated exception: %s",
@@ -205,7 +203,7 @@ void Exceptions::_throw_msg_cause(JavaThread* thread, const char* file, int line
 void Exceptions::_throw_cause(JavaThread* thread, const char* file, int line, Symbol* name, Handle h_cause,
                               Handle h_loader, Handle h_protection_domain) {
   // Check for special boot-strapping/compiler-thread handling
-  if (special_exception(thread, file, line, h_cause)) return;
+  if (special_exception(thread, file, line, Handle(), name)) return;
   // Create and throw exception
   Handle h_exception = new_exception(thread, name, h_cause, h_loader, h_protection_domain);
   _throw(thread, file, line, h_exception, nullptr);
diff --git a/src/java.base/share/classes/jdk/internal/vm/TranslatedException.java b/src/java.base/share/classes/jdk/internal/vm/TranslatedException.java
index 662ab25a12295..485d69b522606 100644
--- a/src/java.base/share/classes/jdk/internal/vm/TranslatedException.java
+++ b/src/java.base/share/classes/jdk/internal/vm/TranslatedException.java
@@ -42,9 +42,13 @@
 
 /**
  * Support for translating exceptions between the HotSpot heap and libjvmci heap.
+ *
+ * Successfully translated exceptions are wrapped in a TranslatedException instance.
+ * This allows callers to distiguish between a translated exception and an error
+ * that arose during translation.
  */
 @SuppressWarnings("serial")
-final class TranslatedException extends Exception {
+public final class TranslatedException extends Exception {
 
     /**
      * The value returned by {@link #encodeThrowable(Throwable)} when encoding
@@ -61,15 +65,18 @@ final class TranslatedException extends Exception {
         maybeFailClinit();
         try {
             FALLBACK_ENCODED_THROWABLE_BYTES =
-                encodeThrowable(new TranslatedException("error during encoding",
-                                                        "<unknown>"), false);
+                encodeThrowable(translationFailure("error during encoding"), false);
             FALLBACK_ENCODED_OUTOFMEMORYERROR_BYTES =
-                encodeThrowable(new OutOfMemoryError(), false);
+                encodeThrowable(translationFailure("OutOfMemoryError during encoding"), false);
         } catch (IOException e) {
             throw new InternalError(e);
         }
     }
 
+    private static InternalError translationFailure(String messageFormat, Object... messageArgs) {
+        return new InternalError(messageFormat.formatted(messageArgs));
+    }
+
     /**
      * Helper to test exception translation.
      */
@@ -86,14 +93,8 @@ private static void maybeFailClinit() {
         }
     }
 
-    /**
-     * Class name of exception that could not be instantiated.
-     */
-    private String originalExceptionClassName;
-
-    private TranslatedException(String message, String originalExceptionClassName) {
-        super(message);
-        this.originalExceptionClassName = originalExceptionClassName;
+    TranslatedException(Throwable translated) {
+        super(translated);
     }
 
     /**
@@ -106,18 +107,6 @@ public Throwable fillInStackTrace() {
         return this;
     }
 
-    @Override
-    public String toString() {
-        String s;
-        if (originalExceptionClassName.equals(TranslatedException.class.getName())) {
-            s = getClass().getName();
-        } else {
-            s = getClass().getName() + "[" + originalExceptionClassName + "]";
-        }
-        String message = getMessage();
-        return (message != null) ? (s + ": " + message) : s;
-    }
-
     /**
      * Prints a stack trace for {@code throwable} if the system property
      * {@code "jdk.internal.vm.TranslatedException.debug"} is true.
@@ -163,7 +152,7 @@ private static Throwable create(String className, String message, Throwable caus
             return initCause((Throwable) cons.newInstance(message), cause, debug);
         } catch (Throwable translationFailure) {
             debugPrintStackTrace(translationFailure, debug);
-            return initCause(new TranslatedException(message, className), cause, debug);
+            return initCause(translationFailure("%s [%s]", message, className), cause, debug);
         }
     }
 
@@ -308,11 +297,10 @@ static Throwable decodeThrowable(byte[] encodedThrowable, boolean debug) {
                 throwable.setStackTrace(stackTrace);
                 cause = throwable;
             }
-            return throwable;
+            return new TranslatedException(throwable);
         } catch (Throwable translationFailure) {
             debugPrintStackTrace(translationFailure, debug);
-            return new TranslatedException("Error decoding exception: " + encodedThrowable,
-                                           translationFailure.getClass().getName());
+            return translationFailure("error decoding exception: %s", encodedThrowable);
         }
     }
 }
diff --git a/src/java.base/share/classes/jdk/internal/vm/VMSupport.java b/src/java.base/share/classes/jdk/internal/vm/VMSupport.java
index a8c3b5d4dfa5f..4ffb7ef7ebec0 100644
--- a/src/java.base/share/classes/jdk/internal/vm/VMSupport.java
+++ b/src/java.base/share/classes/jdk/internal/vm/VMSupport.java
@@ -122,6 +122,8 @@ public static byte[] serializeAgentPropertiesToByteArray() throws IOException {
      *             2: an OutOfMemoryError was thrown while encoding the exception
      *             3: some other problem occured while encoding the exception. If {@code buffer != 0},
      *                it contains a {@code struct { u4 len; char[len] desc}} where {@code desc} describes the problem
+     *             4: an OutOfMemoryError thrown from within VM code on a
+     *                thread that cannot call Java (OOME has no stack trace)
      *            </pre>
      * @param buffer encoded info about the exception to throw (depends on {@code format})
      * @param inJVMHeap [@code true} if executing in the JVM heap, {@code false} otherwise
@@ -129,13 +131,16 @@ public static byte[] serializeAgentPropertiesToByteArray() throws IOException {
      */
     public static void decodeAndThrowThrowable(int format, long buffer, boolean inJVMHeap, boolean debug) throws Throwable {
         if (format != 0) {
+            if (format == 4) {
+                throw new TranslatedException(new OutOfMemoryError("in VM code and current thread cannot call Java"));
+            }
             String context = String.format("while encoding an exception to translate it %s the JVM heap",
                     inJVMHeap ? "to" : "from");
             if (format == 1) {
                 throw new InternalError("native buffer could not be allocated " + context);
             }
             if (format == 2) {
-                throw new OutOfMemoryError("OutOfMemoryError occurred " + context);
+                throw new OutOfMemoryError(context);
             }
             if (format == 3 && buffer != 0L) {
                 byte[] bytes = bufferToBytes(buffer);
diff --git a/test/jdk/jdk/internal/vm/TestTranslatedException.java b/test/jdk/jdk/internal/vm/TestTranslatedException.java
index 145e0faf8b4e4..a7d23510a3661 100644
--- a/test/jdk/jdk/internal/vm/TestTranslatedException.java
+++ b/test/jdk/jdk/internal/vm/TestTranslatedException.java
@@ -40,6 +40,7 @@
 import org.testng.annotations.Test;
 
 import jdk.internal.misc.Unsafe;
+import jdk.internal.vm.TranslatedException;
 import jdk.internal.vm.VMSupport;
 
 public class TestTranslatedException {
@@ -100,6 +101,15 @@ public void encodeDecodeTest() throws Exception {
         try {
             VMSupport.decodeAndThrowThrowable(4, 0L, true, false);
             throw new AssertionError("expected decodeAndThrowThrowable to throw an exception");
+        } catch (TranslatedException decoded) {
+            Assert.assertEquals(decoded.getCause().getClass(), OutOfMemoryError.class);
+        } catch (Throwable decoded) {
+            throw new AssertionError("unexpected exception: " + decoded);
+        }
+
+        try {
+            VMSupport.decodeAndThrowThrowable(5, 0L, true, false);
+            throw new AssertionError("expected decodeAndThrowThrowable to throw an exception");
         } catch (InternalError decoded) {
             // Expected
         } catch (Throwable decoded) {
@@ -142,7 +152,7 @@ private void encodeDecode(Throwable throwable) throws Exception {
                         VMSupport.decodeAndThrowThrowable(format, buffer, true, false);
                         throw new AssertionError("expected decodeAndThrowThrowable to throw an exception");
                     } catch (Throwable decoded) {
-                        assertThrowableEquals(throwable, decoded);
+                        assertThrowableEquals(throwable, decoded.getCause());
                     }
                     return;
                 }
@@ -152,13 +162,15 @@ private void encodeDecode(Throwable throwable) throws Exception {
         }
     }
 
-    private static void assertThrowableEquals(Throwable original, Throwable decoded) {
+    private static void assertThrowableEquals(Throwable originalIn, Throwable decodedIn) {
+        Throwable original = originalIn;
+        Throwable decoded = decodedIn;
         try {
             Assert.assertEquals(original == null, decoded == null);
             while (original != null) {
                 if (Untranslatable.class.equals(original.getClass())) {
-                    Assert.assertEquals(decoded.getClass().getName(), "jdk.internal.vm.TranslatedException");
-                    Assert.assertEquals(decoded.toString(), "jdk.internal.vm.TranslatedException[jdk.internal.vm.test.TestTranslatedException$Untranslatable]: test exception");
+                    Assert.assertEquals(decoded.getClass().getName(), "java.lang.InternalError");
+                    Assert.assertEquals(decoded.toString(), "java.lang.InternalError: test exception [jdk.internal.vm.test.TestTranslatedException$Untranslatable]");
                     Assert.assertEquals(original.getMessage(), "test exception");
                 } else {
                     Assert.assertEquals(decoded.getClass().getName(), original.getClass().getName());
@@ -182,10 +194,10 @@ private static void assertThrowableEquals(Throwable original, Throwable decoded)
             }
         } catch (AssertionError e) {
             System.err.println("original:[");
-            original.printStackTrace(System.err);
+            originalIn.printStackTrace(System.err);
             System.err.println("]");
             System.err.println("decoded:[");
-            original.printStackTrace(System.err);
+            decodedIn.printStackTrace(System.err);
             System.err.println("]");
             throw e;
         }

From b7d0eff5ad77e338b237773d2fc047eea3d2ac12 Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevinw@openjdk.org>
Date: Thu, 11 Jul 2024 07:29:37 +0000
Subject: [PATCH 047/401] 8207908: JMXStatusTest.java fails assertion
 intermittently

Reviewed-by: cjplummer, amenkov
---
 .../management/jmxremote/startstop/JMXStatusTest.java  |  5 ++---
 .../jmxremote/startstop/ManagementAgentJcmd.java       | 10 +++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/test/jdk/sun/management/jmxremote/startstop/JMXStatusTest.java b/test/jdk/sun/management/jmxremote/startstop/JMXStatusTest.java
index 1e6259ef0d730..fc1b4883220b6 100644
--- a/test/jdk/sun/management/jmxremote/startstop/JMXStatusTest.java
+++ b/test/jdk/sun/management/jmxremote/startstop/JMXStatusTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -88,8 +88,6 @@ public final void setup() throws Exception {
         args.addAll(getCustomVmArgs());
         args.add(TEST_APP_NAME);
         testAppPb = ProcessTools.createTestJavaProcessBuilder(args);
-
-        jcmd = new ManagementAgentJcmd(TEST_APP_NAME, false);
     }
 
     @BeforeMethod
@@ -98,6 +96,7 @@ public final void startTestApp() throws Exception {
             TEST_APP_NAME, testAppPb,
             (Predicate<String>)l->l.trim().equals("main enter")
         );
+        jcmd = new ManagementAgentJcmd(testApp, false);
     }
 
     @AfterMethod
diff --git a/test/jdk/sun/management/jmxremote/startstop/ManagementAgentJcmd.java b/test/jdk/sun/management/jmxremote/startstop/ManagementAgentJcmd.java
index 0781bc941fd46..7135f6ea2dba4 100644
--- a/test/jdk/sun/management/jmxremote/startstop/ManagementAgentJcmd.java
+++ b/test/jdk/sun/management/jmxremote/startstop/ManagementAgentJcmd.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,11 +47,11 @@ final class ManagementAgentJcmd {
     private static final String CMD_STATUS = "ManagementAgent.status";
     private static final String CMD_PRINTPERF = "PerfCounter.print";
 
-    private final String id;
+    private final long pid;
     private final boolean verbose;
 
-    public ManagementAgentJcmd(String targetApp, boolean verbose) {
-        this.id = targetApp;
+    public ManagementAgentJcmd(Process targetApp, boolean verbose) {
+        this.pid = targetApp.pid();
         this.verbose = verbose;
     }
 
@@ -174,7 +174,7 @@ private String jcmd(String ... command) throws IOException, InterruptedException
      * @throws InterruptedException
      */
     private String jcmd(Consumer<String> c, String ... command) throws IOException, InterruptedException {
-        return jcmd(id, c, command);
+        return jcmd(Long.toString(pid), c, command);
     }
 
     /**

From 1772a929af0c31bf22153cc19c5d11b00273453b Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Thu, 11 Jul 2024 07:35:48 +0000
Subject: [PATCH 048/401] =?UTF-8?q?8334457:=20Test=20javax/swing/JTabbedPa?=
 =?UTF-8?q?ne/bug4666224.java=20fail=20on=20macOS=20with=20because=20press?=
 =?UTF-8?q?ing=20the=20=E2=80=98C=E2=80=99=20key=20does=20not=20switch=20t?=
 =?UTF-8?q?he=20layout=20to=20WRAP=5FTAB=5FLAYOUT?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-by: achung, abhiscxk, tr
---
 test/jdk/javax/swing/JTabbedPane/bug4666224.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/jdk/javax/swing/JTabbedPane/bug4666224.java b/test/jdk/javax/swing/JTabbedPane/bug4666224.java
index eff34db4c3ee8..0ade8002d8c85 100644
--- a/test/jdk/javax/swing/JTabbedPane/bug4666224.java
+++ b/test/jdk/javax/swing/JTabbedPane/bug4666224.java
@@ -49,7 +49,7 @@ public class bug4666224 {
     private static JFrame frame;
 
     private static final String INSTRUCTIONS = """
-                ON ALL PLATFORMS
+                ON ALL PLATFORMS except macos where pt.6 is not applicable
                     1. Click on any of the tabs, focus indicator is visible.
                     2. Lose focus on the window by clicking on some other window.
                     3. Focus indicator should disappear

From 2928753bd95356467e4fe42ee391e45d1cb6e89c Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Thu, 11 Jul 2024 08:18:46 +0000
Subject: [PATCH 049/401] 8324966: Allow selecting jtreg test case by ID from
 make

Reviewed-by: erikj
---
 make/InitSupport.gmk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

From 62cbf70346e78ca94ce6ea4ba5a308ea0a2bbfa8 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Thu, 11 Jul 2024 08:28:25 +0000
Subject: [PATCH 050/401] 8336085: Fix simple -Wzero-as-null-pointer-constant
 warnings in CDS code

Reviewed-by: dholmes, jwaters
---
 src/hotspot/share/cds/archiveBuilder.cpp | 8 ++++----
 src/hotspot/share/cds/filemap.hpp        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index fdbb6605c13e9..76b6698a40099 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -1292,9 +1292,9 @@ class ArchiveBuilder::CDSMapLogger : AllStatic {
 
     address header = address(mapinfo->header());
     address header_end = header + mapinfo->header()->header_size();
-    log_region("header", header, header_end, 0);
+    log_region("header", header, header_end, nullptr);
     log_header(mapinfo);
-    log_as_hex(header, header_end, 0);
+    log_as_hex(header, header_end, nullptr);
 
     DumpRegion* rw_region = &builder->_rw_region;
     DumpRegion* ro_region = &builder->_ro_region;
@@ -1303,8 +1303,8 @@ class ArchiveBuilder::CDSMapLogger : AllStatic {
     log_metaspace_region("ro region", ro_region, &builder->_ro_src_objs);
 
     address bitmap_end = address(bitmap + bitmap_size_in_bytes);
-    log_region("bitmap", address(bitmap), bitmap_end, 0);
-    log_as_hex((address)bitmap, bitmap_end, 0);
+    log_region("bitmap", address(bitmap), bitmap_end, nullptr);
+    log_as_hex((address)bitmap, bitmap_end, nullptr);
 
 #if INCLUDE_CDS_JAVA_HEAP
     if (heap_info->is_used()) {
diff --git a/src/hotspot/share/cds/filemap.hpp b/src/hotspot/share/cds/filemap.hpp
index 54881b8d2375d..7b10c16920b8f 100644
--- a/src/hotspot/share/cds/filemap.hpp
+++ b/src/hotspot/share/cds/filemap.hpp
@@ -298,7 +298,7 @@ class FileMapHeader: private CDSFileMapHeaderBase {
 
   void set_requested_base(char* b) {
     _requested_base_address = b;
-    _mapped_base_address = 0;
+    _mapped_base_address = nullptr;
   }
 
   SharedPathTable shared_path_table() const {

From b32e4a68bca588d908bd81a398eb3171a6876dc5 Mon Sep 17 00:00:00 2001
From: Xiaolong Peng <xpeng@openjdk.org>
Date: Thu, 11 Jul 2024 08:47:15 +0000
Subject: [PATCH 051/401] 8335356: Shenandoah: Improve concurrent cleanup
 locking

Reviewed-by: ysr, shade
---
 .../share/gc/shenandoah/shenandoahFreeSet.cpp | 20 +++++++++++++++----
 .../share/gc/shenandoah/shenandoahFreeSet.hpp |  1 +
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
index 258dfe17b736e..725cfc85da645 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
@@ -577,6 +577,7 @@ void ShenandoahRegionPartitions::assert_bounds() {
 ShenandoahFreeSet::ShenandoahFreeSet(ShenandoahHeap* heap, size_t max_regions) :
   _heap(heap),
   _partitions(max_regions, this),
+  _trash_regions(NEW_C_HEAP_ARRAY(ShenandoahHeapRegion*, max_regions, mtGC)),
   _right_to_left_bias(false),
   _alloc_bias_weight(0)
 {
@@ -899,7 +900,7 @@ HeapWord* ShenandoahFreeSet::allocate_contiguous(ShenandoahAllocRequest& req) {
   return _heap->get_region(beg)->bottom();
 }
 
-void ShenandoahFreeSet::try_recycle_trashed(ShenandoahHeapRegion *r) {
+void ShenandoahFreeSet::try_recycle_trashed(ShenandoahHeapRegion* r) {
   if (r->is_trash()) {
     _heap->decrease_used(r->used());
     r->recycle();
@@ -910,13 +911,24 @@ void ShenandoahFreeSet::recycle_trash() {
   // lock is not reentrable, check we don't have it
   shenandoah_assert_not_heaplocked();
 
+  size_t count = 0;
   for (size_t i = 0; i < _heap->num_regions(); i++) {
     ShenandoahHeapRegion* r = _heap->get_region(i);
     if (r->is_trash()) {
-      ShenandoahHeapLocker locker(_heap->lock());
-      try_recycle_trashed(r);
+      _trash_regions[count++] = r;
+    }
+  }
+
+  // Relinquish the lock after this much time passed.
+  static constexpr jlong deadline_ns = 30000; // 30 us
+  size_t idx = 0;
+  while (idx < count) {
+    os::naked_yield(); // Yield to allow allocators to take the lock
+    ShenandoahHeapLocker locker(_heap->lock());
+    const jlong deadline = os::javaTimeNanos() + deadline_ns;
+    while (idx < count && os::javaTimeNanos() < deadline) {
+      try_recycle_trashed(_trash_regions[idx++]);
     }
-    SpinPause(); // allow allocators to take the lock
   }
 }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
index e4789d48f802e..1975174b78492 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
@@ -258,6 +258,7 @@ class ShenandoahFreeSet : public CHeapObj<mtGC> {
 private:
   ShenandoahHeap* const _heap;
   ShenandoahRegionPartitions _partitions;
+  ShenandoahHeapRegion** _trash_regions;
 
   // Mutator allocations are biased from left-to-right or from right-to-left based on which end of mutator range
   // is most likely to hold partially used regions.  In general, we want to finish consuming partially used

From 6fcd49f9431cc3507f96ef2acdca43fc6a394a14 Mon Sep 17 00:00:00 2001
From: Pavel Rappo <prappo@openjdk.org>
Date: Thu, 11 Jul 2024 10:08:54 +0000
Subject: [PATCH 052/401] 8336239: Fix javadoc markup in java.lang.Process

Reviewed-by: jpai
---
 src/java.base/share/classes/java/lang/Process.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/java/lang/Process.java b/src/java.base/share/classes/java/lang/Process.java
index f9762ffbcdb35..756705285d966 100644
--- a/src/java.base/share/classes/java/lang/Process.java
+++ b/src/java.base/share/classes/java/lang/Process.java
@@ -64,7 +64,7 @@
  * {@link #getInputStream()}, and
  * {@link #getErrorStream()}.
  * The I/O streams of characters and lines can be written and read using the methods
- * {@link #outputWriter()}, {@link #outputWriter(Charset)}},
+ * {@link #outputWriter()}, {@link #outputWriter(Charset)},
  * {@link #inputReader()}, {@link #inputReader(Charset)},
  * {@link #errorReader()}, and {@link #errorReader(Charset)}.
  * The parent process uses these streams to feed input to and get output

From 5c612c230b0a852aed5fd36e58b82ebf2e1838af Mon Sep 17 00:00:00 2001
From: Robbin Ehn <rehn@openjdk.org>
Date: Thu, 11 Jul 2024 10:24:00 +0000
Subject: [PATCH 053/401] 8332689: RISC-V: Use load instead of trampolines

Reviewed-by: fyang, mli, luhenry
---
 src/hotspot/cpu/riscv/c1_CodeStubs_riscv.cpp  |   2 +-
 .../cpu/riscv/c1_LIRAssembler_riscv.cpp       |   2 +-
 .../cpu/riscv/c1_LIRAssembler_riscv.hpp       |   8 +-
 .../cpu/riscv/c2_MacroAssembler_riscv.cpp     |   4 +-
 src/hotspot/cpu/riscv/codeBuffer_riscv.cpp    |   7 +-
 src/hotspot/cpu/riscv/codeBuffer_riscv.hpp    |   2 +-
 src/hotspot/cpu/riscv/compiledIC_riscv.cpp    |   5 +-
 src/hotspot/cpu/riscv/globals_riscv.hpp       |   4 +-
 .../cpu/riscv/jvmciCodeInstaller_riscv.cpp    |   2 +-
 .../cpu/riscv/macroAssembler_riscv.cpp        | 133 +++--
 .../cpu/riscv/macroAssembler_riscv.hpp        |  88 ++-
 src/hotspot/cpu/riscv/nativeInst_riscv.cpp    | 528 +++++++++++++++++-
 src/hotspot/cpu/riscv/nativeInst_riscv.hpp    | 159 ++----
 src/hotspot/cpu/riscv/relocInfo_riscv.cpp     |  15 +-
 src/hotspot/cpu/riscv/riscv.ad                |  32 +-
 src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp |   4 +-
 16 files changed, 720 insertions(+), 275 deletions(-)

diff --git a/src/hotspot/cpu/riscv/c1_CodeStubs_riscv.cpp b/src/hotspot/cpu/riscv/c1_CodeStubs_riscv.cpp
index 1a24f78ad12a6..b7e1b7863efdb 100644
--- a/src/hotspot/cpu/riscv/c1_CodeStubs_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c1_CodeStubs_riscv.cpp
@@ -318,7 +318,7 @@ void ArrayCopyStub::emit_code(LIR_Assembler* ce) {
   }
   Address resolve(SharedRuntime::get_resolve_static_call_stub(),
                   relocInfo::static_call_type);
-  address call = __ trampoline_call(resolve);
+  address call = __ reloc_call(resolve);
   if (call == nullptr) {
     ce->bailout("trampoline stub overflow");
     return;
diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
index b2489268611b7..798679185d3a2 100644
--- a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
@@ -1346,7 +1346,7 @@ void LIR_Assembler::align_call(LIR_Code code) {
 }
 
 void LIR_Assembler::call(LIR_OpJavaCall* op, relocInfo::relocType rtype) {
-  address call = __ trampoline_call(Address(op->addr(), rtype));
+  address call = __ reloc_call(Address(op->addr(), rtype));
   if (call == nullptr) {
     bailout("trampoline stub overflow");
     return;
diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
index ce23213776c08..4388d0cf4d71d 100644
--- a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.hpp
@@ -69,15 +69,15 @@ friend class ArrayCopyStub;
   enum {
     // See emit_static_call_stub for detail
     // CompiledDirectCall::to_interp_stub_size() (14) + CompiledDirectCall::to_trampoline_stub_size() (1 + 3 + address)
-    _call_stub_size = 14 * NativeInstruction::instruction_size +
-                      (NativeInstruction::instruction_size + NativeCallTrampolineStub::instruction_size),
+    _call_stub_size = 14 * MacroAssembler::instruction_size +
+                      (MacroAssembler::instruction_size + MacroAssembler::NativeShortCall::trampoline_size),
     // See emit_exception_handler for detail
     // verify_not_null_oop + far_call + should_not_reach_here + invalidate_registers(DEBUG_ONLY)
     _exception_handler_size = DEBUG_ONLY(584) NOT_DEBUG(548), // or smaller
     // See emit_deopt_handler for detail
     // auipc (1) + far_jump (6 or 2)
-    _deopt_handler_size = 1 * NativeInstruction::instruction_size +
-                          6 * NativeInstruction::instruction_size // or smaller
+    _deopt_handler_size = 1 * MacroAssembler::instruction_size +
+                          6 * MacroAssembler::instruction_size // or smaller
   };
 
   void check_conflict(ciKlass* exact_klass, intptr_t current_klass, Register tmp,
diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
index 3cb2e52c8cb93..d88e4bf320d70 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
@@ -1040,7 +1040,7 @@ void C2_MacroAssembler::string_indexof(Register haystack, Register needle,
     stub = RuntimeAddress(StubRoutines::riscv::string_indexof_linear_uu());
     assert(stub.target() != nullptr, "string_indexof_linear_uu stub has not been generated");
   }
-  address call = trampoline_call(stub);
+  address call = reloc_call(stub);
   if (call == nullptr) {
     DEBUG_ONLY(reset_labels(LINEARSEARCH, DONE, NOMATCH));
     ciEnv::current()->record_failure("CodeCache is full");
@@ -1478,7 +1478,7 @@ void C2_MacroAssembler::string_compare(Register str1, Register str2,
       ShouldNotReachHere();
   }
   assert(stub.target() != nullptr, "compare_long_string stub has not been generated");
-  address call = trampoline_call(stub);
+  address call = reloc_call(stub);
   if (call == nullptr) {
     DEBUG_ONLY(reset_labels(DONE, SHORT_LOOP, SHORT_STRING, SHORT_LAST, SHORT_LOOP_TAIL, SHORT_LAST2, SHORT_LAST_INIT, SHORT_LOOP_START));
     ciEnv::current()->record_failure("CodeCache is full");
diff --git a/src/hotspot/cpu/riscv/codeBuffer_riscv.cpp b/src/hotspot/cpu/riscv/codeBuffer_riscv.cpp
index d62d595e4bc5e..e772959ed0845 100644
--- a/src/hotspot/cpu/riscv/codeBuffer_riscv.cpp
+++ b/src/hotspot/cpu/riscv/codeBuffer_riscv.cpp
@@ -50,17 +50,18 @@ static bool emit_shared_trampolines(CodeBuffer* cb, CodeBuffer::SharedTrampoline
   if (requests == nullptr) {
     return true;
   }
+  assert(UseTrampolines, "We are not using trampolines");
 
   MacroAssembler masm(cb);
 
   auto emit = [&](address dest, const CodeBuffer::Offsets &offsets) {
-    assert(cb->stubs()->remaining() >= MacroAssembler::max_trampoline_stub_size(), "pre-allocated trampolines");
+    assert(cb->stubs()->remaining() >= MacroAssembler::max_reloc_call_stub_size(), "pre-allocated trampolines");
     LinkedListIterator<int> it(offsets.head());
     int offset = *it.next();
     address stub = __ emit_trampoline_stub(offset, dest);
     assert(stub, "pre-allocated trampolines");
 
-    address reloc_pc = cb->stubs()->end() - NativeCallTrampolineStub::instruction_size;
+    address reloc_pc = cb->stubs()->end() - MacroAssembler::NativeShortCall::trampoline_size;
     while (!it.is_empty()) {
       offset = *it.next();
       address caller_pc = cb->insts()->start() + offset;
@@ -70,7 +71,7 @@ static bool emit_shared_trampolines(CodeBuffer* cb, CodeBuffer::SharedTrampoline
   };
 
   assert(requests->number_of_entries() >= 1, "at least one");
-  const int total_requested_size = MacroAssembler::max_trampoline_stub_size() * requests->number_of_entries();
+  const int total_requested_size = MacroAssembler::max_reloc_call_stub_size() * requests->number_of_entries();
   if (cb->stubs()->maybe_expand_to_ensure_remaining(total_requested_size) && cb->blob() == nullptr) {
     return false;
   }
diff --git a/src/hotspot/cpu/riscv/codeBuffer_riscv.hpp b/src/hotspot/cpu/riscv/codeBuffer_riscv.hpp
index 73a7f1cb89f9b..de70bc2ecc935 100644
--- a/src/hotspot/cpu/riscv/codeBuffer_riscv.hpp
+++ b/src/hotspot/cpu/riscv/codeBuffer_riscv.hpp
@@ -33,7 +33,7 @@
 
 public:
   void flush_bundle(bool start_new_bundle) {}
-  static constexpr bool supports_shared_stubs() { return true; }
+  static bool supports_shared_stubs() { return UseTrampolines; }
 
   void share_trampoline_for(address dest, int caller_offset);
 
diff --git a/src/hotspot/cpu/riscv/compiledIC_riscv.cpp b/src/hotspot/cpu/riscv/compiledIC_riscv.cpp
index 60dceb3ada734..4bbea8f356f0b 100644
--- a/src/hotspot/cpu/riscv/compiledIC_riscv.cpp
+++ b/src/hotspot/cpu/riscv/compiledIC_riscv.cpp
@@ -69,10 +69,9 @@ int CompiledDirectCall::to_interp_stub_size() {
 }
 
 int CompiledDirectCall::to_trampoline_stub_size() {
-  // Somewhat pessimistically, we count 4 instructions here (although
-  // there are only 3) because we sometimes emit an alignment nop.
+  // We count instructions and an additional alignment nop.
   // Trampoline stubs are always word aligned.
-  return MacroAssembler::max_trampoline_stub_size();
+  return MacroAssembler::max_reloc_call_stub_size();
 }
 
 // Relocation entries for call stub, compiled java to interpreter.
diff --git a/src/hotspot/cpu/riscv/globals_riscv.hpp b/src/hotspot/cpu/riscv/globals_riscv.hpp
index c39b29f6ee4a7..c2585f2d1618d 100644
--- a/src/hotspot/cpu/riscv/globals_riscv.hpp
+++ b/src/hotspot/cpu/riscv/globals_riscv.hpp
@@ -120,6 +120,8 @@ define_pd_global(intx, InlineSmallCode,          1000);
   product(bool, UseZvkn, false, EXPERIMENTAL,                                    \
           "Use Zvkn group extension, Zvkned, Zvknhb, Zvkb, Zvkt")                \
   product(bool, UseRVVForBigIntegerShiftIntrinsics, true,                        \
-          "Use RVV instructions for left/right shift of BigInteger")
+          "Use RVV instructions for left/right shift of BigInteger")             \
+  product(bool, UseTrampolines, false, EXPERIMENTAL,                             \
+          "Far calls uses jal to trampoline.")
 
 #endif // CPU_RISCV_GLOBALS_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/jvmciCodeInstaller_riscv.cpp b/src/hotspot/cpu/riscv/jvmciCodeInstaller_riscv.cpp
index ba3d9c99aceb1..a366ef6171dd0 100644
--- a/src/hotspot/cpu/riscv/jvmciCodeInstaller_riscv.cpp
+++ b/src/hotspot/cpu/riscv/jvmciCodeInstaller_riscv.cpp
@@ -39,7 +39,7 @@
 jint CodeInstaller::pd_next_offset(NativeInstruction* inst, jint pc_offset, JVMCI_TRAPS) {
   address pc = (address) inst;
   if (inst->is_call()) {
-    return pc_offset + NativeCall::instruction_size;
+    return pc_offset + NativeCall::byte_size();
   } else if (inst->is_jump()) {
     return pc_offset + NativeJump::instruction_size;
   } else if (inst->is_movptr1()) {
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index b3ae5fbcdd02b..e349eab317760 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -978,36 +978,23 @@ void MacroAssembler::li(Register Rd, int64_t imm) {
   }
 }
 
+void MacroAssembler::load_link_jump(const address source, Register temp) {
+  assert(temp != noreg && temp != x0, "expecting a register");
+  assert_cond(source != nullptr);
+  int64_t distance = source - pc();
+  assert(is_simm32(distance), "Must be");
+  auipc(temp, (int32_t)distance + 0x800);
+  ld(temp, Address(temp, ((int32_t)distance << 20) >> 20));
+  jalr(temp);
+}
+
 void MacroAssembler::jump_link(const address dest, Register temp) {
+  assert(UseTrampolines, "Must be");
   assert_cond(dest != nullptr);
   int64_t distance = dest - pc();
-  if (is_simm21(distance) && ((distance % 2) == 0)) {
-    Assembler::jal(x1, distance);
-  } else {
-    assert(temp != noreg && temp != x0, "expecting a register");
-    int32_t offset = 0;
-    la(temp, dest, offset);
-    jalr(temp, offset);
-  }
-}
-
-void MacroAssembler::jump_link(const Address &adr, Register temp) {
-  switch (adr.getMode()) {
-    case Address::literal: {
-      relocate(adr.rspec(), [&] {
-        jump_link(adr.target(), temp);
-      });
-      break;
-    }
-    case Address::base_plus_offset: {
-      int32_t offset = ((int32_t)adr.offset() << 20) >> 20;
-      la(temp, Address(adr.base(), adr.offset() - offset));
-      jalr(temp, offset);
-      break;
-    }
-    default:
-      ShouldNotReachHere();
-  }
+  assert(is_simm21(distance), "Must be");
+  assert((distance % 2) == 0, "Must be");
+  jal(x1, distance);
 }
 
 void MacroAssembler::j(const address dest, Register temp) {
@@ -3941,15 +3928,7 @@ bool MacroAssembler::lookup_secondary_supers_table(Register r_sub_klass,
   // The next slot to be inspected, by the stub we're about to call,
   // is secondary_supers[r_array_index]. Bits 0 and 1 in the bitmap
   // have been checked.
-  Address stub = RuntimeAddress(StubRoutines::lookup_secondary_supers_table_slow_path_stub());
-  if (stub_is_near) {
-    jump_link(stub, t0);
-  } else {
-    address call = trampoline_call(stub);
-    if (call == nullptr) {
-      return false; // trampoline allocation failed
-    }
-  }
+  rt_call(StubRoutines::lookup_secondary_supers_table_slow_path_stub());
 
   BLOCK_COMMENT("} lookup_secondary_supers_table");
 
@@ -4258,12 +4237,42 @@ address MacroAssembler::trampoline_call(Address entry) {
   return call_pc;
 }
 
+address MacroAssembler::load_and_call(Address entry) {
+  assert(entry.rspec().type() == relocInfo::runtime_call_type ||
+         entry.rspec().type() == relocInfo::opt_virtual_call_type ||
+         entry.rspec().type() == relocInfo::static_call_type ||
+         entry.rspec().type() == relocInfo::virtual_call_type, "wrong reloc type");
+
+  address target = entry.target();
+
+  if (!in_scratch_emit_size()) {
+    address stub = emit_address_stub(offset(), target);
+    if (stub == nullptr) {
+      postcond(pc() == badAddress);
+      return nullptr; // CodeCache is full
+    }
+  }
+
+  address call_pc = pc();
+#ifdef ASSERT
+  if (entry.rspec().type() != relocInfo::runtime_call_type) {
+    assert_alignment(call_pc);
+  }
+#endif
+  relocate(entry.rspec(), [&] {
+    load_link_jump(target);
+  });
+
+  postcond(pc() != badAddress);
+  return call_pc;
+}
+
 address MacroAssembler::ic_call(address entry, jint method_index) {
   RelocationHolder rh = virtual_call_Relocation::spec(pc(), method_index);
   IncompressibleRegion ir(this);  // relocations
   movptr(t1, (address)Universe::non_oop_word(), t0);
   assert_cond(entry != nullptr);
-  return trampoline_call(Address(entry, rh));
+  return reloc_call(Address(entry, rh));
 }
 
 int MacroAssembler::ic_check_size() {
@@ -4308,6 +4317,34 @@ int MacroAssembler::ic_check(int end_alignment) {
   return uep_offset;
 }
 
+address MacroAssembler::emit_address_stub(int insts_call_instruction_offset, address dest) {
+  address stub = start_a_stub(max_reloc_call_stub_size());
+  if (stub == nullptr) {
+    return nullptr;  // CodeBuffer::expand failed
+  }
+
+  // We are always 4-byte aligned here.
+  assert_alignment(pc());
+
+  // Make sure the address of destination 8-byte aligned.
+  align(wordSize, 0);
+
+  RelocationHolder rh = trampoline_stub_Relocation::spec(code()->insts()->start() +
+                                                         insts_call_instruction_offset);
+  const int stub_start_offset = offset();
+  relocate(rh, [&] {
+    assert(offset() - stub_start_offset == 0,
+           "%ld - %ld == %ld : should be", (long)offset(), (long)stub_start_offset, (long)0);
+    assert(offset() % wordSize == 0, "bad alignment");
+    emit_int64((int64_t)dest);
+  });
+
+  const address stub_start_addr = addr_at(stub_start_offset);
+  end_a_stub();
+
+  return stub_start_addr;
+}
+
 // Emit a trampoline stub for a call to a target which is too far away.
 //
 // code sequences:
@@ -4322,11 +4359,13 @@ int MacroAssembler::ic_check(int end_alignment) {
 address MacroAssembler::emit_trampoline_stub(int insts_call_instruction_offset,
                                              address dest) {
   // Max stub size: alignment nop, TrampolineStub.
-  address stub = start_a_stub(max_trampoline_stub_size());
+  address stub = start_a_stub(max_reloc_call_stub_size());
   if (stub == nullptr) {
     return nullptr;  // CodeBuffer::expand failed
   }
 
+  assert(UseTrampolines, "Must be using trampos.");
+
   // We are always 4-byte aligned here.
   assert_alignment(pc());
 
@@ -4335,7 +4374,7 @@ address MacroAssembler::emit_trampoline_stub(int insts_call_instruction_offset,
   // instructions code-section.
 
   // Make sure the address of destination 8-byte aligned after 3 instructions.
-  align(wordSize, MacroAssembler::trampoline_stub_data_offset);
+  align(wordSize, MacroAssembler::NativeShortCall::trampoline_data_offset);
 
   RelocationHolder rh = trampoline_stub_Relocation::spec(code()->insts()->start() +
                                                          insts_call_instruction_offset);
@@ -4348,7 +4387,7 @@ address MacroAssembler::emit_trampoline_stub(int insts_call_instruction_offset,
     ld(t0, target);  // auipc + ld
     jr(t0);          // jalr
     bind(target);
-    assert(offset() - stub_start_offset == MacroAssembler::trampoline_stub_data_offset,
+    assert(offset() - stub_start_offset == MacroAssembler::NativeShortCall::trampoline_data_offset,
            "should be");
     assert(offset() % wordSize == 0, "bad alignment");
     emit_int64((int64_t)dest);
@@ -4356,15 +4395,17 @@ address MacroAssembler::emit_trampoline_stub(int insts_call_instruction_offset,
 
   const address stub_start_addr = addr_at(stub_start_offset);
 
-  assert(MacroAssembler::is_trampoline_stub_at(stub_start_addr), "doesn't look like a trampoline");
-
   end_a_stub();
+
   return stub_start_addr;
 }
 
-int MacroAssembler::max_trampoline_stub_size() {
+int MacroAssembler::max_reloc_call_stub_size() {
   // Max stub size: alignment nop, TrampolineStub.
-  return MacroAssembler::instruction_size + MacroAssembler::trampoline_stub_instruction_size;
+  if (UseTrampolines) {
+    return instruction_size + MacroAssembler::NativeShortCall::trampoline_size;
+  }
+  return instruction_size + wordSize;
 }
 
 int MacroAssembler::static_call_stub_size() {
@@ -5083,14 +5124,14 @@ address MacroAssembler::zero_words(Register ptr, Register cnt) {
     RuntimeAddress zero_blocks(StubRoutines::riscv::zero_blocks());
     assert(zero_blocks.target() != nullptr, "zero_blocks stub has not been generated");
     if (StubRoutines::riscv::complete()) {
-      address tpc = trampoline_call(zero_blocks);
+      address tpc = reloc_call(zero_blocks);
       if (tpc == nullptr) {
         DEBUG_ONLY(reset_labels(around));
         postcond(pc() == badAddress);
         return nullptr;
       }
     } else {
-      jump_link(zero_blocks, t0);
+      rt_call(zero_blocks.target());
     }
   }
   bind(around);
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
index ea2b9229eab47..3c1add9036763 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
@@ -466,8 +466,10 @@ class MacroAssembler: public Assembler {
     return false;
   }
 
+  address emit_address_stub(int insts_call_instruction_offset, address target);
   address emit_trampoline_stub(int insts_call_instruction_offset, address target);
-  static int max_trampoline_stub_size();
+  static int max_reloc_call_stub_size();
+
   void emit_static_call_stub();
   static int static_call_stub_size();
 
@@ -623,8 +625,8 @@ class MacroAssembler: public Assembler {
   void bgtz(Register Rs, const address dest);
 
  private:
+  void load_link_jump(const address source, Register temp = t0);
   void jump_link(const address dest, Register temp);
-  void jump_link(const Address &adr, Register temp);
  public:
   // We try to follow risc-v asm menomics.
   // But as we don't layout a reachable GOT,
@@ -1205,7 +1207,27 @@ class MacroAssembler: public Assembler {
   //     be used instead.
   //     All instructions are embedded at a call site.
   //
-  //   - trampoline call:
+  //   - indirect call: movptr + jalr
+  //     This too can reach anywhere in the address space, but it cannot be
+  //     patched while code is running, so it must only be modified at a safepoint.
+  //     This form of call is most suitable for targets at fixed addresses, which
+  //     will never be patched.
+  //
+  //   - reloc call:
+  //     This is only available in C1/C2-generated code (nmethod).
+  //
+  //     [Main code section]
+  //       auipc
+  //       ld <address_from_stub_section>
+  //       jalr
+  //     [Stub section]
+  //     trampoline:
+  //       <64-bit destination address>
+  //
+  //    To change the destination we simply atomically store the new
+  //    address in the stub section.
+  //
+  // - trampoline call (old reloc call / -XX:+UseTrampolines):
   //     This is only available in C1/C2-generated code (nmethod). It is a combination
   //     of a direct call, which is used if the destination of a call is in range,
   //     and a register-indirect call. It has the advantages of reaching anywhere in
@@ -1224,18 +1246,11 @@ class MacroAssembler: public Assembler {
   //     cache, 'jal trampoline' is replaced with 'jal destination' and the trampoline
   //     is not used.
   //     The optimization does not remove the trampoline from the stub section.
-
+  //
   //     This is necessary because the trampoline may well be redirected later when
   //     code is patched, and the new destination may not be reachable by a simple JAL
   //     instruction.
   //
-  //   - indirect call: movptr + jalr
-  //     This too can reach anywhere in the address space, but it cannot be
-  //     patched while code is running, so it must only be modified at a safepoint.
-  //     This form of call is most suitable for targets at fixed addresses, which
-  //     will never be patched.
-  //
-  //
   // To patch a trampoline call when the JAL can't reach, we first modify
   // the 64-bit destination address in the trampoline, then modify the
   // JAL to point to the trampoline, then flush the instruction cache to
@@ -1248,9 +1263,10 @@ class MacroAssembler: public Assembler {
   // invalidated, so there will be a trap at its start.
   // For this to work, the destination address in the trampoline is
   // always updated, even if we're not using the trampoline.
+  // --
 
   // Emit a direct call if the entry address will always be in range,
-  // otherwise a trampoline call.
+  // otherwise a reloc call.
   // Supported entry.rspec():
   // - relocInfo::runtime_call_type
   // - relocInfo::opt_virtual_call_type
@@ -1258,7 +1274,13 @@ class MacroAssembler: public Assembler {
   // - relocInfo::virtual_call_type
   //
   // Return: the call PC or null if CodeCache is full.
+  address reloc_call(Address entry) {
+    return UseTrampolines ? trampoline_call(entry) : load_and_call(entry);
+  }
+ private:
   address trampoline_call(Address entry);
+  address load_and_call(Address entry);
+ public:
 
   address ic_call(address entry, jint method_index = 0);
   static int ic_check_size();
@@ -1585,51 +1607,20 @@ class MacroAssembler: public Assembler {
 
 public:
   enum {
-    // Refer to function emit_trampoline_stub.
-    trampoline_stub_instruction_size = 3 * instruction_size + wordSize, // auipc + ld + jr + target address
-    trampoline_stub_data_offset      = 3 * instruction_size,            // auipc + ld + jr
-
     // movptr
     movptr1_instruction_size = 6 * instruction_size, // lui, addi, slli, addi, slli, addi.  See movptr1().
     movptr2_instruction_size = 5 * instruction_size, // lui, lui, slli, add, addi.  See movptr2().
     load_pc_relative_instruction_size = 2 * instruction_size // auipc, ld
   };
 
+  enum NativeShortCall {
+    trampoline_size        = 3 * instruction_size + wordSize,
+    trampoline_data_offset = 3 * instruction_size
+  };
+
   static bool is_load_pc_relative_at(address branch);
   static bool is_li16u_at(address instr);
 
-  static bool is_trampoline_stub_at(address addr) {
-    // Ensure that the stub is exactly
-    //      ld   t0, L--->auipc + ld
-    //      jr   t0
-    // L:
-
-    // judge inst + register + imm
-    // 1). check the instructions: auipc + ld + jalr
-    // 2). check if auipc[11:7] == t0 and ld[11:7] == t0 and ld[19:15] == t0 && jr[19:15] == t0
-    // 3). check if the offset in ld[31:20] equals the data_offset
-    assert_cond(addr != nullptr);
-    const int instr_size = instruction_size;
-    if (is_auipc_at(addr) &&
-        is_ld_at(addr + instr_size) &&
-        is_jalr_at(addr + 2 * instr_size) &&
-        (extract_rd(addr)                    == x5) &&
-        (extract_rd(addr + instr_size)       == x5) &&
-        (extract_rs1(addr + instr_size)      == x5) &&
-        (extract_rs1(addr + 2 * instr_size)  == x5) &&
-        (Assembler::extract(Assembler::ld_instr(addr + 4), 31, 20) == trampoline_stub_data_offset)) {
-      return true;
-    }
-    return false;
-  }
-
-  static bool is_call_at(address instr) {
-    if (is_jal_at(instr) || is_jalr_at(instr)) {
-      return true;
-    }
-    return false;
-  }
-
   static bool is_jal_at(address instr)        { assert_cond(instr != nullptr); return extract_opcode(instr) == 0b1101111; }
   static bool is_jalr_at(address instr)       { assert_cond(instr != nullptr); return extract_opcode(instr) == 0b1100111 && extract_funct3(instr) == 0b000; }
   static bool is_branch_at(address instr)     { assert_cond(instr != nullptr); return extract_opcode(instr) == 0b1100011; }
@@ -1664,7 +1655,6 @@ class MacroAssembler: public Assembler {
 
   static bool is_lwu_to_zr(address instr);
 
-private:
   static Register extract_rs1(address instr);
   static Register extract_rs2(address instr);
   static Register extract_rd(address instr);
diff --git a/src/hotspot/cpu/riscv/nativeInst_riscv.cpp b/src/hotspot/cpu/riscv/nativeInst_riscv.cpp
index 348a00b6767f9..f0357f1cd3029 100644
--- a/src/hotspot/cpu/riscv/nativeInst_riscv.cpp
+++ b/src/hotspot/cpu/riscv/nativeInst_riscv.cpp
@@ -39,71 +39,228 @@
 #include "c1/c1_Runtime1.hpp"
 #endif
 
-void NativeCall::verify() {
-  assert(MacroAssembler::is_call_at((address)this), "unexpected code at call site");
+//-----------------------------------------------------------------------------
+// NativeInstruction
+
+bool NativeInstruction::is_call_at(address addr) {
+  return NativeCall::is_at(addr);
 }
 
-address NativeCall::destination() const {
-  address addr = (address)this;
+//-----------------------------------------------------------------------------
+// NativeShortCallTrampoline
+//
+// Implements the trampoline part of reloc call - trampoline call.
+
+class NativeShortCall;
+
+class NativeShortCallTrampolineStub : public NativeInstruction {
+ private:
+  friend NativeShortCall;
+  enum RISCV_specific_constants {
+    trampoline_data_offset = 3 * NativeInstruction::instruction_size // auipc + ld + jr
+  };
+
+  address destination() const;
+  void set_destination(address new_destination);
+
+  static bool is_at(address addr);
+  static NativeShortCallTrampolineStub* at(address addr);
+};
+
+address NativeShortCallTrampolineStub::destination() const {
+  return ptr_at(trampoline_data_offset);
+}
+
+void NativeShortCallTrampolineStub::set_destination(address new_destination) {
+  set_ptr_at(trampoline_data_offset, new_destination);
+  OrderAccess::release();
+}
+
+bool NativeShortCallTrampolineStub::is_at(address addr) {
+  // Ensure that the stub is exactly
+  //      ld   t0, L--->auipc + ld
+  //      jr   t0
+  // L:
+
+  // judge inst + register + imm
+  // 1). check the instructions: auipc + ld + jalr
+  // 2). check if auipc[11:7] == t0 and ld[11:7] == t0 and ld[19:15] == t0 && jr[19:15] == t0
+  // 3). check if the offset in ld[31:20] equals the data_offset
+  assert_cond(addr != nullptr);
+  const int instr_size = NativeInstruction::instruction_size;
+  if (MacroAssembler::is_auipc_at(addr) &&
+      MacroAssembler::is_ld_at(addr + instr_size) &&
+      MacroAssembler::is_jalr_at(addr + 2 * instr_size) &&
+      (MacroAssembler::extract_rd(addr)                    == x5) &&
+      (MacroAssembler::extract_rd(addr + instr_size)       == x5) &&
+      (MacroAssembler::extract_rs1(addr + instr_size)      == x5) &&
+      (MacroAssembler::extract_rs1(addr + 2 * instr_size)  == x5) &&
+      (Assembler::extract(Assembler::ld_instr(addr + 4), 31, 20) == trampoline_data_offset)) {
+    return true;
+  }
+  return false;
+}
+
+NativeShortCallTrampolineStub* NativeShortCallTrampolineStub::at(address addr) {
+  assert_cond(addr != nullptr);
+  assert(NativeShortCallTrampolineStub::is_at(addr), "no call trampoline found");
+  return (NativeShortCallTrampolineStub*)addr;
+}
+
+//-----------------------------------------------------------------------------
+// NativeShortCall
+//
+// Implements the trampoline call, a short call with a trampoline, version of reloc call.
+// Enabled by setting the experimental UseTrampolines to true.
+
+class NativeShortCall: private NativeInstruction {
+ public:
+  enum RISCV_specific_constants {
+    return_address_offset       =    1 * NativeInstruction::instruction_size // jal
+  };
+
+  address instruction_address() const       { return addr_at(0); }
+  address next_instruction_address() const  { return addr_at(return_address_offset); }
+  address return_address() const            { return addr_at(return_address_offset); }
+  address destination() const;
+  address reloc_destination(address orig_address);
+
+  void set_destination(address dest);
+  void verify();
+  void print();
+
+  bool set_destination_mt_safe(address dest, bool assert_lock = true);
+  bool reloc_set_destination(address dest);
+
+ private:
+  address get_trampoline();
+  bool has_trampoline();
+  address trampoline_destination();
+ public:
+
+  static NativeShortCall* at(address addr);
+  static bool is_at(address addr);
+  static bool is_call_before(address return_address);
+};
+
+address NativeShortCall::destination() const {
+  address addr = instruction_address();
   assert(MacroAssembler::is_jal_at(instruction_address()), "inst must be jal.");
+
   address destination = MacroAssembler::target_addr_for_insn(instruction_address());
 
   // Do we use a trampoline stub for this call?
   CodeBlob* cb = CodeCache::find_blob(addr);
   assert(cb && cb->is_nmethod(), "sanity");
   nmethod *nm = (nmethod *)cb;
-  if (nm != nullptr && nm->stub_contains(destination) && MacroAssembler::is_trampoline_stub_at(destination)) {
+  if (nm != nullptr && nm->stub_contains(destination) && NativeShortCallTrampolineStub::is_at(destination)) {
     // Yes we do, so get the destination from the trampoline stub.
     const address trampoline_stub_addr = destination;
-    destination = nativeCallTrampolineStub_at(trampoline_stub_addr)->destination();
+    destination = NativeShortCallTrampolineStub::at(trampoline_stub_addr)->destination();
   }
 
   return destination;
 }
 
-// Similar to replace_mt_safe, but just changes the destination. The
-// important thing is that free-running threads are able to execute this
-// call instruction at all times.
+address NativeShortCall::reloc_destination(address orig_address) {
+  address addr = instruction_address();
+  if (NativeShortCall::is_at(addr)) {
+    NativeShortCall* call = NativeShortCall::at(addr);
+    if (call->has_trampoline()) {
+      return call->trampoline_destination();
+    }
+  }
+  if (orig_address != nullptr) {
+    // the extracted address from the instructions in address orig_addr
+    address new_addr = MacroAssembler::pd_call_destination(orig_address);
+    // If call is branch to self, don't try to relocate it, just leave it
+    // as branch to self. This happens during code generation if the code
+    // buffer expands. It will be relocated to the trampoline above once
+    // code generation is complete.
+    new_addr = (new_addr == orig_address) ? addr : new_addr;
+    return new_addr;
+  }
+  return MacroAssembler::pd_call_destination(addr);
+}
+
+void NativeShortCall::set_destination(address dest) {
+  assert(NativeShortCall::is_at(instruction_address()), "unexpected code at call site");
+  assert(is_jal(), "Should be jal instruction!");
+  intptr_t offset = (intptr_t)(dest - instruction_address());
+  assert((offset & 0x1) == 0, "bad alignment");
+  assert(Assembler::is_simm21(offset), "encoding constraint");
+  unsigned int insn = 0b1101111; // jal
+  address pInsn = (address)(&insn);
+  Assembler::patch(pInsn, 31, 31, (offset >> 20) & 0x1);
+  Assembler::patch(pInsn, 30, 21, (offset >> 1) & 0x3ff);
+  Assembler::patch(pInsn, 20, 20, (offset >> 11) & 0x1);
+  Assembler::patch(pInsn, 19, 12, (offset >> 12) & 0xff);
+  Assembler::patch(pInsn, 11, 7, ra->encoding()); // Rd must be x1, need ra
+  set_int_at(0, insn);
+}
+
+void NativeShortCall::verify() {
+  assert(NativeShortCall::is_at(instruction_address()),
+         "unexpected code at call site: %p", instruction_address());
+}
+
+void NativeShortCall::print() {
+  assert(NativeShortCall::is_at(instruction_address()), "unexpected code at call site");
+  tty->print_cr(PTR_FORMAT ": jal/auipc,ld,jalr x1, offset/reg", p2i(instruction_address()));
+}
+
+// The important thing is that threads are able to execute this
+// call instruction at all times. (cmodx)
 //
 // Used in the runtime linkage of calls; see class CompiledIC.
 //
 // Add parameter assert_lock to switch off assertion
 // during code generation, where no patching lock is needed.
-void NativeCall::set_destination_mt_safe(address dest, bool assert_lock) {
+bool NativeShortCall::set_destination_mt_safe(address dest, bool assert_lock) {
   assert(!assert_lock ||
          (Patching_lock->is_locked() || SafepointSynchronize::is_at_safepoint()) ||
-         CompiledICLocker::is_safe(addr_at(0)),
+         CompiledICLocker::is_safe(instruction_address()),
          "concurrent code patching");
 
-  address addr_call = addr_at(0);
-  assert(MacroAssembler::is_call_at(addr_call), "unexpected code at call site");
+  address call_addr = instruction_address();
+  assert(NativeCall::is_at(call_addr), "unexpected code at call site");
+
+  reloc_set_destination(dest);
+
+  ICache::invalidate_range(call_addr, instruction_size);
+  return true;
+}
+
+bool NativeShortCall::reloc_set_destination(address dest) {
+  address call_addr = instruction_address();
+  assert(NativeCall::is_at(call_addr), "unexpected code at call site");
 
   // Patch the constant in the call's trampoline stub.
   address trampoline_stub_addr = get_trampoline();
   if (trampoline_stub_addr != nullptr) {
-    assert (!MacroAssembler::is_trampoline_stub_at(dest), "chained trampolines");
-    nativeCallTrampolineStub_at(trampoline_stub_addr)->set_destination(dest);
+    assert(!NativeShortCallTrampolineStub::is_at(dest), "chained trampolines");
+    NativeShortCallTrampolineStub::at(trampoline_stub_addr)->set_destination(dest);
   }
 
   // Patch the call.
-  if (Assembler::reachable_from_branch_at(addr_call, dest)) {
+  if (Assembler::reachable_from_branch_at(call_addr, dest)) {
     set_destination(dest);
   } else {
     assert (trampoline_stub_addr != nullptr, "we need a trampoline");
     set_destination(trampoline_stub_addr);
   }
 
-  ICache::invalidate_range(addr_call, instruction_size);
+  return true;
 }
 
-address NativeCall::get_trampoline() {
-  address call_addr = addr_at(0);
+address NativeShortCall::get_trampoline() {
+  address call_addr = instruction_address();
 
   CodeBlob *code = CodeCache::find_blob(call_addr);
   assert(code != nullptr, "Could not find the containing code blob");
 
   address jal_destination = MacroAssembler::pd_call_destination(call_addr);
-  if (code != nullptr && code->contains(jal_destination) && MacroAssembler::is_trampoline_stub_at(jal_destination)) {
+  if (code != nullptr && code->contains(jal_destination) && NativeShortCallTrampolineStub::is_at(jal_destination)) {
     return jal_destination;
   }
 
@@ -114,8 +271,326 @@ address NativeCall::get_trampoline() {
   return nullptr;
 }
 
-// Inserts a native call instruction at a given pc
-void NativeCall::insert(address code_pos, address entry) { Unimplemented(); }
+bool NativeShortCall::has_trampoline() {
+  return NativeShortCall::get_trampoline() != nullptr;
+}
+
+address NativeShortCall::trampoline_destination() {
+  return NativeShortCallTrampolineStub::at(get_trampoline())->destination();
+}
+
+NativeShortCall* NativeShortCall::at(address addr) {
+  assert_cond(addr != nullptr);
+  assert(NativeShortCall::is_at(addr), "unexpected code at call site: %p", addr);
+  NativeShortCall* call = (NativeShortCall*)(addr);
+  return call;
+}
+
+bool NativeShortCall::is_at(address addr) {
+  if (MacroAssembler::is_jal_at(addr)) {
+    if (MacroAssembler::extract_rd(addr)  == x1) {
+      return true;
+    }
+  }
+  return false;
+}
+
+bool NativeShortCall::is_call_before(address return_address) {
+  return NativeShortCall::is_at(return_address - instruction_size);
+}
+
+//-----------------------------------------------------------------------------
+// NativeFarCall
+//
+// Implements direct far calling loading an address from the stub section version of reloc call.
+// This is the default (experimental flag UseTrampolines, default false).
+
+class NativeFarCall: public NativeInstruction {
+ public:
+  enum RISCV_specific_constants {
+    return_address_offset       =    3 * NativeInstruction::instruction_size, // auipc + ld + jalr
+  };
+
+  address instruction_address() const       { return addr_at(0); }
+  address next_instruction_address() const  { return addr_at(return_address_offset); }
+  address return_address() const            { return addr_at(return_address_offset); }
+  address destination() const;
+  address reloc_destination(address orig_address);
+
+  void set_destination(address dest);
+  void verify();
+  void print();
+
+  bool set_destination_mt_safe(address dest, bool assert_lock = true);
+  bool reloc_set_destination(address dest);
+
+ private:
+  address stub_address();
+
+  static void set_stub_address_destination_at(address dest, address value);
+  static address stub_address_destination_at(address src);
+ public:
+
+  static NativeFarCall* at(address addr);
+  static bool is_at(address addr);
+  static bool is_call_before(address return_address);
+};
+
+address NativeFarCall::destination() const {
+  address addr = instruction_address();
+  assert(NativeFarCall::is_at(addr), "unexpected code at call site");
+
+  address destination = MacroAssembler::target_addr_for_insn(addr);
+
+  CodeBlob* cb = CodeCache::find_blob(addr);
+  assert(cb && cb->is_nmethod(), "sanity");
+  nmethod *nm = (nmethod *)cb;
+  assert(nm != nullptr, "Sanity");
+  assert(nm->stub_contains(destination), "Sanity");
+  assert(destination != nullptr, "Sanity");
+  return stub_address_destination_at(destination);
+}
+
+address NativeFarCall::reloc_destination(address orig_address) {
+  address call_addr = instruction_address();
+
+  CodeBlob *code = CodeCache::find_blob(call_addr);
+  assert(code != nullptr, "Could not find the containing code blob");
+
+  address stub_addr = nullptr;
+  if (code != nullptr && code->is_nmethod()) {
+    stub_addr = trampoline_stub_Relocation::get_trampoline_for(call_addr, (nmethod*)code);
+  }
+
+  if (stub_addr != nullptr) {
+    stub_addr = MacroAssembler::target_addr_for_insn(call_addr);
+  }
+  return stub_addr;
+}
+
+void NativeFarCall::set_destination(address dest) {
+  address addr = instruction_address();
+  assert(NativeFarCall::is_at(addr), "unexpected code at call site");
+  Unimplemented();
+}
+
+void NativeFarCall::verify() {
+  assert(NativeFarCall::is_at(instruction_address()), "unexpected code at call site");
+}
+
+void NativeFarCall::print() {
+  assert(NativeFarCall::is_at(instruction_address()), "unexpected code at call site");
+  tty->print_cr(PTR_FORMAT ": auipc,ld,jalr x1, offset/reg, ", p2i(addr_at(0)));
+}
+
+bool NativeFarCall::set_destination_mt_safe(address dest, bool assert_lock) {
+  assert(NativeFarCall::is_at(addr_at(0)), "unexpected code at call site");
+  assert(!assert_lock ||
+         (Patching_lock->is_locked() || SafepointSynchronize::is_at_safepoint()) ||
+         CompiledICLocker::is_safe(addr_at(0)),
+         "concurrent code patching");
+
+  address call_addr = addr_at(0);
+  assert(NativeFarCall::is_at(call_addr), "unexpected code at call site");
+
+  address stub_addr = stub_address();
+
+  if (stub_addr != nullptr) {
+    set_stub_address_destination_at(stub_addr, dest);
+    return true;
+  }
+
+  return false;
+}
+
+bool NativeFarCall::reloc_set_destination(address dest) {
+  address call_addr = addr_at(0);
+  assert(NativeFarCall::is_at(call_addr), "unexpected code at call site");
+
+  CodeBlob *code = CodeCache::find_blob(call_addr);
+  assert(code != nullptr, "Could not find the containing code blob");
+
+  address stub_addr = nullptr;
+  if (code != nullptr && code->is_nmethod()) {
+    stub_addr = trampoline_stub_Relocation::get_trampoline_for(call_addr, (nmethod*)code);
+  }
+
+  if (stub_addr != nullptr) {
+    MacroAssembler::pd_patch_instruction_size(call_addr, stub_addr);
+  }
+
+  return true;
+}
+
+void NativeFarCall::set_stub_address_destination_at(address dest, address value) {
+  assert_cond(dest != nullptr);
+  assert_cond(value != nullptr);
+
+  set_data64_at(dest, (uint64_t)value);
+  OrderAccess::release();
+}
+
+address NativeFarCall::stub_address_destination_at(address src) {
+  assert_cond(src != nullptr);
+  address dest = (address)get_data64_at(src);
+  return dest;
+}
+
+address NativeFarCall::stub_address() {
+  address call_addr = addr_at(0);
+
+  CodeBlob *code = CodeCache::find_blob(call_addr);
+  assert(code != nullptr, "Could not find the containing code blob");
+
+  address dest = MacroAssembler::pd_call_destination(call_addr);
+  assert(code->contains(dest), "Sanity");
+  return dest;
+}
+
+NativeFarCall* NativeFarCall::at(address addr) {
+  assert_cond(addr != nullptr);
+  assert(NativeFarCall::is_at(addr), "unexpected code at call site: %p", addr);
+  NativeFarCall* call = (NativeFarCall*)(addr);
+  return call;
+}
+
+bool NativeFarCall::is_at(address addr) {
+  assert_cond(addr != nullptr);
+  const int instr_size = NativeInstruction::instruction_size;
+  if (MacroAssembler::is_auipc_at(addr) &&
+      MacroAssembler::is_ld_at(addr + instr_size) &&
+      MacroAssembler::is_jalr_at(addr + 2 * instr_size) &&
+      (MacroAssembler::extract_rd(addr)                    == x5) &&
+      (MacroAssembler::extract_rd(addr + instr_size)       == x5) &&
+      (MacroAssembler::extract_rs1(addr + instr_size)      == x5) &&
+      (MacroAssembler::extract_rs1(addr + 2 * instr_size)  == x5) &&
+      (MacroAssembler::extract_rd(addr + 2 * instr_size)  == x1)) {
+    return true;
+  }
+  return false;
+}
+
+bool NativeFarCall::is_call_before(address return_address) {
+  return NativeFarCall::is_at(return_address - return_address_offset);
+}
+
+//-----------------------------------------------------------------------------
+// NativeCall
+
+address NativeCall::instruction_address() const {
+  if (UseTrampolines) {
+    return NativeShortCall::at(addr_at(0))->instruction_address();
+  } else {
+    return NativeFarCall::at(addr_at(0))->instruction_address();
+  }
+}
+
+address NativeCall::next_instruction_address() const {
+  if (UseTrampolines) {
+    return NativeShortCall::at(addr_at(0))->next_instruction_address();
+  } else {
+    return NativeFarCall::at(addr_at(0))->next_instruction_address();
+  }
+}
+
+address NativeCall::return_address() const {
+  if (UseTrampolines) {
+    return NativeShortCall::at(addr_at(0))->return_address();
+  } else {
+    return NativeFarCall::at(addr_at(0))->return_address();
+  }
+}
+
+address NativeCall::destination() const {
+  if (UseTrampolines) {
+    return NativeShortCall::at(addr_at(0))->destination();
+  } else {
+    return NativeFarCall::at(addr_at(0))->destination();
+  }
+}
+
+address NativeCall::reloc_destination(address orig_address) {
+  if (UseTrampolines) {
+    return NativeShortCall::at(addr_at(0))->reloc_destination(orig_address);
+  } else {
+    return NativeFarCall::at(addr_at(0))->reloc_destination(orig_address);
+  }
+}
+
+void NativeCall::set_destination(address dest) {
+  if (UseTrampolines) {
+    NativeShortCall::at(addr_at(0))->set_destination(dest);
+  } else {
+    NativeFarCall::at(addr_at(0))->set_destination(dest);
+  }
+}
+
+void NativeCall::verify() {
+  if (UseTrampolines) {
+    NativeShortCall::at(addr_at(0))->verify();
+  } else {
+    NativeFarCall::at(addr_at(0))->verify();;
+  }
+}
+
+void NativeCall::print() {
+  if (UseTrampolines) {
+    NativeShortCall::at(addr_at(0))->print();
+  } else {
+    NativeFarCall::at(addr_at(0))->print();;
+  }
+}
+
+bool NativeCall::set_destination_mt_safe(address dest, bool assert_lock) {
+  if (UseTrampolines) {
+    return NativeShortCall::at(addr_at(0))->set_destination_mt_safe(dest, assert_lock);
+  } else {
+    return NativeFarCall::at(addr_at(0))->set_destination_mt_safe(dest, assert_lock);
+  }
+}
+
+bool NativeCall::reloc_set_destination(address dest) {
+  if (UseTrampolines) {
+    return NativeShortCall::at(addr_at(0))->reloc_set_destination(dest);
+  } else {
+    return NativeFarCall::at(addr_at(0))->reloc_set_destination(dest);
+  }
+}
+
+bool NativeCall::is_at(address addr) {
+  if (UseTrampolines) {
+    return NativeShortCall::is_at(addr);
+  } else {
+    return NativeFarCall::is_at(addr);
+  }
+}
+
+bool NativeCall::is_call_before(address return_address) {
+  if (UseTrampolines) {
+    return NativeShortCall::is_call_before(return_address);
+  } else {
+    return NativeFarCall::is_call_before(return_address);
+  }
+}
+
+NativeCall* nativeCall_at(address addr) {
+  assert_cond(addr != nullptr);
+  NativeCall* call = (NativeCall*)(addr);
+  DEBUG_ONLY(call->verify());
+  return call;
+}
+
+NativeCall* nativeCall_before(address return_address) {
+  assert_cond(return_address != nullptr);
+  NativeCall* call = nullptr;
+  if (UseTrampolines) {
+    call = (NativeCall*)(return_address - NativeShortCall::return_address_offset);
+  } else {
+    call = (NativeCall*)(return_address - NativeFarCall::return_address_offset);
+  }
+  DEBUG_ONLY(call->verify());
+  return call;
+}
 
 //-------------------------------------------------------------------
 
@@ -327,15 +802,6 @@ void NativeGeneralJump::replace_mt_safe(address instr_addr, address code_buffer)
 
 //-------------------------------------------------------------------
 
-address NativeCallTrampolineStub::destination(nmethod *nm) const {
-  return ptr_at(data_offset);
-}
-
-void NativeCallTrampolineStub::set_destination(address new_destination) {
-  set_ptr_at(data_offset, new_destination);
-  OrderAccess::release();
-}
-
 void NativePostCallNop::make_deopt() {
   MacroAssembler::assert_alignment(addr_at(0));
   NativeDeoptInstruction::insert(addr_at(0));
diff --git a/src/hotspot/cpu/riscv/nativeInst_riscv.hpp b/src/hotspot/cpu/riscv/nativeInst_riscv.hpp
index f925f8950aa23..0ac3a89969a25 100644
--- a/src/hotspot/cpu/riscv/nativeInst_riscv.hpp
+++ b/src/hotspot/cpu/riscv/nativeInst_riscv.hpp
@@ -41,8 +41,6 @@
 // - - NativeJump
 // - - NativeGeneralJump
 // - - NativeIllegalInstruction
-// - - NativeCallTrampolineStub
-// - - NativeMembar
 // - - NativePostCallNop
 // - - NativeDeoptInstruction
 
@@ -69,30 +67,31 @@ class NativeInstruction {
   bool is_movptr1()                         const { return MacroAssembler::is_movptr1_at(addr_at(0));     }
   bool is_movptr2()                         const { return MacroAssembler::is_movptr2_at(addr_at(0));     }
   bool is_auipc()                           const { return MacroAssembler::is_auipc_at(addr_at(0));       }
-  bool is_call()                            const { return MacroAssembler::is_call_at(addr_at(0));        }
   bool is_jump()                            const { return MacroAssembler::is_jump_at(addr_at(0));        }
+  bool is_call()                            const { return is_call_at(addr_at(0));                        }
+  static bool is_call_at(address addr);
 
-  inline bool is_nop() const;
-  inline bool is_jump_or_nop();
+  bool is_nop() const;
+  bool is_jump_or_nop();
   bool is_safepoint_poll();
   bool is_sigill_not_entrant();
   bool is_stop();
 
  protected:
-  address addr_at(int offset) const    { return address(this) + offset; }
+  address addr_at(int offset) const { return address(this) + offset; }
+  jint     int_at(int offset) const { return (jint)      Bytes::get_native_u4(addr_at(offset));  }
+  juint   uint_at(int offset) const { return             Bytes::get_native_u4(addr_at(offset));  }
+  address  ptr_at(int offset) const { return (address)   Bytes::get_native_u8(addr_at(offset));  }
+  oop      oop_at(int offset) const { return cast_to_oop(Bytes::get_native_u8(addr_at(offset))); }
 
-  jint int_at(int offset) const        { return (jint)Bytes::get_native_u4(addr_at(offset)); }
-  juint uint_at(int offset) const      { return Bytes::get_native_u4(addr_at(offset)); }
 
-  address ptr_at(int offset) const     { return (address)Bytes::get_native_u8(addr_at(offset)); }
+  void  set_int_at(int offset, jint i)      { Bytes::put_native_u4(addr_at(offset), i); }
+  void set_uint_at(int offset, jint i)      { Bytes::put_native_u4(addr_at(offset), i); }
+  void  set_ptr_at(int offset, address ptr) { Bytes::put_native_u8(addr_at(offset), (u8)ptr); }
+  void  set_oop_at(int offset, oop o)       { Bytes::put_native_u8(addr_at(offset), cast_from_oop<u8>(o)); }
 
-  oop  oop_at (int offset) const       { return cast_to_oop(Bytes::get_native_u8(addr_at(offset))); }
-
-
-  void set_int_at(int offset, jint i)        { Bytes::put_native_u4(addr_at(offset), i); }
-  void set_uint_at(int offset, jint i)       { Bytes::put_native_u4(addr_at(offset), i); }
-  void set_ptr_at (int offset, address ptr)  { Bytes::put_native_u8(addr_at(offset), (u8)ptr); }
-  void set_oop_at (int offset, oop o)        { Bytes::put_native_u8(addr_at(offset), cast_from_oop<u8>(o)); }
+  static void     set_data64_at(address dest, uint64_t data) { Bytes::put_native_u8(dest, (u8)data); }
+  static uint64_t get_data64_at(address src)                 { return Bytes::get_native_u8(src); }
 
  public:
 
@@ -103,99 +102,56 @@ class NativeInstruction {
   }
 };
 
-inline NativeInstruction* nativeInstruction_at(address addr) {
+NativeInstruction* nativeInstruction_at(address addr) {
   return (NativeInstruction*)addr;
 }
 
-// The natural type of an RISCV instruction is uint32_t
-inline NativeInstruction* nativeInstruction_at(uint32_t *addr) {
-  return (NativeInstruction*)addr;
-}
+NativeCall* nativeCall_at(address addr);
+NativeCall* nativeCall_before(address return_address);
 
-inline NativeCall* nativeCall_at(address addr);
 // The NativeCall is an abstraction for accessing/manipulating native
 // call instructions (used to manipulate inline caches, primitive &
 // DSO calls, etc.).
-
-class NativeCall: public NativeInstruction {
- public:
-  enum RISCV_specific_constants {
-    instruction_size            =    4,
-    instruction_offset          =    0,
-    displacement_offset         =    0,
-    return_address_offset       =    4
+class NativeCall: private NativeInstruction {
+ // private: when common code is using byte_size()
+ private:
+  enum {
+    // Use byte_size() as it can be changed in runtime
+    // Since instruction_size exists on NativeInstruction we need
+    // to overload and hide it.
+    instruction_size = 3 * Assembler::instruction_size // auipc + ld + jalr
   };
+ public:
 
-  static int byte_size()                    { return instruction_size; }
-  address instruction_address() const       { return addr_at(instruction_offset); }
-  address next_instruction_address() const  { return addr_at(return_address_offset); }
-  address return_address() const            { return addr_at(return_address_offset); }
-  address destination() const;
-
-  void set_destination(address dest) {
-    assert(is_jal(), "Should be jal instruction!");
-    intptr_t offset = (intptr_t)(dest - instruction_address());
-    assert((offset & 0x1) == 0, "bad alignment");
-    assert(Assembler::is_simm21(offset), "encoding constraint");
-    unsigned int insn = 0b1101111; // jal
-    address pInsn = (address)(&insn);
-    Assembler::patch(pInsn, 31, 31, (offset >> 20) & 0x1);
-    Assembler::patch(pInsn, 30, 21, (offset >> 1) & 0x3ff);
-    Assembler::patch(pInsn, 20, 20, (offset >> 11) & 0x1);
-    Assembler::patch(pInsn, 19, 12, (offset >> 12) & 0xff);
-    Assembler::patch(pInsn, 11, 7, ra->encoding()); // Rd must be x1, need ra
-    set_int_at(displacement_offset, insn);
+  static int byte_size() {
+    if (UseTrampolines) {
+      return NativeInstruction::instruction_size; // jal
+    } else {
+      return 3 * NativeInstruction::instruction_size; // auipc + ld + jalr
+    }
   }
+  // Creation
+  friend NativeCall* nativeCall_at(address addr);
+  friend NativeCall* nativeCall_before(address return_address);
+
+  address instruction_address() const;
+  address next_instruction_address() const;
+  address return_address() const;
+  address destination() const;
+  address reloc_destination(address orig_address);
 
   void verify_alignment() {} // do nothing on riscv
   void verify();
   void print();
 
-  // Creation
-  inline friend NativeCall* nativeCall_at(address addr);
-  inline friend NativeCall* nativeCall_before(address return_address);
-
-  static bool is_call_before(address return_address) {
-    return MacroAssembler::is_call_at(return_address - NativeCall::return_address_offset);
-  }
-
-  // MT-safe patching of a call instruction.
-  static void insert(address code_pos, address entry);
-
-  static void replace_mt_safe(address instr_addr, address code_buffer);
-
-  // Similar to replace_mt_safe, but just changes the destination.  The
-  // important thing is that free-running threads are able to execute
-  // this call instruction at all times.  If the call is an immediate BL
-  // instruction we can simply rely on atomicity of 32-bit writes to
-  // make sure other threads will see no intermediate states.
-
-  // We cannot rely on locks here, since the free-running threads must run at
-  // full speed.
-  //
-  // Used in the runtime linkage of calls; see class CompiledIC.
-  // (Cf. 4506997 and 4479829, where threads witnessed garbage displacements.)
+  void set_destination(address dest);
+  bool set_destination_mt_safe(address dest, bool assert_lock = true);
+  bool reloc_set_destination(address dest);
 
-  // The parameter assert_lock disables the assertion during code generation.
-  void set_destination_mt_safe(address dest, bool assert_lock = true);
-
-  address get_trampoline();
+  static bool is_at(address addr);
+  static bool is_call_before(address return_address);
 };
 
-inline NativeCall* nativeCall_at(address addr) {
-  assert_cond(addr != nullptr);
-  NativeCall* call = (NativeCall*)(addr - NativeCall::instruction_offset);
-  DEBUG_ONLY(call->verify());
-  return call;
-}
-
-inline NativeCall* nativeCall_before(address return_address) {
-  assert_cond(return_address != nullptr);
-  NativeCall* call = (NativeCall*)(return_address - NativeCall::return_address_offset);
-  DEBUG_ONLY(call->verify());
-  return call;
-}
-
 // An interface for accessing/manipulating native mov reg, imm instructions.
 // (used to manipulate inlined 64-bit data calls, etc.)
 class NativeMovConstReg: public NativeInstruction {
@@ -366,27 +322,6 @@ inline bool NativeInstruction::is_jump_or_nop() {
   return is_nop() || is_jump();
 }
 
-// Call trampoline stubs.
-class NativeCallTrampolineStub : public NativeInstruction {
- public:
-
-  enum RISCV_specific_constants {
-    // Refer to function emit_trampoline_stub.
-    instruction_size = MacroAssembler::trampoline_stub_instruction_size, // auipc + ld + jr + target address
-    data_offset      = MacroAssembler::trampoline_stub_data_offset,      // auipc + ld + jr
-  };
-
-  address destination(nmethod *nm = nullptr) const;
-  void set_destination(address new_destination);
-  ptrdiff_t destination_offset() const;
-};
-
-inline NativeCallTrampolineStub* nativeCallTrampolineStub_at(address addr) {
-  assert_cond(addr != nullptr);
-  assert(MacroAssembler::is_trampoline_stub_at(addr), "no call trampoline found");
-  return (NativeCallTrampolineStub*)addr;
-}
-
 // A NativePostCallNop takes the form of three instructions:
 //     nop; lui zr, hi20; addiw zr, lo12
 //
diff --git a/src/hotspot/cpu/riscv/relocInfo_riscv.cpp b/src/hotspot/cpu/riscv/relocInfo_riscv.cpp
index 43a9b8f89aeaa..d0903c96e2271 100644
--- a/src/hotspot/cpu/riscv/relocInfo_riscv.cpp
+++ b/src/hotspot/cpu/riscv/relocInfo_riscv.cpp
@@ -60,12 +60,10 @@ void Relocation::pd_set_data_value(address x, bool verify_only) {
 
 address Relocation::pd_call_destination(address orig_addr) {
   assert(is_call(), "should be an address instruction here");
-  if (MacroAssembler::is_call_at(addr())) {
-    address trampoline = nativeCall_at(addr())->get_trampoline();
-    if (trampoline != nullptr) {
-      return nativeCallTrampolineStub_at(trampoline)->destination();
-    }
+  if (NativeCall::is_at(addr())) {
+    return nativeCall_at(addr())->reloc_destination(orig_addr);
   }
+  // Non call reloc
   if (orig_addr != nullptr) {
     // the extracted address from the instructions in address orig_addr
     address new_addr = MacroAssembler::pd_call_destination(orig_addr);
@@ -81,10 +79,9 @@ address Relocation::pd_call_destination(address orig_addr) {
 
 void Relocation::pd_set_call_destination(address x) {
   assert(is_call(), "should be an address instruction here");
-  if (MacroAssembler::is_call_at(addr())) {
-    address trampoline = nativeCall_at(addr())->get_trampoline();
-    if (trampoline != nullptr) {
-      nativeCall_at(addr())->set_destination_mt_safe(x, /* assert_lock */false);
+  if (NativeCall::is_at(addr())) {
+    NativeCall* nc = nativeCall_at(addr());
+    if (nc->reloc_set_destination(x)) {
       return;
     }
   }
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index e2a1fcf621fab..b176c6e9cb7c2 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -1238,17 +1238,24 @@ bool needs_acquiring_load_reserved(const Node *n)
 
 int MachCallStaticJavaNode::ret_addr_offset()
 {
-  // jal
-  return 1 * NativeInstruction::instruction_size;
+  if (UseTrampolines) {
+    return 1 * NativeInstruction::instruction_size; // jal
+  }
+  return 3 * NativeInstruction::instruction_size; // auipc + ld + jalr
 }
 
 int MachCallDynamicJavaNode::ret_addr_offset()
 {
-  return NativeMovConstReg::movptr2_instruction_size +  NativeInstruction::instruction_size; // movptr2, jal
+  if (UseTrampolines) {
+    return NativeMovConstReg::movptr2_instruction_size +  NativeInstruction::instruction_size; // movptr2, jal
+  }
+  return NativeMovConstReg::movptr2_instruction_size + (3 * NativeInstruction::instruction_size); // movptr2, auipc + ld + jal
 }
 
 int MachCallRuntimeNode::ret_addr_offset() {
-  // for generated stubs the call will be
+  // For generated stubs the call will be:
+  //   auipc + ld + jalr
+  // Using trampos:
   //   jal(addr)
   // or with far branches
   //   jal(trampoline_stub)
@@ -1261,7 +1268,10 @@ int MachCallRuntimeNode::ret_addr_offset() {
   //   jalr(t0)                       ->  jalr
   CodeBlob *cb = CodeCache::find_blob(_entry_point);
   if (cb != nullptr) {
-    return 1 * NativeInstruction::instruction_size;
+    if (UseTrampolines) {
+      return 1 * NativeInstruction::instruction_size;
+    }
+    return 3 * NativeInstruction::instruction_size;
   } else {
     return 11 * NativeInstruction::instruction_size;
   }
@@ -2403,7 +2413,7 @@ encode %{
     assert_cond(addr != nullptr);
     if (!_method) {
       // A call to a runtime wrapper, e.g. new, new_typeArray_Java, uncommon_trap.
-      call = __ trampoline_call(Address(addr, relocInfo::runtime_call_type));
+      call = __ reloc_call(Address(addr, relocInfo::runtime_call_type));
       if (call == nullptr) {
         ciEnv::current()->record_failure("CodeCache is full");
         return;
@@ -2412,12 +2422,16 @@ encode %{
       // The NOP here is purely to ensure that eliding a call to
       // JVM_EnsureMaterializedForStackWalk doesn't change the code size.
       __ nop();
+      if (!UseTrampolines) {
+        __ nop();
+        __ nop();
+      }
       __ block_comment("call JVM_EnsureMaterializedForStackWalk (elided)");
     } else {
       int method_index = resolved_method_index(masm);
       RelocationHolder rspec = _optimized_virtual ? opt_virtual_call_Relocation::spec(method_index)
                                                   : static_call_Relocation::spec(method_index);
-      call = __ trampoline_call(Address(addr, rspec));
+      call = __ reloc_call(Address(addr, rspec));
       if (call == nullptr) {
         ciEnv::current()->record_failure("CodeCache is full");
         return;
@@ -2469,7 +2483,7 @@ encode %{
     address entry = (address)$meth$$method;
     CodeBlob *cb = CodeCache::find_blob(entry);
     if (cb != nullptr) {
-      address call = __ trampoline_call(Address(entry, relocInfo::runtime_call_type));
+      address call = __ reloc_call(Address(entry, relocInfo::runtime_call_type));
       if (call == nullptr) {
         ciEnv::current()->record_failure("CodeCache is full");
         return;
@@ -10098,7 +10112,7 @@ instruct partialSubtypeCheckConstSuper(iRegP_R14 sub, iRegP_R10 super_reg, immP
                                                  $tmpR11$$Register, $tmpR12$$Register, $tmpR13$$Register,
                                                  $tmpR16$$Register, super_klass_slot);
     } else {
-      address call = __ trampoline_call(RuntimeAddress(StubRoutines::lookup_secondary_supers_table_stub(super_klass_slot)));
+      address call = __ reloc_call(RuntimeAddress(StubRoutines::lookup_secondary_supers_table_stub(super_klass_slot)));
       success = (call != nullptr);
     }
     if (!success) {
diff --git a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
index 3af203a95b039..01ab3d5c27403 100644
--- a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
+++ b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
@@ -1005,7 +1005,7 @@ static void gen_continuation_enter(MacroAssembler* masm,
     // Make sure the call is patchable
     __ align(NativeInstruction::instruction_size);
 
-    const address tr_call = __ trampoline_call(resolve);
+    const address tr_call = __ reloc_call(resolve);
     if (tr_call == nullptr) {
       fatal("CodeCache is full at gen_continuation_enter");
     }
@@ -1037,7 +1037,7 @@ static void gen_continuation_enter(MacroAssembler* masm,
   // Make sure the call is patchable
   __ align(NativeInstruction::instruction_size);
 
-  const address tr_call = __ trampoline_call(resolve);
+  const address tr_call = __ reloc_call(resolve);
   if (tr_call == nullptr) {
     fatal("CodeCache is full at gen_continuation_enter");
   }

From dea92742c2b5889717f2183dc29b5772daff5340 Mon Sep 17 00:00:00 2001
From: Sonia Zaldana Calles <szaldana@openjdk.org>
Date: Thu, 11 Jul 2024 14:12:13 +0000
Subject: [PATCH 054/401] 8332125: [nmt] Totals in diff report should print out
 total malloc and mmap diffs

Reviewed-by: stuefe, jsjolen
---
 src/hotspot/share/nmt/memReporter.cpp         |  28 +++++
 .../runtime/NMT/TotalMallocMmapDiffTest.java  | 107 ++++++++++++++++++
 2 files changed, 135 insertions(+)
 create mode 100644 test/hotspot/jtreg/runtime/NMT/TotalMallocMmapDiffTest.java

diff --git a/src/hotspot/share/nmt/memReporter.cpp b/src/hotspot/share/nmt/memReporter.cpp
index b09cf7ae2bdbc..d53782dfdaa15 100644
--- a/src/hotspot/share/nmt/memReporter.cpp
+++ b/src/hotspot/share/nmt/memReporter.cpp
@@ -487,7 +487,35 @@ void MemSummaryDiffReporter::report_diff() {
   print_virtual_memory_diff(_current_baseline.total_reserved_memory(),
     _current_baseline.total_committed_memory(), _early_baseline.total_reserved_memory(),
     _early_baseline.total_committed_memory());
+  out->cr();
+  out->cr();
+
+  // malloc diff
+  const size_t early_malloced_bytes =
+    _early_baseline.malloc_memory_snapshot()->total();
+  const size_t early_count =
+    _early_baseline.malloc_memory_snapshot()->total_count();
+  const size_t current_malloced_bytes =
+    _current_baseline.malloc_memory_snapshot()->total();
+  const size_t current_count =
+    _current_baseline.malloc_memory_snapshot()->total_count();
+  print_malloc_diff(current_malloced_bytes, current_count, early_malloced_bytes,
+                    early_count, mtNone);
+  out->cr();
+  out->cr();
 
+  // mmap diff
+  out->print("mmap: ");
+  const size_t early_reserved =
+    _early_baseline.virtual_memory_snapshot()->total_reserved();
+  const size_t early_committed =
+    _early_baseline.virtual_memory_snapshot()->total_committed();
+  const size_t current_reserved =
+    _current_baseline.virtual_memory_snapshot()->total_reserved();
+  const size_t current_committed =
+    _current_baseline.virtual_memory_snapshot()->total_committed();
+  print_virtual_memory_diff(current_reserved, current_committed, early_reserved,
+                            early_committed);
   out->cr();
   out->cr();
 
diff --git a/test/hotspot/jtreg/runtime/NMT/TotalMallocMmapDiffTest.java b/test/hotspot/jtreg/runtime/NMT/TotalMallocMmapDiffTest.java
new file mode 100644
index 0000000000000..3ba94c6a31a86
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/NMT/TotalMallocMmapDiffTest.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Red Hat Inc.
+ * 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 8332125
+ * @summary Test to verify correctness of total malloc and mmap diffs
+ * @key randomness
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=summary -Xms32m -Xmx32m TotalMallocMmapDiffTest
+ *
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+
+import jdk.test.whitebox.WhiteBox;
+
+public class TotalMallocMmapDiffTest {
+    private static final WhiteBox wb = WhiteBox.getWhiteBox();
+    private static final long ALLOCATE_SIZE = 250 * 1024 * 1024; // 250MB
+    private static final double FUDGE_FACTOR = 0.2;
+    private static final double UPPER_BOUND = ALLOCATE_SIZE * (1 + FUDGE_FACTOR);
+    private static final double LOWER_BOUND = ALLOCATE_SIZE * (1 - FUDGE_FACTOR);
+
+    public static void main(String[] args) throws Exception {
+
+        // Get baseline
+        OutputAnalyzer output = NMTTestUtils.startJcmdVMNativeMemory("baseline=true", "scale=1");
+        output.shouldContain("Baseline taken");
+
+        // Allocate some memory via malloc
+        long addr = wb.NMTMalloc(ALLOCATE_SIZE);
+
+        // Virtually reserve and commit memory
+        addr = wb.NMTReserveMemory(ALLOCATE_SIZE);
+        wb.NMTCommitMemory(addr, ALLOCATE_SIZE);
+
+        // Get NMT diff
+        output = NMTTestUtils.startJcmdVMNativeMemory("summary.diff", "scale=1");
+
+        // Verify malloc diff accounts for memory allocation with a fudge factor
+        long mallocDiff = getMallocDiff(output);
+        if (mallocDiff < LOWER_BOUND || mallocDiff > UPPER_BOUND) {
+            throw new Exception("Total malloc diff is incorrect. " +
+                    "Expected malloc diff range: [" + LOWER_BOUND + " - " + UPPER_BOUND + "]" +
+                    "Actual malloc diff: " + mallocDiff);
+        }
+
+        // Verify mmap diff accounts for reserve and commit
+        long reservedDiff = getReservedDiff(output);
+        long committedDiff = getCommittedDiff(output);
+        if (reservedDiff < LOWER_BOUND || reservedDiff > UPPER_BOUND) {
+            throw new Exception("mmap reserved diff is incorrect. " +
+                    "Expected reserved diff range: [" + LOWER_BOUND + " - " + UPPER_BOUND + "]" +
+                    "Actual reserved diff: " + reservedDiff);
+        }
+        if (committedDiff < LOWER_BOUND || committedDiff > UPPER_BOUND) {
+            throw new Exception("mmap committed diff is incorrect. " +
+                    "Expected committed diff range: [" + LOWER_BOUND + " - " + UPPER_BOUND + "]" +
+                    "Actual committed diff: " + committedDiff);
+        }
+
+    }
+
+    private static long getMallocDiff(OutputAnalyzer output) {
+        // First match should be global malloc diff
+        String malloc = output.firstMatch("malloc=\\d+ \\+(\\d+)", 1);
+        return Long.parseLong(malloc);
+    }
+
+    private static long getReservedDiff(OutputAnalyzer output) {
+        // First match should be global mmap diff
+        String reservedDiff = output.firstMatch("mmap: reserved=\\d+ \\+(\\d+)", 1);
+        return Long.parseLong(reservedDiff);
+    }
+
+    private static long getCommittedDiff(OutputAnalyzer output) {
+        // First match should be global mmap diff
+        String committedDiff = output.firstMatch("mmap: reserved=\\d+ \\+\\d+, committed=\\d+ \\+(\\d+)", 1);
+        return Long.parseLong(committedDiff);
+    }
+}

From d06d79c80980644df511cded0eb8bc0309d878d3 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Thu, 11 Jul 2024 16:07:03 +0000
Subject: [PATCH 055/401] 8325369: @sealedGraph: Bad link to image for tag on
 nested classes

Reviewed-by: jjg
---
 .../build/tools/taglet/SealedGraph.java        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/make/jdk/src/classes/build/tools/taglet/SealedGraph.java b/make/jdk/src/classes/build/tools/taglet/SealedGraph.java
index fd1b73355b3da..17867b99595bc 100644
--- a/make/jdk/src/classes/build/tools/taglet/SealedGraph.java
+++ b/make/jdk/src/classes/build/tools/taglet/SealedGraph.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -107,7 +107,7 @@ public String toString(List<? extends DocTree> tags, Element element) {
             throw new RuntimeException(e);
         }
 
-        String simpleTypeName = element.getSimpleName().toString();
+        String simpleTypeName = packagelessCanonicalName(typeElement).replace('.', '/');
         String imageFile = simpleTypeName + "-sealed-graph.svg";
         int thumbnailHeight = 100; // also appears in the stylesheet
         String hoverImage = "<span>"
@@ -315,14 +315,14 @@ private static Optional<String> packageName(TypeElement element) {
                 case MEMBER -> packageName((TypeElement) element.getEnclosingElement());
             };
         }
+    }
 
-        private static String packagelessCanonicalName(TypeElement element) {
-            String result = element.getSimpleName().toString();
-            while (element.getNestingKind() == NestingKind.MEMBER) {
-                element = (TypeElement) element.getEnclosingElement();
-                result = element.getSimpleName().toString() + '.' + result;
-            }
-            return result;
+    private static String packagelessCanonicalName(TypeElement element) {
+        String result = element.getSimpleName().toString();
+        while (element.getNestingKind() == NestingKind.MEMBER) {
+            element = (TypeElement) element.getEnclosingElement();
+            result = element.getSimpleName().toString() + '.' + result;
         }
+        return result;
     }
 }

From 58c98420b65bcea08f37982fdfba747005c03553 Mon Sep 17 00:00:00 2001
From: Joe Wang <joehw@openjdk.org>
Date: Thu, 11 Jul 2024 18:38:32 +0000
Subject: [PATCH 056/401] 8336021: Doccheck: valign not allowed for HTML5 in
 java.xml

Reviewed-by: lancea
---
 .../share/classes/org/w3c/dom/Attr.java       | 44 +++++++++----------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/java.xml/share/classes/org/w3c/dom/Attr.java b/src/java.xml/share/classes/org/w3c/dom/Attr.java
index 54d0997eb38b0..0943fcac36313 100644
--- a/src/java.xml/share/classes/org/w3c/dom/Attr.java
+++ b/src/java.xml/share/classes/org/w3c/dom/Attr.java
@@ -124,65 +124,63 @@
  * </thead>
  * <tbody>
  * <tr>
- * <th scope="row" valign='top' rowspan='1' colspan='1'>
+ * <th scope="row">
  * Character reference</th>
- * <td valign='top' rowspan='1' colspan='1'>
+ * <td>
  * <pre>"x&amp;#178;=5"</pre>
  * </td>
- * <td valign='top' rowspan='1' colspan='1'>
+ * <td>
  * <pre>"x&#178;=5"</pre>
  * </td>
- * <td valign='top' rowspan='1' colspan='1'>
+ * <td>
  * <pre>"x&amp;#178;=5"</pre>
  * </td>
  * </tr>
  * <tr>
- * <th scope="row" valign='top' rowspan='1' colspan='1'>Built-in
- * character entity</th>
- * <td valign='top' rowspan='1' colspan='1'>
+ * <th scope="row">Built-in character entity</th>
+ * <td>
  * <pre>"y&amp;lt;6"</pre>
  * </td>
- * <td valign='top' rowspan='1' colspan='1'>
+ * <td>
  * <pre>"y&lt;6"</pre>
  * </td>
- * <td valign='top' rowspan='1' colspan='1'>
+ * <td>
  * <pre>"y&amp;lt;6"</pre>
  * </td>
  * </tr>
  * <tr>
- * <th scope="row" valign='top' rowspan='1' colspan='1'>Literal newline between</th>
- * <td valign='top' rowspan='1' colspan='1'>
- * <pre>
- * "x=5&amp;#10;y=6"</pre>
+ * <th scope="row">Literal newline between</th>
+ * <td>
+ * <pre>"x=5&amp;#10;y=6"</pre>
  * </td>
- * <td valign='top' rowspan='1' colspan='1'>
+ * <td>
  * <pre>"x=5 y=6"</pre>
  * </td>
- * <td valign='top' rowspan='1' colspan='1'>
+ * <td>
  * <pre>"x=5&amp;#10;y=6"</pre>
  * </td>
  * </tr>
  * <tr>
- * <th scope="row" valign='top' rowspan='1' colspan='1'>Normalized newline between</th>
- * <td valign='top' rowspan='1' colspan='1'>
+ * <th scope="row">Normalized newline between</th>
+ * <td>
  * <pre>"x=5
  * y=6"</pre>
  * </td>
- * <td valign='top' rowspan='1' colspan='1'>
+ * <td>
  * <pre>"x=5 y=6"</pre>
  * </td>
- * <td valign='top' rowspan='1' colspan='1'>
+ * <td>
  * <pre>"x=5 y=6"</pre>
  * </td>
  * </tr>
  * <tr>
- * <th scope="row" valign='top' rowspan='1' colspan='1'>Entity <code>e</code> with literal newline</th>
- * <td valign='top' rowspan='1' colspan='1'>
+ * <th scope="row">Entity <code>e</code> with literal newline</th>
+ * <td>
  * <pre>
  * &lt;!ENTITY e '...&amp;#10;...'&gt; [...]&gt; "x=5&amp;e;y=6"</pre>
  * </td>
- * <td valign='top' rowspan='1' colspan='1'><em>Dependent on Implementation and Load Options</em></td>
- * <td valign='top' rowspan='1' colspan='1'><em>Dependent on Implementation and Load/Save Options</em></td>
+ * <td><em>Dependent on Implementation and Load Options</em></td>
+ * <td><em>Dependent on Implementation and Load/Save Options</em></td>
  * </tr>
  * </tbody>
  * </table>

From 5100303c6c5e4224d2c41f90719139bb5f4e236e Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Thu, 11 Jul 2024 18:40:40 +0000
Subject: [PATCH 057/401] 8335668: NumberFormat integer only parsing should
 throw exception for edge case

Reviewed-by: naoto
---
 .../classes/java/text/DecimalFormat.java      | 14 +++++---
 .../Format/NumberFormat/LenientParseTest.java | 30 ++++++++++++++--
 .../Format/NumberFormat/StrictParseTest.java  | 34 ++++++++++++++++---
 3 files changed, 67 insertions(+), 11 deletions(-)

diff --git a/src/java.base/share/classes/java/text/DecimalFormat.java b/src/java.base/share/classes/java/text/DecimalFormat.java
index 1f249888a28f5..04acca1ceb51d 100644
--- a/src/java.base/share/classes/java/text/DecimalFormat.java
+++ b/src/java.base/share/classes/java/text/DecimalFormat.java
@@ -2379,8 +2379,8 @@ private final boolean subparse(String text, ParsePosition parsePosition,
         NumericPosition pos = subparseNumber(text, position, digits, true, isExponent, status);
         position = pos.fullPos;
 
-        // First character after the prefix was un-parseable, should
-        // fail regardless if lenient or strict.
+        // First character after the prefix was un-parseable or parsing integer
+        // only with no integer portion. Should fail regardless if lenient or strict.
         if (position == -1) {
             parsePosition.index = oldStart;
             parsePosition.errorIndex = oldStart;
@@ -2421,8 +2421,8 @@ private final boolean subparse(String text, ParsePosition parsePosition,
             }
 
             // When parsing integer only, index should be int pos
-            // If intPos is 0, the entire value was integer
-            if (isParseIntegerOnly() && pos.intPos > 0) {
+            // If intPos is -1, the entire value was integer and index should be full pos
+            if (isParseIntegerOnly() && pos.intPos != -1) {
                 parsePosition.index = pos.intPos;
             } else {
                 // increment the index by the suffix
@@ -2474,7 +2474,7 @@ NumericPosition subparseNumber(String text, int position,
                                    boolean isExponent, boolean[] status) {
         // process digits or Inf, find decimal position
         status[STATUS_INFINITE] = false;
-        int intIndex = 0;
+        int intIndex = -1;
         if (!isExponent && text.regionMatches(position, symbols.getInfinity(), 0,
                 symbols.getInfinity().length())) {
             position += symbols.getInfinity().length();
@@ -2570,6 +2570,10 @@ NumericPosition subparseNumber(String text, int position,
                     // Cancel out backup setting (see grouping handler below)
                     backup = -1;
                 } else if (!isExponent && ch == decimal) {
+                    if (isParseIntegerOnly() && startPos == position) {
+                        // Parsing int only with no integer portion, fail
+                        return new NumericPosition(-1, intIndex);
+                    }
                     // Check grouping size on decimal separator
                     if (parseStrict && isGroupingViolation(position, prevSeparatorIndex)) {
                         return new NumericPosition(
diff --git a/test/jdk/java/text/Format/NumberFormat/LenientParseTest.java b/test/jdk/java/text/Format/NumberFormat/LenientParseTest.java
index 41f8961ff32e2..c85fe0f6cbb59 100644
--- a/test/jdk/java/text/Format/NumberFormat/LenientParseTest.java
+++ b/test/jdk/java/text/Format/NumberFormat/LenientParseTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8327640 8331485 8333456
+ * @bug 8327640 8331485 8333456 8335668
  * @summary Test suite for NumberFormat parsing when lenient.
  * @run junit/othervm -Duser.language=en -Duser.country=US LenientParseTest
  * @run junit/othervm -Duser.language=ja -Duser.country=JP LenientParseTest
@@ -128,6 +128,28 @@ public void numFmtStrictIntegerOnlyUsed(String toParse, int expectedValue, int e
         dFmt.setParseIntegerOnly(false);
     }
 
+    // 8335668: Parsing with integer only against String with no integer portion
+    // should fail, not return 0. Expected error index should be 0
+    @Test
+    public void integerParseOnlyFractionOnlyTest() {
+        var fmt = NumberFormat.getIntegerInstance();
+        failParse(fmt, localizeText("."), 0);
+        failParse(fmt, localizeText(".0"), 0);
+        failParse(fmt, localizeText(".55"), 0);
+    }
+
+    // 8335668: Parsing with integer only against String with no integer portion
+    // should fail, not return 0. Expected error index should be 0
+    @Test // Non-localized, run once
+    @EnabledIfSystemProperty(named = "user.language", matches = "en")
+    public void compactIntegerParseOnlyFractionOnlyTest() {
+        var fmt = NumberFormat.getCompactNumberInstance(Locale.US, NumberFormat.Style.SHORT);
+        fmt.setParseIntegerOnly(true);
+        failParse(fmt, ".K", 0);
+        failParse(fmt, ".0K", 0);
+        failParse(fmt, ".55K", 0);
+    }
+
     @Test // Non-localized, only run once
     @EnabledIfSystemProperty(named = "user.language", matches = "en")
     public void badExponentParseNumberFormatTest() {
@@ -313,7 +335,11 @@ private static Stream<Arguments> validFullParseStrings() {
                 Arguments.of("10000", 10000d),
                 Arguments.of("100,000", 100000d),
                 Arguments.of("1,000,000", 1000000d),
-                Arguments.of("10,000,000", 10000000d))
+                Arguments.of("10,000,000", 10000000d),
+                // Smaller value cases (w/ decimal)
+                Arguments.of(".1", .1d),
+                Arguments.of("1.1", 1.1d),
+                Arguments.of("11.1", 11.1d))
                 .map(args -> Arguments.of(
                         localizeText(String.valueOf(args.get()[0])), args.get()[1]));
     }
diff --git a/test/jdk/java/text/Format/NumberFormat/StrictParseTest.java b/test/jdk/java/text/Format/NumberFormat/StrictParseTest.java
index 333bc1b050637..3e90ccb39ceaf 100644
--- a/test/jdk/java/text/Format/NumberFormat/StrictParseTest.java
+++ b/test/jdk/java/text/Format/NumberFormat/StrictParseTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8327640 8331485 8333755
+ * @bug 8327640 8331485 8333755 8335668
  * @summary Test suite for NumberFormat parsing with strict leniency
  * @run junit/othervm -Duser.language=en -Duser.country=US StrictParseTest
  * @run junit/othervm -Duser.language=ja -Duser.country=JP StrictParseTest
@@ -203,6 +203,28 @@ public void numFmtStrictIntegerOnlyUsedTest(String toParse, Number expVal) {
         }
     }
 
+    // 8335668: Parsing with integer only against String with no integer portion
+    // should fail, not return 0. Expected error index should be 0
+    @Test
+    public void integerParseOnlyFractionOnlyTest() {
+        var fmt = NumberFormat.getIntegerInstance();
+        failParse(fmt, localizeText("."), 0);
+        failParse(fmt, localizeText(".0"), 0);
+        failParse(fmt, localizeText(".55"), 0);
+    }
+
+    // 8335668: Parsing with integer only against String with no integer portion
+    // should fail, not return 0. Expected error index should be 0
+    @Test // Non-localized, run once
+    @EnabledIfSystemProperty(named = "user.language", matches = "en")
+    public void compactIntegerParseOnlyFractionOnlyTest() {
+        var fmt = NumberFormat.getCompactNumberInstance(Locale.US, NumberFormat.Style.SHORT);
+        fmt.setParseIntegerOnly(true);
+        failParse(fmt, ".K", 0);
+        failParse(fmt, ".0K", 0);
+        failParse(fmt, ".55K", 0);
+    }
+
     // 8333755: Parsing behavior should follow normal strict behavior
     // when it comes to failures.
     @ParameterizedTest
@@ -426,8 +448,8 @@ private static Stream<Arguments> badParseStrings() {
                 Arguments.of("1,234a", 5),
                 Arguments.of("1,.a", 2),
                 Arguments.of("1.a", 2),
-                Arguments.of(".22a", 3),
-                Arguments.of(".1a1", 2),
+                Arguments.of("1.22a", 4),
+                Arguments.of("1.1a1", 3),
                 Arguments.of("1,234,a", 5),
                 // Double decimal
                 Arguments.of("1,234..5", 5))
@@ -453,7 +475,11 @@ private static Stream<Arguments> validParseStrings() {
                 Arguments.of("10000", 10000d),
                 Arguments.of("100,000", 100000d),
                 Arguments.of("1,000,000", 1000000d),
-                Arguments.of("10,000,000", 10000000d))
+                Arguments.of("10,000,000", 10000000d),
+                // Smaller value cases (w/ decimal)
+                Arguments.of(".1", .1d),
+                Arguments.of("1.1", 1.1d),
+                Arguments.of("11.1", 11.1d))
                 .map(args -> Arguments.of(
                         localizeText(String.valueOf(args.get()[0])), args.get()[1]));
     }

From 9eb611e7f07ebb6eb0cbcca32d644abf8352c991 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@openjdk.org>
Date: Thu, 11 Jul 2024 19:53:52 +0000
Subject: [PATCH 058/401] 8334055: Unhelpful 'required: reference' diagnostics
 after JDK-8043226

Reviewed-by: vromero
---
 .../classes/com/sun/tools/javac/comp/Attr.java   |  9 +--------
 .../failures/CantAnnotateMissingSymbol.java      | 16 ++++++++++++++++
 .../failures/CantAnnotateMissingSymbol.out       |  2 ++
 .../failures/CantAnnotatePackages.java           |  2 +-
 .../failures/CantAnnotatePackages.out            |  6 +++---
 .../failures/CantAnnotateScoping.java            |  2 +-
 .../failures/CantAnnotateScoping.out             |  9 ++++-----
 7 files changed, 28 insertions(+), 18 deletions(-)
 create mode 100644 test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateMissingSymbol.java
 create mode 100644 test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateMissingSymbol.out

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index f58319496e968..9b79846ba40df 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -5241,14 +5241,7 @@ public void visitModifiers(JCModifiers tree) {
 
     public void visitAnnotatedType(JCAnnotatedType tree) {
         attribAnnotationTypes(tree.annotations, env);
-        Type underlyingType =
-                attribTree(tree.underlyingType, env, new ResultInfo(KindSelector.TYP_PCK, Type.noType));
-        if (underlyingType.hasTag(PACKAGE)) {
-            // Type annotations are not admissible on packages, but we handle packages here to
-            // report better diagnostics later in validateAnnotatedType.
-            result = tree.type = underlyingType;
-            return;
-        }
+        Type underlyingType = attribType(tree.underlyingType, env);
         Type annotatedType = underlyingType.preannotatedType();
 
         if (!env.info.isNewClass)
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateMissingSymbol.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateMissingSymbol.java
new file mode 100644
index 0000000000000..469cffa37a61f
--- /dev/null
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateMissingSymbol.java
@@ -0,0 +1,16 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8026564 8043226
+ * @summary 8334055
+ * @compile/fail/ref=CantAnnotateMissingSymbol.out -XDrawDiagnostics CantAnnotateMissingSymbol.java
+ */
+
+import java.lang.annotation.*;
+import java.util.List;
+
+class CantAnnotateMissingSymbol {
+    List<@TA NoSuch> x;
+}
+
+@Target(ElementType.TYPE_USE)
+@interface TA { }
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateMissingSymbol.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateMissingSymbol.out
new file mode 100644
index 0000000000000..b875cd2be7b80
--- /dev/null
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateMissingSymbol.out
@@ -0,0 +1,2 @@
+CantAnnotateMissingSymbol.java:12:14: compiler.err.cant.resolve.location: kindname.class, NoSuch, , , (compiler.misc.location: kindname.class, CantAnnotateMissingSymbol, null)
+1 error
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotatePackages.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotatePackages.java
index d7587dfcf5fc2..d35351b6f4084 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotatePackages.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotatePackages.java
@@ -1,6 +1,6 @@
 /*
  * @test /nodynamiccopyright/
- * @bug 8026564 8043226
+ * @bug 8026564 8043226 8334055
  * @summary The parts of a fully-qualified type can't be annotated.
  * @author Werner Dietl
  * @compile/fail/ref=CantAnnotatePackages.out -XDrawDiagnostics CantAnnotatePackages.java
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotatePackages.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotatePackages.out
index 6e2b9cb93b0e2..b91d65828b97b 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotatePackages.out
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotatePackages.out
@@ -1,5 +1,5 @@
+CantAnnotatePackages.java:16:14: compiler.err.cant.resolve.location: kindname.class, java, , , (compiler.misc.location: kindname.class, CantAnnotatePackages, null)
+CantAnnotatePackages.java:17:9: compiler.err.cant.resolve.location: kindname.class, lang, , , (compiler.misc.location: kindname.package, java, null)
+CantAnnotatePackages.java:18:14: compiler.err.cant.resolve.location: kindname.class, lang, , , (compiler.misc.location: kindname.package, java, null)
 CantAnnotatePackages.java:14:18: compiler.err.type.annotation.inadmissible: (compiler.misc.type.annotation.1: @TA), java.lang, @TA java.lang.Object
-CantAnnotatePackages.java:16:14: compiler.err.type.annotation.inadmissible: (compiler.misc.type.annotation.1: @TA), java.lang, @TA java.lang.Object
-CantAnnotatePackages.java:17:9: compiler.err.type.annotation.inadmissible: (compiler.misc.type.annotation.1: @TA), java.lang, @TA java.lang.Object
-CantAnnotatePackages.java:18:14: compiler.err.type.annotation.inadmissible: (compiler.misc.type.annotation.1: @TA), java.lang, @TA java.lang.Object
 4 errors
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateScoping.java b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateScoping.java
index aec691c913dd6..4bdd791909c27 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateScoping.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateScoping.java
@@ -1,6 +1,6 @@
 /*
  * @test /nodynamiccopyright/
- * @bug 8006733 8006775 8043226
+ * @bug 8006733 8006775 8043226 8334055
  * @summary Ensure behavior for nested types is correct.
  * @author Werner Dietl
  * @compile/fail/ref=CantAnnotateScoping.out -XDrawDiagnostics CantAnnotateScoping.java
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateScoping.out b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateScoping.out
index 2ae736ad315d4..ade5333a446fa 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateScoping.out
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/CantAnnotateScoping.out
@@ -1,13 +1,12 @@
-CantAnnotateScoping.java:68:18: compiler.err.doesnt.exist: java.XXX
+CantAnnotateScoping.java:63:9: compiler.err.cant.resolve.location: kindname.class, lang, , , (compiler.misc.location: kindname.package, java, null)
+CantAnnotateScoping.java:68:9: compiler.err.cant.resolve.location: kindname.class, XXX, , , (compiler.misc.location: kindname.package, java, null)
+CantAnnotateScoping.java:71:9: compiler.err.cant.resolve.location: kindname.class, lang, , , (compiler.misc.location: kindname.package, java, null)
 CantAnnotateScoping.java:38:14: compiler.err.type.annotation.inadmissible: (compiler.misc.type.annotation.1: @TA), Test.Outer, @TA Test.Outer.SInner
 CantAnnotateScoping.java:51:18: compiler.err.type.annotation.inadmissible: (compiler.misc.type.annotation.1: @TA), java.lang, @TA java.lang.Object
 CantAnnotateScoping.java:60:37: compiler.err.type.annotation.inadmissible: (compiler.misc.type.annotation: @TA,@TA2), java.lang, @DTA @TA @TA2 java.lang.Object
 CantAnnotateScoping.java:40:14: compiler.err.type.annotation.inadmissible: (compiler.misc.type.annotation.1: @TA), Test.Outer, @TA Test.Outer.SInner
-CantAnnotateScoping.java:63:11: compiler.err.annotation.type.not.applicable.to.type: DA
-CantAnnotateScoping.java:68:11: compiler.err.annotation.type.not.applicable.to.type: DA
-CantAnnotateScoping.java:71:9: compiler.err.type.annotation.inadmissible: (compiler.misc.type.annotation.1: @TA), java.lang, @TA java.lang.Object
 CantAnnotateScoping.java:44:34: compiler.err.type.annotation.inadmissible: (compiler.misc.type.annotation: @TA,@TA2), Test.Outer, @TA @TA2 Test.Outer.SInner
 CantAnnotateScoping.java:44:25: compiler.err.annotation.type.not.applicable.to.type: DA
 CantAnnotateScoping.java:48:38: compiler.err.type.annotation.inadmissible: (compiler.misc.type.annotation.1: @TA), Test.Outer, @TA Test.Outer.SInner
 CantAnnotateScoping.java:48:34: compiler.err.annotation.type.not.applicable.to.type: DA
-12 errors
+11 errors

From 73e3e0edeb20c6f701b213423476f92fb05dd262 Mon Sep 17 00:00:00 2001
From: Dean Long <dlong@openjdk.org>
Date: Thu, 11 Jul 2024 20:18:16 +0000
Subject: [PATCH 059/401] 8321509: False positive in get_trampoline fast path
 causes crash

Reviewed-by: kvn, adinn, thartmann
---
 .../cpu/aarch64/globalDefinitions_aarch64.hpp |  4 +-
 .../cpu/aarch64/nativeInst_aarch64.cpp        | 39 +++++++++----------
 .../cpu/aarch64/nativeInst_aarch64.hpp        |  7 ++--
 src/hotspot/cpu/aarch64/relocInfo_aarch64.cpp | 33 ++++++++++------
 src/hotspot/share/code/relocInfo.cpp          |  8 ++++
 src/hotspot/share/code/relocInfo.hpp          |  5 +++
 6 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp b/src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp
index 63f6c9491c8de..faf635dc33282 100644
--- a/src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -76,4 +76,6 @@ const bool CCallingConventionRequiresIntsAsLongs = false;
 
 #define USE_POINTERS_TO_REGISTER_IMPL_ARRAY
 
+#define USE_TRAMPOLINE_STUB_FIX_OWNER
+
 #endif // CPU_AARCH64_GLOBALDEFINITIONS_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp b/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp
index c88705618e63d..5a3f9d228ca89 100644
--- a/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -51,13 +51,18 @@ void NativeInstruction::wrote(int offset) {
 }
 
 address NativeCall::destination() const {
-  address addr = (address)this;
-  address destination = instruction_address() + displacement();
+  address addr = instruction_address();
+  address destination = addr + displacement();
+
+  // Performance optimization: no need to call find_blob() if it is a self-call
+  if (destination == addr) {
+    return destination;
+  }
 
   // Do we use a trampoline stub for this call?
   CodeBlob* cb = CodeCache::find_blob(addr);
-  assert(cb && cb->is_nmethod(), "sanity");
-  nmethod *nm = (nmethod *)cb;
+  assert(cb != nullptr && cb->is_nmethod(), "nmethod expected");
+  nmethod *nm = cb->as_nmethod();
   if (nm->stub_contains(destination) && is_NativeCallTrampolineStub_at(destination)) {
     // Yes we do, so get the destination from the trampoline stub.
     const address trampoline_stub_addr = destination;
@@ -72,12 +77,8 @@ address NativeCall::destination() const {
 // call instruction at all times.
 //
 // Used in the runtime linkage of calls; see class CompiledIC.
-//
-// Add parameter assert_lock to switch off assertion
-// during code generation, where no patching lock is needed.
-void NativeCall::set_destination_mt_safe(address dest, bool assert_lock) {
-  assert(!assert_lock ||
-         (Patching_lock->is_locked() || SafepointSynchronize::is_at_safepoint()) ||
+void NativeCall::set_destination_mt_safe(address dest) {
+  assert((Patching_lock->is_locked() || SafepointSynchronize::is_at_safepoint()) ||
          CompiledICLocker::is_safe(addr_at(0)),
          "concurrent code patching");
 
@@ -104,22 +105,18 @@ void NativeCall::set_destination_mt_safe(address dest, bool assert_lock) {
 }
 
 address NativeCall::get_trampoline() {
-  address call_addr = addr_at(0);
+  address call_addr = instruction_address();
 
   CodeBlob *code = CodeCache::find_blob(call_addr);
-  assert(code != nullptr, "Could not find the containing code blob");
+  assert(code != nullptr && code->is_nmethod(), "nmethod expected");
+  nmethod* nm = code->as_nmethod();
 
-  address bl_destination
-    = MacroAssembler::pd_call_destination(call_addr);
-  if (code->contains(bl_destination) &&
+  address bl_destination = call_addr + displacement();
+  if (nm->stub_contains(bl_destination) &&
       is_NativeCallTrampolineStub_at(bl_destination))
     return bl_destination;
 
-  if (code->is_nmethod()) {
-    return trampoline_stub_Relocation::get_trampoline_for(call_addr, (nmethod*)code);
-  }
-
-  return nullptr;
+  return trampoline_stub_Relocation::get_trampoline_for(call_addr, nm);
 }
 
 // Inserts a native call instruction at a given pc
diff --git a/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp b/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
index 974214d985b5d..0eb5ff815be1d 100644
--- a/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2108, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -174,6 +174,7 @@ class NativeCall: public NativeInstruction {
   int displacement() const { return (int_at(displacement_offset) << 6) >> 4; }
   address displacement_address() const { return addr_at(displacement_offset); }
   address return_address() const { return addr_at(return_address_offset); }
+  address raw_destination() const { return instruction_address() + displacement(); }
   address destination() const;
 
   void set_destination(address dest) {
@@ -213,9 +214,7 @@ class NativeCall: public NativeInstruction {
   //
   // Used in the runtime linkage of calls; see class CompiledIC.
   // (Cf. 4506997 and 4479829, where threads witnessed garbage displacements.)
-
-  // The parameter assert_lock disables the assertion during code generation.
-  void set_destination_mt_safe(address dest, bool assert_lock = true);
+  void set_destination_mt_safe(address dest);
 
   address get_trampoline();
 #if INCLUDE_JVMCI
diff --git a/src/hotspot/cpu/aarch64/relocInfo_aarch64.cpp b/src/hotspot/cpu/aarch64/relocInfo_aarch64.cpp
index 332f24996930f..c4c8648d552d0 100644
--- a/src/hotspot/cpu/aarch64/relocInfo_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/relocInfo_aarch64.cpp
@@ -60,13 +60,12 @@ void Relocation::pd_set_data_value(address x, bool verify_only) {
 
 address Relocation::pd_call_destination(address orig_addr) {
   assert(is_call(), "should be a call here");
-  if (NativeCall::is_call_at(addr())) {
-    address trampoline = nativeCall_at(addr())->get_trampoline();
-    if (trampoline) {
-      return nativeCallTrampolineStub_at(trampoline)->destination();
+  if (orig_addr == nullptr) {
+    if (NativeCall::is_call_at(addr())) {
+      NativeCall* call = nativeCall_at(addr());
+      return call->destination();
     }
-  }
-  if (orig_addr != nullptr) {
+  } else {
     address new_addr = MacroAssembler::pd_call_destination(orig_addr);
     // If call is branch to self, don't try to relocate it, just leave it
     // as branch to self. This happens during code generation if the code
@@ -82,16 +81,26 @@ address Relocation::pd_call_destination(address orig_addr) {
 void Relocation::pd_set_call_destination(address x) {
   assert(is_call(), "should be a call here");
   if (NativeCall::is_call_at(addr())) {
-    address trampoline = nativeCall_at(addr())->get_trampoline();
-    if (trampoline) {
-      nativeCall_at(addr())->set_destination_mt_safe(x, /* assert_lock */false);
-      return;
-    }
+    NativeCall* call = nativeCall_at(addr());
+    call->set_destination(x);
+  } else {
+    MacroAssembler::pd_patch_instruction(addr(), x);
   }
-  MacroAssembler::pd_patch_instruction(addr(), x);
   assert(pd_call_destination(addr()) == x, "fail in reloc");
 }
 
+void trampoline_stub_Relocation::pd_fix_owner_after_move() {
+  NativeCall* call = nativeCall_at(owner());
+  assert(call->raw_destination() == owner(), "destination should be empty");
+  address trampoline = addr();
+  address dest = nativeCallTrampolineStub_at(trampoline)->destination();
+  if (!Assembler::reachable_from_branch_at(owner(), dest)) {
+    dest = trampoline;
+  }
+  call->set_destination(dest);
+}
+
+
 address* Relocation::pd_address_in_code() {
   return (address*)(addr() + 8);
 }
diff --git a/src/hotspot/share/code/relocInfo.cpp b/src/hotspot/share/code/relocInfo.cpp
index 3b19b63f24469..a379f88ddc180 100644
--- a/src/hotspot/share/code/relocInfo.cpp
+++ b/src/hotspot/share/code/relocInfo.cpp
@@ -373,6 +373,14 @@ void CallRelocation::fix_relocation_after_move(const CodeBuffer* src, CodeBuffer
 }
 
 
+#ifdef USE_TRAMPOLINE_STUB_FIX_OWNER
+void trampoline_stub_Relocation::fix_relocation_after_move(const CodeBuffer* src, CodeBuffer* dest) {
+  // Finalize owner destination only for nmethods
+  if (dest->blob() != nullptr) return;
+  pd_fix_owner_after_move();
+}
+#endif
+
 //// pack/unpack methods
 
 void oop_Relocation::pack_data_to(CodeSection* dest) {
diff --git a/src/hotspot/share/code/relocInfo.hpp b/src/hotspot/share/code/relocInfo.hpp
index 6d0907d97dedc..25cca49e50bb8 100644
--- a/src/hotspot/share/code/relocInfo.hpp
+++ b/src/hotspot/share/code/relocInfo.hpp
@@ -1258,6 +1258,11 @@ class runtime_call_w_cp_Relocation : public CallRelocation {
 // in the code, it can patch it to jump to the trampoline where is
 // sufficient space for a far branch. Needed on PPC.
 class trampoline_stub_Relocation : public Relocation {
+#ifdef USE_TRAMPOLINE_STUB_FIX_OWNER
+  void pd_fix_owner_after_move();
+  void fix_relocation_after_move(const CodeBuffer* src, CodeBuffer* dest) override;
+#endif
+
  public:
   static RelocationHolder spec(address static_call) {
     return RelocationHolder::construct<trampoline_stub_Relocation>(static_call);

From 889055713ea83f899ebd7bf640dcf3c3e1a82ebe Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nbenalla@openjdk.org>
Date: Thu, 11 Jul 2024 20:44:21 +0000
Subject: [PATCH 060/401] 8335623: Clean up HtmlTag.HtmlTag and make the ARIA
 role attribute global

Reviewed-by: liach
---
 .../jdk/javadoc/internal/doclint/HtmlTag.java | 22 +------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

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

From 687601ebcaedf133fd4d5cecc42c5aadf9c73f3c Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevinw@openjdk.org>
Date: Thu, 11 Jul 2024 20:45:34 +0000
Subject: [PATCH 061/401] 8336257: Additional tests in jmxremote/startstop to
 match on PID not app name

Reviewed-by: cjplummer, alanb, amenkov, dcubed
---
 .../sun/management/jmxremote/startstop/JMXStartStopTest.java | 5 +++--
 .../jmxremote/startstop/JMXStatusPerfCountersTest.java       | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/jdk/sun/management/jmxremote/startstop/JMXStartStopTest.java b/test/jdk/sun/management/jmxremote/startstop/JMXStartStopTest.java
index 13a4f7bea73f0..3d125325449f5 100644
--- a/test/jdk/sun/management/jmxremote/startstop/JMXStartStopTest.java
+++ b/test/jdk/sun/management/jmxremote/startstop/JMXStartStopTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -72,7 +72,7 @@ public class JMXStartStopTest {
 
     private static final boolean verbose = false;
 
-    private static ManagementAgentJcmd jcmd = new ManagementAgentJcmd(TEST_APP_NAME, verbose);
+    private static ManagementAgentJcmd jcmd;
 
     private static void dbg_print(String msg) {
         if (verbose) {
@@ -347,6 +347,7 @@ public synchronized void start() throws InterruptedException, IOException, Timeo
                                                 "the requested port not being available");
                     }
                     pid = p.pid();
+                    jcmd = new ManagementAgentJcmd(p, verbose);
                 } catch (TimeoutException e) {
                     if (p != null) {
                         p.destroy();
diff --git a/test/jdk/sun/management/jmxremote/startstop/JMXStatusPerfCountersTest.java b/test/jdk/sun/management/jmxremote/startstop/JMXStatusPerfCountersTest.java
index fc7a0de2d0630..e3703ba8dbc87 100644
--- a/test/jdk/sun/management/jmxremote/startstop/JMXStatusPerfCountersTest.java
+++ b/test/jdk/sun/management/jmxremote/startstop/JMXStatusPerfCountersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,7 +67,6 @@ public static void setupClass() throws Exception {
 
     @BeforeTest
     public void setup() {
-        jcmd = new ManagementAgentJcmd(TEST_APP_NAME, false);
     }
 
     @BeforeMethod
@@ -76,6 +75,7 @@ public void startTestApp() throws Exception {
             TEST_APP_NAME, testAppPb,
             (Predicate<String>)l->l.trim().equals("main enter")
         );
+        jcmd = new ManagementAgentJcmd(testApp, false);
     }
 
     @AfterMethod

From b3ef2a600cfec31723dc78fe552e9cf9976b0337 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Thu, 11 Jul 2024 20:51:27 +0000
Subject: [PATCH 062/401] 8336036: Synthetic documentation for a record's
 equals is incorrect for floating-point types

Reviewed-by: prappo
---
 .../doclets/toolkit/resources/doclets.properties   |  6 ++++--
 .../doclet/testRecordTypes/TestRecordTypes.java    | 14 +++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
index 859289ff8bd21..0ee9429ec0c65 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
@@ -319,10 +319,12 @@ doclet.record_equals_doc.fullbody.head=\
 doclet.record_equals_doc.fullbody.tail.both=\
  Reference components are compared with \
  {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}; \
- primitive components are compared with '=='.
+ primitive components are compared with the <code>compare</code> method from \
+ their corresponding wrapper classes.
 
 doclet.record_equals_doc.fullbody.tail.primitive=\
- All components in this record class are compared with '=='.
+ All components in this record class are compared with the <code>compare</code> \
+ method from their corresponding wrapper classes.
 
 doclet.record_equals_doc.fullbody.tail.reference=\
  All components in this record class are compared with \
diff --git a/test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java b/test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java
index c4579c501ec77..f9aa3cfd6fa49 100644
--- a/test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java
+++ b/test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -237,7 +237,8 @@ public record R(int r1) { }""");
                 """
                     Indicates whether some other object is "equal to" this one. The objects are equa\
                     l if the other object is of the same class and if all the record components are \
-                    equal. All components in this record class are compared with '=='.""",
+                    equal. All components in this record class are compared with the <code>compare</\
+                    code> method from their corresponding wrapper classes.""",
                 """
                     <span class="element-name">r1</span>""",
                 """
@@ -300,7 +301,8 @@ public record R(int r1) { }""");
                 """
                     Indicates whether some other object is "equal to" this one. The objects are equa\
                     l if the other object is of the same class and if all the record components are \
-                    equal. All components in this record class are compared with '=='.""",
+                    equal. All components in this record class are compared with the <code>compare</\
+                    code> method from their corresponding wrapper classes.""",
                 """
                     <span class="element-name">r1</span>""",
                 """
@@ -311,7 +313,8 @@ l if the other object is of the same class and if all the record components are
     @Test
     public void testGeneratedEqualsPrimitive(Path base) throws IOException {
         testGeneratedEquals(base, "int a, int b",
-             "All components in this record class are compared with '=='.");
+             "All components in this record class are compared with the <code>compare</code> method " +
+                     "from their corresponding wrapper classes.");
     }
 
     @Test
@@ -324,7 +327,8 @@ public void testGeneratedEqualsReference(Path base) throws IOException {
     public void testGeneratedEqualsMixed(Path base) throws IOException {
         testGeneratedEquals(base, "int a, Object b",
              "Reference components are compared with <code>Objects::equals(Object,Object)</code>; "
-             + "primitive components are compared with '=='.");
+             + "primitive components are compared with the <code>compare</code> method from their "
+             + "corresponding wrapper classes.");
     }
 
     private void testGeneratedEquals(Path base, String comps, String expect) throws IOException {

From 81a0d1ba03bbdbe718302b3925cdc207d5d05232 Mon Sep 17 00:00:00 2001
From: Vanitha B P <vanitha.b.p@oracle.com>
Date: Thu, 11 Jul 2024 21:27:30 +0000
Subject: [PATCH 063/401] 8325525: Create jtreg test case for JDK-8325203

Reviewed-by: asemenyuk, almatvee
---
 .../apps/ChildProcessAppLauncher.java         | 37 ++++++++
 .../jpackage/windows/WinChildProcessTest.java | 88 +++++++++++++++++++
 2 files changed, 125 insertions(+)
 create mode 100644 test/jdk/tools/jpackage/apps/ChildProcessAppLauncher.java
 create mode 100644 test/jdk/tools/jpackage/windows/WinChildProcessTest.java

diff --git a/test/jdk/tools/jpackage/apps/ChildProcessAppLauncher.java b/test/jdk/tools/jpackage/apps/ChildProcessAppLauncher.java
new file mode 100644
index 0000000000000..11be90bc45622
--- /dev/null
+++ b/test/jdk/tools/jpackage/apps/ChildProcessAppLauncher.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+
+public class ChildProcessAppLauncher {
+
+    public static void main(String[] args) throws IOException {
+            String calcPath = Path.of(System.getenv("SystemRoot"), "system32", "calc.exe").toString();
+            ProcessBuilder processBuilder = new ProcessBuilder(calcPath);
+            Process process = processBuilder.start();
+            System.out.println("Calc id=" + process.pid());
+            System.exit(0);
+    }
+}
diff --git a/test/jdk/tools/jpackage/windows/WinChildProcessTest.java b/test/jdk/tools/jpackage/windows/WinChildProcessTest.java
new file mode 100644
index 0000000000000..2928f7f1c5ffe
--- /dev/null
+++ b/test/jdk/tools/jpackage/windows/WinChildProcessTest.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 8325203
+ * @summary Test that Jpackage windows executable application kills the launched 3rd party application
+ *          when System.exit(0) is invoked along with terminating java program.
+ * @library ../helpers
+ * @library /test/lib
+ * @requires os.family == "windows"
+ * @build WinChildProcessTest
+ * @build jdk.jpackage.test.*
+ * @build WinChildProcessTest
+ * @modules jdk.jpackage/jdk.jpackage.internal
+ * @run main/othervm -Xmx512m jdk.jpackage.test.Main
+ *  --jpt-run=WinChildProcessTest
+ *
+ */
+
+import java.util.List;
+import java.util.Optional;
+
+import java.nio.file.Path;
+
+import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.Executor;
+import jdk.jpackage.test.TKit;
+
+public class WinChildProcessTest {
+    private static final Path TEST_APP_JAVA = TKit.TEST_SRC_ROOT
+            .resolve("apps/ChildProcessAppLauncher.java");
+
+    @Test
+    public static void test() throws Throwable {
+        long calcPid = 0;
+        try {
+            JPackageCommand cmd = JPackageCommand
+                    .helloAppImage(TEST_APP_JAVA + "*Hello");
+
+            // Create the image of the third party application launcher
+            cmd.executeAndAssertImageCreated();
+
+            // Start the third party application launcher and dump and save the
+            // output of the application
+            List<String> output = new Executor().saveOutput().dumpOutput()
+                    .setExecutable(cmd.appLauncherPath().toAbsolutePath())
+                    .execute(0).getOutput();
+            String pidStr = output.get(0);
+
+            // parse calculator PID
+            calcPid = Long.parseLong(pidStr.split("=", 2)[1]);
+
+            // Check whether the termination of third party application launcher
+            // also terminating the launched third party application
+            // If third party application is not terminated the test is
+            // successful else failure
+            Optional<ProcessHandle> processHandle = ProcessHandle.of(calcPid);
+            boolean isAlive = processHandle.isPresent()
+                    && processHandle.get().isAlive();
+            System.out.println("Is Alive " + isAlive);
+            TKit.assertTrue(isAlive, "Check is calculator process is alive");
+        } finally {
+            // Kill only a specific calculator instance
+            Runtime.getRuntime().exec("taskkill /F /PID " + calcPid);
+        }
+    }
+}
\ No newline at end of file

From c703d290425f85a06e61d72c9672ac2adac92db9 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Fri, 12 Jul 2024 05:56:53 +0000
Subject: [PATCH 064/401] 8335710:
 serviceability/dcmd/vm/SystemDumpMapTest.java and SystemMapTest.java fail on
 Linux Alpine after 8322475

Reviewed-by: stuefe, lucy
---
 .../jtreg/serviceability/dcmd/vm/SystemMapTestBase.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/serviceability/dcmd/vm/SystemMapTestBase.java b/test/hotspot/jtreg/serviceability/dcmd/vm/SystemMapTestBase.java
index 000e977a590e5..3d1284b09eeee 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/vm/SystemMapTestBase.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/vm/SystemMapTestBase.java
@@ -49,8 +49,8 @@ public class SystemMapTestBase {
         regexBase_committed + "/bin/java",
         // libjvm
         regexBase_committed + "/lib/.*/libjvm.so",
-        // vdso library, should be part of all user space apps on all architectures OpenJDK supports.
-        regexBase_committed + "\\[vdso\\]",
+        // heap segment, should be part of all user space apps on all architectures OpenJDK supports.
+        regexBase_committed + "\\[heap\\]",
         // we should see the hs-perf data file, and it should appear as shared as well as committed
         regexBase_shared_and_committed + "hsperfdata_.*"
     };

From 1fe3ada001e188754df5de00bf6804f028ad274b Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Fri, 12 Jul 2024 08:14:56 +0000
Subject: [PATCH 065/401] 8336284: Test
 TestClhsdbJstackLock.java/TestJhsdbJstackLock.java fails with -Xcomp after
 JDK-8335743

Reviewed-by: cjplummer, amenkov
---
 test/hotspot/jtreg/serviceability/sa/TestClhsdbJstackLock.java | 2 +-
 test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackLock.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/serviceability/sa/TestClhsdbJstackLock.java b/test/hotspot/jtreg/serviceability/sa/TestClhsdbJstackLock.java
index e4d4361e6512b..266b14167ef4e 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestClhsdbJstackLock.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestClhsdbJstackLock.java
@@ -59,7 +59,7 @@ public static void main (String... args) throws Exception {
                 "^\\s+- waiting to lock <0x[0-9a-f]+> \\(a java\\.lang\\.Class for LingeredAppWithLock\\)$",
                 "^\\s+- locked <0x[0-9a-f]+> \\(a java\\.lang\\.Thread\\)$",
                 "^\\s+- locked <0x[0-9a-f]+> \\(a java\\.lang\\.Class for int\\)$",
-                "^\\s+- waiting on <0x[0-9a-f]+> \\(a java\\.lang\\.Object\\)$"));
+                "^\\s+- waiting on (<0x[0-9a-f]+> \\(a java\\.lang\\.Object\\)|<no object reference available>)$"));
             unExpStrMap.put("jstack", List.of(
                 "missing reason for "));
             test.run(app.getPid(), cmds, expStrMap, unExpStrMap);
diff --git a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackLock.java b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackLock.java
index 98c4286609178..d3c7f61103165 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackLock.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackLock.java
@@ -65,7 +65,7 @@ public static void main (String... args) throws Exception {
             out.shouldMatch("^\\s+- waiting to lock <0x[0-9a-f]+> \\(a java\\.lang\\.Class for LingeredAppWithLock\\)$");
             out.shouldMatch("^\\s+- locked <0x[0-9a-f]+> \\(a java\\.lang\\.Thread\\)$");
             out.shouldMatch("^\\s+- locked <0x[0-9a-f]+> \\(a java\\.lang\\.Class for int\\)$");
-            out.shouldMatch("^\\s+- waiting on <0x[0-9a-f]+> \\(a java\\.lang\\.Object\\)$");
+            out.shouldMatch("^\\s+- waiting on (<0x[0-9a-f]+> \\(a java\\.lang\\.Object\\)|<no object reference available>)$");
 
             out.stderrShouldBeEmptyIgnoreDeprecatedWarnings();
 

From f677b90eb93026d3fdfd4ae19d48415a7d8318e8 Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevinw@openjdk.org>
Date: Fri, 12 Jul 2024 08:19:24 +0000
Subject: [PATCH 066/401] 8267887: RMIConnector_NPETest.java fails after
 removal of RMI Activation (JDK-8267123)

Reviewed-by: cjplummer, sspitsyn
---
 test/jdk/ProblemList.txt                      |  2 -
 .../connection/RMIConnector_NPETest.java      | 77 -------------------
 2 files changed, 79 deletions(-)
 delete mode 100644 test/jdk/javax/management/remote/mandatory/connection/RMIConnector_NPETest.java

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 20dfcef539de3..05e42b4933046 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -528,8 +528,6 @@ javax/management/MBeanServer/OldMBeanServerTest.java            8030957 aix-all
 
 javax/management/monitor/DerivedGaugeMonitorTest.java           8042211 generic-all
 
-javax/management/remote/mandatory/connection/RMIConnector_NPETest.java 8267887 generic-all
-
 javax/management/remote/mandatory/connection/BrokenConnectionTest.java 8262312 linux-all
 
 ############################################################################
diff --git a/test/jdk/javax/management/remote/mandatory/connection/RMIConnector_NPETest.java b/test/jdk/javax/management/remote/mandatory/connection/RMIConnector_NPETest.java
deleted file mode 100644
index 29a91a464c713..0000000000000
--- a/test/jdk/javax/management/remote/mandatory/connection/RMIConnector_NPETest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2010, 2016, 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
- * @summary NPE IN RMIConnector.connect
- * @bug 6984520
- * @library /java/rmi/testlibrary
- * @modules java.management.rmi
- *          java.rmi/sun.rmi.registry
- *          java.rmi/sun.rmi.server
- *          java.rmi/sun.rmi.transport
- *          java.rmi/sun.rmi.transport.tcp
- * @run clean RMIConnector_NPETest
- * @run build TestLibrary RMID
- * @run build RMIConnector_NPETest
- * @run main RMIConnector_NPETest
- */
-import java.io.IOException;
-import javax.management.*;
-import javax.management.remote.rmi.*;
-
-public class RMIConnector_NPETest {
-    public static void main(String argv[]) throws Exception {
-        RMID rmid = RMID.createRMID();
-        Exception failureCause = null;
-        RMIConnector agent = null;
-
-        try {
-            rmid.start();
-            int rmidPort = rmid.getPort();
-            MBeanServer mbs = MBeanServerFactory.createMBeanServer();
-            RMIJRMPServerImpl rmiserver = new RMIJRMPServerImpl(rmidPort, null, null, null);
-            rmiserver.setMBeanServer(mbs);
-            agent = new RMIConnector(rmiserver, null);
-            agent.connect();
-        } catch (NullPointerException npe) {
-            failureCause = npe;
-        } catch (Exception e) {
-            // OK
-        } finally {
-            if (agent != null) {
-                try {
-                    agent.close();
-                } catch (IOException e) {
-                    // ignore
-                }
-            }
-            rmid.destroy();
-        }
-
-        if (failureCause != null) {
-            TestLibrary.bomb("Test failed", failureCause);
-        }
-
-    }
-}

From 7a6203296416268f1c3f269d0db2b0c817642a34 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Fri, 12 Jul 2024 09:30:38 +0000
Subject: [PATCH 067/401] 8336081: Fix -Wzero-as-null-pointer-constant warnings
 in JVMTypedFlagLimit ctors

Reviewed-by: dholmes, jwaters
---
 src/hotspot/share/runtime/flags/jvmFlagLimit.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/runtime/flags/jvmFlagLimit.hpp b/src/hotspot/share/runtime/flags/jvmFlagLimit.hpp
index 69df96f226dd8..4a9c9c66d9b37 100644
--- a/src/hotspot/share/runtime/flags/jvmFlagLimit.hpp
+++ b/src/hotspot/share/runtime/flags/jvmFlagLimit.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -155,7 +155,7 @@ class JVMTypedFlagLimit : public JVMFlagLimit {
   // dummy - no range or constraint. This object will not be emitted into the .o file
   // because we declare it as "const" but has no reference to it.
   constexpr JVMTypedFlagLimit(int type_enum) :
-  JVMFlagLimit(0, 0, JVMFlagConstraintPhase::AtParse, 0), _min(0), _max(0) {}
+  JVMFlagLimit(0, 0, JVMFlagConstraintPhase::AtParse, 0), _min(), _max() {}
 
   // range only
   constexpr JVMTypedFlagLimit(int type_enum, T min, T max) :
@@ -163,7 +163,7 @@ class JVMTypedFlagLimit : public JVMFlagLimit {
 
   // constraint only
   constexpr JVMTypedFlagLimit(int type_enum, ConstraintMarker dummy2, short func, JVMFlagConstraintPhase phase) :
-    JVMFlagLimit(type_enum, func, phase, HAS_CONSTRAINT), _min(0), _max(0) {}
+    JVMFlagLimit(type_enum, func, phase, HAS_CONSTRAINT), _min(), _max() {}
 
   // range and constraint
   constexpr JVMTypedFlagLimit(int type_enum, T min, T max, ConstraintMarker dummy2, short func, JVMFlagConstraintPhase phase)  :

From 9b6f6c5c9dd6d0fbb056e8d84c3a0888a3320edf Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Fri, 12 Jul 2024 09:33:04 +0000
Subject: [PATCH 068/401] 8336082: Fix -Wzero-as-null-pointer-constant warnings
 in SimpleCompactHashtable

Reviewed-by: coleenp, dholmes
---
 .../share/classfile/compactHashtable.hpp      | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/hotspot/share/classfile/compactHashtable.hpp b/src/hotspot/share/classfile/compactHashtable.hpp
index e99369cc5c376..6cb689ad20df6 100644
--- a/src/hotspot/share/classfile/compactHashtable.hpp
+++ b/src/hotspot/share/classfile/compactHashtable.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -204,18 +204,20 @@ class SimpleCompactHashtable {
   u4* _entries;
 
 public:
-  SimpleCompactHashtable() {
-    _entry_count = 0;
-    _bucket_count = 0;
-    _buckets = 0;
-    _entries = 0;
-  }
+  SimpleCompactHashtable() :
+    _base_address(nullptr),
+    _bucket_count(0),
+    _entry_count(0),
+    _buckets(nullptr),
+    _entries(nullptr)
+  {}
 
   void reset() {
+    _base_address = nullptr;
     _bucket_count = 0;
     _entry_count = 0;
-    _buckets = 0;
-    _entries = 0;
+    _buckets = nullptr;
+    _entries = nullptr;
   }
 
   void init(address base_address, u4 entry_count, u4 bucket_count, u4* buckets, u4* entries);

From eec0e155f303ff4bbdab172765ca7c92c2b94cbd Mon Sep 17 00:00:00 2001
From: Volker Simonis <simonis@openjdk.org>
Date: Fri, 12 Jul 2024 12:09:58 +0000
Subject: [PATCH 069/401] 8335619: Add an @apiNote to
 j.l.i.ClassFileTransformer to warn about recursive class loading and
 ClassCircularityErrors

Reviewed-by: alanb, stuefe, liach
---
 .../lang/instrument/ClassFileTransformer.java | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/java.instrument/share/classes/java/lang/instrument/ClassFileTransformer.java b/src/java.instrument/share/classes/java/lang/instrument/ClassFileTransformer.java
index d4c17f1cfdcf7..ee2037fac5bfb 100644
--- a/src/java.instrument/share/classes/java/lang/instrument/ClassFileTransformer.java
+++ b/src/java.instrument/share/classes/java/lang/instrument/ClassFileTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -155,11 +155,28 @@
  * logging or debugging of format corruptions.
  *
  * <P>
- * Note the term <i>class file</i> is used as defined in section 3.1 of
- * <cite>The Java Virtual Machine Specification</cite>, to mean a
- * sequence of bytes in class file format, whether or not they reside in a
+ * Note the term <i>class file</i> is used as defined in chapter {@jvms 4} The
+ * {@code class} File Format of <cite>The Java Virtual Machine Specification</cite>,
+ * to mean a sequence of bytes in class file format, whether or not they reside in a
  * file.
  *
+ * @apiNote
+ * Great care must be taken when transforming core JDK classes which are at the
+ * same time required during the transformation process as this can lead to class
+ * circularity or linkage errors.
+ *
+ * <P>
+ * If for example the invocation of {@link #transform transform()} for a class
+ * {@code C} requires loading or resolving the same class {@code C},
+ * an error is thrown that is an instance of {@link LinkageError} (or a subclass).
+ * If the {@link LinkageError} occurs during reference resolution (see section
+ * {@jvms 5.4.3} Resolution of <cite>The Java Virtual Machine Specification</cite>)
+ * for a class {@code D}, the resolution of the corresponding reference in class
+ * {@code D} will permanently fail with the same error at any subsequent attempt.
+ * This means that a {@link LinkageError} triggered during transformation of
+ * {@code C} in a class {@code D} not directly related to {@code C} can repeatedly
+ * occur later in arbitrary user code which uses {@code D}.
+ *
  * @see     java.lang.instrument.Instrumentation
  * @since   1.5
  */

From 559826c2922851dbe45ead23ad1d73b1846334ac Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Fri, 12 Jul 2024 12:17:21 +0000
Subject: [PATCH 070/401] 8332474: Tighten up ToolBox' JavacTask to not
 silently accept javac crash as a failure

Reviewed-by: vromero
---
 .../com/sun/tools/javac/comp/Modules.java     |  1 +
 .../tools/lib/toolbox/AbstractTask.java       | 60 ++++++++++++++++---
 .../tools/lib/toolbox/JavacTask.java          | 20 +++++++
 3 files changed, 72 insertions(+), 9 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
index 1136cb5621a79..3d893252218b5 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
@@ -330,6 +330,7 @@ private void enterModule(JCCompilationUnit toplevel, ClassSymbol c, Set<ModuleSy
             } else {
                 sym = syms.enterModule(name);
                 if (sym.module_info.sourcefile != null && sym.module_info.sourcefile != toplevel.sourcefile) {
+                    decl.sym = syms.errModule;
                     log.error(decl.pos(), Errors.DuplicateModule(sym));
                     return;
                 }
diff --git a/test/langtools/tools/lib/toolbox/AbstractTask.java b/test/langtools/tools/lib/toolbox/AbstractTask.java
index 83aca079ce592..778a5398605f8 100644
--- a/test/langtools/tools/lib/toolbox/AbstractTask.java
+++ b/test/langtools/tools/lib/toolbox/AbstractTask.java
@@ -35,6 +35,7 @@
 import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.BiConsumer;
 import static toolbox.ToolBox.lineSeparator;
 
 /**
@@ -50,7 +51,9 @@ abstract class AbstractTask<T extends AbstractTask<T>> implements Task {
     private final Map<OutputKind, String> redirects = new EnumMap<>(OutputKind.class);
     private final Map<String, String> envVars = new HashMap<>();
     private Expect expect = Expect.SUCCESS;
-    int expectedExitCode = 0;
+    //validator for exit codes, first parameter is the exit code
+    //the second the test name:
+    private BiConsumer<Integer, String> exitCodeValidator = null;
 
     /**
      * Create a task that will execute in the specified mode.
@@ -67,7 +70,7 @@ protected AbstractTask(ToolBox tb, Mode mode) {
      * @return the result of calling {@code run()}
      */
     public Result run(Expect expect) {
-        expect(expect, Integer.MIN_VALUE);
+        expect(expect, (_, _) -> {});
         return run();
     }
 
@@ -83,17 +86,56 @@ public Result run(Expect expect, int exitCode) {
         return run();
     }
 
+    /**
+     * Sets the expected outcome of the task and calls {@code run()}.
+     * @param expect the expected outcome
+     * @param exitCodeValidator an exit code validator. The first parameter will
+     *                          be the actual exit code, the second test name,
+     *                          should throw TaskError if the exit code is not
+     *                          as expected. Only used if the expected outcome
+     *                          is {@code FAIL}
+     * @return the result of calling {@code run()}
+     */
+    public Result run(Expect expect,
+                      BiConsumer<Integer, String> exitCodeValidator) {
+        expect(expect, exitCodeValidator);
+        return run();
+    }
+
+    /**
+     * Sets the expected outcome and expected exit code of the task.
+     * The exit code will not be checked if the outcome is
+     * {@code Expect.SUCCESS} or if the exit code is set to
+     * {@code Integer.MIN_VALUE}.
+     * @param expect the expected outcome
+     * @param expectedExitCode the expected exit code
+     */
+    protected void expect(Expect expect, int expectedExitCode) {
+        expect(expect, (exitCode, testName) -> {
+            if (expectedExitCode != Integer.MIN_VALUE &&
+                exitCode != expectedExitCode) {
+                throw new TaskError("Task " + testName + "failed with unexpected exit code "
+                    + exitCode + ", expected " + expectedExitCode);
+            }
+        });
+    }
+
     /**
      * Sets the expected outcome and expected exit code of the task.
      * The exit code will not be checked if the outcome is
      * {@code Expect.SUCCESS} or if the exit code is set to
      * {@code Integer.MIN_VALUE}.
      * @param expect the expected outcome
-     * @param exitCode the expected exit code
+     * @param exitCodeValidator an exit code validator. The first parameter will
+     *                          be the actual exit code, the second test name,
+     *                          should throw TaskError if the exit code is not
+     *                          as expected. Only used if the expected outcome
+     *                          is {@code FAIL}
      */
-    protected void expect(Expect expect, int exitCode) {
+    protected void expect(Expect expect,
+                          BiConsumer<Integer, String> exitCodeValidator) {
         this.expect = expect;
-        this.expectedExitCode = exitCode;
+        this.exitCodeValidator = exitCodeValidator;
     }
 
     /**
@@ -119,11 +161,11 @@ protected Result checkExit(Result result) throws TaskError {
                     throw new TaskError("Task " + name() + " succeeded unexpectedly");
                 }
 
-                if (expectedExitCode != Integer.MIN_VALUE
-                        && result.exitCode != expectedExitCode) {
+                try {
+                    exitCodeValidator.accept(result.exitCode, name());
+                } catch (Throwable t) {
                     result.writeAll();
-                    throw new TaskError("Task " + name() + "failed with unexpected exit code "
-                        + result.exitCode + ", expected " + expectedExitCode);
+                    throw t;
                 }
                 break;
         }
diff --git a/test/langtools/tools/lib/toolbox/JavacTask.java b/test/langtools/tools/lib/toolbox/JavacTask.java
index 5991d9e6063bc..ed056099e84e3 100644
--- a/test/langtools/tools/lib/toolbox/JavacTask.java
+++ b/test/langtools/tools/lib/toolbox/JavacTask.java
@@ -314,6 +314,26 @@ public String name() {
         return "javac";
     }
 
+    @Override
+    public Result run(Expect expect) {
+        int expectedExitCode = expect == Expect.SUCCESS ? 0 : 1;
+
+        return run(expect, (exitCode, testName) -> {
+            if (exitCode == 4) {
+                throw new TaskError("Task " + testName + " failed due to a javac crash "
+                    + "(exit code 4)");
+            }
+        });
+    }
+
+    @Override
+    public Result run(Expect expect, int exitCode) {
+        if (exitCode == 4) {
+            throw new IllegalArgumentException("Disallowed exit code: 4");
+        }
+        return super.run(expect, exitCode);
+    }
+
     /**
      * Calls the compiler with the arguments as currently configured.
      * @return a Result object indicating the outcome of the compilation

From 2fc7eb44a018974734832576a0a2631ae747e0cd Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhiscxk@openjdk.org>
Date: Fri, 12 Jul 2024 12:37:58 +0000
Subject: [PATCH 071/401] 8155030: The Menu Mnemonics are always displayed for
 GTK LAF

Hides mnemonics on menus, buttons, and labels for GTK L&F.

Moved shared code for hiding mnemonics into
sun/swing/MnemonicHandler and AltProcessor to avoid code duplication.

Reviewed-by: prr, tr, achung, dnguyen, aivanov
---
 .../classes/com/apple/laf/AquaButtonUI.java   |   7 +-
 .../classes/com/apple/laf/AquaLabelUI.java    |  21 +--
 .../com/apple/laf/AquaLookAndFeel.java        |  11 +-
 .../com/apple/laf/AquaMenuPainter.java        |  38 ++++--
 .../java/swing/plaf/gtk/GTKGraphicsUtils.java |  21 ++-
 .../java/swing/plaf/gtk/GTKLookAndFeel.java   |  70 ++++++++--
 .../share/classes/sun/swing/AltProcessor.java |  67 ++++++++++
 .../classes/sun/swing/MnemonicHandler.java}   | 100 ++++++---------
 .../plaf/windows/WindowsGraphicsUtils.java    |  75 ++++-------
 .../swing/plaf/windows/WindowsLabelUI.java    |   7 +-
 .../plaf/windows/WindowsLookAndFeel.java      |  42 +-----
 .../swing/plaf/windows/WindowsMenuBarUI.java  |   6 +-
 .../swing/plaf/windows/WindowsMenuItemUI.java |   5 +-
 .../plaf/windows/WindowsPopupMenuUI.java      |   9 +-
 .../swing/plaf/windows/WindowsRootPaneUI.java |  36 +++---
 .../swing/JMenuBar/TestMenuMnemonic.java      |   8 +-
 .../JMenuBar/TestMenuMnemonicLinuxAndMac.java | 121 ++++++++++++++++++
 .../javax/swing/LookAndFeel/bug4736093.java   |  12 +-
 .../plaf/windows/6921687/bug6921687.java      |  11 +-
 19 files changed, 428 insertions(+), 239 deletions(-)
 create mode 100644 src/java.desktop/share/classes/sun/swing/AltProcessor.java
 rename src/java.desktop/{macosx/classes/com/apple/laf/AquaMnemonicHandler.java => share/classes/sun/swing/MnemonicHandler.java} (52%)
 create mode 100644 test/jdk/javax/swing/JMenuBar/TestMenuMnemonicLinuxAndMac.java

diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonUI.java
index dab893252cfdb..063923ff80754 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaButtonUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -75,6 +75,7 @@
 import com.apple.laf.AquaUtilControlSize.Sizeable;
 import com.apple.laf.AquaUtils.RecyclableSingleton;
 import com.apple.laf.AquaUtils.RecyclableSingletonFromDefaultConstructor;
+import sun.swing.MnemonicHandler;
 import sun.swing.SwingUtilities2;
 
 public class AquaButtonUI extends BasicButtonUI implements Sizeable {
@@ -487,12 +488,10 @@ protected void paintIcon(final Graphics g, final AbstractButton b, final Rectang
      * Use the paintText method which takes the AbstractButton argument.
      */
     protected void paintText(final Graphics g, final JComponent c, final Rectangle localTextRect, final String text) {
-        final Graphics2D g2d = g instanceof Graphics2D ? (Graphics2D)g : null;
-
         final AbstractButton b = (AbstractButton)c;
         final ButtonModel model = b.getModel();
         final FontMetrics fm = g.getFontMetrics();
-        final int mnemonicIndex = AquaMnemonicHandler.isMnemonicHidden() ? -1 : b.getDisplayedMnemonicIndex();
+        final int mnemonicIndex = MnemonicHandler.isMnemonicHidden() ? -1 : b.getDisplayedMnemonicIndex();
 
         /* Draw the Text */
         if (model.isEnabled()) {
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaLabelUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaLabelUI.java
index fb5682d05413e..e0f282325e412 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaLabelUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaLabelUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,16 +25,19 @@
 
 package com.apple.laf;
 
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Graphics;
 
-import javax.swing.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.basic.*;
-
-import sun.swing.SwingUtilities2;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.UIResource;
+import javax.swing.plaf.basic.BasicLabelUI;
 
 import com.apple.laf.AquaUtils.RecyclableSingleton;
 import com.apple.laf.AquaUtils.RecyclableSingletonFromDefaultConstructor;
+import sun.swing.MnemonicHandler;
+import sun.swing.SwingUtilities2;
 
 public class AquaLabelUI extends BasicLabelUI {
     private static final RecyclableSingleton<AquaLabelUI> aquaLabelUI = new RecyclableSingletonFromDefaultConstructor<AquaLabelUI>(AquaLabelUI.class);
@@ -55,7 +58,7 @@ protected void uninstallListeners(final JLabel c) {
 
     protected void paintEnabledText(final JLabel l, final Graphics g, final String s, final int textX, final int textY) {
         int mnemIndex = l.getDisplayedMnemonicIndex();
-        if (AquaMnemonicHandler.isMnemonicHidden()) {
+        if (MnemonicHandler.isMnemonicHidden()) {
             mnemIndex = -1;
         }
 
@@ -72,7 +75,7 @@ protected void paintEnabledText(final JLabel l, final Graphics g, final String s
      */
     protected void paintDisabledText(final JLabel l, final Graphics g, final String s, final int textX, final int textY) {
         int accChar = l.getDisplayedMnemonicIndex();
-        if (AquaMnemonicHandler.isMnemonicHidden()) {
+        if (MnemonicHandler.isMnemonicHidden()) {
             accChar = -1;
         }
 
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaLookAndFeel.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaLookAndFeel.java
index d68cd1448eaa9..83604e5d835cd 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaLookAndFeel.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaLookAndFeel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,6 +55,8 @@
 
 import apple.laf.JRSUIControl;
 import apple.laf.JRSUIUtils;
+import sun.swing.AltProcessor;
+import sun.swing.MnemonicHandler;
 import sun.swing.SwingAccessor;
 import sun.swing.SwingUtilities2;
 
@@ -174,7 +176,9 @@ public Void run() {
         spf.setActive(true);
         PopupFactory.setSharedInstance(spf);
 
-        KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventPostProcessor(AquaMnemonicHandler.getInstance());
+        KeyboardFocusManager.getCurrentKeyboardFocusManager()
+                .addKeyEventPostProcessor(AltProcessor.getInstance());
+        MnemonicHandler.setMnemonicHidden(true);
     }
 
     /**
@@ -185,7 +189,8 @@ public Void run() {
      * @see #initialize
      */
     public void uninitialize() {
-        KeyboardFocusManager.getCurrentKeyboardFocusManager().removeKeyEventPostProcessor(AquaMnemonicHandler.getInstance());
+        KeyboardFocusManager.getCurrentKeyboardFocusManager()
+                .removeKeyEventPostProcessor(AltProcessor.getInstance());
 
         final PopupFactory popupFactory = PopupFactory.getSharedInstance();
         if (popupFactory instanceof ScreenPopupFactory spf) {
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuPainter.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuPainter.java
index 5a13822fd5acd..8f1a6799ff6b6 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuPainter.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuPainter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,21 +25,39 @@
 
 package com.apple.laf;
 
-import java.awt.*;
-import java.awt.event.*;
-
-import javax.swing.*;
+import java.awt.Color;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Insets;
+import java.awt.Rectangle;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+
+import javax.swing.ButtonModel;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+import javax.swing.KeyStroke;
+import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
 import javax.swing.border.Border;
 import javax.swing.plaf.basic.BasicHTML;
 import javax.swing.text.View;
 
-import sun.swing.SwingUtilities2;
-
-import apple.laf.JRSUIConstants.*;
-
+import apple.laf.JRSUIConstants.State;
+import apple.laf.JRSUIConstants.Widget;
 import com.apple.laf.AquaIcon.InvertableIcon;
 import com.apple.laf.AquaUtils.RecyclableSingleton;
 import com.apple.laf.AquaUtils.RecyclableSingletonFromDefaultConstructor;
+import sun.swing.MnemonicHandler;
+import sun.swing.SwingUtilities2;
 
 /**
  * AquaMenuPainter, implements paintMenuItem to avoid code duplication
@@ -287,7 +305,7 @@ protected void paintMenuItem(final Client client, final Graphics g, final JCompo
             if (v != null) {
                 v.paint(g, textRect);
             } else {
-                final int mnemonic = (AquaMnemonicHandler.isMnemonicHidden() ? -1 : model.getMnemonic());
+                final int mnemonic = (MnemonicHandler.isMnemonicHidden() ? -1 : model.getMnemonic());
                 drawString(g, c, text, mnemonic, textRect.x, textRect.y + fm.getAscent(), isEnabled, isSelected);
             }
         }
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKGraphicsUtils.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKGraphicsUtils.java
index 0ef404593f592..2a0aa7be41c45 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKGraphicsUtils.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKGraphicsUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,12 +24,19 @@
  */
 package com.sun.java.swing.plaf.gtk;
 
-import javax.swing.*;
-import javax.swing.plaf.synth.*;
 import java.awt.Color;
 import java.awt.Graphics;
 import java.awt.Rectangle;
 
+import javax.swing.AbstractButton;
+import javax.swing.JComponent;
+import javax.swing.plaf.synth.Region;
+import javax.swing.plaf.synth.SynthConstants;
+import javax.swing.plaf.synth.SynthContext;
+import javax.swing.plaf.synth.SynthGraphicsUtils;
+
+import sun.swing.MnemonicHandler;
+
 /**
  * @author Joshua Outwater
  */
@@ -49,6 +56,11 @@ public void paintText(SynthContext context, Graphics g, String text,
         int componentState = context.getComponentState();
 
         String themeName = GTKLookAndFeel.getGtkThemeName();
+
+        if (MnemonicHandler.isMnemonicHidden()) {
+            mnemonicIndex = -1;
+        }
+
         if (themeName != null && themeName.startsWith("blueprint") &&
             shouldShadowText(context.getRegion(), componentState)) {
 
@@ -115,7 +127,8 @@ public void paintText(SynthContext context, Graphics g, String text,
                 g.setColor(color);
             }
         }
-        super.paintText(context, g, text, bounds, mnemonicIndex);
+        super.paintText(context, g, text, bounds,
+                        MnemonicHandler.isMnemonicHidden() ? -1 : mnemonicIndex);
     }
 
     private static boolean shouldShadowText(Region id, int state) {
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
index 65f29ea8384fe..93ba22d8dd3da 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
@@ -25,28 +25,50 @@
 
 package com.sun.java.swing.plaf.gtk;
 
-import java.awt.*;
-import java.beans.*;
-import java.io.File;
-import java.lang.ref.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Insets;
+import java.awt.KeyboardFocusManager;
+import java.awt.Toolkit;
+import java.awt.Window;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
 import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.Locale;
-import javax.swing.*;
-import javax.swing.colorchooser.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.synth.*;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.swing.JComponent;
+import javax.swing.JTextField;
+import javax.swing.LayoutStyle;
+import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+import javax.swing.UIDefaults;
+import javax.swing.UIManager;
+import javax.swing.colorchooser.AbstractColorChooserPanel;
+import javax.swing.plaf.BorderUIResource;
+import javax.swing.plaf.ColorUIResource;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.DimensionUIResource;
+import javax.swing.plaf.InsetsUIResource;
+import javax.swing.plaf.synth.Region;
+import javax.swing.plaf.synth.SynthConstants;
+import javax.swing.plaf.synth.SynthLookAndFeel;
+import javax.swing.plaf.synth.SynthStyleFactory;
 import javax.swing.text.DefaultEditorKit;
 
 import com.sun.java.swing.plaf.gtk.GTKConstants.PositionType;
 import com.sun.java.swing.plaf.gtk.GTKConstants.StateType;
-import java.util.HashMap;
-import java.util.Map;
 import sun.awt.SunToolkit;
 import sun.awt.UNIXToolkit;
-import sun.awt.OSInfo;
 import sun.security.action.GetPropertyAction;
+import sun.swing.AltProcessor;
 import sun.swing.DefaultLayoutStyle;
+import sun.swing.MnemonicHandler;
 import sun.swing.SwingAccessor;
 import sun.swing.SwingUtilities2;
 
@@ -866,7 +888,6 @@ public Object createValue(UIDefaults table) {
                  "ctrl released ENTER", "release"
             },
 
-
             "ScrollBar.squareButtons", Boolean.FALSE,
             "ScrollBar.thumbHeight", Integer.valueOf(14),
             "ScrollBar.width", Integer.valueOf(16),
@@ -1414,6 +1435,10 @@ static boolean isLeftToRight(Component c) {
         return c.getComponentOrientation().isLeftToRight();
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
     public void initialize() {
         /*
          * We need to call loadGTK() to ensure that the native GTK
@@ -1456,6 +1481,23 @@ public void initialize() {
         gtkAAFontSettingsCond = SwingUtilities2.isLocalDisplay();
         aaTextInfo = new HashMap<>(2);
         SwingUtilities2.putAATextInfo(gtkAAFontSettingsCond, aaTextInfo);
+
+        KeyboardFocusManager.getCurrentKeyboardFocusManager()
+                .addKeyEventPostProcessor(AltProcessor.getInstance());
+
+        // By default mnemonics are hidden for GTK L&F
+        MnemonicHandler.setMnemonicHidden(true);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void uninitialize() {
+        KeyboardFocusManager.getCurrentKeyboardFocusManager()
+                .removeKeyEventPostProcessor(AltProcessor.getInstance());
+        MnemonicHandler.setMnemonicHidden(false);
+        super.uninitialize();
     }
 
     static ReferenceQueue<GTKLookAndFeel> queue = new ReferenceQueue<GTKLookAndFeel>();
diff --git a/src/java.desktop/share/classes/sun/swing/AltProcessor.java b/src/java.desktop/share/classes/sun/swing/AltProcessor.java
new file mode 100644
index 0000000000000..c7bb7b3d4102e
--- /dev/null
+++ b/src/java.desktop/share/classes/sun/swing/AltProcessor.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package sun.swing;
+
+import java.awt.KeyEventPostProcessor;
+import java.awt.Window;
+import java.awt.event.KeyEvent;
+
+import javax.swing.JRootPane;
+import javax.swing.SwingUtilities;
+
+public final class AltProcessor implements KeyEventPostProcessor {
+
+    private AltProcessor() {}
+
+    private static final AltProcessor altProcessor = new AltProcessor();
+
+    public static KeyEventPostProcessor getInstance() {
+        return altProcessor;
+    }
+
+    @Override
+    public boolean postProcessKeyEvent(final KeyEvent ev) {
+        if (ev.getKeyCode() != KeyEvent.VK_ALT) {
+            return false;
+        }
+
+        final JRootPane root = SwingUtilities.getRootPane(ev.getComponent());
+        final Window winAncestor = (root == null ? null : SwingUtilities.getWindowAncestor(root));
+
+        switch (ev.getID()) {
+            case KeyEvent.KEY_PRESSED:
+                MnemonicHandler.setMnemonicHidden(false);
+                break;
+            case KeyEvent.KEY_RELEASED:
+                MnemonicHandler.setMnemonicHidden(true);
+                break;
+        }
+
+        MnemonicHandler.repaintMnemonicsInWindow(winAncestor);
+
+        return false;
+    }
+}
diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaMnemonicHandler.java b/src/java.desktop/share/classes/sun/swing/MnemonicHandler.java
similarity index 52%
rename from src/java.desktop/macosx/classes/com/apple/laf/AquaMnemonicHandler.java
rename to src/java.desktop/share/classes/sun/swing/MnemonicHandler.java
index 76c9735882807..b4f0cac7c611a 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaMnemonicHandler.java
+++ b/src/java.desktop/share/classes/sun/swing/MnemonicHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,39 +23,27 @@
  * questions.
  */
 
-package com.apple.laf;
+package sun.swing;
 
-import java.awt.*;
-import java.awt.event.KeyEvent;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Window;
 
-import javax.swing.*;
+import javax.swing.AbstractButton;
+import javax.swing.JLabel;
+import javax.swing.UIManager;
 
-import com.apple.laf.AquaUtils.RecyclableSingleton;
-import com.apple.laf.AquaUtils.RecyclableSingletonFromDefaultConstructor;
+public final class MnemonicHandler {
 
-public class AquaMnemonicHandler {
-    private static final RecyclableSingleton<AltProcessor> altProcessor = new RecyclableSingletonFromDefaultConstructor<AltProcessor>(AltProcessor.class);
-    public static KeyEventPostProcessor getInstance() {
-        return altProcessor.get();
-    }
+    private static boolean isMnemonicHidden;
 
-    protected static boolean isMnemonicHidden = true; // true by default
-
-    public static void setMnemonicHidden(final boolean hide) {
-        if (UIManager.getBoolean("Button.showMnemonics")) {
-            // Do not hide mnemonics if the UI defaults do not support this
-            isMnemonicHidden = false;
-        } else {
-            isMnemonicHidden = hide;
-        }
-    }
+    private MnemonicHandler() {}
 
     /**
-     * Gets the state of the hide mnemonic flag. This only has meaning if this feature is supported by the underlying OS.
+     * Gets the state of the hide mnemonic flag.
+     * This only has meaning if this feature is supported by the underlying OS.
      *
      * @return true if mnemonics are hidden, otherwise, false
-     * @see #setMnemonicHidden
-     * @since 1.4
      */
     public static boolean isMnemonicHidden() {
         if (UIManager.getBoolean("Button.showMnemonics")) {
@@ -65,34 +53,27 @@ public static boolean isMnemonicHidden() {
         return isMnemonicHidden;
     }
 
-    static class AltProcessor implements KeyEventPostProcessor {
-        public boolean postProcessKeyEvent(final KeyEvent ev) {
-            if (ev.getKeyCode() != KeyEvent.VK_ALT) {
-                return false;
-            }
-
-            final JRootPane root = SwingUtilities.getRootPane(ev.getComponent());
-            final Window winAncestor = (root == null ? null : SwingUtilities.getWindowAncestor(root));
-
-            switch(ev.getID()) {
-                case KeyEvent.KEY_PRESSED:
-                    setMnemonicHidden(false);
-                    break;
-                case KeyEvent.KEY_RELEASED:
-                    setMnemonicHidden(true);
-                    break;
-            }
-
-            repaintMnemonicsInWindow(winAncestor);
-
-            return false;
+    /**
+     * Sets the state of the hide mnemonic flag. This flag is used by the
+     * component UI delegates to determine if the mnemonic should be rendered.
+     * This method is a non operation if the underlying operating system
+     * does not support the mnemonic hiding feature.
+     *
+     * @param hide true if mnemonics should be hidden
+     */
+    public static void setMnemonicHidden(final boolean hide) {
+        if (UIManager.getBoolean("Button.showMnemonics")) {
+            // Do not hide mnemonics if the UI defaults do not support this
+            isMnemonicHidden = false;
+        } else {
+            isMnemonicHidden = hide;
         }
     }
 
-    /*
+    /**
      * Repaints all the components with the mnemonics in the given window and all its owned windows.
      */
-    static void repaintMnemonicsInWindow(final Window w) {
+    public static void repaintMnemonicsInWindow(final Window w) {
         if (w == null || !w.isShowing()) {
             return;
         }
@@ -105,29 +86,22 @@ static void repaintMnemonicsInWindow(final Window w) {
         repaintMnemonicsInContainer(w);
     }
 
-    /*
+    /**
      * Repaints all the components with the mnemonics in container.
      * Recursively searches for all the subcomponents.
      */
-    static void repaintMnemonicsInContainer(final Container cont) {
-        for (int i = 0; i < cont.getComponentCount(); i++) {
-            final Component c = cont.getComponent(i);
+    private static void repaintMnemonicsInContainer(final Container cont) {
+        final Component[] elements = cont.getComponents();
+        for (final Component c : elements) {
             if (c == null || !c.isVisible()) {
                 continue;
             }
 
-            if (c instanceof AbstractButton && ((AbstractButton)c).getMnemonic() != '\0') {
-                c.repaint();
-                continue;
-            }
-
-            if (c instanceof JLabel && ((JLabel)c).getDisplayedMnemonic() != '\0') {
+            if ((c instanceof AbstractButton b && b.getMnemonic() != '\0')
+                || (c instanceof JLabel l && l.getDisplayedMnemonic() != '\0')) {
                 c.repaint();
-                continue;
-            }
-
-            if (c instanceof Container) {
-                repaintMnemonicsInContainer((Container)c);
+            } else if (c instanceof Container) {
+                repaintMnemonicsInContainer((Container) c);
             }
         }
     }
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java
index ff38130f728e5..cb4b5caa86de9 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,31 @@
 
 package com.sun.java.swing.plaf.windows;
 
-import sun.swing.SwingUtilities2;
-
-import java.awt.*;
-
-import javax.swing.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Point;
+import java.awt.Rectangle;
+
+import javax.swing.AbstractButton;
+import javax.swing.ButtonModel;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JRadioButton;
+import javax.swing.JToggleButton;
+import javax.swing.UIManager;
 import javax.swing.plaf.UIResource;
 
-import static com.sun.java.swing.plaf.windows.TMSchema.*;
+import sun.swing.MnemonicHandler;
+import sun.swing.SwingUtilities2;
+
+import static com.sun.java.swing.plaf.windows.TMSchema.Part;
+import static com.sun.java.swing.plaf.windows.TMSchema.Prop;
+import static com.sun.java.swing.plaf.windows.TMSchema.State;
+import static com.sun.java.swing.plaf.windows.TMSchema.TypeEnum;
 
 /**
  * A collection of static utility methods used for rendering the Windows look
@@ -60,7 +77,7 @@ public static void paintText(Graphics g, AbstractButton b,
 
         int mnemIndex = b.getDisplayedMnemonicIndex();
         // W2K Feature: Check to see if the Underscore should be rendered.
-        if (WindowsLookAndFeel.isMnemonicHidden() == true) {
+        if (MnemonicHandler.isMnemonicHidden()) {
             mnemIndex = -1;
         }
 
@@ -191,46 +208,4 @@ static boolean isLeftToRight(Component c) {
         return c.getComponentOrientation().isLeftToRight();
     }
 
-    /*
-     * Repaints all the components with the mnemonics in the given window and
-     * all its owned windows.
-     */
-    static void repaintMnemonicsInWindow(Window w) {
-        if(w == null || !w.isShowing()) {
-            return;
-        }
-
-        Window[] ownedWindows = w.getOwnedWindows();
-        for(int i=0;i<ownedWindows.length;i++) {
-            repaintMnemonicsInWindow(ownedWindows[i]);
-        }
-
-        repaintMnemonicsInContainer(w);
-    }
-
-    /*
-     * Repaints all the components with the mnemonics in container.
-     * Recursively searches for all the subcomponents.
-     */
-    static void repaintMnemonicsInContainer(Container cont) {
-        Component c;
-        for(int i=0; i<cont.getComponentCount(); i++) {
-            c = cont.getComponent(i);
-            if(c == null || !c.isVisible()) {
-                continue;
-            }
-            if(c instanceof AbstractButton
-               && ((AbstractButton)c).getMnemonic() != '\0') {
-                c.repaint();
-                continue;
-            } else if(c instanceof JLabel
-                      && ((JLabel)c).getDisplayedMnemonic() != '\0') {
-                c.repaint();
-                continue;
-            }
-            if(c instanceof Container) {
-                repaintMnemonicsInContainer((Container)c);
-            }
-        }
-    }
 }
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java
index 93f69f49c63f6..6266772dcf4a2 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,7 @@
 import javax.swing.plaf.basic.BasicLabelUI;
 
 import sun.awt.AppContext;
+import sun.swing.MnemonicHandler;
 import sun.swing.SwingUtilities2;
 
 /**
@@ -62,7 +63,7 @@ protected void paintEnabledText(JLabel l, Graphics g, String s,
                                     int textX, int textY) {
         int mnemonicIndex = l.getDisplayedMnemonicIndex();
         // W2K Feature: Check to see if the Underscore should be rendered.
-        if (WindowsLookAndFeel.isMnemonicHidden() == true) {
+        if (MnemonicHandler.isMnemonicHidden()) {
             mnemonicIndex = -1;
         }
 
@@ -75,7 +76,7 @@ protected void paintDisabledText(JLabel l, Graphics g, String s,
                                      int textX, int textY) {
         int mnemonicIndex = l.getDisplayedMnemonicIndex();
         // W2K Feature: Check to see if the Underscore should be rendered.
-        if (WindowsLookAndFeel.isMnemonicHidden() == true) {
+        if (MnemonicHandler.isMnemonicHidden()) {
             mnemonicIndex = -1;
         }
         if ( UIManager.getColor("Label.disabledForeground") instanceof Color &&
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
index f28346292a6ce..aa97b0d0741a4 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -93,6 +93,7 @@
 import sun.security.action.GetPropertyAction;
 import sun.swing.DefaultLayoutStyle;
 import sun.swing.ImageIconUIResource;
+import sun.swing.MnemonicHandler;
 import sun.swing.StringUIClientPropertyKey;
 import sun.swing.SwingAccessor;
 import sun.swing.SwingUtilities2;
@@ -196,6 +197,7 @@ public void initialize() {
         }
         KeyboardFocusManager.getCurrentKeyboardFocusManager().
             addKeyEventPostProcessor(WindowsRootPaneUI.altProcessor);
+        MnemonicHandler.setMnemonicHidden(true);
 
     }
 
@@ -1908,48 +1910,10 @@ public void uninitialize() {
         WindowsDesktopProperty.flushUnreferencedProperties();
     }
 
-
-    // Toggle flag for drawing the mnemonic state
-    private static boolean isMnemonicHidden = true;
-
     // Flag which indicates that the Win98/Win2k/WinME features
     // should be disabled.
     private static boolean isClassicWindows = false;
 
-    /**
-     * Sets the state of the hide mnemonic flag. This flag is used by the
-     * component UI delegates to determine if the mnemonic should be rendered.
-     * This method is a non operation if the underlying operating system
-     * does not support the mnemonic hiding feature.
-     *
-     * @param hide true if mnemonics should be hidden
-     * @since 1.4
-     */
-    public static void setMnemonicHidden(boolean hide) {
-        if (UIManager.getBoolean("Button.showMnemonics") == true) {
-            // Do not hide mnemonics if the UI defaults do not support this
-            isMnemonicHidden = false;
-        } else {
-            isMnemonicHidden = hide;
-        }
-    }
-
-    /**
-     * Gets the state of the hide mnemonic flag. This only has meaning
-     * if this feature is supported by the underlying OS.
-     *
-     * @return true if mnemonics are hidden, otherwise, false
-     * @see #setMnemonicHidden
-     * @since 1.4
-     */
-    public static boolean isMnemonicHidden() {
-        if (UIManager.getBoolean("Button.showMnemonics") == true) {
-            // Do not hide mnemonics if the UI defaults do not support this
-            isMnemonicHidden = false;
-        }
-        return isMnemonicHidden;
-    }
-
     /**
      * Gets the state of the flag which indicates if the old Windows
      * look and feel should be rendered. This flag is used by the
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java
index 10aadfa7cd871..8c6cbdff5412e 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java
@@ -52,6 +52,8 @@
 import com.sun.java.swing.plaf.windows.TMSchema.State;
 import com.sun.java.swing.plaf.windows.XPStyle.Skin;
 
+import sun.swing.MnemonicHandler;
+
 /**
  * Windows rendition of the component.
  */
@@ -149,11 +151,11 @@ public void actionPerformed(ActionEvent e) {
                 MenuElement[] selectedPath = msm.getSelectedPath();
                 if (selectedPath.length > 0 && (selectedPath[0] instanceof JMenuBar)) {
                     msm.clearSelectedPath();
-                    WindowsLookAndFeel.setMnemonicHidden(true);
+                    MnemonicHandler.setMnemonicHidden(true);
                 } else {
                     MenuElement[] path = {menuBar, menu};
                     msm.setSelectedPath(path);
-                    WindowsLookAndFeel.setMnemonicHidden(false);
+                    MnemonicHandler.setMnemonicHidden(false);
                 }
                 WindowsLookAndFeel.repaintRootPane(menuBar);
             }
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java
index 09fad9c98a6de..2f76f9291332c 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,6 +46,7 @@
 import com.sun.java.swing.plaf.windows.XPStyle.Skin;
 import sun.swing.MenuItemCheckIconFactory;
 import sun.swing.MenuItemLayoutHelper;
+import sun.swing.MnemonicHandler;
 import sun.swing.SwingUtilities2;
 
 /**
@@ -203,7 +204,7 @@ static void paintText(WindowsMenuItemUIAccessor menuItemUI, Graphics g,
             FontMetrics fm = SwingUtilities2.getFontMetrics(menuItem, g);
             int mnemIndex = menuItem.getDisplayedMnemonicIndex();
             // W2K Feature: Check to see if the Underscore should be rendered.
-            if (WindowsLookAndFeel.isMnemonicHidden() == true) {
+            if (MnemonicHandler.isMnemonicHidden()) {
                 mnemIndex = -1;
             }
             WindowsGraphicsUtils.paintXPText(menuItem,
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java
index 87e89fca3dce6..3bf214aff374d 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,6 +47,7 @@
 import com.sun.java.swing.plaf.windows.TMSchema.Part;
 import com.sun.java.swing.plaf.windows.TMSchema.State;
 import com.sun.java.swing.plaf.windows.XPStyle.Skin;
+import sun.swing.MnemonicHandler;
 import sun.swing.StringUIClientPropertyKey;
 
 import static sun.swing.SwingUtilities2.BASICMENUITEMUI_MAX_TEXT_OFFSET;
@@ -99,13 +100,13 @@ public void stateChanged(ChangeEvent ev) {
             MenuSelectionManager msm = (MenuSelectionManager)ev.getSource();
             MenuElement[] path = msm.getSelectedPath();
             if (path.length == 0) {
-                if(!WindowsLookAndFeel.isMnemonicHidden()) {
+                if (!MnemonicHandler.isMnemonicHidden()) {
                     // menu was canceled -- hide mnemonics
-                    WindowsLookAndFeel.setMnemonicHidden(true);
+                    MnemonicHandler.setMnemonicHidden(true);
                     if (repaintRoot != null) {
                         Window win =
                             SwingUtilities.getWindowAncestor(repaintRoot);
-                        WindowsGraphicsUtils.repaintMnemonicsInWindow(win);
+                        MnemonicHandler.repaintMnemonicsInWindow(win);
                     }
                 }
                 repaintRoot = null;
diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java
index 86e9a888a2faf..f05da909ac1db 100644
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,6 +61,8 @@
 import javax.swing.plaf.basic.BasicRootPaneUI;
 import javax.swing.plaf.basic.ComboPopup;
 
+import sun.swing.MnemonicHandler;
+
 /**
  * Windows implementation of RootPaneUI, there is one shared between all
  * JRootPane instances.
@@ -93,13 +95,13 @@ void altPressed(KeyEvent ev) {
                 ev.consume();
             } else if(path.length > 0) { // We are in ComboBox
                 menuCanceledOnPress = false;
-                WindowsLookAndFeel.setMnemonicHidden(false);
-                WindowsGraphicsUtils.repaintMnemonicsInWindow(winAncestor);
+                MnemonicHandler.setMnemonicHidden(false);
+                MnemonicHandler.repaintMnemonicsInWindow(winAncestor);
                 ev.consume();
             } else {
                 menuCanceledOnPress = false;
-                WindowsLookAndFeel.setMnemonicHidden(false);
-                WindowsGraphicsUtils.repaintMnemonicsInWindow(winAncestor);
+                MnemonicHandler.setMnemonicHidden(false);
+                MnemonicHandler.repaintMnemonicsInWindow(winAncestor);
                 JMenuBar mbar = root != null ? root.getJMenuBar() : null;
                 if(mbar == null && winAncestor instanceof JFrame) {
                     mbar = ((JFrame)winAncestor).getJMenuBar();
@@ -113,8 +115,8 @@ void altPressed(KeyEvent ev) {
 
         void altReleased(KeyEvent ev) {
             if (menuCanceledOnPress) {
-                WindowsLookAndFeel.setMnemonicHidden(true);
-                WindowsGraphicsUtils.repaintMnemonicsInWindow(winAncestor);
+                MnemonicHandler.setMnemonicHidden(true);
+                MnemonicHandler.repaintMnemonicsInWindow(winAncestor);
                 return;
             }
 
@@ -151,14 +153,14 @@ void altReleased(KeyEvent ev) {
                     path[0] = mbar;
                     path[1] = menu;
                     msm.setSelectedPath(path);
-                } else if(!WindowsLookAndFeel.isMnemonicHidden()) {
-                    WindowsLookAndFeel.setMnemonicHidden(true);
-                    WindowsGraphicsUtils.repaintMnemonicsInWindow(winAncestor);
+                } else if (!MnemonicHandler.isMnemonicHidden()) {
+                    MnemonicHandler.setMnemonicHidden(true);
+                    MnemonicHandler.repaintMnemonicsInWindow(winAncestor);
                 }
             } else {
                 if((msm.getSelectedPath())[0] instanceof ComboPopup) {
-                    WindowsLookAndFeel.setMnemonicHidden(true);
-                    WindowsGraphicsUtils.repaintMnemonicsInWindow(winAncestor);
+                    MnemonicHandler.setMnemonicHidden(true);
+                    MnemonicHandler.repaintMnemonicsInWindow(winAncestor);
                 }
             }
 
@@ -193,8 +195,8 @@ public boolean postProcessKeyEvent(KeyEvent ev) {
                             MenuSelectionManager.defaultManager();
                         MenuElement[] path = msm.getSelectedPath();
                         if (path.length <= 0) {
-                            WindowsLookAndFeel.setMnemonicHidden(true);
-                            WindowsGraphicsUtils.repaintMnemonicsInWindow(winAncestor);
+                            MnemonicHandler.setMnemonicHidden(true);
+                            MnemonicHandler.repaintMnemonicsInWindow(winAncestor);
                         }
                     }
                     altKeyPressed = false;
@@ -202,9 +204,9 @@ public boolean postProcessKeyEvent(KeyEvent ev) {
                 root = null;
                 winAncestor = null;
             } else {
-                if (WindowsLookAndFeel.isMnemonicHidden() && ev.isAltDown()) {
-                    WindowsLookAndFeel.setMnemonicHidden(false);
-                    WindowsGraphicsUtils.repaintMnemonicsInWindow(winAncestor);
+                if (MnemonicHandler.isMnemonicHidden() && ev.isAltDown()) {
+                    MnemonicHandler.setMnemonicHidden(false);
+                    MnemonicHandler.repaintMnemonicsInWindow(winAncestor);
                 }
                 altKeyPressed = false;
             }
diff --git a/test/jdk/javax/swing/JMenuBar/TestMenuMnemonic.java b/test/jdk/javax/swing/JMenuBar/TestMenuMnemonic.java
index 500d3ca3408af..7dd9ec16c91ec 100644
--- a/test/jdk/javax/swing/JMenuBar/TestMenuMnemonic.java
+++ b/test/jdk/javax/swing/JMenuBar/TestMenuMnemonic.java
@@ -23,10 +23,10 @@
 
 /*
  * @test
- * @bug 8326458
+ * @bug 8326458 8155030
  * @key headful
  * @requires (os.family == "windows")
- * @modules java.desktop/com.sun.java.swing.plaf.windows
+ * @modules java.desktop/sun.swing
  * @summary Verifies if menu mnemonics toggle on F10 press in Windows LAF
  * @run main TestMenuMnemonic
  */
@@ -43,7 +43,7 @@
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 
-import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
+import sun.swing.MnemonicHandler;
 
 public class TestMenuMnemonic {
 
@@ -93,7 +93,7 @@ private static void verifyMnemonicsState() {
         MenuSelectionManager msm =
                 MenuSelectionManager.defaultManager();
         MenuElement[] selectedPath = msm.getSelectedPath();
-        if (WindowsLookAndFeel.isMnemonicHidden()) {
+        if (MnemonicHandler.isMnemonicHidden()) {
             mnemonicHideCount.getAndIncrement();
             // Check if selection is cleared when mnemonics are hidden
             if (selectedPath.length != 0) {
diff --git a/test/jdk/javax/swing/JMenuBar/TestMenuMnemonicLinuxAndMac.java b/test/jdk/javax/swing/JMenuBar/TestMenuMnemonicLinuxAndMac.java
new file mode 100644
index 0000000000000..5fdf8f9aa2709
--- /dev/null
+++ b/test/jdk/javax/swing/JMenuBar/TestMenuMnemonicLinuxAndMac.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.Rectangle;
+import java.awt.Robot;
+import java.awt.event.KeyEvent;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import javax.imageio.ImageIO;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+
+/*
+ * @test
+ * @bug 8155030
+ * @key headful
+ * @requires (os.family == "linux" | os.family == "mac")
+ * @library /javax/swing/regtesthelpers
+ * @build Util
+ * @summary Verifies if menu mnemonic toggle on Alt press in GTK and Aqua LAF
+ * @run main TestMenuMnemonicLinuxAndMac
+ */
+
+public class TestMenuMnemonicLinuxAndMac {
+
+    private static JFrame frame;
+    private static JMenu fileMenu;
+    private static volatile Rectangle fileMenuRect;
+
+    public static void main(String[] args) throws Exception {
+        for (UIManager.LookAndFeelInfo laf :
+                UIManager.getInstalledLookAndFeels()) {
+            if (laf.getName().contains("GTK") || laf.getName().contains("Aqua")) {
+                System.out.println("Testing: " + laf.getName());
+                UIManager.setLookAndFeel(laf.getClassName());
+                break;
+            }
+        }
+
+        Robot robot = new Robot();
+        robot.setAutoDelay(200);
+
+        try {
+            SwingUtilities.invokeAndWait(TestMenuMnemonicLinuxAndMac::createAndShowUI);
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            SwingUtilities.invokeAndWait(() -> {
+                fileMenuRect = new Rectangle(fileMenu.getLocationOnScreen(),
+                        fileMenu.getSize());
+            });
+
+            robot.keyPress(KeyEvent.VK_ALT);
+            robot.waitForIdle();
+
+            BufferedImage img1 = robot.createScreenCapture(fileMenuRect);
+
+            robot.keyRelease(KeyEvent.VK_ALT);
+            robot.waitForIdle();
+
+            BufferedImage img2 = robot.createScreenCapture(fileMenuRect);
+
+            if (Util.compareBufferedImages(img1, img2)) {
+                try {
+                    ImageIO.write(img1, "png", new File("Menu_With_Mnemonic.png"));
+                    ImageIO.write(img2, "png", new File("Menu_Without_Mnemonic.png"));
+                } catch (IOException ignored) {
+                }
+                throw new RuntimeException("Mismatch in mnemonic show/hide on Alt press");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    private static void createAndShowUI() {
+        frame = new JFrame("Test Menu Mnemonic Show/Hide");
+        JMenuBar menuBar = new JMenuBar();
+        fileMenu = new JMenu("File");
+        fileMenu.setMnemonic(KeyEvent.VK_F);
+        JMenuItem item1 = new JMenuItem("Item-1");
+        JMenuItem item2 = new JMenuItem("Item-2");
+        fileMenu.add(item1);
+        fileMenu.add(item2);
+        menuBar.add(fileMenu);
+        frame.setJMenuBar(menuBar);
+        frame.setSize(250, 200);
+        frame.setLocationRelativeTo(null);
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        frame.setVisible(true);
+    }
+}
diff --git a/test/jdk/javax/swing/LookAndFeel/bug4736093.java b/test/jdk/javax/swing/LookAndFeel/bug4736093.java
index 522eb98ab3e00..7b599f1527f87 100644
--- a/test/jdk/javax/swing/LookAndFeel/bug4736093.java
+++ b/test/jdk/javax/swing/LookAndFeel/bug4736093.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,10 +23,10 @@
 
 /*
  * @test
- * @bug 4736093
+ * @bug 4736093 8155030
  * @requires (os.family == "windows")
  * @summary REGRESSION: Menu and controls shortcuts are not visible in Win L&F in jdk1.4.1
- * @modules java.desktop/com.sun.java.swing.plaf.windows
+ * @modules java.desktop/sun.swing
  * @key headful
  */
 
@@ -42,7 +42,7 @@
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 
-import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
+import sun.swing.MnemonicHandler;
 
 public class bug4736093 {
     static volatile boolean passed = true;
@@ -62,7 +62,7 @@ public static void main(String args[]) throws Exception {
                     winlaf = false;
                 }
 
-                if (winlaf && WindowsLookAndFeel.isMnemonicHidden()) {
+                if (winlaf && MnemonicHandler.isMnemonicHidden()) {
                     mainFrame = new JFrame("Bug 4736093");
                     mainFrame.addWindowListener(new TestStateListener());
                     mainFrame.setSize(200, 400);
@@ -100,7 +100,7 @@ public static void addMenuBar() {
 
 
     public static void checkForMnemonics(boolean expected) {
-        if (expected != WindowsLookAndFeel.isMnemonicHidden()) {
+        if (expected != MnemonicHandler.isMnemonicHidden()) {
             passed = false;
         }
     }
diff --git a/test/jdk/javax/swing/plaf/windows/6921687/bug6921687.java b/test/jdk/javax/swing/plaf/windows/6921687/bug6921687.java
index 7213fe188e8c7..4d62af9122ba0 100644
--- a/test/jdk/javax/swing/plaf/windows/6921687/bug6921687.java
+++ b/test/jdk/javax/swing/plaf/windows/6921687/bug6921687.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,14 +24,13 @@
 /**
  * @test
  * @key headful
- * @bug 6921687 8079428
+ * @bug 6921687 8079428 8155030
  * @summary Mnemonic disappears after repeated attempts to open menu items using
  *          mnemonics
- * @author Semyon Sadetsky
  * @library /test/lib
  * @build jdk.test.lib.Platform
  * @requires (os.family == "windows")
- * @modules java.desktop/com.sun.java.swing.plaf.windows
+ * @modules java.desktop/sun.swing
  * @run main bug6921687
  */
 
@@ -45,6 +44,8 @@
 import javax.swing.UIManager;
 import jdk.test.lib.Platform;
 
+import sun.swing.MnemonicHandler;
+
 public class bug6921687 {
 
     private static Class lafClass;
@@ -91,7 +92,7 @@ public static void main(String[] args) throws Exception {
     }
 
     private static void checkMnemonics() throws Exception {
-        if ((Boolean) lafClass.getMethod("isMnemonicHidden").invoke(lafClass)) {
+        if (MnemonicHandler.isMnemonicHidden()) {
             throw new RuntimeException("Mnemonics are hidden");
         }
     }

From 34d8562a913b8382601e4c0c31ad34a663b9ec0a Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Fri, 12 Jul 2024 12:59:13 +0000
Subject: [PATCH 072/401] 8335902: Parallel: Refactor
 VM_ParallelGCFailedAllocation and VM_ParallelGCSystemGC

Reviewed-by: gli, zgu
---
 .../gc/parallel/parallelScavengeHeap.cpp      | 173 ++++++++++--------
 .../gc/parallel/parallelScavengeHeap.hpp      |  37 ++--
 .../parallel/parallelScavengeHeap.inline.hpp  |   4 -
 .../parallel/psGCAdaptivePolicyCounters.cpp   |   8 -
 .../parallel/psGCAdaptivePolicyCounters.hpp   |  11 --
 .../share/gc/parallel/psParallelCompact.cpp   |   2 +
 src/hotspot/share/gc/parallel/psScavenge.cpp  | 111 +++--------
 src/hotspot/share/gc/parallel/psScavenge.hpp  |  14 +-
 .../share/gc/parallel/psVMOperations.cpp      |  32 ++--
 .../share/gc/parallel/psVMOperations.hpp      |  17 +-
 .../share/gc/shared/gcVMOperations.hpp        |   8 +-
 src/hotspot/share/runtime/vmOperation.hpp     |   4 +-
 .../sun/jvmstat/perfdata/resources/aliasmap   |   4 -
 .../jfr/event/runtime/TestVMOperation.java    |   2 +-
 14 files changed, 173 insertions(+), 254 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
index 33a499ce47134..cee5a805cb74a 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
@@ -263,13 +263,20 @@ bool ParallelScavengeHeap::requires_barriers(stackChunkOop p) const {
 // and the rest will not be executed. For that reason, this method loops
 // during failed allocation attempts. If the java heap becomes exhausted,
 // we rely on the size_policy object to force a bail out.
-HeapWord* ParallelScavengeHeap::mem_allocate(
-                                     size_t size,
-                                     bool* gc_overhead_limit_was_exceeded) {
+HeapWord* ParallelScavengeHeap::mem_allocate(size_t size,
+                                             bool* gc_overhead_limit_was_exceeded) {
   assert(!SafepointSynchronize::is_at_safepoint(), "should not be at safepoint");
   assert(Thread::current() != (Thread*)VMThread::vm_thread(), "should not be in vm thread");
   assert(!Heap_lock->owned_by_self(), "this thread should not own the Heap_lock");
 
+  bool is_tlab = false;
+  return mem_allocate_work(size, is_tlab, gc_overhead_limit_was_exceeded);
+}
+
+HeapWord* ParallelScavengeHeap::mem_allocate_work(size_t size,
+                                                  bool is_tlab,
+                                                  bool* gc_overhead_limit_was_exceeded) {
+
   // In general gc_overhead_limit_was_exceeded should be false so
   // set it so here and reset it to true only if the gc time
   // limit is being exceeded as checked below.
@@ -303,9 +310,11 @@ HeapWord* ParallelScavengeHeap::mem_allocate(
       }
 
       // If certain conditions hold, try allocating from the old gen.
-      result = mem_allocate_old_gen(size);
-      if (result != nullptr) {
-        return result;
+      if (!is_tlab) {
+        result = mem_allocate_old_gen(size);
+        if (result != nullptr) {
+          return result;
+        }
       }
 
       if (gclocker_stalled_count > GCLockerRetryAllocationCount) {
@@ -338,7 +347,7 @@ HeapWord* ParallelScavengeHeap::mem_allocate(
 
     if (result == nullptr) {
       // Generate a VM operation
-      VM_ParallelGCFailedAllocation op(size, gc_count);
+      VM_ParallelCollectForAllocation op(size, is_tlab, gc_count);
       VMThread::execute(&op);
 
       // Did the VM operation execute? If so, return the result directly.
@@ -395,23 +404,6 @@ HeapWord* ParallelScavengeHeap::mem_allocate(
   return result;
 }
 
-// A "death march" is a series of ultra-slow allocations in which a full gc is
-// done before each allocation, and after the full gc the allocation still
-// cannot be satisfied from the young gen.  This routine detects that condition;
-// it should be called after a full gc has been done and the allocation
-// attempted from the young gen. The parameter 'addr' should be the result of
-// that young gen allocation attempt.
-void
-ParallelScavengeHeap::death_march_check(HeapWord* const addr, size_t size) {
-  if (addr != nullptr) {
-    _death_march_count = 0;  // death march has ended
-  } else if (_death_march_count == 0) {
-    if (should_alloc_in_eden(size)) {
-      _death_march_count = 1;    // death march has started
-    }
-  }
-}
-
 HeapWord* ParallelScavengeHeap::allocate_old_gen_and_record(size_t size) {
   assert_locked_or_safepoint(Heap_lock);
   HeapWord* res = old_gen()->allocate(size);
@@ -427,74 +419,76 @@ HeapWord* ParallelScavengeHeap::mem_allocate_old_gen(size_t size) {
     return allocate_old_gen_and_record(size);
   }
 
-  // If a "death march" is in progress, allocate from the old gen a limited
-  // number of times before doing a GC.
-  if (_death_march_count > 0) {
-    if (_death_march_count < 64) {
-      ++_death_march_count;
-      return allocate_old_gen_and_record(size);
-    } else {
-      _death_march_count = 0;
-    }
-  }
   return nullptr;
 }
 
 void ParallelScavengeHeap::do_full_collection(bool clear_all_soft_refs) {
+  if (GCLocker::check_active_before_gc()) {
+    return;
+  }
   PSParallelCompact::invoke(clear_all_soft_refs);
 }
 
-// Failed allocation policy. Must be called from the VM thread, and
-// only at a safepoint! Note that this method has policy for allocation
-// flow, and NOT collection policy. So we do not check for gc collection
-// time over limit here, that is the responsibility of the heap specific
-// collection methods. This method decides where to attempt allocations,
-// and when to attempt collections, but no collection specific policy.
-HeapWord* ParallelScavengeHeap::failed_mem_allocate(size_t size) {
-  assert(SafepointSynchronize::is_at_safepoint(), "should be at safepoint");
-  assert(Thread::current() == (Thread*)VMThread::vm_thread(), "should be in vm thread");
-  assert(!is_stw_gc_active(), "not reentrant");
-  assert(!Heap_lock->owned_by_self(), "this thread should not own the Heap_lock");
+HeapWord* ParallelScavengeHeap::expand_heap_and_allocate(size_t size, bool is_tlab) {
+  HeapWord* result = nullptr;
 
-  // We assume that allocation in eden will fail unless we collect.
+  result = young_gen()->allocate(size);
+  if (result == nullptr && !is_tlab) {
+    // auto expand inside
+    result = old_gen()->allocate(size);
+  }
+  return result;   // Could be null if we are out of space.
+}
 
-  // First level allocation failure, scavenge and allocate in young gen.
-  GCCauseSetter gccs(this, GCCause::_allocation_failure);
-  const bool invoked_full_gc = PSScavenge::invoke();
-  HeapWord* result = young_gen()->allocate(size);
+HeapWord* ParallelScavengeHeap::satisfy_failed_allocation(size_t size, bool is_tlab) {
+  assert(size != 0, "precondition");
 
-  // Second level allocation failure.
-  //   Mark sweep and allocate in young generation.
-  if (result == nullptr && !invoked_full_gc) {
-    do_full_collection(false);
-    result = young_gen()->allocate(size);
+  HeapWord* result = nullptr;
+
+  GCLocker::check_active_before_gc();
+  if (GCLocker::is_active_and_needs_gc()) {
+    return expand_heap_and_allocate(size, is_tlab);
   }
 
-  death_march_check(result, size);
+  // If young-gen can handle this allocation, attempt young-gc firstly.
+  bool should_run_young_gc = is_tlab || should_alloc_in_eden(size);
+  collect_at_safepoint(!should_run_young_gc);
 
-  // Third level allocation failure.
-  //   After mark sweep and young generation allocation failure,
-  //   allocate in old generation.
-  if (result == nullptr) {
-    result = allocate_old_gen_and_record(size);
+  result = expand_heap_and_allocate(size, is_tlab);
+  if (result != nullptr) {
+    return result;
   }
 
-  // Fourth level allocation failure. We're running out of memory.
-  //   More complete mark sweep and allocate in young generation.
-  if (result == nullptr) {
-    do_full_collection(true);
-    result = young_gen()->allocate(size);
+  // If we reach this point, we're really out of memory. Try every trick
+  // we can to reclaim memory. Force collection of soft references. Force
+  // a complete compaction of the heap. Any additional methods for finding
+  // free memory should be here, especially if they are expensive. If this
+  // attempt fails, an OOM exception will be thrown.
+  {
+    // Make sure the heap is fully compacted
+    uintx old_interval = HeapMaximumCompactionInterval;
+    HeapMaximumCompactionInterval = 0;
+
+    const bool clear_all_soft_refs = true;
+    PSParallelCompact::invoke(clear_all_soft_refs);
+
+    // Restore
+    HeapMaximumCompactionInterval = old_interval;
   }
 
-  // Fifth level allocation failure.
-  //   After more complete mark sweep, allocate in old generation.
-  if (result == nullptr) {
-    result = allocate_old_gen_and_record(size);
+  result = expand_heap_and_allocate(size, is_tlab);
+  if (result != nullptr) {
+    return result;
   }
 
-  return result;
+  // What else?  We might try synchronous finalization later.  If the total
+  // space available is large enough for the allocation, then a more
+  // complete compaction phase than we've tried so far might be
+  // appropriate.
+  return nullptr;
 }
 
+
 void ParallelScavengeHeap::ensure_parsability(bool retire_tlabs) {
   CollectedHeap::ensure_parsability(retire_tlabs);
   young_gen()->eden_space()->ensure_parsability();
@@ -513,7 +507,10 @@ size_t ParallelScavengeHeap::unsafe_max_tlab_alloc(Thread* thr) const {
 }
 
 HeapWord* ParallelScavengeHeap::allocate_new_tlab(size_t min_size, size_t requested_size, size_t* actual_size) {
-  HeapWord* result = young_gen()->allocate(requested_size);
+  bool dummy;
+  HeapWord* result = mem_allocate_work(requested_size /* size */,
+                                       true /* is_tlab */,
+                                       &dummy);
   if (result != nullptr) {
     *actual_size = requested_size;
   }
@@ -533,7 +530,6 @@ void ParallelScavengeHeap::prune_unlinked_nmethods() {
   ScavengableNMethods::prune_unlinked_nmethods();
 }
 
-// This method is used by System.gc() and JVMTI.
 void ParallelScavengeHeap::collect(GCCause::Cause cause) {
   assert(!Heap_lock->owned_by_self(),
     "this thread should not own the Heap_lock");
@@ -552,10 +548,10 @@ void ParallelScavengeHeap::collect(GCCause::Cause cause) {
   }
 
   while (true) {
-    VM_ParallelGCSystemGC op(gc_count, full_gc_count, cause);
+    VM_ParallelGCCollect op(gc_count, full_gc_count, cause);
     VMThread::execute(&op);
 
-    if (!GCCause::is_explicit_full_gc(cause) || op.full_gc_succeeded()) {
+    if (!GCCause::is_explicit_full_gc(cause)) {
       return;
     }
 
@@ -573,6 +569,33 @@ void ParallelScavengeHeap::collect(GCCause::Cause cause) {
   }
 }
 
+void ParallelScavengeHeap::try_collect_at_safepoint(bool full) {
+  assert(SafepointSynchronize::is_at_safepoint(), "precondition");
+  if (GCLocker::check_active_before_gc()) {
+    return;
+  }
+  collect_at_safepoint(full);
+}
+
+bool ParallelScavengeHeap::must_clear_all_soft_refs() {
+  return _gc_cause == GCCause::_metadata_GC_clear_soft_refs ||
+         _gc_cause == GCCause::_wb_full_gc;
+}
+
+void ParallelScavengeHeap::collect_at_safepoint(bool full) {
+  assert(!GCLocker::is_active(), "precondition");
+  bool clear_soft_refs = must_clear_all_soft_refs();
+
+  if (!full) {
+    bool success = PSScavenge::invoke(clear_soft_refs);
+    if (success) {
+      return;
+    }
+    // Upgrade to Full-GC if young-gc fails
+  }
+  PSParallelCompact::invoke(clear_soft_refs);
+}
+
 void ParallelScavengeHeap::object_iterate(ObjectClosure* cl) {
   young_gen()->object_iterate(cl);
   old_gen()->object_iterate(cl);
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
index fa45abc80b4d4..a6601611c9be2 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
@@ -75,8 +75,6 @@ class ParallelScavengeHeap : public CollectedHeap {
   static PSAdaptiveSizePolicy*       _size_policy;
   static PSGCAdaptivePolicyCounters* _gc_policy_counters;
 
-  unsigned int _death_march_count;
-
   GCMemoryManager* _young_manager;
   GCMemoryManager* _old_manager;
 
@@ -96,17 +94,27 @@ class ParallelScavengeHeap : public CollectedHeap {
 
   void update_parallel_worker_threads_cpu_time();
 
- protected:
+  void collect_at_safepoint(bool full);
+
+  bool must_clear_all_soft_refs();
+
   HeapWord* allocate_new_tlab(size_t min_size, size_t requested_size, size_t* actual_size) override;
 
   inline bool should_alloc_in_eden(size_t size) const;
-  inline void death_march_check(HeapWord* const result, size_t size);
+
   HeapWord* mem_allocate_old_gen(size_t size);
 
- public:
+  HeapWord* mem_allocate_work(size_t size,
+                              bool is_tlab,
+                              bool* gc_overhead_limit_was_exceeded);
+
+  HeapWord* expand_heap_and_allocate(size_t size, bool is_tlab);
+
+  void do_full_collection(bool clear_all_soft_refs) override;
+
+public:
   ParallelScavengeHeap() :
     CollectedHeap(),
-    _death_march_count(0),
     _young_manager(nullptr),
     _old_manager(nullptr),
     _eden_pool(nullptr),
@@ -184,25 +192,12 @@ class ParallelScavengeHeap : public CollectedHeap {
   // "gc_time_limit_was_exceeded" has an undefined meaning.
   HeapWord* mem_allocate(size_t size, bool* gc_overhead_limit_was_exceeded) override;
 
-  // Allocation attempt(s) during a safepoint. It should never be called
-  // to allocate a new TLAB as this allocation might be satisfied out
-  // of the old generation.
-  HeapWord* failed_mem_allocate(size_t size);
+  HeapWord* satisfy_failed_allocation(size_t size, bool is_tlab);
 
   // Support for System.gc()
   void collect(GCCause::Cause cause) override;
 
-  // These also should be called by the vm thread at a safepoint (e.g., from a
-  // VM operation).
-  //
-  // The first collects the young generation only, unless the scavenge fails; it
-  // will then attempt a full gc.  The second collects the entire heap; if
-  // maximum_compaction is true, it will compact everything and clear all soft
-  // references.
-  inline bool invoke_scavenge();
-
-  // Perform a full collection
-  void do_full_collection(bool clear_all_soft_refs) override;
+  void try_collect_at_safepoint(bool full);
 
   void ensure_parsability(bool retire_tlabs) override;
   void resize_all_tlabs() override;
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp
index 93a90b3d0b50a..f257f4c9177c5 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp
@@ -34,10 +34,6 @@ inline bool ParallelScavengeHeap::should_alloc_in_eden(const size_t size) const
   return size < eden_size / 2;
 }
 
-inline bool ParallelScavengeHeap::invoke_scavenge() {
-  return PSScavenge::invoke();
-}
-
 inline bool ParallelScavengeHeap::is_in_young(const void* p) const {
   // Assumes the old gen address range is lower than that of the young gen.
   bool result = p >= young_gen()->reserved().start();
diff --git a/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.cpp b/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.cpp
index b5d2e577a156c..20e14b73ac390 100644
--- a/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.cpp
+++ b/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.cpp
@@ -128,14 +128,6 @@ PSGCAdaptivePolicyCounters::PSGCAdaptivePolicyCounters(const char* name_arg,
     _major_pause_young_slope = PerfDataManager::create_variable(SUN_GC, cname,
       PerfData::U_None, (jlong) 0, CHECK);
 
-    cname = PerfDataManager::counter_name(name_space(), "scavengeSkipped");
-    _scavenge_skipped = PerfDataManager::create_variable(SUN_GC, cname,
-      PerfData::U_Bytes, (jlong) 0, CHECK);
-
-    cname = PerfDataManager::counter_name(name_space(), "fullFollowsScavenge");
-    _full_follows_scavenge = PerfDataManager::create_variable(SUN_GC, cname,
-      PerfData::U_Bytes, (jlong) 0, CHECK);
-
     _counter_time_stamp.update();
   }
 
diff --git a/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp b/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp
index 223a039d6fe37..620c761004ecd 100644
--- a/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp
+++ b/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp
@@ -61,9 +61,6 @@ class PSGCAdaptivePolicyCounters : public GCAdaptivePolicyCounters {
   PerfVariable* _minor_pause_old_slope;
   PerfVariable* _major_pause_young_slope;
 
-  PerfVariable* _scavenge_skipped;
-  PerfVariable* _full_follows_scavenge;
-
   // Use this time stamp if the gc time stamp is not available.
   TimeStamp     _counter_time_stamp;
 
@@ -180,14 +177,6 @@ class PSGCAdaptivePolicyCounters : public GCAdaptivePolicyCounters {
       (jlong)(ps_size_policy()->live_at_last_full_gc()));
   }
 
-  inline void update_scavenge_skipped(int cause) {
-    _scavenge_skipped->set_value(cause);
-  }
-
-  inline void update_full_follows_scavenge(int event) {
-    _full_follows_scavenge->set_value(event);
-  }
-
   // Update all the counters that can be updated from the size policy.
   // This should be called after all policy changes have been made
   // and reflected internally in the size policy.
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index d4a24b710cfae..f41108d1a597f 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -51,6 +51,7 @@
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shared/gcTrace.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
+#include "gc/shared/gcVMOperations.hpp"
 #include "gc/shared/isGCActiveMark.hpp"
 #include "gc/shared/oopStorage.inline.hpp"
 #include "gc/shared/oopStorageSet.inline.hpp"
@@ -968,6 +969,7 @@ bool PSParallelCompact::invoke(bool clear_all_soft_refs) {
   assert(Thread::current() == (Thread*)VMThread::vm_thread(),
          "should be in vm thread");
 
+  SvcGCMarker sgcm(SvcGCMarker::FULL);
   IsSTWGCActiveMark mark;
 
   ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
diff --git a/src/hotspot/share/gc/parallel/psScavenge.cpp b/src/hotspot/share/gc/parallel/psScavenge.cpp
index 708bb9da48af7..929eca54a5ce9 100644
--- a/src/hotspot/share/gc/parallel/psScavenge.cpp
+++ b/src/hotspot/share/gc/parallel/psScavenge.cpp
@@ -42,6 +42,7 @@
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shared/gcTrace.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
+#include "gc/shared/gcVMOperations.hpp"
 #include "gc/shared/isGCActiveMark.hpp"
 #include "gc/shared/oopStorage.inline.hpp"
 #include "gc/shared/oopStorageSetParState.inline.hpp"
@@ -221,42 +222,6 @@ class ParallelScavengeRefProcProxyTask : public RefProcProxyTask {
   }
 };
 
-// This method contains all heap specific policy for invoking scavenge.
-// PSScavenge::invoke_no_policy() will do nothing but attempt to
-// scavenge. It will not clean up after failed promotions, bail out if
-// we've exceeded policy time limits, or any other special behavior.
-// All such policy should be placed here.
-//
-// Note that this method should only be called from the vm_thread while
-// at a safepoint!
-bool PSScavenge::invoke() {
-  assert(SafepointSynchronize::is_at_safepoint(), "should be at safepoint");
-  assert(Thread::current() == (Thread*)VMThread::vm_thread(), "should be in vm thread");
-  assert(!ParallelScavengeHeap::heap()->is_stw_gc_active(), "not reentrant");
-
-  ParallelScavengeHeap* const heap = ParallelScavengeHeap::heap();
-  IsSTWGCActiveMark mark;
-
-  const bool scavenge_done = PSScavenge::invoke_no_policy();
-  const bool need_full_gc = !scavenge_done;
-  bool full_gc_done = false;
-
-  if (UsePerfData) {
-    PSGCAdaptivePolicyCounters* const counters = heap->gc_policy_counters();
-    const int ffs_val = need_full_gc ? full_follows_scavenge : not_skipped;
-    counters->update_full_follows_scavenge(ffs_val);
-  }
-
-  if (need_full_gc) {
-    GCCauseSetter gccs(heap, GCCause::_adaptive_size_policy);
-    const bool clear_all_softrefs = heap->soft_ref_policy()->should_clear_all_soft_refs();
-
-    full_gc_done = PSParallelCompact::invoke_no_policy(clear_all_softrefs);
-  }
-
-  return full_gc_done;
-}
-
 class PSThreadRootsTaskClosure : public ThreadClosure {
   uint _worker_id;
 public:
@@ -288,14 +253,14 @@ class ScavengeRootsTask : public WorkerTask {
 public:
   ScavengeRootsTask(PSOldGen* old_gen,
                     uint active_workers) :
-      WorkerTask("ScavengeRootsTask"),
-      _strong_roots_scope(active_workers),
-      _subtasks(ParallelRootType::sentinel),
-      _old_gen(old_gen),
-      _gen_top(old_gen->object_space()->top()),
-      _active_workers(active_workers),
-      _is_old_gen_empty(old_gen->object_space()->is_empty()),
-      _terminator(active_workers, PSPromotionManager::vm_thread_promotion_manager()->stack_array_depth()) {
+    WorkerTask("ScavengeRootsTask"),
+    _strong_roots_scope(active_workers),
+    _subtasks(ParallelRootType::sentinel),
+    _old_gen(old_gen),
+    _gen_top(old_gen->object_space()->top()),
+    _active_workers(active_workers),
+    _is_old_gen_empty(old_gen->object_space()->is_empty()),
+    _terminator(active_workers, PSPromotionManager::vm_thread_promotion_manager()->stack_array_depth()) {
     if (!_is_old_gen_empty) {
       PSCardTable* card_table = ParallelScavengeHeap::heap()->card_table();
       card_table->pre_scavenge(active_workers);
@@ -353,26 +318,23 @@ class ScavengeRootsTask : public WorkerTask {
   }
 };
 
-// This method contains no policy. You should probably
-// be calling invoke() instead.
-bool PSScavenge::invoke_no_policy() {
+bool PSScavenge::invoke(bool clear_soft_refs) {
   assert(SafepointSynchronize::is_at_safepoint(), "should be at safepoint");
   assert(Thread::current() == (Thread*)VMThread::vm_thread(), "should be in vm thread");
 
-  _gc_timer.register_gc_start();
-
-  if (GCLocker::check_active_before_gc()) {
+  // Check for potential problems.
+  if (!should_attempt_scavenge()) {
     return false;
   }
 
+  IsSTWGCActiveMark mark;
+
+  _gc_timer.register_gc_start();
+
   ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
   GCCause::Cause gc_cause = heap->gc_cause();
 
-  // Check for potential problems.
-  if (!should_attempt_scavenge()) {
-    return false;
-  }
-
+  SvcGCMarker sgcm(SvcGCMarker::MINOR);
   GCIdMark gc_id_mark;
   _gc_tracer.report_gc_start(heap->gc_cause(), _gc_timer.gc_start());
 
@@ -425,7 +387,7 @@ bool PSScavenge::invoke_no_policy() {
     DerivedPointerTable::clear();
 #endif
 
-    reference_processor()->start_discovery(false /* always_clear */);
+    reference_processor()->start_discovery(clear_soft_refs);
 
     const PreGenGCValues pre_gc_values = heap->get_pre_gc_values();
 
@@ -537,14 +499,13 @@ bool PSScavenge::invoke_no_policy() {
         size_t survivor_limit =
           size_policy->max_survivor_size(max_young_size);
         _tenuring_threshold =
-          size_policy->compute_survivor_space_size_and_threshold(
-                                                           _survivor_overflow,
-                                                           _tenuring_threshold,
-                                                           survivor_limit);
+          size_policy->compute_survivor_space_size_and_threshold(_survivor_overflow,
+                                                                 _tenuring_threshold,
+                                                                 survivor_limit);
 
-       log_debug(gc, age)("Desired survivor size %zu bytes, new threshold %u (max threshold %u)",
-                          size_policy->calculated_survivor_size_in_bytes(),
-                          _tenuring_threshold, MaxTenuringThreshold);
+        log_debug(gc, age)("Desired survivor size %zu bytes, new threshold %u (max threshold %u)",
+                           size_policy->calculated_survivor_size_in_bytes(),
+                           _tenuring_threshold, MaxTenuringThreshold);
 
         if (UsePerfData) {
           PSGCAdaptivePolicyCounters* counters = heap->gc_policy_counters();
@@ -568,8 +529,8 @@ bool PSScavenge::invoke_no_policy() {
           size_t cur_eden = young_gen->eden_space()->capacity_in_bytes();
           size_t max_old_gen_size = old_gen->max_gen_size();
           size_t max_eden_size = max_young_size -
-            young_gen->from_space()->capacity_in_bytes() -
-            young_gen->to_space()->capacity_in_bytes();
+                                 young_gen->from_space()->capacity_in_bytes() -
+                                 young_gen->to_space()->capacity_in_bytes();
 
           // Used for diagnostics
           size_policy->clear_generation_free_space_flags();
@@ -599,7 +560,7 @@ bool PSScavenge::invoke_no_policy() {
         // a full collection.  Don't resize the old gen here.
 
         heap->resize_young_gen(size_policy->calculated_eden_size_in_bytes(),
-                        size_policy->calculated_survivor_size_in_bytes());
+                               size_policy->calculated_survivor_size_in_bytes());
 
         log_debug(gc, ergo)("AdaptiveSizeStop: collection: %d ", heap->total_collections());
       }
@@ -657,20 +618,12 @@ void PSScavenge::clean_up_failed_promotion() {
 
 bool PSScavenge::should_attempt_scavenge() {
   ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
-  PSGCAdaptivePolicyCounters* counters = heap->gc_policy_counters();
-
-  if (UsePerfData) {
-    counters->update_scavenge_skipped(not_skipped);
-  }
 
   PSYoungGen* young_gen = heap->young_gen();
   PSOldGen* old_gen = heap->old_gen();
 
-  // Do not attempt to promote unless to_space is empty
   if (!young_gen->to_space()->is_empty()) {
-    if (UsePerfData) {
-      counters->update_scavenge_skipped(to_space_not_empty);
-    }
+    // To-space is not empty; should run full-gc instead.
     return false;
   }
 
@@ -687,15 +640,7 @@ bool PSScavenge::should_attempt_scavenge() {
                 result ? "Do" : "Skip", (size_t) policy->average_promoted_in_bytes(),
                 (size_t) policy->padded_average_promoted_in_bytes(),
                 free_in_old_gen);
-  if (young_gen->used_in_bytes() < (size_t) policy->padded_average_promoted_in_bytes()) {
-    log_trace(ergo)(" padded_promoted_average is greater than maximum promotion = " SIZE_FORMAT, young_gen->used_in_bytes());
-  }
 
-  if (!result) {
-    if (UsePerfData) {
-      counters->update_scavenge_skipped(promoted_too_large);
-    }
-  }
   return result;
 }
 
diff --git a/src/hotspot/share/gc/parallel/psScavenge.hpp b/src/hotspot/share/gc/parallel/psScavenge.hpp
index c99034e04b5f8..99d0487760b15 100644
--- a/src/hotspot/share/gc/parallel/psScavenge.hpp
+++ b/src/hotspot/share/gc/parallel/psScavenge.hpp
@@ -45,13 +45,6 @@ class PSScavenge: AllStatic {
   friend class PSKeepAliveClosure;
   friend class PSPromotionManager;
 
- enum ScavengeSkippedCause {
-   not_skipped = 0,
-   to_space_not_empty,
-   promoted_too_large,
-   full_follows_scavenge
- };
-
  protected:
   // Flags/counters
   static SpanSubjectToDiscoveryClosure _span_based_discoverer;
@@ -105,10 +98,9 @@ class PSScavenge: AllStatic {
   // Called by parallelScavengeHeap to init the tenuring threshold
   static void initialize();
 
-  // Scavenge entry point.  This may invoke a full gc; return true if so.
-  static bool invoke();
-  // Return true if a collection was done; false otherwise.
-  static bool invoke_no_policy();
+  // Scavenge entry point.
+  // Return true iff a young-gc is completed without promotion-failure.
+  static bool invoke(bool clear_soft_refs);
 
   template <class T> static inline bool should_scavenge(T* p);
 
diff --git a/src/hotspot/share/gc/parallel/psVMOperations.cpp b/src/hotspot/share/gc/parallel/psVMOperations.cpp
index db4d9a3660624..f7e00449f5c90 100644
--- a/src/hotspot/share/gc/parallel/psVMOperations.cpp
+++ b/src/hotspot/share/gc/parallel/psVMOperations.cpp
@@ -31,19 +31,19 @@
 #include "utilities/dtrace.hpp"
 
 // The following methods are used by the parallel scavenge collector
-VM_ParallelGCFailedAllocation::VM_ParallelGCFailedAllocation(size_t word_size,
-                                                             uint gc_count) :
-    VM_CollectForAllocation(word_size, gc_count, GCCause::_allocation_failure) {
+VM_ParallelCollectForAllocation::VM_ParallelCollectForAllocation(size_t word_size,
+                                                                 bool is_tlab,
+                                                                 uint gc_count) :
+  VM_CollectForAllocation(word_size, gc_count, GCCause::_allocation_failure),
+  _is_tlab(is_tlab) {
   assert(word_size != 0, "An allocation should always be requested with this operation.");
 }
 
-void VM_ParallelGCFailedAllocation::doit() {
-  SvcGCMarker sgcm(SvcGCMarker::MINOR);
-
+void VM_ParallelCollectForAllocation::doit() {
   ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
 
   GCCauseSetter gccs(heap, _gc_cause);
-  _result = heap->failed_mem_allocate(_word_size);
+  _result = heap->satisfy_failed_allocation(_word_size, _is_tlab);
 
   if (_result == nullptr && GCLocker::is_active_and_needs_gc()) {
     set_gc_locked();
@@ -56,24 +56,14 @@ static bool is_cause_full(GCCause::Cause cause) {
 }
 
 // Only used for System.gc() calls
-VM_ParallelGCSystemGC::VM_ParallelGCSystemGC(uint gc_count,
+VM_ParallelGCCollect::VM_ParallelGCCollect(uint gc_count,
                                              uint full_gc_count,
                                              GCCause::Cause gc_cause) :
-  VM_GC_Operation(gc_count, gc_cause, full_gc_count, is_cause_full(gc_cause)),
-  _full_gc_succeeded(false)
-{
-}
-
-void VM_ParallelGCSystemGC::doit() {
-  SvcGCMarker sgcm(SvcGCMarker::FULL);
+  VM_GC_Operation(gc_count, gc_cause, full_gc_count, is_cause_full(gc_cause)) {}
 
+void VM_ParallelGCCollect::doit() {
   ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
 
   GCCauseSetter gccs(heap, _gc_cause);
-  if (!_full) {
-    // If (and only if) the scavenge fails, this will invoke a full gc.
-    _full_gc_succeeded = heap->invoke_scavenge();
-  } else {
-    _full_gc_succeeded = PSParallelCompact::invoke(false);
-  }
+  heap->try_collect_at_safepoint(_full);
 }
diff --git a/src/hotspot/share/gc/parallel/psVMOperations.hpp b/src/hotspot/share/gc/parallel/psVMOperations.hpp
index cc49eb631c791..e473ebc49ca42 100644
--- a/src/hotspot/share/gc/parallel/psVMOperations.hpp
+++ b/src/hotspot/share/gc/parallel/psVMOperations.hpp
@@ -29,23 +29,22 @@
 #include "gc/shared/gcCause.hpp"
 #include "gc/shared/gcVMOperations.hpp"
 
-class VM_ParallelGCFailedAllocation : public VM_CollectForAllocation {
- public:
-  VM_ParallelGCFailedAllocation(size_t word_size, uint gc_count);
+class VM_ParallelCollectForAllocation : public VM_CollectForAllocation {
+  bool _is_tlab;
+public:
+  VM_ParallelCollectForAllocation(size_t word_size, bool is_tlab, uint gc_count);
 
   virtual VMOp_Type type() const {
-    return VMOp_ParallelGCFailedAllocation;
+    return VMOp_ParallelCollectForAllocation;
   }
   virtual void doit();
 };
 
-class VM_ParallelGCSystemGC: public VM_GC_Operation {
-  bool _full_gc_succeeded;
+class VM_ParallelGCCollect: public VM_GC_Operation {
  public:
-  VM_ParallelGCSystemGC(uint gc_count, uint full_gc_count, GCCause::Cause gc_cause);
-  virtual VMOp_Type type() const { return VMOp_ParallelGCSystemGC; }
+  VM_ParallelGCCollect(uint gc_count, uint full_gc_count, GCCause::Cause gc_cause);
+  virtual VMOp_Type type() const { return VMOp_ParallelGCCollect; }
   virtual void doit();
-  bool full_gc_succeeded() const { return _full_gc_succeeded; }
 };
 
 #endif // SHARE_GC_PARALLEL_PSVMOPERATIONS_HPP
diff --git a/src/hotspot/share/gc/shared/gcVMOperations.hpp b/src/hotspot/share/gc/shared/gcVMOperations.hpp
index aa007fec5a6aa..e9281198fdfa1 100644
--- a/src/hotspot/share/gc/shared/gcVMOperations.hpp
+++ b/src/hotspot/share/gc/shared/gcVMOperations.hpp
@@ -42,10 +42,10 @@
 //        VM_GC_HeapInspection
 //        VM_PopulateDynamicDumpSharedSpace
 //        VM_SerialGCCollect
-//        VM_ParallelGCSystemGC
+//        VM_ParallelGCCollect
 //        VM_CollectForAllocation
 //          VM_SerialCollectForAllocation
-//          VM_ParallelGCFailedAllocation
+//          VM_ParallelCollectForAllocation
 //      VM_Verify
 //      VM_PopulateDumpSharedSpace
 //
@@ -64,13 +64,13 @@
 //
 //  VM_CollectForAllocation
 //  VM_SerialCollectForAllocation
-//  VM_ParallelGCFailedAllocation
+//  VM_ParallelCollectForAllocation
 //   - this operation is invoked when allocation is failed;
 //     operation performs garbage collection and tries to
 //     allocate afterwards;
 //
 //  VM_SerialGCCollect
-//  VM_ParallelGCSystemGC
+//  VM_ParallelGCCollect
 //   - these operations perform full collection of heaps of
 //     different kind
 //
diff --git a/src/hotspot/share/runtime/vmOperation.hpp b/src/hotspot/share/runtime/vmOperation.hpp
index 47eff632a39cf..36aa6d3f28ac8 100644
--- a/src/hotspot/share/runtime/vmOperation.hpp
+++ b/src/hotspot/share/runtime/vmOperation.hpp
@@ -52,8 +52,8 @@
   template(GC_HeapInspection)                     \
   template(SerialCollectForAllocation)            \
   template(SerialGCCollect)                       \
-  template(ParallelGCFailedAllocation)            \
-  template(ParallelGCSystemGC)                    \
+  template(ParallelCollectForAllocation)          \
+  template(ParallelGCCollect)                     \
   template(G1CollectForAllocation)                \
   template(G1CollectFull)                         \
   template(G1PauseRemark)                         \
diff --git a/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap
index 9166170e50d84..5993acf701f51 100644
--- a/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap
+++ b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap
@@ -459,8 +459,6 @@ alias sun.gc.policy.edenSize                      // 1.5.0 b39
 	hotspot.gc.policy.eden_size               // 1.5.0 b21
 alias sun.gc.policy.freeSpace                     // 1.5.0 b39
 	hotspot.gc.policy.free_space              // 1.5.0 b21
-alias sun.gc.policy.fullFollowsScavenge           // 1.5.0 b39
-	hotspot.gc.policy.full_follows_scavenge   // 1.5.0 b21
 alias sun.gc.policy.gcTimeLimitExceeded           // 1.5.0 b39
 	hotspot.gc.policy.gc_time_limit_exceeded  // 1.5.0 b21
 alias sun.gc.policy.generations                   // 1.5.0 b39
@@ -508,8 +506,6 @@ alias sun.gc.policy.promoSize                     // 1.5.0 b39
 	hotspot.gc.policy.promo_size              // 1.5.0 b21
 alias sun.gc.policy.promoted                      // 1.5.0 b39
 	hotspot.gc.policy.promoted                // 1.5.0 b21
-alias sun.gc.policy.scavengeSkipped               // 1.5.0 b39
-	hotspot.gc.policy.scavenge_skipped        // 1.5.0 b21
 alias sun.gc.policy.survived                      // 1.5.0 b39
 	hotspot.gc.policy.survived                // 1.5.0 b21
 alias sun.gc.policy.survivorOverflowed            // 1.5.0 b39
diff --git a/test/jdk/jdk/jfr/event/runtime/TestVMOperation.java b/test/jdk/jdk/jfr/event/runtime/TestVMOperation.java
index ae6f1f27191af..3b4551d5eecfc 100644
--- a/test/jdk/jdk/jfr/event/runtime/TestVMOperation.java
+++ b/test/jdk/jdk/jfr/event/runtime/TestVMOperation.java
@@ -43,7 +43,7 @@
 public class TestVMOperation {
 
     private static final String EVENT_NAME = EventNames.ExecuteVMOperation;
-    private static final String VM_OPERATION = "ParallelGCSystemGC";
+    private static final String VM_OPERATION = "ParallelGCCollect";
 
     public static void main(String[] args) throws Throwable {
         Recording recording = new Recording();

From 4f312d6bc1fda6e3863ac623902a7decb0704ec3 Mon Sep 17 00:00:00 2001
From: Zhengyu Gu <zgu@openjdk.org>
Date: Fri, 12 Jul 2024 12:59:22 +0000
Subject: [PATCH 073/401] 8336152: Remove unused forward declaration in
 classLoadInfo.hpp

Reviewed-by: dholmes, shade
---
 src/hotspot/share/classfile/classLoadInfo.hpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/hotspot/share/classfile/classLoadInfo.hpp b/src/hotspot/share/classfile/classLoadInfo.hpp
index b1257dc998793..ab665c6b3dad6 100644
--- a/src/hotspot/share/classfile/classLoadInfo.hpp
+++ b/src/hotspot/share/classfile/classLoadInfo.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,8 +29,6 @@
 
 class InstanceKlass;
 
-template <typename T> class GrowableArray;
-
 class ClassInstanceInfo : public StackObj {
  private:
   InstanceKlass* _dynamic_nest_host;

From 84c74ad0a94f5c36529c63d846f15916259ee6a5 Mon Sep 17 00:00:00 2001
From: Shaojin Wen <shaojin.wensj@alibaba-inc.com>
Date: Fri, 12 Jul 2024 14:36:34 +0000
Subject: [PATCH 074/401] 8335802: Improve startup speed HexFormat uses boolean
 instead of enum

Reviewed-by: liach
---
 .../share/classes/java/util/HexFormat.java    | 45 +++++++++----------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/src/java.base/share/classes/java/util/HexFormat.java b/src/java.base/share/classes/java/util/HexFormat.java
index b8c3a06e7ee34..cd6cf8af17de3 100644
--- a/src/java.base/share/classes/java/util/HexFormat.java
+++ b/src/java.base/share/classes/java/util/HexFormat.java
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Alibaba Group Holding Limited. 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
@@ -158,22 +159,17 @@ public final class HexFormat {
      * The hexadecimal characters are from lowercase alpha digits.
      */
     private static final HexFormat HEX_FORMAT =
-            new HexFormat("", "", "", Case.LOWERCASE);
+            new HexFormat("", "", "", false);
 
     private static final HexFormat HEX_UPPER_FORMAT =
-            new HexFormat("", "", "", Case.UPPERCASE);
+            new HexFormat("", "", "", true);
 
     private static final byte[] EMPTY_BYTES = {};
 
     private final String delimiter;
     private final String prefix;
     private final String suffix;
-    private final Case digitCase;
-
-    private enum Case {
-        LOWERCASE,
-        UPPERCASE
-    }
+    private final boolean ucase;
 
     /**
      * Returns a HexFormat with a delimiter, prefix, suffix, and array of digits.
@@ -181,14 +177,14 @@ private enum Case {
      * @param delimiter a delimiter, non-null
      * @param prefix a prefix, non-null
      * @param suffix a suffix, non-null
-     * @param digitCase enum indicating how to case digits
+     * @param ucase enum indicating how to case digits
      * @throws NullPointerException if any argument is null
      */
-    private HexFormat(String delimiter, String prefix, String suffix, Case digitCase) {
+    private HexFormat(String delimiter, String prefix, String suffix, boolean ucase) {
         this.delimiter = Objects.requireNonNull(delimiter, "delimiter");
         this.prefix = Objects.requireNonNull(prefix, "prefix");
         this.suffix = Objects.requireNonNull(suffix, "suffix");
-        this.digitCase = digitCase;
+        this.ucase = ucase;
     }
 
     /**
@@ -217,7 +213,7 @@ public static HexFormat of() {
      * @return a {@link HexFormat} with the delimiter and lowercase characters
      */
     public static HexFormat ofDelimiter(String delimiter) {
-        return new HexFormat(delimiter, "", "", Case.LOWERCASE);
+        return new HexFormat(delimiter, "", "", false);
     }
 
     /**
@@ -226,7 +222,7 @@ public static HexFormat ofDelimiter(String delimiter) {
      * @return a copy of this {@code HexFormat} with the delimiter
      */
     public HexFormat withDelimiter(String delimiter) {
-        return new HexFormat(delimiter, this.prefix, this.suffix, this.digitCase);
+        return new HexFormat(delimiter, this.prefix, this.suffix, this.ucase);
     }
 
     /**
@@ -236,7 +232,7 @@ public HexFormat withDelimiter(String delimiter) {
      * @return a copy of this {@code HexFormat} with the prefix
      */
     public HexFormat withPrefix(String prefix) {
-        return new HexFormat(this.delimiter, prefix, this.suffix, this.digitCase);
+        return new HexFormat(this.delimiter, prefix, this.suffix, this.ucase);
     }
 
     /**
@@ -246,7 +242,7 @@ public HexFormat withPrefix(String prefix) {
      * @return a copy of this {@code HexFormat} with the suffix
      */
     public HexFormat withSuffix(String suffix) {
-        return new HexFormat(this.delimiter, this.prefix, suffix, this.digitCase);
+        return new HexFormat(this.delimiter, this.prefix, suffix, this.ucase);
     }
 
     /**
@@ -258,7 +254,7 @@ public HexFormat withSuffix(String suffix) {
     public HexFormat withUpperCase() {
         if (this == HEX_FORMAT)
             return HEX_UPPER_FORMAT;
-        return new HexFormat(this.delimiter, this.prefix, this.suffix, Case.UPPERCASE);
+        return new HexFormat(this.delimiter, this.prefix, this.suffix, true);
     }
 
     /**
@@ -268,7 +264,7 @@ public HexFormat withUpperCase() {
      * @return a copy of this {@code HexFormat} with lowercase hexadecimal characters
      */
     public HexFormat withLowerCase() {
-        return new HexFormat(this.delimiter, this.prefix, this.suffix, Case.LOWERCASE);
+        return new HexFormat(this.delimiter, this.prefix, this.suffix, false);
     }
 
     /**
@@ -306,7 +302,7 @@ public String suffix() {
      *          otherwise {@code false}
      */
     public boolean isUpperCase() {
-        return digitCase == Case.UPPERCASE;
+        return ucase;
     }
 
     /**
@@ -436,7 +432,6 @@ private String formatOptDelimiter(byte[] bytes, int fromIndex, int toIndex) {
             return null;
         }
 
-        boolean ucase = digitCase == Case.UPPERCASE;
         int length = toIndex - fromIndex;
         if (delimiter.isEmpty()) {
             // Allocate the byte array and fill in the hex pairs for each byte
@@ -637,7 +632,7 @@ public char toLowHexDigit(int value) {
         if (value < 10) {
             return (char)('0' + value);
         }
-        if (digitCase == Case.LOWERCASE) {
+        if (!ucase) {
             return (char)('a' - 10 + value);
         }
         return (char)('A' - 10 + value);
@@ -658,7 +653,7 @@ public char toHighHexDigit(int value) {
         if (value < 10) {
             return (char)('0' + value);
         }
-        if (digitCase == Case.LOWERCASE) {
+        if (!ucase) {
             return (char)('a' - 10 + value);
         }
         return (char)('A' - 10 + value);
@@ -1067,7 +1062,7 @@ public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass())
             return false;
         HexFormat otherHex = (HexFormat) o;
-        return digitCase == otherHex.digitCase &&
+        return ucase == otherHex.ucase &&
                 delimiter.equals(otherHex.delimiter) &&
                 prefix.equals(otherHex.prefix) &&
                 suffix.equals(otherHex.suffix);
@@ -1081,7 +1076,7 @@ public boolean equals(Object o) {
     @Override
     public int hashCode() {
         int result = Objects.hash(delimiter, prefix, suffix);
-        result = 31 * result + Boolean.hashCode(digitCase == Case.UPPERCASE);
+        result = 31 * result + Boolean.hashCode(ucase);
         return result;
     }
 
@@ -1093,7 +1088,7 @@ public int hashCode() {
      */
     @Override
     public String toString() {
-        return escapeNL("uppercase: " + (digitCase == Case.UPPERCASE) +
+        return escapeNL("uppercase: " + ucase +
                 ", delimiter: \"" + delimiter +
                 "\", prefix: \"" + prefix +
                 "\", suffix: \"" + suffix + "\"");

From 1f6e106b45e5109224e13d70f1a40c9e666ec2ab Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevinw@openjdk.org>
Date: Fri, 12 Jul 2024 17:11:20 +0000
Subject: [PATCH 075/401] 8335684: Test ThreadCpuTime.java should pause like
 ThreadCpuTimeArray.java

Reviewed-by: sspitsyn, cjplummer
---
 .../lang/management/ThreadMXBean/ThreadCpuTime.java | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/test/jdk/java/lang/management/ThreadMXBean/ThreadCpuTime.java b/test/jdk/java/lang/management/ThreadMXBean/ThreadCpuTime.java
index 61fff63936382..f8cab540465a5 100644
--- a/test/jdk/java/lang/management/ThreadMXBean/ThreadCpuTime.java
+++ b/test/jdk/java/lang/management/ThreadMXBean/ThreadCpuTime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -177,6 +177,8 @@ private static void waitUntilThreadBlocked()
                 }
             }
         }
+        // Account for threads using CPU for a few millis after their WAITING state is visible:
+        goSleep(500);
     }
 
     static class MyThread extends Thread {
@@ -228,15 +230,6 @@ public void run() {
                     " CurrentThreadCpuTime = " + time1 +
                     " > ThreadCpuTime = " + time2);
             }
-/*************
- * FIXME: Seems that on Solaris-sparc,
- * It occasionally returns a different current thread user time > thread user time
-            if (utime1 > utime2) {
-                throw new RuntimeException("TEST FAILED: " + getName() +
-                    " CurrentThreadUserTime = " + utime1 +
-                    " > ThreadUserTime = " + utime2);
-            }
-*/
         }
     }
 

From 4957145e6c823bfaa638a77457da5c031af978b9 Mon Sep 17 00:00:00 2001
From: Shaojin Wen <shaojin.wensj@alibaba-inc.com>
Date: Fri, 12 Jul 2024 21:49:28 +0000
Subject: [PATCH 076/401] 8336278: Micro-optimize Replace String.format("%n")
 to System.lineSeparator

Reviewed-by: dnsimon, shade
---
 .../share/classes/jdk/vm/ci/code/CodeUtil.java                | 4 ++--
 .../share/classes/jdk/vm/ci/hotspot/HotSpotMethodData.java    | 4 ++--
 .../share/classes/jdk/jfr/internal/tool/StructuredWriter.java | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/CodeUtil.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/CodeUtil.java
index d04823d3e4c1e..59af250a69518 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/CodeUtil.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/CodeUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@
  */
 public class CodeUtil {
 
-    public static final String NEW_LINE = String.format("%n");
+    public static final String NEW_LINE = System.lineSeparator();
 
     public static final int K = 1024;
     public static final int M = 1024 * 1024;
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMethodData.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMethodData.java
index 1096771919c79..bc76b7656fa2a 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMethodData.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMethodData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -318,7 +318,7 @@ public boolean isProfileMature() {
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        String nl = String.format("%n");
+        String nl = System.lineSeparator();
         String nlIndent = String.format("%n%38s", "");
         sb.append("Raw method data for ");
         sb.append(method.format("%H.%n(%p)"));
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/StructuredWriter.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/StructuredWriter.java
index 3892e8502181f..8e16e5fb0bf2c 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/StructuredWriter.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/StructuredWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@ abstract class StructuredWriter {
     private int column;
     // print first event immediately so tool feels responsive
     private boolean first = true;
-    private String lineSeparator = String.format("%n");
+    private String lineSeparator = System.lineSeparator();
 
     StructuredWriter(PrintWriter p) {
         out = p;

From 8ba9bc6f1735be98dcc039244a28884b4d9620ae Mon Sep 17 00:00:00 2001
From: Sean Gwizdak <sgwizdak@amazon.com>
Date: Fri, 12 Jul 2024 21:49:51 +0000
Subject: [PATCH 077/401] 8332249: Micro-optimize Method.hashCode

Reviewed-by: liach
---
 .../share/classes/java/lang/reflect/Method.java     | 10 +++++++++-
 .../bench/java/lang/reflect/MethodBenchmark.java    | 13 +++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/reflect/Method.java b/src/java.base/share/classes/java/lang/reflect/Method.java
index b6ccbaa829452..80e0209249c8b 100644
--- a/src/java.base/share/classes/java/lang/reflect/Method.java
+++ b/src/java.base/share/classes/java/lang/reflect/Method.java
@@ -95,6 +95,8 @@ public final class Method extends Executable {
     // If this branching structure would ever contain cycles, deadlocks can
     // occur in annotation code.
     private Method              root;
+    // Hash code of this object
+    private int                 hash;
 
     // Generics infrastructure
     private String getGenericSignature() {return signature;}
@@ -381,7 +383,13 @@ public boolean equals(Object obj) {
      * method's declaring class name and the method's name.
      */
     public int hashCode() {
-        return getDeclaringClass().getName().hashCode() ^ getName().hashCode();
+        int hc = hash;
+
+        if (hc == 0) {
+            hc = hash = getDeclaringClass().getName().hashCode() ^ getName()
+                .hashCode();
+        }
+        return hc;
     }
 
     /**
diff --git a/test/micro/org/openjdk/bench/java/lang/reflect/MethodBenchmark.java b/test/micro/org/openjdk/bench/java/lang/reflect/MethodBenchmark.java
index 96a218d440594..4e682cf4e92f1 100644
--- a/test/micro/org/openjdk/bench/java/lang/reflect/MethodBenchmark.java
+++ b/test/micro/org/openjdk/bench/java/lang/reflect/MethodBenchmark.java
@@ -36,8 +36,9 @@
 import org.openjdk.jmh.annotations.Warmup;
 
 /**
- * Benchmark measuring the speed of Method/Method.getExceptionTypes() and
- * getParameterTypes(), in cases where the result array is length zero.
+ * Benchmark measuring the speed of Method/Method.getExceptionTypes(),
+ * getParameterTypes() in cases where the result array is length zero,
+ * and hashCode().
  */
 @BenchmarkMode(Mode.AverageTime)
 @State(Scope.Benchmark)
@@ -50,6 +51,7 @@ public class MethodBenchmark {
     Method emptyParametersMethod;
     Method oneExceptionMethod;
     Method oneParameterMethod;
+    Method hashCodeMethod;
 
     public MethodBenchmark() {
         try {
@@ -58,6 +60,8 @@ public MethodBenchmark() {
 
             emptyExceptionsMethod = emptyParametersMethod;
             oneExceptionMethod = oneParameterMethod;
+
+            hashCodeMethod = String.class.getDeclaredMethod("toString");
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -82,4 +86,9 @@ public Object[] getParameterTypes() throws Exception {
     public Object[] getParameterTypesEmpty() throws Exception {
         return emptyParametersMethod.getParameterTypes();
     }
+
+    @Benchmark
+    public int getMethodHashCode() {
+        return hashCodeMethod.hashCode();
+    }
 }

From 5bc86f332986e3fffc1363f569029bb73a706064 Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nbenalla@openjdk.org>
Date: Fri, 12 Jul 2024 21:50:51 +0000
Subject: [PATCH 078/401] 8336259: Wrong link to stylesheet.css in JavaDoc API
 documentation

Reviewed-by: jjg, liach
---
 .../share/classes/java/lang/doc-files/ValueBased.html          | 3 +--
 .../java/lang/doc-files/threadPrimitiveDeprecation.html        | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/doc-files/ValueBased.html b/src/java.base/share/classes/java/lang/doc-files/ValueBased.html
index 86d9b35955726..6a935afe04b69 100644
--- a/src/java.base/share/classes/java/lang/doc-files/ValueBased.html
+++ b/src/java.base/share/classes/java/lang/doc-files/ValueBased.html
@@ -1,6 +1,6 @@
 <!doctype html>
 <!--
- Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 <html lang="en">
 <head>
   <title>Value-based Classes</title>
-  <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <h1 id="ValueBased">{@index "Value-based Classes"}</h1>
diff --git a/src/java.base/share/classes/java/lang/doc-files/threadPrimitiveDeprecation.html b/src/java.base/share/classes/java/lang/doc-files/threadPrimitiveDeprecation.html
index 6172a859ba6bd..c680c0d2745a5 100644
--- a/src/java.base/share/classes/java/lang/doc-files/threadPrimitiveDeprecation.html
+++ b/src/java.base/share/classes/java/lang/doc-files/threadPrimitiveDeprecation.html
@@ -1,6 +1,6 @@
 <!doctype html>
 <!--
- Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 <html lang="en">
 <head>
   <title>Java Thread Primitive Deprecation</title>
-  <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <h1>Java Thread Primitive Deprecation</h1>

From 4166e5345283d118d76b20de579d73bd55436ea6 Mon Sep 17 00:00:00 2001
From: Pavel Rappo <prappo@openjdk.org>
Date: Fri, 12 Jul 2024 23:11:04 +0000
Subject: [PATCH 079/401] 8318106: Generated HTML for snippet does not always
 contain an id

Reviewed-by: liach
---
 .../doclets/formats/html/HtmlIds.java         | 32 +++++++++++++++++++
 .../formats/html/taglets/SnippetTaglet.java   |  6 +++-
 .../testMarkdown/TestMarkdownTaglets.java     |  4 +--
 .../testSnippetTag/TestLangProperties.java    |  4 +--
 .../testSnippetTag/TestSnippetMarkup.java     |  5 +--
 .../doclet/testSnippetTag/TestSnippetTag.java | 29 +++++++++++------
 .../TestSnippetUnnamedPackage.java            |  4 +--
 7 files changed, 65 insertions(+), 19 deletions(-)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlIds.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlIds.java
index fc77210727457..48edce573d3c7 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlIds.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlIds.java
@@ -36,6 +36,7 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.ModuleElement;
 import javax.lang.model.element.PackageElement;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
@@ -595,4 +596,35 @@ public HtmlId forHeading(CharSequence headingText, Set<String> headingIds) {
         }
         return HtmlId.of(idValue);
     }
+
+    /**
+     * Returns an id for a snippet.
+     *
+     * @param e the element in whose documentation the snippet appears
+     * @param snippetIds the set of snippet ids already generated
+     * @return a unique id for the snippet
+     */
+    public HtmlId forSnippet(Element e, Set<String> snippetIds) {
+        String id = "snippet-";
+        ElementKind kind = e.getKind();
+        if (kind == ElementKind.PACKAGE) {
+            id += forPackage((PackageElement) e).name();
+        } else if (kind.isDeclaredType()) {
+            id += forClass((TypeElement) e).name();
+        } else if (kind.isExecutable()) {
+            id += forMember((ExecutableElement) e).getFirst().name();
+        } else if (kind.isField()) {
+            id += forMember((VariableElement) e).name();
+        } else if (kind == ElementKind.MODULE) {
+            id += ((ModuleElement) e).getQualifiedName();
+        } else {
+            // while utterly unexpected, we shouldn't fail
+            id += "unknown-element";
+        }
+        int counter = 1;
+        while (!snippetIds.add(id + counter)) {
+            counter++;
+        }
+        return HtmlId.of(id + counter);
+    }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java
index e705fb0cc1027..f03b3d1bde150 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -148,6 +148,8 @@ private Content snippetTagOutput(Element element, SnippetTree tag, StyledText co
         var pre = new HtmlTree(TagName.PRE).setStyle(HtmlStyle.snippet);
         if (id != null && !id.isBlank()) {
             pre.put(HtmlAttr.ID, id);
+        } else {
+            pre.put(HtmlAttr.ID, config.htmlIds.forSnippet(element, ids).name());
         }
         var code = new HtmlTree(TagName.CODE)
                 .addUnchecked(Text.EMPTY); // Make sure the element is always rendered
@@ -232,6 +234,8 @@ private Content snippetTagOutput(Element element, SnippetTree tag, StyledText co
         return snippetContainer.add(pre.add(code));
     }
 
+    private final Set<String> ids = new HashSet<>();
+
     private static final class BadSnippetException extends Exception {
 
         @java.io.Serial
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownTaglets.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownTaglets.java
index fa9d3bbad1253..abf7bb13593bd 100644
--- a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownTaglets.java
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownTaglets.java
@@ -121,7 +121,7 @@ public void snippet_wrapped() { }
                     <div class="snippet-container"><button class="copy snippet-copy" aria-label="Copy snippet" \
                     onclick="copySnippet(this)"><span data-copied="Copied!">Copy</span>\
                     <img src="../resource-files/copy.svg" alt="Copy snippet"></button>
-                    <pre class="snippet"><code>   this is snippet_standalone
+                    <pre class="snippet" id="snippet-snippet_standalone()1"><code>   this is snippet_standalone
                     </code></pre>
                     </div>
 
@@ -131,7 +131,7 @@ public void snippet_wrapped() { }
                     <div class="block"><p>First sentence.</p>
                     <p>Before.</p>
                     <div class="snippet-container"><button class="copy snippet-copy" aria-label="Copy snippet" onclick="copySnippet(this)"><span data-copied="Copied!">Copy</span><img src="../resource-files/copy.svg" alt="Copy snippet"></button>
-                    <pre class="snippet"><code>   this is a snippet_wrapped
+                    <pre class="snippet" id="snippet-snippet_wrapped()1"><code>   this is a snippet_wrapped
                     </code></pre>
                     </div>
 
diff --git a/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestLangProperties.java b/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestLangProperties.java
index 49b328f314d31..2edd2d34c4ceb 100644
--- a/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestLangProperties.java
+++ b/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestLangProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -179,7 +179,7 @@ public class A {
                     <div class="block">
                     %s
                     </div>""".formatted(index, getSnippetHtmlRepresentation("A.html",
-                    t.expectedOutput(), Optional.of("properties")));
+                    t.expectedOutput(), Optional.of("properties"), Optional.of("snippet-case" + index + "()2")));
             checkOutput("A.html", true, html);
         });
     }
diff --git a/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetMarkup.java b/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetMarkup.java
index 5d9eb794613fb..9a332fde1a9a8 100644
--- a/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetMarkup.java
+++ b/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetMarkup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,6 +52,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 import java.util.regex.MatchResult;
@@ -365,7 +366,7 @@ public class A {
                         <span class="element-name">case%s</span>()</div>
                         <div class="block">
                         %s
-                        </div>""".formatted(index, getSnippetHtmlRepresentation("A.html", t.expectedOutput()));
+                        </div>""".formatted(index, getSnippetHtmlRepresentation("A.html", t.expectedOutput(), Optional.empty(), Optional.of("snippet-case" + index + "()2")));
             checkOutput("A.html", true, html);
         });
     }
diff --git a/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetTag.java b/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetTag.java
index b7b54dfdb2653..7e79232ef72a2 100644
--- a/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetTag.java
+++ b/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -220,8 +220,9 @@ record SnippetAttributes(String content, String id, String lang) { }
         checkLinks();
         for (int j = 0; j < snippets.size(); j++) {
             var attr = snippets.get(j);
+            Optional<String> id = (attr.id() != null ? Optional.of(attr.id()) : Optional.of("snippet-case" + j + "()1"));
             var snippetHtml = getSnippetHtmlRepresentation("pkg/A.html", "    Hello, Snippet!\n",
-                    Optional.ofNullable(attr.lang()), Optional.ofNullable(attr.id()));
+                    Optional.ofNullable(attr.lang()), id);
             checkOutput("pkg/A.html", true,
                         """
                         <span class="element-name">case%s</span>()</div>
@@ -879,7 +880,8 @@ record TestCase(String input, String expectedOutput) { }
                         """
                         <span class="element-name">case%s</span>()</div>
                         <div class="block">
-                        %s""".formatted(id, getSnippetHtmlRepresentation("pkg/A.html", t.expectedOutput())));
+                        %s""".formatted(id, getSnippetHtmlRepresentation("pkg/A.html", t.expectedOutput(), Optional.empty(),
+                                Optional.of("snippet-case" + id + "()2"))));
         });
     }
 
@@ -971,7 +973,8 @@ record TestCase(String input, Function<String, String> expectedTransformation) {
                         """
                         <span class="element-name">case%s</span>()</div>
                         <div class="block">
-                        %s""".formatted(index, getSnippetHtmlRepresentation("pkg/A.html", expectedOutput)));
+                        %s""".formatted(index, getSnippetHtmlRepresentation("pkg/A.html", expectedOutput, Optional.empty(),
+                                Optional.of("snippet-case" + index + "()2"))));
         });
     }
 
@@ -1549,7 +1552,8 @@ record TestCase(Snippet snippet, String expectedOutput) { }
                         """
                         <span class="element-name">case%s</span>()</div>
                         <div class="block">
-                        %s""".formatted(index, getSnippetHtmlRepresentation("pkg/A.html", t.expectedOutput())));
+                        %s""".formatted(index, getSnippetHtmlRepresentation("pkg/A.html", t.expectedOutput(), Optional.empty(),
+                                Optional.of("snippet-case" + index + "()2"))));
         });
     }
 
@@ -1662,12 +1666,14 @@ public void testPositiveInlineTagMarkup_SyntaxCurly(Path base) throws Exception
                     """
                     <span class="element-name">case0</span>()</div>
                     <div class="block">
-                    """ + getSnippetHtmlRepresentation("pkg/A.html", ""));
+                    """ + getSnippetHtmlRepresentation("pkg/A.html", "", Optional.empty(),
+                            Optional.of("snippet-case0()2")));
         checkOutput("pkg/A.html", true,
                     """
                     <span class="element-name">case1</span>()</div>
                     <div class="block">
-                    """ + getSnippetHtmlRepresentation("pkg/A.html", ""));
+                    """ + getSnippetHtmlRepresentation("pkg/A.html", "", Optional.empty(),
+                            Optional.of("snippet-case1()2")));
     }
 
     @Test // TODO: use combinatorial methods
@@ -1765,7 +1771,8 @@ public void testPositiveExternalTagMarkup_AttributeValueSyntax(Path base) throws
                         <span class="element-name">case%s</span>()</div>
                         <div class="block">
                         %s
-                        """.formatted(j, getSnippetHtmlRepresentation("pkg/A.html", "2")));
+                        """.formatted(j, getSnippetHtmlRepresentation("pkg/A.html", "2", Optional.empty(),
+                                Optional.of("snippet-case" + j + "()2"))));
         }
     }
 
@@ -1844,7 +1851,8 @@ record TestCase(Snippet snippet, String expectedOutput) { }
                         """
                         <span class="element-name">case%s</span>()</div>
                         <div class="block">
-                        %s""".formatted(index, getSnippetHtmlRepresentation("pkg/A.html", t.expectedOutput())));
+                        %s""".formatted(index, getSnippetHtmlRepresentation("pkg/A.html", t.expectedOutput(), Optional.empty(),
+                                Optional.of("snippet-case" + index + "()2"))));
         });
     }
 
@@ -2302,7 +2310,8 @@ record TestCase(Snippet snippet, String expectedOutput) { }
                         """
                         <span class="element-name">case%s</span>()</div>
                         <div class="block">
-                        %s""".formatted(index, getSnippetHtmlRepresentation("pkg/A.html", t.expectedOutput())));
+                        %s""".formatted(index, getSnippetHtmlRepresentation("pkg/A.html", t.expectedOutput(), Optional.empty(),
+                                Optional.of("snippet-case" + index + "()2"))));
         });
     }
 
diff --git a/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetUnnamedPackage.java b/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetUnnamedPackage.java
index 4f5c3e3222338..616eb3a7ed7f5 100644
--- a/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetUnnamedPackage.java
+++ b/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetUnnamedPackage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -91,6 +91,6 @@ private C() { }
                         %s
 
                          After.""".formatted(getSnippetHtmlRepresentation("C.html",
-                        "public class S { }", Optional.of("java"))));
+                        "public class S { }", Optional.of("java"), Optional.of("snippet-C1"))));
     }
 }

From ae9f318fc35eeab497e546ebab9faed6ec774ec5 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Sat, 13 Jul 2024 02:19:25 +0000
Subject: [PATCH 080/401] 8336301:
 test/jdk/java/nio/channels/AsyncCloseAndInterrupt.java leaves around a FIFO
 file upon test completion

Reviewed-by: alanb
---
 test/jdk/java/nio/channels/AsyncCloseAndInterrupt.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/jdk/java/nio/channels/AsyncCloseAndInterrupt.java b/test/jdk/java/nio/channels/AsyncCloseAndInterrupt.java
index 0543cd04334d2..bf793288471f2 100644
--- a/test/jdk/java/nio/channels/AsyncCloseAndInterrupt.java
+++ b/test/jdk/java/nio/channels/AsyncCloseAndInterrupt.java
@@ -155,6 +155,7 @@ private static void initFile() throws Exception {
             return;
         }
         fifoFile = new File("x.fifo");
+        fifoFile.deleteOnExit();
         if (fifoFile.exists()) {
             if (!fifoFile.delete())
                 throw new IOException("Cannot delete existing fifo " + fifoFile);

From 6f325db49365d3d06add5d194d4696a1428675fa Mon Sep 17 00:00:00 2001
From: Brian Stafford <bstafford@openjdk.org>
Date: Sat, 13 Jul 2024 04:59:04 +0000
Subject: [PATCH 081/401] 8310915: Typo in aarch64.ad: "envcodings"

Reviewed-by: thartmann
---
 src/hotspot/cpu/aarch64/aarch64.ad | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index 2f2bee6e22f0f..d4b3d63443877 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -3360,7 +3360,7 @@ encode %{
     }
   %}
 
-  /// mov envcodings
+  // mov encodings
 
   enc_class aarch64_enc_movw_imm(iRegI dst, immI src) %{
     uint32_t con = (uint32_t)$src$$constant;

From a9f5e76a65f743be9cd995fbea9c78ff9cef3402 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Sun, 14 Jul 2024 15:01:51 +0000
Subject: [PATCH 082/401] 8335905: CompoundElement API cleanup

Reviewed-by: asotona
---
 .../java/lang/classfile/ClassFileBuilder.java |  4 ++--
 .../java/lang/classfile/ClassModel.java       |  4 ++--
 .../java/lang/classfile/CodeModel.java        |  5 ++---
 .../java/lang/classfile/CompoundElement.java  | 19 ++++++-------------
 .../java/lang/classfile/FieldModel.java       |  4 ++--
 .../java/lang/classfile/MethodModel.java      |  4 ++--
 .../classfile/impl/AbstractUnboundModel.java  |  4 ++--
 .../classfile/impl/BufferedCodeBuilder.java   |  2 +-
 .../classfile/impl/BufferedMethodBuilder.java |  4 ++--
 .../internal/classfile/impl/ClassImpl.java    |  2 +-
 .../classfile/impl/ClassRemapperImpl.java     |  6 ++----
 .../jdk/internal/classfile/impl/CodeImpl.java | 10 ++++++----
 .../internal/classfile/impl/FieldImpl.java    |  4 ++--
 .../internal/classfile/impl/MethodImpl.java   |  4 ++--
 .../classes/sun/tools/jar/FingerPrint.java    |  4 ++--
 .../jfr/internal/EventInstrumentation.java    |  4 ++--
 .../classes/jdk/tools/jimage/JImageTask.java  |  9 ++++-----
 .../lang/instrument/asmlib/Instrumentor.java  |  2 +-
 .../lang/invoke/8022701/MHIllegalAccess.java  |  4 ++--
 .../java/lang/invoke/lambda/LambdaAsm.java    |  4 ++--
 test/jdk/jdk/classfile/AdaptCodeTest.java     |  2 +-
 test/jdk/jdk/classfile/BasicBlockTest.java    |  4 ++--
 .../jdk/classfile/ClassHierarchyInfoTest.java |  2 +-
 test/jdk/jdk/classfile/CorpusTest.java        |  2 +-
 test/jdk/jdk/classfile/LvtTest.java           | 10 +++++-----
 test/jdk/jdk/classfile/OptionsTest.java       |  2 +-
 test/jdk/jdk/classfile/StackMapsTest.java     |  2 +-
 .../jdk/classfile/TestRecordComponent.java    |  2 +-
 test/jdk/jdk/classfile/VerifierSelfTest.java  |  2 +-
 .../helpers/RebuildingTransformation.java     |  2 +-
 .../jdk/jdk/classfile/helpers/Transforms.java |  6 +++---
 .../event/compiler/TestCompilerInlining.java  |  2 +-
 .../openjdk/bench/jdk/classfile/ReadDeep.java |  8 ++++----
 .../bench/jdk/classfile/Transforms.java       |  6 +++---
 34 files changed, 73 insertions(+), 82 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/classfile/ClassFileBuilder.java b/src/java.base/share/classes/java/lang/classfile/ClassFileBuilder.java
index 9381c0510ef87..b4993976ecd12 100644
--- a/src/java.base/share/classes/java/lang/classfile/ClassFileBuilder.java
+++ b/src/java.base/share/classes/java/lang/classfile/ClassFileBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -89,7 +89,7 @@ default void transform(CompoundElement<E> model, ClassFileTransform<?, E, B> tra
         B builder = (B) this;
         var resolved = transform.resolve(builder);
         resolved.startHandler().run();
-        model.forEachElement(resolved.consumer());
+        model.forEach(resolved.consumer());
         resolved.endHandler().run();
     }
 }
diff --git a/src/java.base/share/classes/java/lang/classfile/ClassModel.java b/src/java.base/share/classes/java/lang/classfile/ClassModel.java
index 282392a8c5ef8..c289f72f560f0 100644
--- a/src/java.base/share/classes/java/lang/classfile/ClassModel.java
+++ b/src/java.base/share/classes/java/lang/classfile/ClassModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@
 
 /**
  * Models a classfile.  The contents of the classfile can be traversed via
- * a streaming view (e.g., {@link #elements()}), or via random access (e.g.,
+ * a streaming view, or via random access (e.g.,
  * {@link #flags()}), or by freely mixing the two.
  *
  * @since 22
diff --git a/src/java.base/share/classes/java/lang/classfile/CodeModel.java b/src/java.base/share/classes/java/lang/classfile/CodeModel.java
index b48802d02acc4..45488561c1ab3 100644
--- a/src/java.base/share/classes/java/lang/classfile/CodeModel.java
+++ b/src/java.base/share/classes/java/lang/classfile/CodeModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,8 +36,7 @@
 
 /**
  * Models the body of a method (the {@code Code} attribute).  The instructions
- * of the method body are accessed via a streaming view (e.g., {@link
- * #elements()}).
+ * of the method body are accessed via a streaming view.
  *
  * @since 22
  */
diff --git a/src/java.base/share/classes/java/lang/classfile/CompoundElement.java b/src/java.base/share/classes/java/lang/classfile/CompoundElement.java
index 42f0fabadc6bb..12904c9dd596e 100644
--- a/src/java.base/share/classes/java/lang/classfile/CompoundElement.java
+++ b/src/java.base/share/classes/java/lang/classfile/CompoundElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,7 @@
  * class.  When encountering a {@linkplain CompoundElement}, clients have the
  * option to treat the element as a single entity (e.g., an entire method)
  * or to traverse the contents of that element with the methods in this class
- * (e.g., {@link #elements()}, {@link #forEachElement(Consumer)}, etc.)
+ * (e.g., {@link #forEach(Consumer)}, etc.)
  * @param <E> the element type
  *
  * @sealedGraph
@@ -55,15 +55,8 @@ public sealed interface CompoundElement<E extends ClassFileElement>
      * compound element
      * @param consumer the handler
      */
-    void forEachElement(Consumer<E> consumer);
-
-    /**
-     * {@return an {@link Iterable} describing all the elements contained in this
-     * compound element}
-     */
-    default Iterable<E> elements() {
-        return elementList();
-    }
+    @Override
+    void forEach(Consumer<? super E> consumer);
 
     /**
      * {@return an {@link Iterator} describing all the elements contained in this
@@ -71,7 +64,7 @@ default Iterable<E> elements() {
      */
     @Override
     default Iterator<E> iterator() {
-        return elements().iterator();
+        return elementList().iterator();
     }
 
     /**
@@ -91,7 +84,7 @@ default Stream<E> elementStream() {
      */
     default List<E> elementList() {
         List<E> list = new ArrayList<>();
-        forEachElement(new Consumer<>() {
+        forEach(new Consumer<>() {
             @Override
             public void accept(E e) {
                 list.add(e);
diff --git a/src/java.base/share/classes/java/lang/classfile/FieldModel.java b/src/java.base/share/classes/java/lang/classfile/FieldModel.java
index cb2e167b9cfac..35465dfe97d00 100644
--- a/src/java.base/share/classes/java/lang/classfile/FieldModel.java
+++ b/src/java.base/share/classes/java/lang/classfile/FieldModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,7 @@
 
 /**
  * Models a field.  The contents of the field can be traversed via
- * a streaming view (e.g., {@link #elements()}), or via random access (e.g.,
+ * a streaming view, or via random access (e.g.,
  * {@link #flags()}), or by freely mixing the two.
  *
  * @since 22
diff --git a/src/java.base/share/classes/java/lang/classfile/MethodModel.java b/src/java.base/share/classes/java/lang/classfile/MethodModel.java
index 49cbb6ac7fdc8..3d91683e21889 100644
--- a/src/java.base/share/classes/java/lang/classfile/MethodModel.java
+++ b/src/java.base/share/classes/java/lang/classfile/MethodModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,7 @@
 
 /**
  * Models a method.  The contents of the method can be traversed via
- * a streaming view (e.g., {@link #elements()}), or via random access (e.g.,
+ * a streaming view, or via random access (e.g.,
  * {@link #flags()}), or by freely mixing the two.
  *
  * @since 22
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractUnboundModel.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractUnboundModel.java
index 6aa046eb06dd8..5aebec8ab40f6 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractUnboundModel.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractUnboundModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,7 @@ public AbstractUnboundModel(List<E> elements) {
     }
 
     @Override
-    public void forEachElement(Consumer<E> consumer) {
+    public void forEach(Consumer<? super E> consumer) {
         elements.forEach(consumer);
     }
 
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedCodeBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedCodeBuilder.java
index 8603c77ab8b2a..e9a8f2e1e1c89 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedCodeBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedCodeBuilder.java
@@ -201,7 +201,7 @@ public void writeTo(DirectMethodBuilder builder) {
             builder.withCode(new Consumer<>() {
                 @Override
                 public void accept(CodeBuilder cb) {
-                    forEachElement(cb);
+                    forEach(cb);
                 }
             });
         }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java
index c6cf9d8ea5353..0819831466e75 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -200,7 +200,7 @@ public void writeTo(DirectClassBuilder builder) {
             builder.withMethod(methodName(), methodType(), methodFlags(), new Consumer<>() {
                 @Override
                 public void accept(MethodBuilder mb) {
-                    forEachElement(mb);
+                    forEach(mb);
                 }
             });
         }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassImpl.java
index 907a5cc535152..eab283a8c6030 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassImpl.java
@@ -156,7 +156,7 @@ public List<Attribute<?>> attributes() {
     // ClassModel
 
     @Override
-    public void forEachElement(Consumer<ClassElement> consumer) {
+    public void forEach(Consumer<? super ClassElement> consumer) {
         consumer.accept(flags());
         consumer.accept(ClassFileVersion.of(majorVersion(), minorVersion()));
         superclass().ifPresent(new Consumer<ClassEntry>() {
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassRemapperImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassRemapperImpl.java
index d1a02d9a93c7d..e3f701b2e2adb 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassRemapperImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassRemapperImpl.java
@@ -97,12 +97,10 @@ public void accept(ClassBuilder clb, ClassElement cle) {
         switch (cle) {
             case FieldModel fm ->
                 clb.withField(fm.fieldName().stringValue(), map(
-                        fm.fieldTypeSymbol()), fb ->
-                                fm.forEachElement(asFieldTransform().resolve(fb).consumer()));
+                        fm.fieldTypeSymbol()), fb -> fb.transform(fm, asFieldTransform()));
             case MethodModel mm ->
                 clb.withMethod(mm.methodName().stringValue(), mapMethodDesc(
-                        mm.methodTypeSymbol()), mm.flags().flagsMask(), mb ->
-                                mm.forEachElement(asMethodTransform().resolve(mb).consumer()));
+                        mm.methodTypeSymbol()), mm.flags().flagsMask(), mb -> mb.transform(mm, asMethodTransform()));
             case Superclass sc ->
                 clb.withSuperclass(map(sc.superclassEntry().asSymbol()));
             case Interfaces ins ->
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java
index 06058bba28206..4b2a21072f013 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java
@@ -27,6 +27,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
 
@@ -149,7 +150,7 @@ public void writeTo(BufWriter buf) {
                                     new Consumer<CodeBuilder>() {
                                         @Override
                                         public void accept(CodeBuilder cb) {
-                                            forEachElement(cb);
+                                            forEach(cb);
                                         }
                                     },
                                     (SplitConstantPool)buf.constantPool(),
@@ -166,7 +167,8 @@ public Optional<MethodModel> parent() {
     }
 
     @Override
-    public void forEachElement(Consumer<CodeElement> consumer) {
+    public void forEach(Consumer<? super CodeElement> consumer) {
+        Objects.requireNonNull(consumer);
         inflateMetadata();
         boolean doLineNumbers = (lineNumbers != null);
         generateCatchTargets(consumer);
@@ -329,7 +331,7 @@ private void inflateTypeAnnotations() {
         findAttribute(Attributes.runtimeInvisibleTypeAnnotations()).ifPresent(RuntimeInvisibleTypeAnnotationsAttribute::annotations);
     }
 
-    private void generateCatchTargets(Consumer<CodeElement> consumer) {
+    private void generateCatchTargets(Consumer<? super CodeElement> consumer) {
         // We attach all catch targets to bci zero, because trying to attach them
         // to their range could subtly affect the order of exception processing
         iterateExceptionHandlers(new ExceptionHandlerAction() {
@@ -343,7 +345,7 @@ public void accept(int s, int e, int h, int c) {
         });
     }
 
-    private void generateDebugElements(Consumer<CodeElement> consumer) {
+    private void generateDebugElements(Consumer<? super CodeElement> consumer) {
         for (Attribute<?> a : attributes()) {
             if (a.attributeMapper() == Attributes.characterRangeTable()) {
                 var attr = (BoundCharacterRangeTableAttribute) a;
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/FieldImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/FieldImpl.java
index fb072ae563868..ba424c862fdc9 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/FieldImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/FieldImpl.java
@@ -101,14 +101,14 @@ public void writeTo(DirectClassBuilder builder) {
             builder.withField(fieldName(), fieldType(), new Consumer<>() {
                 @Override
                 public void accept(FieldBuilder fb) {
-                    FieldImpl.this.forEachElement(fb);
+                    FieldImpl.this.forEach(fb);
                 }
             });
         }
     }
 
     @Override
-    public void forEachElement(Consumer<FieldElement> consumer) {
+    public void forEach(Consumer<? super FieldElement> consumer) {
         consumer.accept(flags());
         for (Attribute<?> attr : attributes()) {
             if (attr instanceof FieldElement e)
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/MethodImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/MethodImpl.java
index 3bc811634ee18..62a83dffc6e87 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/MethodImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/MethodImpl.java
@@ -122,7 +122,7 @@ public Optional<CodeModel> code() {
     }
 
     @Override
-    public void forEachElement(Consumer<MethodElement> consumer) {
+    public void forEach(Consumer<? super MethodElement> consumer) {
         consumer.accept(flags());
         for (Attribute<?> attr : attributes()) {
             if (attr instanceof MethodElement e)
@@ -140,7 +140,7 @@ public void writeTo(DirectClassBuilder builder) {
                                new Consumer<>() {
                 @Override
                 public void accept(MethodBuilder mb) {
-                    MethodImpl.this.forEachElement(mb);
+                    MethodImpl.this.forEach(mb);
                 }
             });
         }
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/FingerPrint.java b/src/jdk.jartool/share/classes/sun/tools/jar/FingerPrint.java
index b28078916c58b..beb97ae5fd8ff 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/FingerPrint.java
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/FingerPrint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -172,7 +172,7 @@ private static ClassAttributes getClassAttributes(byte[] bytes) {
                 cm.thisClass().asInternalName(),
                 cm.superclass().map(ClassEntry::asInternalName).orElse(null),
                 cm.majorVersion());
-        cm.forEachElement(attrs);
+        cm.forEach(attrs);
         return attrs;
     }
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java
index d8f5e689ca18c..5521336f93859 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java
@@ -222,7 +222,7 @@ boolean isEnabled() {
     // Only supports String, String[] and Boolean values
     private static <T> T annotationValue(ClassModel classModel, ClassDesc classDesc, Class<T> type) {
         String typeDescriptor = classDesc.descriptorString();
-        for (ClassElement ce : classModel.elements()) {
+        for (ClassElement ce : classModel) {
             if (ce instanceof RuntimeVisibleAnnotationsAttribute rvaa) {
                 for (Annotation a : rvaa.annotations()) {
                     if (a.className().equalsString(typeDescriptor)) {
@@ -260,7 +260,7 @@ private static List<SettingDesc> buildSettingDescs(Class<?> superClass, ClassMod
         Set<String> methodSet = new HashSet<>();
         List<SettingDesc> settingDescs = new ArrayList<>();
         for (MethodModel m : classModel.methods()) {
-            for (var me : m.elements()) {
+            for (var me : m) {
                 if (me instanceof RuntimeVisibleAnnotationsAttribute rvaa) {
                     for (Annotation a : rvaa.annotations()) {
                         // We can't really validate the method at this
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jimage/JImageTask.java b/src/jdk.jlink/share/classes/jdk/tools/jimage/JImageTask.java
index f128a84cc89bf..df2aca02d6888 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jimage/JImageTask.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jimage/JImageTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,6 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import java.lang.classfile.ClassModel;
 import java.lang.classfile.ClassFile;
 import java.lang.classfile.CodeModel;
 import java.lang.classfile.MethodModel;
@@ -368,9 +367,9 @@ void verify(BasicImageReader reader, String name, ImageLocation location) {
         if (name.endsWith(".class") && !name.endsWith("module-info.class")) {
             try {
                 byte[] bytes = reader.getResource(location);
-                ClassFile.of().parse(bytes).forEachElement(cle -> {
-                    if (cle instanceof MethodModel mm) mm.forEachElement(me -> {
-                        if (me instanceof CodeModel com) com.forEachElement(coe -> {
+                ClassFile.of().parse(bytes).forEach(cle -> {
+                    if (cle instanceof MethodModel mm) mm.forEach(me -> {
+                        if (me instanceof CodeModel com) com.forEach(coe -> {
                             //do nothing here, just visit each model element
                         });
                     });
diff --git a/test/jdk/java/lang/instrument/asmlib/Instrumentor.java b/test/jdk/java/lang/instrument/asmlib/Instrumentor.java
index 77893ed8a11b6..2a2e97b8a3726 100644
--- a/test/jdk/java/lang/instrument/asmlib/Instrumentor.java
+++ b/test/jdk/java/lang/instrument/asmlib/Instrumentor.java
@@ -133,7 +133,7 @@ public void atEnd(MethodBuilder mb) {
                         }
                     }));
 
-                    builder.withMethod(newName, mt, mm.flags().flagsMask(), mm::forEachElement);
+                    builder.withMethod(newName, mt, mm.flags().flagsMask(), mm::forEach);
                 } else {
                     builder.accept(element);
                 }
diff --git a/test/jdk/java/lang/invoke/8022701/MHIllegalAccess.java b/test/jdk/java/lang/invoke/8022701/MHIllegalAccess.java
index 0880985638d3f..896e29439e9e8 100644
--- a/test/jdk/java/lang/invoke/8022701/MHIllegalAccess.java
+++ b/test/jdk/java/lang/invoke/8022701/MHIllegalAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,7 +63,7 @@ public static void main(String[] args) throws Throwable {
        */
      ClassTransform changeName = (cb, ce) -> {
          if (ce instanceof MethodModel mm && mm.methodName().equalsString("m")) {
-             cb.withMethod("nemo", mm.methodTypeSymbol(), mm.flags().flagsMask(), mm::forEachElement);
+             cb.withMethod("nemo", mm.methodTypeSymbol(), mm.flags().flagsMask(), mm::forEach);
          } else {
              cb.accept(ce);
          }
diff --git a/test/jdk/java/lang/invoke/lambda/LambdaAsm.java b/test/jdk/java/lang/invoke/lambda/LambdaAsm.java
index 8369ea2bcd39b..76d091cc51dca 100644
--- a/test/jdk/java/lang/invoke/lambda/LambdaAsm.java
+++ b/test/jdk/java/lang/invoke/lambda/LambdaAsm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -100,7 +100,7 @@ static void emitCode() throws IOException {
 
     static void checkMethod(String cname, String mname, ConstantPool cp,
             CodeAttribute code) throws IllegalArgumentException {
-        for (var inst : code.elements()) {
+        for (var inst : code) {
             if (inst instanceof InvokeInstruction inv && (inv.opcode() == Opcode.INVOKESPECIAL
                     || inv.opcode() == Opcode.INVOKEINTERFACE)) {
                 var ref = inv.method();
diff --git a/test/jdk/jdk/classfile/AdaptCodeTest.java b/test/jdk/jdk/classfile/AdaptCodeTest.java
index 2b9dff588190a..ca9145d688521 100644
--- a/test/jdk/jdk/classfile/AdaptCodeTest.java
+++ b/test/jdk/jdk/classfile/AdaptCodeTest.java
@@ -114,7 +114,7 @@ void testSevenOfThirteenIterator() throws Exception {
     void testCopy() throws Exception {
         var cc = ClassFile.of();
         ClassModel cm = cc.parse(testClassPath);
-        byte[] newBytes = cc.build(cm.thisClass().asSymbol(), cb -> cm.forEachElement(cb));
+        byte[] newBytes = cc.build(cm.thisClass().asSymbol(), cm::forEach);
 //        TestUtil.writeClass(newBytes, "TestClass.class");
         String result = (String)
                 new ByteArrayClassLoader(AdaptCodeTest.class.getClassLoader(), testClassName, newBytes)
diff --git a/test/jdk/jdk/classfile/BasicBlockTest.java b/test/jdk/jdk/classfile/BasicBlockTest.java
index 9c4b931857e15..0781c5a10c1a6 100644
--- a/test/jdk/jdk/classfile/BasicBlockTest.java
+++ b/test/jdk/jdk/classfile/BasicBlockTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,7 +57,7 @@ void testPatternsCausingBasicBlockTroubles() throws IOException {
         try (InputStream in = BasicBlockTest.class.getResourceAsStream("BasicBlockTest.class")) {
             var cc = ClassFile.of();
             var classModel = cc.parse(in.readAllBytes());
-            cc.build(classModel.thisClass().asSymbol(), cb -> classModel.forEachElement(cb));
+            cc.build(classModel.thisClass().asSymbol(), classModel::forEach);
         }
     }
 }
diff --git a/test/jdk/jdk/classfile/ClassHierarchyInfoTest.java b/test/jdk/jdk/classfile/ClassHierarchyInfoTest.java
index 4065f1d5e2f9e..d4a9e3a429738 100644
--- a/test/jdk/jdk/classfile/ClassHierarchyInfoTest.java
+++ b/test/jdk/jdk/classfile/ClassHierarchyInfoTest.java
@@ -127,7 +127,7 @@ void transformAndVerifySingle(ClassHierarchyResolver res) throws Exception {
                     if (cle instanceof MethodModel mm) {
                         clb.transformMethod(mm, (mb, me) -> {
                             if (me instanceof CodeModel cm) {
-                                mb.withCode(cob -> cm.forEachElement(cob));
+                                mb.withCode(cm::forEach);
                             }
                             else
                                 mb.with(me);
diff --git a/test/jdk/jdk/classfile/CorpusTest.java b/test/jdk/jdk/classfile/CorpusTest.java
index 67a2ebabb31d2..2dfbef10d6709 100644
--- a/test/jdk/jdk/classfile/CorpusTest.java
+++ b/test/jdk/jdk/classfile/CorpusTest.java
@@ -200,7 +200,7 @@ void testNullAdaptations(Path path) throws Exception {
 
         byte[] newBytes = cc.build(
                 classModel.thisClass().asSymbol(),
-                classModel::forEachElement);
+                classModel::forEach);
         var newModel = cc.parse(newBytes);
         assertEqualsDeep(ClassRecord.ofClassModel(newModel, CompatibilityFilter.By_ClassBuilder),
                 ClassRecord.ofClassModel(classModel, CompatibilityFilter.By_ClassBuilder),
diff --git a/test/jdk/jdk/classfile/LvtTest.java b/test/jdk/jdk/classfile/LvtTest.java
index 7fb289cc175d0..3d7898097980f 100644
--- a/test/jdk/jdk/classfile/LvtTest.java
+++ b/test/jdk/jdk/classfile/LvtTest.java
@@ -88,7 +88,7 @@ void getLVTEntries() {
                         .orElseThrow();
 
         List<LocalVariable> lvs = new ArrayList<>();
-        co.forEachElement(e -> {
+        co.forEach(e -> {
             if (e instanceof LocalVariable l) lvs.add(l);
         });
 
@@ -198,7 +198,7 @@ void getLVTTEntries() {
                         .orElseThrow();
 
         List<LocalVariableType> lvts = new ArrayList<>();
-        co.forEachElement(e -> {
+        co.forEach(e -> {
             if (e instanceof LocalVariableType l) lvts.add(l);
         });
 
@@ -304,11 +304,11 @@ void testCreateLoadLVTT() throws Exception {
     void skipDebugSkipsLVT() {
         ClassModel c = ClassFile.of(ClassFile.DebugElementsOption.DROP_DEBUG).parse(fileBytes);
 
-        c.forEachElement(e -> {
+        c.forEach(e -> {
             if (e instanceof MethodModel m) {
-                m.forEachElement(el -> {
+                m.forEach(el -> {
                     if (el instanceof CodeModel cm) {
-                        cm.forEachElement(elem -> {
+                        cm.forEach(elem -> {
                             assertFalse(elem instanceof LocalVariable);
                             assertFalse(elem instanceof LocalVariableType);
                         });
diff --git a/test/jdk/jdk/classfile/OptionsTest.java b/test/jdk/jdk/classfile/OptionsTest.java
index 10e3855b06085..fda155cfd2a4b 100644
--- a/test/jdk/jdk/classfile/OptionsTest.java
+++ b/test/jdk/jdk/classfile/OptionsTest.java
@@ -117,6 +117,6 @@ void testNoUnstable(Path path, ClassFileElement e) {
         if (e instanceof AttributedElement ae) ae.attributes().forEach(a ->
                 assertTrue(AttributeMapper.AttributeStability.UNSTABLE.ordinal() >= a.attributeMapper().stability().ordinal(),
                            () -> "class " + path + " contains unexpected " + a));
-        if (e instanceof CompoundElement ce) ce.forEachElement(ee -> testNoUnstable(path, (ClassFileElement)ee));
+        if (e instanceof CompoundElement ce) ce.forEach(ee -> testNoUnstable(path, (ClassFileElement)ee));
     }
 }
diff --git a/test/jdk/jdk/classfile/StackMapsTest.java b/test/jdk/jdk/classfile/StackMapsTest.java
index 137f5bac48613..211490c3f8e75 100644
--- a/test/jdk/jdk/classfile/StackMapsTest.java
+++ b/test/jdk/jdk/classfile/StackMapsTest.java
@@ -270,7 +270,7 @@ private static void testTransformedStackMaps(byte[] originalBytes, ClassFile.Opt
 //                                                   classModel.superclass().ifPresent(cb::withSuperclass);
 //                                                   cb.withInterfaces(classModel.interfaces());
 //                                                   cb.withVersion(classModel.majorVersion(), classModel.minorVersion());
-                                                   classModel.forEachElement(cb);
+                                                   classModel.forEach(cb);
                                                });
 
         //then verify transformed bytecode
diff --git a/test/jdk/jdk/classfile/TestRecordComponent.java b/test/jdk/jdk/classfile/TestRecordComponent.java
index b39029154a022..7512e2e31677d 100644
--- a/test/jdk/jdk/classfile/TestRecordComponent.java
+++ b/test/jdk/jdk/classfile/TestRecordComponent.java
@@ -105,7 +105,7 @@ void testChagne() throws Exception {
     void testOptions() throws Exception {
         AtomicInteger count = new AtomicInteger(0);
         ClassModel cm = ClassFile.of().parse(Files.readAllBytes(testClassPath));
-        cm.forEachElement((ce) -> {
+        cm.forEach((ce) -> {
             if (ce instanceof RecordAttribute rm) {
                 count.addAndGet(rm.components().size());
             }});
diff --git a/test/jdk/jdk/classfile/VerifierSelfTest.java b/test/jdk/jdk/classfile/VerifierSelfTest.java
index 529edbf2b7961..26513a543357c 100644
--- a/test/jdk/jdk/classfile/VerifierSelfTest.java
+++ b/test/jdk/jdk/classfile/VerifierSelfTest.java
@@ -79,7 +79,7 @@ void testFailed() throws IOException {
                     if (cle instanceof MethodModel mm) {
                         clb.transformMethod(mm, (mb, me) -> {
                             if (me instanceof CodeModel cm) {
-                                mb.withCode(cob -> cm.forEachElement(cob));
+                                mb.withCode(cob -> cm.forEach(cob));
                             }
                             else
                                 mb.with(me);
diff --git a/test/jdk/jdk/classfile/helpers/RebuildingTransformation.java b/test/jdk/jdk/classfile/helpers/RebuildingTransformation.java
index 7905a79fd40bf..2af3cd9410fde 100644
--- a/test/jdk/jdk/classfile/helpers/RebuildingTransformation.java
+++ b/test/jdk/jdk/classfile/helpers/RebuildingTransformation.java
@@ -75,7 +75,7 @@ static byte[] transform(ClassModel clm) {
                                             cob2.transforming(new CodeRebuildingTransform(), cob3 ->
                                             // first pass transforms bound to unbound instructions
                                             cob3.transforming(new CodeRebuildingTransform(), cob4 -> {
-                                                com.forEachElement(cob4::with);
+                                                com.forEach(cob4::with);
                                                 com.findAttribute(Attributes.stackMapTable()).ifPresent(cob4::with);
                                             }))));
                                     case AnnotationDefaultAttribute a -> mb.with(AnnotationDefaultAttribute.of(transformAnnotationValue(a.defaultValue())));
diff --git a/test/jdk/jdk/classfile/helpers/Transforms.java b/test/jdk/jdk/classfile/helpers/Transforms.java
index 0b44c5a22aa48..c385fe61663ba 100644
--- a/test/jdk/jdk/classfile/helpers/Transforms.java
+++ b/test/jdk/jdk/classfile/helpers/Transforms.java
@@ -218,7 +218,7 @@ public enum InjectNopTransform {
                         if (me instanceof CodeModel xm) {
                             mb.withCode(xb -> {
                                 xb.nop();
-                                xm.forEachElement(new Consumer<>() {
+                                xm.forEach(new Consumer<>() {
                                     @Override
                                     public void accept(CodeElement e) {
                                         xb.with(e);
@@ -270,7 +270,7 @@ public void atEnd(ClassBuilder builder) {
             ClassModel cm = cc.parse(bytes);
             return cc.build(cm.thisClass().asSymbol(),
                                    cb -> {
-                                       cm.forEachElement(cb);
+                                       cm.forEach(cb);
                                        cb.withField("argleBargleWoogaWooga", ConstantDescs.CD_int, b -> { });
                                    });
         }),
@@ -301,7 +301,7 @@ public MethodVisitor visitMethod(int access, String name, String descriptor, Str
             ClassModel cm = cc.parse(bytes);
             return cc.build(cm.thisClass().asSymbol(),
                                    cb -> {
-                                       cm.forEachElement(element -> {
+                                       cm.forEach(element -> {
                                            if (element instanceof MethodModel mm
                                                && mm.methodName().stringValue().equals("hashCode")
                                                && mm.methodType().stringValue().equals("()Z")) {
diff --git a/test/jdk/jdk/jfr/event/compiler/TestCompilerInlining.java b/test/jdk/jdk/jfr/event/compiler/TestCompilerInlining.java
index 79b3fe11cb972..56005fa745832 100644
--- a/test/jdk/jdk/jfr/event/compiler/TestCompilerInlining.java
+++ b/test/jdk/jdk/jfr/event/compiler/TestCompilerInlining.java
@@ -390,7 +390,7 @@ private static Collection<Call> getCalls(Class<?> aClass) {
                         mm.methodTypeSymbol()
                 );
                 int offset = 0;
-                for (var ce : com.elements()) {
+                for (var ce : com) {
                     if (ce instanceof Instruction ins) {
                         if (ins instanceof InvokeInstruction inv) {
                             calls.add(new Call(caller, new MethodDesc(
diff --git a/test/micro/org/openjdk/bench/jdk/classfile/ReadDeep.java b/test/micro/org/openjdk/bench/jdk/classfile/ReadDeep.java
index 2f5e2cfbe1eda..4165785135cea 100644
--- a/test/micro/org/openjdk/bench/jdk/classfile/ReadDeep.java
+++ b/test/micro/org/openjdk/bench/jdk/classfile/ReadDeep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -101,11 +101,11 @@ public void jdkElementsCountLoads(Blackhole bh) {
         for (byte[] bytes : classes) {
             int[] count = new int[1];
             ClassModel cm = cc.parse(bytes);
-            cm.forEachElement(ce -> {
+            cm.forEach(ce -> {
                 if (ce instanceof MethodModel mm) {
-                    mm.forEachElement(me -> {
+                    mm.forEach(me -> {
                         if (me instanceof CodeModel xm) {
-                            xm.forEachElement(xe -> {
+                            xm.forEach(xe -> {
                                 if (xe instanceof LoadInstruction) {
                                     ++count[0];
                                 }
diff --git a/test/micro/org/openjdk/bench/jdk/classfile/Transforms.java b/test/micro/org/openjdk/bench/jdk/classfile/Transforms.java
index d49897dc9c2a0..e4d553c268f3c 100644
--- a/test/micro/org/openjdk/bench/jdk/classfile/Transforms.java
+++ b/test/micro/org/openjdk/bench/jdk/classfile/Transforms.java
@@ -204,7 +204,7 @@ public enum InjectNopTransform {
                         if (me instanceof CodeModel xm) {
                             mb.withCode(xb -> {
                                 xb.nop();
-                                xm.forEachElement(new Consumer<>() {
+                                xm.forEach(new Consumer<>() {
                                     @Override
                                     public void accept(CodeElement e) {
                                         xb.with(e);
@@ -256,7 +256,7 @@ public void atEnd(ClassBuilder builder) {
             ClassModel cm = cc.parse(bytes);
             return cc.build(cm.thisClass().asSymbol(),
                                    cb -> {
-                                       cm.forEachElement(cb);
+                                       cm.forEach(cb);
                                        cb.withField("argleBargleWoogaWooga", ConstantDescs.CD_int, b -> { });
                                    });
         }),
@@ -287,7 +287,7 @@ public MethodVisitor visitMethod(int access, String name, String descriptor, Str
             ClassModel cm = cc.parse(bytes);
             return cc.build(cm.thisClass().asSymbol(),
                                    cb -> {
-                                       cm.forEachElement(element -> {
+                                       cm.forEach(element -> {
                                            if (element instanceof MethodModel mm
                                                && mm.methodName().stringValue().equals("hashCode")
                                                && mm.methodType().stringValue().equals("()Z")) {

From 3f2636d9b71f5270c83d17dcf5d18cf907978475 Mon Sep 17 00:00:00 2001
From: Adam Sotona <asotona@openjdk.org>
Date: Mon, 15 Jul 2024 05:41:52 +0000
Subject: [PATCH 083/401] 8335820:
 java/lang/invoke/LFCaching/LFSingleThreadCachingTest.java fails due to
 IllegalArgumentException: hash must be nonzero

Reviewed-by: liach
---
 .../classfile/impl/AbstractPoolEntry.java     | 13 ++--
 .../impl/BootstrapMethodEntryImpl.java        |  6 +-
 .../classfile/impl/BoundAttribute.java        | 72 +++++++++----------
 test/jdk/jdk/classfile/LimitsTest.java        |  9 ++-
 4 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
index a494c21085c43..f846ca6fa9011 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
@@ -68,24 +68,19 @@ public abstract sealed class AbstractPoolEntry {
      */
 
     private static final int TAG_SMEAR = 0x13C4B2D1;
-    private static final int INT_PHI = 0x9E3779B9;
+    static final int NON_ZERO = 0x40000000;
 
     public static int hash1(int tag, int x1) {
-        return phiMix(tag * TAG_SMEAR + x1);
+        return (tag * TAG_SMEAR + x1) | NON_ZERO;
     }
 
     public static int hash2(int tag, int x1, int x2) {
-        return phiMix(tag * TAG_SMEAR + x1 + 31*x2);
+        return (tag * TAG_SMEAR + x1 + 31 * x2) | NON_ZERO;
     }
 
     // Ensure that hash is never zero
     public static int hashString(int stringHash) {
-        return phiMix(stringHash | (1 << 30));
-    }
-
-    public static int phiMix(int x) {
-        int h = x * INT_PHI;
-        return h ^ (h >> 16);
+        return stringHash | NON_ZERO;
     }
 
     public static Utf8Entry rawUtf8EntryFromStandardAttributeName(String name) {
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BootstrapMethodEntryImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BootstrapMethodEntryImpl.java
index 3d15f097b1325..d6876a82a9c2b 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BootstrapMethodEntryImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BootstrapMethodEntryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -76,9 +76,7 @@ public boolean equals(Object obj) {
 
     static int computeHashCode(MethodHandleEntryImpl handle,
                                List<? extends LoadableConstantEntry> arguments) {
-        int hash = handle.hashCode();
-        hash = 31 * hash + arguments.hashCode();
-        return AbstractPoolEntry.phiMix(hash);
+        return (31 * handle.hashCode() + arguments.hashCode()) | AbstractPoolEntry.NON_ZERO;
     }
 
     @Override
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java
index 21a01becec2d4..4d03c6a232763 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java
@@ -987,77 +987,77 @@ public byte[] codeArray() {
     public static AttributeMapper<?> standardAttribute(Utf8Entry name) {
         // critical bootstrap path, so no lambdas nor method handles here
         return switch (name.hashCode()) {
-            case 0x78147009 ->
+            case 0x46699ff2 ->
                 name.equalsString(NAME_ANNOTATION_DEFAULT) ? annotationDefault() : null;
-            case 0x665e3a3a ->
+            case 0x5208e184 ->
                 name.equalsString(NAME_BOOTSTRAP_METHODS) ? bootstrapMethods() : null;
-            case 0xcb7e162 ->
+            case 0xcb60907a ->
                 name.equalsString(NAME_CHARACTER_RANGE_TABLE) ? characterRangeTable() : null;
-            case 0x21e41e7e ->
+            case 0x4020220d ->
                 name.equalsString(NAME_CODE) ? code() : null;
-            case 0x5a306b41 ->
+            case 0xc20dd1fe ->
                 name.equalsString(NAME_COMPILATION_ID) ? compilationId() : null;
-            case 0x3e191c7c ->
+            case 0xcab1940d ->
                 name.equalsString(NAME_CONSTANT_VALUE) ? constantValue() : null;
-            case 0x5e88ed0c ->
+            case 0x558641d3 ->
                 name.equalsString(NAME_DEPRECATED) ? deprecated() : null;
-            case 0x7284695e ->
+            case 0x51d443cd ->
                 name.equalsString(NAME_ENCLOSING_METHOD) ? enclosingMethod() : null;
-            case 0x21df25db ->
+            case 0x687c1624 ->
                 name.equalsString(NAME_EXCEPTIONS) ? exceptions() : null;
-            case 0x11392da9 ->
+            case 0x7adb2910 ->
                 name.equalsString(NAME_INNER_CLASSES) ? innerClasses() : null;
-            case 0x167536fc ->
+            case 0x653f0551 ->
                 name.equalsString(NAME_LINE_NUMBER_TABLE) ? lineNumberTable() : null;
-            case 0x46939abc ->
+            case 0x64c75927 ->
                 name.equalsString(NAME_LOCAL_VARIABLE_TABLE) ? localVariableTable() : null;
-            case 0x63ee67f4 ->
+            case 0x6697f98d ->
                 name.equalsString(NAME_LOCAL_VARIABLE_TYPE_TABLE) ? localVariableTypeTable() : null;
-            case 0x2b597e15 ->
+            case 0xdbb0cdcb ->
                 name.equalsString(NAME_METHOD_PARAMETERS) ? methodParameters() : null;
-            case 0x19f20ade ->
+            case 0xc9b0928c ->
                 name.equalsString(NAME_MODULE) ? module() : null;
-            case 0x47f6395e ->
+            case 0x41cd27e8 ->
                 name.equalsString(NAME_MODULE_HASHES) ? moduleHashes() : null;
-            case 0x54db809 ->
+            case 0x7deb0a13 ->
                 name.equalsString(NAME_MODULE_MAIN_CLASS) ? moduleMainClass() : null;
-            case 0x1abd1c2c ->
+            case 0x6706ff99 ->
                 name.equalsString(NAME_MODULE_PACKAGES) ? modulePackages() : null;
-            case 0x6ba46dd ->
+            case 0x60272858 ->
                 name.equalsString(NAME_MODULE_RESOLUTION) ? moduleResolution() : null;
-            case 0x46f7d91d ->
+            case 0x5646d73d ->
                 name.equalsString(NAME_MODULE_TARGET) ? moduleTarget() : null;
-            case 0x5137f53 ->
+            case 0x50336c40 ->
                 name.equalsString(NAME_NEST_HOST) ? nestHost() : null;
-            case 0x4a8fa3b6 ->
+            case 0x4735ab81 ->
                 name.equalsString(NAME_NEST_MEMBERS) ? nestMembers() : null;
-            case 0x55c73cb6 ->
+            case 0x7100d9fe ->
                 name.equalsString(NAME_PERMITTED_SUBCLASSES) ? permittedSubclasses() : null;
-            case 0x3fe76d4e ->
+            case 0xd1ab5871 ->
                 name.equalsString(NAME_RECORD) ? record() : null;
-            case 0x180d6925 ->
+            case 0x7588550f ->
                 name.equalsString(NAME_RUNTIME_INVISIBLE_ANNOTATIONS) ? runtimeInvisibleAnnotations() : null;
-            case 0x7be22752 ->
+            case 0xcc74da30 ->
                 name.equalsString(NAME_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS) ? runtimeInvisibleParameterAnnotations() : null;
-            case 0x5299824 ->
+            case 0xf67697f5 ->
                 name.equalsString(NAME_RUNTIME_INVISIBLE_TYPE_ANNOTATIONS) ? runtimeInvisibleTypeAnnotations() : null;
-            case 0x3534786e ->
+            case 0xe0837d2a ->
                 name.equalsString(NAME_RUNTIME_VISIBLE_ANNOTATIONS) ? runtimeVisibleAnnotations() : null;
-            case 0xb4b4ac6 ->
+            case 0xc945a075 ->
                 name.equalsString(NAME_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS) ? runtimeVisibleParameterAnnotations() : null;
-            case 0x6926482 ->
+            case 0x611a3a90 ->
                 name.equalsString(NAME_RUNTIME_VISIBLE_TYPE_ANNOTATIONS) ? runtimeVisibleTypeAnnotations() : null;
-            case 0x16a42b7c ->
+            case 0xf76fb898 ->
                 name.equalsString(NAME_SIGNATURE) ? signature() : null;
-            case 0x400ab245 ->
+            case 0x6b41b047 ->
                 name.equalsString(NAME_SOURCE_DEBUG_EXTENSION) ? sourceDebugExtension() : null;
-            case 0x2af490d4 ->
+            case 0x748c2857 ->
                 name.equalsString(NAME_SOURCE_FILE) ? sourceFile() : null;
-            case 0x303e0c58 ->
+            case 0x6bf13a96 ->
                 name.equalsString(NAME_SOURCE_ID) ? sourceId() : null;
-            case 0x19c7d0cd ->
+            case 0xfa85ee5a ->
                 name.equalsString(NAME_STACK_MAP_TABLE) ? stackMapTable() : null;
-            case 0x3dc79b7a ->
+            case 0xf2670725 ->
                 name.equalsString(NAME_SYNTHETIC) ? synthetic() : null;
             default -> null;
         };
diff --git a/test/jdk/jdk/classfile/LimitsTest.java b/test/jdk/jdk/classfile/LimitsTest.java
index 40ae8a5fb1f67..442707ecd1700 100644
--- a/test/jdk/jdk/classfile/LimitsTest.java
+++ b/test/jdk/jdk/classfile/LimitsTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8320360 8330684 8331320 8331655 8331940 8332486
+ * @bug 8320360 8330684 8331320 8331655 8331940 8332486 8335820
  * @summary Testing ClassFile limits.
  * @run junit LimitsTest
  */
@@ -39,6 +39,7 @@
 import java.lang.classfile.attribute.LineNumberTableAttribute;
 import java.lang.classfile.attribute.LocalVariableInfo;
 import java.lang.classfile.attribute.LocalVariableTableAttribute;
+import java.lang.classfile.constantpool.ConstantPoolBuilder;
 import java.lang.classfile.constantpool.ConstantPoolException;
 import java.lang.classfile.constantpool.IntegerEntry;
 import java.lang.classfile.instruction.LocalVariable;
@@ -190,4 +191,10 @@ void testLocalVariableOutOfBounds() {
                                         cob.constantPool().utf8Entry("a"), cob.constantPool().utf8Entry("A"), 0))))
                 ))).methods().get(0).code().get().elementList());
     }
+
+    @Test
+    void testZeroHashCPEntry() {
+        var cpb = ConstantPoolBuilder.of();
+        cpb.intEntry(-cpb.intEntry(0).hashCode());
+    }
 }

From a96de6d8d273d75a6500e10ed06faab9955f893b Mon Sep 17 00:00:00 2001
From: Richard Reingruber <rrich@openjdk.org>
Date: Mon, 15 Jul 2024 07:34:10 +0000
Subject: [PATCH 084/401] 8336256: memcpy short value to int local is incorrect
 in VtableStubs::unsafe_hash

Reviewed-by: stuefe, shade, kvn
---
 src/hotspot/share/code/vtableStubs.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/code/vtableStubs.cpp b/src/hotspot/share/code/vtableStubs.cpp
index a65852e247fae..dbae8b8694f5e 100644
--- a/src/hotspot/share/code/vtableStubs.cpp
+++ b/src/hotspot/share/code/vtableStubs.cpp
@@ -262,7 +262,8 @@ inline uint VtableStubs::unsafe_hash(address entry_point) {
   address vtable_type_addr = vtable_stub_addr + offset_of(VtableStub, _type);
   address vtable_index_addr = vtable_stub_addr + offset_of(VtableStub, _index);
   bool is_vtable_stub = *vtable_type_addr == static_cast<uint8_t>(VtableStub::Type::vtable_stub);
-  int vtable_index;
+  short vtable_index;
+  static_assert(sizeof(VtableStub::_index) == sizeof(vtable_index), "precondition");
   memcpy(&vtable_index, vtable_index_addr, sizeof(vtable_index));
   return hash(is_vtable_stub, vtable_index);
 }

From 2b0adfc2decf47f6f49f072549c96f301f275285 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Mon, 15 Jul 2024 11:26:33 +0000
Subject: [PATCH 085/401] 8335817: javac AssertionError addLocalVar checkNull

Reviewed-by: vromero, mcimadamore
---
 .../sun/tools/javac/comp/TransPatterns.java   |   9 +-
 .../MatchExceptionLambdaExpression.java       | 150 ++++++++++++++++++
 2 files changed, 157 insertions(+), 2 deletions(-)
 create mode 100644 test/langtools/tools/javac/patterns/MatchExceptionLambdaExpression.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
index aed7b3265f807..2d522d01641f5 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -78,6 +78,7 @@
 import com.sun.tools.javac.code.Symbol.RecordComponent;
 import com.sun.tools.javac.code.Type;
 import static com.sun.tools.javac.code.TypeTag.BOT;
+import static com.sun.tools.javac.code.TypeTag.VOID;
 import com.sun.tools.javac.jvm.PoolConstant.LoadableConstant;
 import com.sun.tools.javac.jvm.Target;
 import com.sun.tools.javac.tree.JCTree;
@@ -1260,7 +1261,11 @@ public void visitLambda(JCLambda tree) {
                 tree.body = translate(tree.body);
                 if (deconstructorCalls != null) {
                     if (tree.body instanceof JCExpression value) {
-                        tree.body = make.Block(0, List.of(make.Return(value)));
+                        if (value.type.hasTag(VOID)) {
+                            tree.body = make.Block(0, List.of(make.Exec(value)));
+                        } else {
+                            tree.body = make.Block(0, List.of(make.Return(value)));
+                        }
                     }
                     if (tree.body instanceof JCBlock block) {
                         preparePatternMatchingCatchIfNeeded(block);
diff --git a/test/langtools/tools/javac/patterns/MatchExceptionLambdaExpression.java b/test/langtools/tools/javac/patterns/MatchExceptionLambdaExpression.java
new file mode 100644
index 0000000000000..f42564dab4094
--- /dev/null
+++ b/test/langtools/tools/javac/patterns/MatchExceptionLambdaExpression.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 8335817
+ * @summary Verify synthetic catches for deconstruction patterns work properly in expression lambdas
+ * @compile MatchExceptionLambdaExpression.java
+ * @run main MatchExceptionLambdaExpression
+ */
+public class MatchExceptionLambdaExpression {
+
+    public static void main(String[] args) {
+        try {
+            doRunPrimitiveVoid(new A("", true), o -> checkPrimitiveVoid(o instanceof A(String s, _), true));
+            throw new AssertionError("Didn't gete the expected exception!");
+        } catch (MatchException ex) {
+            if (ex.getCause() instanceof RequestedException) {
+                //correct
+            } else {
+                throw ex;
+            }
+        }
+        try {
+            doRunPrimitiveVoid(new A("", true), o -> checkVoidBox(o instanceof A(String s, _), true));
+            throw new AssertionError("Didn't gete the expected exception!");
+        } catch (MatchException ex) {
+            if (ex.getCause() instanceof RequestedException) {
+                //correct
+            } else {
+                throw ex;
+            }
+        }
+        try {
+            doRunPrimitiveVoid(new A("", true), o -> checkNonVoid(o instanceof A(String s, _), true));
+            throw new AssertionError("Didn't gete the expected exception!");
+        } catch (MatchException ex) {
+            if (ex.getCause() instanceof RequestedException) {
+                //correct
+            } else {
+                throw ex;
+            }
+        }
+        try {
+            doRunVoidBox(new A("", true), o -> checkVoidBox(o instanceof A(String s, _), true));
+            throw new AssertionError("Didn't gete the expected exception!");
+        } catch (MatchException ex) {
+            if (ex.getCause() instanceof RequestedException) {
+                //correct
+            } else {
+                throw ex;
+            }
+        }
+        try {
+            doRunNonVoid(new A("", true), o -> checkVoidBox(o instanceof A(String s, _), true));
+            throw new AssertionError("Didn't gete the expected exception!");
+        } catch (MatchException ex) {
+            if (ex.getCause() instanceof RequestedException) {
+                //correct
+            } else {
+                throw ex;
+            }
+        }
+        try {
+            doRunNonVoid(new A("", true), o -> checkNonVoid(o instanceof A(String s, _), true));
+            throw new AssertionError("Didn't gete the expected exception!");
+        } catch (MatchException ex) {
+            if (ex.getCause() instanceof RequestedException) {
+                //correct
+            } else {
+                throw ex;
+            }
+        }
+    }
+
+    static void doRunPrimitiveVoid(Object inp, PrimitiveVoidFI toRun) {
+       toRun.run(inp);
+    }
+
+    static void doRunVoidBox(Object inp, VoidBoxFI toRun) {
+       toRun.run(inp);
+    }
+
+    static void doRunNonVoid(Object inp, NonVoidFI toRun) {
+       toRun.run(inp);
+    }
+
+    static void checkPrimitiveVoid(boolean a, boolean shouldNotBeCalled) {
+        if (shouldNotBeCalled) {
+            throw new AssertionError("Should not be called.");
+        }
+    }
+
+    static Void checkVoidBox(boolean a, boolean shouldNotBeCalled) {
+        if (shouldNotBeCalled) {
+            throw new AssertionError("Should not be called.");
+        }
+        return null;
+    }
+
+    static Object checkNonVoid(boolean a, boolean shouldNotBeCalled) {
+        if (shouldNotBeCalled) {
+            throw new AssertionError("Should not be called.");
+        }
+        return null;
+    }
+
+    interface PrimitiveVoidFI {
+        public void run(Object o);
+    }
+
+    interface VoidBoxFI {
+        public Void run(Object o);
+    }
+
+    interface NonVoidFI {
+        public Object run(Object o);
+    }
+
+    record A(String s, boolean fail) {
+        public String s() {
+            if (fail) {
+                throw new RequestedException();
+            }
+            return s;
+        }
+    }
+
+    static class RequestedException extends RuntimeException {}
+}

From a253e0ff4b88541d01596b0e73ede4b96a258fca Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Mon, 15 Jul 2024 12:11:53 +0000
Subject: [PATCH 086/401] 8335642: Hide Transform implementation for Class-File
 API

Reviewed-by: asotona
---
 .../java/lang/classfile/ClassFileBuilder.java | 17 ++--
 .../lang/classfile/ClassFileTransform.java    | 45 +----------
 .../java/lang/classfile/ClassTransform.java   | 13 +---
 .../java/lang/classfile/CodeBuilder.java      |  3 +-
 .../java/lang/classfile/CodeTransform.java    | 13 +---
 .../java/lang/classfile/FieldTransform.java   | 13 +---
 .../java/lang/classfile/MethodTransform.java  | 13 +---
 .../classfile/impl/AbstractDirectBuilder.java |  7 +-
 .../classfile/impl/TransformImpl.java         | 78 +++++++++++--------
 9 files changed, 66 insertions(+), 136 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/classfile/ClassFileBuilder.java b/src/java.base/share/classes/java/lang/classfile/ClassFileBuilder.java
index b4993976ecd12..56a2088370c6b 100644
--- a/src/java.base/share/classes/java/lang/classfile/ClassFileBuilder.java
+++ b/src/java.base/share/classes/java/lang/classfile/ClassFileBuilder.java
@@ -27,8 +27,9 @@
 import java.lang.constant.ClassDesc;
 import java.util.function.Consumer;
 
-import java.lang.classfile.constantpool.ConstantPool;
 import java.lang.classfile.constantpool.ConstantPoolBuilder;
+
+import jdk.internal.classfile.impl.TransformImpl;
 import jdk.internal.javac.PreviewFeature;
 
 /**
@@ -71,25 +72,19 @@ default void accept(E e) {
      */
     ConstantPoolBuilder constantPool();
 
-    /**
-     * {@return whether the provided constant pool is compatible with this builder}
-     * @param source the constant pool to test compatibility with
-     */
-    default boolean canWriteDirect(ConstantPool source) {
-        return constantPool().canWriteDirect(source);
-    }
-
     /**
      * Apply a transform to a model, directing results to this builder.
      * @param model the model to transform
      * @param transform the transform to apply
+     * @return this builder
      */
-    default void transform(CompoundElement<E> model, ClassFileTransform<?, E, B> transform) {
+    default B transform(CompoundElement<E> model, ClassFileTransform<?, E, B> transform) {
         @SuppressWarnings("unchecked")
         B builder = (B) this;
-        var resolved = transform.resolve(builder);
+        var resolved = TransformImpl.resolve(transform, builder);
         resolved.startHandler().run();
         model.forEach(resolved.consumer());
         resolved.endHandler().run();
+        return builder;
     }
 }
diff --git a/src/java.base/share/classes/java/lang/classfile/ClassFileTransform.java b/src/java.base/share/classes/java/lang/classfile/ClassFileTransform.java
index f67da06a36de0..851f4deb03e92 100644
--- a/src/java.base/share/classes/java/lang/classfile/ClassFileTransform.java
+++ b/src/java.base/share/classes/java/lang/classfile/ClassFileTransform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,6 @@
  */
 package java.lang.classfile;
 
-import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 import java.lang.classfile.attribute.RuntimeVisibleAnnotationsAttribute;
@@ -124,46 +123,4 @@ default void atStart(B builder) {
      * @return the chained transform
      */
     C andThen(C next);
-
-    /**
-     * The result of binding a transform to a builder.  Used primarily within
-     * the implementation to perform transformation.
-     *
-     * @param <E> the element type
-     *
-     * @since 22
-     */
-    @PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
-    interface ResolvedTransform<E extends ClassFileElement> {
-        /**
-         * {@return a {@link Consumer} to receive elements}
-         */
-        Consumer<E> consumer();
-
-        /**
-         * {@return an action to call at the end of transformation}
-         */
-        Runnable endHandler();
-
-        /**
-         * {@return an action to call at the start of transformation}
-         */
-        Runnable startHandler();
-    }
-
-    /**
-     * Bind a transform to a builder.  If the transform is chained, intermediate
-     * builders are created for each chain link.  If the transform is stateful
-     * (see, e.g., {@link ClassTransform#ofStateful(Supplier)}), the supplier is
-     * invoked to get a fresh transform object.
-     *
-     * <p>This method is a low-level method that should rarely be used by
-     * user code; most of the time, user code should prefer
-     * {@link ClassFileBuilder#transform(CompoundElement, ClassFileTransform)},
-     * which resolves the transform and executes it on the current builder.
-     *
-     * @param builder the builder to bind to
-     * @return the bound result
-     */
-    ResolvedTransform<E> resolve(B builder);
 }
diff --git a/src/java.base/share/classes/java/lang/classfile/ClassTransform.java b/src/java.base/share/classes/java/lang/classfile/ClassTransform.java
index a2391b320f909..743a39851148a 100644
--- a/src/java.base/share/classes/java/lang/classfile/ClassTransform.java
+++ b/src/java.base/share/classes/java/lang/classfile/ClassTransform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -171,15 +171,4 @@ static ClassTransform transformingFields(FieldTransform xform) {
     default ClassTransform andThen(ClassTransform t) {
         return new TransformImpl.ChainedClassTransform(this, t);
     }
-
-    /**
-     * @implSpec The default implementation returns a resolved transform bound
-     *           to the given class builder.
-     */
-    @Override
-    default ResolvedTransform<ClassElement> resolve(ClassBuilder builder) {
-        return new TransformImpl.ResolvedTransformImpl<>(e -> accept(builder, e),
-                                                         () -> atEnd(builder),
-                                                         () -> atStart(builder));
-    }
 }
diff --git a/src/java.base/share/classes/java/lang/classfile/CodeBuilder.java b/src/java.base/share/classes/java/lang/classfile/CodeBuilder.java
index a166637509174..dffa9c7f89a85 100644
--- a/src/java.base/share/classes/java/lang/classfile/CodeBuilder.java
+++ b/src/java.base/share/classes/java/lang/classfile/CodeBuilder.java
@@ -87,6 +87,7 @@
 import static java.util.Objects.requireNonNull;
 import static jdk.internal.classfile.impl.BytecodeHelpers.handleDescToHandleInfo;
 
+import jdk.internal.classfile.impl.TransformImpl;
 import jdk.internal.javac.PreviewFeature;
 
 /**
@@ -190,7 +191,7 @@ public sealed interface CodeBuilder
      * @return this builder
      */
     default CodeBuilder transforming(CodeTransform transform, Consumer<CodeBuilder> handler) {
-        var resolved = transform.resolve(this);
+        var resolved = TransformImpl.resolve(transform, this);
         resolved.startHandler().run();
         handler.accept(new ChainedCodeBuilder(this, resolved.consumer()));
         resolved.endHandler().run();
diff --git a/src/java.base/share/classes/java/lang/classfile/CodeTransform.java b/src/java.base/share/classes/java/lang/classfile/CodeTransform.java
index a0996a9cb3403..cdc7a3b1434d7 100644
--- a/src/java.base/share/classes/java/lang/classfile/CodeTransform.java
+++ b/src/java.base/share/classes/java/lang/classfile/CodeTransform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -96,15 +96,4 @@ public void atEnd(CodeBuilder builder) {
     default CodeTransform andThen(CodeTransform t) {
         return new TransformImpl.ChainedCodeTransform(this, t);
     }
-
-    /**
-     * @implSpec The default implementation returns a resolved transform bound
-     *           to the given code builder.
-     */
-    @Override
-    default ResolvedTransform<CodeElement> resolve(CodeBuilder builder) {
-        return new TransformImpl.ResolvedTransformImpl<>(e -> accept(builder, e),
-                                                         () -> atEnd(builder),
-                                                         () -> atStart(builder));
-    }
 }
diff --git a/src/java.base/share/classes/java/lang/classfile/FieldTransform.java b/src/java.base/share/classes/java/lang/classfile/FieldTransform.java
index 1a27a1d6ee6fb..4e39f1e9c7fec 100644
--- a/src/java.base/share/classes/java/lang/classfile/FieldTransform.java
+++ b/src/java.base/share/classes/java/lang/classfile/FieldTransform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -111,15 +111,4 @@ static FieldTransform dropping(Predicate<FieldElement> filter) {
     default FieldTransform andThen(FieldTransform t) {
         return new TransformImpl.ChainedFieldTransform(this, t);
     }
-
-    /**
-     * @implSpec The default implementation returns a resolved transform bound
-     *           to the given field builder.
-     */
-    @Override
-    default ResolvedTransform<FieldElement> resolve(FieldBuilder builder) {
-        return new TransformImpl.ResolvedTransformImpl<>(e -> accept(builder, e),
-                                                         () -> atEnd(builder),
-                                                         () -> atStart(builder));
-    }
 }
diff --git a/src/java.base/share/classes/java/lang/classfile/MethodTransform.java b/src/java.base/share/classes/java/lang/classfile/MethodTransform.java
index 829ca041c5a82..e7e024ebc3467 100644
--- a/src/java.base/share/classes/java/lang/classfile/MethodTransform.java
+++ b/src/java.base/share/classes/java/lang/classfile/MethodTransform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -111,17 +111,6 @@ static MethodTransform transformingCode(CodeTransform xform) {
         return new TransformImpl.MethodCodeTransform(xform);
     }
 
-    /**
-     * @implSpec The default implementation returns a resolved transform bound
-     *           to the given method builder.
-     */
-    @Override
-    default ResolvedTransform<MethodElement> resolve(MethodBuilder builder) {
-        return new TransformImpl.ResolvedTransformImpl<>(e -> accept(builder, e),
-                                                         () -> atEnd(builder),
-                                                         () -> atStart(builder));
-    }
-
     /**
      * @implSpec
      * The default implementation returns this method transform chained with another
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractDirectBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractDirectBuilder.java
index 13c2a5fb745b6..2feba5f9e0bb2 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractDirectBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractDirectBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
  */
 package jdk.internal.classfile.impl;
 
+import java.lang.classfile.constantpool.ConstantPool;
 import java.util.Optional;
 
 import java.lang.classfile.Attribute;
@@ -43,6 +44,10 @@ public SplitConstantPool constantPool() {
         return constantPool;
     }
 
+    public boolean canWriteDirect(ConstantPool source) {
+        return constantPool().canWriteDirect(source);
+    }
+
     public Optional<M> original() {
         return Optional.ofNullable(original);
     }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/TransformImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/TransformImpl.java
index 1677d421be9cd..4075f2096668d 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/TransformImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/TransformImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,8 @@
  */
 package jdk.internal.classfile.impl;
 
+import java.lang.classfile.ClassFileBuilder;
+import java.lang.classfile.ClassFileTransform;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
@@ -32,7 +34,6 @@
 import java.lang.classfile.ClassElement;
 import java.lang.classfile.ClassTransform;
 import java.lang.classfile.ClassFileElement;
-import java.lang.classfile.ClassFileTransform;
 import java.lang.classfile.CodeBuilder;
 import java.lang.classfile.CodeElement;
 import java.lang.classfile.CodeModel;
@@ -46,7 +47,7 @@
 import java.lang.classfile.MethodModel;
 import java.lang.classfile.MethodTransform;
 
-public class TransformImpl {
+public final class TransformImpl {
     // ClassTransform
 
     private TransformImpl() {
@@ -58,7 +59,23 @@ private static Runnable chainRunnable(Runnable a, Runnable b) {
 
     private static final Runnable NOTHING = () -> { };
 
-    interface UnresolvedClassTransform extends ClassTransform {
+    public static <E extends ClassFileElement, B extends ClassFileBuilder<E, B>>
+            ResolvedTransform<E> resolve(ClassFileTransform<?, E, B> transform, B builder) {
+        if (transform instanceof ResolvableTransform) {
+            @SuppressWarnings("unchecked")
+            var ut = (ResolvableTransform<E, B>) transform;
+            return ut.resolve(builder);
+        }
+        return new ResolvedTransform<>(e -> transform.accept(builder, e),
+            () -> transform.atEnd(builder),
+            () -> transform.atStart(builder));
+    }
+
+    interface ResolvableTransform<E extends ClassFileElement, B extends ClassFileBuilder<E, B>> {
+        ResolvedTransform<E> resolve(B builder);
+    }
+
+    interface UnresolvedClassTransform extends ClassTransform, ResolvableTransform<ClassElement, ClassBuilder> {
         @Override
         default void accept(ClassBuilder builder, ClassElement element) {
             throw new UnsupportedOperationException("transforms must be resolved before running");
@@ -75,12 +92,11 @@ default void atStart(ClassBuilder builder) {
         }
     }
 
-    public record ResolvedTransformImpl<E extends ClassFileElement>(Consumer<E> consumer,
+    public record ResolvedTransform<E extends ClassFileElement>(Consumer<E> consumer,
                                      Runnable endHandler,
-                                     Runnable startHandler)
-            implements ClassFileTransform.ResolvedTransform<E> {
+                                     Runnable startHandler) {
 
-        public ResolvedTransformImpl(Consumer<E> consumer) {
+        public ResolvedTransform(Consumer<E> consumer) {
             this(consumer, NOTHING, NOTHING);
         }
     }
@@ -89,11 +105,11 @@ public record ChainedClassTransform(ClassTransform t,
                                         ClassTransform next)
             implements UnresolvedClassTransform {
         @Override
-        public ResolvedTransformImpl<ClassElement> resolve(ClassBuilder builder) {
-            ResolvedTransform<ClassElement> downstream = next.resolve(builder);
+        public ResolvedTransform<ClassElement> resolve(ClassBuilder builder) {
+            ResolvedTransform<ClassElement> downstream = TransformImpl.resolve(next, builder);
             ClassBuilder chainedBuilder = new ChainedClassBuilder(builder, downstream.consumer());
-            ResolvedTransform<ClassElement> upstream = t.resolve(chainedBuilder);
-            return new ResolvedTransformImpl<>(upstream.consumer(),
+            ResolvedTransform<ClassElement> upstream = TransformImpl.resolve(t, chainedBuilder);
+            return new ResolvedTransform<>(upstream.consumer(),
                                           chainRunnable(upstream.endHandler(), downstream.endHandler()),
                                           chainRunnable(upstream.startHandler(), downstream.startHandler()));
         }
@@ -103,7 +119,7 @@ public record SupplierClassTransform(Supplier<ClassTransform> supplier)
             implements UnresolvedClassTransform {
         @Override
         public ResolvedTransform<ClassElement> resolve(ClassBuilder builder) {
-            return supplier.get().resolve(builder);
+            return TransformImpl.resolve(supplier.get(), builder);
         }
     }
 
@@ -112,7 +128,7 @@ public record ClassMethodTransform(MethodTransform transform,
             implements UnresolvedClassTransform {
         @Override
         public ResolvedTransform<ClassElement> resolve(ClassBuilder builder) {
-            return new ResolvedTransformImpl<>(ce -> {
+            return new ResolvedTransform<>(ce -> {
                 if (ce instanceof MethodModel mm && filter.test(mm))
                     builder.transformMethod(mm, transform);
                 else
@@ -135,7 +151,7 @@ public record ClassFieldTransform(FieldTransform transform,
             implements UnresolvedClassTransform {
         @Override
         public ResolvedTransform<ClassElement> resolve(ClassBuilder builder) {
-            return new ResolvedTransformImpl<>(ce -> {
+            return new ResolvedTransform<>(ce -> {
                 if (ce instanceof FieldModel fm && filter.test(fm))
                     builder.transformField(fm, transform);
                 else
@@ -155,7 +171,7 @@ public ClassTransform andThen(ClassTransform next) {
 
     // MethodTransform
 
-    interface UnresolvedMethodTransform extends MethodTransform {
+    interface UnresolvedMethodTransform extends MethodTransform, ResolvableTransform<MethodElement, MethodBuilder> {
         @Override
         default void accept(MethodBuilder builder, MethodElement element) {
             throw new UnsupportedOperationException("transforms must be resolved before running");
@@ -177,10 +193,10 @@ public record ChainedMethodTransform(MethodTransform t,
             implements TransformImpl.UnresolvedMethodTransform {
         @Override
         public ResolvedTransform<MethodElement> resolve(MethodBuilder builder) {
-            ResolvedTransform<MethodElement> downstream = next.resolve(builder);
+            ResolvedTransform<MethodElement> downstream = TransformImpl.resolve(next, builder);
             MethodBuilder chainedBuilder = new ChainedMethodBuilder(builder, downstream.consumer());
-            ResolvedTransform<MethodElement> upstream = t.resolve(chainedBuilder);
-            return new ResolvedTransformImpl<>(upstream.consumer(),
+            ResolvedTransform<MethodElement> upstream = TransformImpl.resolve(t, chainedBuilder);
+            return new ResolvedTransform<>(upstream.consumer(),
                                            chainRunnable(upstream.endHandler(), downstream.endHandler()),
                                            chainRunnable(upstream.startHandler(), downstream.startHandler()));
         }
@@ -190,7 +206,7 @@ public record SupplierMethodTransform(Supplier<MethodTransform> supplier)
             implements TransformImpl.UnresolvedMethodTransform {
         @Override
         public ResolvedTransform<MethodElement> resolve(MethodBuilder builder) {
-            return supplier.get().resolve(builder);
+            return TransformImpl.resolve(supplier.get(), builder);
         }
     }
 
@@ -198,7 +214,7 @@ public record MethodCodeTransform(CodeTransform xform)
             implements TransformImpl.UnresolvedMethodTransform {
         @Override
         public ResolvedTransform<MethodElement> resolve(MethodBuilder builder) {
-            return new ResolvedTransformImpl<>(me -> {
+            return new ResolvedTransform<>(me -> {
                 if (me instanceof CodeModel cm) {
                     builder.transformCode(cm, xform);
                 }
@@ -219,7 +235,7 @@ public MethodTransform andThen(MethodTransform next) {
 
     // FieldTransform
 
-    interface UnresolvedFieldTransform extends FieldTransform {
+    interface UnresolvedFieldTransform extends FieldTransform, ResolvableTransform<FieldElement, FieldBuilder> {
         @Override
         default void accept(FieldBuilder builder, FieldElement element) {
             throw new UnsupportedOperationException("transforms must be resolved before running");
@@ -240,10 +256,10 @@ public record ChainedFieldTransform(FieldTransform t, FieldTransform next)
             implements UnresolvedFieldTransform {
         @Override
         public ResolvedTransform<FieldElement> resolve(FieldBuilder builder) {
-            ResolvedTransform<FieldElement> downstream = next.resolve(builder);
+            ResolvedTransform<FieldElement> downstream = TransformImpl.resolve(next, builder);
             FieldBuilder chainedBuilder = new ChainedFieldBuilder(builder, downstream.consumer());
-            ResolvedTransform<FieldElement> upstream = t.resolve(chainedBuilder);
-            return new ResolvedTransformImpl<>(upstream.consumer(),
+            ResolvedTransform<FieldElement> upstream = TransformImpl.resolve(t, chainedBuilder);
+            return new ResolvedTransform<>(upstream.consumer(),
                                            chainRunnable(upstream.endHandler(), downstream.endHandler()),
                                            chainRunnable(upstream.startHandler(), downstream.startHandler()));
         }
@@ -253,13 +269,13 @@ public record SupplierFieldTransform(Supplier<FieldTransform> supplier)
             implements UnresolvedFieldTransform {
         @Override
         public ResolvedTransform<FieldElement> resolve(FieldBuilder builder) {
-            return supplier.get().resolve(builder);
+            return TransformImpl.resolve(supplier.get(), builder);
         }
     }
 
     // CodeTransform
 
-    interface UnresolvedCodeTransform extends CodeTransform {
+    interface UnresolvedCodeTransform extends CodeTransform, ResolvableTransform<CodeElement, CodeBuilder> {
         @Override
         default void accept(CodeBuilder builder, CodeElement element) {
             throw new UnsupportedOperationException("transforms must be resolved before running");
@@ -280,10 +296,10 @@ public record ChainedCodeTransform(CodeTransform t, CodeTransform next)
             implements UnresolvedCodeTransform {
         @Override
         public ResolvedTransform<CodeElement> resolve(CodeBuilder builder) {
-            ResolvedTransform<CodeElement> downstream = next.resolve(builder);
+            ResolvedTransform<CodeElement> downstream = TransformImpl.resolve(next, builder);
             CodeBuilder chainedBuilder = new ChainedCodeBuilder(builder, downstream.consumer());
-            ResolvedTransform<CodeElement> upstream = t.resolve(chainedBuilder);
-            return new ResolvedTransformImpl<>(upstream.consumer(),
+            ResolvedTransform<CodeElement> upstream = TransformImpl.resolve(t, chainedBuilder);
+            return new ResolvedTransform<>(upstream.consumer(),
                                          chainRunnable(upstream.endHandler(), downstream.endHandler()),
                                          chainRunnable(upstream.startHandler(), downstream.startHandler()));
         }
@@ -293,7 +309,7 @@ public record SupplierCodeTransform(Supplier<CodeTransform> supplier)
             implements UnresolvedCodeTransform {
         @Override
         public ResolvedTransform<CodeElement> resolve(CodeBuilder builder) {
-            return supplier.get().resolve(builder);
+            return TransformImpl.resolve(supplier.get(), builder);
         }
     }
 }

From 4635531950dbcfcd3ee2f13a57f0909af78a94c7 Mon Sep 17 00:00:00 2001
From: Maurizio Cimadamore <mcimadamore@openjdk.org>
Date: Mon, 15 Jul 2024 14:24:27 +0000
Subject: [PATCH 087/401] 8335159: Move method reference to lambda desugaring
 before Lower 8336320: NullPointerException: Cannot invoke Type.getTag because
 type is null after JDK-8334037

Reviewed-by: jlahoda, vromero
---
 .../com/sun/tools/javac/comp/Lower.java       | 335 ------------------
 .../com/sun/tools/javac/comp/TransTypes.java  | 287 ++++++++++++++-
 .../javac/SuperInit/MrefDoubleTrans.java      |  38 ++
 3 files changed, 307 insertions(+), 353 deletions(-)
 create mode 100644 test/langtools/tools/javac/SuperInit/MrefDoubleTrans.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
index 7ab38e86366be..6a5d75d7a89ed 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
@@ -29,7 +29,6 @@
 import java.util.stream.Collectors;
 
 import com.sun.source.tree.LambdaExpressionTree.BodyKind;
-import com.sun.source.tree.MemberReferenceTree.ReferenceMode;
 import com.sun.tools.javac.code.*;
 import com.sun.tools.javac.code.Kinds.KindSelector;
 import com.sun.tools.javac.code.Scope.WriteableScope;
@@ -39,7 +38,6 @@
 import com.sun.tools.javac.resources.CompilerProperties.Fragments;
 import com.sun.tools.javac.resources.CompilerProperties.Notes;
 import com.sun.tools.javac.tree.*;
-import com.sun.tools.javac.tree.JCTree.JCMemberReference.ReferenceKind;
 import com.sun.tools.javac.util.*;
 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
 import com.sun.tools.javac.util.List;
@@ -67,8 +65,6 @@
 import static com.sun.tools.javac.tree.JCTree.JCOperatorExpression.OperandPos.LEFT;
 import com.sun.tools.javac.tree.JCTree.JCSwitchExpression;
 
-import javax.lang.model.type.TypeKind;
-
 import static com.sun.tools.javac.tree.JCTree.Tag.*;
 
 /** This pass translates away some syntactic sugar: inner classes,
@@ -3903,337 +3899,6 @@ public void visitLambda(JCLambda tree) {
         result = tree;
     }
 
-    @Override
-    public void visitReference(JCMemberReference tree) {
-        if (needsConversionToLambda(tree)) {
-            // Convert to a lambda, and process as such
-            MemberReferenceToLambda conv = new MemberReferenceToLambda(tree);
-            result = translate(conv.lambda());
-        } else {
-            super.visitReference(tree);
-        }
-    }
-    // where
-        boolean needsVarArgsConversion(JCMemberReference tree) {
-            return tree.varargsElement != null;
-        }
-
-        /**
-         * @return Is this an array operation like clone()
-         */
-        boolean isArrayOp(JCMemberReference tree) {
-            return tree.sym.owner == syms.arrayClass;
-        }
-
-        boolean receiverAccessible(JCMemberReference tree) {
-            //hack needed to workaround 292 bug (7087658)
-            //when 292 issue is fixed we should remove this and change the backend
-            //code to always generate a method handle to an accessible method
-            return tree.ownerAccessible;
-        }
-
-        /**
-         * Erasure destroys the implementation parameter subtype
-         * relationship for intersection types.
-         * Have similar problems for union types too.
-         */
-        boolean interfaceParameterIsIntersectionOrUnionType(JCMemberReference tree) {
-            List<Type> tl = tree.getDescriptorType(types).getParameterTypes();
-            for (; tl.nonEmpty(); tl = tl.tail) {
-                Type pt = tl.head;
-                if (isIntersectionOrUnionType(pt))
-                    return true;
-            }
-            return false;
-        }
-
-        boolean isIntersectionOrUnionType(Type t) {
-            switch (t.getKind()) {
-                case INTERSECTION:
-                case UNION:
-                    return true;
-                case TYPEVAR:
-                    TypeVar tv = (TypeVar) t;
-                    return isIntersectionOrUnionType(tv.getUpperBound());
-            }
-            return false;
-        }
-
-        private boolean isProtectedInSuperClassOfEnclosingClassInOtherPackage(Symbol targetReference,
-                                                                              Symbol currentClass) {
-            return ((targetReference.flags() & PROTECTED) != 0 &&
-                    targetReference.packge() != currentClass.packge());
-        }
-
-        /**
-         * This method should be called only when target release <= 14
-         * where LambdaMetaFactory does not spin nestmate classes.
-         *
-         * This method should be removed when --release 14 is not supported.
-         */
-        boolean isPrivateInOtherClass(JCMemberReference tree) {
-            assert !target.runtimeUseNestAccess();
-            return  (tree.sym.flags() & PRIVATE) != 0 &&
-                    !types.isSameType(
-                            types.erasure(tree.sym.enclClass().asType()),
-                            types.erasure(currentClass.asType()));
-        }
-
-        /**
-         * Does this reference need to be converted to a lambda
-         * (i.e. var args need to be expanded or "super" is used)
-         */
-        boolean needsConversionToLambda(JCMemberReference tree) {
-            return interfaceParameterIsIntersectionOrUnionType(tree) ||
-                    tree.hasKind(ReferenceKind.SUPER) ||
-                    needsVarArgsConversion(tree) ||
-                    isArrayOp(tree) ||
-                    (!target.runtimeUseNestAccess() && isPrivateInOtherClass(tree)) ||
-                    isProtectedInSuperClassOfEnclosingClassInOtherPackage(tree.sym, currentClass) ||
-                    !receiverAccessible(tree) ||
-                    (tree.getMode() == ReferenceMode.NEW &&
-                            tree.kind != ReferenceKind.ARRAY_CTOR &&
-                            (tree.sym.owner.isDirectlyOrIndirectlyLocal() || tree.sym.owner.isInner()));
-        }
-
-    /**
-     * Converts a method reference which cannot be used directly into a lambda
-     */
-    private class MemberReferenceToLambda {
-
-        private final JCMemberReference tree;
-        private final ListBuffer<JCExpression> args = new ListBuffer<>();
-        private final ListBuffer<JCVariableDecl> params = new ListBuffer<>();
-        private final MethodSymbol owner = new MethodSymbol(0, names.empty, Type.noType, currentClass);
-
-        private JCExpression receiverExpression = null;
-
-        MemberReferenceToLambda(JCMemberReference tree) {
-            this.tree = tree;
-        }
-
-        JCExpression lambda() {
-            int prevPos = make.pos;
-            try {
-                make.at(tree);
-
-                //body generation - this can be either a method call or a
-                //new instance creation expression, depending on the member reference kind
-                VarSymbol rcvr = addParametersReturnReceiver();
-                JCExpression expr = (tree.getMode() == ReferenceMode.INVOKE)
-                        ? expressionInvoke(rcvr)
-                        : expressionNew();
-
-                JCLambda slam = make.Lambda(params.toList(), expr);
-                slam.target = tree.target;
-                slam.type = tree.type;
-                slam.pos = tree.pos;
-                slam.wasMethodReference = true;
-                if (receiverExpression != null) {
-                    // use a let expression so that the receiver expression is evaluated eagerly
-                    return make.at(tree.pos).LetExpr(
-                            make.VarDef(rcvr, translate(receiverExpression)), slam).setType(tree.type);
-                } else {
-                    return slam;
-                }
-            } finally {
-                make.at(prevPos);
-            }
-        }
-
-        /**
-         * Generate the parameter list for the converted member reference.
-         *
-         * @return The receiver variable symbol, if any
-         */
-        VarSymbol addParametersReturnReceiver() {
-            Type samDesc = types.erasure(types.findDescriptorSymbol(tree.target.tsym).type);
-            List<Type> samPTypes = samDesc.getParameterTypes();
-            List<Type> descPTypes = tree.getDescriptorType(types).getParameterTypes();
-
-            // Determine the receiver, if any
-            VarSymbol rcvr;
-            switch (tree.kind) {
-                case BOUND:
-                    // The receiver is explicit in the method reference
-                    rcvr = new VarSymbol(SYNTHETIC, names.fromString("rec$"), tree.getQualifierExpression().type, owner);
-                    rcvr.pos = tree.pos;
-                    receiverExpression = attr.makeNullCheck(tree.getQualifierExpression());
-                    break;
-                case UNBOUND:
-                    // The receiver is the first parameter, extract it and
-                    // adjust the SAM and unerased type lists accordingly
-                    rcvr = addParameter("rec$", samDesc.getParameterTypes().head, false);
-                    samPTypes = samPTypes.tail;
-                    descPTypes = descPTypes.tail;
-                    break;
-                default:
-                    rcvr = null;
-                    break;
-            }
-            List<Type> implPTypes = tree.sym.type.getParameterTypes();
-            int implSize = implPTypes.size();
-            int samSize = samPTypes.size();
-            // Last parameter to copy from referenced method, exclude final var args
-            int last = needsVarArgsConversion(tree) ? implSize - 1 : implSize;
-
-            // Failsafe -- assure match-up
-            boolean checkForIntersection = tree.varargsElement != null || implSize == descPTypes.size();
-
-            // Use parameter types of the implementation method unless the unerased
-            // SAM parameter type is an intersection type, in that case use the
-            // erased SAM parameter type so that the supertype relationship
-            // the implementation method parameters is not obscured.
-            // Note: in this loop, the lists implPTypes, samPTypes, and descPTypes
-            // are used as pointers to the current parameter type information
-            // and are thus not usable afterwards.
-            for (int i = 0; implPTypes.nonEmpty() && i < last; ++i) {
-                // By default use the implementation method parameter type
-                Type parmType = implPTypes.head;
-                if (checkForIntersection) {
-                    if (descPTypes.head.getKind() == TypeKind.INTERSECTION) {
-                        parmType = samPTypes.head;
-                    }
-                    // If the unerased parameter type is a type variable whose
-                    // bound is an intersection (eg. <T extends A & B>) then
-                    // use the SAM parameter type
-                    if (descPTypes.head.getKind() == TypeKind.TYPEVAR) {
-                        TypeVar tv = (TypeVar) descPTypes.head;
-                        if (tv.getUpperBound().getKind() == TypeKind.INTERSECTION) {
-                            parmType = samPTypes.head;
-                        }
-                    }
-                }
-                addParameter("x$" + i, parmType, true);
-
-                // Advance to the next parameter
-                implPTypes = implPTypes.tail;
-                samPTypes = samPTypes.tail;
-                descPTypes = descPTypes.tail;
-            }
-            // Flatten out the var args
-            for (int i = last; i < samSize; ++i) {
-                addParameter("xva$" + i, tree.varargsElement, true);
-            }
-
-            return rcvr;
-        }
-
-        private JCExpression makeReceiver(VarSymbol rcvr) {
-            if (rcvr == null) return null;
-            JCExpression rcvrExpr = make.Ident(rcvr);
-            boolean protAccess =
-                    isProtectedInSuperClassOfEnclosingClassInOtherPackage(tree.sym, currentClass);
-            Type rcvrType = tree.ownerAccessible && !protAccess ? tree.sym.enclClass().type
-                    : tree.expr.type;
-            if (rcvrType == syms.arrayClass.type) {
-                // Map the receiver type to the actually type, not just "array"
-                rcvrType = tree.getQualifierExpression().type;
-            }
-            if (!rcvr.type.tsym.isSubClass(rcvrType.tsym, types)) {
-                rcvrExpr = make.TypeCast(make.Type(rcvrType), rcvrExpr).setType(rcvrType);
-            }
-            return rcvrExpr;
-        }
-
-        /**
-         * determine the receiver of the method call - the receiver can
-         * be a type qualifier, the synthetic receiver parameter or 'super'.
-         */
-        private JCExpression expressionInvoke(VarSymbol rcvr) {
-            JCExpression qualifier =
-                    (rcvr != null) ?
-                            makeReceiver(rcvr) :
-                            tree.getQualifierExpression();
-
-            //create the qualifier expression
-            JCFieldAccess select = make.Select(qualifier, tree.sym.name);
-            select.sym = tree.sym;
-            select.type = tree.sym.erasure(types);
-
-            //create the method call expression
-            JCExpression apply = make.Apply(List.nil(), select,
-                            convertArgs(tree.sym, args.toList(), tree.varargsElement)).
-                    setType(tree.sym.erasure(types).getReturnType());
-
-            apply = transTypes.coerce(attrEnv, apply,
-                    types.erasure(tree.referentType.getReturnType()));
-
-            setVarargsIfNeeded(apply, tree.varargsElement);
-            return apply;
-        }
-
-        /**
-         * Lambda body to use for a 'new'.
-         */
-        private JCExpression expressionNew() {
-            if (tree.kind == ReferenceKind.ARRAY_CTOR) {
-                //create the array creation expression
-                JCNewArray newArr = make.NewArray(
-                        make.Type(types.elemtype(tree.getQualifierExpression().type)),
-                        List.of(make.Ident(params.first())),
-                        null);
-                newArr.type = tree.getQualifierExpression().type;
-                return newArr;
-            } else {
-                //create the instance creation expression
-                //note that method reference syntax does not allow an explicit
-                //enclosing class (so the enclosing class is null)
-                // but this may need to be patched up later with the proxy for the outer this
-                JCNewClass newClass = make.NewClass(null,
-                        List.nil(),
-                        make.Type(tree.getQualifierExpression().type),
-                        convertArgs(tree.sym, args.toList(), tree.varargsElement),
-                        null);
-                newClass.constructor = tree.sym;
-                newClass.constructorType = tree.sym.erasure(types);
-                newClass.type = tree.getQualifierExpression().type;
-                setVarargsIfNeeded(newClass, tree.varargsElement);
-                return newClass;
-            }
-        }
-
-        private VarSymbol addParameter(String name, Type p, boolean genArg) {
-            VarSymbol vsym = new VarSymbol(PARAMETER | SYNTHETIC, names.fromString(name), p, owner);
-            vsym.pos = tree.pos;
-            params.append(make.VarDef(vsym, null));
-            if (genArg) {
-                args.append(make.Ident(vsym));
-            }
-            return vsym;
-        }
-    }
-
-    /**
-     * Convert method/constructor arguments by inserting appropriate cast
-     * as required by type-erasure - this is needed when bridging a lambda/method
-     * reference, as the bridged signature might require downcast to be compatible
-     * with the generated signature.
-     */
-    private List<JCExpression> convertArgs(Symbol meth, List<JCExpression> args, Type varargsElement) {
-        Assert.check(meth.kind == MTH);
-        List<Type> formals = types.erasure(meth.type).getParameterTypes();
-        if (varargsElement != null) {
-            Assert.check((meth.flags() & VARARGS) != 0);
-        }
-        return transTypes.translateArgs(args, formals, varargsElement, attrEnv);
-    }
-
-    /**
-     * Set varargsElement field on a given tree (must be either a new class tree
-     * or a method call tree)
-     */
-    private void setVarargsIfNeeded(JCTree tree, Type varargsElement) {
-        if (varargsElement != null) {
-            switch (tree.getTag()) {
-                case APPLY: ((JCMethodInvocation)tree).varargsElement = varargsElement; break;
-                case NEWCLASS: ((JCNewClass)tree).varargsElement = varargsElement; break;
-                case TYPECAST: setVarargsIfNeeded(((JCTypeCast) tree).expr, varargsElement); break;
-                default: throw new AssertionError();
-            }
-        }
-    }
-
     public void visitSwitch(JCSwitch tree) {
         List<JCCase> cases = tree.patternSwitch ? addDefaultIfNeeded(tree.patternSwitch,
                                                                      tree.wasEnumSelector,
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java
index d1ea165104176..bfe35dbec9c1f 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java
@@ -26,10 +26,13 @@
 package com.sun.tools.javac.comp;
 
 
+import com.sun.source.tree.MemberReferenceTree.ReferenceMode;
 import com.sun.tools.javac.code.*;
 import com.sun.tools.javac.code.Attribute.TypeCompound;
 import com.sun.tools.javac.code.Source.Feature;
 import com.sun.tools.javac.code.Symbol.*;
+import com.sun.tools.javac.code.Type.TypeVar;
+import com.sun.tools.javac.jvm.Target;
 import com.sun.tools.javac.tree.*;
 import com.sun.tools.javac.tree.JCTree.*;
 import com.sun.tools.javac.tree.JCTree.JCMemberReference.ReferenceKind;
@@ -46,6 +49,8 @@
 import static com.sun.tools.javac.comp.CompileStates.CompileState;
 import com.sun.tools.javac.tree.JCTree.JCBreak;
 
+import javax.lang.model.type.TypeKind;
+
 /** This pass translates Generic Java to conventional Java.
  *
  *  <p><b>This is NOT part of any supported API.
@@ -75,6 +80,7 @@ public static TransTypes instance(Context context) {
     private Attr attr;
     private final Resolve resolve;
     private final CompileStates compileStates;
+    private final Target target;
 
     @SuppressWarnings("this-escape")
     protected TransTypes(Context context) {
@@ -89,6 +95,7 @@ protected TransTypes(Context context) {
         resolve = Resolve.instance(context);
         annotate = Annotate.instance(context);
         attr = Attr.instance(context);
+        target = Target.instance(context);
     }
 
     /** Construct an attributed tree for a cast of expression to target type,
@@ -539,6 +546,268 @@ public void visitLambda(JCLambda tree) {
         }
     }
 
+    @Override
+    public void visitReference(JCMemberReference tree) {
+        if (needsConversionToLambda(tree)) {
+            // Convert to a lambda, and process as such
+            MemberReferenceToLambda conv = new MemberReferenceToLambda(tree);
+            result = translate(conv.lambda());
+        } else {
+            Type t = types.skipTypeVars(tree.expr.type, false);
+            Type receiverTarget = t.isCompound() ? erasure(tree.sym.owner.type) : erasure(t);
+            if (tree.kind == ReferenceKind.UNBOUND) {
+                tree.expr = make.Type(receiverTarget);
+            } else {
+                tree.expr = translate(tree.expr, receiverTarget);
+            }
+            if (!tree.type.isIntersection()) {
+                tree.type = erasure(tree.type);
+            } else {
+                tree.type = types.erasure(types.findDescriptorSymbol(tree.type.tsym).owner.type);
+            }
+            result = tree;
+        }
+    }
+    // where
+    boolean needsVarArgsConversion(JCMemberReference tree) {
+        return tree.varargsElement != null;
+    }
+
+    /**
+     * @return Is this an array operation like clone()
+     */
+    boolean isArrayOp(JCMemberReference tree) {
+        return tree.sym.owner == syms.arrayClass;
+    }
+
+    boolean receiverAccessible(JCMemberReference tree) {
+        //hack needed to workaround 292 bug (7087658)
+        //when 292 issue is fixed we should remove this and change the backend
+        //code to always generate a method handle to an accessible method
+        return tree.ownerAccessible;
+    }
+
+    /**
+     * Erasure destroys the implementation parameter subtype
+     * relationship for intersection types.
+     * Have similar problems for union types too.
+     */
+    boolean interfaceParameterIsIntersectionOrUnionType(JCMemberReference tree) {
+        List<Type> tl = tree.getDescriptorType(types).getParameterTypes();
+        for (; tl.nonEmpty(); tl = tl.tail) {
+            Type pt = tl.head;
+            if (isIntersectionOrUnionType(pt))
+                return true;
+        }
+        return false;
+    }
+
+    boolean isIntersectionOrUnionType(Type t) {
+        return switch (t.getKind()) {
+            case INTERSECTION, UNION -> true;
+            case TYPEVAR -> {
+                TypeVar tv = (TypeVar) t;
+                yield isIntersectionOrUnionType(tv.getUpperBound());
+            }
+            default -> false;
+        };
+    }
+
+    private boolean isProtectedInSuperClassOfEnclosingClassInOtherPackage(Symbol targetReference,
+                                                                          Symbol currentClass) {
+        return ((targetReference.flags() & PROTECTED) != 0 &&
+                targetReference.packge() != currentClass.packge());
+    }
+
+    /**
+     * This method should be called only when target release <= 14
+     * where LambdaMetaFactory does not spin nestmate classes.
+     *
+     * This method should be removed when --release 14 is not supported.
+     */
+    boolean isPrivateInOtherClass(JCMemberReference tree) {
+        return (tree.sym.flags() & PRIVATE) != 0 &&
+                !types.isSameType(
+                        types.erasure(tree.sym.enclClass().asType()),
+                        types.erasure(env.enclClass.sym.asType()));
+    }
+
+    /**
+     * Does this reference need to be converted to a lambda
+     * (i.e. var args need to be expanded or "super" is used)
+     */
+    boolean needsConversionToLambda(JCMemberReference tree) {
+        return interfaceParameterIsIntersectionOrUnionType(tree) ||
+                tree.hasKind(ReferenceKind.SUPER) ||
+                needsVarArgsConversion(tree) ||
+                isArrayOp(tree) ||
+                (!target.runtimeUseNestAccess() && isPrivateInOtherClass(tree)) ||
+                isProtectedInSuperClassOfEnclosingClassInOtherPackage(tree.sym, env.enclClass.sym) ||
+                !receiverAccessible(tree) ||
+                (tree.getMode() == ReferenceMode.NEW &&
+                        tree.kind != ReferenceKind.ARRAY_CTOR &&
+                        (tree.sym.owner.isDirectlyOrIndirectlyLocal() || tree.sym.owner.isInner()));
+    }
+
+    /**
+     * Converts a method reference which cannot be used directly into a lambda
+     */
+    private class MemberReferenceToLambda {
+
+        private final JCMemberReference tree;
+        private final ListBuffer<JCExpression> args = new ListBuffer<>();
+        private final ListBuffer<JCVariableDecl> params = new ListBuffer<>();
+        private final MethodSymbol owner = new MethodSymbol(0, names.empty, Type.noType, env.enclClass.sym);
+
+        private JCExpression receiverExpression = null;
+
+        MemberReferenceToLambda(JCMemberReference tree) {
+            this.tree = tree;
+        }
+
+        JCExpression lambda() {
+            int prevPos = make.pos;
+            try {
+                make.at(tree);
+
+                //body generation - this can be either a method call or a
+                //new instance creation expression, depending on the member reference kind
+                VarSymbol rcvr = addParametersReturnReceiver();
+                JCExpression expr = (tree.getMode() == ReferenceMode.INVOKE)
+                        ? expressionInvoke(rcvr)
+                        : expressionNew();
+
+                JCLambda slam = make.Lambda(params.toList(), expr);
+                slam.target = tree.target;
+                slam.type = tree.type;
+                slam.pos = tree.pos;
+                slam.wasMethodReference = true;
+                if (receiverExpression != null) {
+                    // use a let expression so that the receiver expression is evaluated eagerly
+                    return make.at(tree.pos).LetExpr(
+                            make.VarDef(rcvr, receiverExpression), slam).setType(tree.type);
+                } else {
+                    return slam;
+                }
+            } finally {
+                make.at(prevPos);
+            }
+        }
+
+        /**
+         * Generate the parameter list for the converted member reference.
+         *
+         * @return The receiver variable symbol, if any
+         */
+        VarSymbol addParametersReturnReceiver() {
+            List<Type> descPTypes = tree.getDescriptorType(types).getParameterTypes();
+
+            // Determine the receiver, if any
+            VarSymbol rcvr;
+            switch (tree.kind) {
+                case BOUND:
+                    // The receiver is explicit in the method reference
+                    rcvr = new VarSymbol(SYNTHETIC, names.fromString("rec$"), tree.getQualifierExpression().type, owner);
+                    rcvr.pos = tree.pos;
+                    receiverExpression = attr.makeNullCheck(tree.getQualifierExpression());
+                    break;
+                case UNBOUND:
+                    // The receiver is the first parameter, extract it and
+                    // adjust the SAM and unerased type lists accordingly
+                    rcvr = addParameter("rec$", descPTypes.head, false);
+                    descPTypes = descPTypes.tail;
+                    break;
+                default:
+                    rcvr = null;
+                    break;
+            }
+            List<Type> implPTypes = tree.sym.type.getParameterTypes();
+            int implSize = implPTypes.size();
+            int samSize = descPTypes.size();
+            // Last parameter to copy from referenced method, exclude final var args
+            int last = needsVarArgsConversion(tree) ? implSize - 1 : implSize;
+
+            for (int i = 0; implPTypes.nonEmpty() && i < last; ++i) {
+                // Use the descriptor parameter type
+                Type parmType = descPTypes.head;
+                addParameter("x$" + i, parmType, true);
+
+                // Advance to the next parameter
+                implPTypes = implPTypes.tail;
+                descPTypes = descPTypes.tail;
+            }
+            // Flatten out the var args
+            for (int i = last; i < samSize; ++i) {
+                addParameter("xva$" + i, tree.varargsElement, true);
+            }
+
+            return rcvr;
+        }
+
+        /**
+         * determine the receiver of the method call - the receiver can
+         * be a type qualifier, the synthetic receiver parameter or 'super'.
+         */
+        private JCExpression expressionInvoke(VarSymbol rcvr) {
+            JCExpression qualifier =
+                    (rcvr != null) ?
+                            make.Ident(rcvr) :
+                            tree.getQualifierExpression();
+
+            //create the qualifier expression
+            JCFieldAccess select = make.Select(qualifier, tree.sym.name);
+            select.sym = tree.sym;
+            select.type = tree.referentType;
+
+            //create the method call expression
+            JCExpression apply = make.Apply(List.nil(), select,
+                            args.toList()).setType(tree.referentType.getReturnType());
+
+            TreeInfo.setVarargsElement(apply, tree.varargsElement);
+            return apply;
+        }
+
+        /**
+         * Lambda body to use for a 'new'.
+         */
+        private JCExpression expressionNew() {
+            if (tree.kind == ReferenceKind.ARRAY_CTOR) {
+                //create the array creation expression
+                JCNewArray newArr = make.NewArray(
+                        make.Type(types.elemtype(tree.getQualifierExpression().type)),
+                        List.of(make.Ident(params.first())),
+                        null);
+                newArr.type = tree.getQualifierExpression().type;
+                return newArr;
+            } else {
+                //create the instance creation expression
+                //note that method reference syntax does not allow an explicit
+                //enclosing class (so the enclosing class is null)
+                // but this may need to be patched up later with the proxy for the outer this
+                JCNewClass newClass = make.NewClass(null,
+                        List.nil(),
+                        make.Type(tree.getQualifierExpression().type),
+                        args.toList(),
+                        null);
+                newClass.constructor = tree.sym;
+                newClass.constructorType = tree.sym.erasure(types);
+                newClass.type = tree.getQualifierExpression().type;
+                TreeInfo.setVarargsElement(newClass, tree.varargsElement);
+                return newClass;
+            }
+        }
+
+        private VarSymbol addParameter(String name, Type p, boolean genArg) {
+            VarSymbol vsym = new VarSymbol(PARAMETER | SYNTHETIC, names.fromString(name), p, owner);
+            vsym.pos = tree.pos;
+            params.append(make.VarDef(vsym, null));
+            if (genArg) {
+                args.append(make.Ident(vsym));
+            }
+            return vsym;
+        }
+    }
+
     public void visitSwitch(JCSwitch tree) {
         Type selsuper = types.supertype(tree.selector.type);
         boolean enumSwitch = selsuper != null &&
@@ -860,24 +1129,6 @@ else if (tree.sym.kind == VAR) {
         }
     }
 
-    public void visitReference(JCMemberReference tree) {
-        Type t = types.skipTypeVars(tree.expr.type, false);
-        Type receiverTarget = t.isCompound() ? erasure(tree.sym.owner.type) : erasure(t);
-        if (tree.kind == ReferenceKind.UNBOUND) {
-            tree.expr = make.Type(receiverTarget);
-        } else {
-            tree.expr = translate(tree.expr, receiverTarget);
-        }
-        if (!tree.type.isIntersection()) {
-            tree.type = erasure(tree.type);
-        } else {
-            tree.type = types.erasure(types.findDescriptorSymbol(tree.type.tsym).owner.type);
-        }
-        if (tree.varargsElement != null)
-            tree.varargsElement = erasure(tree.varargsElement);
-        result = tree;
-    }
-
     public void visitTypeArray(JCArrayTypeTree tree) {
         tree.elemtype = translate(tree.elemtype, null);
         tree.type = erasure(tree.type);
diff --git a/test/langtools/tools/javac/SuperInit/MrefDoubleTrans.java b/test/langtools/tools/javac/SuperInit/MrefDoubleTrans.java
new file mode 100644
index 0000000000000..aeddae455b2f5
--- /dev/null
+++ b/test/langtools/tools/javac/SuperInit/MrefDoubleTrans.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 8336320
+ * @summary NullPointerException: Cannot invoke Type.getTag because type is null after JDK-8334037
+ * @compile MrefDoubleTrans.java
+ */
+class MrefDoubleTrans {
+    public void f() {
+        Runnable r = new I()::m;
+    }
+
+    class I {
+        void m(Object... xs) {}
+    }
+}

From 000de306286bb75bbdad2f572ce6dafd4184680e Mon Sep 17 00:00:00 2001
From: Patricio Chilano Mateo <pchilanomate@openjdk.org>
Date: Mon, 15 Jul 2024 14:54:04 +0000
Subject: [PATCH 088/401] 8335269: [Graal] occasional timeout in
 java/lang/StringBuffer/TestSynchronization.java with loom

Reviewed-by: dholmes, alanb
---
 .../share/runtime/continuationFreezeThaw.cpp  |  5 ++
 .../Thread/virtual/ThreadPollOnYield.java     | 79 +++++++++++++++++++
 2 files changed, 84 insertions(+)
 create mode 100644 test/jdk/java/lang/Thread/virtual/ThreadPollOnYield.java

diff --git a/src/hotspot/share/runtime/continuationFreezeThaw.cpp b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
index 77ec9642d48f3..87f60debc140a 100644
--- a/src/hotspot/share/runtime/continuationFreezeThaw.cpp
+++ b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
@@ -1579,6 +1579,11 @@ static inline int freeze_internal(JavaThread* current, intptr_t* const sp) {
     verify_continuation(cont.continuation());
     freeze_result res = entry->is_pinned() ? freeze_pinned_cs : freeze_pinned_monitor;
     log_develop_trace(continuations)("=== end of freeze (fail %d)", res);
+    // Avoid Thread.yield() loops without safepoint polls.
+    if (SafepointMechanism::should_process(current)) {
+      cont.done(); // allow safepoint
+      ThreadInVMfromJava tivmfj(current);
+    }
     return res;
   }
 
diff --git a/test/jdk/java/lang/Thread/virtual/ThreadPollOnYield.java b/test/jdk/java/lang/Thread/virtual/ThreadPollOnYield.java
new file mode 100644
index 0000000000000..b8ab61556eaf6
--- /dev/null
+++ b/test/jdk/java/lang/Thread/virtual/ThreadPollOnYield.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 id=default
+ * @bug 8335269
+ * @summary Test that Thread.yield loop polls for safepoints
+ * @requires vm.continuations
+ * @library /test/lib
+ * @run junit/othervm ThreadPollOnYield
+ */
+
+/*
+ * @test id=c2
+ * @bug 8335269
+ * @summary Test that Thread.yield loop polls for safepoints
+ * @requires vm.continuations & vm.compMode != "Xcomp"
+ * @library /test/lib
+ * @run junit/othervm -Xcomp -XX:-TieredCompilation -XX:CompileCommand=inline,*::yield* -XX:CompileCommand=inline,*::*Yield ThreadPollOnYield
+ */
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import jdk.test.lib.thread.VThreadPinner;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+class ThreadPollOnYield {
+    static void foo(AtomicBoolean done) {
+        while (!done.get()) {
+            Thread.yield();
+        }
+    }
+
+    @Test
+    void testThreadYieldPolls() throws Exception {
+        AtomicBoolean done = new AtomicBoolean();
+        var vthread = Thread.ofVirtual().start(() -> {
+            VThreadPinner.runPinned(() -> foo(done));
+        });
+        Thread.sleep(5000);
+        done.set(true);
+        vthread.join();
+
+        System.out.println("First vthread done");
+
+        AtomicBoolean done2 = new AtomicBoolean();
+        vthread = Thread.ofVirtual().start(() -> {
+            VThreadPinner.runPinned(() -> foo(done2));
+        });
+        long start = System.currentTimeMillis();
+        while (System.currentTimeMillis() - start < 5000) {
+            Thread.sleep(250);
+            System.gc();
+        }
+        done2.set(true);
+        vthread.join();
+    }
+}

From 9dfcd75ec4f6c1fb60e5416fa6fc759c969a24fb Mon Sep 17 00:00:00 2001
From: Maurizio Cimadamore <mcimadamore@openjdk.org>
Date: Mon, 15 Jul 2024 15:28:24 +0000
Subject: [PATCH 089/401] 8334121: Anonymous class capturing two enclosing
 instances fails to compile

Reviewed-by: jlahoda, vromero
---
 .../com/sun/tools/javac/code/Symbol.java      | 20 +++++-
 .../com/sun/tools/javac/comp/Lower.java       | 50 +------------
 .../javac/MethodParameters/LocalClassTest.out |  2 +-
 .../SuperInit/MultiLevelOuterInstance.java    | 72 +++++++++++++++++++
 4 files changed, 94 insertions(+), 50 deletions(-)
 create mode 100644 test/langtools/tools/javac/SuperInit/MultiLevelOuterInstance.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
index ca420eecdc5e5..4dd4f73a161c3 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
@@ -358,7 +358,7 @@ public Type erasure(Types types) {
     public Type externalType(Types types) {
         Type t = erasure(types);
         if (name == name.table.names.init && owner.hasOuterInstance()) {
-            Type outerThisType = types.erasure(owner.type.getEnclosingType());
+            Type outerThisType = owner.innermostAccessibleEnclosingClass().erasure(types);
             return new MethodType(t.getParameterTypes().prepend(outerThisType),
                                   t.getReturnType(),
                                   t.getThrownTypes(),
@@ -506,7 +506,23 @@ public boolean isInner() {
      */
     public boolean hasOuterInstance() {
         return
-            type.getEnclosingType().hasTag(CLASS) && (flags() & (INTERFACE | ENUM | RECORD | NOOUTERTHIS)) == 0;
+            type.getEnclosingType().hasTag(CLASS) && (flags() & (INTERFACE | ENUM | RECORD)) == 0 &&
+                    ((flags() & NOOUTERTHIS) == 0 || type.getEnclosingType().tsym.hasOuterInstance());
+    }
+
+    /** If the class containing this symbol is a local or an anonymous class, then it might be
+     *  defined inside one or more pre-construction contexts, for which the corresponding enclosing
+     *  instance is considered inaccessible. This method return the class symbol corresponding to the
+     *  innermost enclosing type that is accessible from this symbol's class. Note: this method should
+     *  only be called after checking that {@link #hasOuterInstance()} returns {@code true}.
+     */
+    public ClassSymbol innermostAccessibleEnclosingClass() {
+        Assert.check(enclClass().hasOuterInstance());
+        Type current = enclClass().type;
+        while ((current.tsym.flags() & NOOUTERTHIS) != 0) {
+            current = current.getEnclosingType();
+        }
+        return (ClassSymbol) current.getEnclosingType().tsym;
     }
 
     /** The closest enclosing class of this symbol's declaration.
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
index 6a5d75d7a89ed..1ac62183bbe03 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
@@ -366,53 +366,9 @@ void visitSymbol(Symbol _sym) {
                     if (v.getConstValue() == null) {
                         addFreeVar(v);
                     }
-                } else {
-                    if (outerThisStack.head != null &&
-                        outerThisStack.head != _sym)
-                        visitSymbol(outerThisStack.head);
                 }
             }
         }
-
-        /** If tree refers to a class instance creation expression
-         *  add all free variables of the freshly created class.
-         */
-        public void visitNewClass(JCNewClass tree) {
-            ClassSymbol c = (ClassSymbol)tree.constructor.owner;
-            if (tree.encl == null &&
-                c.hasOuterInstance() &&
-                outerThisStack.head != null)
-                visitSymbol(outerThisStack.head);
-            super.visitNewClass(tree);
-        }
-
-        /** If tree refers to a qualified this or super expression
-         *  for anything but the current class, add the outer this
-         *  stack as a free variable.
-         */
-        public void visitSelect(JCFieldAccess tree) {
-            if ((tree.name == names._this || tree.name == names._super) &&
-                tree.selected.type.tsym != clazz &&
-                outerThisStack.head != null)
-                visitSymbol(outerThisStack.head);
-            super.visitSelect(tree);
-        }
-
-        /** If tree refers to a superclass constructor call,
-         *  add all free variables of the superclass.
-         */
-        public void visitApply(JCMethodInvocation tree) {
-            if (TreeInfo.name(tree.meth) == names._super) {
-                Symbol constructor = TreeInfo.symbol(tree.meth);
-                ClassSymbol c = (ClassSymbol)constructor.owner;
-                if (c.hasOuterInstance() &&
-                    !tree.meth.hasTag(SELECT) &&
-                    outerThisStack.head != null)
-                    visitSymbol(outerThisStack.head);
-            }
-            super.visitApply(tree);
-        }
-
     }
 
     ClassSymbol ownerToCopyFreeVarsFrom(ClassSymbol c) {
@@ -1586,7 +1542,7 @@ Name outerThisName(Type type, Symbol owner) {
     }
 
     private VarSymbol makeOuterThisVarSymbol(Symbol owner, long flags) {
-        Type target = types.erasure(owner.enclClass().type.getEnclosingType());
+        Type target = owner.innermostAccessibleEnclosingClass().erasure(types);
         // Set NOOUTERTHIS for all synthetic outer instance variables, and unset
         // it when the variable is accessed. If the variable is never accessed,
         // we skip creating an outer instance field and saving the constructor
@@ -3097,7 +3053,7 @@ public void visitNewClass(JCNewClass tree) {
                 thisArg.type = tree.encl.type;
             } else if (c.isDirectlyOrIndirectlyLocal()) {
                 // local class
-                thisArg = makeThis(tree.pos(), c.type.getEnclosingType().tsym);
+                thisArg = makeThis(tree.pos(), c.innermostAccessibleEnclosingClass());
             } else {
                 // nested class
                 thisArg = makeOwnerThis(tree.pos(), c, false);
@@ -3303,7 +3259,7 @@ public void visitApply(JCMethodInvocation tree) {
                     ((JCIdent) tree.meth).name = methName;
                 } else if (c.isDirectlyOrIndirectlyLocal() || methName == names._this){
                     // local class or this() call
-                    thisArg = makeThis(tree.meth.pos(), c.type.getEnclosingType().tsym);
+                    thisArg = makeThis(tree.meth.pos(), c.innermostAccessibleEnclosingClass());
                 } else if (currentClass.isStatic()) {
                     // super() call from static nested class - invalid
                     log.error(tree.pos(),
diff --git a/test/langtools/tools/javac/MethodParameters/LocalClassTest.out b/test/langtools/tools/javac/MethodParameters/LocalClassTest.out
index bd25ff3a6be50..3b95739e74a5e 100644
--- a/test/langtools/tools/javac/MethodParameters/LocalClassTest.out
+++ b/test/langtools/tools/javac/MethodParameters/LocalClassTest.out
@@ -1,7 +1,7 @@
 class LocalClassTest$1 -- anon
 LocalClassTest$1.<init>(final this$0/*implicit*/, final j, final val$i/*synthetic*/)
 class LocalClassTest$1CapturingLocal$1 -- anon
-LocalClassTest$1CapturingLocal$1.<init>(final val$this$0/*synthetic*/, final val$val$i/*synthetic*/)
+LocalClassTest$1CapturingLocal$1.<init>(final this$0/*implicit*/, final val$val$i/*synthetic*/)
 LocalClassTest$1CapturingLocal$1.test()
 class LocalClassTest$1CapturingLocal -- inner
 LocalClassTest$1CapturingLocal.<init>(final this$0/*implicit*/, final j, final val$i/*synthetic*/)
diff --git a/test/langtools/tools/javac/SuperInit/MultiLevelOuterInstance.java b/test/langtools/tools/javac/SuperInit/MultiLevelOuterInstance.java
new file mode 100644
index 0000000000000..e47e70a3bdc56
--- /dev/null
+++ b/test/langtools/tools/javac/SuperInit/MultiLevelOuterInstance.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 8334121
+ * @summary Anonymous class capturing two enclosing instances fails to compile
+ * @enablePreview
+ */
+
+public class MultiLevelOuterInstance {
+
+    interface A {
+        void run();
+    }
+    interface B {
+        void run();
+    }
+
+    class Inner1 {
+        Inner1() {
+            this(new A() {
+                class Inner2 {
+                    Inner2() {
+                        this(new B() {
+                            public void run() {
+                                m();
+                                g();
+                            }
+                        });
+                    }
+
+                    Inner2(B o) {
+                        o.run();
+                    }
+                }
+
+                public void run() {
+                    new Inner2();
+                }
+
+                void m() { }
+            });
+        }
+
+        Inner1(A o) { }
+    }
+    void g() { }
+
+    public static void main(String[] args) {
+        new MultiLevelOuterInstance().new Inner1();
+    }
+}

From ab27acab0b0f4a8af080275e92c2f296f5f6486b Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Mon, 15 Jul 2024 15:43:02 +0000
Subject: [PATCH 090/401] 8336297: C2: Fix -Wzero-as-null-pointer-constant
 warnings in derived Node ctors

Reviewed-by: kvn, jwaters
---
 src/hotspot/share/opto/graphKit.cpp     |  8 ++++----
 src/hotspot/share/opto/library_call.cpp | 12 ++++++------
 src/hotspot/share/opto/loopnode.cpp     |  4 ++--
 src/hotspot/share/opto/parse1.cpp       |  2 +-
 src/hotspot/share/opto/parse2.cpp       | 10 +++++-----
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/hotspot/share/opto/graphKit.cpp b/src/hotspot/share/opto/graphKit.cpp
index 134d21e5bad18..569d6bc35cd16 100644
--- a/src/hotspot/share/opto/graphKit.cpp
+++ b/src/hotspot/share/opto/graphKit.cpp
@@ -1209,7 +1209,7 @@ Node* GraphKit::load_array_length(Node* array) {
   Node *alen;
   if (alloc == nullptr) {
     Node *r_adr = basic_plus_adr(array, arrayOopDesc::length_offset_in_bytes());
-    alen = _gvn.transform( new LoadRangeNode(0, immutable_memory(), r_adr, TypeInt::POS));
+    alen = _gvn.transform( new LoadRangeNode(nullptr, immutable_memory(), r_adr, TypeInt::POS));
   } else {
     alen = array_ideal_length(alloc, _gvn.type(array)->is_oopptr(), false);
   }
@@ -2385,7 +2385,7 @@ Node* GraphKit::precision_rounding(Node* n) {
   if (Matcher::strict_fp_requires_explicit_rounding) {
 #ifdef IA32
     if (UseSSE == 0) {
-      return _gvn.transform(new RoundFloatNode(0, n));
+      return _gvn.transform(new RoundFloatNode(nullptr, n));
     }
 #else
     Unimplemented();
@@ -2399,7 +2399,7 @@ Node* GraphKit::dprecision_rounding(Node *n) {
   if (Matcher::strict_fp_requires_explicit_rounding) {
 #ifdef IA32
     if (UseSSE < 2) {
-      return _gvn.transform(new RoundDoubleNode(0, n));
+      return _gvn.transform(new RoundDoubleNode(nullptr, n));
     }
 #else
     Unimplemented();
@@ -3489,7 +3489,7 @@ FastLockNode* GraphKit::shared_lock(Node* obj) {
   box = _gvn.transform(box);
   Node* mem = reset_memory();
 
-  FastLockNode * flock = _gvn.transform(new FastLockNode(0, obj, box) )->as_FastLock();
+  FastLockNode * flock = _gvn.transform(new FastLockNode(nullptr, obj, box) )->as_FastLock();
 
   // Add monitor to debug info for the slow path.  If we block inside the
   // slow path and de-opt, we need the monitor hanging around
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index ebe9258f99b60..f1c3e592fff53 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -2138,12 +2138,12 @@ bool LibraryCallKit::inline_number_methods(vmIntrinsics::ID id) {
   case vmIntrinsics::_numberOfTrailingZeros_l:  n = new CountTrailingZerosLNode(arg);  break;
   case vmIntrinsics::_bitCount_i:               n = new PopCountINode(          arg);  break;
   case vmIntrinsics::_bitCount_l:               n = new PopCountLNode(          arg);  break;
-  case vmIntrinsics::_reverseBytes_c:           n = new ReverseBytesUSNode(0,   arg);  break;
-  case vmIntrinsics::_reverseBytes_s:           n = new ReverseBytesSNode( 0,   arg);  break;
-  case vmIntrinsics::_reverseBytes_i:           n = new ReverseBytesINode( 0,   arg);  break;
-  case vmIntrinsics::_reverseBytes_l:           n = new ReverseBytesLNode( 0,   arg);  break;
-  case vmIntrinsics::_reverse_i:                n = new ReverseINode(0, arg); break;
-  case vmIntrinsics::_reverse_l:                n = new ReverseLNode(0, arg); break;
+  case vmIntrinsics::_reverseBytes_c:           n = new ReverseBytesUSNode(nullptr, arg);  break;
+  case vmIntrinsics::_reverseBytes_s:           n = new ReverseBytesSNode( nullptr, arg);  break;
+  case vmIntrinsics::_reverseBytes_i:           n = new ReverseBytesINode( nullptr, arg);  break;
+  case vmIntrinsics::_reverseBytes_l:           n = new ReverseBytesLNode( nullptr, arg);  break;
+  case vmIntrinsics::_reverse_i:                n = new ReverseINode(nullptr, arg); break;
+  case vmIntrinsics::_reverse_l:                n = new ReverseLNode(nullptr, arg); break;
   default:  fatal_unexpected_iid(id);  break;
   }
   set_result(_gvn.transform(n));
diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index 6c16d7cc6a4e6..0ea0e8cbcf505 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -2591,7 +2591,7 @@ Node *LoopLimitNode::Ideal(PhaseGVN *phase, bool can_reshape) {
     Node* stride_m = phase->intcon(stride_con - (stride_con > 0 ? 1 : -1));
     Node *range = phase->transform(new SubINode(in(Limit), in(Init)));
     Node *bias  = phase->transform(new AddINode(range, stride_m));
-    Node *trip  = phase->transform(new DivINode(0, bias, in(Stride)));
+    Node *trip  = phase->transform(new DivINode(nullptr, bias, in(Stride)));
     Node *span  = phase->transform(new MulINode(trip, in(Stride)));
     return new AddINode(span, in(Init)); // exact limit
   }
@@ -2620,7 +2620,7 @@ Node *LoopLimitNode::Ideal(PhaseGVN *phase, bool can_reshape) {
       Node* neg_stride   = phase->longcon(-stride_con);
       span = phase->transform(new AndLNode(bias, neg_stride));
     } else {
-      Node *trip  = phase->transform(new DivLNode(0, bias, stride));
+      Node *trip  = phase->transform(new DivLNode(nullptr, bias, stride));
       span = phase->transform(new MulLNode(trip, stride));
     }
     // Convert back to int
diff --git a/src/hotspot/share/opto/parse1.cpp b/src/hotspot/share/opto/parse1.cpp
index 3989020451eb5..7e19336e735ed 100644
--- a/src/hotspot/share/opto/parse1.cpp
+++ b/src/hotspot/share/opto/parse1.cpp
@@ -251,7 +251,7 @@ void Parse::load_interpreter_state(Node* osr_buf) {
 
     // Build a bogus FastLockNode (no code will be generated) and push the
     // monitor into our debug info.
-    const FastLockNode *flock = _gvn.transform(new FastLockNode( 0, lock_object, box ))->as_FastLock();
+    const FastLockNode *flock = _gvn.transform(new FastLockNode( nullptr, lock_object, box ))->as_FastLock();
     map()->push_monitor(flock);
 
     // If the lock is our method synchronization lock, tuck it away in
diff --git a/src/hotspot/share/opto/parse2.cpp b/src/hotspot/share/opto/parse2.cpp
index d43b8335ffd5b..cbd9323c3a93a 100644
--- a/src/hotspot/share/opto/parse2.cpp
+++ b/src/hotspot/share/opto/parse2.cpp
@@ -2233,7 +2233,7 @@ void Parse::do_one_bytecode() {
   case Bytecodes::_fdiv:
     b = pop();
     a = pop();
-    c = _gvn.transform( new DivFNode(0,a,b) );
+    c = _gvn.transform( new DivFNode(nullptr,a,b) );
     d = precision_rounding(c);
     push( d );
     break;
@@ -2243,7 +2243,7 @@ void Parse::do_one_bytecode() {
       // Generate a ModF node.
       b = pop();
       a = pop();
-      c = _gvn.transform( new ModFNode(0,a,b) );
+      c = _gvn.transform( new ModFNode(nullptr,a,b) );
       d = precision_rounding(c);
       push( d );
     }
@@ -2294,7 +2294,7 @@ void Parse::do_one_bytecode() {
     a = pop_pair();
     b = _gvn.transform( new ConvD2FNode(a));
     // This breaks _227_mtrt (speed & correctness) and _222_mpegaudio (speed)
-    //b = _gvn.transform(new RoundFloatNode(0, b) );
+    //b = _gvn.transform(new RoundFloatNode(nullptr, b) );
     push( b );
     break;
 
@@ -2360,7 +2360,7 @@ void Parse::do_one_bytecode() {
   case Bytecodes::_ddiv:
     b = pop_pair();
     a = pop_pair();
-    c = _gvn.transform( new DivDNode(0,a,b) );
+    c = _gvn.transform( new DivDNode(nullptr,a,b) );
     d = dprecision_rounding(c);
     push_pair( d );
     break;
@@ -2378,7 +2378,7 @@ void Parse::do_one_bytecode() {
       a = pop_pair();
       // a % b
 
-      c = _gvn.transform( new ModDNode(0,a,b) );
+      c = _gvn.transform( new ModDNode(nullptr,a,b) );
       d = dprecision_rounding(c);
       push_pair( d );
     }

From 388fcf03c02c41bb690733e8565642c24ead56e0 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Mon, 15 Jul 2024 16:00:00 +0000
Subject: [PATCH 091/401] 8336349: Fix more simple
 -Wzero-as-null-pointer-constant warnings in C2 code

Reviewed-by: kvn, shade
---
 src/hotspot/share/opto/buildOopMap.cpp |  4 ++--
 src/hotspot/share/opto/callnode.cpp    |  2 +-
 src/hotspot/share/opto/chaitin.cpp     |  4 ++--
 src/hotspot/share/opto/compile.cpp     |  2 +-
 src/hotspot/share/opto/domgraph.cpp    | 12 ++++++------
 src/hotspot/share/opto/idealKit.cpp    |  4 ++--
 src/hotspot/share/opto/ifg.cpp         |  4 ++--
 src/hotspot/share/opto/live.cpp        |  6 +++---
 src/hotspot/share/opto/loopnode.cpp    |  4 ++--
 src/hotspot/share/opto/matcher.cpp     |  4 ++--
 src/hotspot/share/opto/memnode.cpp     |  2 +-
 src/hotspot/share/opto/node.cpp        |  2 +-
 src/hotspot/share/opto/output.cpp      |  4 ++--
 src/hotspot/share/opto/phaseX.cpp      |  6 +++---
 src/hotspot/share/opto/reg_split.cpp   |  8 ++++----
 src/hotspot/share/opto/regalloc.cpp    |  4 ++--
 src/hotspot/share/opto/type.cpp        | 12 ++++++------
 17 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/hotspot/share/opto/buildOopMap.cpp b/src/hotspot/share/opto/buildOopMap.cpp
index 5b93e21b597b7..4591e87da2d14 100644
--- a/src/hotspot/share/opto/buildOopMap.cpp
+++ b/src/hotspot/share/opto/buildOopMap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -489,7 +489,7 @@ static void do_liveness(PhaseRegAlloc* regalloc, PhaseCFG* cfg, Block_List* work
         // GEN use'd bits
         for( uint l=1; l<n->req(); l++ ) {
           Node *def = n->in(l);
-          assert(def != 0, "input edge required");
+          assert(def != nullptr, "input edge required");
           int first = regalloc->get_reg_first(def);
           int second = regalloc->get_reg_second(def);
           //If peephole had removed the node,do not set live bit for it.
diff --git a/src/hotspot/share/opto/callnode.cpp b/src/hotspot/share/opto/callnode.cpp
index 6ac3d6e4c611c..282f0f7fce3ce 100644
--- a/src/hotspot/share/opto/callnode.cpp
+++ b/src/hotspot/share/opto/callnode.cpp
@@ -985,7 +985,7 @@ Node* CallNode::Ideal(PhaseGVN* phase, bool can_reshape) {
 }
 
 bool CallNode::is_call_to_arraycopystub() const {
-  if (_name != nullptr && strstr(_name, "arraycopy") != 0) {
+  if (_name != nullptr && strstr(_name, "arraycopy") != nullptr) {
     return true;
   }
   return false;
diff --git a/src/hotspot/share/opto/chaitin.cpp b/src/hotspot/share/opto/chaitin.cpp
index 97c45f508445e..220b916436ea8 100644
--- a/src/hotspot/share/opto/chaitin.cpp
+++ b/src/hotspot/share/opto/chaitin.cpp
@@ -69,7 +69,7 @@ void LRG::dump() const {
       tty->print(") ");
     }
   }
-  else if( _def == 0 ) tty->print("Dead ");
+  else if( _def == nullptr ) tty->print("Dead ");
   else tty->print("Def: N%d ",_def->_idx);
 
   tty->print("Cost:%4.2g Area:%4.2g Score:%4.2g ",_cost,_area, score());
@@ -203,7 +203,7 @@ PhaseChaitin::PhaseChaitin(uint unique, PhaseCFG &cfg, Matcher &matcher, bool sc
        nullptr
 #endif
        )
-  , _live(0)
+  , _live(nullptr)
   , _lo_degree(0), _lo_stk_degree(0), _hi_degree(0), _simplified(0)
   , _oldphi(unique)
 #ifndef PRODUCT
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index 3687bc70efdc4..4f5c7bf5c723c 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -1066,7 +1066,7 @@ void Compile::Init(bool aliasing) {
     if (has_method() && _directive->VectorizeOption) {
       set_do_vector_loop(true);
       NOT_PRODUCT(if (do_vector_loop() && Verbose) {tty->print("Compile::Init: do vectorized loops (SIMD like) for method %s\n",  method()->name()->as_quoted_ascii());})
-    } else if (has_method() && method()->name() != 0 &&
+    } else if (has_method() && method()->name() != nullptr &&
                method()->intrinsic_id() == vmIntrinsics::_forEachRemaining) {
       set_do_vector_loop(true);
     }
diff --git a/src/hotspot/share/opto/domgraph.cpp b/src/hotspot/share/opto/domgraph.cpp
index 42cd5f4a58c4d..46cf3316af51e 100644
--- a/src/hotspot/share/opto/domgraph.cpp
+++ b/src/hotspot/share/opto/domgraph.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,7 +62,7 @@ struct Tarjan {
 // constructed.  This is the Lengauer & Tarjan O(E-alpha(E,V)) algorithm.
 void PhaseCFG::build_dominator_tree() {
   // Pre-grow the blocks array, prior to the ResourceMark kicking in
-  _blocks.map(number_of_blocks(), 0);
+  _blocks.map(number_of_blocks(), nullptr);
 
   ResourceMark rm;
   // Setup mappings from my Graph to Tarjan's stuff and back
@@ -286,8 +286,8 @@ uint PhaseCFG::do_DFS(Tarjan *tarjan, uint rpo_counter) {
 
 void Tarjan::COMPRESS()
 {
-  assert( _ancestor != 0, "" );
-  if( _ancestor->_ancestor != 0 ) {
+  assert( _ancestor != nullptr, "" );
+  if( _ancestor->_ancestor != nullptr ) {
     _ancestor->COMPRESS( );
     if( _ancestor->_label->_semi < _label->_semi )
       _label = _ancestor->_label;
@@ -575,8 +575,8 @@ int NTarjan::DFS( NTarjan *ntarjan, VectorSet &visited, PhaseIdealLoop *pil, uin
 
 void NTarjan::COMPRESS()
 {
-  assert( _ancestor != 0, "" );
-  if( _ancestor->_ancestor != 0 ) {
+  assert( _ancestor != nullptr, "" );
+  if( _ancestor->_ancestor != nullptr ) {
     _ancestor->COMPRESS( );
     if( _ancestor->_label->_semi < _label->_semi )
       _label = _ancestor->_label;
diff --git a/src/hotspot/share/opto/idealKit.cpp b/src/hotspot/share/opto/idealKit.cpp
index 56b2dc93ed3b0..80c4791cfd5cc 100644
--- a/src/hotspot/share/opto/idealKit.cpp
+++ b/src/hotspot/share/opto/idealKit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@ IdealKit::IdealKit(GraphKit* gkit, bool delay_all_transforms, bool has_declarati
   assert(_initial_memory == nullptr || _initial_memory->Opcode() == Op_MergeMem, "memory must be pre-split");
   assert(!_gvn.is_IterGVN(), "IdealKit can't be used during Optimize phase");
   int init_size = 5;
-  _pending_cvstates = new (C->node_arena()) GrowableArray<Node*>(C->node_arena(), init_size, 0, 0);
+  _pending_cvstates = new (C->node_arena()) GrowableArray<Node*>(C->node_arena(), init_size, 0, nullptr);
   DEBUG_ONLY(_state = new (C->node_arena()) GrowableArray<int>(C->node_arena(), init_size, 0, 0));
   if (!has_declarations) {
      declarations_done();
diff --git a/src/hotspot/share/opto/ifg.cpp b/src/hotspot/share/opto/ifg.cpp
index ed728342fd014..b11fb3deb444e 100644
--- a/src/hotspot/share/opto/ifg.cpp
+++ b/src/hotspot/share/opto/ifg.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -622,7 +622,7 @@ bool PhaseChaitin::remove_node_if_not_used(Block* b, uint location, Node* n, uin
     b->remove_node(location);
     LRG& lrg = lrgs(lid);
     if (lrg._def == n) {
-      lrg._def = 0;
+      lrg._def = nullptr;
     }
     n->disconnect_inputs(C);
     _cfg.unmap_node_from_block(n);
diff --git a/src/hotspot/share/opto/live.cpp b/src/hotspot/share/opto/live.cpp
index 6932fd6a697e6..7378f36df5020 100644
--- a/src/hotspot/share/opto/live.cpp
+++ b/src/hotspot/share/opto/live.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,8 +44,8 @@
 // live-out sets.  This separate compilation is done in the outer loop below.
 PhaseLive::PhaseLive(const PhaseCFG &cfg, const LRG_List &names, Arena *arena, bool keep_deltas)
   : Phase(LIVE),
-  _live(0),
-  _livein(0),
+  _live(nullptr),
+  _livein(nullptr),
   _cfg(cfg),
   _names(names),
   _arena(arena),
diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index 0ea0e8cbcf505..cbb8758c12521 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -6338,7 +6338,7 @@ void PhaseIdealLoop::build_loop_late_post_work(Node *n, bool pinned) {
     }
   } else {                      // No slot zero
     if( n->is_CFG() ) {         // CFG with no slot 0 is dead
-      _loop_or_ctrl.map(n->_idx,0);    // No block setting, it's globally dead
+      _loop_or_ctrl.map(n->_idx,nullptr); // No block setting, it's globally dead
       return;
     }
     assert(!n->is_CFG() || n->outcnt() == 0, "");
@@ -6356,7 +6356,7 @@ void PhaseIdealLoop::build_loop_late_post_work(Node *n, bool pinned) {
       assert(_loop_or_ctrl[n->out(i1)->_idx] == nullptr, "all uses must also be dead");
     }
 #endif
-    _loop_or_ctrl.map(n->_idx, 0);     // This node is useless
+    _loop_or_ctrl.map(n->_idx, nullptr); // This node is useless
     _deadlist.push(n);
     return;
   }
diff --git a/src/hotspot/share/opto/matcher.cpp b/src/hotspot/share/opto/matcher.cpp
index 74e2ba603ac94..4c2f208e445c1 100644
--- a/src/hotspot/share/opto/matcher.cpp
+++ b/src/hotspot/share/opto/matcher.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1812,7 +1812,7 @@ MachNode *Matcher::ReduceInst( State *s, int rule, Node *&mem ) {
     ReduceInst_Interior( s, rule, mem, mach, 1 );
   } else {
     // Instruction chain rules are data-dependent on their inputs
-    mach->add_req(0);             // Set initial control to none
+    mach->add_req(nullptr);     // Set initial control to none
     ReduceInst_Chain_Rule( s, rule, mem, mach );
   }
 
diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp
index ad3a948793fa1..438dc5c1f64e6 100644
--- a/src/hotspot/share/opto/memnode.cpp
+++ b/src/hotspot/share/opto/memnode.cpp
@@ -2862,7 +2862,7 @@ class ArrayPointer {
                _pointer->_idx, _pointer->Name(),
                _base->_idx, _base->Name(),
                (long long)_constant_offset);
-    if (_int_offset != 0) {
+    if (_int_offset != nullptr) {
       tty->print(" + I2L[%d %s] << %d",
                  _int_offset->_idx, _int_offset->Name(), _int_offset_shift);
     }
diff --git a/src/hotspot/share/opto/node.cpp b/src/hotspot/share/opto/node.cpp
index d290541dffac3..6cf6ff2094e83 100644
--- a/src/hotspot/share/opto/node.cpp
+++ b/src/hotspot/share/opto/node.cpp
@@ -1101,7 +1101,7 @@ uint Node::size(PhaseRegAlloc *ra_) const { return 0; }
 //------------------------------CFG Construction-------------------------------
 // Nodes that end basic blocks, e.g. IfTrue/IfFalse, JumpProjNode, Root,
 // Goto and Return.
-const Node *Node::is_block_proj() const { return 0; }
+const Node *Node::is_block_proj() const { return nullptr; }
 
 // Minimum guaranteed type
 const Type *Node::bottom_type() const { return Type::BOTTOM; }
diff --git a/src/hotspot/share/opto/output.cpp b/src/hotspot/share/opto/output.cpp
index 8ea456d3417da..9631f40b67ec7 100644
--- a/src/hotspot/share/opto/output.cpp
+++ b/src/hotspot/share/opto/output.cpp
@@ -2900,7 +2900,7 @@ void Scheduling::verify_good_schedule( Block *b, const char *msg ) {
     // Now make all USEs live
     for( uint i=1; i<n->req(); i++ ) {
       Node *def = n->in(i);
-      assert(def != 0, "input edge required");
+      assert(def != nullptr, "input edge required");
       OptoReg::Name reg_lo = _regalloc->get_reg_first(def);
       OptoReg::Name reg_hi = _regalloc->get_reg_second(def);
       if( OptoReg::is_valid(reg_lo) ) {
@@ -2923,7 +2923,7 @@ void Scheduling::verify_good_schedule( Block *b, const char *msg ) {
 // Conditionally add precedence edges.  Avoid putting edges on Projs.
 static void add_prec_edge_from_to( Node *from, Node *to ) {
   if( from->is_Proj() ) {       // Put precedence edge on Proj's input
-    assert( from->req() == 1 && (from->len() == 1 || from->in(1)==0), "no precedence edges on projections" );
+    assert( from->req() == 1 && (from->len() == 1 || from->in(1) == nullptr), "no precedence edges on projections" );
     from = from->in(0);
   }
   if( from != to &&             // No cycles (for things like LD L0,[L0+4] )
diff --git a/src/hotspot/share/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp
index 499adf0f923cd..96e9f10880841 100644
--- a/src/hotspot/share/opto/phaseX.cpp
+++ b/src/hotspot/share/opto/phaseX.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -780,7 +780,7 @@ void PhaseGVN::dead_loop_check( Node *n ) {
         }
       }
     }
-    if (!no_dead_loop) n->dump_bfs(100,0,"#");
+    if (!no_dead_loop) n->dump_bfs(100,nullptr,"#");
     assert(no_dead_loop, "dead loop detected");
   }
 }
@@ -1135,7 +1135,7 @@ bool PhaseIterGVN::verify_node_value(Node* n) {
   }
   tty->cr();
   tty->print_cr("Missed Value optimization:");
-  n->dump_bfs(1, 0, "");
+  n->dump_bfs(1, nullptr, "");
   tty->print_cr("Current type:");
   told->dump_on(tty);
   tty->cr();
diff --git a/src/hotspot/share/opto/reg_split.cpp b/src/hotspot/share/opto/reg_split.cpp
index 35b2618c64c40..9f89c683b34b5 100644
--- a/src/hotspot/share/opto/reg_split.cpp
+++ b/src/hotspot/share/opto/reg_split.cpp
@@ -309,7 +309,7 @@ static Node* clone_node(Node* def, Block *b, Compile* C) {
       assert(false, "RA Split failed: attempt to clone node with anti_dependence");
       C->record_method_not_compilable("RA Split failed: attempt to clone node with anti_dependence");
     }
-    return 0;
+    return nullptr;
   }
   return def->clone();
 }
@@ -341,7 +341,7 @@ Node *PhaseChaitin::split_Rematerialize(Node *def, Block *b, uint insidx, uint &
       Node *in_spill;
       if (in->ideal_reg() != Op_RegFlags) {
         in_spill = get_spillcopy_wide(MachSpillCopyNode::InputToRematerialization, in, def, i);
-        if (!in_spill) { return 0; } // Bailed out
+        if (!in_spill) { return nullptr; } // Bailed out
         insert_proj(b_def, idx_def, in_spill, maxlrg++);
         if (b_def == b) {
           insidx++;
@@ -357,7 +357,7 @@ Node *PhaseChaitin::split_Rematerialize(Node *def, Block *b, uint insidx, uint &
                  " range and defining node %d: %s may not be rematerialized.",
                  def->_idx, def->Name(), in->_idx, in->Name());
           C->record_method_not_compilable("attempted to spill a non-spillable item with RegFlags input");
-          return 0; // Bailed out
+          return nullptr; // Bailed out
         }
       }
     }
@@ -366,7 +366,7 @@ Node *PhaseChaitin::split_Rematerialize(Node *def, Block *b, uint insidx, uint &
   Node *spill = clone_node(def, b, C);
   if (spill == nullptr || C->check_node_count(NodeLimitFudgeFactor, out_of_nodes)) {
     // Check when generating nodes
-    return 0;
+    return nullptr;
   }
 
   // See if any inputs are currently being spilled, and take the
diff --git a/src/hotspot/share/opto/regalloc.cpp b/src/hotspot/share/opto/regalloc.cpp
index df5071635c764..d06619976f368 100644
--- a/src/hotspot/share/opto/regalloc.cpp
+++ b/src/hotspot/share/opto/regalloc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@ PhaseRegAlloc::PhaseRegAlloc( uint unique, PhaseCFG &cfg,
                               Matcher &matcher,
                               void (*pr_stats)() ):
                Phase(Register_Allocation),
-               _node_regs(0),
+               _node_regs(nullptr),
                _node_regs_max_index(0),
                _cfg(cfg),
                _framesize(0xdeadbeef),
diff --git a/src/hotspot/share/opto/type.cpp b/src/hotspot/share/opto/type.cpp
index 690107f169c4b..967b4a815d09e 100644
--- a/src/hotspot/share/opto/type.cpp
+++ b/src/hotspot/share/opto/type.cpp
@@ -554,9 +554,9 @@ void Type::Initialize_shared(Compile* current) {
   TypeInstPtr::BOTTOM  = TypeInstPtr::make(TypePtr::BotPTR,  current->env()->Object_klass());
   TypeInstPtr::MIRROR  = TypeInstPtr::make(TypePtr::NotNull, current->env()->Class_klass());
   TypeInstPtr::MARK    = TypeInstPtr::make(TypePtr::BotPTR,  current->env()->Object_klass(),
-                                           false, 0, oopDesc::mark_offset_in_bytes());
+                                           false, nullptr, oopDesc::mark_offset_in_bytes());
   TypeInstPtr::KLASS   = TypeInstPtr::make(TypePtr::BotPTR,  current->env()->Object_klass(),
-                                           false, 0, oopDesc::klass_offset_in_bytes());
+                                           false, nullptr, oopDesc::klass_offset_in_bytes());
   TypeOopPtr::BOTTOM  = TypeOopPtr::make(TypePtr::BotPTR, OffsetBot, TypeOopPtr::InstanceBot);
 
   TypeMetadataPtr::BOTTOM = TypeMetadataPtr::make(TypePtr::BotPTR, nullptr, OffsetBot);
@@ -567,7 +567,7 @@ void Type::Initialize_shared(Compile* current) {
   TypeNarrowKlass::NULL_PTR = TypeNarrowKlass::make( TypePtr::NULL_PTR );
 
   mreg2type[Op_Node] = Type::BOTTOM;
-  mreg2type[Op_Set ] = 0;
+  mreg2type[Op_Set ] = nullptr;
   mreg2type[Op_RegN] = TypeNarrowOop::BOTTOM;
   mreg2type[Op_RegI] = TypeInt::INT;
   mreg2type[Op_RegP] = TypePtr::BOTTOM;
@@ -3129,7 +3129,7 @@ const TypeRawPtr *TypeRawPtr::NOTNULL;
 const TypeRawPtr *TypeRawPtr::make( enum PTR ptr ) {
   assert( ptr != Constant, "what is the constant?" );
   assert( ptr != Null, "Use TypePtr for null" );
-  return (TypeRawPtr*)(new TypeRawPtr(ptr,0))->hashcons();
+  return (TypeRawPtr*)(new TypeRawPtr(ptr,nullptr))->hashcons();
 }
 
 const TypeRawPtr *TypeRawPtr::make( address bits ) {
@@ -3141,7 +3141,7 @@ const TypeRawPtr *TypeRawPtr::make( address bits ) {
 const TypeRawPtr* TypeRawPtr::cast_to_ptr_type(PTR ptr) const {
   assert( ptr != Constant, "what is the constant?" );
   assert( ptr != Null, "Use TypePtr for null" );
-  assert( _bits==0, "Why cast a constant address?");
+  assert( _bits == nullptr, "Why cast a constant address?");
   if( ptr == _ptr ) return this;
   return make(ptr);
 }
@@ -3525,7 +3525,7 @@ TypeOopPtr::TypeOopPtr(TYPES t, PTR ptr, ciKlass* k, const TypeInterfaces* inter
   }
 #endif
   if (Compile::current()->eliminate_boxing() && (t == InstPtr) &&
-      (offset > 0) && xk && (k != 0) && k->is_instance_klass()) {
+      (offset > 0) && xk && (k != nullptr) && k->is_instance_klass()) {
     _is_ptr_to_boxed_value = k->as_instance_klass()->is_boxed_value_offset(offset);
   }
 #ifdef _LP64

From c8a95a763c169b94c5ba07d2c6fbdf99ba3b9e3b Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Mon, 15 Jul 2024 20:26:52 +0000
Subject: [PATCH 092/401] 8072701: resume001 failed due to ERROR: timeout for
 waiting for a BreakpintEvent

Reviewed-by: amenkov, kevinw, sspitsyn
---
 .../jdi/ThreadReference/resume/resume001.java | 30 ++++++++++++++-----
 .../ThreadReference/resume/resume001a.java    | 10 +++++--
 .../vmTestbase/nsk/share/jdi/Debugee.java     |  6 ++--
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001.java
index c98248eeb5112..c7dd827a5698f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001.java
@@ -117,6 +117,7 @@ private static void log3(String message) {
     static int waitTime;
 
     static VirtualMachine      vm            = null;
+    static Debugee             debuggee      = null;
     static EventRequestManager eventRManager = null;
     static EventQueue          eventQueue    = null;
     static EventSet            eventSet      = null;
@@ -137,8 +138,6 @@ private static void log3(String message) {
 
     private int runThis (String argv[], PrintStream out) {
 
-        Debugee debuggee;
-
         argsHandler     = new ArgumentHandler(argv);
         logHandler      = new Log(out, argsHandler);
         Binder binder   = new Binder(argsHandler, logHandler);
@@ -336,13 +335,23 @@ private int runThis (String argv[], PrintStream out) {
                     break label1;
                 log2("       thread2 is at breakpoint");
 
-
                 log2("......checking up that thread2.resume() resumes thread2 suspended with VirtualMachine.suspend()");
 
                 log2("       enabling breakpRequest3");
                 breakpRequest3.enable();
+
+                // don't do vm.suspend() until mainThread is waiting
+                line = pipe.readln();
+                if (line.equals("waiting")) {
+                    log2("     : returned string is 'waiting'");
+                } else {
+                    log3("ERROR: returned string is not 'waiting': " + line);
+                    expresult = returnCode4;
+                    break label1;
+                }
                 log2("       suspending the thread2 with vm.suspend()");
                 vm.suspend();
+
                 log2("       first resuming the thread2 with eventSet.resume()");
                 eventSet.resume();
                 log2("       checking up thread's state");
@@ -361,13 +370,17 @@ private int runThis (String argv[], PrintStream out) {
                         break label1;
                 log2("       thread2 is at breakpoint");
 
-
-                log2("      resuming the thread2");
+                log2("       resuming the thread2");
                 thread2.resume();
 
+                log2("       undo the vm.suspend() with vm.resume()");
+                vm.resume();
+            }
+            // These are only needed if we break out of the loop due to an error
+            if (expresult != returnCode0) {
+                vm.resume();
+                vm.resume();  // for case error when both VirtualMachine and the thread2 were suspended
             }
-            vm.resume();
-            vm.resume();  // for case error when both VirtualMachine and the thread2 were suspended
 
             //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             log2("     the end of testing");
@@ -487,7 +500,8 @@ private int breakpoint () {
                 try {
                     eventSet = eventQueue.remove(waitTime*60000);
                     if (eventSet == null) {
-                        log3("ERROR:  timeout for waiting for a BreakpintEvent");
+                        log3("ERROR:  timeout for waiting for a BreakpointEvent");
+                        debuggee.printThreadsInfo(vm);
                         returnCode = returnCode3;
                         break labelBP;
                     }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001a.java
index 7d52f788e2a18..7efc2dd7c0163 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/resume/resume001a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -81,7 +81,13 @@ public static void main (String argv[]) {
 
             String instruction;
 
-            log1("waiting for an instruction from the debugger ...");
+            log1("waiting for an instruction from the debugger: iteration " + i);
+            if (i == 1) {
+                // Let the debugger know we finished the first iteration and are now
+                // waiting for next command. This is needed so we don't suspend the
+                // main thread while it is doing a log(), which can hold a needed lock.
+                pipe.println("waiting");
+            }
             instruction = pipe.readln();
             if (instruction.equals("quit")) {
                 log1("'quit' recieved");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java
index 6b4f65bc625ab..732a7a6696b27 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java
@@ -595,9 +595,9 @@ public int endDebugee() {
     /*
      * Print information about all threads in debuggee VM
      */
-    protected void printThreadsInfo(VirtualMachine vm)  {
+    public void printThreadsInfo(VirtualMachine vm) {
         try {
-            log.display("------------ Try to print debuggee threads before killing process ------------");
+            log.display("------------ Print debuggee threads ------------");
             if (vm == null) {
                 log.display("Can't print threads info because 'vm' is null");
                 return;
@@ -631,7 +631,7 @@ protected void printThreadsInfo(VirtualMachine vm)  {
                     }
                 }
             }
-            log.display("----------------------------------------------------------------------");
+            log.display("------------------------------------------------");
         } catch (Throwable t) {
             log.complain("");
             t.printStackTrace(log.getOutStream());

From bc7cd42d11943003470ed4c93a25db3a8f9b5d21 Mon Sep 17 00:00:00 2001
From: Alexey Ushakov <avu@openjdk.org>
Date: Mon, 15 Jul 2024 23:25:11 +0000
Subject: [PATCH 093/401] 8314498: [macos] Transferring File objects to Finder
 fails

Co-authored-by: Andrey Starovoyt <Andrey.Starovoyt@jetbrains.com>
Reviewed-by: prr
---
 .../classes/sun/lwawt/macosx/CClipboard.java  |  7 +++-
 .../native/libawt_lwawt/awt/CClipboard.m      | 33 +++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CClipboard.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CClipboard.java
index 19f9a4082205b..4499151d5459d 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CClipboard.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CClipboard.java
@@ -89,7 +89,11 @@ protected void setContentsNative(Transferable contents) {
 
             try {
                 byte[] bytes = DataTransferer.getInstance().translateTransferable(contents, flavor, format);
-                setData(bytes, format);
+                if (DataFlavor.javaFileListFlavor.equals(flavor)) {
+                    writeFileObjects(bytes);
+                } else {
+                    setData(bytes, format);
+                }
             } catch (IOException e) {
                 // Fix 4696186: don't print exception if data with
                 // javaJVMLocalObjectMimeType failed to serialize.
@@ -127,6 +131,7 @@ protected void registerClipboardViewerChecked()    {
 
     private native void declareTypes(long[] formats, SunClipboard newOwner);
     private native void setData(byte[] data, long format);
+    private native void writeFileObjects(byte[] data);
 
     void checkPasteboardAndNotify() {
         if (checkPasteboardWithoutNotification()) {
diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/CClipboard.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/CClipboard.m
index 9818300f6a6b6..a3edadc26299a 100644
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/CClipboard.m
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/CClipboard.m
@@ -174,6 +174,39 @@ - (BOOL) checkPasteboardWithoutNotification:(id)application {
 JNI_COCOA_EXIT(env);
 }
 
+/*
+ * Class:     sun_lwawt_macosx_CClipboard
+ * Method:    writeFileObjects
+ * Signature: ([B)V
+*/
+JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CClipboard_writeFileObjects
+(JNIEnv *env, jobject inObject, jbyteArray inBytes)
+{
+    CHECK_NULL(inBytes);
+
+JNI_COCOA_ENTER(env);
+    jint nBytes = (*env)->GetArrayLength(env, inBytes);
+    jbyte *rawBytes = (*env)->GetPrimitiveArrayCritical(env, inBytes, NULL);
+    CHECK_NULL(rawBytes);
+    NSMutableArray *formatArray = [NSMutableArray arrayWithCapacity:2];
+    int i = 0;
+    for (int j = 0; j < nBytes; j++) {
+        if (rawBytes[j] == 0) {
+            NSString *path = [NSString stringWithUTF8String:(const char*)(rawBytes + i)];
+            NSURL *fileURL = [NSURL fileURLWithPath:path];
+            [formatArray addObject:fileURL.absoluteURL];
+            i = j + 1;
+        }
+    }
+    (*env)->ReleasePrimitiveArrayCritical(env, inBytes, rawBytes, JNI_ABORT);
+
+    [ThreadUtilities performOnMainThreadWaiting:YES block:^() {
+        [[NSPasteboard generalPasteboard] writeObjects:formatArray];
+    }];
+JNI_COCOA_EXIT(env);
+}
+
+
 /*
  * Class:     sun_lwawt_macosx_CClipboard
  * Method:    getClipboardFormats

From 8feabc849ba2f617c8c6dbb2ec5074297beb6437 Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Tue, 16 Jul 2024 01:43:36 +0000
Subject: [PATCH 094/401] 8334057: JLinkReproducibleTest.java support receive
 test.tool.vm.opts

Reviewed-by: jpai
---
 test/jdk/tools/jlink/JLinkReproducibleTest.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/jdk/tools/jlink/JLinkReproducibleTest.java b/test/jdk/tools/jlink/JLinkReproducibleTest.java
index 09591dabe17b1..da9e2aa1dfc82 100644
--- a/test/jdk/tools/jlink/JLinkReproducibleTest.java
+++ b/test/jdk/tools/jlink/JLinkReproducibleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,9 @@
  * @run driver JLinkReproducibleTest
  */
 public class JLinkReproducibleTest {
+
+    private static final String TOOL_VM_OPTIONS = System.getProperty("test.tool.vm.opts", "");
+
     private static void run(List<String> cmd) throws Exception {
         var pb = new ProcessBuilder(cmd.toArray(new String[0]));
         var res = ProcessTools.executeProcess(pb);
@@ -46,6 +49,9 @@ private static void run(List<String> cmd) throws Exception {
     private static void jlink(Path image, boolean with_default_trace_file) throws Exception {
         var cmd = new ArrayList<String>();
         cmd.add(JDKToolFinder.getJDKTool("jlink"));
+        if (!TOOL_VM_OPTIONS.isEmpty()) {
+            cmd.addAll(Arrays.asList(TOOL_VM_OPTIONS.split("\\s+", -1)));
+        }
         cmd.addAll(List.of(
             "--module-path", JMODS_DIR.toString() + File.pathSeparator + CLASS_DIR.toString(),
             "--add-modules", "main",

From 419cc4624891e5775847f8acaf92fa8c42a9719c Mon Sep 17 00:00:00 2001
From: Christoph Langer <clanger@openjdk.org>
Date: Tue, 16 Jul 2024 12:48:06 +0000
Subject: [PATCH 095/401] 8335533: OutOfMemoryError: Metaspace observed again
 on AIX in test RedefineLeakThrowable.java after JDK-8294960

Reviewed-by: mbaesken, stuefe
---
 .../jvmti/RedefineClasses/RedefineLeakThrowable.java          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineLeakThrowable.java b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineLeakThrowable.java
index bf5105f26740c..8d008e1d6aa78 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineLeakThrowable.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineLeakThrowable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
  * @modules java.instrument
  *          java.compiler
  * @run main RedefineClassHelper
- * @run main/othervm/timeout=6000 -javaagent:redefineagent.jar -XX:MetaspaceSize=23m -XX:MaxMetaspaceSize=23m RedefineLeakThrowable
+ * @run main/othervm/timeout=6000 -javaagent:redefineagent.jar -XX:MetaspaceSize=25m -XX:MaxMetaspaceSize=25m RedefineLeakThrowable
  */
 
 /*

From c99be357c9ff3b4f7edd8673beefeab54aa4ee90 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 16 Jul 2024 15:23:55 +0000
Subject: [PATCH 096/401] 8336474: Problemlist compiler/interpreter/Test6833129
 on x86_32

Reviewed-by: thartmann, stuefe
---
 test/hotspot/jtreg/ProblemList.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 76dc9f6f033fa..000a290856170 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -71,6 +71,8 @@ compiler/codecache/CodeCacheFullCountTest.java 8332954 generic-all
 
 compiler/vectorization/TestFloat16VectorConvChain.java 8335860 generic-all
 
+compiler/interpreter/Test6833129.java 8335266 generic-i586
+
 #############################################################################
 
 # :hotspot_gc

From 88eff4c3054b7d9d6486ff418bbecca8f0388117 Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <kvn@openjdk.org>
Date: Tue, 16 Jul 2024 16:11:00 +0000
Subject: [PATCH 097/401] 8336421: ciMethod() constructor should use
 ConditionalMutexLocker(Compile_lock)

Reviewed-by: jwaters, thartmann, shade
---
 src/hotspot/share/ci/ciMethod.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/ci/ciMethod.cpp b/src/hotspot/share/ci/ciMethod.cpp
index 844ef0a0c03da..bc95f322d0d06 100644
--- a/src/hotspot/share/ci/ciMethod.cpp
+++ b/src/hotspot/share/ci/ciMethod.cpp
@@ -109,7 +109,8 @@ ciMethod::ciMethod(const methodHandle& h_m, ciInstanceKlass* holder) :
   ciEnv *env = CURRENT_ENV;
   if (env->jvmti_can_hotswap_or_post_breakpoint()) {
     // 6328518 check hotswap conditions under the right lock.
-    MutexLocker locker(Compile_lock);
+    bool should_take_Compile_lock = !Compile_lock->owned_by_self();
+    ConditionalMutexLocker locker(Compile_lock, should_take_Compile_lock, Mutex::_safepoint_check_flag);
     if (Dependencies::check_evol_method(h_m()) != nullptr) {
       _is_c1_compilable = false;
       _is_c2_compilable = false;

From 59bf3d77aa96dfdc199f5a6893c76c8a379e9fba Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Tue, 16 Jul 2024 17:53:08 +0000
Subject: [PATCH 098/401] 8336080: Fix -Wzero-as-null-pointer-constant warnings
 in ClassLoaderStats ctor

Reviewed-by: dholmes, iwalulya
---
 src/hotspot/share/classfile/classLoaderStats.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/classfile/classLoaderStats.hpp b/src/hotspot/share/classfile/classLoaderStats.hpp
index 8296c6ee25f3c..4818ddff609fa 100644
--- a/src/hotspot/share/classfile/classLoaderStats.hpp
+++ b/src/hotspot/share/classfile/classLoaderStats.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -82,9 +82,9 @@ class ClassLoaderStats : public ResourceObj {
   uintx             _hidden_classes_count;
 
   ClassLoaderStats() :
-    _cld(0),
-    _class_loader(0),
-    _parent(0),
+    _cld(nullptr),
+    _class_loader(),
+    _parent(),
     _chunk_sz(0),
     _block_sz(0),
     _classes_count(0),

From a60608e7a35aeeed57bcce641d4957de1e4b4def Mon Sep 17 00:00:00 2001
From: Alex Menkov <amenkov@openjdk.org>
Date: Tue, 16 Jul 2024 18:10:47 +0000
Subject: [PATCH 099/401] 8334169: Long arguments of attach operation are
 silently truncated on Windows

Reviewed-by: sspitsyn, cjplummer
---
 .../native/libattach/VirtualMachineImpl.c     |  48 +++--
 .../serviceability/attach/LongArgTest.java    | 179 ++++++++++++++++++
 2 files changed, 212 insertions(+), 15 deletions(-)
 create mode 100644 test/hotspot/jtreg/serviceability/attach/LongArgTest.java

diff --git a/src/jdk.attach/windows/native/libattach/VirtualMachineImpl.c b/src/jdk.attach/windows/native/libattach/VirtualMachineImpl.c
index 3e3118c327f2f..a8b17c22d83f2 100644
--- a/src/jdk.attach/windows/native/libattach/VirtualMachineImpl.c
+++ b/src/jdk.attach/windows/native/libattach/VirtualMachineImpl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,8 +54,8 @@ typedef jint (WINAPI* EnqueueOperationFunc)
 static HANDLE
 doPrivilegedOpenProcess(DWORD dwDesiredAccess, BOOL bInheritHandle, DWORD dwProcessId);
 
-/* convert jstring to C string */
-static void jstring_to_cstring(JNIEnv* env, jstring jstr, char* cstr, int len);
+/* Converts jstring to C string, returns JNI_FALSE if the string has been truncated. */
+static jboolean jstring_to_cstring(JNIEnv* env, jstring jstr, char* cstr, size_t cstr_buf_size);
 
 
 /*
@@ -75,9 +75,9 @@ typedef struct {
    char jvmLib[MAX_LIBNAME_LENGTH];         /* "jvm.dll" */
    char func1[MAX_FUNC_LENGTH];
    char func2[MAX_FUNC_LENGTH];
-   char cmd[MAX_CMD_LENGTH];                /* "load", "dump", ...      */
-   char arg[MAX_ARGS][MAX_ARG_LENGTH];      /* arguments to command     */
-   char pipename[MAX_PIPE_NAME_LENGTH];
+   char cmd[MAX_CMD_LENGTH + 1];            /* "load", "dump", ...      */
+   char arg[MAX_ARGS][MAX_ARG_LENGTH + 1];  /* arguments to command     */
+   char pipename[MAX_PIPE_NAME_LENGTH + 1];
 } DataBlock;
 
 /*
@@ -377,7 +377,6 @@ JNIEXPORT jint JNICALL Java_sun_tools_attach_VirtualMachineImpl_readPipe
     return (jint)nread;
 }
 
-
 /*
  * Class:     sun_tools_attach_VirtualMachineImpl
  * Method:    enqueue
@@ -410,7 +409,11 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_enqueue
     /*
      * Command and arguments
      */
-    jstring_to_cstring(env, cmd, data.cmd, MAX_CMD_LENGTH);
+    if (!jstring_to_cstring(env, cmd, data.cmd, sizeof(data.cmd))) {
+        JNU_ThrowByName(env, "com/sun/tools/attach/AttachOperationFailedException",
+                        "command is too long");
+        return;
+    }
     argsLen = (*env)->GetArrayLength(env, args);
 
     if (argsLen > 0) {
@@ -423,7 +426,11 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_enqueue
             if (obj == NULL) {
                 data.arg[i][0] = '\0';
             } else {
-                jstring_to_cstring(env, obj, data.arg[i], MAX_ARG_LENGTH);
+                if (!jstring_to_cstring(env, obj, data.arg[i], sizeof(data.arg[i]))) {
+                    JNU_ThrowByName(env, "com/sun/tools/attach/AttachOperationFailedException",
+                                    "argument is too long");
+                    return;
+                }
             }
             if ((*env)->ExceptionOccurred(env)) return;
         }
@@ -433,7 +440,11 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_enqueue
     }
 
     /* pipe name */
-    jstring_to_cstring(env, pipename, data.pipename, MAX_PIPE_NAME_LENGTH);
+    if (!jstring_to_cstring(env, pipename, data.pipename, sizeof(data.pipename))) {
+        JNU_ThrowByName(env, "com/sun/tools/attach/AttachOperationFailedException",
+                        "pipe name is too long");
+        return;
+    }
 
     /*
      * Allocate memory in target process for data and code stub
@@ -615,21 +626,28 @@ doPrivilegedOpenProcess(DWORD dwDesiredAccess, BOOL bInheritHandle, DWORD dwProc
     return hProcess;
 }
 
-/* convert jstring to C string */
-static void jstring_to_cstring(JNIEnv* env, jstring jstr, char* cstr, int len) {
+/* Converts jstring to C string, returns JNI_FALSE if the string has been truncated. */
+static jboolean jstring_to_cstring(JNIEnv* env, jstring jstr, char* cstr, size_t cstr_buf_size) {
     jboolean isCopy;
     const char* str;
+    jboolean result = JNI_TRUE;
 
     if (jstr == NULL) {
         cstr[0] = '\0';
     } else {
         str = JNU_GetStringPlatformChars(env, jstr, &isCopy);
-        if ((*env)->ExceptionOccurred(env)) return;
+        if ((*env)->ExceptionOccurred(env)) {
+            return result;
+        }
+        if (strlen(str) >= cstr_buf_size) {
+            result = JNI_FALSE;
+        }
 
-        strncpy(cstr, str, len);
-        cstr[len-1] = '\0';
+        strncpy(cstr, str, cstr_buf_size);
+        cstr[cstr_buf_size - 1] = '\0';
         if (isCopy) {
             JNU_ReleaseStringPlatformChars(env, jstr, str);
         }
     }
+    return result;
 }
diff --git a/test/hotspot/jtreg/serviceability/attach/LongArgTest.java b/test/hotspot/jtreg/serviceability/attach/LongArgTest.java
new file mode 100644
index 0000000000000..f7d8a330a6ba3
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/attach/LongArgTest.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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
+ * @summary Tests that long arguments of attach operation are not truncated
+ * @bug 8334168
+ * @library /test/lib
+ * @modules jdk.attach/sun.tools.attach
+ * @run main LongArgTest
+ */
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.InputStream;
+import java.io.IOException;
+
+import com.sun.tools.attach.VirtualMachine;
+import sun.tools.attach.HotSpotVirtualMachine;
+
+import jdk.test.lib.apps.LingeredApp;
+
+public class LongArgTest {
+
+    // current restriction: max arg size is 1024
+    private static int MAX_ARG_SIZE = 1024;
+
+    public static void main(String[] args) throws Exception {
+        LingeredApp app = null;
+        try {
+            app = LingeredApp.startApp();
+
+            // sanity
+            test(app)
+                .mustSucceed()
+                .run();
+
+            test(app)
+                .valueLength(MAX_ARG_SIZE)
+                .mustSucceed()
+                .run();
+
+            test(app)
+                .valueLength(MAX_ARG_SIZE + 1)
+                .run();
+
+            // more than max args (3) with MAX_ARG_SIZE
+            test(app)
+                .valueLength(3 * MAX_ARG_SIZE + 1)
+                .run();
+
+        } finally {
+            LingeredApp.stopApp(app);
+        }
+    }
+
+    private static Test test(LingeredApp app) {
+        return new Test(app);
+    }
+
+    // For simplicity, the test uses internal HotSpotVirtualMachine,
+    // sets/gets "HeapDumpPath" flag value (string flag, not validated by JVM).
+    private static class Test {
+        private LingeredApp app;
+        private String flagName = "HeapDumpPath";
+        private String flagValue = generateValue(5);
+        private boolean setFlagMustSucceed = false;
+
+        Test(LingeredApp app) {
+            this.app = app;
+        }
+
+        Test valueLength(int len) {
+            flagValue = generateValue(len);
+            return this;
+        }
+
+        Test mustSucceed() {
+            setFlagMustSucceed = true;
+            return this;
+        }
+
+        void run() throws Exception {
+            System.out.println("======== Start ========");
+            System.out.println("Arg size = " + flagValue.length());
+
+            HotSpotVirtualMachine vm = (HotSpotVirtualMachine)VirtualMachine.attach(String.valueOf(app.getPid()));
+
+            if (setFlag(vm)) {
+                String actualValue = getFlag(vm);
+
+                if (!flagValue.equals(actualValue)) {
+                    String msg = "Actual value is different: ";
+                    if (actualValue == null) {
+                        msg += "null";
+                    } else if (flagValue.startsWith(actualValue)) {
+                        msg += "truncated from " + flagValue.length() + " to " + actualValue.length();
+                    } else {
+                        msg += actualValue + ", expected value: " + flagValue;
+                    }
+                    System.out.println(msg);
+                    vm.detach();
+                    throw new RuntimeException(msg);
+                } else {
+                    System.out.println("Actual value matches: " + actualValue);
+                }
+            }
+
+            vm.detach();
+
+            System.out.println("======== End ========");
+            System.out.println();
+        }
+
+        // Sets the flag value, return true on success.
+        private boolean setFlag(HotSpotVirtualMachine vm) throws Exception {
+            BufferedReader replyReader = null;
+            try {
+                replyReader = new BufferedReader(new InputStreamReader(
+                    vm.setFlag(flagName, flagValue)));
+            } catch (IOException ex) {
+                if (setFlagMustSucceed) {
+                    throw ex;
+                }
+                System.out.println("OK: setFlag() thrown exception:");
+                ex.printStackTrace(System.out);
+                return false;
+            }
+
+            String line;
+            while ((line = replyReader.readLine()) != null) {
+                System.out.println("setFlag: " + line);
+            }
+            replyReader.close();
+            return true;
+        }
+
+        private String getFlag(HotSpotVirtualMachine vm) throws Exception {
+            // Then read and make sure we get back the same value.
+            BufferedReader replyReader = new BufferedReader(new InputStreamReader(vm.printFlag(flagName)));
+
+            String prefix = "-XX:" + flagName + "=";
+            String value = null;
+            String line;
+            while((line = replyReader.readLine()) != null) {
+                System.out.println("getFlag: " + line);
+                if (line.startsWith(prefix)) {
+                    value = line.substring(prefix.length());
+                }
+            }
+            return value;
+        }
+
+        private String generateValue(int len) {
+            return "X" + "A".repeat(len - 2) + "X";
+        }
+    }
+
+}

From 005fb67e99370ef2bd15dae621a3924e1cf00124 Mon Sep 17 00:00:00 2001
From: Cesar Soares Lucas <cslucas@openjdk.org>
Date: Tue, 16 Jul 2024 20:47:42 +0000
Subject: [PATCH 100/401] 8331194: NPE in ArrayCreationTree.java with
 -XX:-UseCompressedOops

Reviewed-by: kvn
---
 src/hotspot/share/opto/machnode.hpp           |  4 +
 src/hotspot/share/opto/output.cpp             | 26 +++++-
 src/hotspot/share/opto/output.hpp             |  3 +
 ...stReduceAllocationAndNestedScalarized.java | 80 +++++++++++++++++++
 4 files changed, 112 insertions(+), 1 deletion(-)
 create mode 100644 test/hotspot/jtreg/compiler/escapeAnalysis/TestReduceAllocationAndNestedScalarized.java

diff --git a/src/hotspot/share/opto/machnode.hpp b/src/hotspot/share/opto/machnode.hpp
index 4d7b9c62aaa5b..6fcbabdab90f3 100644
--- a/src/hotspot/share/opto/machnode.hpp
+++ b/src/hotspot/share/opto/machnode.hpp
@@ -867,6 +867,10 @@ class MachSafePointNode : public MachReturnNode {
     assert(verify_jvms(jvms), "jvms must match");
     return in(_jvmadj + jvms->monitor_box_offset(idx));
   }
+  Node* scalarized_obj(const JVMState* jvms, uint idx) const {
+    assert(verify_jvms(jvms), "jvms must match");
+    return in(_jvmadj + jvms->scloff() + idx);
+  }
   void  set_local(const JVMState* jvms, uint idx, Node *c) {
     assert(verify_jvms(jvms), "jvms must match");
     set_req(_jvmadj + jvms->locoff() + idx, c);
diff --git a/src/hotspot/share/opto/output.cpp b/src/hotspot/share/opto/output.cpp
index 9631f40b67ec7..fd7d0eaf1719a 100644
--- a/src/hotspot/share/opto/output.cpp
+++ b/src/hotspot/share/opto/output.cpp
@@ -974,6 +974,27 @@ bool PhaseOutput::contains_as_owner(GrowableArray<MonitorValue*> *monarray, Obje
   return false;
 }
 
+// Determine if there is a scalar replaced object description represented by 'ov'.
+bool PhaseOutput::contains_as_scalarized_obj(JVMState* jvms, MachSafePointNode* sfn,
+                                             GrowableArray<ScopeValue*>* objs,
+                                             ObjectValue* ov) const {
+  for (int i = 0; i < jvms->scl_size(); i++) {
+    Node* n = sfn->scalarized_obj(jvms, i);
+    // Other kinds of nodes that we may encounter here, for instance constants
+    // representing values of fields of objects scalarized, aren't relevant for
+    // us, since they don't map to ObjectValue.
+    if (!n->is_SafePointScalarObject()) {
+      continue;
+    }
+
+    ObjectValue* other = (ObjectValue*) sv_for_node_id(objs, n->_idx);
+    if (ov == other) {
+      return true;
+    }
+  }
+  return false;
+}
+
 //--------------------------Process_OopMap_Node--------------------------------
 void PhaseOutput::Process_OopMap_Node(MachNode *mach, int current_offset) {
   // Handle special safepoint nodes for synchronization
@@ -1137,7 +1158,10 @@ void PhaseOutput::Process_OopMap_Node(MachNode *mach, int current_offset) {
 
         for (int j = 0; j< merge->possible_objects()->length(); j++) {
           ObjectValue* ov = merge->possible_objects()->at(j)->as_ObjectValue();
-          bool is_root = locarray->contains(ov) || exparray->contains(ov) || contains_as_owner(monarray, ov);
+          bool is_root = locarray->contains(ov) ||
+                         exparray->contains(ov) ||
+                         contains_as_owner(monarray, ov) ||
+                         contains_as_scalarized_obj(jvms, sfn, objs, ov);
           ov->set_root(is_root);
         }
       }
diff --git a/src/hotspot/share/opto/output.hpp b/src/hotspot/share/opto/output.hpp
index 9431ef3d5089f..503f5414dc4fd 100644
--- a/src/hotspot/share/opto/output.hpp
+++ b/src/hotspot/share/opto/output.hpp
@@ -208,6 +208,9 @@ class PhaseOutput : public Phase {
 
   bool starts_bundle(const Node *n) const;
   bool contains_as_owner(GrowableArray<MonitorValue*> *monarray, ObjectValue *ov) const;
+  bool contains_as_scalarized_obj(JVMState* jvms, MachSafePointNode* sfn,
+                                  GrowableArray<ScopeValue*>* objs,
+                                  ObjectValue* ov) const;
 
   // Dump formatted assembly
 #if defined(SUPPORT_OPTO_ASSEMBLY)
diff --git a/test/hotspot/jtreg/compiler/escapeAnalysis/TestReduceAllocationAndNestedScalarized.java b/test/hotspot/jtreg/compiler/escapeAnalysis/TestReduceAllocationAndNestedScalarized.java
new file mode 100644
index 0000000000000..5916490a02c79
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/escapeAnalysis/TestReduceAllocationAndNestedScalarized.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 8331194
+ * @summary Check that Reduce Allocation Merges doesn't crash when an input
+ *          of the Phi is not the _current_ output of the Phi but said input
+ *          needs to be rematerialized because it's used regardless of the
+ *          Phi output.
+ * @run main/othervm -XX:CompileCommand=dontinline,*TestReduceAllocationAndNestedScalarized*::test
+ *                   -XX:CompileCommand=compileonly,*TestReduceAllocationAndNestedScalarized*::test
+ *                   -XX:CompileCommand=compileonly,*Picture*::*init*
+ *                   -XX:CompileCommand=compileonly,*Point*::*init*
+ *                   -XX:CompileCommand=exclude,*Unloaded*::*
+ *                   -XX:+IgnoreUnrecognizedVMOptions
+ *                   -XX:-TieredCompilation
+ *                   -XX:-UseCompressedOops
+ *                   -Xcomp
+ *                   -server
+ *                   compiler.escapeAnalysis.TestReduceAllocationAndNestedScalarized
+ * @run main compiler.escapeAnalysis.TestReduceAllocationAndNestedScalarized
+ */
+
+package compiler.escapeAnalysis;
+
+public class TestReduceAllocationAndNestedScalarized {
+    static class Picture {
+        public Point first;
+        public Point second;
+    }
+
+    static class Point {
+        int x;
+    }
+
+    static class Unloaded {
+    }
+
+    static int test(boolean cond) {
+        Picture p = new Picture();
+        p.first = new Point();
+        Point p2 = p.first;
+
+        if (cond) p2 = new Point();
+
+        p.second = p2;
+
+        new Unloaded();
+
+        return p.first.x;
+    }
+
+    public static void main(String[] args) {
+        Picture pic = new Picture();
+        Point pnt   = new Point();
+        int res     = test(true);
+        System.out.println("Result is: " + res);
+    }
+}

From f3e7063e26cefb6643e4150b7fcbdc9a1fdaebed Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Tue, 16 Jul 2024 23:27:32 +0000
Subject: [PATCH 101/401] 8336420: Add JVMTI setfldw001 and setfmodw001 tests
 to Xcomp problem list

Reviewed-by: dcubed
---
 test/hotspot/jtreg/ProblemList-Xcomp.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/hotspot/jtreg/ProblemList-Xcomp.txt b/test/hotspot/jtreg/ProblemList-Xcomp.txt
index 9a52a731039fe..5617ea0efa676 100644
--- a/test/hotspot/jtreg/ProblemList-Xcomp.txt
+++ b/test/hotspot/jtreg/ProblemList-Xcomp.txt
@@ -28,6 +28,12 @@
 #############################################################################
 
 vmTestbase/nsk/jvmti/AttachOnDemand/attach020/TestDescription.java 8287324 generic-all
+
+vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw001/TestDescription.java#id0            8205957 generic-all
+vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw001/TestDescription.java#logging        8205957 generic-all
+vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw001/TestDescription.java#id0     8205957 generic-all
+vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw001/TestDescription.java#logging 8205957 generic-all
+
 vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t002/TestDescription.java 8245680 windows-x64
 
 vmTestbase/vm/mlvm/mixed/stress/regression/b6969574/INDIFY_Test.java 8265295 linux-x64,windows-x64

From 69baa7d2850fafbd89978db12eec683c286eb921 Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Tue, 16 Jul 2024 23:46:41 +0000
Subject: [PATCH 102/401] 8336413: gtk headers : Fix typedef redeclaration of
 GMainContext and GdkPixbuf

Reviewed-by: prr, dnguyen
---
 src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.h | 4 +---
 src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.h | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.h b/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.h
index 4a9773d333a46..8075d4f419fad 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.h
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,13 +55,11 @@ typedef enum
 } GParamFlags;
 
 /* We define all structure pointers to be void* */
-typedef void GMainContext;
 typedef void GVfs;
 
 typedef void GdkColormap;
 typedef void GdkDrawable;
 typedef void GdkGC;
-typedef void GdkPixbuf;
 typedef void GdkPixmap;
 
 typedef void GtkFixed;
diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.h b/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.h
index ed5997cb0cd13..054510d488b10 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.h
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -180,8 +180,6 @@ typedef enum _cairo_status {
 } cairo_status_t;
 
 /* We define all structure pointers to be void* */
-typedef void GdkPixbuf;
-typedef void GMainContext;
 typedef void GVfs;
 
 typedef void GdkColormap;

From 5f365d44be9c1f3413c9ccde970e2745090a516a Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <thartmann@openjdk.org>
Date: Tue, 23 Jan 2024 08:25:53 +0000
Subject: [PATCH 103/401] 8323231: Improve array management

Co-authored-by: Martin Balao <mbalao@openjdk.org>
Reviewed-by: iveresov, rhalade, mschoene, dlong, kvn
---
 src/hotspot/share/c1/c1_RangeCheckElimination.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/c1/c1_RangeCheckElimination.cpp b/src/hotspot/share/c1/c1_RangeCheckElimination.cpp
index 256f8190b50dc..c2397d4a399a6 100644
--- a/src/hotspot/share/c1/c1_RangeCheckElimination.cpp
+++ b/src/hotspot/share/c1/c1_RangeCheckElimination.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -483,14 +483,14 @@ void RangeCheckEliminator::in_block_motion(BlockBegin *block, AccessIndexedList
 
           if (c) {
             jint value = c->type()->as_IntConstant()->value();
-            if (value != min_jint) {
-              if (ao->op() == Bytecodes::_isub) {
-                value = -value;
-              }
+            if (ao->op() == Bytecodes::_iadd) {
               base = java_add(base, value);
-              last_integer = base;
-              last_instruction = other;
+            } else {
+              assert(ao->op() == Bytecodes::_isub, "unexpected bytecode");
+              base = java_subtract(base, value);
             }
+            last_integer = base;
+            last_instruction = other;
             index = other;
           } else {
             break;

From 46c37686454321011541499a79c776f774ff2b57 Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Thu, 25 Jan 2024 14:47:13 +0000
Subject: [PATCH 104/401] 8320548: Improved loop handling

Reviewed-by: mschoene, rhalade, thartmann, chagedorn
---
 src/hotspot/share/opto/superword.cpp | 42 +++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp
index 5721f7bcd5420..0e1328a448577 100644
--- a/src/hotspot/share/opto/superword.cpp
+++ b/src/hotspot/share/opto/superword.cpp
@@ -2954,27 +2954,55 @@ void VTransform::adjust_pre_loop_limit_to_align_main_loop_vectors() {
   TRACE_ALIGN_VECTOR_NODE(mask_AW);
   TRACE_ALIGN_VECTOR_NODE(adjust_pre_iter);
 
-  // 4: Compute (3a, b):
+  // 4: The computation of the new pre-loop limit could overflow (for 3a) or
+  //    underflow (for 3b) the int range. This is problematic in combination
+  //    with Range Check Elimination (RCE), which determines a "safe" range
+  //    where a RangeCheck will always succeed. RCE adjusts the pre-loop limit
+  //    such that we only enter the main-loop once we have reached the "safe"
+  //    range, and adjusts the main-loop limit so that we exit the main-loop
+  //    before we leave the "safe" range. After RCE, the range of the main-loop
+  //    can only be safely narrowed, and should never be widened. Hence, the
+  //    pre-loop limit can only be increased (for stride > 0), but an add
+  //    overflow might decrease it, or decreased (for stride < 0), but a sub
+  //    underflow might increase it. To prevent that, we perform the Sub / Add
+  //    and Max / Min with long operations.
+  old_limit       = new ConvI2LNode(old_limit);
+  orig_limit      = new ConvI2LNode(orig_limit);
+  adjust_pre_iter = new ConvI2LNode(adjust_pre_iter);
+  phase()->register_new_node(old_limit, pre_ctrl);
+  phase()->register_new_node(orig_limit, pre_ctrl);
+  phase()->register_new_node(adjust_pre_iter, pre_ctrl);
+  TRACE_ALIGN_VECTOR_NODE(old_limit);
+  TRACE_ALIGN_VECTOR_NODE(orig_limit);
+  TRACE_ALIGN_VECTOR_NODE(adjust_pre_iter);
+
+  // 5: Compute (3a, b):
   //    new_limit = old_limit + adjust_pre_iter     (stride > 0)
   //    new_limit = old_limit - adjust_pre_iter     (stride < 0)
+  //
   Node* new_limit = nullptr;
   if (stride < 0) {
-    new_limit = new SubINode(old_limit, adjust_pre_iter);
+    new_limit = new SubLNode(old_limit, adjust_pre_iter);
   } else {
-    new_limit = new AddINode(old_limit, adjust_pre_iter);
+    new_limit = new AddLNode(old_limit, adjust_pre_iter);
   }
   phase()->register_new_node(new_limit, pre_ctrl);
   TRACE_ALIGN_VECTOR_NODE(new_limit);
 
-  // 5: Compute (15a, b):
+  // 6: Compute (15a, b):
   //    Prevent pre-loop from going past the original limit of the loop.
   Node* constrained_limit =
-    (stride > 0) ? (Node*) new MinINode(new_limit, orig_limit)
-                 : (Node*) new MaxINode(new_limit, orig_limit);
+    (stride > 0) ? (Node*) new MinLNode(phase()->C, new_limit, orig_limit)
+                 : (Node*) new MaxLNode(phase()->C, new_limit, orig_limit);
+  phase()->register_new_node(constrained_limit, pre_ctrl);
+  TRACE_ALIGN_VECTOR_NODE(constrained_limit);
+
+  // 7: We know that the result is in the int range, there is never truncation
+  constrained_limit = new ConvL2INode(constrained_limit);
   phase()->register_new_node(constrained_limit, pre_ctrl);
   TRACE_ALIGN_VECTOR_NODE(constrained_limit);
 
-  // 6: Hack the pre-loop limit
+  // 8: Hack the pre-loop limit
   igvn().replace_input_of(pre_opaq, 1, constrained_limit);
 }
 

From 227fc5e591da0ea7540a7f25451240401ead3495 Mon Sep 17 00:00:00 2001
From: Matias Saavedra Silva <matsaave@openjdk.org>
Date: Mon, 29 Jan 2024 21:40:21 +0000
Subject: [PATCH 105/401] 8314794: Improve UTF8 String supports

Reviewed-by: dholmes, coleenp, rhalade
---
 src/hotspot/share/utilities/exceptions.cpp | 29 +++++++++++++---------
 src/hotspot/share/utilities/utf8.cpp       | 11 +++++---
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/hotspot/share/utilities/exceptions.cpp b/src/hotspot/share/utilities/exceptions.cpp
index 78147ea4089ca..c8f458dfa31ad 100644
--- a/src/hotspot/share/utilities/exceptions.cpp
+++ b/src/hotspot/share/utilities/exceptions.cpp
@@ -44,6 +44,9 @@
 #include "utilities/events.hpp"
 #include "utilities/exceptions.hpp"
 
+// Limit exception message components to 64K (the same max as Symbols)
+#define MAX_LEN 65535
+
 // Implementation of ThreadShadow
 void check_ThreadShadow() {
   const ByteSize offset1 = byte_offset_of(ThreadShadow, _pending_exception);
@@ -114,10 +117,11 @@ bool Exceptions::special_exception(JavaThread* thread, const char* file, int lin
   if (h_exception.is_null() && !thread->can_call_java()) {
     ResourceMark rm(thread);
     const char* exc_value = h_name != nullptr ? h_name->as_C_string() : "null";
-    log_info(exceptions)("Thread cannot call Java so instead of throwing exception <%s%s%s> (" PTR_FORMAT ") \n"
+    log_info(exceptions)("Thread cannot call Java so instead of throwing exception <%.*s%s%.*s> (" PTR_FORMAT ") \n"
                         "at [%s, line %d]\nfor thread " PTR_FORMAT ",\n"
                         "throwing pre-allocated exception: %s",
-                        exc_value, message ? ": " : "", message ? message : "",
+                        MAX_LEN, exc_value, message ? ": " : "",
+                        MAX_LEN, message ? message : "",
                         p2i(h_exception()), file, line, p2i(thread),
                         Universe::vm_exception()->print_value_string());
     // We do not care what kind of exception we get for a thread which
@@ -143,10 +147,11 @@ void Exceptions::_throw(JavaThread* thread, const char* file, int line, Handle h
 
   // tracing (do this up front - so it works during boot strapping)
   // Note, the print_value_string() argument is not called unless logging is enabled!
-  log_info(exceptions)("Exception <%s%s%s> (" PTR_FORMAT ") \n"
+  log_info(exceptions)("Exception <%.*s%s%.*s> (" PTR_FORMAT ") \n"
                        "thrown [%s, line %d]\nfor thread " PTR_FORMAT,
-                       h_exception->print_value_string(),
-                       message ? ": " : "", message ? message : "",
+                       MAX_LEN, h_exception->print_value_string(),
+                       message ? ": " : "",
+                       MAX_LEN, message ? message : "",
                        p2i(h_exception()), file, line, p2i(thread));
 
   // for AbortVMOnException flag
@@ -566,13 +571,13 @@ void Exceptions::log_exception(Handle exception, const char* message) {
   ResourceMark rm;
   const char* detail_message = java_lang_Throwable::message_as_utf8(exception());
   if (detail_message != nullptr) {
-    log_info(exceptions)("Exception <%s: %s>\n thrown in %s",
-                         exception->print_value_string(),
-                         detail_message,
-                         message);
+    log_info(exceptions)("Exception <%.*s: %.*s>\n thrown in %.*s",
+                         MAX_LEN, exception->print_value_string(),
+                         MAX_LEN, detail_message,
+                         MAX_LEN, message);
   } else {
-    log_info(exceptions)("Exception <%s>\n thrown in %s",
-                         exception->print_value_string(),
-                         message);
+    log_info(exceptions)("Exception <%.*s>\n thrown in %.*s",
+                         MAX_LEN, exception->print_value_string(),
+                         MAX_LEN, message);
   }
 }
diff --git a/src/hotspot/share/utilities/utf8.cpp b/src/hotspot/share/utilities/utf8.cpp
index d7798778b2cea..6fd877120df40 100644
--- a/src/hotspot/share/utilities/utf8.cpp
+++ b/src/hotspot/share/utilities/utf8.cpp
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "memory/allocation.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/utf8.hpp"
@@ -431,12 +432,16 @@ int UNICODE::utf8_size(jbyte c) {
 
 template<typename T>
 int UNICODE::utf8_length(const T* base, int length) {
-  int result = 0;
+  size_t result = 0;
   for (int index = 0; index < length; index++) {
     T c = base[index];
-    result += utf8_size(c);
+    int sz = utf8_size(c);
+    if (result + sz > INT_MAX-1) {
+      break;
+    }
+    result += sz;
   }
-  return result;
+  return checked_cast<int>(result);
 }
 
 template<typename T>

From aea9a08bebb6555ef6f00daba24afec394dd245b Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Sun, 11 Feb 2024 21:54:51 +0000
Subject: [PATCH 106/401] 8319859: Better symbol storage

Reviewed-by: rhalade, coleenp, matsaave, iklam
---
 src/hotspot/share/classfile/symbolTable.cpp | 15 ++++++++++++++-
 src/hotspot/share/oops/symbol.cpp           |  1 +
 src/hotspot/share/oops/symbol.hpp           |  3 ++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/classfile/symbolTable.cpp b/src/hotspot/share/classfile/symbolTable.cpp
index f680939682aaa..9483c6715b476 100644
--- a/src/hotspot/share/classfile/symbolTable.cpp
+++ b/src/hotspot/share/classfile/symbolTable.cpp
@@ -344,8 +344,19 @@ Symbol* SymbolTable::lookup_common(const char* name,
   return sym;
 }
 
+// Symbols should represent entities from the constant pool that are
+// limited to 64K in length, but usage errors creep in allowing Symbols
+// to be used for arbitrary strings. For debug builds we will assert if
+// a string is too long, whereas product builds will truncate it.
 Symbol* SymbolTable::new_symbol(const char* name, int len) {
-  assert(len <= Symbol::max_length(), "sanity");
+  assert(len <= Symbol::max_length(),
+         "String length %d exceeds the maximum Symbol length of %d", len, Symbol::max_length());
+  if (len > Symbol::max_length()) {
+    warning("A string \"%.80s ... %.80s\" exceeds the maximum Symbol "
+            "length of %d and has been truncated", name, (name + len - 80), Symbol::max_length());
+    len = Symbol::max_length();
+  }
+
   unsigned int hash = hash_symbol(name, len, _alt_hash);
   Symbol* sym = lookup_common(name, len, hash);
   if (sym == nullptr) {
@@ -485,6 +496,7 @@ void SymbolTable::new_symbols(ClassLoaderData* loader_data, const constantPoolHa
   for (int i = 0; i < names_count; i++) {
     const char *name = names[i];
     int len = lengths[i];
+    assert(len <= Symbol::max_length(), "must be - these come from the constant pool");
     unsigned int hash = hashValues[i];
     assert(lookup_shared(name, len, hash) == nullptr, "must have checked already");
     Symbol* sym = do_add_if_needed(name, len, hash, is_permanent);
@@ -494,6 +506,7 @@ void SymbolTable::new_symbols(ClassLoaderData* loader_data, const constantPoolHa
 }
 
 Symbol* SymbolTable::do_add_if_needed(const char* name, int len, uintx hash, bool is_permanent) {
+  assert(len <= Symbol::max_length(), "caller should have ensured this");
   SymbolTableLookup lookup(name, len, hash);
   SymbolTableGet stg;
   bool clean_hint = false;
diff --git a/src/hotspot/share/oops/symbol.cpp b/src/hotspot/share/oops/symbol.cpp
index 4deae3720616b..8fe7c2aadbf2a 100644
--- a/src/hotspot/share/oops/symbol.cpp
+++ b/src/hotspot/share/oops/symbol.cpp
@@ -54,6 +54,7 @@ uint32_t Symbol::pack_hash_and_refcount(short hash, int refcount) {
 }
 
 Symbol::Symbol(const u1* name, int length, int refcount) {
+  assert(length <= max_length(), "SymbolTable should have caught this!");
   _hash_and_refcount =  pack_hash_and_refcount((short)os::random(), refcount);
   _length = (u2)length;
   // _body[0..1] are allocated in the header just by coincidence in the current
diff --git a/src/hotspot/share/oops/symbol.hpp b/src/hotspot/share/oops/symbol.hpp
index 3b3f1366203b9..045332c7a8480 100644
--- a/src/hotspot/share/oops/symbol.hpp
+++ b/src/hotspot/share/oops/symbol.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -130,6 +130,7 @@ class Symbol : public MetaspaceObj {
     return (int)heap_word_size(byte_size(length));
   }
 
+  // Constructor is private for use only by SymbolTable.
   Symbol(const u1* name, int length, int refcount);
 
   static short extract_hash(uint32_t value)   { return (short)(value >> 16); }

From c5a8c8a0b6d51c33679efb02514f7a44e93ad290 Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Tue, 13 Feb 2024 21:15:08 +0000
Subject: [PATCH 107/401] 8325600: Better symbol storage

Reviewed-by: coleenp, rhalade, matsaave
---
 src/hotspot/share/classfile/symbolTable.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/classfile/symbolTable.cpp b/src/hotspot/share/classfile/symbolTable.cpp
index 9483c6715b476..ddbf180a4a188 100644
--- a/src/hotspot/share/classfile/symbolTable.cpp
+++ b/src/hotspot/share/classfile/symbolTable.cpp
@@ -345,10 +345,10 @@ Symbol* SymbolTable::lookup_common(const char* name,
 }
 
 // Symbols should represent entities from the constant pool that are
-// limited to 64K in length, but usage errors creep in allowing Symbols
+// limited to <64K in length, but usage errors creep in allowing Symbols
 // to be used for arbitrary strings. For debug builds we will assert if
 // a string is too long, whereas product builds will truncate it.
-Symbol* SymbolTable::new_symbol(const char* name, int len) {
+static int check_length(const char* name, int len) {
   assert(len <= Symbol::max_length(),
          "String length %d exceeds the maximum Symbol length of %d", len, Symbol::max_length());
   if (len > Symbol::max_length()) {
@@ -356,7 +356,11 @@ Symbol* SymbolTable::new_symbol(const char* name, int len) {
             "length of %d and has been truncated", name, (name + len - 80), Symbol::max_length());
     len = Symbol::max_length();
   }
+  return len;
+}
 
+Symbol* SymbolTable::new_symbol(const char* name, int len) {
+  len = check_length(name, len);
   unsigned int hash = hash_symbol(name, len, _alt_hash);
   Symbol* sym = lookup_common(name, len, hash);
   if (sym == nullptr) {
@@ -555,7 +559,7 @@ Symbol* SymbolTable::do_add_if_needed(const char* name, int len, uintx hash, boo
 
 Symbol* SymbolTable::new_permanent_symbol(const char* name) {
   unsigned int hash = 0;
-  int len = (int)strlen(name);
+  int len = check_length(name, (int)strlen(name));
   Symbol* sym = SymbolTable::lookup_only(name, len, hash);
   if (sym == nullptr) {
     sym = do_add_if_needed(name, len, hash, /* is_permanent */ true);

From e636325510e882afa703752c6d37c183d111565c Mon Sep 17 00:00:00 2001
From: Jayathirth D V <jdv@openjdk.org>
Date: Fri, 15 Mar 2024 10:28:00 +0000
Subject: [PATCH 108/401] 8324559: Improve 2D image handling

Reviewed-by: rhalade, mschoene, psadhukhan, prr
---
 .../share/native/libawt/java2d/loops/MaskFill.c  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/java.desktop/share/native/libawt/java2d/loops/MaskFill.c b/src/java.desktop/share/native/libawt/java2d/loops/MaskFill.c
index 354934069c04f..fe0bc406860ce 100644
--- a/src/java.desktop/share/native/libawt/java2d/loops/MaskFill.c
+++ b/src/java.desktop/share/native/libawt/java2d/loops/MaskFill.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -467,7 +467,7 @@ storePgram(EdgeInfo *pLeftEdge, EdgeInfo *pRightEdge,
 #define INSERT_ACCUM(pACCUM, IMIN, IMAX, X0, Y0, X1, Y1, CX1, CX2, MULT) \
     do { \
         jdouble xmid = ((X0) + (X1)) * 0.5; \
-        if (xmid <= (CX2)) { \
+        if (xmid < (CX2)) { \
             jdouble sliceh = ((Y1) - (Y0)); \
             jdouble slicearea; \
             jint i; \
@@ -556,7 +556,7 @@ fillAAPgram(NativePrimitive *pPrim, SurfaceDataRasInfo *pRasInfo,
     jint cy2 = pRasInfo->bounds.y2;
     jint width = cx2 - cx1;
     EdgeInfo edges[4];
-    jfloat localaccum[MASK_BUF_LEN + 1];
+    jfloat localaccum[MASK_BUF_LEN + 2];
     jfloat *pAccum;
 
     if (!storePgram(edges + 0, edges + 2,
@@ -568,12 +568,12 @@ fillAAPgram(NativePrimitive *pPrim, SurfaceDataRasInfo *pRasInfo,
     }
 
     pAccum = ((width > MASK_BUF_LEN)
-              ? malloc((width + 1) * sizeof(jfloat))
+              ? malloc((width + 2) * sizeof(jfloat))
               : localaccum);
     if (pAccum == NULL) {
         return;
     }
-    memset(pAccum, 0, (width+1) * sizeof(jfloat));
+    memset(pAccum, 0, (width + 2) * sizeof(jfloat));
 
     while (cy1 < cy2) {
         jint lmin, lmax, rmin, rmax;
@@ -794,7 +794,7 @@ drawAAPgram(NativePrimitive *pPrim, SurfaceDataRasInfo *pRasInfo,
     jint cy2 = pRasInfo->bounds.y2;
     jint width = cx2 - cx1;
     EdgeInfo edges[8];
-    jfloat localaccum[MASK_BUF_LEN + 1];
+    jfloat localaccum[MASK_BUF_LEN + 2];
     jfloat *pAccum;
 
     if (!storePgram(edges + 0, edges + 6,
@@ -815,12 +815,12 @@ drawAAPgram(NativePrimitive *pPrim, SurfaceDataRasInfo *pRasInfo,
                JNI_TRUE);
 
     pAccum = ((width > MASK_BUF_LEN)
-              ? malloc((width + 1) * sizeof(jfloat))
+              ? malloc((width + 2) * sizeof(jfloat))
               : localaccum);
     if (pAccum == NULL) {
         return;
     }
-    memset(pAccum, 0, (width+1) * sizeof(jfloat));
+    memset(pAccum, 0, (width + 2) * sizeof(jfloat));
 
     while (cy1 < cy2) {
         jint lmin, lmax, rmin, rmax;

From 553f21ae5324029eef3c934d69be40f5d4266457 Mon Sep 17 00:00:00 2001
From: Christian Hagedorn <chagedorn@openjdk.org>
Date: Tue, 26 Mar 2024 11:43:35 +0000
Subject: [PATCH 109/401] 8327413: Enhance compilation efficiency

Co-authored-by: Roland Westrelin <roland@openjdk.org>
Reviewed-by: ahgross, rhalade, thartmann, epeter, mbalao, fferrari
---
 src/hotspot/share/opto/ifnode.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/opto/ifnode.cpp b/src/hotspot/share/opto/ifnode.cpp
index a5722c45a5e6a..cedbc66bbb444 100644
--- a/src/hotspot/share/opto/ifnode.cpp
+++ b/src/hotspot/share/opto/ifnode.cpp
@@ -773,6 +773,7 @@ bool IfNode::cmpi_folds(PhaseIterGVN* igvn, bool fold_ne) {
 bool IfNode::is_ctrl_folds(Node* ctrl, PhaseIterGVN* igvn) {
   return ctrl != nullptr &&
     ctrl->is_Proj() &&
+    ctrl->outcnt() == 1 && // No side-effects
     ctrl->in(0) != nullptr &&
     ctrl->in(0)->Opcode() == Op_If &&
     ctrl->in(0)->outcnt() == 2 &&
@@ -1346,7 +1347,7 @@ Node* IfNode::fold_compares(PhaseIterGVN* igvn) {
 
   if (cmpi_folds(igvn)) {
     Node* ctrl = in(0);
-    if (is_ctrl_folds(ctrl, igvn) && ctrl->outcnt() == 1) {
+    if (is_ctrl_folds(ctrl, igvn)) {
       // A integer comparison immediately dominated by another integer
       // comparison
       ProjNode* success = nullptr;

From 8cc84bf71e42bb72755a9f2d8532cbdbd428c2a5 Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Fri, 29 Mar 2024 17:40:00 +0000
Subject: [PATCH 110/401] 8320097: Improve Image transformations

Reviewed-by: jdv, psadhukhan, aivanov, rhalade
---
 .../share/classes/sun/java2d/pipe/DrawImage.java         | 9 ++++++++-
 .../share/native/libawt/java2d/loops/TransformHelper.c   | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/java.desktop/share/classes/sun/java2d/pipe/DrawImage.java b/src/java.desktop/share/classes/sun/java2d/pipe/DrawImage.java
index 7275a01ce0697..00563a84ecf17 100644
--- a/src/java.desktop/share/classes/sun/java2d/pipe/DrawImage.java
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/DrawImage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -369,6 +369,13 @@ protected void renderImageXform(SunGraphics2D sg, Image img,
         final AffineTransform itx;
         try {
             itx = tx.createInverse();
+            double[] mat = new double[6];
+            itx.getMatrix(mat);
+            for (double d : mat) {
+                if (!Double.isFinite(d)) {
+                    return;
+                }
+            }
         } catch (final NoninvertibleTransformException ignored) {
             // Non-invertible transform means no output
             return;
diff --git a/src/java.desktop/share/native/libawt/java2d/loops/TransformHelper.c b/src/java.desktop/share/native/libawt/java2d/loops/TransformHelper.c
index 4d7442d7aef66..02c99ea9adad3 100644
--- a/src/java.desktop/share/native/libawt/java2d/loops/TransformHelper.c
+++ b/src/java.desktop/share/native/libawt/java2d/loops/TransformHelper.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -120,7 +120,7 @@ TransformInterpFunc *pBicubicFunc = BicubicInterp;
 /* We reject coordinates not less than 1<<30 so that the distance between */
 /* any 2 of them is less than 1<<31 which would overflow into the sign */
 /* bit of a signed long value used to represent fixed point coordinates. */
-#define TX_FIXED_UNSAFE(v)  (fabs(v) >= (1<<30))
+#define TX_FIXED_UNSAFE(v)  (isinf(v) || isnan(v) || fabs(v) >= (1<<30))
 static jboolean
 checkOverflow(jint dxoff, jint dyoff,
               SurfaceDataBounds *pBounds,

From 13341ca70276c891add2e4652b6e1e8020610988 Mon Sep 17 00:00:00 2001
From: Jayathirth D V <jdv@openjdk.org>
Date: Tue, 2 Apr 2024 06:02:01 +0000
Subject: [PATCH 111/401] 8323390: Enhance mask blit functionality

Reviewed-by: prr, rhalade, psadhukhan
---
 .../classes/sun/java2d/SunGraphics2D.java     | 42 +++++++++++--------
 .../share/native/libawt/java2d/SurfaceData.h  | 11 ++++-
 .../native/libawt/java2d/loops/MaskBlit.c     | 16 ++++++-
 3 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java b/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java
index 86666b1f894b6..c27e4c6ebe070 100644
--- a/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java
+++ b/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2150,27 +2150,33 @@ private void doCopyArea(int x, int y, int w, int h, int dx, int dy) {
         }
 
         Blit ob = lastCAblit;
-        if (dy == 0 && dx > 0 && dx < w) {
-            while (w > 0) {
-                int partW = Math.min(w, dx);
-                w -= partW;
-                int sx = x + w;
-                ob.Blit(theData, theData, comp, clip,
-                        sx, y, sx+dx, y+dy, partW, h);
+        try {
+            if (dy == 0 && dx > 0 && dx < w) {
+                while (w > 0) {
+                    int partW = Math.min(w, dx);
+                    w -= partW;
+                    int sx = Math.addExact(x, w);
+                    ob.Blit(theData, theData, comp, clip,
+                            sx, y, sx+dx, y+dy, partW, h);
+                }
+                return;
             }
-            return;
-        }
-        if (dy > 0 && dy < h && dx > -w && dx < w) {
-            while (h > 0) {
-                int partH = Math.min(h, dy);
-                h -= partH;
-                int sy = y + h;
-                ob.Blit(theData, theData, comp, clip,
-                        x, sy, x+dx, sy+dy, w, partH);
+            if (dy > 0 && dy < h && dx > -w && dx < w) {
+                while (h > 0) {
+                    int partH = Math.min(h, dy);
+                    h -= partH;
+                    int sy = Math.addExact(y, h);
+                    ob.Blit(theData, theData, comp, clip,
+                            x, sy, Math.addExact(x, dx), sy+dy, w, partH);
+                }
+                return;
             }
+            ob.Blit(theData, theData, comp, clip, x, y,
+                Math.addExact(x, dx), Math.addExact(y, dy), w, h);
+        } catch (ArithmeticException ex) {
+            // We are hitting integer overflow in Math.addExact()
             return;
         }
-            ob.Blit(theData, theData, comp, clip, x, y, x+dx, y+dy, w, h);
     }
 
     /*
diff --git a/src/java.desktop/share/native/libawt/java2d/SurfaceData.h b/src/java.desktop/share/native/libawt/java2d/SurfaceData.h
index c4eae3c19aa78..8975f8d4a9d20 100644
--- a/src/java.desktop/share/native/libawt/java2d/SurfaceData.h
+++ b/src/java.desktop/share/native/libawt/java2d/SurfaceData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
 #define _Included_SurfaceData
 
 #include <jni.h>
+#include <limits.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -53,6 +54,14 @@ typedef struct {
 
 #define SD_RASINFO_PRIVATE_SIZE         64
 
+#define UNSAFE_TO_ADD(a, b) \
+    (((a >= 0) && (b >= 0) && (a > (INT_MAX - b))) || \
+     ((a < 0) && (b < 0) && (a < (INT_MIN - b)))) \
+
+#define UNSAFE_TO_SUB(a, b) \
+    (((b >= 0) && (a < 0) && (a < (INT_MIN + b))) || \
+     ((b < 0) && (a >= 0) && (-b > (INT_MAX - a)))) \
+
 /*
  * The SurfaceDataRasInfo structure is used to pass in and return various
  * pieces of information about the destination drawable.  In particular:
diff --git a/src/java.desktop/share/native/libawt/java2d/loops/MaskBlit.c b/src/java.desktop/share/native/libawt/java2d/loops/MaskBlit.c
index 21b716e3bcdd6..e8c8765dd2c1c 100644
--- a/src/java.desktop/share/native/libawt/java2d/loops/MaskBlit.c
+++ b/src/java.desktop/share/native/libawt/java2d/loops/MaskBlit.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,14 +68,28 @@ Java_sun_java2d_loops_MaskBlit_MaskBlit
         return;
     }
 
+    if (width <= 0 || height <= 0) {
+        return;
+    }
+
     srcInfo.bounds.x1 = srcx;
     srcInfo.bounds.y1 = srcy;
+    if (UNSAFE_TO_ADD(srcx, width) ||
+        UNSAFE_TO_ADD(srcy, height) ||
+        UNSAFE_TO_ADD(dstx, width) ||
+        UNSAFE_TO_ADD(dsty, height)) {
+        return;
+    }
     srcInfo.bounds.x2 = srcx + width;
     srcInfo.bounds.y2 = srcy + height;
     dstInfo.bounds.x1 = dstx;
     dstInfo.bounds.y1 = dsty;
     dstInfo.bounds.x2 = dstx + width;
     dstInfo.bounds.y2 = dsty + height;
+    if (UNSAFE_TO_SUB(srcx, dstx) ||
+        UNSAFE_TO_SUB(srcy, dsty)) {
+        return;
+    }
     srcx -= dstx;
     srcy -= dsty;
     SurfaceData_IntersectBounds(&dstInfo.bounds, &clipInfo.bounds);

From 3babffd4002be62f9f75a1a773c9561804612fad Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Wed, 17 Jul 2024 06:12:01 +0000
Subject: [PATCH 112/401] 8334167: Test
 java/lang/instrument/NativeMethodPrefixApp.java timed out

Reviewed-by: dholmes, sspitsyn, alanb
---
 .../instrument/NativeMethodPrefixAgent.java   | 85 +++++++++----------
 .../instrument/NativeMethodPrefixApp.java     | 53 ++++++------
 .../lang/instrument/libNativeMethodPrefix.c   | 39 +++++++++
 3 files changed, 105 insertions(+), 72 deletions(-)
 create mode 100644 test/jdk/java/lang/instrument/libNativeMethodPrefix.c

diff --git a/test/jdk/java/lang/instrument/NativeMethodPrefixAgent.java b/test/jdk/java/lang/instrument/NativeMethodPrefixAgent.java
index 5ddede39959ed..5107f122ba3ef 100644
--- a/test/jdk/java/lang/instrument/NativeMethodPrefixAgent.java
+++ b/test/jdk/java/lang/instrument/NativeMethodPrefixAgent.java
@@ -35,70 +35,69 @@ class NativeMethodPrefixAgent {
 
     static ClassFileTransformer t0, t1, t2;
     static Instrumentation inst;
-    private static Throwable agentError;
+    private static Throwable agentError; // to be accessed/updated in a synchronized block
 
-    public static void checkErrors() {
+    private static final String CLASS_TO_TRANSFORM = "NativeMethodPrefixApp$Dummy";
+
+    public static synchronized void checkErrors() {
         if (agentError != null) {
             throw new RuntimeException("Agent error", agentError);
         }
     }
 
+    private static synchronized void trackError(final Throwable t) {
+        if (agentError == null) {
+            agentError = t;
+            return;
+        }
+        if (agentError != t) {
+            agentError.addSuppressed(t);
+        }
+    }
+
     static class Tr implements ClassFileTransformer {
         private static final ClassDesc CD_StringIdCallbackReporter = ClassDesc.ofInternalName("bootreporter/StringIdCallbackReporter");
         private static final MethodTypeDesc MTD_void_String_int = MethodTypeDesc.of(CD_void, CD_String, CD_int);
         final String trname;
         final int transformId;
+        private final String nativeMethodPrefix;
 
         Tr(int transformId) {
             this.trname = "tr" + transformId;
             this.transformId = transformId;
+            this.nativeMethodPrefix = "wrapped_" + trname + "_";
         }
 
-        public byte[]
-        transform(
-            ClassLoader loader,
-            String className,
-            Class<?> classBeingRedefined,
-            ProtectionDomain    protectionDomain,
-            byte[] classfileBuffer) {
-            boolean redef = classBeingRedefined != null;
-            System.out.println(trname + ": " +
-                               (redef? "Retransforming " : "Loading ") + className);
-            if (className != null) {
-                try {
-                    byte[] newcf = Instrumentor.instrFor(classfileBuffer)
-                                   .addNativeMethodTrackingInjection(
-                                        "wrapped_" + trname + "_", (name, h) -> {
-                                            h.loadConstant(name);
-                                            h.loadConstant(transformId);
-                                            h.invokestatic(
-                                                    CD_StringIdCallbackReporter,
-                                                    "tracker",
-                                                    MTD_void_String_int);
-                                        })
-                                   .apply();
-                    /*** debugging ...
-                    if (newcf != null) {
-                        String fname = trname + (redef?"_redef" : "") + "/" + className;
-                        System.err.println("dumping to: " + fname);
-                        write_buffer(fname + "_before.class", classfileBuffer);
-                        write_buffer(fname + "_instr.class", newcf);
-                    }
-                    ***/
-
-                    return redef? null : newcf;
-                } catch (Throwable ex) {
-                    if (agentError == null) {
-                        agentError = ex;
-                    }
-                    System.err.println("ERROR: Injection failure: " + ex);
-                    ex.printStackTrace();
+        @Override
+        public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined,
+                                ProtectionDomain protectionDomain, byte[] classfileBuffer) {
+
+            try {
+                // we only transform a specific application class
+                if (!className.equals(CLASS_TO_TRANSFORM)) {
+                    return null;
+                }
+                if (classBeingRedefined != null) {
                     return null;
                 }
+                // use a byte code generator which creates wrapper methods,
+                // with a configured native method prefix, for each native method on the
+                // class being transformed
+                final Instrumentor byteCodeGenerator = Instrumentor.instrFor(classfileBuffer)
+                        .addNativeMethodTrackingInjection(nativeMethodPrefix,
+                                (name, cb) -> {
+                                    cb.loadConstant(name);
+                                    cb.loadConstant(transformId);
+                                    cb.invokestatic(CD_StringIdCallbackReporter,
+                                            "tracker", MTD_void_String_int);
+                                });
+                // generate the bytecode
+                return byteCodeGenerator.apply();
+            } catch (Throwable t) {
+                trackError(t);
+                return null;
             }
-            return null;
         }
-
     }
 
     // for debugging
diff --git a/test/jdk/java/lang/instrument/NativeMethodPrefixApp.java b/test/jdk/java/lang/instrument/NativeMethodPrefixApp.java
index 65cc54793cbed..97cf4fde2f130 100644
--- a/test/jdk/java/lang/instrument/NativeMethodPrefixApp.java
+++ b/test/jdk/java/lang/instrument/NativeMethodPrefixApp.java
@@ -22,10 +22,7 @@
  */
 
 
-import java.io.File;
 import java.nio.file.Path;
-import java.lang.management.*;
-import java.util.zip.CRC32;
 
 import bootreporter.*;
 import jdk.test.lib.helpers.ClassFileInstaller;
@@ -34,27 +31,24 @@
 
 /*
  * @test
- * @bug 6263319
+ * @bug 6263319 8334167
  * @summary test setNativeMethodPrefix
  * @requires ((vm.opt.StartFlightRecording == null) | (vm.opt.StartFlightRecording == false)) & ((vm.opt.FlightRecorder == null) | (vm.opt.FlightRecorder == false))
- * @modules java.management
- *          java.instrument
+ * @modules java.instrument
  * @library /test/lib
  * @build bootreporter.StringIdCallback bootreporter.StringIdCallbackReporter
  *        asmlib.Instrumentor NativeMethodPrefixAgent
  * @enablePreview
  * @comment The test uses asmlib/Instrumentor.java which relies on ClassFile API PreviewFeature.
- * @run driver/timeout=240 NativeMethodPrefixApp roleDriver
- * @comment The test uses a higher timeout to prevent test timeouts noted in JDK-6528548
+ * @run main/native NativeMethodPrefixApp roleDriver
  */
 public class NativeMethodPrefixApp implements StringIdCallback {
 
-    // This test is fragile like a golden file test.
-    // It assumes that a specific non-native library method will call a specific
-    // native method.  The below may need to be updated based on library changes.
-    static String goldenNativeMethodName = "getStartupTime";
-
+    // we expect this native method, which is part of this test's application,
+    // to be instrumented and invoked
+    static String goldenNativeMethodName = "fooBarNativeMethod";
     static boolean[] gotIt = {false, false, false};
+    private static final String testLibraryPath = System.getProperty("test.nativepath");
 
     public static void main(String[] args) throws Exception {
         if (args.length == 1) {
@@ -69,21 +63,19 @@ public static void main(String[] args) throws Exception {
             launchApp(agentJar);
         } else {
             System.err.println("running app");
+            System.loadLibrary("NativeMethodPrefix"); // load the native library
             new NativeMethodPrefixApp().run();
         }
     }
 
     private static Path createAgentJar() throws Exception {
-        final String testClassesDir = System.getProperty("test.classes");
         final Path agentJar = Path.of("NativeMethodPrefixAgent.jar");
         final String manifest = """
                 Manifest-Version: 1.0
                 Premain-Class: NativeMethodPrefixAgent
                 Can-Retransform-Classes: true
                 Can-Set-Native-Method-Prefix: true
-                """
-                + "Boot-Class-Path: " + testClassesDir.replace(File.separatorChar, '/') + "/"
-                + "\n";
+                """;
         System.out.println("Manifest is:\n" + manifest);
         // create the agent jar
         ClassFileInstaller.writeJar(agentJar.getFileName().toString(),
@@ -97,10 +89,7 @@ private static void launchApp(final Path agentJar) throws Exception {
         final OutputAnalyzer oa = ProcessTools.executeTestJava(
                 "--enable-preview", // due to usage of ClassFile API PreviewFeature in the agent
                 "-javaagent:" + agentJar.toString(),
-                // We disable CheckIntrinsic because the NativeMethodPrefixAgent modifies
-                // the native method names, which then causes a failure in the VM check
-                // for the presence of an intrinsic on a @IntrinsicCandidate native method.
-                "-XX:+UnlockDiagnosticVMOptions", "-XX:-CheckIntrinsics",
+                "-Djava.library.path=" + testLibraryPath,
                 NativeMethodPrefixApp.class.getName());
         oa.shouldHaveExitValue(0);
         // make available stdout/stderr in the logs, even in case of successful completion
@@ -110,14 +99,11 @@ private static void launchApp(final Path agentJar) throws Exception {
     private void run() throws Exception {
         StringIdCallbackReporter.registerCallback(this);
         System.err.println("start");
-
-        java.lang.reflect.Array.getLength(new short[5]);
-        RuntimeMXBean mxbean = ManagementFactory.getRuntimeMXBean();
-        System.err.println(mxbean.getVmVendor());
-        // Simply load a class containing an @IntrinsicCandidate on a native method
-        // to exercise the VM code which verifies the presence of the intrinsic
-        // implementation for that method.
-        System.err.println(new CRC32());
+        final long val = new Dummy().callSomeNativeMethod();
+        if (val != 42) {
+            throw new RuntimeException("unexpected return value " + val
+                    + " from native method, expected 42");
+        }
 
         NativeMethodPrefixAgent.checkErrors();
 
@@ -137,4 +123,13 @@ public void tracker(String name, int id) {
             System.err.println("Tracked #" + id + ": " + name);
         }
     }
+
+    private static class Dummy {
+
+        private long callSomeNativeMethod() {
+            return fooBarNativeMethod();
+        }
+
+        private native long fooBarNativeMethod();
+    }
 }
diff --git a/test/jdk/java/lang/instrument/libNativeMethodPrefix.c b/test/jdk/java/lang/instrument/libNativeMethodPrefix.c
new file mode 100644
index 0000000000000..39dd7edbf2325
--- /dev/null
+++ b/test/jdk/java/lang/instrument/libNativeMethodPrefix.c
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 <stdio.h>
+#include "jni.h"
+
+JNIEXPORT jlong JNICALL
+Java_NativeMethodPrefixApp_00024Dummy_fooBarNativeMethod(JNIEnv *env, jclass clazz)
+{
+    fprintf(stderr, "native method called\n");
+    return 42;
+}
+
+JNIEXPORT jint JNICALL
+JNI_OnLoad(JavaVM *vm, void *reserved)
+{
+    fprintf(stderr, "native library loaded\n");
+    return JNI_VERSION_1_1; // this native library needs the very basic JNI support
+}

From b9b0b8504ec989ad0687188de4bccfe2c04e5d64 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Wed, 17 Jul 2024 06:46:34 +0000
Subject: [PATCH 113/401] 8336375: Crash on paste to JShell

Reviewed-by: jvernee
---
 .../jdk/internal/org/jline/terminal/impl/ffm/Kernel32.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/Kernel32.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/Kernel32.java
index 0c485819f57dc..4e7adbe335550 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/Kernel32.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/Kernel32.java
@@ -236,7 +236,7 @@ public static int ScrollConsoleScreenBuffer(
         MethodHandle mh$ = requireNonNull(ScrollConsoleScreenBufferW$MH, "ScrollConsoleScreenBuffer");
         try {
             return (int)
-                    mh$.invokeExact(hConsoleOutput, lpScrollRectangle, lpClipRectangle, dwDestinationOrigin, lpFill);
+                    mh$.invokeExact(hConsoleOutput, lpScrollRectangle.seg, lpClipRectangle.seg, dwDestinationOrigin.seg, lpFill.seg);
         } catch (Throwable ex$) {
             throw new AssertionError("should not reach here", ex$);
         }

From 70f3e99016311a6520e6a7c0da4c7ff718364976 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Wed, 17 Jul 2024 09:25:59 +0000
Subject: [PATCH 114/401] 8336463: Parallel: Add PSOldGen::expand_and_allocate

Reviewed-by: iwalulya, zgu
---
 .../share/gc/parallel/mutableSpace.cpp        |  7 +++++-
 .../share/gc/parallel/mutableSpace.hpp        |  2 +-
 .../gc/parallel/parallelScavengeHeap.cpp      |  3 +--
 src/hotspot/share/gc/parallel/psOldGen.cpp    | 23 ++++++++++++++-----
 src/hotspot/share/gc/parallel/psOldGen.hpp    |  4 ++++
 5 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/mutableSpace.cpp b/src/hotspot/share/gc/parallel/mutableSpace.cpp
index 7e1115e2b4172..89be0f31f678e 100644
--- a/src/hotspot/share/gc/parallel/mutableSpace.cpp
+++ b/src/hotspot/share/gc/parallel/mutableSpace.cpp
@@ -189,7 +189,12 @@ bool MutableSpace::cas_deallocate(HeapWord *obj, size_t size) {
 
 // Only used by oldgen allocation.
 bool MutableSpace::needs_expand(size_t word_size) const {
-  assert_lock_strong(PSOldGenExpand_lock);
+#ifdef ASSERT
+  // If called by VM thread, locking is not needed.
+  if (!Thread::current()->is_VM_thread()) {
+    assert_lock_strong(PSOldGenExpand_lock);
+  }
+#endif
   // Holding the lock means end is stable.  So while top may be advancing
   // via concurrent allocations, there is no need to order the reads of top
   // and end here, unlike in cas_allocate.
diff --git a/src/hotspot/share/gc/parallel/mutableSpace.hpp b/src/hotspot/share/gc/parallel/mutableSpace.hpp
index 1add9c7735a4e..b48b1ebcc9fb4 100644
--- a/src/hotspot/share/gc/parallel/mutableSpace.hpp
+++ b/src/hotspot/share/gc/parallel/mutableSpace.hpp
@@ -129,7 +129,7 @@ class MutableSpace: public CHeapObj<mtGC> {
   // Return true if this space needs to be expanded in order to satisfy an
   // allocation request of the indicated size.  Concurrent allocations and
   // resizes may change the result of a later call.  Used by oldgen allocator.
-  // precondition: holding PSOldGenExpand_lock
+  // precondition: holding PSOldGenExpand_lock if not VM thread
   bool needs_expand(size_t word_size) const;
 
   // Iteration.
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
index cee5a805cb74a..5883b1cd6074d 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
@@ -434,8 +434,7 @@ HeapWord* ParallelScavengeHeap::expand_heap_and_allocate(size_t size, bool is_tl
 
   result = young_gen()->allocate(size);
   if (result == nullptr && !is_tlab) {
-    // auto expand inside
-    result = old_gen()->allocate(size);
+    result = old_gen()->expand_and_allocate(size);
   }
   return result;   // Could be null if we are out of space.
 }
diff --git a/src/hotspot/share/gc/parallel/psOldGen.cpp b/src/hotspot/share/gc/parallel/psOldGen.cpp
index 4744811b4259c..2715ab90768e4 100644
--- a/src/hotspot/share/gc/parallel/psOldGen.cpp
+++ b/src/hotspot/share/gc/parallel/psOldGen.cpp
@@ -120,6 +120,18 @@ void PSOldGen::initialize_performance_counters(const char* perf_data_name, int l
                                       _object_space, _gen_counters);
 }
 
+HeapWord* PSOldGen::expand_and_allocate(size_t word_size) {
+  assert(SafepointSynchronize::is_at_safepoint(), "precondition");
+  assert(Thread::current()->is_VM_thread(), "precondition");
+  if (object_space()->needs_expand(word_size)) {
+    expand(word_size*HeapWordSize);
+  }
+
+  // Reuse the CAS API even though this is VM thread in safepoint. This method
+  // is not invoked repeatedly, so the CAS overhead should be negligible.
+  return cas_allocate_noexpand(word_size);
+}
+
 size_t PSOldGen::num_iterable_blocks() const {
   return (object_space()->used_in_bytes() + IterateBlockSize - 1) / IterateBlockSize;
 }
@@ -170,9 +182,13 @@ bool PSOldGen::expand_for_allocate(size_t word_size) {
 }
 
 bool PSOldGen::expand(size_t bytes) {
-  assert_lock_strong(PSOldGenExpand_lock);
+#ifdef ASSERT
+  if (!Thread::current()->is_VM_thread()) {
+    assert_lock_strong(PSOldGenExpand_lock);
+  }
   assert_locked_or_safepoint(Heap_lock);
   assert(bytes > 0, "precondition");
+#endif
   const size_t alignment = virtual_space()->alignment();
   size_t aligned_bytes  = align_up(bytes, alignment);
   size_t aligned_expand_bytes = align_up(MinHeapDeltaBytes, alignment);
@@ -208,8 +224,6 @@ bool PSOldGen::expand(size_t bytes) {
 }
 
 bool PSOldGen::expand_by(size_t bytes) {
-  assert_lock_strong(PSOldGenExpand_lock);
-  assert_locked_or_safepoint(Heap_lock);
   assert(bytes > 0, "precondition");
   bool result = virtual_space()->expand_by(bytes);
   if (result) {
@@ -244,9 +258,6 @@ bool PSOldGen::expand_by(size_t bytes) {
 }
 
 bool PSOldGen::expand_to_reserved() {
-  assert_lock_strong(PSOldGenExpand_lock);
-  assert_locked_or_safepoint(Heap_lock);
-
   bool result = false;
   const size_t remaining_bytes = virtual_space()->uncommitted_size();
   if (remaining_bytes > 0) {
diff --git a/src/hotspot/share/gc/parallel/psOldGen.hpp b/src/hotspot/share/gc/parallel/psOldGen.hpp
index 68cac7128da20..09481d8dddea3 100644
--- a/src/hotspot/share/gc/parallel/psOldGen.hpp
+++ b/src/hotspot/share/gc/parallel/psOldGen.hpp
@@ -118,6 +118,7 @@ class PSOldGen : public CHeapObj<mtGC> {
   // Calculating new sizes
   void resize(size_t desired_free_space);
 
+  // Invoked by mutators and GC-workers.
   HeapWord* allocate(size_t word_size) {
     HeapWord* res;
     do {
@@ -127,6 +128,9 @@ class PSOldGen : public CHeapObj<mtGC> {
     return res;
   }
 
+  // Invoked by VM thread inside a safepoint.
+  HeapWord* expand_and_allocate(size_t word_size);
+
   // Iteration.
   void oop_iterate(OopIterateClosure* cl) { object_space()->oop_iterate(cl); }
   void object_iterate(ObjectClosure* cl) { object_space()->object_iterate(cl); }

From 59843f4a65c18b9a9cc32d4146e569b0e8c89baf Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nbenalla@openjdk.org>
Date: Wed, 17 Jul 2024 09:42:04 +0000
Subject: [PATCH 115/401] 8336040: Missing closing anchor element in Docs.gmk

Reviewed-by: dholmes, jpai, shade
---
 make/Docs.gmk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/Docs.gmk b/make/Docs.gmk
index 192843de9cdec..08a9ac662cd2a 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -1,4 +1,4 @@
-# Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -714,7 +714,7 @@ SPEC_HEADER_BLOCK := \
     <div class="navbar"> \
         <div>$(HEADER_RIGHT_SIDE_INFO)</div> \
         <nav><ul><li><a href="PATH_TO_SPECS/../api/index.html">API</a> \
-        <li><a href="PATH_TO_SPECS/index.html">OTHER SPECIFICATIONS \
+        <li><a href="PATH_TO_SPECS/index.html">OTHER SPECIFICATIONS</a> \
         <li><a href="PATH_TO_SPECS/man/index.html">TOOL GUIDES</a></ul></nav> \
     </div> \
 </header>

From d41d2a7a82cb6eff17396717e2e14139ad8179ba Mon Sep 17 00:00:00 2001
From: Vladimir Petko <vpetko@openjdk.org>
Date: Wed, 17 Jul 2024 09:43:47 +0000
Subject: [PATCH 116/401] 8334502: gtest/GTestWrapper.java fails on armhf due
 to LogDecorations.iso8601_utctime_test

Reviewed-by: dholmes, shade
---
 src/hotspot/share/runtime/os.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index 490a04aa6f132..c1d0c9d2fb495 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -213,9 +213,9 @@ char* os::iso8601_time(jlong milliseconds_since_19700101, char* buffer, size_t b
     abs_local_to_UTC = -(abs_local_to_UTC);
   }
   // Convert time zone offset seconds to hours and minutes.
-  const time_t zone_hours = (abs_local_to_UTC / seconds_per_hour);
-  const time_t zone_min =
-    ((abs_local_to_UTC % seconds_per_hour) / seconds_per_minute);
+  const int zone_hours = static_cast<int>(abs_local_to_UTC / seconds_per_hour);
+  const int zone_min =
+    static_cast<int>((abs_local_to_UTC % seconds_per_hour) / seconds_per_minute);
 
   // Print an ISO 8601 date and time stamp into the buffer
   const int year = 1900 + time_struct.tm_year;

From 67979eb0771ff834d6d3d18ba5a8bfe161cfc2ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= <mgronlun@openjdk.org>
Date: Wed, 17 Jul 2024 11:17:10 +0000
Subject: [PATCH 117/401] 8334781: JFR crash: 
 assert(((((JfrTraceIdBits::load(klass)) &
 ((JfrTraceIdEpoch::this_epoch_method_and_class_bits()))) != 0))) failed:
 invariant

Reviewed-by: egahlin
---
 .../recorder/checkpoint/types/jfrTypeSet.cpp   |  4 ++++
 .../checkpoint/types/jfrTypeSetUtils.hpp       |  4 ++++
 .../checkpoint/types/traceid/jfrTraceId.cpp    | 18 +++++++++---------
 .../traceid/jfrTraceIdLoadBarrier.inline.hpp   |  4 ++--
 .../types/traceid/jfrTraceIdMacros.hpp         |  7 ++++++-
 .../share/jfr/support/jfrTraceIdExtension.hpp  |  9 +++++----
 .../share/prims/jvmtiRedefineClasses.cpp       |  2 +-
 7 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
index 0c94765575239..203ec3a3ec494 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
@@ -310,7 +310,9 @@ static void set_serialized(const T* ptr) {
   assert(ptr != nullptr, "invariant");
   if (current_epoch()) {
     CLEAR_THIS_EPOCH_CLEARED_BIT(ptr);
+    assert(!IS_THIS_EPOCH_CLEARED_BIT_SET(ptr), "invariant");
   }
+  assert(IS_PREVIOUS_EPOCH_CLEARED_BIT_SET(ptr), "invariant");
   SET_SERIALIZED(ptr);
   assert(IS_SERIALIZED(ptr), "invariant");
 }
@@ -929,9 +931,11 @@ void set_serialized<Method>(MethodPtr method) {
   assert(method != nullptr, "invariant");
   if (current_epoch()) {
     CLEAR_THIS_EPOCH_METHOD_CLEARED_BIT(method);
+    assert(!IS_THIS_EPOCH_METHOD_CLEARED_BIT_SET(method), "invariant");
   }
   assert(unloading() ? true : METHOD_IS_NOT_SERIALIZED(method), "invariant");
   SET_METHOD_SERIALIZED(method);
+  assert(IS_PREVIOUS_EPOCH_METHOD_CLEARED_BIT_SET(method), "invariant");
   assert(METHOD_IS_SERIALIZED(method), "invariant");
 }
 
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp
index 237745b13d93e..bfff7eaaf1b03 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp
@@ -96,6 +96,8 @@ class ClearArtifact {
     assert(IS_NOT_TRANSIENT(value), "invariant");
     SET_PREVIOUS_EPOCH_CLEARED_BIT(value);
     CLEAR_PREVIOUS_EPOCH_METHOD_AND_CLASS(value);
+    assert(IS_THIS_EPOCH_CLEARED_BIT_SET(value), "invariant");
+    assert(IS_PREVIOUS_EPOCH_CLEARED_BIT_SET(value), "invariant");
     return true;
   }
 };
@@ -111,6 +113,8 @@ class ClearArtifact<const Method*> {
     assert(METHOD_IS_NOT_TRANSIENT(method), "invariant");
     SET_PREVIOUS_EPOCH_METHOD_CLEARED_BIT(method);
     CLEAR_PREVIOUS_EPOCH_METHOD_FLAG(method);
+    assert(IS_THIS_EPOCH_METHOD_CLEARED_BIT_SET(method), "invariant");
+    assert(IS_PREVIOUS_EPOCH_METHOD_CLEARED_BIT_SET(method), "invariant");
     return true;
   }
 };
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.cpp
index f07078eaf06de..d2973f748729a 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,22 +50,22 @@ static traceid atomic_inc(traceid volatile* const dest, traceid stride = 1) {
 
 static traceid next_class_id() {
   static volatile traceid class_id_counter = LAST_TYPE_ID + 1; // + 1 is for the void.class primitive
-  return atomic_inc(&class_id_counter) << TRACE_ID_SHIFT;
+  return (atomic_inc(&class_id_counter) << TRACE_ID_SHIFT) | EPOCH_CLEARED_BITS;
 }
 
 static traceid next_module_id() {
   static volatile traceid module_id_counter = 0;
-  return atomic_inc(&module_id_counter) << TRACE_ID_SHIFT;
+  return (atomic_inc(&module_id_counter) << TRACE_ID_SHIFT) | EPOCH_CLEARED_BITS;
 }
 
 static traceid next_package_id() {
   static volatile traceid package_id_counter = 0;
-  return atomic_inc(&package_id_counter) << TRACE_ID_SHIFT;
+  return (atomic_inc(&package_id_counter) << TRACE_ID_SHIFT) | EPOCH_CLEARED_BITS;
 }
 
 static traceid next_class_loader_data_id() {
   static volatile traceid cld_id_counter = 0;
-  return atomic_inc(&cld_id_counter) << TRACE_ID_SHIFT;
+  return (atomic_inc(&cld_id_counter) << TRACE_ID_SHIFT) | EPOCH_CLEARED_BITS;
 }
 
 static bool found_jdk_internal_event_klass = false;
@@ -201,18 +201,18 @@ traceid JfrTraceId::load_raw(jclass jc) {
 // used by CDS / APPCDS as part of "remove_unshareable_info"
 void JfrTraceId::remove(const Klass* k) {
   assert(k != nullptr, "invariant");
-  // Mask off and store the event flags.
+  // Mask off and store the event flags and epoch clear bits.
   // This mechanism will retain the event specific flags
   // in the archive, allowing for event flag restoration
   // when renewing the traceid on klass revival.
-  k->set_trace_id(EVENT_KLASS_MASK(k));
+  k->set_trace_id(EPOCH_CLEARED_BITS | EVENT_KLASS_MASK(k));
 }
 
 // used by CDS / APPCDS as part of "remove_unshareable_info"
 void JfrTraceId::remove(const Method* method) {
   assert(method != nullptr, "invariant");
-  // Clear all bits.
-  method->set_trace_flags(0);
+  // Clear tag bits and set epoch cleared bits.
+  method->set_trace_flags(static_cast<uint16_t>(EPOCH_CLEARED_BITS));
 }
 
 // used by CDS / APPCDS as part of "restore_unshareable_info"
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.inline.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.inline.hpp
index ed30233527400..5f986121ea020 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.inline.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.inline.hpp
@@ -157,9 +157,9 @@ inline traceid JfrTraceIdLoadBarrier::load_leakp(const Klass* klass) {
 
 inline traceid JfrTraceIdLoadBarrier::load_leakp(const Klass* klass, const Method* method) {
   assert(klass != nullptr, "invariant");
-  assert(METHOD_AND_CLASS_USED_THIS_EPOCH(klass), "invariant");
   assert(method != nullptr, "invariant");
   assert(klass == method->method_holder(), "invariant");
+  assert(METHOD_AND_CLASS_USED_THIS_EPOCH(klass), "invariant");
   if (should_tag(method)) {
     // the method is already logically tagged, just like the klass,
     // but because of redefinition, the latest Method*
@@ -174,9 +174,9 @@ inline traceid JfrTraceIdLoadBarrier::load_leakp(const Klass* klass, const Metho
 
 inline traceid JfrTraceIdLoadBarrier::load_leakp_previuos_epoch(const Klass* klass, const Method* method) {
   assert(klass != nullptr, "invariant");
-  assert(METHOD_AND_CLASS_USED_PREVIOUS_EPOCH(klass), "invariant");
   assert(method != nullptr, "invariant");
   assert(klass == method->method_holder(), "invariant");
+  assert(METHOD_AND_CLASS_USED_PREVIOUS_EPOCH(klass), "invariant");
   if (METHOD_FLAG_NOT_USED_PREVIOUS_EPOCH(method)) {
     // the method is already logically tagged, just like the klass,
     // but because of redefinition, the latest Method*
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdMacros.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdMacros.hpp
index 3736c070f0ac9..f53eecad2cf9e 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdMacros.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdMacros.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,6 +48,7 @@
 #define EPOCH_0_CLEARED_BIT                       (EPOCH_0_CLEARED_META_BIT << META_SHIFT)
 #define EPOCH_1_CLEARED_META_BIT                  (BIT << 1)
 #define EPOCH_1_CLEARED_BIT                       (EPOCH_1_CLEARED_META_BIT << META_SHIFT)
+#define EPOCH_CLEARED_BITS                        (EPOCH_1_CLEARED_BIT | EPOCH_0_CLEARED_BIT)
 #define LEAKP_META_BIT                            (BIT << 2)
 #define LEAKP_BIT                                 (LEAKP_META_BIT << META_SHIFT)
 #define TRANSIENT_META_BIT                        (BIT << 3)
@@ -136,6 +137,8 @@
 #define IS_TRANSIENT(ptr)                         (TRACE_ID_PREDICATE(ptr, TRANSIENT_BIT))
 #define IS_NOT_TRANSIENT(ptr)                     (!(IS_TRANSIENT(ptr)))
 #define SET_SERIALIZED(ptr)                       (TRACE_ID_META_TAG(ptr, SERIALIZED_META_BIT))
+#define IS_THIS_EPOCH_CLEARED_BIT_SET(ptr)        (TRACE_ID_PREDICATE(ptr, (THIS_EPOCH_BIT << META_SHIFT)))
+#define IS_PREVIOUS_EPOCH_CLEARED_BIT_SET(ptr)    (TRACE_ID_PREDICATE(ptr, (PREVIOUS_EPOCH_BIT << META_SHIFT)))
 #define IS_SERIALIZED(ptr)                        (TRACE_ID_PREDICATE(ptr, SERIALIZED_BIT))
 #define IS_NOT_SERIALIZED(ptr)                    (!(IS_SERIALIZED(ptr)))
 #define SHOULD_TAG(ptr)                           (NOT_USED_THIS_EPOCH(ptr))
@@ -161,5 +164,7 @@
 #define CLEAR_THIS_EPOCH_METHOD_CLEARED_BIT(ptr)  (METHOD_META_MASK_CLEAR(ptr,(~(THIS_EPOCH_BIT))))
 #define IS_THIS_EPOCH_METHOD_CLEARED(ptr)         (METHOD_FLAG_PREDICATE(method, THIS_EPOCH_BIT))
 #define IS_PREVIOUS_EPOCH_METHOD_CLEARED(ptr)     (METHOD_FLAG_PREDICATE(method, PREVIOUS_EPOCH_BIT))
+#define IS_THIS_EPOCH_METHOD_CLEARED_BIT_SET(ptr) (METHOD_FLAG_PREDICATE(ptr, (THIS_EPOCH_BIT << META_SHIFT)))
+#define IS_PREVIOUS_EPOCH_METHOD_CLEARED_BIT_SET(ptr) (METHOD_FLAG_PREDICATE(ptr, (PREVIOUS_EPOCH_BIT << META_SHIFT)))
 
 #endif // SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDMACROS_HPP
diff --git a/src/hotspot/share/jfr/support/jfrTraceIdExtension.hpp b/src/hotspot/share/jfr/support/jfrTraceIdExtension.hpp
index 353e5c3f07c2b..c73ece42645c3 100644
--- a/src/hotspot/share/jfr/support/jfrTraceIdExtension.hpp
+++ b/src/hotspot/share/jfr/support/jfrTraceIdExtension.hpp
@@ -44,11 +44,13 @@
 #define REMOVE_METHOD_ID(method) JfrTraceId::remove(method);
 #define RESTORE_ID(k) JfrTraceId::restore(k);
 
+static constexpr const uint16_t cleared_epoch_bits = 512 | 256;
+
 class JfrTraceFlag {
  private:
   mutable uint16_t _flags;
  public:
-  JfrTraceFlag() : _flags(0) {}
+  JfrTraceFlag() : _flags(cleared_epoch_bits) {}
   bool is_set(uint16_t flag) const {
     return (_flags & flag) != 0;
   }
@@ -96,9 +98,8 @@ class JfrTraceFlag {
   uint8_t* trace_meta_addr() const {               \
     return _trace_flags.meta_addr();               \
   }                                                \
-  void copy_trace_flags(uint8_t src_flags) const { \
-    uint8_t flags = *_trace_flags.flags_addr();    \
-    _trace_flags.set_flags(flags | src_flags);     \
+  void copy_trace_flags(uint16_t rhs_flags) const { \
+    _trace_flags.set_flags(_trace_flags.flags() | rhs_flags); \
   }
 
 #endif // SHARE_JFR_SUPPORT_JFRTRACEIDEXTENSION_HPP
diff --git a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
index 84010493dbcb6..344ef7802a2a6 100644
--- a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
+++ b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
@@ -1174,7 +1174,7 @@ jvmtiError VM_RedefineClasses::compare_and_normalize_class_versions(
           }
         }
       }
-      JFR_ONLY(k_new_method->copy_trace_flags(*k_old_method->trace_flags_addr());)
+      JFR_ONLY(k_new_method->copy_trace_flags(k_old_method->trace_flags());)
       log_trace(redefine, class, normalize)
         ("Method matched: new: %s [%d] == old: %s [%d]",
          k_new_method->name_and_sig_as_C_string(), ni, k_old_method->name_and_sig_as_C_string(), oi);

From 871362870ea8dc5f4ac186876e91023116891a5b Mon Sep 17 00:00:00 2001
From: Suchismith Roy <sroy@openjdk.org>
Date: Wed, 17 Jul 2024 11:24:08 +0000
Subject: [PATCH 118/401] 8334217: [AIX] Misleading error messages after
 JDK-8320005

Reviewed-by: jkern, mbaesken
---
 src/hotspot/os/aix/os_aix.cpp      | 11 ++++++-----
 src/hotspot/os/aix/porting_aix.cpp |  5 ++++-
 src/hotspot/os/aix/porting_aix.hpp |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index dce12db3935b3..79e3175f1b655 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -1016,7 +1016,7 @@ bool os::dll_address_to_library_name(address addr, char* buf,
   return true;
 }
 
-static void* dll_load_library(const char *filename, char *ebuf, int ebuflen) {
+static void* dll_load_library(const char *filename, int *eno, char *ebuf, int ebuflen) {
 
   log_info(os)("attempting shared library load of %s", filename);
   if (ebuf && ebuflen > 0) {
@@ -1044,7 +1044,7 @@ static void* dll_load_library(const char *filename, char *ebuf, int ebuflen) {
   void* result;
   const char* error_report = nullptr;
   JFR_ONLY(NativeLibraryLoadEvent load_event(filename, &result);)
-  result = Aix_dlopen(filename, dflags, &error_report);
+  result = Aix_dlopen(filename, dflags, eno, &error_report);
   if (result != nullptr) {
     Events::log_dll_message(nullptr, "Loaded shared library %s", filename);
     // Reload dll cache. Don't do this in signal handling.
@@ -1076,12 +1076,13 @@ void *os::dll_load(const char *filename, char *ebuf, int ebuflen) {
   const char new_extension[] = ".a";
   STATIC_ASSERT(sizeof(old_extension) >= sizeof(new_extension));
   // First try to load the existing file.
-  result = dll_load_library(filename, ebuf, ebuflen);
+  int eno=0;
+  result = dll_load_library(filename, &eno, ebuf, ebuflen);
   // If the load fails,we try to reload by changing the extension to .a for .so files only.
   // Shared object in .so format dont have braces, hence they get removed for archives with members.
-  if (result == nullptr && pointer_to_dot != nullptr && strcmp(pointer_to_dot, old_extension) == 0) {
+  if (result == nullptr && eno == ENOENT && pointer_to_dot != nullptr && strcmp(pointer_to_dot, old_extension) == 0) {
     snprintf(pointer_to_dot, sizeof(old_extension), "%s", new_extension);
-    result = dll_load_library(file_path, ebuf, ebuflen);
+    result = dll_load_library(file_path, &eno, ebuf, ebuflen);
   }
   FREE_C_HEAP_ARRAY(char, file_path);
   return result;
diff --git a/src/hotspot/os/aix/porting_aix.cpp b/src/hotspot/os/aix/porting_aix.cpp
index ac0cc8d53d81d..cbc45d3e12234 100644
--- a/src/hotspot/os/aix/porting_aix.cpp
+++ b/src/hotspot/os/aix/porting_aix.cpp
@@ -1035,7 +1035,7 @@ static bool search_file_in_LIBPATH(const char* path, struct stat64x* stat) {
 // specific AIX versions for ::dlopen() and ::dlclose(), which handles the struct g_handletable
 // This way we mimic dl handle equality for a library
 // opened a second time, as it is implemented on other platforms.
-void* Aix_dlopen(const char* filename, int Flags, const char** error_report) {
+void* Aix_dlopen(const char* filename, int Flags, int *eno, const char** error_report) {
   assert(error_report != nullptr, "error_report is nullptr");
   void* result;
   struct stat64x libstat;
@@ -1047,6 +1047,7 @@ void* Aix_dlopen(const char* filename, int Flags, const char** error_report) {
     assert(result == nullptr, "dll_load: Could not stat() file %s, but dlopen() worked; Have to improve stat()", filename);
   #endif
     *error_report = "Could not load module .\nSystem error: No such file or directory";
+    *eno = ENOENT;
     return nullptr;
   }
   else {
@@ -1090,6 +1091,7 @@ void* Aix_dlopen(const char* filename, int Flags, const char** error_report) {
         p_handletable = new_tab;
       }
       // Library not yet loaded; load it, then store its handle in handle table
+      errno = 0;
       result = ::dlopen(filename, Flags);
       if (result != nullptr) {
         g_handletable_used++;
@@ -1101,6 +1103,7 @@ void* Aix_dlopen(const char* filename, int Flags, const char** error_report) {
       }
       else {
         // error analysis when dlopen fails
+        *eno = errno;
         *error_report = ::dlerror();
         if (*error_report == nullptr) {
           *error_report = "dlerror returned no error description";
diff --git a/src/hotspot/os/aix/porting_aix.hpp b/src/hotspot/os/aix/porting_aix.hpp
index 109eceee3fca5..15f1e0afc549c 100644
--- a/src/hotspot/os/aix/porting_aix.hpp
+++ b/src/hotspot/os/aix/porting_aix.hpp
@@ -115,6 +115,6 @@ class AixMisc {
 
 };
 
-void* Aix_dlopen(const char* filename, int Flags, const char** error_report);
+void* Aix_dlopen(const char* filename, int Flags, int *eno, const char** error_report);
 
 #endif // OS_AIX_PORTING_AIX_HPP

From 6df7acbc74922d297852044596045a8b32636423 Mon Sep 17 00:00:00 2001
From: Pavel Rappo <prappo@openjdk.org>
Date: Wed, 17 Jul 2024 12:20:17 +0000
Subject: [PATCH 119/401] 8299080: Wrong default value of snippet lang
 attribute

Reviewed-by: jjg
---
 .../formats/html/taglets/SnippetTaglet.java   |  77 ++++-----
 .../formats/html/taglets/snippet/Parser.java  |   7 +-
 .../testMarkdown/TestMarkdownTaglets.java     |   4 +-
 .../doclet/testSnippetTag/SnippetTester.java  |   4 +-
 .../testSnippetTag/TestSnippetMarkup.java     |   2 +-
 .../doclet/testSnippetTag/TestSnippetTag.java | 150 +++++++++++++++---
 6 files changed, 174 insertions(+), 70 deletions(-)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java
index f03b3d1bde150..0642b37406420 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java
@@ -26,6 +26,8 @@
 package jdk.javadoc.internal.doclets.formats.html.taglets;
 
 import java.io.IOException;
+import java.net.URI;
+import java.nio.file.Path;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -65,41 +67,16 @@
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
 
+import static jdk.javadoc.internal.doclets.formats.html.taglets.SnippetTaglet.Language.*;
+
 /**
  * A taglet that represents the {@code @snippet} tag.
  */
 public class SnippetTaglet extends BaseTaglet {
 
     public enum Language {
-
-        JAVA("java"),
-        PROPERTIES("properties");
-
-        private static final Map<String, Language> languages;
-
-        static {
-            Map<String, Language> tmp = new HashMap<>();
-            for (var language : values()) {
-                String id = Objects.requireNonNull(language.identifier);
-                if (tmp.put(id, language) != null)
-                    throw new IllegalStateException(); // 1-1 correspondence
-            }
-            languages = Map.copyOf(tmp);
-        }
-
-        Language(String id) {
-            identifier = id;
-        }
-
-        private final String identifier;
-
-        public static Optional<Language> of(String identifier) {
-            if (identifier == null)
-                return Optional.empty();
-            return Optional.ofNullable(languages.get(identifier));
-        }
-
-        public String getIdentifier() {return identifier;}
+        JAVA,
+        PROPERTIES;
     }
 
     SnippetTaglet(HtmlConfiguration config) {
@@ -361,18 +338,30 @@ private Content generateContent(Element holder, DocTree tag)
             }
         }
 
-        String lang = null;
+        String lang;
         AttributeTree langAttr = attributes.get("lang");
-        if (langAttr != null) {
+
+        if (langAttr != null) { // the lang attribute overrides everything else
             lang = stringValueOf(langAttr);
-        } else if (containsClass) {
+        } else if (inlineContent != null && externalContent == null) { // an inline snippet
             lang = "java";
-        } else if (containsFile) {
-            lang = languageFromFileName(fileObject.getName());
+        } else if (externalContent != null) { // an external or a hybrid snippet
+            if (containsClass) { // the class attribute means Java
+                lang = "java";
+            } else {
+                var uri = fileObject.toUri();
+                var path = uri.getPath() != null ? uri.getPath() : "";
+                var fileName = path.substring(path.lastIndexOf('/') + 1);
+                lang = languageFromFileName(fileName);
+            }
+        } else {
+            throw new AssertionError();
         }
 
-        Optional<Language> language = Language.of(lang);
-
+        var language = switch (lang) {
+            case "properties" -> PROPERTIES;
+            case null, default -> JAVA;
+        };
 
         // TODO cache parsed external snippet (WeakHashMap)
 
@@ -482,7 +471,7 @@ private static String diff(String inline, String external) {
                """.formatted(inline, external);
     }
 
-    private StyledText parse(Resources resources, Diags diags, Optional<Language> language, String content) throws ParseException {
+    private StyledText parse(Resources resources, Diags diags, Language language, String content) throws ParseException {
         Parser.Result result = new Parser(resources).parse(diags, language, content);
         result.actions().forEach(Action::perform);
         return result.text();
@@ -505,13 +494,15 @@ private static String stringValueOf(AttributeTree at) throws BadSnippetException
     }
 
     private String languageFromFileName(String fileName) {
-        // TODO: find a way to extend/customize the list of recognized file name extensions
-        if (fileName.endsWith(".java")) {
-            return "java";
-        } else if (fileName.endsWith(".properties")) {
-            return "properties";
+        // The assumption is simple: a file extension is the language
+        // identifier.
+        // Was about to use Path.getExtension introduced in 8057113, but then
+        // learned that it was removed in 8298303.
+        int lastPeriod = fileName.lastIndexOf('.');
+        if (lastPeriod <= 0) {
+            return null;
         }
-        return null;
+        return (lastPeriod == fileName.length() - 1) ? null : fileName.substring(lastPeriod + 1);
     }
 
     private void error(TagletWriter writer, Element holder, DocTree tag, String key, Object... args) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/snippet/Parser.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/snippet/Parser.java
index 907c2231a5c3f..61e687391de9a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/snippet/Parser.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/snippet/Parser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -89,9 +89,8 @@ public Parser(Resources resources) {
         this.markupParser = new MarkupParser(resources);
     }
 
-    public Result parse(SnippetTaglet.Diags diags, Optional<SnippetTaglet.Language> language, String source) throws ParseException {
-        SnippetTaglet.Language lang = language.orElse(SnippetTaglet.Language.JAVA);
-        var p = switch (lang) {
+    public Result parse(SnippetTaglet.Diags diags, SnippetTaglet.Language language, String source) throws ParseException {
+        var p = switch (language) {
             case JAVA -> JAVA_COMMENT;
             case PROPERTIES -> PROPERTIES_COMMENT;
         };
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownTaglets.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownTaglets.java
index abf7bb13593bd..d00eab1b74fd3 100644
--- a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownTaglets.java
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownTaglets.java
@@ -121,7 +121,7 @@ public void snippet_wrapped() { }
                     <div class="snippet-container"><button class="copy snippet-copy" aria-label="Copy snippet" \
                     onclick="copySnippet(this)"><span data-copied="Copied!">Copy</span>\
                     <img src="../resource-files/copy.svg" alt="Copy snippet"></button>
-                    <pre class="snippet" id="snippet-snippet_standalone()1"><code>   this is snippet_standalone
+                    <pre class="snippet" id="snippet-snippet_standalone()1"><code class="language-java">   this is snippet_standalone
                     </code></pre>
                     </div>
 
@@ -131,7 +131,7 @@ public void snippet_wrapped() { }
                     <div class="block"><p>First sentence.</p>
                     <p>Before.</p>
                     <div class="snippet-container"><button class="copy snippet-copy" aria-label="Copy snippet" onclick="copySnippet(this)"><span data-copied="Copied!">Copy</span><img src="../resource-files/copy.svg" alt="Copy snippet"></button>
-                    <pre class="snippet" id="snippet-snippet_wrapped()1"><code>   this is a snippet_wrapped
+                    <pre class="snippet" id="snippet-snippet_wrapped()1"><code class="language-java">   this is a snippet_wrapped
                     </code></pre>
                     </div>
 
diff --git a/test/langtools/jdk/javadoc/doclet/testSnippetTag/SnippetTester.java b/test/langtools/jdk/javadoc/doclet/testSnippetTag/SnippetTester.java
index 48d4fb75fc2e6..a0430126b1034 100644
--- a/test/langtools/jdk/javadoc/doclet/testSnippetTag/SnippetTester.java
+++ b/test/langtools/jdk/javadoc/doclet/testSnippetTag/SnippetTester.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -100,7 +100,7 @@ protected void checkOutputEither(Output out, String first, String... other) {
 
     protected String getSnippetHtmlRepresentation(String pathToHtmlFile,
                                                   String content) {
-        return getSnippetHtmlRepresentation(pathToHtmlFile, content, Optional.empty(), Optional.empty());
+        return getSnippetHtmlRepresentation(pathToHtmlFile, content, Optional.of("java"), Optional.empty());
     }
 
     protected String getSnippetHtmlRepresentation(String pathToHtmlFile,
diff --git a/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetMarkup.java b/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetMarkup.java
index 9a332fde1a9a8..627827582152e 100644
--- a/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetMarkup.java
+++ b/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetMarkup.java
@@ -366,7 +366,7 @@ public class A {
                         <span class="element-name">case%s</span>()</div>
                         <div class="block">
                         %s
-                        </div>""".formatted(index, getSnippetHtmlRepresentation("A.html", t.expectedOutput(), Optional.empty(), Optional.of("snippet-case" + index + "()2")));
+                        </div>""".formatted(index, getSnippetHtmlRepresentation("A.html", t.expectedOutput(), Optional.of("java"), Optional.of("snippet-case" + index + "()2")));
             checkOutput("A.html", true, html);
         });
     }
diff --git a/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetTag.java b/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetTag.java
index 7e79232ef72a2..413de03d23bb7 100644
--- a/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetTag.java
+++ b/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetTag.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8266666 8275788 8276964
+ * @bug 8266666 8275788 8276964 8299080
  * @summary Implementation for snippets
  * @library /tools/lib ../../lib
  * @modules jdk.compiler/com.sun.tools.javac.api
@@ -108,27 +108,27 @@ record SnippetAttributes(String content, String id, String lang) { }
                     {@snippet id="foo1" :
                         Hello, Snippet!
                     }
-                    """, "foo1", null),
+                    """, "foo1", "java"),
                 new SnippetAttributes("""
                     {@snippet id="foo2":
                         Hello, Snippet!
                     }
-                    """, "foo2", null),
+                    """, "foo2", "java"),
                 new SnippetAttributes("""
                     {@snippet id='foo3' :
                         Hello, Snippet!
                     }
-                    """, "foo3", null),
+                    """, "foo3", "java"),
                 new SnippetAttributes("""
                     {@snippet id='foo4':
                         Hello, Snippet!
                     }
-                    """, "foo4", null),
+                    """, "foo4", "java"),
                 new SnippetAttributes("""
                     {@snippet id=foo5 :
                         Hello, Snippet!
                     }
-                    """, "foo5", null),
+                    """, "foo5", "java"),
 // (1) Haven't yet decided on this one. It's a consistency issue. On the one
 // hand, `:` is considered a part of a javadoc tag's name (e.g. JDK-4750173);
 // on the other hand, snippet markup treats `:` (next-line modifier) as a value
@@ -137,28 +137,28 @@ record SnippetAttributes(String content, String id, String lang) { }
 //                    {@snippet id=foo6:
 //                        Hello, Snippet!
 //                    }
-//                    """, "foo6", null),
+//                    """, "foo6", "java"),
 
                 new SnippetAttributes("""
                     {@snippet id="" :
                         Hello, Snippet!
                     }
-                    """, null, null),
+                    """, null, "java"),
                 new SnippetAttributes("""
                     {@snippet id="":
                         Hello, Snippet!
                     }
-                    """, null, null),
+                    """, null, "java"),
                 new SnippetAttributes("""
                     {@snippet id='':
                         Hello, Snippet!
                     }
-                    """, null, null),
+                    """, null, "java"),
                 new SnippetAttributes("""
                     {@snippet id=:
                         Hello, Snippet!
                     }
-                    """, null, null),
+                    """, null, "java"),
                 new SnippetAttributes("""
                     {@snippet lang="java" :
                         Hello, Snippet!
@@ -880,7 +880,7 @@ record TestCase(String input, String expectedOutput) { }
                         """
                         <span class="element-name">case%s</span>()</div>
                         <div class="block">
-                        %s""".formatted(id, getSnippetHtmlRepresentation("pkg/A.html", t.expectedOutput(), Optional.empty(),
+                        %s""".formatted(id, getSnippetHtmlRepresentation("pkg/A.html", t.expectedOutput(), Optional.of("java"),
                                 Optional.of("snippet-case" + id + "()2"))));
         });
     }
@@ -973,7 +973,7 @@ record TestCase(String input, Function<String, String> expectedTransformation) {
                         """
                         <span class="element-name">case%s</span>()</div>
                         <div class="block">
-                        %s""".formatted(index, getSnippetHtmlRepresentation("pkg/A.html", expectedOutput, Optional.empty(),
+                        %s""".formatted(index, getSnippetHtmlRepresentation("pkg/A.html", expectedOutput, Optional.of("txt"),
                                 Optional.of("snippet-case" + index + "()2"))));
         });
     }
@@ -1552,7 +1552,7 @@ record TestCase(Snippet snippet, String expectedOutput) { }
                         """
                         <span class="element-name">case%s</span>()</div>
                         <div class="block">
-                        %s""".formatted(index, getSnippetHtmlRepresentation("pkg/A.html", t.expectedOutput(), Optional.empty(),
+                        %s""".formatted(index, getSnippetHtmlRepresentation("pkg/A.html", t.expectedOutput(), Optional.of("java"),
                                 Optional.of("snippet-case" + index + "()2"))));
         });
     }
@@ -1666,13 +1666,13 @@ public void testPositiveInlineTagMarkup_SyntaxCurly(Path base) throws Exception
                     """
                     <span class="element-name">case0</span>()</div>
                     <div class="block">
-                    """ + getSnippetHtmlRepresentation("pkg/A.html", "", Optional.empty(),
+                    """ + getSnippetHtmlRepresentation("pkg/A.html", "", Optional.of("txt"),
                             Optional.of("snippet-case0()2")));
         checkOutput("pkg/A.html", true,
                     """
                     <span class="element-name">case1</span>()</div>
                     <div class="block">
-                    """ + getSnippetHtmlRepresentation("pkg/A.html", "", Optional.empty(),
+                    """ + getSnippetHtmlRepresentation("pkg/A.html", "", Optional.of("txt"),
                             Optional.of("snippet-case1()2")));
     }
 
@@ -1851,12 +1851,126 @@ record TestCase(Snippet snippet, String expectedOutput) { }
                         """
                         <span class="element-name">case%s</span>()</div>
                         <div class="block">
-                        %s""".formatted(index, getSnippetHtmlRepresentation("pkg/A.html", t.expectedOutput(), Optional.empty(),
+                        %s""".formatted(index, getSnippetHtmlRepresentation("pkg/A.html", t.expectedOutput(), Optional.of("java"),
                                 Optional.of("snippet-case" + index + "()2"))));
         });
     }
 
     @Test
+    public void testPositiveExternalHybridLangAttribute(Path base) throws Exception {
+
+        Path srcDir = base.resolve("src");
+        Path outDir = base.resolve("out");
+
+        record TestCase(String tag, String expectedContent, String expectedLang) { }
+
+        final var testCases = List.of(
+                // -------------------- external snippets --------------------
+                // if there's no file extension and no lang attribute, then
+                // markup is that of "java" and the class="language-" attribute
+                // is absent
+                new TestCase("""
+                        {@snippet file=".file"}
+                        """, """
+                        # @highlight substring=hi:
+                        hi <span class="bold">there</span>
+                        """, null),
+                new TestCase("""
+                        {@snippet file="file"}
+                        """, """
+                        # @highlight substring=hi:
+                        hi <span class="bold">there</span>
+                        """, null),
+                // if the file extension differs from the value of the lang
+                // attribute, which is set to "java", "properties" or other,
+                // then the class="language-" attribute is that of lang and
+                // markup is that of "properties" for lang=properties and
+                // markup is that of "java" for anything else
+                new TestCase("""
+                        {@snippet file="File.java" lang=properties}
+                        """, """
+                        <span class="bold">hi</span> there // @<span class="bold">hi</span>ghlight substring=there
+                        """, "properties"),
+                new TestCase("""
+                        {@snippet file="file.properties" lang=java}
+                        """, """
+                        # @highlight substring=hi:
+                        hi <span class="bold">there</span>
+                        """, "java"),
+                new TestCase("""
+                        {@snippet file="File.java" lang=txt}
+                        """, """
+                        # @highlight substring=hi:
+                        hi <span class="bold">there</span>
+                        """, "txt"),
+                // if there's no file extension, but the lang attribute is set
+                // to "java", "properties", or other, then the class="language-"
+                // attribute is that of lang and markup is that of "properties"
+                // for lang=properties and markup is that of "java" for
+                // anything else
+                new TestCase("""
+                        {@snippet file="file" lang=properties}
+                        """, """
+                        <span class="bold">hi</span> there // @<span class="bold">hi</span>ghlight substring=there
+                        """, "properties"),
+                new TestCase("""
+                        {@snippet file="file" lang=java}
+                        """, """
+                        # @highlight substring=hi:
+                        hi <span class="bold">there</span>
+                        """, "java"),
+                new TestCase("""
+                        {@snippet file="file" lang=txt}
+                        """, """
+                        # @highlight substring=hi:
+                        hi <span class="bold">there</span>
+                        """, "txt"),
+                // --------------------- hybrid snippets ---------------------
+                // the lang attribute "overrides" file extension
+                new TestCase("""
+                        {@snippet file="File.java" lang=properties:
+                        # @highlight substring=hi:
+                        hi there // @highlight substring=there
+                        }
+                        """, """
+                        <span class="bold">hi</span> there // @<span class="bold">hi</span>ghlight substring=there
+                        """, "properties"),
+                // if the lang attribute is absent, file extension determines
+                // markup and the the class="language-" attribute
+                new TestCase("""
+                        {@snippet file="file.properties":
+                        # @highlight substring=hi:
+                        hi there // @highlight substring=there
+                        }
+                        """, """
+                        <span class="bold">hi</span> there // @<span class="bold">hi</span>ghlight substring=there
+                        """, "properties")
+        );
+
+        for (var f : List.of(".file", "file", "File.java", "file.properties"))
+            addSnippetFile(srcDir, "pkg", f, """
+                    # @highlight substring=hi:
+                    hi there // @highlight substring=there
+                    """);
+
+        ClassBuilder classBuilder = new ClassBuilder(tb, "pkg.A")
+                .setModifiers("public", "class");
+        forEachNumbered(testCases, (s, i) -> classBuilder.addMembers(
+                MethodBuilder.parse("public void case%s() { }".formatted(i)).setComments(s.tag)));
+        classBuilder.write(srcDir);
+        javadoc("-d", outDir.toString(),
+                "-sourcepath", srcDir.toString(),
+                "pkg");
+        checkExit(Exit.OK);
+        forEachNumbered(testCases, (t, i) -> checkOutput("pkg/A.html", true, """
+                        <span class="element-name">case%s</span>()</div>
+                        <div class="block">
+                        %s
+                        """.formatted(i, getSnippetHtmlRepresentation("pkg/A.html", t.expectedContent, Optional.ofNullable(t.expectedLang),
+                Optional.of("snippet-case" + i + "()2")))));
+    }
+
+    //@Test
     public void testNegativeHybridTag_FileNotFound(Path base) throws Exception {
         Path srcDir = base.resolve("src");
         Path outDir = base.resolve("out");
@@ -2310,7 +2424,7 @@ record TestCase(Snippet snippet, String expectedOutput) { }
                         """
                         <span class="element-name">case%s</span>()</div>
                         <div class="block">
-                        %s""".formatted(index, getSnippetHtmlRepresentation("pkg/A.html", t.expectedOutput(), Optional.empty(),
+                        %s""".formatted(index, getSnippetHtmlRepresentation("pkg/A.html", t.expectedOutput(), Optional.of("txt"),
                                 Optional.of("snippet-case" + index + "()2"))));
         });
     }

From 7ec55df34af98e9a80381dba7f7f2127f2248f73 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Wed, 17 Jul 2024 14:49:00 +0000
Subject: [PATCH 120/401] 8336638: Parallel: Remove redundant mangle in
 PSScavenge::invoke

Reviewed-by: zgu
---
 src/hotspot/share/gc/parallel/psScavenge.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/psScavenge.cpp b/src/hotspot/share/gc/parallel/psScavenge.cpp
index 929eca54a5ce9..f3d8d90f80483 100644
--- a/src/hotspot/share/gc/parallel/psScavenge.cpp
+++ b/src/hotspot/share/gc/parallel/psScavenge.cpp
@@ -344,6 +344,9 @@ bool PSScavenge::invoke(bool clear_soft_refs) {
   PSOldGen* old_gen = heap->old_gen();
   PSAdaptiveSizePolicy* size_policy = heap->size_policy();
 
+  assert(young_gen->to_space()->is_empty(),
+         "Attempt to scavenge with live objects in to_space");
+
   heap->increment_total_collections();
 
   if (AdaptiveSizePolicy::should_update_eden_stats(gc_cause)) {
@@ -379,10 +382,6 @@ bool PSScavenge::invoke(bool clear_soft_refs) {
     // Let the size policy know we're starting
     size_policy->minor_collection_begin();
 
-    assert(young_gen->to_space()->is_empty(),
-           "Attempt to scavenge with live objects in to_space");
-    young_gen->to_space()->clear(SpaceDecorator::Mangle);
-
 #if COMPILER2_OR_JVMCI
     DerivedPointerTable::clear();
 #endif

From 10186ff48fe67aeb83c028b47f6b7e5105513cf3 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Wed, 17 Jul 2024 16:25:36 +0000
Subject: [PATCH 121/401] 8336300: DateFormatSymbols#getInstanceRef returns
 non-cached instance

Reviewed-by: joehw, iris, jlu, aturbanov
---
 .../classes/java/text/DateFormatSymbols.java     | 16 +---------------
 .../classes/java/text/SimpleDateFormat.java      |  4 ++--
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/java.base/share/classes/java/text/DateFormatSymbols.java b/src/java.base/share/classes/java/text/DateFormatSymbols.java
index 372752bf737a4..f08f5e7833804 100644
--- a/src/java.base/share/classes/java/text/DateFormatSymbols.java
+++ b/src/java.base/share/classes/java/text/DateFormatSymbols.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -351,20 +351,6 @@ public static final DateFormatSymbols getInstance(Locale locale) {
         throw new RuntimeException("DateFormatSymbols instance creation failed.");
     }
 
-    /**
-     * Returns a DateFormatSymbols provided by a provider or found in
-     * the cache. Note that this method returns a cached instance,
-     * not its clone. Therefore, the instance should never be given to
-     * an application.
-     */
-    static final DateFormatSymbols getInstanceRef(Locale locale) {
-        DateFormatSymbols dfs = getProviderInstance(locale);
-        if (dfs != null) {
-            return dfs;
-        }
-        throw new RuntimeException("DateFormatSymbols instance creation failed.");
-    }
-
     private static DateFormatSymbols getProviderInstance(Locale locale) {
         LocaleProviderAdapter adapter = LocaleProviderAdapter.getAdapter(DateFormatSymbolsProvider.class, locale);
         DateFormatSymbolsProvider provider = adapter.getDateFormatSymbolsProvider();
diff --git a/src/java.base/share/classes/java/text/SimpleDateFormat.java b/src/java.base/share/classes/java/text/SimpleDateFormat.java
index 6f4aa130a4145..dbc7235cbc4e1 100644
--- a/src/java.base/share/classes/java/text/SimpleDateFormat.java
+++ b/src/java.base/share/classes/java/text/SimpleDateFormat.java
@@ -623,7 +623,7 @@ public SimpleDateFormat(String pattern, Locale locale)
 
         initializeCalendar(locale);
         this.pattern = pattern;
-        this.formatData = DateFormatSymbols.getInstanceRef(locale);
+        formatData = DateFormatSymbols.getInstance(locale);
         this.locale = locale;
         initialize(locale);
     }
@@ -644,7 +644,7 @@ public SimpleDateFormat(String pattern, DateFormatSymbols formatSymbols)
         }
 
         this.pattern = pattern;
-        this.formatData = (DateFormatSymbols) formatSymbols.clone();
+        formatData = (DateFormatSymbols) formatSymbols.clone();
         this.locale = Locale.getDefault(Locale.Category.FORMAT);
         initializeCalendar(this.locale);
         initialize(this.locale);

From bcb5e69505f6cc8a4f323924cd2c58e630595fc0 Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <kvn@openjdk.org>
Date: Wed, 17 Jul 2024 18:46:00 +0000
Subject: [PATCH 122/401] 8335921: Fix HotSpot VM build without JVMTI

Reviewed-by: dholmes, shade
---
 make/hotspot/lib/JvmFeatures.gmk                        | 2 +-
 src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.hpp | 8 ++++----
 src/hotspot/share/jfr/periodic/jfrPeriodic.cpp          | 7 ++++++-
 src/hotspot/share/jfr/recorder/jfrRecorder.cpp          | 4 ++--
 src/hotspot/share/jvmci/jvmciCompilerToVM.hpp           | 2 ++
 src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp       | 4 ++--
 src/hotspot/share/jvmci/vmStructs_jvmci.cpp             | 2 +-
 test/jdk/jdk/jfr/event/runtime/TestAgentEvent.java      | 4 ++--
 8 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/make/hotspot/lib/JvmFeatures.gmk b/make/hotspot/lib/JvmFeatures.gmk
index c8a58465d524b..a0136870d8c3c 100644
--- a/make/hotspot/lib/JvmFeatures.gmk
+++ b/make/hotspot/lib/JvmFeatures.gmk
@@ -84,7 +84,7 @@ ifneq ($(call check-jvm-feature, jvmti), true)
       jvmtiImpl.cpp jvmtiManageCapabilities.cpp jvmtiRawMonitor.cpp jvmtiUtil.cpp jvmtiTrace.cpp \
       jvmtiCodeBlobEvents.cpp jvmtiEnv.cpp jvmtiRedefineClasses.cpp jvmtiEnvBase.cpp jvmtiEnvThreadState.cpp \
       jvmtiTagMap.cpp jvmtiEventController.cpp evmCompat.cpp jvmtiEnter.xsl jvmtiExport.cpp \
-      jvmtiClassFileReconstituter.cpp jvmtiTagMapTable.cpp jvmtiAgent.cpp jvmtiAgentList.cpp
+      jvmtiClassFileReconstituter.cpp jvmtiTagMapTable.cpp jvmtiAgent.cpp jvmtiAgentList.cpp jfrJvmtiAgent.cpp
 endif
 
 ifneq ($(call check-jvm-feature, jvmci), true)
diff --git a/src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.hpp b/src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.hpp
index bd11cdb54ed5b..22c1b5c62560b 100644
--- a/src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.hpp
+++ b/src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,10 +32,10 @@ class JfrJvmtiAgent : public JfrCHeapObj {
  private:
   JfrJvmtiAgent();
   ~JfrJvmtiAgent();
-  static bool create();
-  static void destroy();
+  static bool create() NOT_JVMTI_RETURN_(true);
+  static void destroy() NOT_JVMTI_RETURN;
  public:
-  static void retransform_classes(JNIEnv* env, jobjectArray classes, TRAPS);
+  static void retransform_classes(JNIEnv* env, jobjectArray classes, TRAPS) NOT_JVMTI_RETURN;
 };
 
 #endif // SHARE_JFR_INSTRUMENTATION_JFRJVMTIAGENT_HPP
diff --git a/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp b/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp
index 65b23e3433a60..d9aae89b99341 100644
--- a/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp
+++ b/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -280,6 +280,7 @@ TRACE_REQUEST_FUNC(SystemProcess) {
   }
 }
 
+#if INCLUDE_JVMTI
 template <typename AgentEvent>
 static void send_agent_event(AgentEvent& event, const JvmtiAgent* agent) {
   event.set_name(agent->name());
@@ -316,6 +317,10 @@ TRACE_REQUEST_FUNC(NativeAgent) {
   const JvmtiAgentList::Iterator xrun_agents_it = JvmtiAgentList::xrun_agents();
   send_native_agent_events(xrun_agents_it);
 }
+#else  // INCLUDE_JVMTI
+TRACE_REQUEST_FUNC(JavaAgent)   {}
+TRACE_REQUEST_FUNC(NativeAgent) {}
+#endif // INCLUDE_JVMTI
 
 TRACE_REQUEST_FUNC(ThreadContextSwitchRate) {
   double rate = 0.0;
diff --git a/src/hotspot/share/jfr/recorder/jfrRecorder.cpp b/src/hotspot/share/jfr/recorder/jfrRecorder.cpp
index cc460f8c2aad6..9aebdcc0afa19 100644
--- a/src/hotspot/share/jfr/recorder/jfrRecorder.cpp
+++ b/src/hotspot/share/jfr/recorder/jfrRecorder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -238,7 +238,7 @@ bool JfrRecorder::on_create_vm_2() {
 }
 
 bool JfrRecorder::on_create_vm_3() {
-  assert(JvmtiEnvBase::get_phase() == JVMTI_PHASE_LIVE, "invalid init sequence");
+  JVMTI_ONLY( assert(JvmtiEnvBase::get_phase() == JVMTI_PHASE_LIVE, "invalid init sequence"); )
   return CDSConfig::is_dumping_archive() || launch_command_line_recordings(JavaThread::current());
 }
 
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp
index 665656d0be441..8fdb96a303825 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp
@@ -126,12 +126,14 @@ class CompilerToVM {
     // Minimum alignment of an offset into CodeBuffer::SECT_CONSTS
     static int data_section_item_alignment;
 
+#if INCLUDE_JVMTI
     /*
      * Pointer to JvmtiExport::_should_notify_object_alloc.
      * Exposed as an int* instead of an address so the
      * underlying type is part of the JVMCIVMStructs definition.
      */
     static int* _should_notify_object_alloc;
+#endif
 
    public:
      static void initialize(JVMCI_TRAPS);
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
index 02cf6baff7827..f1028b4b2bb7e 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
@@ -144,7 +144,7 @@ address CompilerToVM::Data::symbol_clinit;
 
 int CompilerToVM::Data::data_section_item_alignment;
 
-int* CompilerToVM::Data::_should_notify_object_alloc;
+JVMTI_ONLY( int* CompilerToVM::Data::_should_notify_object_alloc; )
 
 void CompilerToVM::Data::initialize(JVMCI_TRAPS) {
   Klass_vtable_start_offset = in_bytes(Klass::vtable_start_offset());
@@ -230,7 +230,7 @@ void CompilerToVM::Data::initialize(JVMCI_TRAPS) {
 
   data_section_item_alignment = relocInfo::addr_unit();
 
-  _should_notify_object_alloc = &JvmtiExport::_should_notify_object_alloc;
+  JVMTI_ONLY( _should_notify_object_alloc = &JvmtiExport::_should_notify_object_alloc; )
 
   BarrierSet* bs = BarrierSet::barrier_set();
   if (bs->is_a(BarrierSet::CardTableBarrierSet)) {
diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index f55c7bf91a9b6..1e2ca0e990edb 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -138,7 +138,7 @@
                                                                                                                                      \
   static_field(CompilerToVM::Data,             data_section_item_alignment,            int)                                          \
                                                                                                                                      \
-  static_field(CompilerToVM::Data,             _should_notify_object_alloc,            int*)                                         \
+  JVMTI_ONLY(static_field(CompilerToVM::Data,  _should_notify_object_alloc,            int*))                                         \
                                                                                                                                      \
   static_field(Abstract_VM_Version,            _features,                              uint64_t)                                     \
                                                                                                                                      \
diff --git a/test/jdk/jdk/jfr/event/runtime/TestAgentEvent.java b/test/jdk/jdk/jfr/event/runtime/TestAgentEvent.java
index 3bba83ffbe483..9becd4677e1c6 100644
--- a/test/jdk/jdk/jfr/event/runtime/TestAgentEvent.java
+++ b/test/jdk/jdk/jfr/event/runtime/TestAgentEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
  * @test
  * @key jfr
  * @summary Tests Agent Loaded event by starting native and Java agents
- * @requires vm.hasJFR
+ * @requires vm.hasJFR & vm.jvmti
  *
  * @library /test/lib
  * @modules java.instrument

From 78cc0f9569535c72900cf4617e22cef99f695e61 Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nbenalla@openjdk.org>
Date: Wed, 17 Jul 2024 21:39:19 +0000
Subject: [PATCH 123/401] 8336091: Fix HTML warnings in the generated HTML
 files

Reviewed-by: dholmes
---
 make/jdk/src/classes/build/tools/fixuppandoc/Main.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/jdk/src/classes/build/tools/fixuppandoc/Main.java b/make/jdk/src/classes/build/tools/fixuppandoc/Main.java
index 4f76cbdfaf85c..3d76457b596b8 100644
--- a/make/jdk/src/classes/build/tools/fixuppandoc/Main.java
+++ b/make/jdk/src/classes/build/tools/fixuppandoc/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -638,7 +638,7 @@ void write(PrintWriter out) {
                 index++;
             }
             boolean updateEndTd = false;
-            Pattern styleAttr = Pattern.compile("(?<before>.*style=\")(?<style>[^\"]*)(?<after>\".*)");
+            Pattern styleAttr = Pattern.compile("(?s)(?<before>.*style=\")(?<style>[^\"]*)(?<after>\".*)");
             for (Entry e : entries) {
                 if (simple && e.column == maxIndex) {
                     String attrs = e.html.substring(3, e.html.length() - 1);

From 21a6cf848da00c795d833f926f831c7aea05dfa3 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Thu, 18 Jul 2024 00:21:03 +0000
Subject: [PATCH 124/401] 8336587: failure_handler lldb command times out on
 macosx-aarch64 core file

Reviewed-by: dlong, dholmes, jpai
---
 test/failure_handler/src/share/conf/mac.properties | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/failure_handler/src/share/conf/mac.properties b/test/failure_handler/src/share/conf/mac.properties
index 1a5d48f2bdc91..6a1c9fb4e777d 100644
--- a/test/failure_handler/src/share/conf/mac.properties
+++ b/test/failure_handler/src/share/conf/mac.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -71,6 +71,9 @@ native.core.timeout=600000
 cores=native.lldb
 native.lldb.app=lldb
 native.lldb.delimiter=\0
+# Core files can be very big and take a long time to load on macosx-aarch64.
+# The 20 seconds default timeout is not nearly enough.
+native.lldb.timeout=120000
 # Assume that java standard laucher has been used
 native.lldb.args=--core\0%p\0%java\0-o\0thread backtrace all\0-o\0quit
 

From 72297d22d19e34ff26bd34644dc087a1dec9527e Mon Sep 17 00:00:00 2001
From: Arseny Bochkarev <arseny.bochkarev@syntacore.com>
Date: Thu, 18 Jul 2024 08:55:07 +0000
Subject: [PATCH 125/401] 8317720: RISC-V: Implement Adler32 intrinsic

Reviewed-by: fyang
---
 src/hotspot/cpu/riscv/assembler_riscv.hpp     |   8 +
 src/hotspot/cpu/riscv/stubGenerator_riscv.cpp | 260 ++++++++++++++++++
 src/hotspot/cpu/riscv/vm_version_riscv.cpp    |  12 +
 3 files changed, 280 insertions(+)

diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp
index fbb3200f40b0d..e4280ab34e1ce 100644
--- a/src/hotspot/cpu/riscv/assembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp
@@ -1415,6 +1415,10 @@ enum VectorMask {
   INSN(vredmaxu_vs,   0b1010111, 0b010, 0b000110);
   INSN(vredmax_vs,    0b1010111, 0b010, 0b000111);
 
+  // Vector Widening Integer Reduction Instructions
+  INSN(vwredsum_vs,    0b1010111, 0b000, 0b110001);
+  INSN(vwredsumu_vs,   0b1010111, 0b000, 0b110000);
+
   // Vector Floating-Point Compare Instructions
   INSN(vmfle_vv, 0b1010111, 0b001, 0b011001);
   INSN(vmflt_vv, 0b1010111, 0b001, 0b011011);
@@ -1453,6 +1457,10 @@ enum VectorMask {
   INSN(vmulh_vv,   0b1010111, 0b010, 0b100111);
   INSN(vmul_vv,    0b1010111, 0b010, 0b100101);
 
+  // Vector Widening Integer Multiply Instructions
+  INSN(vwmul_vv,    0b1010111, 0b010, 0b111011);
+  INSN(vwmulu_vv,   0b1010111, 0b010, 0b111000);
+
   // Vector Integer Min/Max Instructions
   INSN(vmax_vv,  0b1010111, 0b000, 0b000111);
   INSN(vmaxu_vv, 0b1010111, 0b000, 0b000110);
diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
index 61c7a8668f55a..2a9faee7e2fdf 100644
--- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
@@ -5103,6 +5103,262 @@ class StubGenerator: public StubCodeGenerator {
     return (address) start;
   }
 
+  void adler32_process_bytes(Register buff, Register s1, Register s2, VectorRegister vtable,
+    VectorRegister vzero, VectorRegister vbytes, VectorRegister vs1acc, VectorRegister vs2acc,
+    Register temp0, Register temp1, Register temp2,  Register temp3,
+    VectorRegister vtemp1, VectorRegister vtemp2, int step, Assembler::LMUL lmul) {
+
+    assert((lmul == Assembler::m4 && step == 64) ||
+           (lmul == Assembler::m2 && step == 32) ||
+           (lmul == Assembler::m1 && step == 16),
+           "LMUL should be aligned with step: m4 and 64, m2 and 32 or m1 and 16");
+    // Below is function for calculating Adler32 checksum with 64-, 32- or 16-byte step. LMUL=m4, m2 or m1 is used.
+    // The results are in v12, v13, ..., v22, v23. Example below is for 64-byte step case.
+    // We use b1, b2, ..., b64 to denote the 64 bytes loaded in each iteration.
+    // In non-vectorized code, we update s1 and s2 as:
+    //   s1 <- s1 + b1
+    //   s2 <- s2 + s1
+    //   s1 <- s1 + b2
+    //   s2 <- s2 + b1
+    //   ...
+    //   s1 <- s1 + b64
+    //   s2 <- s2 + s1
+    // Putting above assignments together, we have:
+    //   s1_new = s1 + b1 + b2 + ... + b64
+    //   s2_new = s2 + (s1 + b1) + (s1 + b1 + b2) + ... + (s1 + b1 + b2 + ... + b64) =
+    //          = s2 + s1 * 64 + (b1 * 64 + b2 * 63 + ... + b64 * 1) =
+    //          = s2 + s1 * 64 + (b1, b2, ... b64) dot (64, 63, ... 1)
+
+    __ mv(temp3, step);
+    // Load data
+    __ vsetvli(temp0, temp3, Assembler::e8, lmul);
+    __ vle8_v(vbytes, buff);
+    __ addi(buff, buff, step);
+
+    // Upper bound reduction sum for s1_new:
+    // 0xFF * 64 = 0x3FC0, so:
+    // 1. Need to do vector-widening reduction sum
+    // 2. It is safe to perform sign-extension during vmv.x.s with 16-bits elements
+    __ vwredsumu_vs(vs1acc, vbytes, vzero);
+    // Multiplication for s2_new
+    __ vwmulu_vv(vs2acc, vtable, vbytes);
+
+    // s2 = s2 + s1 * log2(step)
+    __ slli(temp1, s1, exact_log2(step));
+    __ add(s2, s2, temp1);
+
+    // Summing up calculated results for s2_new
+    if (MaxVectorSize > 16) {
+      __ vsetvli(temp0, temp3, Assembler::e16, lmul);
+    } else {
+      // Half of vector-widening multiplication result is in successor of vs2acc
+      // group for vlen == 16, in which case we need to double vector register
+      // group width in order to reduction sum all of them
+      Assembler::LMUL lmulx2 = (lmul == Assembler::m1) ? Assembler::m2 :
+                               (lmul == Assembler::m2) ? Assembler::m4 : Assembler::m8;
+      __ vsetvli(temp0, temp3, Assembler::e16, lmulx2);
+    }
+    // Upper bound for reduction sum:
+    // 0xFF * (64 + 63 + ... + 2 + 1) = 0x817E0 max for whole register group, so:
+    // 1. Need to do vector-widening reduction sum
+    // 2. It is safe to perform sign-extension during vmv.x.s with 32-bits elements
+    __ vwredsumu_vs(vtemp1, vs2acc, vzero);
+
+    // Extracting results for:
+    // s1_new
+    __ vmv_x_s(temp0, vs1acc);
+    __ add(s1, s1, temp0);
+    // s2_new
+    __ vsetvli(temp0, temp3, Assembler::e32, Assembler::m1);
+    __ vmv_x_s(temp1, vtemp1);
+    __ add(s2, s2, temp1);
+  }
+
+  /***
+   *  int java.util.zip.Adler32.updateBytes(int adler, byte[] b, int off, int len)
+   *
+   *  Arguments:
+   *
+   *  Inputs:
+   *   c_rarg0   - int   adler
+   *   c_rarg1   - byte* buff (b + off)
+   *   c_rarg2   - int   len
+   *
+   *  Output:
+   *   c_rarg0   - int adler result
+   */
+  address generate_updateBytesAdler32() {
+    __ align(CodeEntryAlignment);
+    StubCodeMark mark(this, "StubRoutines", "updateBytesAdler32");
+    address start = __ pc();
+
+    Label L_nmax, L_nmax_loop, L_nmax_loop_entry, L_by16, L_by16_loop,
+      L_by16_loop_unroll, L_by1_loop, L_do_mod, L_combine, L_by1;
+
+    // Aliases
+    Register adler  = c_rarg0;
+    Register s1     = c_rarg0;
+    Register s2     = c_rarg3;
+    Register buff   = c_rarg1;
+    Register len    = c_rarg2;
+    Register nmax  = c_rarg4;
+    Register base  = c_rarg5;
+    Register count = c_rarg6;
+    Register temp0 = x28; // t3
+    Register temp1 = x29; // t4
+    Register temp2 = x30; // t5
+    Register temp3 = x31; // t6
+
+    VectorRegister vzero = v31;
+    VectorRegister vbytes = v8; // group: v8, v9, v10, v11
+    VectorRegister vs1acc = v12; // group: v12, v13, v14, v15
+    VectorRegister vs2acc = v16; // group: v16, v17, v18, v19, v20, v21, v22, v23
+    VectorRegister vtable_64 = v24; // group: v24, v25, v26, v27
+    VectorRegister vtable_32 = v4; // group: v4, v5
+    VectorRegister vtable_16 = v30;
+    VectorRegister vtemp1 = v28;
+    VectorRegister vtemp2 = v29;
+
+    // Max number of bytes we can process before having to take the mod
+    // 0x15B0 is 5552 in decimal, the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1
+    const uint64_t BASE = 0xfff1;
+    const uint64_t NMAX = 0x15B0;
+
+    // Loops steps
+    int step_64 = 64;
+    int step_32 = 32;
+    int step_16 = 16;
+    int step_1  = 1;
+
+    __ enter(); // Required for proper stackwalking of RuntimeStub frame
+    __ mv(temp1, 64);
+    __ vsetvli(temp0, temp1, Assembler::e8, Assembler::m4);
+
+    // Generating accumulation coefficients for further calculations
+    // vtable_64:
+    __ vid_v(vtemp1);
+    __ vrsub_vx(vtable_64, vtemp1, temp1);
+    // vtable_64 group now contains { 0x40, 0x3f, 0x3e, ..., 0x3, 0x2, 0x1 }
+
+    // vtable_32:
+    __ mv(temp1, 32);
+    __ vsetvli(temp0, temp1, Assembler::e8, Assembler::m2);
+    __ vid_v(vtemp1);
+    __ vrsub_vx(vtable_32, vtemp1, temp1);
+    // vtable_32 group now contains { 0x20, 0x1f, 0x1e, ..., 0x3, 0x2, 0x1 }
+
+    __ vsetivli(temp0, 16, Assembler::e8, Assembler::m1);
+    // vtable_16:
+    __ mv(temp1, 16);
+    __ vid_v(vtemp1);
+    __ vrsub_vx(vtable_16, vtemp1, temp1);
+    // vtable_16 now contains { 0x10, 0xf, 0xe, ..., 0x3, 0x2, 0x1 }
+
+    __ vmv_v_i(vzero, 0);
+
+    __ mv(base, BASE);
+    __ mv(nmax, NMAX);
+
+    // s1 is initialized to the lower 16 bits of adler
+    // s2 is initialized to the upper 16 bits of adler
+    __ srliw(s2, adler, 16); // s2 = ((adler >> 16) & 0xffff)
+    __ zero_extend(s1, adler, 16); // s1 = (adler & 0xffff)
+
+    // The pipelined loop needs at least 16 elements for 1 iteration
+    // It does check this, but it is more effective to skip to the cleanup loop
+    __ mv(temp0, step_16);
+    __ bgeu(len, temp0, L_nmax);
+    __ beqz(len, L_combine);
+
+    // Jumping to L_by1_loop
+    __ sub(len, len, step_1);
+    __ j(L_by1_loop);
+
+  __ bind(L_nmax);
+    __ sub(len, len, nmax);
+    __ sub(count, nmax, 16);
+    __ bltz(len, L_by16);
+
+  // Align L_nmax loop by 64
+  __ bind(L_nmax_loop_entry);
+    __ sub(count, count, 32);
+
+  __ bind(L_nmax_loop);
+    adler32_process_bytes(buff, s1, s2, vtable_64, vzero,
+      vbytes, vs1acc, vs2acc, temp0, temp1, temp2, temp3,
+      vtemp1, vtemp2, step_64, Assembler::m4);
+    __ sub(count, count, step_64);
+    __ bgtz(count, L_nmax_loop);
+
+    // There are three iterations left to do
+    adler32_process_bytes(buff, s1, s2, vtable_32, vzero,
+      vbytes, vs1acc, vs2acc, temp0, temp1, temp2, temp3,
+      vtemp1, vtemp2, step_32, Assembler::m2);
+    adler32_process_bytes(buff, s1, s2, vtable_16, vzero,
+      vbytes, vs1acc, vs2acc, temp0, temp1, temp2, temp3,
+      vtemp1, vtemp2, step_16, Assembler::m1);
+
+    // s1 = s1 % BASE
+    __ remuw(s1, s1, base);
+    // s2 = s2 % BASE
+    __ remuw(s2, s2, base);
+
+    __ sub(len, len, nmax);
+    __ sub(count, nmax, 16);
+    __ bgez(len, L_nmax_loop_entry);
+
+  __ bind(L_by16);
+    __ add(len, len, count);
+    __ bltz(len, L_by1);
+    // Trying to unroll
+    __ mv(temp3, step_64);
+    __ blt(len, temp3, L_by16_loop);
+
+  __ bind(L_by16_loop_unroll);
+    adler32_process_bytes(buff, s1, s2, vtable_64, vzero,
+      vbytes, vs1acc, vs2acc, temp0, temp1, temp2, temp3,
+      vtemp1, vtemp2, step_64, Assembler::m4);
+    __ sub(len, len, step_64);
+    // By now the temp3 should still be 64
+    __ bge(len, temp3, L_by16_loop_unroll);
+
+  __ bind(L_by16_loop);
+    adler32_process_bytes(buff, s1, s2, vtable_16, vzero,
+      vbytes, vs1acc, vs2acc, temp0, temp1, temp2, temp3,
+      vtemp1, vtemp2, step_16, Assembler::m1);
+    __ sub(len, len, step_16);
+    __ bgez(len, L_by16_loop);
+
+  __ bind(L_by1);
+    __ add(len, len, 15);
+    __ bltz(len, L_do_mod);
+
+  __ bind(L_by1_loop);
+    __ lbu(temp0, Address(buff, 0));
+    __ addi(buff, buff, step_1);
+    __ add(s1, temp0, s1);
+    __ add(s2, s2, s1);
+    __ sub(len, len, step_1);
+    __ bgez(len, L_by1_loop);
+
+  __ bind(L_do_mod);
+    // s1 = s1 % BASE
+    __ remuw(s1, s1, base);
+    // s2 = s2 % BASE
+    __ remuw(s2, s2, base);
+
+    // Combine lower bits and higher bits
+    // adler = s1 | (s2 << 16)
+  __ bind(L_combine);
+    __ slli(s2, s2, 16);
+    __ orr(s1, s1, s2);
+
+    __ leave(); // Required for proper stackwalking of RuntimeStub frame
+    __ ret();
+
+    return start;
+  }
+
 #endif // COMPILER2_OR_JVMCI
 
 #ifdef COMPILER2
@@ -5746,6 +6002,10 @@ static const int64_t right_3_bits = right_n_bits(3);
       StubRoutines::_sha1_implCompressMB   = generate_sha1_implCompress(true, "sha1_implCompressMB");
     }
 
+    if (UseAdler32Intrinsics) {
+      StubRoutines::_updateBytesAdler32 = generate_updateBytesAdler32();
+    }
+
 #endif // COMPILER2_OR_JVMCI
   }
 
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.cpp b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
index b7517bc3f3f0c..c52c809f9350c 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.cpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
@@ -239,6 +239,18 @@ void VM_Version::initialize() {
   //       as there are extra checks inside it which could disable UseRVV
   //       in some situations.
 
+  // Adler32
+  if (UseRVV) {
+    if (FLAG_IS_DEFAULT(UseAdler32Intrinsics)) {
+      FLAG_SET_DEFAULT(UseAdler32Intrinsics, true);
+    }
+  } else if (UseAdler32Intrinsics) {
+    if (!FLAG_IS_DEFAULT(UseAdler32Intrinsics)) {
+      warning("Adler32 intrinsic requires RVV instructions (not available on this CPU).");
+    }
+    FLAG_SET_DEFAULT(UseAdler32Intrinsics, false);
+  }
+
   // ChaCha20
   if (UseRVV) {
     if (FLAG_IS_DEFAULT(UseChaCha20Intrinsics)) {

From 1b83bd9225fe9ada4c3770d5cd41242f82fe144f Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Thu, 18 Jul 2024 10:08:13 +0000
Subject: [PATCH 126/401] 8336661: Parallel: Remove stacks_empty assert in
 PSScavenge::invoke

Reviewed-by: sangheki
---
 src/hotspot/share/gc/parallel/psScavenge.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/psScavenge.cpp b/src/hotspot/share/gc/parallel/psScavenge.cpp
index f3d8d90f80483..7df2143ccbb94 100644
--- a/src/hotspot/share/gc/parallel/psScavenge.cpp
+++ b/src/hotspot/share/gc/parallel/psScavenge.cpp
@@ -401,8 +401,6 @@ bool PSScavenge::invoke(bool clear_soft_refs) {
 
     PSPromotionManager::pre_scavenge();
 
-    // We'll use the promotion manager again later.
-    PSPromotionManager* promotion_manager = PSPromotionManager::vm_thread_promotion_manager();
     {
       GCTraceTime(Debug, gc, phases) tm("Scavenge", &_gc_timer);
 
@@ -425,17 +423,12 @@ bool PSScavenge::invoke(bool clear_soft_refs) {
       pt.print_all_references();
     }
 
-    assert(promotion_manager->stacks_empty(),"stacks should be empty at this point");
-
     {
       GCTraceTime(Debug, gc, phases) tm("Weak Processing", &_gc_timer);
       PSAdjustWeakRootsClosure root_closure;
       WeakProcessor::weak_oops_do(&ParallelScavengeHeap::heap()->workers(), &_is_alive_closure, &root_closure, 1);
     }
 
-    // Verify that usage of root_closure didn't copy any objects.
-    assert(promotion_manager->stacks_empty(),"stacks should be empty at this point");
-
     // Finally, flush the promotion_manager's labs, and deallocate its stacks.
     promotion_failure_occurred = PSPromotionManager::post_scavenge(_gc_tracer);
     if (promotion_failure_occurred) {

From 7bf531324404419e7de3e83e245d351e1a4e4499 Mon Sep 17 00:00:00 2001
From: Jorn Vernee <jvernee@openjdk.org>
Date: Thu, 18 Jul 2024 11:00:39 +0000
Subject: [PATCH 127/401] 8335480: Only deoptimize threads if needed when
 closing shared arena

Reviewed-by: mcimadamore, kvn, uschindler, vlivanov, eosterlund
---
 src/hotspot/share/c1/c1_Compilation.cpp       |   2 +
 src/hotspot/share/c1/c1_Compilation.hpp       |   3 +
 src/hotspot/share/c1/c1_GraphBuilder.cpp      |   3 +
 src/hotspot/share/ci/ciEnv.cpp                |   2 +
 src/hotspot/share/ci/ciEnv.hpp                |   1 +
 src/hotspot/share/ci/ciMethod.cpp             |   8 +
 src/hotspot/share/ci/ciMethod.hpp             |   1 +
 src/hotspot/share/code/nmethod.cpp            |   1 +
 src/hotspot/share/code/nmethod.hpp            |   4 +
 src/hotspot/share/jvmci/jvmciRuntime.cpp      |   1 +
 src/hotspot/share/opto/compile.cpp            |   1 +
 src/hotspot/share/opto/compile.hpp            |   3 +
 src/hotspot/share/opto/output.cpp             |   1 +
 src/hotspot/share/opto/parse1.cpp             |   4 +
 .../share/prims/scopedMemoryAccess.cpp        | 138 +++++++++----
 src/hotspot/share/runtime/vframe.cpp          |  86 ++++----
 src/hotspot/share/runtime/vframe.hpp          |  18 +-
 .../jdk/java/foreign/TestConcurrentClose.java | 188 ++++++++++++++++++
 test/jdk/java/foreign/TestHandshake.java      |   2 +-
 .../java/lang/foreign/ConcurrentClose.java    |  85 ++++++++
 20 files changed, 463 insertions(+), 89 deletions(-)
 create mode 100644 test/jdk/java/foreign/TestConcurrentClose.java
 create mode 100644 test/micro/org/openjdk/bench/java/lang/foreign/ConcurrentClose.java

diff --git a/src/hotspot/share/c1/c1_Compilation.cpp b/src/hotspot/share/c1/c1_Compilation.cpp
index bef1fae7f7496..48201a8605376 100644
--- a/src/hotspot/share/c1/c1_Compilation.cpp
+++ b/src/hotspot/share/c1/c1_Compilation.cpp
@@ -437,6 +437,7 @@ void Compilation::install_code(int frame_size) {
     has_unsafe_access(),
     SharedRuntime::is_wide_vector(max_vector_size()),
     has_monitors(),
+    has_scoped_access(),
     _immediate_oops_patched
   );
 }
@@ -578,6 +579,7 @@ Compilation::Compilation(AbstractCompiler* compiler, ciEnv* env, ciMethod* metho
 , _has_method_handle_invokes(false)
 , _has_reserved_stack_access(method->has_reserved_stack_access())
 , _has_monitors(method->is_synchronized() || method->has_monitor_bytecodes())
+, _has_scoped_access(method->is_scoped())
 , _install_code(install_code)
 , _bailout_msg(nullptr)
 , _first_failure_details(nullptr)
diff --git a/src/hotspot/share/c1/c1_Compilation.hpp b/src/hotspot/share/c1/c1_Compilation.hpp
index f344695509ee1..d55a8debca72c 100644
--- a/src/hotspot/share/c1/c1_Compilation.hpp
+++ b/src/hotspot/share/c1/c1_Compilation.hpp
@@ -84,6 +84,7 @@ class Compilation: public StackObj {
   bool               _has_method_handle_invokes;  // True if this method has MethodHandle invokes.
   bool               _has_reserved_stack_access;
   bool               _has_monitors; // Fastpath monitors detection for Continuations
+  bool               _has_scoped_access; // For shared scope closure
   bool               _install_code;
   const char*        _bailout_msg;
   CompilationFailureInfo* _first_failure_details; // Details for the first failure happening during compilation
@@ -143,6 +144,7 @@ class Compilation: public StackObj {
   bool has_fpu_code() const                      { return _has_fpu_code; }
   bool has_unsafe_access() const                 { return _has_unsafe_access; }
   bool has_monitors() const                      { return _has_monitors; }
+  bool has_scoped_access() const                 { return _has_scoped_access; }
   bool has_irreducible_loops() const             { return _has_irreducible_loops; }
   int max_vector_size() const                    { return 0; }
   ciMethod* method() const                       { return _method; }
@@ -175,6 +177,7 @@ class Compilation: public StackObj {
   void set_would_profile(bool f)                 { _would_profile = f; }
   void set_has_access_indexed(bool f)            { _has_access_indexed = f; }
   void set_has_monitors(bool f)                  { _has_monitors = f; }
+  void set_has_scoped_access(bool f)             { _has_scoped_access = f; }
   // Add a set of exception handlers covering the given PC offset
   void add_exception_handlers_for_pco(int pco, XHandlers* exception_handlers);
   // Statistics gathering
diff --git a/src/hotspot/share/c1/c1_GraphBuilder.cpp b/src/hotspot/share/c1/c1_GraphBuilder.cpp
index 46d74db6d6a50..0493b0458cd66 100644
--- a/src/hotspot/share/c1/c1_GraphBuilder.cpp
+++ b/src/hotspot/share/c1/c1_GraphBuilder.cpp
@@ -3518,6 +3518,9 @@ static void set_flags_for_inlined_callee(Compilation* compilation, ciMethod* cal
   if (callee->is_synchronized() || callee->has_monitor_bytecodes()) {
     compilation->set_has_monitors(true);
   }
+  if (callee->is_scoped()) {
+    compilation->set_has_scoped_access(true);
+  }
 }
 
 bool GraphBuilder::try_inline(ciMethod* callee, bool holder_known, bool ignore_return, Bytecodes::Code bc, Value receiver) {
diff --git a/src/hotspot/share/ci/ciEnv.cpp b/src/hotspot/share/ci/ciEnv.cpp
index 565300f43b4ff..3079d469ebe48 100644
--- a/src/hotspot/share/ci/ciEnv.cpp
+++ b/src/hotspot/share/ci/ciEnv.cpp
@@ -1032,6 +1032,7 @@ void ciEnv::register_method(ciMethod* target,
                             bool has_unsafe_access,
                             bool has_wide_vectors,
                             bool has_monitors,
+                            bool has_scoped_access,
                             int immediate_oops_patched) {
   VM_ENTRY_MARK;
   nmethod* nm = nullptr;
@@ -1124,6 +1125,7 @@ void ciEnv::register_method(ciMethod* target,
       nm->set_has_unsafe_access(has_unsafe_access);
       nm->set_has_wide_vectors(has_wide_vectors);
       nm->set_has_monitors(has_monitors);
+      nm->set_has_scoped_access(has_scoped_access);
       assert(!method->is_synchronized() || nm->has_monitors(), "");
 
       if (entry_bci == InvocationEntryBci) {
diff --git a/src/hotspot/share/ci/ciEnv.hpp b/src/hotspot/share/ci/ciEnv.hpp
index be63632ba4eef..5ee9b420033ef 100644
--- a/src/hotspot/share/ci/ciEnv.hpp
+++ b/src/hotspot/share/ci/ciEnv.hpp
@@ -383,6 +383,7 @@ class ciEnv : StackObj {
                        bool                      has_unsafe_access,
                        bool                      has_wide_vectors,
                        bool                      has_monitors,
+                       bool                      has_scoped_access,
                        int                       immediate_oops_patched);
 
   // Access to certain well known ciObjects.
diff --git a/src/hotspot/share/ci/ciMethod.cpp b/src/hotspot/share/ci/ciMethod.cpp
index bc95f322d0d06..b2ac3a8b2175c 100644
--- a/src/hotspot/share/ci/ciMethod.cpp
+++ b/src/hotspot/share/ci/ciMethod.cpp
@@ -960,6 +960,14 @@ bool ciMethod::is_object_initializer() const {
    return name() == ciSymbols::object_initializer_name();
 }
 
+// ------------------------------------------------------------------
+// ciMethod::is_scoped
+//
+// Return true for methods annotated with @Scoped
+bool ciMethod::is_scoped() const {
+   return get_Method()->is_scoped();
+}
+
 // ------------------------------------------------------------------
 // ciMethod::has_member_arg
 //
diff --git a/src/hotspot/share/ci/ciMethod.hpp b/src/hotspot/share/ci/ciMethod.hpp
index a7c18b09f13eb..5a4a1dd1c7fc3 100644
--- a/src/hotspot/share/ci/ciMethod.hpp
+++ b/src/hotspot/share/ci/ciMethod.hpp
@@ -360,6 +360,7 @@ class ciMethod : public ciMetadata {
   bool is_unboxing_method() const;
   bool is_vector_method() const;
   bool is_object_initializer() const;
+  bool is_scoped() const;
 
   bool can_be_statically_bound(ciInstanceKlass* context) const;
 
diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index ea56ee6129812..54aeac6be0495 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -1234,6 +1234,7 @@ void nmethod::init_defaults(CodeBuffer *code_buffer, CodeOffsets* offsets) {
   _has_method_handle_invokes  = 0;
   _has_wide_vectors           = 0;
   _has_monitors               = 0;
+  _has_scoped_access          = 0;
   _has_flushed_dependencies   = 0;
   _is_unlinked                = 0;
   _load_reported              = 0; // jvmti state
diff --git a/src/hotspot/share/code/nmethod.hpp b/src/hotspot/share/code/nmethod.hpp
index ee0fe00433149..095c0ba4a26a4 100644
--- a/src/hotspot/share/code/nmethod.hpp
+++ b/src/hotspot/share/code/nmethod.hpp
@@ -271,6 +271,7 @@ class nmethod : public CodeBlob {
           _has_method_handle_invokes:1,// Has this method MethodHandle invokes?
           _has_wide_vectors:1,         // Preserve wide vectors at safepoints
           _has_monitors:1,             // Fastpath monitor detection for continuations
+          _has_scoped_access:1,        // used by for shared scope closure (scopedMemoryAccess.cpp)
           _has_flushed_dependencies:1, // Used for maintenance of dependencies (under CodeCache_lock)
           _is_unlinked:1,              // mark during class unloading
           _load_reported:1;            // used by jvmti to track if an event has been posted for this nmethod
@@ -664,6 +665,9 @@ class nmethod : public CodeBlob {
   bool  has_monitors() const                      { return _has_monitors; }
   void  set_has_monitors(bool z)                  { _has_monitors = z; }
 
+  bool  has_scoped_access() const                 { return _has_scoped_access; }
+  void  set_has_scoped_access(bool z)             { _has_scoped_access = z; }
+
   bool  has_method_handle_invokes() const         { return _has_method_handle_invokes; }
   void  set_has_method_handle_invokes(bool z)     { _has_method_handle_invokes = z; }
 
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.cpp b/src/hotspot/share/jvmci/jvmciRuntime.cpp
index 9770e329a8813..371a6540898b3 100644
--- a/src/hotspot/share/jvmci/jvmciRuntime.cpp
+++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp
@@ -2183,6 +2183,7 @@ JVMCI::CodeInstallResult JVMCIRuntime::register_method(JVMCIEnv* JVMCIENV,
         nm->set_has_unsafe_access(has_unsafe_access);
         nm->set_has_wide_vectors(has_wide_vector);
         nm->set_has_monitors(has_monitors);
+        nm->set_has_scoped_access(true); // conservative
 
         JVMCINMethodData* data = nm->jvmci_nmethod_data();
         assert(data != nullptr, "must be");
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index 4f5c7bf5c723c..a9d73364e2d00 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -1061,6 +1061,7 @@ void Compile::Init(bool aliasing) {
 
   set_do_vector_loop(false);
   set_has_monitors(false);
+  set_has_scoped_access(false);
 
   if (AllowVectorizeOnDemand) {
     if (has_method() && _directive->VectorizeOption) {
diff --git a/src/hotspot/share/opto/compile.hpp b/src/hotspot/share/opto/compile.hpp
index 7c998d59d37fc..15c91f6ad12fa 100644
--- a/src/hotspot/share/opto/compile.hpp
+++ b/src/hotspot/share/opto/compile.hpp
@@ -354,6 +354,7 @@ class Compile : public Phase {
   // JSR 292
   bool                  _has_method_handle_invokes; // True if this method has MethodHandle invokes.
   bool                  _has_monitors;          // Metadata transfered to nmethod to enable Continuations lock-detection fastpath
+  bool                  _has_scoped_access;     // For shared scope closure
   bool                  _clinit_barrier_on_entry; // True if clinit barrier is needed on nmethod entry
   int                   _loop_opts_cnt;         // loop opts round
   uint                  _stress_seed;           // Seed for stress testing
@@ -672,6 +673,8 @@ class Compile : public Phase {
   void          set_clinit_barrier_on_entry(bool z) { _clinit_barrier_on_entry = z; }
   bool              has_monitors() const         { return _has_monitors; }
   void          set_has_monitors(bool v)         { _has_monitors = v; }
+  bool              has_scoped_access() const    { return _has_scoped_access; }
+  void          set_has_scoped_access(bool v)    { _has_scoped_access = v; }
 
   // check the CompilerOracle for special behaviours for this compile
   bool          method_has_option(CompileCommandEnum option) {
diff --git a/src/hotspot/share/opto/output.cpp b/src/hotspot/share/opto/output.cpp
index fd7d0eaf1719a..42374a0bcd4f8 100644
--- a/src/hotspot/share/opto/output.cpp
+++ b/src/hotspot/share/opto/output.cpp
@@ -3458,6 +3458,7 @@ void PhaseOutput::install_code(ciMethod*         target,
                                      has_unsafe_access,
                                      SharedRuntime::is_wide_vector(C->max_vector_size()),
                                      C->has_monitors(),
+                                     C->has_scoped_access(),
                                      0);
 
     if (C->log() != nullptr) { // Print code cache state into compiler log
diff --git a/src/hotspot/share/opto/parse1.cpp b/src/hotspot/share/opto/parse1.cpp
index 7e19336e735ed..9b194099183b1 100644
--- a/src/hotspot/share/opto/parse1.cpp
+++ b/src/hotspot/share/opto/parse1.cpp
@@ -437,6 +437,10 @@ Parse::Parse(JVMState* caller, ciMethod* parse_method, float expected_uses)
     C->set_has_monitors(true);
   }
 
+  if (parse_method->is_scoped()) {
+    C->set_has_scoped_access(true);
+  }
+
   _iter.reset_to_method(method());
   C->set_has_loops(C->has_loops() || method()->has_loops());
 
diff --git a/src/hotspot/share/prims/scopedMemoryAccess.cpp b/src/hotspot/share/prims/scopedMemoryAccess.cpp
index 62546c4fe51f6..e23eb73c81c9c 100644
--- a/src/hotspot/share/prims/scopedMemoryAccess.cpp
+++ b/src/hotspot/share/prims/scopedMemoryAccess.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 #include "classfile/vmSymbols.hpp"
 #include "jni.h"
 #include "jvm.h"
+#include "logging/logStream.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/stackwalk.hpp"
@@ -35,35 +36,76 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/vframe.inline.hpp"
 
-static bool is_in_scoped_access(JavaThread* jt, oop session) {
+template<typename Func>
+static bool for_scoped_method(JavaThread* jt, const Func& func) {
+  ResourceMark rm;
+#ifdef ASSERT
+  LogMessage(foreign) msg;
+  NonInterleavingLogStream ls{LogLevelType::Trace, msg};
+  if (ls.is_enabled()) {
+    ls.print_cr("Walking thread: %s", jt->name());
+  }
+#endif
+
   const int max_critical_stack_depth = 10;
   int depth = 0;
   for (vframeStream stream(jt); !stream.at_end(); stream.next()) {
     Method* m = stream.method();
-    if (m->is_scoped()) {
-      StackValueCollection* locals = stream.asJavaVFrame()->locals();
-      for (int i = 0; i < locals->size(); i++) {
-        StackValue* var = locals->at(i);
-        if (var->type() == T_OBJECT) {
-          if (var->get_obj() == session) {
-            assert(depth < max_critical_stack_depth, "can't have more than %d critical frames", max_critical_stack_depth);
-            return true;
-          }
-        }
-      }
-      break;
+    bool is_scoped = m->is_scoped();
+
+#ifdef ASSERT
+    if (ls.is_enabled()) {
+      stream.asJavaVFrame()->print_value(&ls);
+      ls.print_cr("    is_scoped=%s", is_scoped ? "true" : "false");
+    }
+#endif
+
+    if (is_scoped) {
+      assert(depth < max_critical_stack_depth, "can't have more than %d critical frames", max_critical_stack_depth);
+      return func(stream);
     }
     depth++;
+
 #ifndef ASSERT
+    // On debug builds, just keep searching the stack
+    // in case we missed an @Scoped method further up
     if (depth >= max_critical_stack_depth) {
       break;
     }
 #endif
   }
-
   return false;
 }
 
+static bool is_accessing_session(JavaThread* jt, oop session, bool& in_scoped) {
+  return for_scoped_method(jt, [&](vframeStream& stream){
+    in_scoped = true;
+    StackValueCollection* locals = stream.asJavaVFrame()->locals();
+    for (int i = 0; i < locals->size(); i++) {
+      StackValue* var = locals->at(i);
+      if (var->type() == T_OBJECT) {
+        if (var->get_obj() == session) {
+          return true;
+        }
+      }
+    }
+    return false;
+  });
+}
+
+static frame get_last_frame(JavaThread* jt) {
+  frame last_frame = jt->last_frame();
+  RegisterMap register_map(jt,
+                            RegisterMap::UpdateMap::include,
+                            RegisterMap::ProcessFrames::include,
+                            RegisterMap::WalkContinuation::skip);
+
+  if (last_frame.is_safepoint_blob_frame()) {
+    last_frame = last_frame.sender(&register_map);
+  }
+  return last_frame;
+}
+
 class ScopedAsyncExceptionHandshake : public AsyncExceptionHandshake {
   OopHandle _session;
 
@@ -78,8 +120,8 @@ class ScopedAsyncExceptionHandshake : public AsyncExceptionHandshake {
 
   virtual void do_thread(Thread* thread) {
     JavaThread* jt = JavaThread::cast(thread);
-    ResourceMark rm;
-    if (is_in_scoped_access(jt, _session.resolve())) {
+    bool ignored;
+    if (is_accessing_session(jt, _session.resolve(), ignored)) {
       // Throw exception to unwind out from the scoped access
       AsyncExceptionHandshake::do_thread(thread);
     }
@@ -104,31 +146,14 @@ class CloseScopedMemoryClosure : public HandshakeClosure {
       return;
     }
 
-    frame last_frame = jt->last_frame();
-    RegisterMap register_map(jt,
-                             RegisterMap::UpdateMap::include,
-                             RegisterMap::ProcessFrames::include,
-                             RegisterMap::WalkContinuation::skip);
-
-    if (last_frame.is_safepoint_blob_frame()) {
-      last_frame = last_frame.sender(&register_map);
-    }
-
-    ResourceMark rm;
-    if (last_frame.is_compiled_frame() && last_frame.can_be_deoptimized()) {
-      // FIXME: we would like to conditionally deoptimize only if the corresponding
-      // _session is reachable from the frame, but reachabilityFence doesn't currently
-      // work the way it should. Therefore we deopt unconditionally for now.
-      Deoptimization::deoptimize(jt, last_frame);
-    }
-
     if (jt->has_async_exception_condition()) {
       // Target thread just about to throw an async exception using async handshakes,
       // we will then unwind out from the scoped memory access.
       return;
     }
 
-    if (is_in_scoped_access(jt, JNIHandles::resolve(_session))) {
+    bool in_scoped = false;
+    if (is_accessing_session(jt, JNIHandles::resolve(_session), in_scoped)) {
       // We have found that the target thread is inside of a scoped access.
       // An asynchronous handshake is sent to the target thread, telling it
       // to throw an exception, which will unwind the target thread out from
@@ -136,6 +161,47 @@ class CloseScopedMemoryClosure : public HandshakeClosure {
       OopHandle session(Universe::vm_global(), JNIHandles::resolve(_session));
       OopHandle error(Universe::vm_global(), JNIHandles::resolve(_error));
       jt->install_async_exception(new ScopedAsyncExceptionHandshake(session, error));
+    } else if (!in_scoped) {
+      frame last_frame = get_last_frame(jt);
+      if (last_frame.is_compiled_frame() && last_frame.can_be_deoptimized()) {
+        // We are not at a safepoint that is 'in' an @Scoped method, but due to the compiler
+        // moving code around/hoisting checks, we may be in a situation like this:
+        //
+        // liveness check (from @Scoped method)
+        // for (...) {
+        //    for (...) { // strip-mining inner loop
+        //        memory access (from @Scoped method)
+        //    }
+        //    safepoint <-- STOPPED HERE
+        // }
+        //
+        // The safepoint at which we're stopped may be in between the liveness check
+        // and actual memory access, but is itself 'outside' of @Scoped code
+        //
+        // However, we're not sure whether we are in this exact situation, and
+        // we're also not sure whether a memory access will actually occur after
+        // this safepoint. So, we can not just install an async exception here
+        //
+        // Instead, we mark the frame for deoptimization (which happens just before
+        // execution in this frame continues) to get back to code like this:
+        //
+        // for (...) {
+        //     call to ScopedMemoryAccess
+        //     safepoint <-- STOPPED HERE
+        // }
+        //
+        // This means that we will re-do the liveness check before attempting
+        // another memory access. If the scope has been closed at that point,
+        // the target thread will see it and throw an exception.
+
+        nmethod* code = last_frame.cb()->as_nmethod();
+        if (code->has_scoped_access()) {
+          // We would like to deoptimize here only if last_frame::oops_do
+          // reports the session oop being live at this safepoint, but this
+          // currently isn't possible due to JDK-8290892
+          Deoptimization::deoptimize(jt, last_frame);
+        }
+      }
     }
   }
 };
diff --git a/src/hotspot/share/runtime/vframe.cpp b/src/hotspot/share/runtime/vframe.cpp
index be2e275bf7fc3..ebd5af5b74e6f 100644
--- a/src/hotspot/share/runtime/vframe.cpp
+++ b/src/hotspot/share/runtime/vframe.cpp
@@ -618,94 +618,94 @@ javaVFrame* vframeStreamCommon::asJavaVFrame() {
 }
 
 #ifndef PRODUCT
-void vframe::print() {
-  if (WizardMode) _fr.print_value_on(tty,nullptr);
+void vframe::print(outputStream* output) {
+  if (WizardMode) _fr.print_value_on(output, nullptr);
 }
 
-void vframe::print_value() const {
-  ((vframe*)this)->print();
+void vframe::print_value(outputStream* output) const {
+  ((vframe*)this)->print(output);
 }
 
 
-void entryVFrame::print_value() const {
-  ((entryVFrame*)this)->print();
+void entryVFrame::print_value(outputStream* output) const {
+  ((entryVFrame*)this)->print(output);
 }
 
-void entryVFrame::print() {
-  vframe::print();
-  tty->print_cr("C Chunk in between Java");
-  tty->print_cr("C     link " INTPTR_FORMAT, p2i(_fr.link()));
+void entryVFrame::print(outputStream* output) {
+  vframe::print(output);
+  output->print_cr("C Chunk in between Java");
+  output->print_cr("C     link " INTPTR_FORMAT, p2i(_fr.link()));
 }
 
 
 // ------------- javaVFrame --------------
 
-static void print_stack_values(const char* title, StackValueCollection* values) {
+static void print_stack_values(outputStream* output, const char* title, StackValueCollection* values) {
   if (values->is_empty()) return;
-  tty->print_cr("\t%s:", title);
+  output->print_cr("\t%s:", title);
   values->print();
 }
 
 
-void javaVFrame::print() {
+void javaVFrame::print(outputStream* output) {
   Thread* current_thread = Thread::current();
   ResourceMark rm(current_thread);
   HandleMark hm(current_thread);
 
-  vframe::print();
-  tty->print("\t");
+  vframe::print(output);
+  output->print("\t");
   method()->print_value();
-  tty->cr();
-  tty->print_cr("\tbci:    %d", bci());
+  output->cr();
+  output->print_cr("\tbci:    %d", bci());
 
-  print_stack_values("locals",      locals());
-  print_stack_values("expressions", expressions());
+  print_stack_values(output, "locals",      locals());
+  print_stack_values(output, "expressions", expressions());
 
   GrowableArray<MonitorInfo*>* list = monitors();
   if (list->is_empty()) return;
-  tty->print_cr("\tmonitor list:");
+  output->print_cr("\tmonitor list:");
   for (int index = (list->length()-1); index >= 0; index--) {
     MonitorInfo* monitor = list->at(index);
-    tty->print("\t  obj\t");
+    output->print("\t  obj\t");
     if (monitor->owner_is_scalar_replaced()) {
       Klass* k = java_lang_Class::as_Klass(monitor->owner_klass());
-      tty->print("( is scalar replaced %s)", k->external_name());
+      output->print("( is scalar replaced %s)", k->external_name());
     } else if (monitor->owner() == nullptr) {
-      tty->print("( null )");
+      output->print("( null )");
     } else {
       monitor->owner()->print_value();
-      tty->print("(owner=" INTPTR_FORMAT ")", p2i(monitor->owner()));
+      output->print("(owner=" INTPTR_FORMAT ")", p2i(monitor->owner()));
     }
     if (monitor->eliminated()) {
       if(is_compiled_frame()) {
-        tty->print(" ( lock is eliminated in compiled frame )");
+        output->print(" ( lock is eliminated in compiled frame )");
       } else {
-        tty->print(" ( lock is eliminated, frame not compiled )");
+        output->print(" ( lock is eliminated, frame not compiled )");
       }
     }
-    tty->cr();
-    tty->print("\t  ");
-    monitor->lock()->print_on(tty, monitor->owner());
-    tty->cr();
+    output->cr();
+    output->print("\t  ");
+    monitor->lock()->print_on(output, monitor->owner());
+    output->cr();
   }
 }
 
 
-void javaVFrame::print_value() const {
+void javaVFrame::print_value(outputStream* output) const {
   Method*    m = method();
   InstanceKlass*     k = m->method_holder();
-  tty->print_cr("frame( sp=" INTPTR_FORMAT ", unextended_sp=" INTPTR_FORMAT ", fp=" INTPTR_FORMAT ", pc=" INTPTR_FORMAT ")",
+  output->print_cr("frame( sp=" INTPTR_FORMAT ", unextended_sp=" INTPTR_FORMAT ", fp=" INTPTR_FORMAT ", pc=" INTPTR_FORMAT ")",
                 p2i(_fr.sp()),  p2i(_fr.unextended_sp()), p2i(_fr.fp()), p2i(_fr.pc()));
-  tty->print("%s.%s", k->internal_name(), m->name()->as_C_string());
+  output->print("%s.%s", k->internal_name(), m->name()->as_C_string());
 
   if (!m->is_native()) {
     Symbol*  source_name = k->source_file_name();
     int        line_number = m->line_number_from_bci(bci());
     if (source_name != nullptr && (line_number != -1)) {
-      tty->print("(%s:%d)", source_name->as_C_string(), line_number);
+      output->print("(%s:%d)", source_name->as_C_string(), line_number);
     }
   } else {
-    tty->print("(Native Method)");
+    output->print("(Native Method)");
   }
   // Check frame size and print warning if it looks suspiciously large
   if (fr().sp() != nullptr) {
@@ -719,25 +719,25 @@ void javaVFrame::print_value() const {
   }
 }
 
-void javaVFrame::print_activation(int index) const {
+void javaVFrame::print_activation(int index, outputStream* output) const {
   // frame number and method
-  tty->print("%2d - ", index);
+  output->print("%2d - ", index);
   ((vframe*)this)->print_value();
-  tty->cr();
+  output->cr();
 
   if (WizardMode) {
     ((vframe*)this)->print();
-    tty->cr();
+    output->cr();
   }
 }
 
 // ------------- externalVFrame --------------
 
-void externalVFrame::print() {
-  _fr.print_value_on(tty,nullptr);
+void externalVFrame::print(outputStream* output) {
+  _fr.print_value_on(output, nullptr);
 }
 
-void externalVFrame::print_value() const {
-  ((vframe*)this)->print();
+void externalVFrame::print_value(outputStream* output) const {
+  ((vframe*)this)->print(output);
 }
 #endif // PRODUCT
diff --git a/src/hotspot/share/runtime/vframe.hpp b/src/hotspot/share/runtime/vframe.hpp
index 427fea2f78e8c..c2a777c15569b 100644
--- a/src/hotspot/share/runtime/vframe.hpp
+++ b/src/hotspot/share/runtime/vframe.hpp
@@ -99,8 +99,8 @@ class vframe: public ResourceObj {
 
 #ifndef PRODUCT
   // printing operations
-  virtual void print_value() const;
-  virtual void print();
+  virtual void print_value(outputStream* output = tty) const;
+  virtual void print(outputStream* output = tty);
 #endif
 };
 
@@ -145,9 +145,9 @@ class javaVFrame: public vframe {
 #ifndef PRODUCT
  public:
   // printing operations
-  void print();
-  void print_value() const;
-  void print_activation(int index) const;
+  void print(outputStream* output = tty);
+  void print_value(outputStream* output = tty) const;
+  void print_activation(int index, outputStream* output = tty) const;
 #endif
   friend class vframe;
 };
@@ -195,8 +195,8 @@ class externalVFrame: public vframe {
 #ifndef PRODUCT
  public:
   // printing operations
-  void print_value() const;
-  void print();
+  void print_value(outputStream* output = tty) const;
+  void print(outputStream* output = tty);
 #endif
   friend class vframe;
 };
@@ -211,8 +211,8 @@ class entryVFrame: public externalVFrame {
 #ifndef PRODUCT
  public:
   // printing
-  void print_value() const;
-  void print();
+  void print_value(outputStream* output = tty) const;
+  void print(outputStream* output = tty);
 #endif
   friend class vframe;
 };
diff --git a/test/jdk/java/foreign/TestConcurrentClose.java b/test/jdk/java/foreign/TestConcurrentClose.java
new file mode 100644
index 0000000000000..7f39ef3904023
--- /dev/null
+++ b/test/jdk/java/foreign/TestConcurrentClose.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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
+ * @requires vm.compiler2.enabled
+ * @modules java.base/jdk.internal.vm.annotation java.base/jdk.internal.misc
+ * @key randomness
+ * @library /test/lib
+ *
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ *
+ * @run testng/othervm
+ *   -Xbootclasspath/a:.
+ *   -XX:+UnlockDiagnosticVMOptions
+ *   -XX:+WhiteBoxAPI
+ *   -XX:CompileCommand=dontinline,TestConcurrentClose$SegmentAccessor::doAccess
+ *   TestConcurrentClose
+ */
+
+import jdk.test.whitebox.WhiteBox;
+import org.testng.annotations.Test;
+
+import java.lang.foreign.Arena;
+import java.lang.foreign.MemorySegment;
+import java.lang.reflect.Method;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+
+import static java.lang.foreign.ValueLayout.JAVA_BYTE;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+public class TestConcurrentClose {
+    static final WhiteBox WB = WhiteBox.getWhiteBox();
+    static final Method DO_ACCESS_METHOD;
+    static final int C2_COMPILED_LEVEL = 4;
+
+    static {
+        try {
+            DO_ACCESS_METHOD = SegmentAccessor.class.getDeclaredMethod("doAccess");
+        } catch (ReflectiveOperationException e) {
+            throw new ExceptionInInitializerError(e);
+        }
+    }
+
+    static final int ITERATIONS = 5;
+    static final int SEGMENT_SIZE = 10_000;
+    static final int MAX_EXECUTOR_WAIT_SECONDS = 20;
+    static final int NUM_ACCESSORS = 50;
+
+    static final AtomicLong start = new AtomicLong();
+    static final AtomicBoolean started = new AtomicBoolean();
+
+    @Test
+    public void testHandshake() throws InterruptedException {
+        for (int it = 0; it < ITERATIONS; it++) {
+            System.out.println("ITERATION " + it + " - starting");
+            ExecutorService accessExecutor = Executors.newCachedThreadPool();
+            start.set(System.currentTimeMillis());
+            started.set(false);
+            CountDownLatch startClosureLatch = new CountDownLatch(1);
+
+            for (int i = 0; i < NUM_ACCESSORS ; i++) {
+                Arena arena = Arena.ofShared();
+                MemorySegment segment = arena.allocate(SEGMENT_SIZE, 1);
+                accessExecutor.execute(new SegmentAccessor(i, segment));
+                accessExecutor.execute(new Closer(i, startClosureLatch, arena));
+            }
+
+            awaitCompilation();
+
+            long closeDelay = System.currentTimeMillis() - start.get();
+            System.out.println("Starting closers after delay of " + closeDelay + " millis");
+            startClosureLatch.countDown();
+            accessExecutor.shutdown();
+            assertTrue(accessExecutor.awaitTermination(MAX_EXECUTOR_WAIT_SECONDS, TimeUnit.SECONDS));
+            long finishDelay = System.currentTimeMillis() - start.get();
+            System.out.println("ITERATION " + it + " - finished, after " + finishDelay + "milis");
+        }
+    }
+
+    static class SegmentAccessor implements Runnable {
+        final MemorySegment segment;
+        final int id;
+        boolean hasFailed = false;
+
+        SegmentAccessor(int id, MemorySegment segment) {
+            this.id = id;
+            this.segment = segment;
+        }
+
+        @Override
+        public final void run() {
+            start("Accessor #" + id);
+            while (segment.scope().isAlive()) {
+                try {
+                    doAccess();
+                } catch (IllegalStateException ex) {
+                    // scope was closed, loop should exit
+                    assertFalse(hasFailed);
+                    hasFailed = true;
+                }
+            }
+            long delay = System.currentTimeMillis() - start.get();
+            System.out.println("Accessor #" + id + " terminated - elapsed (ms): " + delay);
+        }
+
+        // keep this out of line, so it has a chance to be fully C2 compiled
+        private int doAccess() {
+            int sum = 0;
+            for (int i = 0; i < segment.byteSize(); i++) {
+                sum += segment.get(JAVA_BYTE, i);
+            }
+            return sum;
+        }
+    }
+
+    static class Closer implements Runnable {
+        final int id;
+        final Arena arena;
+        final CountDownLatch startLatch;
+
+        Closer(int id, CountDownLatch startLatch, Arena arena) {
+            this.id = id;
+            this.arena = arena;
+            this.startLatch = startLatch;
+        }
+
+        @Override
+        public void run() {
+            start("Closer #" + id);
+            try {
+                // try to close all at the same time, to simulate concurrent
+                // closures of unrelated arenas
+                startLatch.await();
+            } catch (InterruptedException e) {
+                throw new RuntimeException("Unexpected interruption", e);
+            }
+            arena.close(); // This should NOT throw
+            long delay = System.currentTimeMillis() - start.get();
+            System.out.println("Closer #" + id + "terminated - elapsed (ms): " + delay);
+        }
+    }
+
+    static void start(String name) {
+        if (started.compareAndSet(false, true)) {
+            long delay = System.currentTimeMillis() - start.get();
+            System.out.println("Started first thread: " + name + " ; elapsed (ms): " + delay);
+        }
+    }
+
+    private static void awaitCompilation() throws InterruptedException {
+        int retries = 0;
+        while (WB.getMethodCompilationLevel(DO_ACCESS_METHOD, false) != C2_COMPILED_LEVEL) {
+            if (retries > 20) {
+                throw new IllegalStateException("SegmentAccessor::doAccess method not being compiled");
+            }
+            Thread.sleep(1000);
+            retries++;
+        }
+    }
+}
diff --git a/test/jdk/java/foreign/TestHandshake.java b/test/jdk/java/foreign/TestHandshake.java
index efa175eb5c403..ff85c3482a2da 100644
--- a/test/jdk/java/foreign/TestHandshake.java
+++ b/test/jdk/java/foreign/TestHandshake.java
@@ -100,7 +100,7 @@ static abstract class AbstractSegmentAccessor implements Runnable {
 
         @Override
         public final void run() {
-            start("\"Accessor #\" + id");
+            start("Accessor #" + id);
             while (segment.scope().isAlive()) {
                 try {
                     doAccess();
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/ConcurrentClose.java b/test/micro/org/openjdk/bench/java/lang/foreign/ConcurrentClose.java
new file mode 100644
index 0000000000000..5a29e1c4ed31b
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/ConcurrentClose.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+package org.openjdk.bench.java.lang.foreign;
+
+import java.lang.foreign.Arena;
+import java.lang.foreign.MemorySegment;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.util.concurrent.TimeUnit;
+
+import org.openjdk.jmh.annotations.*;
+
+import static java.lang.foreign.ValueLayout.*;
+
+@BenchmarkMode(Mode.AverageTime)
+@Warmup(iterations = 5, time = 10, timeUnit = TimeUnit.SECONDS)
+@Measurement(iterations = 10, time = 10, timeUnit = TimeUnit.SECONDS)
+@State(Scope.Thread)
+@OutputTimeUnit(TimeUnit.MICROSECONDS)
+@Fork(1)
+public class ConcurrentClose {
+
+    static final int SIZE = 10_000;
+    static final VarHandle BYTES = MethodHandles.arrayElementVarHandle(byte[].class);
+
+    MemorySegment segment;
+    byte[] array;
+
+    @Setup
+    public void setup() {
+        segment = Arena.global().allocate(SIZE);
+        array = new byte[SIZE];
+    }
+
+    @Benchmark
+    @GroupThreads(1)
+    @Group("sharedClose")
+    public void closing() {
+        Arena arena = Arena.ofShared();
+        arena.close();
+    }
+
+    @Benchmark
+    @GroupThreads(1)
+    @Group("sharedClose")
+    public int memorySegmentAccess() {
+        int sum = 0;
+        for (long i = 0; i < segment.byteSize(); i++) {
+            sum += segment.get(JAVA_BYTE, i);
+        }
+        return sum;
+    }
+
+    @Benchmark
+    @GroupThreads(1)
+    @Group("sharedClose")
+    public int otherAccess() {
+        int sum = 0;
+        for (int i = 0; i < array.length; i++) {
+            sum += (byte) BYTES.get(array, i);
+        }
+        return sum;
+    }
+}

From 35df48e1b321d16f44ba924065143af67143cf95 Mon Sep 17 00:00:00 2001
From: Jatin Bhateja <jbhateja@openjdk.org>
Date: Thu, 18 Jul 2024 11:22:58 +0000
Subject: [PATCH 128/401] 8335860:
 compiler/vectorization/TestFloat16VectorConvChain.java fails with
 non-standard AVX/SSE settings

Reviewed-by: sviswanathan, kvn
---
 test/hotspot/jtreg/ProblemList.txt                             | 2 --
 .../compiler/vectorization/TestFloat16VectorConvChain.java     | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 000a290856170..7e7970a4c6caf 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -69,8 +69,6 @@ compiler/startup/StartupOutput.java 8326615 generic-x64
 
 compiler/codecache/CodeCacheFullCountTest.java 8332954 generic-all
 
-compiler/vectorization/TestFloat16VectorConvChain.java 8335860 generic-all
-
 compiler/interpreter/Test6833129.java 8335266 generic-i586
 
 #############################################################################
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorConvChain.java b/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorConvChain.java
index 6b090c965bb8c..9a2b9d6b8487a 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorConvChain.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorConvChain.java
@@ -24,7 +24,6 @@
 /**
 * @test
 * @summary Test Float16 vector conversion chain.
-* @requires vm.compiler2.enabled
 * @library /test/lib /
 * @run driver compiler.vectorization.TestFloat16VectorConvChain
 */
@@ -39,7 +38,7 @@
 public class TestFloat16VectorConvChain {
 
     @Test
-    @IR(counts = {IRNode.VECTOR_CAST_HF2F, IRNode.VECTOR_SIZE_ANY, ">= 1", IRNode.VECTOR_CAST_F2HF, IRNode.VECTOR_SIZE_ANY, " >= 1"})
+    @IR(applyIfCPUFeatureOr = {"f16c", "true", "avx512vl", "true"}, counts = {IRNode.VECTOR_CAST_HF2F, IRNode.VECTOR_SIZE_ANY, ">= 1", IRNode.VECTOR_CAST_F2HF, IRNode.VECTOR_SIZE_ANY, " >= 1"})
     public static void test(short [] res, short [] src1, short [] src2) {
         for (int i = 0; i < res.length; i++) {
             res[i] = (short)Float.float16ToFloat(Float.floatToFloat16(Float.float16ToFloat(src1[i]) + Float.float16ToFloat(src2[i])));

From 4a73ed44f1af4ea3e53b1e1a6acfca1ba6b636c3 Mon Sep 17 00:00:00 2001
From: Robert Toyonaga <rtoyonag@redhat.com>
Date: Thu, 18 Jul 2024 13:35:32 +0000
Subject: [PATCH 129/401] 8330144: Revise os::free_memory()

Reviewed-by: stuefe, mbaesken
---
 src/hotspot/os/aix/os_aix.cpp                 |  2 +-
 src/hotspot/os/bsd/os_bsd.cpp                 |  2 +-
 src/hotspot/os/linux/os_linux.cpp             | 13 +++-------
 src/hotspot/os/windows/os_windows.cpp         |  2 +-
 .../share/gc/parallel/mutableNUMASpace.cpp    |  2 +-
 .../share/gc/parallel/mutableSpace.cpp        |  2 +-
 src/hotspot/share/runtime/os.cpp              |  4 +--
 src/hotspot/share/runtime/os.hpp              |  4 +--
 .../runtime/test_committed_virtualmemory.cpp  |  2 +-
 test/hotspot/gtest/runtime/test_os.cpp        | 25 ++++++++++++++++++-
 10 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index 79e3175f1b655..fd16a7984a6f3 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -1846,7 +1846,7 @@ bool os::remove_stack_guard_pages(char* addr, size_t size) {
 void os::pd_realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
 }
 
-void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint) {
+void os::pd_disclaim_memory(char *addr, size_t bytes) {
 }
 
 size_t os::pd_pretouch_memory(void* first, void* last, size_t page_size) {
diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
index fe1e7098fd541..c9c6c4d3edf97 100644
--- a/src/hotspot/os/bsd/os_bsd.cpp
+++ b/src/hotspot/os/bsd/os_bsd.cpp
@@ -1684,7 +1684,7 @@ void os::pd_commit_memory_or_exit(char* addr, size_t size,
 void os::pd_realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
 }
 
-void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint) {
+void os::pd_disclaim_memory(char *addr, size_t bytes) {
   ::madvise(addr, bytes, MADV_DONTNEED);
 }
 
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 87150365ed576..1c735f1b3c9d8 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -3035,15 +3035,10 @@ void os::pd_realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
   }
 }
 
-void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint) {
-  // This method works by doing an mmap over an existing mmaping and effectively discarding
-  // the existing pages. However it won't work for SHM-based large pages that cannot be
-  // uncommitted at all. We don't do anything in this case to avoid creating a segment with
-  // small pages on top of the SHM segment. This method always works for small pages, so we
-  // allow that in any case.
-  if (alignment_hint <= os::vm_page_size() || can_commit_large_page_memory()) {
-    commit_memory(addr, bytes, alignment_hint, !ExecMem);
-  }
+// Hints to the OS that the memory is no longer needed and may be reclaimed by the OS when convenient.
+// The memory will be re-acquired on touch without needing explicit recommitting.
+void os::pd_disclaim_memory(char *addr, size_t bytes) {
+   ::madvise(addr, bytes, MADV_DONTNEED);
 }
 
 size_t os::pd_pretouch_memory(void* first, void* last, size_t page_size) {
diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index 096b52a60e2af..1cc7d9aa33adf 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -3893,7 +3893,7 @@ bool os::unguard_memory(char* addr, size_t bytes) {
 }
 
 void os::pd_realign_memory(char *addr, size_t bytes, size_t alignment_hint) { }
-void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint) { }
+void os::pd_disclaim_memory(char *addr, size_t bytes) { }
 
 size_t os::pd_pretouch_memory(void* first, void* last, size_t page_size) {
   return page_size;
diff --git a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
index d6a6639d7ef36..f261f42924e4b 100644
--- a/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
+++ b/src/hotspot/share/gc/parallel/mutableNUMASpace.cpp
@@ -213,7 +213,7 @@ void MutableNUMASpace::bias_region(MemRegion mr, uint lgrp_id) {
     // Then we uncommit the pages in the range.
     // The alignment_hint argument must be less than or equal to the small page
     // size if not using large pages or else this function does nothing.
-    os::free_memory((char*)aligned_region.start(), aligned_region.byte_size(), os_align);
+    os::disclaim_memory((char*)aligned_region.start(), aligned_region.byte_size());
     // And make them local/first-touch biased.
     os::numa_make_local((char*)aligned_region.start(), aligned_region.byte_size(), checked_cast<int>(lgrp_id));
   }
diff --git a/src/hotspot/share/gc/parallel/mutableSpace.cpp b/src/hotspot/share/gc/parallel/mutableSpace.cpp
index 89be0f31f678e..d90121b0eaf2c 100644
--- a/src/hotspot/share/gc/parallel/mutableSpace.cpp
+++ b/src/hotspot/share/gc/parallel/mutableSpace.cpp
@@ -53,7 +53,7 @@ void MutableSpace::numa_setup_pages(MemRegion mr, size_t page_size, bool clear_s
       size_t size = pointer_delta(end, start, sizeof(char));
       if (clear_space) {
         // Prefer page reallocation to migration.
-        os::free_memory((char*)start, size, page_size);
+        os::disclaim_memory((char*)start, size);
       }
       os::numa_make_global((char*)start, size);
     }
diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index c1d0c9d2fb495..6cb57e9dcb6e5 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -2271,8 +2271,8 @@ bool os::unmap_memory(char *addr, size_t bytes) {
   return result;
 }
 
-void os::free_memory(char *addr, size_t bytes, size_t alignment_hint) {
-  pd_free_memory(addr, bytes, alignment_hint);
+void os::disclaim_memory(char *addr, size_t bytes) {
+  pd_disclaim_memory(addr, bytes);
 }
 
 void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
diff --git a/src/hotspot/share/runtime/os.hpp b/src/hotspot/share/runtime/os.hpp
index af8eb8c8b9a13..63ea172166729 100644
--- a/src/hotspot/share/runtime/os.hpp
+++ b/src/hotspot/share/runtime/os.hpp
@@ -231,7 +231,7 @@ class os: AllStatic {
                            char *addr, size_t bytes, bool read_only = false,
                            bool allow_exec = false);
   static bool   pd_unmap_memory(char *addr, size_t bytes);
-  static void   pd_free_memory(char *addr, size_t bytes, size_t alignment_hint);
+  static void   pd_disclaim_memory(char *addr, size_t bytes);
   static void   pd_realign_memory(char *addr, size_t bytes, size_t alignment_hint);
 
   // Returns 0 if pretouch is done via platform dependent method, or otherwise
@@ -520,7 +520,7 @@ class os: AllStatic {
                            char *addr, size_t bytes, bool read_only = false,
                            bool allow_exec = false, MEMFLAGS flags = mtNone);
   static bool   unmap_memory(char *addr, size_t bytes);
-  static void   free_memory(char *addr, size_t bytes, size_t alignment_hint);
+  static void   disclaim_memory(char *addr, size_t bytes);
   static void   realign_memory(char *addr, size_t bytes, size_t alignment_hint);
 
   // NUMA-specific interface
diff --git a/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp b/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp
index 2ffef1e211fdd..44973c9845f57 100644
--- a/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp
+++ b/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp
@@ -132,7 +132,7 @@ class CommittedVirtualMemoryTest {
     }
 
     // Cleanup
-    os::free_memory(base, size, page_sz);
+    os::disclaim_memory(base, size);
     VirtualMemoryTracker::remove_released_region((address)base, size);
 
     rmr = VirtualMemoryTracker::_reserved_regions->find(ReservedMemoryRegion((address)base, size));
diff --git a/test/hotspot/gtest/runtime/test_os.cpp b/test/hotspot/gtest/runtime/test_os.cpp
index 70f739ce9228f..4d3e6ba7f52ac 100644
--- a/test/hotspot/gtest/runtime/test_os.cpp
+++ b/test/hotspot/gtest/runtime/test_os.cpp
@@ -20,7 +20,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 #include "precompiled.hpp"
 #include "memory/allocation.hpp"
 #include "memory/resourceArea.hpp"
@@ -977,3 +976,27 @@ TEST_VM(os, vm_min_address) {
 #endif
 }
 
+#if !defined(_WINDOWS) && !defined(_AIX)
+TEST_VM(os, free_without_uncommit) {
+  const size_t page_sz = os::vm_page_size();
+  const size_t pages = 64;
+  const size_t size = pages * page_sz;
+
+  char* base = os::reserve_memory(size, false, mtTest);
+  ASSERT_NE(base, (char*) nullptr);
+  ASSERT_TRUE(os::commit_memory(base, size, false));
+
+  for (size_t index = 0; index < pages; index++) {
+    base[index * page_sz] = 'a';
+  }
+
+  os::disclaim_memory(base, size);
+
+  // Ensure we can still use the memory without having to recommit.
+  for (size_t index = 0; index < pages; index++) {
+    base[index * page_sz] = 'a';
+  }
+
+  os::release_memory(base, size);
+}
+#endif

From 5f7b0072cfe7434b43dea53b2a8d55c56c6668ea Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Thu, 18 Jul 2024 15:24:51 +0000
Subject: [PATCH 130/401] 8336346: Fix -Wzero-as-null-pointer-constant warnings
 in jvmciJavaClasses.cpp

Reviewed-by: jwaters, thartmann
---
 src/hotspot/share/jvmci/jvmciJavaClasses.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/jvmci/jvmciJavaClasses.cpp b/src/hotspot/share/jvmci/jvmciJavaClasses.cpp
index 8bec6aa37db9b..5b26b6419df8a 100644
--- a/src/hotspot/share/jvmci/jvmciJavaClasses.cpp
+++ b/src/hotspot/share/jvmci/jvmciJavaClasses.cpp
@@ -584,7 +584,7 @@ void JNIJVMCI::register_natives(JNIEnv* env) {
 #define EMPTY2(x,y)
 #define FIELD3(className, name, sig) FIELD2(className, name)
 #define FIELD2(className, name) \
-  jfieldID JNIJVMCI::className::_##name##_field_id = 0; \
+  jfieldID JNIJVMCI::className::_##name##_field_id = nullptr; \
   int HotSpotJVMCI::className::_##name##_offset = 0;
 #define METHOD(jniCallType, jniGetMethod, hsCallType, returnType, className, methodName, signatureSymbolName)
 #define CONSTRUCTOR(className, signature)
@@ -626,7 +626,7 @@ JVMCI_CLASSES_DO(EMPTY2, EMPTY0, FIELD2, FIELD2, FIELD2, FIELD2, FIELD2, FIELD3,
   void JNIJVMCI::className::check(JVMCIEnv* jvmciEnv, JVMCIObject obj, const char* field_name, jfieldID offset) {                 \
     assert(obj.is_non_null(), "null field access of %s.%s", #className, field_name);                                              \
     assert(jvmciEnv->isa_##className(obj), "wrong class, " #className " expected, found %s", jvmciEnv->klass_name(obj));          \
-    assert(offset != 0, "must be valid offset");                                                                                  \
+    assert(offset != nullptr, "must be valid offset");                                                                            \
   }                                                                                                                               \
   jclass JNIJVMCI::className::_class = nullptr;
 

From 245c08664896d63ac050ebc23259b23908dafed5 Mon Sep 17 00:00:00 2001
From: Vicente Romero <vromero@openjdk.org>
Date: Thu, 18 Jul 2024 15:54:41 +0000
Subject: [PATCH 131/401] 8332600: javac uses record components source position
 during compilation

Reviewed-by: jlahoda
---
 .../com/sun/tools/javac/code/Symbol.java      | 28 +++++++------------
 .../com/sun/tools/javac/comp/TypeEnter.java   | 23 +++++++++++----
 .../javac/records/RecordCompilationTests.java |  4 ++-
 3 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
index 4dd4f73a161c3..99f0645cd5c76 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
@@ -1564,29 +1564,21 @@ public RecordComponent getRecordComponent(VarSymbol field) {
             return null;
         }
 
-        public RecordComponent findRecordComponentToRemove(JCVariableDecl var) {
-            RecordComponent toRemove = null;
-            for (RecordComponent rc : recordComponents) {
-                /* it could be that a record erroneously declares two record components with the same name, in that
-                 * case we need to use the position to disambiguate, but if we loaded the record from a class file
-                 * all positions will be -1, in that case we have to ignore the position and match only based on the
-                 * name
-                 */
-                if (rc.name == var.name && (var.pos == rc.pos || rc.pos == -1)) {
-                    toRemove = rc;
-                }
-            }
-            return toRemove;
-        }
-
         /* creates a record component if non is related to the given variable and recreates a brand new one
          * in other case
          */
         public RecordComponent createRecordComponent(RecordComponent existing, JCVariableDecl rcDecl, VarSymbol varSym) {
             RecordComponent rc = null;
-            if (existing != null) {
-                recordComponents = List.filter(recordComponents, existing);
-                recordComponents = recordComponents.append(rc = new RecordComponent(varSym, existing.ast, existing.isVarargs));
+            if (existing != null && !recordComponents.isEmpty()) {
+                ListBuffer<RecordComponent> newRComps = new ListBuffer<>();
+                for (RecordComponent rcomp : recordComponents) {
+                    if (existing == rcomp) {
+                        newRComps.add(rc = new RecordComponent(varSym, existing.ast, existing.isVarargs));
+                    } else {
+                        newRComps.add(rcomp);
+                    }
+                }
+                recordComponents = newRComps.toList();
             } else {
                 // Didn't find the record component: create one.
                 recordComponents = recordComponents.append(rc = new RecordComponent(varSym, rcDecl));
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
index eb48812f5382b..5be8d755d41e2 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
@@ -1048,6 +1048,7 @@ protected void runPhase(Env<AttrContext> env) {
             if ((sym.flags_field & RECORD) != 0) {
                 List<JCVariableDecl> fields = TreeInfo.recordFields(tree);
 
+                int fieldPos = 0;
                 for (JCVariableDecl field : fields) {
                     /** Some notes regarding the code below. Annotations applied to elements of a record header are propagated
                      *  to other elements which, when applicable, not explicitly declared by the user: the canonical constructor,
@@ -1063,24 +1064,24 @@ protected void runPhase(Env<AttrContext> env) {
                      *  copying the original annotations from the record component to the corresponding field, again this applies
                      *  only if APs are present.
                      *
-                     *  First, we find the record component by comparing its name and position with current field,
-                     *  if any, and we mark it. Then we copy the annotations to the field so that annotations applicable only to the record component
+                     *  First, we get the record component matching the field position. Then we copy the annotations
+                     *  to the field so that annotations applicable only to the record component
                      *  can be attributed, as if declared in the field, and then stored in the metadata associated to the record
                      *  component. The invariance we need to keep here is that record components must be scheduled for
                      *  annotation only once during this process.
                      */
-                    RecordComponent rc = sym.findRecordComponentToRemove(field);
+                    RecordComponent rc = getRecordComponentAt(sym, fieldPos);
 
                     if (rc != null && (rc.getOriginalAnnos().length() != field.mods.annotations.length())) {
                         TreeCopier<JCTree> tc = new TreeCopier<>(make.at(field.pos));
-                        List<JCAnnotation> originalAnnos = tc.copy(rc.getOriginalAnnos());
-                        field.mods.annotations = originalAnnos;
+                        field.mods.annotations = tc.copy(rc.getOriginalAnnos());
                     }
 
                     memberEnter.memberEnter(field, env);
 
                     JCVariableDecl rcDecl = new TreeCopier<JCTree>(make.at(field.pos)).copy(field);
                     sym.createRecordComponent(rc, rcDecl, field.sym);
+                    fieldPos++;
                 }
 
                 enterThisAndSuper(sym, env);
@@ -1095,6 +1096,18 @@ protected void runPhase(Env<AttrContext> env) {
         }
     }
 
+    // where
+        private RecordComponent getRecordComponentAt(ClassSymbol sym, int componentPos) {
+            int i = 0;
+            for (RecordComponent rc : sym.getRecordComponents()) {
+                if (i == componentPos) {
+                    return rc;
+                }
+                i++;
+            }
+            return null;
+        }
+
     /** Enter member fields and methods of a class
      */
     private final class MembersPhase extends AbstractMembersPhase {
diff --git a/test/langtools/tools/javac/records/RecordCompilationTests.java b/test/langtools/tools/javac/records/RecordCompilationTests.java
index 9f5e73cc5d0ba..cbd00f9c607cb 100644
--- a/test/langtools/tools/javac/records/RecordCompilationTests.java
+++ b/test/langtools/tools/javac/records/RecordCompilationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  *
  * @test
  * @bug 8250629 8252307 8247352 8241151 8246774 8259025 8288130 8282714 8289647 8294020
+ *      8332600
  * @summary Negative compilation tests, and positive compilation (smoke) tests for records
  * @library /lib/combo /tools/lib /tools/javac/lib
  * @enablePreview
@@ -136,6 +137,7 @@ void testMalformedDeclarations() {
         assertFail("compiler.err.repeated.modifier", "public public record R(String foo) { }");
         assertFail("compiler.err.repeated.modifier", "private private record R(String foo) { }");
         assertFail("compiler.err.already.defined", "record R(int x, int x) {}");
+        assertFail("compiler.err.already.defined", "record R(int x, int x, int x) {}");
         for (String s : List.of("var", "record"))
             assertFail("compiler.err.restricted.type.not.allowed.here", "record R(# x) { }", s);
         for (String s : List.of("public", "protected", "private", "static", "final", "transient", "volatile",

From bbc79a5e0144cb5ee6051e078681f9c6821441cb Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Thu, 18 Jul 2024 16:33:48 +0000
Subject: [PATCH 132/401] 8333768: Minor doc updates to java.lang.{Float,
 Double}

Reviewed-by: rgiulietti
---
 .../share/classes/java/lang/Double.java       | 56 ++++++++++++++++---
 .../share/classes/java/lang/Float.java        | 54 +++++++++++++++---
 .../share/classes/java/lang/Math.java         | 16 +++---
 .../share/classes/java/lang/StrictMath.java   | 16 +++---
 4 files changed, 111 insertions(+), 31 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/Double.java b/src/java.base/share/classes/java/lang/Double.java
index 277e1c14480c1..5f4c0b3f40f5a 100644
--- a/src/java.base/share/classes/java/lang/Double.java
+++ b/src/java.base/share/classes/java/lang/Double.java
@@ -116,8 +116,8 @@
  * <p>To provide the appropriate semantics for {@code equals} and
  * {@code compareTo} methods, those methods cannot simply be wrappers
  * around {@code ==} or ordered comparison operations. Instead, {@link
- * Double#equals equals} uses <a href=#repEquivalence> representation
- * equivalence</a>, defining NaN arguments to be equal to each other,
+ * Double#equals equals} uses {@linkplain ##repEquivalence representation
+ * equivalence}, defining NaN arguments to be equal to each other,
  * restoring reflexivity, and defining {@code +0.0} to <em>not</em> be
  * equal to {@code -0.0}. For comparisons, {@link Double#compareTo
  * compareTo} defines a total order where {@code -0.0} is less than
@@ -591,6 +591,23 @@ public final class Double extends Number
      * <p>To create localized string representations of a floating-point
      * value, use subclasses of {@link java.text.NumberFormat}.
      *
+     * @apiNote
+     * This method corresponds to the general functionality of the
+     * convertToDecimalCharacter operation defined in IEEE 754;
+     * however, that operation is defined in terms of specifying the
+     * number of significand digits used in the conversion.
+     * Code to do such a conversion in the Java platform includes
+     * converting the {@code double} to a {@link java.math.BigDecimal
+     * BigDecimal} exactly and then rounding the {@code BigDecimal} to
+     * the desired number of digits; sample code:
+     * {@snippet lang=java :
+     * double d = 0.1;
+     * int digits = 25;
+     * BigDecimal bd = new BigDecimal(d);
+     * String result = bd.round(new MathContext(digits,  RoundingMode.HALF_UP));
+     * // 0.1000000000000000055511151
+     * }
+     *
      * @param   d   the {@code double} to be converted.
      * @return a string representation of the argument.
      */
@@ -671,6 +688,11 @@ public static String toString(double d) {
      *     <td>{@code 0x0.0000000000001p-1022}</td>
      * </tbody>
      * </table>
+     *
+     * @apiNote
+     * This method corresponds to the convertToHexCharacter operation
+     * defined in IEEE 754.
+     *
      * @param   d   the {@code double} to be converted.
      * @return a hex string representation of the argument.
      * @since 1.5
@@ -897,6 +919,10 @@ public static String toHexString(double d) {
      * where {@code l} is the desired locale, or
      * {@link java.util.Locale#ROOT} if locale insensitive.
      *
+     * @apiNote
+     * This method corresponds to the convertFromDecimalCharacter and
+     * convertFromHexCharacter operations defined in IEEE 754.
+     *
      * @param      s   the string to be parsed.
      * @return     a {@code Double} object holding the value
      *             represented by the {@code String} argument.
@@ -1087,6 +1113,7 @@ public String toString() {
      * @jls 5.1.3 Narrowing Primitive Conversion
      * @since 1.1
      */
+    @Override
     public byte byteValue() {
         return (byte)value;
     }
@@ -1100,6 +1127,7 @@ public byte byteValue() {
      * @jls 5.1.3 Narrowing Primitive Conversion
      * @since 1.1
      */
+    @Override
     public short shortValue() {
         return (short)value;
     }
@@ -1109,9 +1137,14 @@ public short shortValue() {
      * after a narrowing primitive conversion.
      * @jls 5.1.3 Narrowing Primitive Conversion
      *
+     * @apiNote
+     * This method corresponds to the convertToIntegerTowardZero
+     * operation defined in IEEE 754.
+     *
      * @return  the {@code double} value represented by this object
      *          converted to type {@code int}
      */
+    @Override
     public int intValue() {
         return (int)value;
     }
@@ -1120,10 +1153,15 @@ public int intValue() {
      * Returns the value of this {@code Double} as a {@code long}
      * after a narrowing primitive conversion.
      *
+     * @apiNote
+     * This method corresponds to the convertToIntegerTowardZero
+     * operation defined in IEEE 754.
+     *
      * @return  the {@code double} value represented by this object
      *          converted to type {@code long}
      * @jls 5.1.3 Narrowing Primitive Conversion
      */
+    @Override
     public long longValue() {
         return (long)value;
     }
@@ -1141,6 +1179,7 @@ public long longValue() {
      * @jls 5.1.3 Narrowing Primitive Conversion
      * @since 1.0
      */
+    @Override
     public float floatValue() {
         return (float)value;
     }
@@ -1150,6 +1189,7 @@ public float floatValue() {
      *
      * @return the {@code double} value represented by this object
      */
+    @Override
     @IntrinsicCandidate
     public double doubleValue() {
         return value;
@@ -1210,9 +1250,8 @@ public static int hashCode(double value) {
      * on {@code double} values since the {@code ==} operator does
      * <em>not</em> define an equivalence relation and to satisfy the
      * {@linkplain Object#equals equals contract} an equivalence
-     * relation must be implemented; see <a
-     * href="#equivalenceRelation">this discussion</a> for details of
-     * floating-point equality and equivalence.
+     * relation must be implemented; see {@linkplain ##equivalenceRelation
+     * this discussion for details of floating-point equality and equivalence}.
      *
      * @see java.lang.Double#doubleToLongBits(double)
      * @jls 15.21.1 Numerical Equality Operators == and !=
@@ -1389,9 +1428,9 @@ public static long doubleToLongBits(double value) {
 
      * This ensures that the <i>natural ordering</i> of {@code Double}
      * objects imposed by this method is <i>consistent with
-     * equals</i>; see <a href="#equivalenceRelation">this
-     * discussion</a> for details of floating-point comparison and
-     * ordering.
+     * equals</i>; see {@linkplain ##equivalenceRelation this
+     * discussion for details of floating-point comparison and
+     * ordering}.
      *
      * @param   anotherDouble   the {@code Double} to be compared.
      * @return  the value {@code 0} if {@code anotherDouble} is
@@ -1405,6 +1444,7 @@ public static long doubleToLongBits(double value) {
      * @jls 15.20.1 Numerical Comparison Operators {@code <}, {@code <=}, {@code >}, and {@code >=}
      * @since   1.2
      */
+    @Override
     public int compareTo(Double anotherDouble) {
         return Double.compare(value, anotherDouble.value);
     }
diff --git a/src/java.base/share/classes/java/lang/Float.java b/src/java.base/share/classes/java/lang/Float.java
index 63a4cc0fab29b..02b6600777331 100644
--- a/src/java.base/share/classes/java/lang/Float.java
+++ b/src/java.base/share/classes/java/lang/Float.java
@@ -307,6 +307,23 @@ public final class Float extends Number
      * <p>To create localized string representations of a floating-point
      * value, use subclasses of {@link java.text.NumberFormat}.
      *
+     * @apiNote
+     * This method corresponds to the general functionality of the
+     * convertToDecimalCharacter operation defined in IEEE 754;
+     * however, that operation is defined in terms of specifying the
+     * number of significand digits used in the conversion.
+     * Code to do such a conversion in the Java platform includes
+     * converting the {@code float} to a {@link java.math.BigDecimal
+     * BigDecimal} exactly and then rounding the {@code BigDecimal} to
+     * the desired number of digits; sample code:
+     * {@snippet lang=java :
+     * floatf = 0.1f;
+     * int digits = 15;
+     * BigDecimal bd = new BigDecimal(f);
+     * String result = bd.round(new MathContext(digits,  RoundingMode.HALF_UP));
+     * // 0.100000001490116
+     * }
+     *
      * @param   f   the {@code float} to be converted.
      * @return a string representation of the argument.
      */
@@ -387,6 +404,11 @@ public static String toString(float f) {
      *     <td>{@code 0x0.000002p-126}</td>
      * </tbody>
      * </table>
+     *
+     * @apiNote
+     * This method corresponds to the convertToHexCharacter operation
+     * defined in IEEE 754.
+     *
      * @param   f   the {@code float} to be converted.
      * @return a hex string representation of the argument.
      * @since 1.5
@@ -524,6 +546,10 @@ public static String toHexString(float f) {
      * where {@code l} is the desired locale, or
      * {@link java.util.Locale#ROOT} if locale insensitive.
      *
+     * @apiNote
+     * This method corresponds to the convertFromDecimalCharacter and
+     * convertFromHexCharacter operations defined in IEEE 754.
+     *
      * @param   s   the string to be parsed.
      * @return  a {@code Float} object holding the value
      *          represented by the {@code String} argument.
@@ -729,6 +755,7 @@ public String toString() {
      *          converted to type {@code byte}
      * @jls 5.1.3 Narrowing Primitive Conversion
      */
+    @Override
     public byte byteValue() {
         return (byte)value;
     }
@@ -742,6 +769,7 @@ public byte byteValue() {
      * @jls 5.1.3 Narrowing Primitive Conversion
      * @since 1.1
      */
+    @Override
     public short shortValue() {
         return (short)value;
     }
@@ -750,10 +778,15 @@ public short shortValue() {
      * Returns the value of this {@code Float} as an {@code int} after
      * a narrowing primitive conversion.
      *
+     * @apiNote
+     * This method corresponds to the convertToIntegerTowardZero
+     * operation defined in IEEE 754.
+     *
      * @return  the {@code float} value represented by this object
      *          converted to type {@code int}
      * @jls 5.1.3 Narrowing Primitive Conversion
      */
+    @Override
     public int intValue() {
         return (int)value;
     }
@@ -762,10 +795,15 @@ public int intValue() {
      * Returns value of this {@code Float} as a {@code long} after a
      * narrowing primitive conversion.
      *
+     * @apiNote
+     * This method corresponds to the convertToIntegerTowardZero
+     * operation defined in IEEE 754.
+     *
      * @return  the {@code float} value represented by this object
      *          converted to type {@code long}
      * @jls 5.1.3 Narrowing Primitive Conversion
      */
+    @Override
     public long longValue() {
         return (long)value;
     }
@@ -775,6 +813,7 @@ public long longValue() {
      *
      * @return the {@code float} value represented by this object
      */
+    @Override
     @IntrinsicCandidate
     public float floatValue() {
         return value;
@@ -792,6 +831,7 @@ public float floatValue() {
      *         object converted to type {@code double}
      * @jls 5.1.2 Widening Primitive Conversion
      */
+    @Override
     public double doubleValue() {
         return (double)value;
     }
@@ -839,9 +879,8 @@ public static int hashCode(float value) {
      * {@code float} values since the {@code ==} operator does
      * <em>not</em> define an equivalence relation and to satisfy the
      * {@linkplain Object#equals equals contract} an equivalence
-     * relation must be implemented; see <a
-     * href="Double.html#equivalenceRelation">this discussion</a> for
-     * details of floating-point equality and equivalence.
+     * relation must be implemented; see {@linkplain Double##equivalenceRelation
+     * this discussion for details of floating-point equality and equivalence}.
      *
      * @param obj the object to be compared
      * @return  {@code true} if the objects are the same;
@@ -1092,7 +1131,7 @@ public static float float16ToFloat(short floatBinary16) {
      * <li> If the argument is a NaN, the result is a NaN.
      * </ul>
      *
-     * The <a href="#binary16Format">binary16 format</a> is discussed in
+     * The {@linkplain ##binary16Format binary16 format} is discussed in
      * more detail in the {@link #float16ToFloat} method.
      *
      * @apiNote
@@ -1208,9 +1247,9 @@ public static short floatToFloat16(float f) {
      *
      * This ensures that the <i>natural ordering</i> of {@code Float}
      * objects imposed by this method is <i>consistent with
-     * equals</i>; see <a href="Double.html#equivalenceRelation">this
-     * discussion</a> for details of floating-point comparison and
-     * ordering.
+     * equals</i>; see {@linkplain Double##equivalenceRelation this
+     * discussion for details of floating-point comparison and
+     * ordering}.
      *
      *
      * @param   anotherFloat   the {@code Float} to be compared.
@@ -1225,6 +1264,7 @@ public static short floatToFloat16(float f) {
      * @jls 15.20.1 Numerical Comparison Operators {@code <}, {@code <=}, {@code >}, and {@code >=}
      * @since   1.2
      */
+    @Override
     public int compareTo(Float anotherFloat) {
         return Float.compare(value, anotherFloat.value);
     }
diff --git a/src/java.base/share/classes/java/lang/Math.java b/src/java.base/share/classes/java/lang/Math.java
index fa45b6436c752..61b59784e0e63 100644
--- a/src/java.base/share/classes/java/lang/Math.java
+++ b/src/java.base/share/classes/java/lang/Math.java
@@ -225,7 +225,7 @@ public static double tan(double a) {
 
     /**
      * Returns the arc sine of a value; the returned angle is in the
-     * range -<i>pi</i>/2 through <i>pi</i>/2.  Special cases:
+     * range &minus;<i>pi</i>/2 through <i>pi</i>/2.  Special cases:
      * <ul><li>If the argument is NaN or its absolute value is greater
      * than 1, then the result is NaN.
      * <li>If the argument is zero, then the result is a zero with the
@@ -261,7 +261,7 @@ public static double acos(double a) {
 
     /**
      * Returns the arc tangent of a value; the returned angle is in the
-     * range -<i>pi</i>/2 through <i>pi</i>/2.  Special cases:
+     * range &minus;<i>pi</i>/2 through <i>pi</i>/2.  Special cases:
      * <ul><li>If the argument is NaN, then the result is NaN.
      * <li>If the argument is zero, then the result is a zero with the
      * same sign as the argument.
@@ -553,7 +553,7 @@ public static double rint(double a) {
      * coordinates ({@code x},&nbsp;{@code y}) to polar
      * coordinates (r,&nbsp;<i>theta</i>).
      * This method computes the phase <i>theta</i> by computing an arc tangent
-     * of {@code y/x} in the range of -<i>pi</i> to <i>pi</i>. Special
+     * of {@code y/x} in the range of &minus;<i>pi</i> to <i>pi</i>. Special
      * cases:
      * <ul><li>If either argument is NaN, then the result is NaN.
      * <li>If the first argument is positive zero and the second argument
@@ -2645,7 +2645,7 @@ public static float signum(float f) {
     /**
      * Returns the hyperbolic sine of a {@code double} value.
      * The hyperbolic sine of <i>x</i> is defined to be
-     * (<i>e<sup>x</sup>&nbsp;-&nbsp;e<sup>-x</sup></i>)/2
+     * (<i>e<sup>x</sup>&nbsp;&minus;&nbsp;e<sup>&minus;x</sup></i>)/2
      * where <i>e</i> is {@linkplain Math#E Euler's number}.
      *
      * <p>Special cases:
@@ -2674,7 +2674,7 @@ public static double sinh(double x) {
     /**
      * Returns the hyperbolic cosine of a {@code double} value.
      * The hyperbolic cosine of <i>x</i> is defined to be
-     * (<i>e<sup>x</sup>&nbsp;+&nbsp;e<sup>-x</sup></i>)/2
+     * (<i>e<sup>x</sup>&nbsp;+&nbsp;e<sup>&minus;x</sup></i>)/2
      * where <i>e</i> is {@linkplain Math#E Euler's number}.
      *
      * <p>Special cases:
@@ -2702,7 +2702,7 @@ public static double cosh(double x) {
     /**
      * Returns the hyperbolic tangent of a {@code double} value.
      * The hyperbolic tangent of <i>x</i> is defined to be
-     * (<i>e<sup>x</sup>&nbsp;-&nbsp;e<sup>-x</sup></i>)/(<i>e<sup>x</sup>&nbsp;+&nbsp;e<sup>-x</sup></i>),
+     * (<i>e<sup>x</sup>&nbsp;&minus;&nbsp;e<sup>&minus;x</sup></i>)/(<i>e<sup>x</sup>&nbsp;+&nbsp;e<sup>&minus;x</sup></i>),
      * in other words, {@linkplain Math#sinh
      * sinh(<i>x</i>)}/{@linkplain Math#cosh cosh(<i>x</i>)}.  Note
      * that the absolute value of the exact tanh is always less than
@@ -2770,7 +2770,7 @@ public static double hypot(double x, double y) {
     }
 
     /**
-     * Returns <i>e</i><sup>x</sup>&nbsp;-1.  Note that for values of
+     * Returns <i>e</i><sup>x</sup>&nbsp;&minus;1.  Note that for values of
      * <i>x</i> near 0, the exact sum of
      * {@code expm1(x)}&nbsp;+&nbsp;1 is much closer to the true
      * result of <i>e</i><sup>x</sup> than {@code exp(x)}.
@@ -2799,7 +2799,7 @@ public static double hypot(double x, double y) {
      * returned.
      *
      * @param   x   the exponent to raise <i>e</i> to in the computation of
-     *              <i>e</i><sup>{@code x}</sup>&nbsp;-1.
+     *              <i>e</i><sup>{@code x}</sup>&nbsp;&minus;1.
      * @return  the value <i>e</i><sup>{@code x}</sup>&nbsp;-&nbsp;1.
      * @since 1.5
      */
diff --git a/src/java.base/share/classes/java/lang/StrictMath.java b/src/java.base/share/classes/java/lang/StrictMath.java
index 741aa5865982a..6db10113c8aa2 100644
--- a/src/java.base/share/classes/java/lang/StrictMath.java
+++ b/src/java.base/share/classes/java/lang/StrictMath.java
@@ -181,7 +181,7 @@ public static double tan(double a) {
 
     /**
      * Returns the arc sine of a value; the returned angle is in the
-     * range -<i>pi</i>/2 through <i>pi</i>/2.  Special cases:
+     * range &minus;<i>pi</i>/2 through <i>pi</i>/2.  Special cases:
      * <ul><li>If the argument is NaN or its absolute value is greater
      * than 1, then the result is NaN.
      * <li>If the argument is zero, then the result is a zero with the
@@ -211,7 +211,7 @@ public static double acos(double a) {
 
     /**
      * Returns the arc tangent of a value; the returned angle is in the
-     * range -<i>pi</i>/2 through <i>pi</i>/2.  Special cases:
+     * range &minus;<i>pi</i>/2 through <i>pi</i>/2.  Special cases:
      * <ul><li>If the argument is NaN, then the result is NaN.
      * <li>If the argument is zero, then the result is a zero with the
      * same sign as the argument.
@@ -524,7 +524,7 @@ public static double rint(double a) {
      * coordinates ({@code x},&nbsp;{@code y}) to polar
      * coordinates (r,&nbsp;<i>theta</i>).
      * This method computes the phase <i>theta</i> by computing an arc tangent
-     * of {@code y/x} in the range of -<i>pi</i> to <i>pi</i>. Special
+     * of {@code y/x} in the range of &minus;<i>pi</i> to <i>pi</i>. Special
      * cases:
      * <ul><li>If either argument is NaN, then the result is NaN.
      * <li>If the first argument is positive zero and the second argument
@@ -2093,7 +2093,7 @@ public static float signum(float f) {
     /**
      * Returns the hyperbolic sine of a {@code double} value.
      * The hyperbolic sine of <i>x</i> is defined to be
-     * (<i>e<sup>x</sup>&nbsp;-&nbsp;e<sup>-x</sup></i>)/2
+     * (<i>e<sup>x</sup>&nbsp;&minus;&nbsp;e<sup>&minus;x</sup></i>)/2
      * where <i>e</i> is {@linkplain Math#E Euler's number}.
      *
      * <p>Special cases:
@@ -2120,7 +2120,7 @@ public static double sinh(double x) {
     /**
      * Returns the hyperbolic cosine of a {@code double} value.
      * The hyperbolic cosine of <i>x</i> is defined to be
-     * (<i>e<sup>x</sup>&nbsp;+&nbsp;e<sup>-x</sup></i>)/2
+     * (<i>e<sup>x</sup>&nbsp;+&nbsp;e<sup>&minus;x</sup></i>)/2
      * where <i>e</i> is {@linkplain Math#E Euler's number}.
      *
      * <p>Special cases:
@@ -2146,7 +2146,7 @@ public static double cosh(double x) {
     /**
      * Returns the hyperbolic tangent of a {@code double} value.
      * The hyperbolic tangent of <i>x</i> is defined to be
-     * (<i>e<sup>x</sup>&nbsp;-&nbsp;e<sup>-x</sup></i>)/(<i>e<sup>x</sup>&nbsp;+&nbsp;e<sup>-x</sup></i>),
+     * (<i>e<sup>x</sup>&nbsp;&minus;&nbsp;e<sup>&minus;x</sup></i>)/(<i>e<sup>x</sup>&nbsp;+&nbsp;e<sup>&minus;x</sup></i>),
      * in other words, {@linkplain Math#sinh
      * sinh(<i>x</i>)}/{@linkplain Math#cosh cosh(<i>x</i>)}.  Note
      * that the absolute value of the exact tanh is always less than
@@ -2203,7 +2203,7 @@ public static double hypot(double x, double y) {
     }
 
     /**
-     * Returns <i>e</i><sup>x</sup>&nbsp;-1.  Note that for values of
+     * Returns <i>e</i><sup>x</sup>&nbsp;&minus;1.  Note that for values of
      * <i>x</i> near 0, the exact sum of
      * {@code expm1(x)}&nbsp;+&nbsp;1 is much closer to the true
      * result of <i>e</i><sup>x</sup> than {@code exp(x)}.
@@ -2224,7 +2224,7 @@ public static double hypot(double x, double y) {
      * </ul>
      *
      * @param   x   the exponent to raise <i>e</i> to in the computation of
-     *              <i>e</i><sup>{@code x}</sup>&nbsp;-1.
+     *              <i>e</i><sup>{@code x}</sup>&nbsp;&minus;1.
      * @return  the value <i>e</i><sup>{@code x}</sup>&nbsp;-&nbsp;1.
      * @since 1.5
      */

From 02be7b8ddcdb62977770cb5052e86bcada8478ba Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Thu, 18 Jul 2024 17:35:06 +0000
Subject: [PATCH 133/401] 8334495: Use FFM instead of jdk.internal.misc.Unsafe
 in java.desktop font implementation

Reviewed-by: jdv, dnguyen, achung
---
 .../classes/sun/font/FileFontStrike.java      |  37 ++-
 .../share/classes/sun/font/GlyphList.java     |  63 ++---
 .../share/classes/sun/font/StrikeCache.java   | 221 +++++++++++++-----
 .../share/native/libfontmanager/sunFont.c     |  40 +---
 .../classes/sun/font/XRGlyphCacheEntry.java   |  53 ++---
 5 files changed, 224 insertions(+), 190 deletions(-)

diff --git a/src/java.desktop/share/classes/sun/font/FileFontStrike.java b/src/java.desktop/share/classes/sun/font/FileFontStrike.java
index bf98b8ca57863..e6d07026a55bc 100644
--- a/src/java.desktop/share/classes/sun/font/FileFontStrike.java
+++ b/src/java.desktop/share/classes/sun/font/FileFontStrike.java
@@ -315,8 +315,7 @@ long getGlyphImageFromWindows(int glyphCode) {
              * work to the FM case.
              */
             float advance = getGlyphAdvance(glyphCode, false);
-            StrikeCache.unsafe.putFloat(ptr + StrikeCache.xAdvanceOffset,
-                                        advance);
+            StrikeCache.setGlyphXAdvance(ptr, advance);
             return ptr;
         } else {
             if (FontUtilities.isLogging()) {
@@ -665,8 +664,7 @@ private float getGlyphAdvance(int glyphCode, boolean getUserAdv) {
                 glyphPtr = getCachedGlyphPtr(glyphCode);
             }
             if (glyphPtr != 0L) {
-                advance = StrikeCache.unsafe.getFloat
-                    (glyphPtr + StrikeCache.xAdvanceOffset);
+                advance = StrikeCache.getGlyphXAdvance(glyphPtr);
 
             } else {
                 advance = fileFont.getGlyphAdvance(pScalerContext, glyphCode);
@@ -726,15 +724,13 @@ void getGlyphImageBounds(int glyphCode, Point2D.Float pt,
             return;
         }
 
-        topLeftX = StrikeCache.unsafe.getFloat(ptr+StrikeCache.topLeftXOffset);
-        topLeftY = StrikeCache.unsafe.getFloat(ptr+StrikeCache.topLeftYOffset);
+        topLeftX = StrikeCache.getGlyphTopLeftX(ptr);
+        topLeftY = StrikeCache.getGlyphTopLeftY(ptr);
 
         result.x = (int)Math.floor(pt.x + topLeftX + 0.5f);
         result.y = (int)Math.floor(pt.y + topLeftY + 0.5f);
-        result.width =
-            StrikeCache.unsafe.getShort(ptr+StrikeCache.widthOffset)  &0x0ffff;
-        result.height =
-            StrikeCache.unsafe.getShort(ptr+StrikeCache.heightOffset) &0x0ffff;
+        result.width = StrikeCache.getGlyphWidth(ptr) & 0x0ffff;
+        result.height = StrikeCache.getGlyphHeight(ptr) & 0x0ffff;
 
         /* HRGB LCD text may have padding that is empty. This is almost always
          * going to be when topLeftX is -2 or less.
@@ -755,25 +751,22 @@ void getGlyphImageBounds(int glyphCode, Point2D.Float pt,
 
     private int getGlyphImageMinX(long ptr, int origMinX) {
 
-        int width = StrikeCache.unsafe.getChar(ptr+StrikeCache.widthOffset);
-        int height = StrikeCache.unsafe.getChar(ptr+StrikeCache.heightOffset);
-        int rowBytes =
-            StrikeCache.unsafe.getChar(ptr+StrikeCache.rowBytesOffset);
+        int width = StrikeCache.getGlyphWidth(ptr);
+        int height = StrikeCache.getGlyphHeight(ptr);
+        int rowBytes = StrikeCache.getGlyphRowBytes(ptr);
 
         if (rowBytes == width) {
             return origMinX;
         }
 
-        long pixelData =
-            StrikeCache.unsafe.getAddress(ptr + StrikeCache.pixelDataOffset);
-
-        if (pixelData == 0L) {
+        if (StrikeCache.getGlyphImagePtr(ptr) == 0L) {
             return origMinX;
         }
 
+        byte[] pixelData = StrikeCache.getGlyphPixelBytes(ptr);
         for (int y=0;y<height;y++) {
             for (int x=0;x<3;x++) {
-                if (StrikeCache.unsafe.getByte(pixelData+y*rowBytes+x) != 0) {
+                if (pixelData[(y*rowBytes)+x] != 0) {
                     return origMinX;
                 }
             }
@@ -819,10 +812,8 @@ private Point2D.Float getGlyphMetrics(int glyphCode, boolean getImage) {
         }
         if (glyphPtr != 0L) {
             metrics = new Point2D.Float();
-            metrics.x = StrikeCache.unsafe.getFloat
-                (glyphPtr + StrikeCache.xAdvanceOffset);
-            metrics.y = StrikeCache.unsafe.getFloat
-                (glyphPtr + StrikeCache.yAdvanceOffset);
+            metrics.x = StrikeCache.getGlyphXAdvance(glyphPtr);
+            metrics.y = StrikeCache.getGlyphYAdvance(glyphPtr);
             /* advance is currently in device space, need to convert back
              * into user space.
              * This must not include the translation component. */
diff --git a/src/java.desktop/share/classes/sun/font/GlyphList.java b/src/java.desktop/share/classes/sun/font/GlyphList.java
index 8d19d005b89d3..df6ca08586cf0 100644
--- a/src/java.desktop/share/classes/sun/font/GlyphList.java
+++ b/src/java.desktop/share/classes/sun/font/GlyphList.java
@@ -319,10 +319,9 @@ public void setGlyphIndex(int i) {
            metrics[4] = 0;
            return;
         }
-        float gx =
-            StrikeCache.unsafe.getFloat(images[i]+StrikeCache.topLeftXOffset);
-        float gy =
-            StrikeCache.unsafe.getFloat(images[i]+StrikeCache.topLeftYOffset);
+
+        float gx = StrikeCache.getGlyphTopLeftX(images[i]);
+        float gy = StrikeCache.getGlyphTopLeftY(images[i]);
 
         if (usePositions) {
             metrics[0] = (int)Math.floor(positions[(i<<1)]   + gposx + gx);
@@ -331,17 +330,12 @@ public void setGlyphIndex(int i) {
             metrics[0] = (int)Math.floor(gposx + gx);
             metrics[1] = (int)Math.floor(gposy + gy);
             /* gposx and gposy are used to accumulate the advance */
-            gposx += StrikeCache.unsafe.getFloat
-                (images[i]+StrikeCache.xAdvanceOffset);
-            gposy += StrikeCache.unsafe.getFloat
-                (images[i]+StrikeCache.yAdvanceOffset);
+            gposx += StrikeCache.getGlyphXAdvance(images[i]);
+            gposy += StrikeCache.getGlyphYAdvance(images[i]);
         }
-        metrics[2] =
-            StrikeCache.unsafe.getChar(images[i]+StrikeCache.widthOffset);
-        metrics[3] =
-            StrikeCache.unsafe.getChar(images[i]+StrikeCache.heightOffset);
-        metrics[4] =
-            StrikeCache.unsafe.getChar(images[i]+StrikeCache.rowBytesOffset);
+        metrics[2] = StrikeCache.getGlyphWidth(images[i]);
+        metrics[3] = StrikeCache.getGlyphHeight(images[i]);
+        metrics[4] = StrikeCache.getGlyphRowBytes(images[i]);
     }
 
     public int[] getMetrics() {
@@ -360,22 +354,12 @@ public byte[] getGrayBits() {
         if (images[glyphindex] == 0L) {
             return graybits;
         }
-        long pixelDataAddress =
-            StrikeCache.unsafe.getAddress(images[glyphindex] +
-                                          StrikeCache.pixelDataOffset);
-
+        long pixelDataAddress = StrikeCache.getGlyphImagePtr(images[glyphindex]);
         if (pixelDataAddress == 0L) {
             return graybits;
         }
-        /* unsafe is supposed to be fast, but I doubt if this loop can beat
-         * a native call which does a getPrimitiveArrayCritical and a
-         * memcpy for the typical amount of image data (30-150 bytes)
-         * Consider a native method if there is a performance problem (which
-         * I haven't seen so far).
-         */
-        for (int i=0; i<len; i++) {
-            graybits[i] = StrikeCache.unsafe.getByte(pixelDataAddress+i);
-        }
+        byte[] bytes = StrikeCache.getGlyphPixelBytes(images[glyphindex]);
+        System.arraycopy(bytes, 0, graybits, 0, bytes.length);
         return graybits;
     }
 
@@ -445,13 +429,6 @@ public int getNumGlyphs() {
      * but it seems unavoidable without re-working the Java TextRenderers.
      */
     private void fillBounds(int[] bounds, int endGlyphIndex) {
-        /* Faster to access local variables in the for loop? */
-        int xOffset = StrikeCache.topLeftXOffset;
-        int yOffset = StrikeCache.topLeftYOffset;
-        int wOffset = StrikeCache.widthOffset;
-        int hOffset = StrikeCache.heightOffset;
-        int xAdvOffset = StrikeCache.xAdvanceOffset;
-        int yAdvOffset = StrikeCache.yAdvanceOffset;
 
         int startGlyphIndex = glyphindex + 1;
         if (startGlyphIndex >= endGlyphIndex) {
@@ -471,10 +448,10 @@ private void fillBounds(int[] bounds, int endGlyphIndex) {
             if (images[i] == 0L) {
                 continue;
             }
-            gx = StrikeCache.unsafe.getFloat(images[i]+xOffset);
-            gy = StrikeCache.unsafe.getFloat(images[i]+yOffset);
-            gw = StrikeCache.unsafe.getChar(images[i]+wOffset);
-            gh = StrikeCache.unsafe.getChar(images[i]+hOffset);
+            gx = StrikeCache.getGlyphTopLeftX(images[i]);
+            gy = StrikeCache.getGlyphTopLeftY(images[i]);
+            gw = StrikeCache.getGlyphWidth(images[i]);
+            gh = StrikeCache.getGlyphHeight(images[i]);
 
             if (usePositions) {
                 gx0 = positions[posIndex++] + gx + glx;
@@ -482,8 +459,8 @@ private void fillBounds(int[] bounds, int endGlyphIndex) {
             } else {
                 gx0 = glx + gx;
                 gy0 = gly + gy;
-                glx += StrikeCache.unsafe.getFloat(images[i]+xAdvOffset);
-                gly += StrikeCache.unsafe.getFloat(images[i]+yAdvOffset);
+                glx += StrikeCache.getGlyphXAdvance(images[i]);
+                gly += StrikeCache.getGlyphYAdvance(images[i]);
             }
             gx1 = gx0 + gw;
             gy1 = gy0 + gh;
@@ -506,10 +483,8 @@ public static boolean canContainColorGlyphs() {
     }
 
     public boolean isColorGlyph(int glyphIndex) {
-        int width = StrikeCache.unsafe.getChar(images[glyphIndex] +
-                                               StrikeCache.widthOffset);
-        int rowBytes = StrikeCache.unsafe.getChar(images[glyphIndex] +
-                                                  StrikeCache.rowBytesOffset);
+        int width = StrikeCache.getGlyphWidth(images[glyphIndex]);
+        int rowBytes = StrikeCache.getGlyphRowBytes(images[glyphIndex]);
         return rowBytes == width * 4;
     }
 
diff --git a/src/java.desktop/share/classes/sun/font/StrikeCache.java b/src/java.desktop/share/classes/sun/font/StrikeCache.java
index 950ba5b3d465b..ea1369b4383ac 100644
--- a/src/java.desktop/share/classes/sun/font/StrikeCache.java
+++ b/src/java.desktop/share/classes/sun/font/StrikeCache.java
@@ -27,6 +27,16 @@
 
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsEnvironment;
+
+import java.lang.foreign.MemoryLayout;
+import java.lang.foreign.MemorySegment;
+import static java.lang.foreign.MemorySegment.NULL;
+import java.lang.foreign.StructLayout;
+import java.lang.foreign.ValueLayout;
+import static java.lang.foreign.ValueLayout.*;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.SoftReference;
@@ -37,7 +47,6 @@
 import sun.java2d.pipe.BufferedContext;
 import sun.java2d.pipe.RenderQueue;
 import sun.java2d.pipe.hw.AccelGraphicsConfig;
-import jdk.internal.misc.Unsafe;
 
 /**
 
@@ -63,8 +72,6 @@
 
 public final class StrikeCache {
 
-    static final Unsafe unsafe = Unsafe.getUnsafe();
-
     static ReferenceQueue<Object> refQueue = Disposer.getQueue();
 
     static ArrayList<GlyphDisposedListener> disposeListeners = new ArrayList<GlyphDisposedListener>(1);
@@ -98,40 +105,159 @@ public final class StrikeCache {
     static boolean cacheRefTypeWeak;
 
     /*
-     * Native sizes and offsets for glyph cache
-     * There are 10 values.
+     * Native sizes and accessors for glyph cache structure.
+     * There are 10 values. Also need native address size and a long which
+     * references a memory address for a "null" glyph image.
      */
-    static int nativeAddressSize;
-    static int glyphInfoSize;
-    static int xAdvanceOffset;
-    static int yAdvanceOffset;
-    static int boundsOffset;
-    static int widthOffset;
-    static int heightOffset;
-    static int rowBytesOffset;
-    static int topLeftXOffset;
-    static int topLeftYOffset;
-    static int pixelDataOffset;
-    static int cacheCellOffset;
-    static int managedOffset;
-    static long invisibleGlyphPtr;
-
-    /* Native method used to return information used for unsafe
-     * access to native data.
-     * return values as follows:-
-     * arr[0] = size of an address/pointer.
-     * arr[1] = size of a GlyphInfo
-     * arr[2] = offset of advanceX
-     * arr[3] = offset of advanceY
-     * arr[4] = offset of width
-     * arr[5] = offset of height
-     * arr[6] = offset of rowBytes
-     * arr[7] = offset of topLeftX
-     * arr[8] = offset of topLeftY
-     * arr[9] = offset of pixel data.
-     * arr[10] = address of a GlyphImageRef representing the invisible glyph
-     */
-    static native void getGlyphCacheDescription(long[] infoArray);
+    static final int nativeAddressSize = (int)ValueLayout.ADDRESS.byteSize();
+    static final long invisibleGlyphPtr = getInvisibleGlyphPtr(); // a singleton.
+
+    static native long getInvisibleGlyphPtr();
+
+    public static final StructLayout GlyphImageLayout = MemoryLayout.structLayout(
+        JAVA_FLOAT.withName("xAdvance"), // 0+4=4,
+        JAVA_FLOAT.withName("yAdvance"), // 4+4=8,
+        JAVA_CHAR.withName("width"),     // 8+2=10,
+        JAVA_CHAR.withName("height"),    // 10+2=12
+        JAVA_CHAR.withName("rowBytes"),  // 12+2=14
+        JAVA_BYTE.withName("managed"),   // 14+1=15
+        MemoryLayout.paddingLayout(1),   // 15+1=16
+        JAVA_FLOAT.withName("topLeftX"), // 16+4=20
+        JAVA_FLOAT.withName("topLeftY"), // 20+4=24
+        ADDRESS.withName("cellInfo"),    // 24+8=32
+        ADDRESS.withName("image")        // 32+8=40
+     );
+
+   private static final long GLYPHIMAGESIZE = GlyphImageLayout.byteSize();
+
+   private static VarHandle getVarHandle(StructLayout struct, String name) {
+        VarHandle h = struct.varHandle(PathElement.groupElement(name));
+        /* insert 0 offset so don't need to pass arg every time */
+        return MethodHandles.insertCoordinates(h, 1, 0L).withInvokeExactBehavior();
+    }
+
+    private static final VarHandle xAdvanceHandle = getVarHandle(GlyphImageLayout, "xAdvance");
+    private static final VarHandle yAdvanceHandle = getVarHandle(GlyphImageLayout, "yAdvance");
+    private static final VarHandle widthHandle    = getVarHandle(GlyphImageLayout, "width");
+    private static final VarHandle heightHandle   = getVarHandle(GlyphImageLayout, "height");
+    private static final VarHandle rowBytesHandle = getVarHandle(GlyphImageLayout, "rowBytes");
+    private static final VarHandle managedHandle  = getVarHandle(GlyphImageLayout, "managed");
+    private static final VarHandle topLeftXHandle = getVarHandle(GlyphImageLayout, "topLeftX");
+    private static final VarHandle topLeftYHandle = getVarHandle(GlyphImageLayout, "topLeftY");
+    private static final VarHandle cellInfoHandle = getVarHandle(GlyphImageLayout, "cellInfo");
+    private static final VarHandle imageHandle    = getVarHandle(GlyphImageLayout, "image");
+
+    @SuppressWarnings("restricted")
+    static final float getGlyphXAdvance(long ptr) {
+        MemorySegment seg = MemorySegment.ofAddress(ptr);
+        seg = seg.reinterpret(GLYPHIMAGESIZE);
+        return (float)xAdvanceHandle.get(seg);
+    }
+
+    @SuppressWarnings("restricted")
+    static final void setGlyphXAdvance(long ptr, float val) {
+        MemorySegment seg = MemorySegment.ofAddress(ptr);
+        seg = seg.reinterpret(GLYPHIMAGESIZE);
+        xAdvanceHandle.set(seg, val);
+    }
+
+    @SuppressWarnings("restricted")
+    static final float getGlyphYAdvance(long ptr) {
+        MemorySegment seg = MemorySegment.ofAddress(ptr);
+        seg = seg.reinterpret(GLYPHIMAGESIZE);
+        return (float)yAdvanceHandle.get(seg);
+    }
+
+    @SuppressWarnings("restricted")
+    static final char getGlyphWidth(long ptr) {
+        MemorySegment seg = MemorySegment.ofAddress(ptr);
+        seg = seg.reinterpret(GLYPHIMAGESIZE);
+        return (char)widthHandle.get(seg);
+    }
+
+    @SuppressWarnings("restricted")
+    static final char getGlyphHeight(long ptr) {
+        MemorySegment seg = MemorySegment.ofAddress(ptr);
+        seg = seg.reinterpret(GLYPHIMAGESIZE);
+        return (char)heightHandle.get(seg);
+    }
+
+    @SuppressWarnings("restricted")
+    static final char getGlyphRowBytes(long ptr) {
+        MemorySegment seg = MemorySegment.ofAddress(ptr);
+        seg = seg.reinterpret(GLYPHIMAGESIZE);
+        return (char)rowBytesHandle.get(seg);
+    }
+
+    @SuppressWarnings("restricted")
+    static final byte getGlyphManaged(long ptr) {
+        MemorySegment seg = MemorySegment.ofAddress(ptr);
+        seg = seg.reinterpret(GLYPHIMAGESIZE);
+        return (byte)managedHandle.get(seg);
+    }
+
+    @SuppressWarnings("restricted")
+    static final float getGlyphTopLeftX(long ptr) {
+        MemorySegment seg = MemorySegment.ofAddress(ptr);
+        seg = seg.reinterpret(GLYPHIMAGESIZE);
+        return (float)topLeftXHandle.get(seg);
+    }
+
+    @SuppressWarnings("restricted")
+    static final float getGlyphTopLeftY(long ptr) {
+        MemorySegment seg = MemorySegment.ofAddress(ptr);
+        seg = seg.reinterpret(GLYPHIMAGESIZE);
+        return (float)topLeftYHandle.get(seg);
+    }
+
+    @SuppressWarnings("restricted")
+    static final long getGlyphCellInfo(long ptr) {
+        MemorySegment seg = MemorySegment.ofAddress(ptr);
+        seg = seg.reinterpret(GLYPHIMAGESIZE);
+        return ((MemorySegment)cellInfoHandle.get(seg)).address();
+    }
+
+    @SuppressWarnings("restricted")
+    static final void setGlyphCellInfo(long ptr, long val) {
+        MemorySegment seg = MemorySegment.ofAddress(ptr);
+        seg = seg.reinterpret(GLYPHIMAGESIZE);
+        MemorySegment segval = MemorySegment.ofAddress(val);
+        cellInfoHandle.set(seg, segval);
+    }
+
+    @SuppressWarnings("restricted")
+    static final long getGlyphImagePtr(long ptr) {
+        MemorySegment seg = MemorySegment.ofAddress(ptr);
+        seg = seg.reinterpret(GLYPHIMAGESIZE);
+        return ((MemorySegment)imageHandle.get(seg)).address();
+    }
+
+    @SuppressWarnings("restricted")
+    static final MemorySegment getGlyphPixelData(long ptr) {
+        MemorySegment seg = MemorySegment.ofAddress(ptr);
+        seg = seg.reinterpret(GLYPHIMAGESIZE);
+        char hgt = (char)heightHandle.get(seg);
+        char rb = (char)rowBytesHandle.get(seg);
+        MemorySegment pixelData = (MemorySegment)imageHandle.get(seg);
+        pixelData = pixelData.reinterpret(rb * hgt);
+        return pixelData;
+    }
+
+    @SuppressWarnings("restricted")
+    static final byte[] getGlyphPixelBytes(long ptr) {
+        MemorySegment seg = MemorySegment.ofAddress(ptr);
+        seg = seg.reinterpret(GLYPHIMAGESIZE);
+        char hgt = (char)heightHandle.get(seg);
+        char rb = (char)rowBytesHandle.get(seg);
+        MemorySegment pixelData = (MemorySegment)imageHandle.get(seg);
+        int sz = rb * hgt;
+        pixelData = pixelData.reinterpret(sz);
+        return pixelData.toArray(ValueLayout.JAVA_BYTE);
+    }
+
+    static final byte getPixelByte(MemorySegment pixelData, long index) {
+       return pixelData.getAtIndex(JAVA_BYTE, index);
+    }
 
     static {
         initStatic();
@@ -140,24 +266,6 @@ public final class StrikeCache {
     @SuppressWarnings("removal")
     private static void initStatic() {
 
-        long[] nativeInfo = new long[13];
-        getGlyphCacheDescription(nativeInfo);
-        //Can also get address size from Unsafe class :-
-        //nativeAddressSize = unsafe.addressSize();
-        nativeAddressSize = (int)nativeInfo[0];
-        glyphInfoSize     = (int)nativeInfo[1];
-        xAdvanceOffset    = (int)nativeInfo[2];
-        yAdvanceOffset    = (int)nativeInfo[3];
-        widthOffset       = (int)nativeInfo[4];
-        heightOffset      = (int)nativeInfo[5];
-        rowBytesOffset    = (int)nativeInfo[6];
-        topLeftXOffset    = (int)nativeInfo[7];
-        topLeftYOffset    = (int)nativeInfo[8];
-        pixelDataOffset   = (int)nativeInfo[9];
-        invisibleGlyphPtr = nativeInfo[10];
-        cacheCellOffset = (int) nativeInfo[11];
-        managedOffset = (int) nativeInfo[12];
-
         if (nativeAddressSize < 4) {
             throw new InternalError("Unexpected address size for font data: " +
                                     nativeAddressSize);
@@ -324,7 +432,7 @@ private static void freeCachedIntMemory(int[] glyphPtrs, long pContext) {
                 ArrayList<Long> gids = null;
 
                 for (int i = 0; i < glyphPtrs.length; i++) {
-                    if (glyphPtrs[i] != 0 && unsafe.getByte(glyphPtrs[i] + managedOffset) == 0) {
+                    if ((glyphPtrs[i] != 0) && getGlyphManaged(glyphPtrs[i]) == 0) {
 
                         if (gids == null) {
                             gids = new ArrayList<Long>();
@@ -350,8 +458,7 @@ private static void  freeCachedLongMemory(long[] glyphPtrs, long pContext) {
                 ArrayList<Long> gids = null;
 
                 for (int i=0; i < glyphPtrs.length; i++) {
-                    if (glyphPtrs[i] != 0
-                            && unsafe.getByte(glyphPtrs[i] + managedOffset) == 0) {
+                    if ((glyphPtrs[i] != 0) && getGlyphManaged(glyphPtrs[i]) == 0) {
 
                         if (gids == null) {
                             gids = new ArrayList<Long>();
diff --git a/src/java.desktop/share/native/libfontmanager/sunFont.c b/src/java.desktop/share/native/libfontmanager/sunFont.c
index b50a67e5c40b0..6029dc02d89b8 100644
--- a/src/java.desktop/share/native/libfontmanager/sunFont.c
+++ b/src/java.desktop/share/native/libfontmanager/sunFont.c
@@ -300,41 +300,9 @@ JNIEXPORT void JNICALL Java_sun_font_StrikeCache_freeLongMemory
     }
 }
 
-JNIEXPORT void JNICALL
-Java_sun_font_StrikeCache_getGlyphCacheDescription
-  (JNIEnv *env, jclass cls, jlongArray results) {
-
-    jlong* nresults;
-    GlyphInfo *info;
-    size_t baseAddr;
-
-    if ((*env)->GetArrayLength(env, results) < 13) {
-        return;
-    }
+JNIEXPORT jlong JNICALL
+Java_sun_font_StrikeCache_getInvisibleGlyphPtr(JNIEnv *env, jclass cls) {
 
-    nresults = (jlong*)(*env)->GetPrimitiveArrayCritical(env, results, NULL);
-    if (nresults == NULL) {
-        return;
-    }
-    info = (GlyphInfo*) calloc(1, sizeof(GlyphInfo));
-    if (info == NULL) {
-        (*env)->ReleasePrimitiveArrayCritical(env, results, nresults, 0);
-        return;
-    }
-    baseAddr = (size_t)info;
-    nresults[0] = sizeof(void*);
-    nresults[1] = sizeof(GlyphInfo);
-    nresults[2] = 0;
-    nresults[3] = (size_t)&(info->advanceY)-baseAddr;
-    nresults[4] = (size_t)&(info->width)-baseAddr;
-    nresults[5] = (size_t)&(info->height)-baseAddr;
-    nresults[6] = (size_t)&(info->rowBytes)-baseAddr;
-    nresults[7] = (size_t)&(info->topLeftX)-baseAddr;
-    nresults[8] = (size_t)&(info->topLeftY)-baseAddr;
-    nresults[9] = (size_t)&(info->image)-baseAddr;
-    nresults[10] = (jlong)(uintptr_t)info; /* invisible glyph */
-    nresults[11] = (size_t)&(info->cellInfo)-baseAddr;
-    nresults[12] = (size_t)&(info->managed)-baseAddr;
-
-    (*env)->ReleasePrimitiveArrayCritical(env, results, nresults, 0);
+    GlyphInfo *info = (GlyphInfo*) calloc(1, sizeof(GlyphInfo));
+    return (jlong)(uintptr_t)info; /* invisible glyph */
 }
diff --git a/src/java.desktop/unix/classes/sun/font/XRGlyphCacheEntry.java b/src/java.desktop/unix/classes/sun/font/XRGlyphCacheEntry.java
index fff6919c464e9..cd090eab52ddd 100644
--- a/src/java.desktop/unix/classes/sun/font/XRGlyphCacheEntry.java
+++ b/src/java.desktop/unix/classes/sun/font/XRGlyphCacheEntry.java
@@ -69,28 +69,25 @@ public int getGlyphSet() {
     }
 
     public static int getGlyphID(long glyphInfoPtr) {
-        // We need to access the GlyphID with Unsafe.getAddress() because the
+        // We need to access the GlyphID as a long because the
         // corresponding field in the underlying C data-structure is of type
         // 'void*' (see field 'cellInfo' of struct 'GlyphInfo'
         // in src/share/native/sun/font/fontscalerdefs.h).
         // On 64-bit Big-endian architectures it would be wrong to access this
-        // field with Unsafe.getInt().
-        return (int) StrikeCache.unsafe.getAddress(glyphInfoPtr +
-                                                   StrikeCache.cacheCellOffset);
+        // field as an int.
+        return (int)StrikeCache.getGlyphCellInfo(glyphInfoPtr);
     }
 
     public static void setGlyphID(long glyphInfoPtr, int id) {
-        // We need to access the GlyphID with Unsafe.putAddress() because the
+        // We need to access the GlyphID as a long because the
         // corresponding field in the underlying C data-structure is of type
-        // 'void*' (see field 'cellInfo' of struct 'GlyphInfo' in
-        // src/share/native/sun/font/fontscalerdefs.h).
-        // On 64-bit Big-endian architectures it would be wrong to write this
-        // field with Unsafe.putInt() because it is also accessed from native
-        // code as a 'long'.
+        // 'void*' (see field 'cellInfo' of struct 'GlyphInfo'
+        // in src/share/native/sun/font/fontscalerdefs.h).
+        // On 64-bit Big-endian architectures it would be wrong to access this
+        // field as an int
         // See Java_sun_java2d_xr_XRBackendNative_XRAddGlyphsNative()
-        // in src/solaris/native/sun/java2d/x11/XRBackendNative.c
-        StrikeCache.unsafe.putAddress(glyphInfoPtr +
-                                      StrikeCache.cacheCellOffset, (long)id);
+        // in src/unix/native/sun/java2d/x11/XRBackendNative.c
+        StrikeCache.setGlyphCellInfo(glyphInfoPtr, (long)id);
     }
 
     public int getGlyphID() {
@@ -102,29 +99,27 @@ public void setGlyphID(int id) {
     }
 
     public float getXAdvance() {
-        return StrikeCache.unsafe.getFloat(glyphInfoPtr + StrikeCache.xAdvanceOffset);
+        return StrikeCache.getGlyphXAdvance(glyphInfoPtr);
     }
 
     public float getYAdvance() {
-        return StrikeCache.unsafe.getFloat(glyphInfoPtr + StrikeCache.yAdvanceOffset);
+        return StrikeCache.getGlyphYAdvance(glyphInfoPtr);
     }
 
     public int getSourceRowBytes() {
-        return StrikeCache.unsafe.getShort(glyphInfoPtr + StrikeCache.rowBytesOffset);
+        return StrikeCache.getGlyphRowBytes(glyphInfoPtr);
     }
 
     public int getWidth() {
-        return StrikeCache.unsafe.getShort(glyphInfoPtr + StrikeCache.widthOffset);
+        return StrikeCache.getGlyphWidth(glyphInfoPtr);
     }
 
     public int getHeight() {
-        return StrikeCache.unsafe.getShort(glyphInfoPtr + StrikeCache.heightOffset);
+        return StrikeCache.getGlyphHeight(glyphInfoPtr);
     }
 
     public void writePixelData(ByteArrayOutputStream os, boolean uploadAsLCD) {
-        long pixelDataAddress =
-            StrikeCache.unsafe.getAddress(glyphInfoPtr +
-                                          StrikeCache.pixelDataOffset);
+        long pixelDataAddress = StrikeCache.getGlyphImagePtr(glyphInfoPtr);
         if (pixelDataAddress == 0L) {
             return;
         }
@@ -134,11 +129,12 @@ public void writePixelData(ByteArrayOutputStream os, boolean uploadAsLCD) {
         int rowBytes = getSourceRowBytes();
         int paddedWidth = getPaddedWidth(uploadAsLCD);
 
+        byte[] pixelBytes = StrikeCache.getGlyphPixelBytes(glyphInfoPtr);
         if (!uploadAsLCD) {
             for (int line = 0; line < height; line++) {
                 for(int x = 0; x < paddedWidth; x++) {
                     if(x < width) {
-                        os.write(StrikeCache.unsafe.getByte(pixelDataAddress + (line * rowBytes + x)));
+                        os.write(pixelBytes[(line * rowBytes + x)]);
                     }else {
                          /*pad to multiple of 4 bytes per line*/
                          os.write(0);
@@ -151,12 +147,9 @@ public void writePixelData(ByteArrayOutputStream os, boolean uploadAsLCD) {
                 int rowBytesWidth = width * 3;
                 int srcpix = 0;
                 while (srcpix < rowBytesWidth) {
-                    os.write(StrikeCache.unsafe.getByte
-                          (pixelDataAddress + (rowStart + srcpix + 2)));
-                    os.write(StrikeCache.unsafe.getByte
-                          (pixelDataAddress + (rowStart + srcpix + 1)));
-                    os.write(StrikeCache.unsafe.getByte
-                          (pixelDataAddress + (rowStart + srcpix + 0)));
+                    os.write(pixelBytes[rowStart + srcpix + 2]);
+                    os.write(pixelBytes[rowStart + srcpix + 1]);
+                    os.write(pixelBytes[rowStart + srcpix + 0]);
                     os.write(255);
                     srcpix += 3;
                 }
@@ -165,11 +158,11 @@ public void writePixelData(ByteArrayOutputStream os, boolean uploadAsLCD) {
     }
 
     public float getTopLeftXOffset() {
-        return StrikeCache.unsafe.getFloat(glyphInfoPtr + StrikeCache.topLeftXOffset);
+        return StrikeCache.getGlyphTopLeftX(glyphInfoPtr);
     }
 
     public float getTopLeftYOffset() {
-        return StrikeCache.unsafe.getFloat(glyphInfoPtr + StrikeCache.topLeftYOffset);
+        return StrikeCache.getGlyphTopLeftY(glyphInfoPtr);
     }
 
     public long getGlyphInfoPtr() {

From b44632aa15d21a10e559aee02a9e4dcd876654f6 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Thu, 18 Jul 2024 21:46:07 +0000
Subject: [PATCH 134/401] 8336588: Ensure Transform downstream receives
 upstream start items only after downstream started

Reviewed-by: asotona
---
 .../classfile/impl/TransformImpl.java         |  8 +--
 test/jdk/jdk/classfile/TransformTests.java    | 60 +++++++++++++++----
 2 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/TransformImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/TransformImpl.java
index 4075f2096668d..8478b1a51f035 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/TransformImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/TransformImpl.java
@@ -111,7 +111,7 @@ public ResolvedTransform<ClassElement> resolve(ClassBuilder builder) {
             ResolvedTransform<ClassElement> upstream = TransformImpl.resolve(t, chainedBuilder);
             return new ResolvedTransform<>(upstream.consumer(),
                                           chainRunnable(upstream.endHandler(), downstream.endHandler()),
-                                          chainRunnable(upstream.startHandler(), downstream.startHandler()));
+                                          chainRunnable(downstream.startHandler(), upstream.startHandler()));
         }
     }
 
@@ -198,7 +198,7 @@ public ResolvedTransform<MethodElement> resolve(MethodBuilder builder) {
             ResolvedTransform<MethodElement> upstream = TransformImpl.resolve(t, chainedBuilder);
             return new ResolvedTransform<>(upstream.consumer(),
                                            chainRunnable(upstream.endHandler(), downstream.endHandler()),
-                                           chainRunnable(upstream.startHandler(), downstream.startHandler()));
+                                           chainRunnable(downstream.startHandler(), upstream.startHandler()));
         }
     }
 
@@ -261,7 +261,7 @@ public ResolvedTransform<FieldElement> resolve(FieldBuilder builder) {
             ResolvedTransform<FieldElement> upstream = TransformImpl.resolve(t, chainedBuilder);
             return new ResolvedTransform<>(upstream.consumer(),
                                            chainRunnable(upstream.endHandler(), downstream.endHandler()),
-                                           chainRunnable(upstream.startHandler(), downstream.startHandler()));
+                                           chainRunnable(downstream.startHandler(), upstream.startHandler()));
         }
     }
 
@@ -301,7 +301,7 @@ public ResolvedTransform<CodeElement> resolve(CodeBuilder builder) {
             ResolvedTransform<CodeElement> upstream = TransformImpl.resolve(t, chainedBuilder);
             return new ResolvedTransform<>(upstream.consumer(),
                                          chainRunnable(upstream.endHandler(), downstream.endHandler()),
-                                         chainRunnable(upstream.startHandler(), downstream.startHandler()));
+                                         chainRunnable(downstream.startHandler(), upstream.startHandler()));
         }
     }
 
diff --git a/test/jdk/jdk/classfile/TransformTests.java b/test/jdk/jdk/classfile/TransformTests.java
index 0cc1dafdf3274..fb9f72ba3aacc 100644
--- a/test/jdk/jdk/classfile/TransformTests.java
+++ b/test/jdk/jdk/classfile/TransformTests.java
@@ -23,18 +23,27 @@
 
 /*
  * @test
- * @bug 8336010
+ * @bug 8336010 8336588
  * @summary Testing ClassFile transformations.
  * @run junit TransformTests
  */
+
 import java.lang.classfile.ClassBuilder;
+import java.lang.classfile.ClassElement;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.ClassTransform;
 import java.lang.classfile.CodeBuilder;
 import java.lang.classfile.CodeElement;
+import java.lang.classfile.CodeModel;
+import java.lang.classfile.CodeTransform;
 import java.lang.classfile.FieldModel;
 import java.lang.classfile.FieldTransform;
 import java.lang.classfile.Label;
+import java.lang.classfile.MethodModel;
 import java.lang.classfile.MethodTransform;
 import java.lang.classfile.instruction.BranchInstruction;
+import java.lang.classfile.instruction.ConstantInstruction;
 import java.lang.classfile.instruction.LabelTarget;
 import java.lang.constant.ClassDesc;
 import java.lang.constant.MethodTypeDesc;
@@ -43,18 +52,10 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-
-import helpers.ByteArrayClassLoader;
-import java.lang.classfile.ClassModel;
-import java.lang.classfile.ClassTransform;
-import java.lang.classfile.ClassFile;
-import java.lang.classfile.CodeModel;
-import java.lang.classfile.CodeTransform;
-import java.lang.classfile.MethodModel;
-import java.lang.classfile.instruction.ConstantInstruction;
 import java.util.HashSet;
 import java.util.Set;
 
+import helpers.ByteArrayClassLoader;
 import org.junit.jupiter.api.Test;
 
 import static java.lang.classfile.ClassFile.*;
@@ -289,6 +290,45 @@ public void accept(CodeBuilder builder, CodeElement element) {
         assertTrue(leaveLabels.isEmpty(), () -> "Some labels are not bounded: " + leaveLabels);
     }
 
+    @Test
+    void testStateOrder() throws Exception {
+        var bytes = Files.readAllBytes(testClassPath);
+        var cf = ClassFile.of();
+        var cm = cf.parse(bytes);
+
+        int[] counter = {0};
+
+        enum TransformState { START, ONGOING, ENDED }
+
+        var ct = ClassTransform.ofStateful(() -> new ClassTransform() {
+            TransformState state = TransformState.START;
+
+            @Override
+            public void atStart(ClassBuilder builder) {
+                assertSame(TransformState.START, state);
+                builder.withField("f" + counter[0]++, CD_int, 0);
+                state = TransformState.ONGOING;
+            }
+
+            @Override
+            public void atEnd(ClassBuilder builder) {
+                assertSame(TransformState.ONGOING, state);
+                builder.withField("f" + counter[0]++, CD_int, 0);
+                state = TransformState.ENDED;
+            }
+
+            @Override
+            public void accept(ClassBuilder builder, ClassElement element) {
+                assertSame(TransformState.ONGOING, state);
+                builder.with(element);
+            }
+        });
+
+        cf.transformClass(cm, ct);
+        cf.transformClass(cm, ct.andThen(ct));
+        cf.transformClass(cm, ct.andThen(ct).andThen(ct));
+    }
+
     public static class TestClass {
         static public String foo() {
             return "foo";

From 902c2afb6714f778e3229c8411e9f9d5c392b388 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Thu, 18 Jul 2024 21:46:19 +0000
Subject: [PATCH 135/401] 8336585: BoundAttribute.readEntryList not type-safe

Reviewed-by: asotona
---
 .../classfile/impl/BoundAttribute.java        | 35 ++++++++-------
 .../jdk/jdk/classfile/BoundAttributeTest.java | 44 ++++++++++++++++---
 2 files changed, 57 insertions(+), 22 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java
index 4d03c6a232763..175c4adb927b4 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java
@@ -25,12 +25,6 @@
 
 package jdk.internal.classfile.impl;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Function;
-
 import java.lang.classfile.*;
 import java.lang.classfile.attribute.*;
 import java.lang.classfile.constantpool.ClassEntry;
@@ -40,7 +34,14 @@
 import java.lang.classfile.constantpool.ModuleEntry;
 import java.lang.classfile.constantpool.NameAndTypeEntry;
 import java.lang.classfile.constantpool.PackageEntry;
+import java.lang.classfile.constantpool.PoolEntry;
 import java.lang.classfile.constantpool.Utf8Entry;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
+
 import jdk.internal.access.SharedSecrets;
 
 import static java.lang.classfile.Attributes.*;
@@ -116,13 +117,13 @@ public String toString() {
         return String.format("Attribute[name=%s]", mapper.name());
     }
 
-    <E> List<E> readEntryList(int p) {
+    <E extends PoolEntry> List<E> readEntryList(int p, Class<E> type) {
         int cnt = classReader.readU2(p);
         p += 2;
         var entries = new Object[cnt];
         int end = p + (cnt * 2);
         for (int i = 0; p < end; i++, p += 2) {
-            entries[i] = classReader.readEntry(p);
+            entries[i] = classReader.readEntry(p, type);
         }
         return SharedSecrets.getJavaUtilCollectionAccess().listFromTrustedArray(entries);
     }
@@ -549,7 +550,7 @@ public BoundExceptionsAttribute(ClassReader cf, AttributeMapper<ExceptionsAttrib
         @Override
         public List<ClassEntry> exceptions() {
             if (exceptions == null) {
-                exceptions = readEntryList(payloadStart);
+                exceptions = readEntryList(payloadStart, ClassEntry.class);
             }
             return exceptions;
         }
@@ -645,7 +646,7 @@ private void structure() {
                     PackageEntry pe = classReader.readEntry(p, PackageEntry.class);
                     int exportFlags = classReader.readU2(p + 2);
                     p += 4;
-                    List<ModuleEntry> exportsTo = readEntryList(p);
+                    List<ModuleEntry> exportsTo = readEntryList(p, ModuleEntry.class);
                     p += 2 + exportsTo.size() * 2;
                     elements[i] = ModuleExportInfo.of(pe, exportFlags, exportsTo);
                 }
@@ -660,7 +661,7 @@ private void structure() {
                     PackageEntry po = classReader.readEntry(p, PackageEntry.class);
                     int opensFlags = classReader.readU2(p + 2);
                     p += 4;
-                    List<ModuleEntry> opensTo = readEntryList(p);
+                    List<ModuleEntry> opensTo = readEntryList(p, ModuleEntry.class);
                     p += 2 + opensTo.size() * 2;
                     elements[i] = ModuleOpenInfo.of(po, opensFlags, opensTo);
                 }
@@ -668,7 +669,7 @@ private void structure() {
             }
 
             {
-                uses = readEntryList(p);
+                uses = readEntryList(p, ClassEntry.class);
                 p += 2 + uses.size() * 2;
                 int cnt = classReader.readU2(p);
                 p += 2;
@@ -677,7 +678,7 @@ private void structure() {
                 for (int i = 0; i < cnt; i++) {
                     ClassEntry c = classReader.readEntry(p, ClassEntry.class);
                     p += 2;
-                    List<ClassEntry> providesWith = readEntryList(p);
+                    List<ClassEntry> providesWith = readEntryList(p, ClassEntry.class);
                     p += 2 + providesWith.size() * 2;
                     elements[i] = ModuleProvideInfo.of(c, providesWith);
                 }
@@ -697,7 +698,7 @@ public BoundModulePackagesAttribute(ClassReader cf, AttributeMapper<ModulePackag
         @Override
         public List<PackageEntry> packages() {
             if (packages == null) {
-                packages = readEntryList(payloadStart);
+                packages = readEntryList(payloadStart, PackageEntry.class);
             }
             return packages;
         }
@@ -715,7 +716,7 @@ public BoundNestMembersAttribute(ClassReader cf, AttributeMapper<NestMembersAttr
         @Override
         public List<ClassEntry> nestMembers() {
             if (members == null) {
-                members = readEntryList(payloadStart);
+                members = readEntryList(payloadStart, ClassEntry.class);
             }
             return members;
         }
@@ -744,7 +745,7 @@ public List<BootstrapMethodEntry> bootstrapMethods() {
                 int p = payloadStart + 2;
                 for (int i = 0; i < size; ++i) {
                     final var handle = classReader.readEntry(p, AbstractPoolEntry.MethodHandleEntryImpl.class);
-                    final List<LoadableConstantEntry> args = readEntryList(p + 2);
+                    final List<LoadableConstantEntry> args = readEntryList(p + 2, LoadableConstantEntry.class);
                     p += 4 + args.size() * 2;
                     int hash = BootstrapMethodEntryImpl.computeHashCode(handle, args);
                     bs[i] = new BootstrapMethodEntryImpl(classReader, i, hash, handle, args);
@@ -924,7 +925,7 @@ public BoundPermittedSubclassesAttribute(ClassReader cf, AttributeMapper<Permitt
         @Override
         public List<ClassEntry> permittedSubclasses() {
             if (permittedSubclasses == null) {
-                permittedSubclasses = readEntryList(payloadStart);
+                permittedSubclasses = readEntryList(payloadStart, ClassEntry.class);
             }
             return permittedSubclasses;
         }
diff --git a/test/jdk/jdk/classfile/BoundAttributeTest.java b/test/jdk/jdk/classfile/BoundAttributeTest.java
index 103bcffa8987a..f6d2d0e9010a1 100644
--- a/test/jdk/jdk/classfile/BoundAttributeTest.java
+++ b/test/jdk/jdk/classfile/BoundAttributeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,19 +23,24 @@
 
 /*
  * @test
- * @bug 8304837
+ * @bug 8304837 8336585
  * @summary Testing BoundAttributes
  * @run junit BoundAttributeTest
  */
+import jdk.internal.classfile.impl.DirectClassBuilder;
+import jdk.internal.classfile.impl.UnboundAttribute;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.opentest4j.AssertionFailedError;
+
 import java.lang.classfile.Attributes;
+import java.lang.classfile.BufWriter;
 import java.lang.classfile.ClassModel;
 import java.lang.classfile.ClassFile;
 import java.lang.classfile.CodeBuilder;
 import java.lang.classfile.attribute.MethodParameterInfo;
 import java.lang.classfile.attribute.MethodParametersAttribute;
-import org.junit.jupiter.api.Test;
-import org.opentest4j.AssertionFailedError;
-
+import java.lang.classfile.constantpool.ConstantPoolException;
 import java.lang.constant.ClassDesc;
 import java.lang.constant.ConstantDescs;
 import java.lang.constant.MethodTypeDesc;
@@ -67,4 +72,33 @@ void testReadMethodParametersAttributeWithoutParameterName() {
         List<MethodParameterInfo> parameters = assertDoesNotThrow(methodParametersAttribute::parameters);
         assertTrue(parameters.get(0).name().isEmpty());
     }
+
+    @Test
+    void testBadEntryTypeInList() {
+        var cf = ClassFile.of();
+
+        // Craft an attribute list with index to badly typed attributes
+        var bytes = cf.build(ClassDesc.of("Test"), clb -> {
+            var cp = clb.constantPool();
+            var oneClassString = cp.utf8Entry("Test$Ape");
+            var oneClass = cp.classEntry(oneClassString);
+            ((DirectClassBuilder) clb).writeAttribute(new UnboundAttribute.AdHocAttribute<>(Attributes.nestMembers()) {
+                @Override
+                public void writeBody(BufWriter b) {
+                    b.writeU2(2);
+                    b.writeIndex(oneClass);
+                    b.writeIndex(oneClassString);
+                }
+            });
+        });
+
+        var nm = cf.parse(bytes).findAttribute(Attributes.nestMembers()).orElseThrow();
+        Assertions.assertThrows(ConstantPoolException.class, () -> {
+            int sum = 0;
+            // this should throw CPE upon encountering non-ClassEntry
+            for (var member : nm.nestMembers()) {
+                sum += member.index();
+            }
+        });
+    }
 }

From 39f44768131254ee11f723f92e2bac57b0d1ade0 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Thu, 18 Jul 2024 22:22:59 +0000
Subject: [PATCH 136/401] 8334772: Change Class::signers to an explicit field

Reviewed-by: dholmes, alanb, rriggs, coleenp
---
 src/hotspot/share/classfile/javaClasses.cpp   | 17 ++++----
 src/hotspot/share/classfile/javaClasses.hpp   |  4 +-
 src/hotspot/share/include/jvm.h               |  6 ---
 src/hotspot/share/prims/jvm.cpp               | 39 -------------------
 .../share/classes/java/lang/Class.java        | 17 +++++---
 src/java.base/share/native/libjava/Class.c    |  2 -
 6 files changed, 19 insertions(+), 66 deletions(-)

diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index 4d3aac1598e01..c0a413f18681d 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -1220,10 +1220,6 @@ objArrayOop java_lang_Class::signers(oop java_class) {
   assert(_signers_offset != 0, "must be set");
   return (objArrayOop)java_class->obj_field(_signers_offset);
 }
-void java_lang_Class::set_signers(oop java_class, objArrayOop signers) {
-  assert(_signers_offset != 0, "must be set");
-  java_class->obj_field_put(_signers_offset, signers);
-}
 
 oop java_lang_Class::class_data(oop java_class) {
   assert(_classData_offset != 0, "must be set");
@@ -1418,12 +1414,13 @@ oop java_lang_Class::primitive_mirror(BasicType t) {
 }
 
 #define CLASS_FIELDS_DO(macro) \
-  macro(_classRedefinedCount_offset, k, "classRedefinedCount", int_signature,         false); \
-  macro(_class_loader_offset,        k, "classLoader",         classloader_signature, false); \
-  macro(_component_mirror_offset,    k, "componentType",       class_signature,       false); \
-  macro(_module_offset,              k, "module",              module_signature,      false); \
-  macro(_name_offset,                k, "name",                string_signature,      false); \
-  macro(_classData_offset,           k, "classData",           object_signature,      false);
+  macro(_classRedefinedCount_offset, k, "classRedefinedCount", int_signature,          false); \
+  macro(_class_loader_offset,        k, "classLoader",         classloader_signature,  false); \
+  macro(_component_mirror_offset,    k, "componentType",       class_signature,        false); \
+  macro(_module_offset,              k, "module",              module_signature,       false); \
+  macro(_name_offset,                k, "name",                string_signature,       false); \
+  macro(_classData_offset,           k, "classData",           object_signature,       false); \
+  macro(_signers_offset,             k, "signers",             object_array_signature, false);
 
 void java_lang_Class::compute_offsets() {
   if (_offsets_computed) {
diff --git a/src/hotspot/share/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp
index 90095545110d1..973f2f8f52466 100644
--- a/src/hotspot/share/classfile/javaClasses.hpp
+++ b/src/hotspot/share/classfile/javaClasses.hpp
@@ -208,7 +208,6 @@ class java_lang_String : AllStatic {
   macro(java_lang_Class, oop_size,               int_signature,     false) \
   macro(java_lang_Class, static_oop_field_count, int_signature,     false) \
   macro(java_lang_Class, protection_domain,      object_signature,  false) \
-  macro(java_lang_Class, signers,                object_signature,  false) \
   macro(java_lang_Class, source_file,            object_signature,  false) \
 
 class java_lang_Class : AllStatic {
@@ -299,8 +298,7 @@ class java_lang_Class : AllStatic {
     set_init_lock(java_class, nullptr);
   }
   static oop  component_mirror(oop java_class);
-  static objArrayOop  signers(oop java_class);
-  static void set_signers(oop java_class, objArrayOop signers);
+  static objArrayOop signers(oop java_class);
   static oop  class_data(oop java_class);
   static void set_class_data(oop java_class, oop classData);
 
diff --git a/src/hotspot/share/include/jvm.h b/src/hotspot/share/include/jvm.h
index 0aad9160ae8b5..a18e9bffc85df 100644
--- a/src/hotspot/share/include/jvm.h
+++ b/src/hotspot/share/include/jvm.h
@@ -552,12 +552,6 @@ JVM_GetClassInterfaces(JNIEnv *env, jclass cls);
 JNIEXPORT jboolean JNICALL
 JVM_IsInterface(JNIEnv *env, jclass cls);
 
-JNIEXPORT jobjectArray JNICALL
-JVM_GetClassSigners(JNIEnv *env, jclass cls);
-
-JNIEXPORT void JNICALL
-JVM_SetClassSigners(JNIEnv *env, jclass cls, jobjectArray signers);
-
 JNIEXPORT jobject JNICALL
 JVM_GetProtectionDomain(JNIEnv *env, jclass cls);
 
diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
index d55c8a6be656d..7a8c07477dcb7 100644
--- a/src/hotspot/share/prims/jvm.cpp
+++ b/src/hotspot/share/prims/jvm.cpp
@@ -1252,45 +1252,6 @@ JVM_ENTRY(jboolean, JVM_IsHiddenClass(JNIEnv *env, jclass cls))
   return k->is_hidden();
 JVM_END
 
-JVM_ENTRY(jobjectArray, JVM_GetClassSigners(JNIEnv *env, jclass cls))
-  JvmtiVMObjectAllocEventCollector oam;
-  oop mirror = JNIHandles::resolve_non_null(cls);
-  if (java_lang_Class::is_primitive(mirror)) {
-    // There are no signers for primitive types
-    return nullptr;
-  }
-
-  objArrayHandle signers(THREAD, java_lang_Class::signers(mirror));
-
-  // If there are no signers set in the class, or if the class
-  // is an array, return null.
-  if (signers == nullptr) return nullptr;
-
-  // copy of the signers array
-  Klass* element = ObjArrayKlass::cast(signers->klass())->element_klass();
-  objArrayOop signers_copy = oopFactory::new_objArray(element, signers->length(), CHECK_NULL);
-  for (int index = 0; index < signers->length(); index++) {
-    signers_copy->obj_at_put(index, signers->obj_at(index));
-  }
-
-  // return the copy
-  return (jobjectArray) JNIHandles::make_local(THREAD, signers_copy);
-JVM_END
-
-
-JVM_ENTRY(void, JVM_SetClassSigners(JNIEnv *env, jclass cls, jobjectArray signers))
-  oop mirror = JNIHandles::resolve_non_null(cls);
-  if (!java_lang_Class::is_primitive(mirror)) {
-    // This call is ignored for primitive types and arrays.
-    // Signers are only set once, ClassLoader.java, and thus shouldn't
-    // be called with an array.  Only the bootstrap loader creates arrays.
-    Klass* k = java_lang_Class::as_Klass(mirror);
-    if (k->is_instance_klass()) {
-      java_lang_Class::set_signers(k->java_mirror(), objArrayOop(JNIHandles::resolve(signers)));
-    }
-  }
-JVM_END
-
 
 JVM_ENTRY(jobject, JVM_GetProtectionDomain(JNIEnv *env, jclass cls))
   oop mirror = JNIHandles::resolve_non_null(cls);
diff --git a/src/java.base/share/classes/java/lang/Class.java b/src/java.base/share/classes/java/lang/Class.java
index 5b378077d563f..fb59de482ecf1 100644
--- a/src/java.base/share/classes/java/lang/Class.java
+++ b/src/java.base/share/classes/java/lang/Class.java
@@ -1110,8 +1110,8 @@ public Module getModule() {
     // will throw NoSuchFieldException
     private final ClassLoader classLoader;
 
-    // Set by VM
-    private transient Object classData;
+    private transient Object classData; // Set by VM
+    private transient Object[] signers; // Read by VM, mutable
 
     // package-private
     Object getClassData() {
@@ -1510,14 +1510,19 @@ public Set<AccessFlag> accessFlags() {
      *          a primitive type or void.
      * @since   1.1
      */
-    public native Object[] getSigners();
-
+    public Object[] getSigners() {
+        var signers = this.signers;
+        return signers == null ? null : signers.clone();
+    }
 
     /**
      * Set the signers of this class.
      */
-    native void setSigners(Object[] signers);
-
+    void setSigners(Object[] signers) {
+        if (!isPrimitive() && !isArray()) {
+            this.signers = signers;
+        }
+    }
 
     /**
      * If this {@code Class} object represents a local or anonymous
diff --git a/src/java.base/share/native/libjava/Class.c b/src/java.base/share/native/libjava/Class.c
index 276101d22aa9c..87fab37dfd302 100644
--- a/src/java.base/share/native/libjava/Class.c
+++ b/src/java.base/share/native/libjava/Class.c
@@ -58,8 +58,6 @@ static JNINativeMethod methods[] = {
     {"getSuperclass",    "()" CLS,          NULL},
     {"getInterfaces0",   "()[" CLS,         (void *)&JVM_GetClassInterfaces},
     {"isInterface",      "()Z",             (void *)&JVM_IsInterface},
-    {"getSigners",       "()[" OBJ,         (void *)&JVM_GetClassSigners},
-    {"setSigners",       "([" OBJ ")V",     (void *)&JVM_SetClassSigners},
     {"isArray",          "()Z",             (void *)&JVM_IsArrayClass},
     {"isHidden",         "()Z",             (void *)&JVM_IsHiddenClass},
     {"isPrimitive",      "()Z",             (void *)&JVM_IsPrimitiveClass},

From 330e520c1d42d3a9f3e187873dcd8ed7fd561aaf Mon Sep 17 00:00:00 2001
From: Fernando Guallini <fguallini@openjdk.org>
Date: Thu, 18 Jul 2024 22:36:26 +0000
Subject: [PATCH 137/401] 8028127: Regtest
 java/security/Security/SynchronizedAccess.java is incorrect

Reviewed-by: wetmore, mdonovan, rhalade
---
 .../security/Security/SynchronizedAccess.java | 127 +++++++++++++-----
 1 file changed, 91 insertions(+), 36 deletions(-)

diff --git a/test/jdk/java/security/Security/SynchronizedAccess.java b/test/jdk/java/security/Security/SynchronizedAccess.java
index 4e244a291e35b..28019213b3c24 100644
--- a/test/jdk/java/security/Security/SynchronizedAccess.java
+++ b/test/jdk/java/security/Security/SynchronizedAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,13 +23,15 @@
 
 /*
  * @test
- * @bug 4162583 7054918 8130181
- * @library ../testlibrary
+ * @bug 4162583 7054918 8130181 8028127
+ * @library /test/lib ../testlibrary
  * @summary Make sure Provider api implementations are synchronized properly
  */
 
 import java.security.*;
 
+import jdk.test.lib.Asserts;
+
 public class SynchronizedAccess {
 
     public static void main(String[] args) throws Exception {
@@ -42,52 +44,105 @@ public static void main(String[] args) throws Exception {
     }
 
     public static void main0(String[] args) throws Exception {
+        var providersCountBefore = Security.getProviders().length;
         AccessorThread[] acc = new AccessorThread[200];
-        for (int i=0; i < acc.length; i++)
-            acc[i] = new AccessorThread("thread"+i);
-        for (int i=0; i < acc.length; i++)
+        for (int i = 0; i < acc.length; i++) {
+            acc[i] = new AccessorThread("thread" + i);
+        }
+        for (int i = 0; i < acc.length; i++) {
             acc[i].start();
-        for (int i=0; i < acc.length; i++)
+        }
+        for (int i = 0; i < acc.length; i++) {
             acc[i].join();
+        }
+        var providersCountAfter = Security.getProviders().length;
+        Asserts.assertEquals(providersCountBefore, providersCountAfter);
     }
-}
 
-class AccessorThread extends Thread {
+    static class AccessorThread extends Thread {
 
-    public AccessorThread(String str) {
-        super(str);
-    }
+        public AccessorThread(String str) {
+            super(str);
+        }
 
-    public void run() {
-        Provider[] provs = new Provider[10];
-        for (int i=0; i < provs.length; i++)
-            provs[i] = new MyProvider("name"+i, "1", "test");
+        public void run() {
+            Provider[] provs = new Provider[10];
+            for (int i = 0; i < provs.length; i++) {
+                provs[i] = new MyProvider("name" + i, "1", "test");
+            }
 
-        int rounds = 20;
-        while (rounds-- > 0) {
-            try {
-                for (int i=0; i<provs.length; i++) {
+            int rounds = 20;
+            while (rounds-- > 0) {
+                for (int i = 0; i < provs.length; i++) {
+                    // Might install (>=0) or not (-1) if already installed
                     Security.addProvider(provs[i]);
+                    Thread.yield();
+                }
+
+                try {
+                    Signature.getInstance("sigalg");
+                    Thread.yield();
+                } catch (NoSuchAlgorithmException nsae) {
+                    // All providers may have been deregistered.  Ok.
                 }
-                Signature sig = Signature.getInstance("sigalg");
-                for (int i=0; i<provs.length; i++) {
-                    Security.removeProvider("name"+i);
+
+                for (int i = 0; i < provs.length; i++) {
+                    // Might or might not remove (silent return)
+                    Security.removeProvider("name" + i);
+                    Thread.yield();
                 }
-                provs = Security.getProviders();
-            } catch (NoSuchAlgorithmException nsae) {
+            } // while
+        }
+
+        public static final class MyProvider extends Provider {
+            public MyProvider(String name, String version, String info) {
+                super(name, version, info);
+                put("Signature.sigalg", SigImpl.class.getName());
             }
+        }
+
+        public static final class SigImpl extends Signature {
 
-            try {
-                Thread.sleep(5);
-            } catch (InterruptedException ie) {
+            public SigImpl() {
+                super(null);
             }
-        } // while
-    }
-}
 
-class MyProvider extends Provider {
-    public MyProvider(String name, String version, String info) {
-        super(name, version, info);
-        put("Signature.sigalg", "sigimpl");
+            @Override
+            protected void engineInitVerify(PublicKey publicKey) {
+            }
+
+            @Override
+            protected void engineInitSign(PrivateKey privateKey) {
+            }
+
+            @Override
+            protected void engineUpdate(byte b) {
+            }
+
+            @Override
+            protected void engineUpdate(byte[] b, int off, int len) {
+            }
+
+            @Override
+            protected byte[] engineSign() {
+                return new byte[0];
+            }
+
+            @Override
+            protected boolean engineVerify(byte[] sigBytes) {
+                return false;
+            }
+
+            @Override
+            protected void engineSetParameter(String param, Object value)
+                    throws InvalidParameterException {
+            }
+
+            @Override
+            protected Object engineGetParameter(String param)
+                    throws InvalidParameterException {
+                return null;
+            }
+        }
     }
-}
+}
\ No newline at end of file

From 1b9270ac8a76b482103dd3f6b12606a22214e554 Mon Sep 17 00:00:00 2001
From: Prajwal Kumaraswamy <pkumaraswamy@openjdk.org>
Date: Thu, 18 Jul 2024 22:42:34 +0000
Subject: [PATCH 138/401] 8328723: IP Address error when client enables HTTPS
 endpoint check on server socket

Reviewed-by: wetmore, djelinski
---
 .../sun/security/ssl/X509TrustManagerImpl.java    | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java b/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
index e3df4c1620281..58794e5dce87f 100644
--- a/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/X509TrustManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -428,8 +428,17 @@ static void checkIdentity(SSLSession session,
         }
 
         if (!identifiable) {
-            checkIdentity(peerHost,
-                    trustedChain[0], algorithm, chainsToPublicCA);
+            try {
+                checkIdentity(peerHost,
+                        trustedChain[0], algorithm, chainsToPublicCA);
+            } catch(CertificateException ce) {
+                if (checkClientTrusted && "HTTPS".equalsIgnoreCase(algorithm)) {
+                    throw new CertificateException("Endpoint Identification Algorithm " +
+                            "HTTPS is not supported on the server side");
+                } else {
+                    throw ce;
+                }
+            }
         }
     }
 

From 902bada2cdd141ade8615d1e3c2fcbff2b80e3b1 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Fri, 19 Jul 2024 02:56:42 +0000
Subject: [PATCH 139/401] 8234071: JTable.AUTO_RESIZE_LAST_COLUMN acts like
 AUTO_RESIZE_ALL_COLUMNS

Reviewed-by: prr, abhiscxk
---
 src/java.desktop/share/classes/javax/swing/JTable.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/java.desktop/share/classes/javax/swing/JTable.java b/src/java.desktop/share/classes/javax/swing/JTable.java
index 7f7c0a3ee7c7e..fc780a9ce2c48 100644
--- a/src/java.desktop/share/classes/javax/swing/JTable.java
+++ b/src/java.desktop/share/classes/javax/swing/JTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1266,6 +1266,12 @@ public void setAutoResizeMode(int mode) {
             autoResizeMode = mode;
             resizeAndRepaint();
             if (tableHeader != null) {
+                if (mode == JTable.AUTO_RESIZE_LAST_COLUMN) {
+                    int colCnt = columnModel.getColumnCount();
+                    if (colCnt > 0) {
+                        tableHeader.setResizingColumn(columnModel.getColumn(colCnt - 1));
+                    }
+                }
                 tableHeader.resizeAndRepaint();
             }
             firePropertyChange("autoResizeMode", old, autoResizeMode);

From f5871df25c60990825babb3bbae38c5ade93f097 Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Fri, 19 Jul 2024 05:54:25 +0000
Subject: [PATCH 140/401] 8336675: Remove UnixFileSystemProvider.checkPath in
 favor of UnixPath.toUnixPath

Reviewed-by: jpai, alanb, bpb
---
 .../sun/nio/fs/UnixFileSystemProvider.java    | 25 +++----------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixFileSystemProvider.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileSystemProvider.java
index 1ad666afc68fc..7b3bca3acacd0 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixFileSystemProvider.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixFileSystemProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,6 @@
 import java.nio.file.NotLinkException;
 import java.nio.file.OpenOption;
 import java.nio.file.Path;
-import java.nio.file.ProviderMismatchException;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.nio.file.attribute.BasicFileAttributeView;
 import java.nio.file.attribute.FileAttribute;
@@ -126,14 +125,6 @@ public Path getPath(URI uri) {
         return UnixUriUtils.fromUri(theFileSystem, uri);
     }
 
-    UnixPath checkPath(Path obj) {
-        if (obj == null)
-            throw new NullPointerException();
-        if (!(obj instanceof UnixPath))
-            throw new ProviderMismatchException();
-        return (UnixPath)obj;
-    }
-
     @Override
     @SuppressWarnings("unchecked")
     public <V extends FileAttributeView> V getFileAttributeView(Path obj,
@@ -216,7 +207,7 @@ public FileChannel newFileChannel(Path obj,
                                       FileAttribute<?>... attrs)
         throws IOException
     {
-        UnixPath file = checkPath(obj);
+        UnixPath file = UnixPath.toUnixPath(obj);
         int mode = UnixFileModeAttribute
             .toUnixMode(UnixFileModeAttribute.ALL_READWRITE, attrs);
         try {
@@ -233,7 +224,7 @@ public AsynchronousFileChannel newAsynchronousFileChannel(Path obj,
                                                               ExecutorService executor,
                                                               FileAttribute<?>... attrs) throws IOException
     {
-        UnixPath file = checkPath(obj);
+        UnixPath file = UnixPath.toUnixPath(obj);
         int mode = UnixFileModeAttribute
             .toUnixMode(UnixFileModeAttribute.ALL_READWRITE, attrs);
         ThreadPool pool = (executor == null) ? null : ThreadPool.wrap(executor, 0);
@@ -253,15 +244,7 @@ public SeekableByteChannel newByteChannel(Path obj,
                                               FileAttribute<?>... attrs)
          throws IOException
     {
-        UnixPath file = UnixPath.toUnixPath(obj);
-        int mode = UnixFileModeAttribute
-            .toUnixMode(UnixFileModeAttribute.ALL_READWRITE, attrs);
-        try {
-            return UnixChannelFactory.newFileChannel(file, options, mode);
-        } catch (UnixException x) {
-            x.rethrowAsIOException(file);
-            return null;  // keep compiler happy
-        }
+        return newFileChannel(obj, options, attrs);
     }
 
     @Override

From 10fcad70b3894023d65716b42dc67c1a2bda9c03 Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Fri, 19 Jul 2024 06:23:11 +0000
Subject: [PATCH 141/401] 8325945: Error reporting should limit the number of
 String characters printed

Reviewed-by: thartmann, stuefe
---
 src/hotspot/share/classfile/javaClasses.cpp   |  23 +++-
 src/hotspot/share/classfile/javaClasses.hpp   |   2 +-
 src/hotspot/share/prims/whitebox.cpp          |   9 ++
 src/hotspot/share/runtime/globals.hpp         |   6 +
 .../runtime/PrintingTests/StringPrinting.java | 122 ++++++++++++++++++
 test/lib/jdk/test/whitebox/WhiteBox.java      |   7 +-
 6 files changed, 166 insertions(+), 3 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/PrintingTests/StringPrinting.java

diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index c0a413f18681d..a0b5b73c6d449 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -751,8 +751,16 @@ bool java_lang_String::equals(oop str1, oop str2) {
   return value_equals(value1, value2);
 }
 
-void java_lang_String::print(oop java_string, outputStream* st) {
+// Print the given string to the given outputStream, limiting the output to
+// at most max_length of the string's characters. If the length exceeds the
+// limit we print an abridged version of the string with the "middle" elided
+// and replaced by " ... (N characters ommitted) ... ". If max_length is odd
+// it is treated as max_length-1.
+void java_lang_String::print(oop java_string, outputStream* st, int max_length) {
   assert(java_string->klass() == vmClasses::String_klass(), "must be java_string");
+  // We need at least two characters to print A ... B
+  assert(max_length > 1, "invalid max_length: %d", max_length);
+
   typeArrayOop value  = java_lang_String::value_no_keepalive(java_string);
 
   if (value == nullptr) {
@@ -765,8 +773,17 @@ void java_lang_String::print(oop java_string, outputStream* st) {
   int length = java_lang_String::length(java_string, value);
   bool is_latin1 = java_lang_String::is_latin1(java_string);
 
+  bool abridge = length > max_length;
+
   st->print("\"");
   for (int index = 0; index < length; index++) {
+    // If we need to abridge and we've printed half the allowed characters
+    // then jump to the tail of the string.
+    if (abridge && index >= max_length / 2) {
+      st->print(" ... (%d characters ommitted) ... ", length - 2 * (max_length / 2));
+      index = length - (max_length / 2);
+      abridge = false; // only do this once
+    }
     jchar c = (!is_latin1) ?  value->char_at(index) :
                              ((jchar) value->byte_at(index)) & 0xff;
     if (c < ' ') {
@@ -776,6 +793,10 @@ void java_lang_String::print(oop java_string, outputStream* st) {
     }
   }
   st->print("\"");
+
+  if (length > max_length) {
+    st->print(" (abridged) ");
+  }
 }
 
 // java_lang_Class
diff --git a/src/hotspot/share/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp
index 973f2f8f52466..57914e189b75d 100644
--- a/src/hotspot/share/classfile/javaClasses.hpp
+++ b/src/hotspot/share/classfile/javaClasses.hpp
@@ -194,7 +194,7 @@ class java_lang_String : AllStatic {
   static inline bool is_instance(oop obj);
 
   // Debugging
-  static void print(oop java_string, outputStream* st);
+  static void print(oop java_string, outputStream* st, int max_length = MaxStringPrintSize);
   friend class JavaClasses;
   friend class StringTable;
 };
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index a799d5b5de42d..43e47409c4cb6 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -179,6 +179,14 @@ WB_ENTRY(jlong, WB_GetVMLargePageSize(JNIEnv* env, jobject o))
   return os::large_page_size();
 WB_END
 
+WB_ENTRY(jstring, WB_PrintString(JNIEnv* env, jobject wb, jstring str, jint max_length))
+  ResourceMark rm(THREAD);
+  stringStream sb;
+  java_lang_String::print(JNIHandles::resolve(str), &sb, max_length);
+  oop result = java_lang_String::create_oop_from_str(sb.as_string(), THREAD);
+  return (jstring) JNIHandles::make_local(THREAD, result);
+WB_END
+
 class WBIsKlassAliveClosure : public LockedClassesDo {
     Symbol* _name;
     int _count;
@@ -2959,6 +2967,7 @@ static JNINativeMethod methods[] = {
   {CC"preTouchMemory",  CC"(JJ)V",                    (void*)&WB_PreTouchMemory},
   {CC"cleanMetaspaces", CC"()V",                      (void*)&WB_CleanMetaspaces},
   {CC"rss", CC"()J",                                  (void*)&WB_Rss},
+  {CC"printString", CC"(Ljava/lang/String;I)Ljava/lang/String;", (void*)&WB_PrintString},
 };
 
 
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index cbd161d86eb48..7a7a3769ac90f 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -1304,6 +1304,12 @@ const int ObjectAlignmentInBytes = 8;
   develop(int, MaxElementPrintSize, 256,                                    \
           "maximum number of elements to print")                            \
                                                                             \
+  develop(int, MaxStringPrintSize, 256,                                     \
+          "maximum number of characters to print for a java.lang.String "   \
+          "in the VM. If exceeded, an abridged version of the string is "   \
+          "printed with the middle of the string elided.")                  \
+          range(2, O_BUFLEN)                                                \
+                                                                            \
   develop(intx, MaxSubklassPrintSize, 4,                                    \
           "maximum number of subklasses to print when printing klass")      \
                                                                             \
diff --git a/test/hotspot/jtreg/runtime/PrintingTests/StringPrinting.java b/test/hotspot/jtreg/runtime/PrintingTests/StringPrinting.java
new file mode 100644
index 0000000000000..fffcdd72d1584
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/PrintingTests/StringPrinting.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 8325945
+ * @summary Test abridged VM String printing
+ * @library /test/lib
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+WhiteBoxAPI StringPrinting
+ */
+
+import jdk.test.whitebox.WhiteBox;
+
+public class StringPrinting {
+
+    private static final WhiteBox WB = WhiteBox.getWhiteBox();
+
+    static void checkEqual(String s1, String s2) {
+        if (!s1.equals(s2)) {
+            throw new RuntimeException("Different strings: " + s1 + " vs " + s2);
+        }
+    }
+
+    static void checkEqual(int len1, int len2) {
+        if (len1 != len2) {
+            throw new RuntimeException("Different lengths: " + len1 + " vs " + len2);
+        }
+    }
+
+    public static void main(String[] args) {
+        // Modified string format is "xxx ... (N characters ommitted) ... xxx" (abridged)
+        final String elipse = " ... ";
+        final String text = " characters ommitted)";
+        final String abridged = "\" (abridged) ";
+
+        // Define a set of maxLengths for ease of inspection in the test outout
+        // Note: maxLength must be >= 2
+        int[] maxLengths = new int[] { 2, 3, 16, 256, 512 };
+        for (int maxLength : maxLengths) {
+            // Test string lengths around maxLength and "much" bigger
+            // than maxLength
+            int[] strLengths = new int[] { maxLength - 1,
+                                           maxLength,
+                                           maxLength + 1,
+                                           2 * maxLength
+            };
+            for (int length : strLengths) {
+                System.out.println("Testing string length " + length + " with maxLength " + maxLength);
+                String s = "x".repeat(length);
+                String r = WB.printString(s, maxLength);
+                if (length <= maxLength) {
+                    // Strip off the double-quotes that surround the string
+                    if (r.charAt(0) == '\"' && r.charAt(r.length() - 1) == '\"') {
+                        r = r.substring(1, r.length() - 1);
+                    } else {
+                        throw new RuntimeException("String was not quoted as expected: " + r);
+                    }
+                    checkEqual(s, r);
+                } else {
+                    // Strip off leading double-quote
+                    if (r.charAt(0) == '\"') {
+                        r = r.substring(1, r.length());
+                    } else {
+                        throw new RuntimeException("String was not quoted as expected: " + r);
+                    }
+
+                    // Strip off abridged
+                    if (r.endsWith(abridged)) {
+                        r = r.substring(0, r.length() - abridged.length());
+                    } else {
+                        throw new RuntimeException("String was not marked abridged as expected: " + r);
+                    }
+
+                    // Now extract the two "halves"
+                    int elipseStart = r.indexOf(elipse);
+                    String firstHalf = r.substring(0, elipseStart);
+                    int secondElipseStart = r.lastIndexOf(elipse);
+                    String secondHalf = r.substring(secondElipseStart + elipse.length(), r.length());
+
+                    System.out.println("S1: >" + firstHalf + "<");
+                    System.out.println("S2: >" + secondHalf + "<");
+
+                    checkEqual(firstHalf.length(), maxLength / 2);
+                    checkEqual(secondHalf.length(), maxLength /2);
+
+                    // Now check number of characters ommitted
+                    String tail = r.substring(r.indexOf("("), r.length());
+                    int numberEnd = tail.indexOf(" ");
+                    String nChars = tail.substring(1, numberEnd);
+                    System.out.println("N: >" + nChars + "<");
+
+                    // Now add all the bits back together to get the expected full length
+                    int fullLength = maxLength / 2 + elipse.length() + 1 /* for ( */
+                        + nChars.length() + text.length() + elipse.length() + maxLength / 2;
+                    checkEqual(r.length(), fullLength);
+                }
+            }
+        }
+    }
+}
diff --git a/test/lib/jdk/test/whitebox/WhiteBox.java b/test/lib/jdk/test/whitebox/WhiteBox.java
index 1bc309e2aecf8..607e9552945b5 100644
--- a/test/lib/jdk/test/whitebox/WhiteBox.java
+++ b/test/lib/jdk/test/whitebox/WhiteBox.java
@@ -99,8 +99,13 @@ public         long getObjectSize(Object o) {
   }
 
   // Runtime
-  // Make sure class name is in the correct format
+
+  // Returns the potentially abridged form of `str` as it would be
+  // printed by the VM.
+  public native String printString(String str, int maxLength);
+
   public int countAliveClasses(String name) {
+    // Make sure class name is in the correct format
     return countAliveClasses0(name.replace('.', '/'));
   }
   private native int countAliveClasses0(String name);

From fa5ad700bb6a92aef7577969e09b4fbd93feb388 Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Fri, 19 Jul 2024 07:06:51 +0000
Subject: [PATCH 142/401] 8334771: [TESTBUG] Run TestDockerMemoryMetrics.java
 with -Xcomp fails exitValue = 137

Reviewed-by: lmesnik, sspitsyn
---
 .../jdk/jdk/internal/platform/docker/MetricsMemoryTester.java | 4 +++-
 .../jdk/internal/platform/docker/TestDockerMemoryMetrics.java | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/jdk/jdk/internal/platform/docker/MetricsMemoryTester.java b/test/jdk/jdk/internal/platform/docker/MetricsMemoryTester.java
index 6307a93fa5699..8069965e8d87d 100644
--- a/test/jdk/jdk/internal/platform/docker/MetricsMemoryTester.java
+++ b/test/jdk/jdk/internal/platform/docker/MetricsMemoryTester.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,6 +48,8 @@ public static void main(String[] args) {
             case "softlimit":
                 testMemorySoftLimit(args[1]);
                 break;
+            default:
+                throw new RuntimeException("unknown args: " + args[0] + " for MetricsMemoryTester");
         }
     }
 
diff --git a/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetrics.java b/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetrics.java
index 09cd60baabe2a..416e91bec5ca2 100644
--- a/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetrics.java
+++ b/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetrics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -75,7 +75,7 @@ public static void main(String[] args) throws Exception {
             }
             testOomKillFlag("100m", true);
 
-            testMemoryFailCount("64m");
+            testMemoryFailCount("128m");
 
             testMemorySoftLimit("500m","200m");
 

From 10982fe557e9e8b68b674630a9979cb355bdbe62 Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Fri, 19 Jul 2024 07:28:51 +0000
Subject: [PATCH 143/401] 8335843: C2 hits
 assert(_print_inlining_stream->size() > 0) failed: missing inlining msg

Reviewed-by: thartmann, kvn, vlivanov
---
 src/hotspot/share/opto/callGenerator.cpp      |  6 +-
 .../print/TestPrintInliningLateMHCall.java    | 79 +++++++++++++++++++
 .../TestPrintInliningLateVirtualCall.java     |  4 +-
 3 files changed, 86 insertions(+), 3 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/print/TestPrintInliningLateMHCall.java

diff --git a/src/hotspot/share/opto/callGenerator.cpp b/src/hotspot/share/opto/callGenerator.cpp
index 433d0316b9dad..afd9ca25a56fe 100644
--- a/src/hotspot/share/opto/callGenerator.cpp
+++ b/src/hotspot/share/opto/callGenerator.cpp
@@ -432,6 +432,10 @@ bool LateInlineMHCallGenerator::do_late_inline_check(Compile* C, JVMState* jvms)
   assert(!input_not_const, "sanity"); // shouldn't have been scheduled for inlining in the first place
 
   if (cg != nullptr) {
+    if (!allow_inline && (C->print_inlining() || C->print_intrinsics())) {
+      C->print_inlining(cg->method(), jvms->depth()-1, call_node()->jvms()->bci(), InliningResult::FAILURE,
+                        "late method handle call resolution");
+    }
     assert(!cg->is_late_inline() || cg->is_mh_late_inline() || AlwaysIncrementalInline || StressIncrementalInlining, "we're doing late inlining");
     _inline_cg = cg;
     C->dec_number_of_mh_late_inlines();
@@ -555,7 +559,7 @@ bool LateInlineVirtualCallGenerator::do_late_inline_check(Compile* C, JVMState*
 
   if (cg != nullptr) {
     if (!allow_inline && (C->print_inlining() || C->print_intrinsics())) {
-      C->print_inlining(method(), jvms->depth()-1, call_node()->jvms()->bci(), InliningResult::FAILURE,
+      C->print_inlining(cg->method(), jvms->depth()-1, call_node()->jvms()->bci(), InliningResult::FAILURE,
                         "late call devirtualization");
     }
     assert(!cg->is_late_inline() || cg->is_mh_late_inline() || AlwaysIncrementalInline || StressIncrementalInlining, "we're doing late inlining");
diff --git a/test/hotspot/jtreg/compiler/print/TestPrintInliningLateMHCall.java b/test/hotspot/jtreg/compiler/print/TestPrintInliningLateMHCall.java
new file mode 100644
index 0000000000000..529469e3a958a
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/print/TestPrintInliningLateMHCall.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2024, Red Hat 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 8335843
+ * @summary C2 hits assert(_print_inlining_stream->size() > 0) failed: missing inlining msg
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:-BackgroundCompilation -XX:+PrintCompilation -XX:+PrintInlining TestPrintInliningLateMHCall
+ */
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+
+public class TestPrintInliningLateMHCall {
+    static final MethodHandle mh1;
+    static MethodHandle mh2;
+
+    static {
+        try {
+            MethodHandles.Lookup lookup = MethodHandles.lookup();
+            mh1 = lookup.findStatic(TestPrintInliningLateMHCall.class, "lateResolved", MethodType.methodType(void.class));
+            mh2 = mh1;
+        } catch (NoSuchMethodException | IllegalAccessException e) {
+            e.printStackTrace();
+            throw new RuntimeException("Method handle lookup failed");
+        }
+    }
+
+    public static void main(String[] args) throws Throwable {
+        for (int i = 0; i < 20_000; i++) {
+            testHelper(0);
+            testHelper(10);
+            test();
+        }
+    }
+
+    private static void testHelper(int i) throws Throwable {
+        MethodHandle mh = null;
+        if (i == 10) {
+            mh = mh1;
+        } else {
+            mh = mh2;
+        }
+        mh.invokeExact();
+    }
+
+    private static void test() throws Throwable {
+        int i;
+        for (i = 0; i < 10; i++) {
+
+        }
+        testHelper(i);
+    }
+
+    private static void lateResolved() {
+        // noop
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/print/TestPrintInliningLateVirtualCall.java b/test/hotspot/jtreg/compiler/print/TestPrintInliningLateVirtualCall.java
index b41f37b3bed50..f73e30badcb37 100644
--- a/test/hotspot/jtreg/compiler/print/TestPrintInliningLateVirtualCall.java
+++ b/test/hotspot/jtreg/compiler/print/TestPrintInliningLateVirtualCall.java
@@ -44,9 +44,9 @@ public static void main(String[] args) {
     private static void testHelper(int i) {
         A a;
         if (i == 10) {
-            a = fieldA;
-        } else if (i > 10) {
             a = fieldB;
+        } else if (i > 10) {
+            a = fieldA;
         } else {
             a = fieldC;
         }

From 0ddf54e222104469669f611804ae55e2685f54fb Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Fri, 19 Jul 2024 07:30:23 +0000
Subject: [PATCH 144/401] 8335709: C2:
 assert(!loop->is_member(get_loop(useblock))) failed: must be outside loop

Co-authored-by: Emanuel Peter <epeter@openjdk.org>
Reviewed-by: epeter, thartmann
---
 src/hotspot/share/opto/loopnode.cpp           |  7 ++-
 .../InfiniteLoopBadControlNeverBranch.java    | 57 +++++++++++++++++++
 2 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/loopopts/InfiniteLoopBadControlNeverBranch.java

diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index cbb8758c12521..85e6f03d4280d 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -5473,7 +5473,8 @@ int PhaseIdealLoop::build_loop_tree_impl( Node *n, int pre_order ) {
 
     } else {                    // Else not a nested loop
       if (!_loop_or_ctrl[m->_idx]) continue; // Dead code has no loop
-      l = get_loop(m);          // Get previously determined loop
+      IdealLoopTree* m_loop = get_loop(m);
+      l = m_loop;          // Get previously determined loop
       // If successor is header of a loop (nest), move up-loop till it
       // is a member of some outer enclosing loop.  Since there are no
       // shared headers (I've split them already) I only need to go up
@@ -5499,10 +5500,10 @@ int PhaseIdealLoop::build_loop_tree_impl( Node *n, int pre_order ) {
           // Insert the NeverBranch between 'm' and it's control user.
           NeverBranchNode *iff = new NeverBranchNode( m );
           _igvn.register_new_node_with_optimizer(iff);
-          set_loop(iff, l);
+          set_loop(iff, m_loop);
           Node *if_t = new CProjNode( iff, 0 );
           _igvn.register_new_node_with_optimizer(if_t);
-          set_loop(if_t, l);
+          set_loop(if_t, m_loop);
 
           Node* cfg = nullptr;       // Find the One True Control User of m
           for (DUIterator_Fast jmax, j = m->fast_outs(jmax); j < jmax; j++) {
diff --git a/test/hotspot/jtreg/compiler/loopopts/InfiniteLoopBadControlNeverBranch.java b/test/hotspot/jtreg/compiler/loopopts/InfiniteLoopBadControlNeverBranch.java
new file mode 100644
index 0000000000000..b36bbcc156802
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/InfiniteLoopBadControlNeverBranch.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 8335709
+ * @summary C2: assert(!loop->is_member(get_loop(useblock))) failed: must be outside loop
+ * @library /test/lib
+ * @run main/othervm -Xcomp -XX:CompileCommand=compileonly,InfiniteLoopBadControlNeverBranch::* InfiniteLoopBadControlNeverBranch
+ *
+ */
+
+
+import jdk.test.lib.Utils;
+
+public class InfiniteLoopBadControlNeverBranch {
+    static int b;
+    static short c;
+
+    public static void main(String[] args) throws InterruptedException {
+        Thread thread = new Thread(() -> test());
+        thread.setDaemon(true);
+        thread.start();
+        Thread.sleep(Utils.adjustTimeout(4000));
+    }
+
+    static void test() {
+        int i = 0;
+        while (true) {
+            if (i > 1) {
+                b = 0;
+            }
+            c = (short) (b * 7);
+            i++;
+        }
+    }
+}

From b703be9cf633796456991279d07cbde98ad7f1aa Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Fri, 19 Jul 2024 08:34:36 +0000
Subject: [PATCH 145/401] 8336465: C2: EA incorrectly/unnecessarily checks for
 clinits

Reviewed-by: kvn, thartmann
---
 src/hotspot/share/opto/bytecodeInfo.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/opto/bytecodeInfo.cpp b/src/hotspot/share/opto/bytecodeInfo.cpp
index 3b1e9cbd855e6..9e0fa6f760f53 100644
--- a/src/hotspot/share/opto/bytecodeInfo.cpp
+++ b/src/hotspot/share/opto/bytecodeInfo.cpp
@@ -86,10 +86,10 @@ static bool is_init_with_ea(ciMethod* callee_method,
   if (!C->do_escape_analysis() || !EliminateAllocations) {
     return false; // EA is off
   }
-  if (callee_method->is_initializer()) {
+  if (callee_method->is_object_initializer()) {
     return true; // constructor
   }
-  if (caller_method->is_initializer() &&
+  if (caller_method->is_object_initializer() &&
       caller_method != C->method() &&
       caller_method->holder()->is_subclass_of(callee_method->holder())) {
     return true; // super constructor is called from inlined constructor

From 5d965f36d3cd7a1a1f22bf119a98a9e9576a647f Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Fri, 19 Jul 2024 08:34:47 +0000
Subject: [PATCH 146/401] 8336466: C2: Parser incorrectly/unnecessarily checks
 for clinits

Reviewed-by: kvn, thartmann
---
 src/hotspot/share/opto/callnode.cpp | 6 ++----
 src/hotspot/share/opto/parse1.cpp   | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/share/opto/callnode.cpp b/src/hotspot/share/opto/callnode.cpp
index 282f0f7fce3ce..d715e6533432e 100644
--- a/src/hotspot/share/opto/callnode.cpp
+++ b/src/hotspot/share/opto/callnode.cpp
@@ -1601,10 +1601,8 @@ AllocateNode::AllocateNode(Compile* C, const TypeFunc *atype,
 
 void AllocateNode::compute_MemBar_redundancy(ciMethod* initializer)
 {
-  assert(initializer != nullptr &&
-         initializer->is_initializer() &&
-         !initializer->is_static(),
-             "unexpected initializer method");
+  assert(initializer != nullptr && initializer->is_object_initializer(),
+         "unexpected initializer method");
   BCEscapeAnalyzer* analyzer = initializer->get_bcea();
   if (analyzer == nullptr) {
     return;
diff --git a/src/hotspot/share/opto/parse1.cpp b/src/hotspot/share/opto/parse1.cpp
index 9b194099183b1..14ef93a5eed8c 100644
--- a/src/hotspot/share/opto/parse1.cpp
+++ b/src/hotspot/share/opto/parse1.cpp
@@ -1013,7 +1013,7 @@ void Parse::do_exits() {
   // such unusual early publications.  But no barrier is needed on
   // exceptional returns, since they cannot publish normally.
   //
-  if (method()->is_initializer() &&
+  if (method()->is_object_initializer() &&
        (wrote_final() ||
          (AlwaysSafeConstructors && wrote_fields()) ||
          (support_IRIW_for_not_multiple_copy_atomic_cpu && wrote_volatile()))) {

From 84bc4767a4cd68fb52a36c6644bbec67c24b0e1d Mon Sep 17 00:00:00 2001
From: Volker Simonis <simonis@openjdk.org>
Date: Fri, 19 Jul 2024 11:26:44 +0000
Subject: [PATCH 147/401] 8336258: Document the behavior of 'exclude' and
 'compileonly' with respect to inlining

Reviewed-by: thartmann, jkarthikeyan
---
 src/hotspot/share/compiler/compilerOracle.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/hotspot/share/compiler/compilerOracle.cpp b/src/hotspot/share/compiler/compilerOracle.cpp
index a81d60c9fc422..d0479f3fdbb50 100644
--- a/src/hotspot/share/compiler/compilerOracle.cpp
+++ b/src/hotspot/share/compiler/compilerOracle.cpp
@@ -637,6 +637,10 @@ static void usage() {
   tty->print_cr("and 'compileonly'. There is no priority of commands. Applying (a subset of) these");
   tty->print_cr("commands to the same method results in undefined behavior.");
   tty->cr();
+  tty->print_cr("The 'exclude' command excludes methods from top-level compilations as well as");
+  tty->print_cr("from inlining, whereas the 'compileonly' command only excludes methods from");
+  tty->print_cr("top-level compilations (i.e. they can still be inlined into other compilation units).");
+  tty->cr();
 };
 
 static int skip_whitespace(char* &line) {

From 6e9fcc2d80170c79e45b8710e98754c67d544012 Mon Sep 17 00:00:00 2001
From: Jie Fu <jiefu@openjdk.org>
Date: Fri, 19 Jul 2024 12:28:56 +0000
Subject: [PATCH 148/401] 8336816: runtime/PrintingTests/StringPrinting.java
 fails with release VMs

Reviewed-by: dholmes
---
 test/hotspot/jtreg/runtime/PrintingTests/StringPrinting.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/runtime/PrintingTests/StringPrinting.java b/test/hotspot/jtreg/runtime/PrintingTests/StringPrinting.java
index fffcdd72d1584..f55a8308e6d38 100644
--- a/test/hotspot/jtreg/runtime/PrintingTests/StringPrinting.java
+++ b/test/hotspot/jtreg/runtime/PrintingTests/StringPrinting.java
@@ -28,7 +28,7 @@
  * @library /test/lib
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+WhiteBoxAPI StringPrinting
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI StringPrinting
  */
 
 import jdk.test.whitebox.WhiteBox;

From c25c4896ad9ef031e3cddec493aef66ff87c48a7 Mon Sep 17 00:00:00 2001
From: Adam Sotona <asotona@openjdk.org>
Date: Fri, 19 Jul 2024 13:09:45 +0000
Subject: [PATCH 149/401] 8333812: ClassFile.verify() can throw exceptions
 instead of returning VerifyErrors

Reviewed-by: liach
---
 .../classfile/impl/BoundAttribute.java        | 12 +++++++--
 .../classfile/impl/ClassFileImpl.java         |  6 ++++-
 .../classfile/impl/verifier/VerifierImpl.java |  7 ++---
 test/jdk/jdk/classfile/VerifierSelfTest.java  | 26 ++++++++++++++++++-
 4 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java
index 175c4adb927b4..6a23be54f4855 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java
@@ -286,7 +286,11 @@ public static final class BoundLocalVariableTableAttribute
 
         public BoundLocalVariableTableAttribute(AttributedElement enclosing, ClassReader cf, AttributeMapper<LocalVariableTableAttribute> mapper, int pos) {
             super(cf, mapper, pos);
-            codeAttribute = (CodeImpl) enclosing;
+            if (enclosing instanceof CodeImpl ci) {
+                this.codeAttribute = ci;
+            } else {
+                throw new IllegalArgumentException("Invalid LocalVariableTable attribute location");
+            }
         }
 
         @Override
@@ -313,7 +317,11 @@ public static final class BoundLocalVariableTypeTableAttribute
 
         public BoundLocalVariableTypeTableAttribute(AttributedElement enclosing, ClassReader cf, AttributeMapper<LocalVariableTypeTableAttribute> mapper, int pos) {
             super(cf, mapper, pos);
-            this.codeAttribute = (CodeImpl) enclosing;
+            if (enclosing instanceof CodeImpl ci) {
+                this.codeAttribute = ci;
+            } else {
+                throw new IllegalArgumentException("Invalid LocalVariableTypeTable attribute location");
+            }
         }
 
         @Override
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassFileImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassFileImpl.java
index e4408d6c7b27d..8de62e7a12ba6 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassFileImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassFileImpl.java
@@ -132,7 +132,11 @@ public void accept(ClassBuilder builder) {
 
     @Override
     public List<VerifyError> verify(ClassModel model) {
-        return VerifierImpl.verify(model, classHierarchyResolverOption().classHierarchyResolver(), null);
+        try {
+            return VerifierImpl.verify(model, classHierarchyResolverOption().classHierarchyResolver(), null);
+        } catch (IllegalArgumentException verifierInitializationError) {
+            return List.of(new VerifyError(verifierInitializationError.getMessage()));
+        }
     }
 
     @Override
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerifierImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerifierImpl.java
index 11e7256751eeb..33733c5572a73 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerifierImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerifierImpl.java
@@ -114,9 +114,10 @@ public static List<VerifyError> verify(ClassModel classModel, Consumer<String> l
     }
 
     public static List<VerifyError> verify(ClassModel classModel, ClassHierarchyResolver classHierarchyResolver, Consumer<String> logger) {
-        var klass = new VerificationWrapper(classModel);
-        log_info(logger, "Start class verification for: %s", klass.thisClassName());
+        String clsName = classModel.thisClass().asInternalName();
+        log_info(logger, "Start class verification for: %s", clsName);
         try {
+            var klass = new VerificationWrapper(classModel);
             var errors = new ArrayList<VerifyError>();
             errors.addAll(new ParserVerifier(classModel).verify());
             if (is_eligible_for_verification(klass)) {
@@ -134,7 +135,7 @@ public static List<VerifyError> verify(ClassModel classModel, ClassHierarchyReso
             }
             return errors;
         } finally {
-            log_info(logger, "End class verification for: %s", klass.thisClassName());
+            log_info(logger, "End class verification for: %s", clsName);
         }
     }
 
diff --git a/test/jdk/jdk/classfile/VerifierSelfTest.java b/test/jdk/jdk/classfile/VerifierSelfTest.java
index 26513a543357c..84a5ded161089 100644
--- a/test/jdk/jdk/classfile/VerifierSelfTest.java
+++ b/test/jdk/jdk/classfile/VerifierSelfTest.java
@@ -24,6 +24,7 @@
 /*
  * @test
  * @summary Testing ClassFile Verifier.
+ * @bug 8333812
  * @enablePreview
  * @run junit VerifierSelfTest
  */
@@ -46,8 +47,10 @@
 import java.lang.classfile.attribute.*;
 import java.lang.classfile.components.ClassPrinter;
 import java.lang.constant.ModuleDesc;
+import jdk.internal.classfile.impl.DirectClassBuilder;
+import jdk.internal.classfile.impl.UnboundAttribute;
 import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.*;
 
 class VerifierSelfTest {
 
@@ -94,6 +97,27 @@ void testFailed() throws IOException {
         }
     }
 
+    @Test
+    void testInvalidAttrLocation() {
+        var cc = ClassFile.of();
+        var bytes = cc.build(ClassDesc.of("InvalidAttrLocationClass"), cb ->
+            ((DirectClassBuilder)cb).writeAttribute(new UnboundAttribute.AdHocAttribute<LocalVariableTableAttribute>(Attributes.localVariableTable()) {
+                @Override
+                public void writeBody(BufWriter b) {
+                    b.writeU2(0);
+                }
+            }));
+        assertTrue(cc.verify(bytes).stream().anyMatch(e -> e.getMessage().contains("Invalid LocalVariableTable attribute location")));
+    }
+
+    @Test
+    void testInvalidClassNameEntry() {
+        var cc = ClassFile.of();
+        var bytes = cc.parse(new byte[]{(byte)0xCA, (byte)0xFE, (byte)0xBA, (byte)0xBE,
+            0, 0, 0, 0, 0, 2, ClassFile.TAG_INTEGER, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0});
+        assertTrue(cc.verify(bytes).stream().anyMatch(e -> e.getMessage().contains("expected ClassEntry")));
+    }
+
     @Test
     void testParserVerification() {
         var cc = ClassFile.of();

From 3ade2b6114bbe81eb03e3a49c08b5401f70a2367 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Fri, 19 Jul 2024 21:25:20 +0000
Subject: [PATCH 150/401] 8336777: BufferedMethodBuilder not initialized with
 static flag

Reviewed-by: asotona
---
 .../classfile/impl/BufferedMethodBuilder.java | 16 +++-
 .../classfile/impl/ChainedClassBuilder.java   |  4 +-
 .../classfile/impl/DirectMethodBuilder.java   |  4 +-
 .../internal/classfile/impl/MethodInfo.java   |  5 +-
 .../classfile/impl/TerminalMethodBuilder.java |  4 +-
 .../MethodBuilderStaticFlagTest.java          | 80 +++++++++++++++++++
 6 files changed, 102 insertions(+), 11 deletions(-)
 create mode 100644 test/jdk/jdk/classfile/MethodBuilderStaticFlagTest.java

diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java
index 0819831466e75..eaa2e2b710e76 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java
@@ -25,6 +25,7 @@
 package jdk.internal.classfile.impl;
 
 import java.lang.constant.MethodTypeDesc;
+import java.lang.reflect.AccessFlag;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -44,7 +45,7 @@
 import java.lang.classfile.constantpool.Utf8Entry;
 
 public final class BufferedMethodBuilder
-        implements TerminalMethodBuilder, MethodInfo {
+        implements TerminalMethodBuilder {
     private final List<MethodElement> elements;
     private final SplitConstantPool constantPool;
     private final ClassFileImpl context;
@@ -59,23 +60,32 @@ public BufferedMethodBuilder(SplitConstantPool constantPool,
                                  ClassFileImpl context,
                                  Utf8Entry nameInfo,
                                  Utf8Entry typeInfo,
+                                 int flags,
                                  MethodModel original) {
         this.elements = new ArrayList<>();
         this.constantPool = constantPool;
         this.context = context;
         this.name = nameInfo;
         this.desc = typeInfo;
-        this.flags = AccessFlags.ofMethod();
+        this.flags = AccessFlags.ofMethod(flags);
         this.original = original;
     }
 
     @Override
     public MethodBuilder with(MethodElement element) {
         elements.add(element);
-        if (element instanceof AccessFlags f) this.flags = f;
+        if (element instanceof AccessFlags f) this.flags = checkFlags(f);
         return this;
     }
 
+    private AccessFlags checkFlags(AccessFlags updated) {
+        boolean wasStatic = updated.has(AccessFlag.STATIC);
+        boolean isStatic = flags.has(AccessFlag.STATIC);
+        if (wasStatic != isStatic)
+            throw new IllegalArgumentException("Cannot change ACC_STATIC flag of method");
+        return updated;
+    }
+
     @Override
     public ConstantPoolBuilder constantPool() {
         return constantPool;
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedClassBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedClassBuilder.java
index b33d192f9b355..045652782171f 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedClassBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedClassBuilder.java
@@ -79,7 +79,7 @@ public ClassBuilder transformField(FieldModel field, FieldTransform transform) {
     public ClassBuilder withMethod(Utf8Entry name, Utf8Entry descriptor, int flags,
                                    Consumer<? super MethodBuilder> handler) {
         consumer.accept(new BufferedMethodBuilder(terminal.constantPool, terminal.context,
-                                                         name, descriptor, null)
+                                                         name, descriptor, flags, null)
                                        .run(handler)
                                        .toModel());
         return this;
@@ -88,7 +88,7 @@ public ClassBuilder withMethod(Utf8Entry name, Utf8Entry descriptor, int flags,
     @Override
     public ClassBuilder transformMethod(MethodModel method, MethodTransform transform) {
         BufferedMethodBuilder builder = new BufferedMethodBuilder(terminal.constantPool, terminal.context,
-                                                                  method.methodName(), method.methodType(), method);
+                                                                  method.methodName(), method.methodType(), method.flags().flagsMask(), method);
         builder.transform(method, transform);
         consumer.accept(builder.toModel());
         return this;
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/DirectMethodBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/DirectMethodBuilder.java
index 50daf24305666..a4b3bbe1b84b8 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/DirectMethodBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/DirectMethodBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@
 
 public final class DirectMethodBuilder
         extends AbstractDirectBuilder<MethodModel>
-        implements TerminalMethodBuilder, WritableElement<MethodModel>, MethodInfo {
+        implements TerminalMethodBuilder, WritableElement<MethodModel> {
 
     final Utf8Entry name;
     final Utf8Entry desc;
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/MethodInfo.java b/src/java.base/share/classes/jdk/internal/classfile/impl/MethodInfo.java
index 0dd81776f6708..ce51144770676 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/MethodInfo.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/MethodInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,8 @@
 
 import static java.lang.classfile.ClassFile.ACC_STATIC;
 
-public interface MethodInfo {
+public sealed interface MethodInfo
+        permits MethodImpl, TerminalMethodBuilder, BufferedMethodBuilder.Model {
     Utf8Entry methodName();
     Utf8Entry methodType();
     MethodTypeDesc methodTypeSymbol();
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/TerminalMethodBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/TerminalMethodBuilder.java
index 636b12a9acfdb..e1c66bec503b5 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/TerminalMethodBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/TerminalMethodBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
 import java.lang.classfile.MethodBuilder;
 
 public sealed interface TerminalMethodBuilder
-        extends MethodBuilder
+        extends MethodBuilder, MethodInfo
         permits BufferedMethodBuilder, DirectMethodBuilder {
     BufferedCodeBuilder bufferedCodeBuilder(CodeModel original);
 }
diff --git a/test/jdk/jdk/classfile/MethodBuilderStaticFlagTest.java b/test/jdk/jdk/classfile/MethodBuilderStaticFlagTest.java
new file mode 100644
index 0000000000000..d5a24a144ea12
--- /dev/null
+++ b/test/jdk/jdk/classfile/MethodBuilderStaticFlagTest.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 jdk.internal.classfile.impl.ChainedClassBuilder;
+import org.junit.jupiter.api.Test;
+
+import java.lang.classfile.ClassBuilder;
+import java.lang.classfile.ClassElement;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassTransform;
+import java.lang.constant.ClassDesc;
+
+import static java.lang.classfile.ClassFile.ACC_PUBLIC;
+import static java.lang.classfile.ClassFile.ACC_STATIC;
+import static java.lang.constant.ConstantDescs.MTD_void;
+import static org.junit.jupiter.api.Assertions.*;
+
+/*
+ * @test
+ * @bug 8336777
+ * @summary Testing MethodBuilder correctly rejecting resetting the static
+ *          access flag.
+ * @run junit MethodBuilderStaticFlagTest
+ */
+class MethodBuilderStaticFlagTest {
+
+    void testClassBuilder(ClassBuilder clb) {
+        clb.withMethod("staticToStatic", MTD_void, ACC_STATIC, mb -> mb.withFlags(ACC_PUBLIC | ACC_STATIC));
+        assertThrows(IllegalArgumentException.class, () ->
+                clb.withMethod("staticToInstance", MTD_void, ACC_STATIC, mb -> mb.withFlags(ACC_PUBLIC)));
+        assertThrows(IllegalArgumentException.class, () ->
+                clb.withMethod("instanceToStatic", MTD_void, 0, mb -> mb.withFlags(ACC_PUBLIC | ACC_STATIC)));
+        clb.withMethod("instanceToInstance", MTD_void, 0, mb -> mb.withFlags(ACC_PUBLIC));
+    }
+
+    @Test
+    void testDirectBuilder() {
+        ClassFile.of().build(ClassDesc.of("C1"), this::testClassBuilder);
+    }
+
+    @Test
+    void testBufferedBuilder() {
+        var cf = ClassFile.of();
+        var bytes = cf.build(ClassDesc.of("C2"), _ -> {});
+        var cm = cf.parse(bytes);
+
+        cf.transformClass(cm, new ClassTransform() {
+            @Override
+            public void accept(ClassBuilder builder, ClassElement element) {
+                builder.with(element);
+            }
+
+            @Override
+            public void atEnd(ClassBuilder clb) {
+                assertInstanceOf(ChainedClassBuilder.class, clb);
+                testClassBuilder(clb);
+            }
+        }.andThen(ClassBuilder::with));
+    }
+}

From 939fe000a96bc7c92c7b8814eb6ee66856718e4e Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@openjdk.org>
Date: Fri, 19 Jul 2024 21:52:45 +0000
Subject: [PATCH 151/401] 8336786: VerifyError with lambda capture and
 enclosing instance references

Reviewed-by: mcimadamore
---
 .../sun/tools/javac/comp/LambdaToMethod.java  |  3 +-
 .../com/sun/tools/javac/comp/Lower.java       |  3 +-
 .../SuperClassThisCapture.java                | 51 +++++++++++++++++++
 .../lambda/SuperClassThisCapture/a/A.java     | 28 ++++++++++
 4 files changed, 82 insertions(+), 3 deletions(-)
 create mode 100644 test/langtools/tools/javac/lambda/SuperClassThisCapture/SuperClassThisCapture.java
 create mode 100644 test/langtools/tools/javac/lambda/SuperClassThisCapture/a/A.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
index 66d499f54fede..7f1ad8211cb84 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
@@ -1291,12 +1291,13 @@ private boolean inClassWithinLambda() {
          * in nested scopes (which do not need to undergo capture).
          */
         private JCTree capturedDecl(int depth, Symbol sym) {
+            Assert.check(sym.kind != TYP);
             int currentDepth = frameStack.size() - 1;
             for (Frame block : frameStack) {
                 switch (block.tree.getTag()) {
                     case CLASSDEF:
                         ClassSymbol clazz = ((JCClassDecl)block.tree).sym;
-                        if (clazz.isSubClass(sym, types) || sym.isMemberOf(clazz, types)) {
+                        if (clazz.isSubClass(sym.enclClass(), types)) {
                             return currentDepth > depth ? null : block.tree;
                         }
                         break;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
index 1ac62183bbe03..7c7db6de0863b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
@@ -1828,11 +1828,10 @@ JCExpression makeOuterThis(DiagnosticPosition pos, TypeSymbol c) {
      *                       due to protection?
      */
     JCExpression makeOwnerThis(DiagnosticPosition pos, Symbol sym, boolean preciseMatch) {
-        Symbol c = sym.owner;
         if (preciseMatch ? sym.isMemberOf(currentClass, types)
                          : currentClass.isSubClass(sym.owner, types)) {
             // in this case, `this' works fine
-            return make.at(pos).This(c.erasure(types));
+            return make.at(pos).This(currentClass.erasure(types));
         } else {
             // need to go via this$n
             return makeOwnerThisN(pos, sym, preciseMatch);
diff --git a/test/langtools/tools/javac/lambda/SuperClassThisCapture/SuperClassThisCapture.java b/test/langtools/tools/javac/lambda/SuperClassThisCapture/SuperClassThisCapture.java
new file mode 100644
index 0000000000000..1b553c42cdc21
--- /dev/null
+++ b/test/langtools/tools/javac/lambda/SuperClassThisCapture/SuperClassThisCapture.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2024, Alphabet LLC. 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 8336786
+ * @summary VerifyError with lambda capture and enclosing instance references
+ * @compile a/A.java SuperClassThisCapture.java
+ * @run main SuperClassThisCapture
+ */
+
+public class SuperClassThisCapture extends a.A {
+
+  public static void main(String[] args) {
+    new SuperClassThisCapture().f(42);
+    new SuperClassThisCapture().g();
+  }
+
+  public void f(int x) {
+    Runnable r = () -> {
+      System.err.println(x);
+      new I();
+    };
+    r.run();
+  }
+
+  public void g() {
+    Runnable r = () -> new I();
+    r.run();
+  }
+}
diff --git a/test/langtools/tools/javac/lambda/SuperClassThisCapture/a/A.java b/test/langtools/tools/javac/lambda/SuperClassThisCapture/a/A.java
new file mode 100644
index 0000000000000..71855b894309a
--- /dev/null
+++ b/test/langtools/tools/javac/lambda/SuperClassThisCapture/a/A.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2024, Alphabet LLC. 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.
+ */
+
+package a;
+
+public class A {
+  public class I {}
+}

From e7e48a780a34007994f830869fdb74ba1cb5b3fe Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Fri, 19 Jul 2024 21:53:04 +0000
Subject: [PATCH 152/401] 8248609: [Graal]
 vmTestbase/nsk/jdi/VoidValue/toString/tostring001/TestDescription.java failed
 with Unexpected com.sun.jdi.ObjectCollectedException

Reviewed-by: amenkov, lmesnik
---
 .../vmTestbase/nsk/jdi/VoidValue/toString/tostring001.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/toString/tostring001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/toString/tostring001.java
index f1d1baf06be72..b2cdb6acef4db 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/toString/tostring001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VoidValue/toString/tostring001.java
@@ -140,6 +140,10 @@ private static void execTest() {
 
         try {
             testedObject = testedClass.newInstance(thread, ctor, params, 0);
+            // Disable collection on testedObject. invokeMethod() will essentially do a
+            // vm.resume(), which gives GC a chance to run, which might result in this
+            // object being collected.
+            testedObject.disableCollection();
         } catch (Exception e) {
             throw new Failure("unexpected " + e + " when invoking debuggee's constructor");
         }
@@ -178,6 +182,7 @@ private static void execTest() {
         }
 
         display("Checking of debuggee's void value methods completed!");
+        testedObject.enableCollection();
         debuggee.resume();
     }
 

From e3acf4c627c3c75f9a2ef29647daa6f4746fdc62 Mon Sep 17 00:00:00 2001
From: Shaojin Wen <shaojin.wensj@alibaba-inc.com>
Date: Fri, 19 Jul 2024 22:06:23 +0000
Subject: [PATCH 153/401] 8336792: DateTimeFormatterBuilder append zeros based
 on StringBuilder.repeat

Reviewed-by: liach, rriggs, naoto
---
 .../time/format/DateTimeFormatterBuilder.java  | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java b/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java
index ed380841faab4..46a80deee00ec 100644
--- a/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java
+++ b/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java
@@ -2965,8 +2965,9 @@ public boolean format(DateTimePrintContext context, StringBuilder buf) {
                 }
             }
             char zeroDigit = decimalStyle.getZeroDigit();
-            for (int i = 0; i < minWidth - size; i++) {
-                buf.append(zeroDigit);
+            int zeros = minWidth - size;
+            if (zeros > 0) {
+                buf.repeat(zeroDigit, zeros);
             }
             if (zeroDigit == '0' && value != Long.MIN_VALUE) {
                 buf.append(Math.abs(value));
@@ -3410,17 +3411,16 @@ public boolean format(DateTimePrintContext context, StringBuilder buf) {
                     if (decimalPoint) {
                         buf.append(decimalStyle.getDecimalSeparator());
                     }
-                    for (int i = 0; i < width; i++) {
-                        buf.append(zero);
-                    }
+                    buf.repeat(zero, width);
                 }
             } else {
                 if (decimalPoint) {
                     buf.append(decimalStyle.getDecimalSeparator());
                 }
                 // add leading zeros
-                for (int i = 9 - stringSize; i > 0; i--) {
-                    buf.append(zero);
+                int zeros = 9 - stringSize;
+                if (zeros > 0) {
+                    buf.repeat(zero, zeros);
                 }
                 // truncate unwanted digits
                 if (maxWidth < 9) {
@@ -3594,9 +3594,7 @@ public boolean format(DateTimePrintContext context, StringBuilder buf) {
                     if (decimalPoint) {
                         buf.append(decimalStyle.getDecimalSeparator());
                     }
-                    for (int i = 0; i < minWidth; i++) {
-                        buf.append(decimalStyle.getZeroDigit());
-                    }
+                    buf.repeat(decimalStyle.getZeroDigit(), minWidth);
                 }
             } else {
                 int outputScale = Math.clamp(fraction.scale(), minWidth, maxWidth);

From 491b9f5efc01fa36fb3c174e130b46bc69c8d707 Mon Sep 17 00:00:00 2001
From: Shaojin Wen <shaojin.wensj@alibaba-inc.com>
Date: Sat, 20 Jul 2024 06:54:19 +0000
Subject: [PATCH 154/401] 8336706: Optimize LocalDate.toString with
 StringBuilder.repeat

Reviewed-by: liach, rriggs
---
 src/java.base/share/classes/java/time/LocalDate.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/java.base/share/classes/java/time/LocalDate.java b/src/java.base/share/classes/java/time/LocalDate.java
index 2649c098a5b43..b0d7ad33c8a3e 100644
--- a/src/java.base/share/classes/java/time/LocalDate.java
+++ b/src/java.base/share/classes/java/time/LocalDate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2154,10 +2154,10 @@ public String toString() {
         StringBuilder buf = new StringBuilder(10);
         if (absYear < 1000) {
             if (yearValue < 0) {
-                buf.append(yearValue - 10000).deleteCharAt(1);
-            } else {
-                buf.append(yearValue + 10000).deleteCharAt(0);
+                buf.append('-');
             }
+            buf.repeat('0', absYear < 10 ? 3 : absYear < 100 ? 2 : 1);
+            buf.append(absYear);
         } else {
             if (yearValue > 9999) {
                 buf.append('+');

From c5b7af73d07f7458e970f5752eb75640562ddc7b Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <kvn@openjdk.org>
Date: Sat, 20 Jul 2024 15:41:29 +0000
Subject: [PATCH 155/401] 8336692: Redo fix for JDK-8284620

Reviewed-by: dlong
---
 src/hotspot/share/asm/codeBuffer.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/asm/codeBuffer.cpp b/src/hotspot/share/asm/codeBuffer.cpp
index ea47e435c0bb0..b25e07bc36d67 100644
--- a/src/hotspot/share/asm/codeBuffer.cpp
+++ b/src/hotspot/share/asm/codeBuffer.cpp
@@ -135,10 +135,11 @@ CodeBuffer::~CodeBuffer() {
     // Previous incarnations of this buffer are held live, so that internal
     // addresses constructed before expansions will not be confused.
     cb->free_blob();
+  }
+  if (_overflow_arena != nullptr) {
     // free any overflow storage
-    delete cb->_overflow_arena;
+    delete _overflow_arena;
   }
-
   if (_shared_trampoline_requests != nullptr) {
     delete _shared_trampoline_requests;
   }
@@ -973,8 +974,6 @@ void CodeBuffer::take_over_code_from(CodeBuffer* cb) {
     CodeSection* this_sect = code_section(n);
     this_sect->take_over_code_from(cb_sect);
   }
-  _overflow_arena = cb->_overflow_arena;
-  cb->_overflow_arena = nullptr;
   // Make sure the old cb won't try to use it or free it.
   DEBUG_ONLY(cb->_blob = (BufferBlob*)badAddress);
 }

From b21cb44e38ee8ea75e3a1c51e3a28388056a492d Mon Sep 17 00:00:00 2001
From: Aleksei Efimov <aefimov@openjdk.org>
Date: Sat, 20 Jul 2024 16:48:30 +0000
Subject: [PATCH 156/401] 8329398: Links in InetAddress class description show
 "#format"

Reviewed-by: jpai
---
 src/java.base/share/classes/java/net/InetAddress.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/java.base/share/classes/java/net/InetAddress.java b/src/java.base/share/classes/java/net/InetAddress.java
index 7e0c39f9111ee..5ed8c73c919dd 100644
--- a/src/java.base/share/classes/java/net/InetAddress.java
+++ b/src/java.base/share/classes/java/net/InetAddress.java
@@ -142,12 +142,12 @@
  *
  * <p>
  *
- * For IPv4 address format, please refer to <A
- * HREF="Inet4Address.html#format">Inet4Address#format</A>; For IPv6
- * address format, please refer to <A
- * HREF="Inet6Address.html#format">Inet6Address#format</A>.
+ * For IPv4 address format, please refer to the supported
+ * {@linkplain Inet4Address##format IPv4 address textual representations};
+ * For IPv6 address format, please refer to the supported
+ * {@linkplain Inet6Address##format IPv6 address textual representations}.
  *
- * <p> There is a <a href="doc-files/net-properties.html#Ipv4IPv6">couple of
+ * <p> There are a <a href="doc-files/net-properties.html#Ipv4IPv6">couple of
  * System Properties</a> affecting how IPv4 and IPv6 addresses are used.
  *
  * <h2 id="host-name-resolution"> Host Name Resolution </h2>

From ad498f57fcead174306c6e6e3b2d1f9916821b84 Mon Sep 17 00:00:00 2001
From: Christian Stein <cstein@openjdk.org>
Date: Sun, 21 Jul 2024 08:49:16 +0000
Subject: [PATCH 157/401] 8335896: Source launcher should set TCCL

Reviewed-by: alanb
---
 .../tools/javac/launcher/MemoryContext.java   |  3 +--
 .../tools/javac/launcher/SourceLauncher.java  |  3 ++-
 .../javac/launcher/SourceLauncherTest.java    | 23 ++++++++++++++++++-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/MemoryContext.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/MemoryContext.java
index f804174c711fd..941f5c4c40ec4 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/MemoryContext.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/MemoryContext.java
@@ -184,10 +184,9 @@ byte[] compileJavaFileByName(String name) {
      * @param parent the class loader to be used as the parent loader
      * @param mainClassName the fully-qualified name of the application class to load
      * @return class loader object able to find and load the desired class
-     * @throws ClassNotFoundException if the class cannot be located
      * @throws Fault if a modular application class is in the unnamed package
      */
-    ClassLoader newClassLoaderFor(ClassLoader parent, String mainClassName) throws ClassNotFoundException, Fault {
+    ClassLoader newClassLoaderFor(ClassLoader parent, String mainClassName) throws Fault {
         var moduleInfoBytes = inMemoryClasses.get("module-info");
         if (moduleInfoBytes == null) {
             // Trivial case: no compiled module descriptor available, no extra module layer required
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java
index 4ae6b841542a3..8a8226b3dba1b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java
@@ -198,8 +198,9 @@ private Class<?> execute(MemoryContext context, String[] mainArgs)
         // 1. Find a main method in the first class and if there is one - invoke it
         Class<?> firstClass;
         String firstClassName = program.qualifiedTypeNames().getFirst();
+        ClassLoader loader = context.newClassLoaderFor(parentLoader, firstClassName);
+        Thread.currentThread().setContextClassLoader(loader);
         try {
-            ClassLoader loader = context.newClassLoaderFor(parentLoader, firstClassName);
             firstClass = Class.forName(firstClassName, false, loader);
         } catch (ClassNotFoundException e) {
             throw new Fault(Errors.CantFindClass(firstClassName));
diff --git a/test/langtools/tools/javac/launcher/SourceLauncherTest.java b/test/langtools/tools/javac/launcher/SourceLauncherTest.java
index 5e70e84482d32..e3ed1c3e8af51 100644
--- a/test/langtools/tools/javac/launcher/SourceLauncherTest.java
+++ b/test/langtools/tools/javac/launcher/SourceLauncherTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8192920 8204588 8246774 8248843 8268869 8235876 8328339
+ * @bug 8192920 8204588 8246774 8248843 8268869 8235876 8328339 8335896
  * @summary Test source launcher
  * @library /tools/lib
  * @enablePreview
@@ -276,6 +276,27 @@ public void testSystemProperty(Path base) throws IOException {
         checkEqual("stdout", log.trim(), file.toAbsolutePath().toString());
     }
 
+    @Test
+    public void testThreadContextClassLoader(Path base) throws IOException {
+        tb.writeJavaFiles(base, //language=java
+                """
+                class ThreadContextClassLoader {
+                    public static void main(String... args) {
+                        var expected = ThreadContextClassLoader.class.getClassLoader();
+                        var actual = Thread.currentThread().getContextClassLoader();
+                        System.out.println(expected == actual);
+                    }
+                }
+                """);
+
+        Path file = base.resolve("ThreadContextClassLoader.java");
+        String log = new JavaTask(tb)
+                .className(file.toString())
+                .run(Task.Expect.SUCCESS)
+                .getOutput(Task.OutputKind.STDOUT);
+        checkEqual("stdout", log.trim(), "true");
+    }
+
     void testSuccess(Path file, String expect) throws IOException {
         Result r = run(file, Collections.emptyList(), List.of("1", "2", "3"));
         checkEqual("stdout", r.stdOut, expect);

From fd741a88e8bc73a9db6d4283bb54daab1760b442 Mon Sep 17 00:00:00 2001
From: Hai-May Chao <hchao@openjdk.org>
Date: Sun, 21 Jul 2024 17:05:46 +0000
Subject: [PATCH 158/401] 8327538: The SSLExtension class specifies incorrect
 values for heartbeat per RFC 6520 and post_handshake_auth per RFC 8446

Reviewed-by: wetmore
---
 .../share/classes/sun/security/ssl/SSLExtension.java        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/sun/security/ssl/SSLExtension.java b/src/java.base/share/classes/sun/security/ssl/SSLExtension.java
index 2a9239fac95ac..2cb74fb105697 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -181,7 +181,7 @@ enum SSLExtension implements SSLStringizer {
     USE_SRTP                (0x000E, "use_srtp"),
 
     // Extensions defined in RFC 6520 (TLS and DTLS Heartbeat Extension)
-    HEARTBEAT               (0x000E, "heartbeat"),
+    HEARTBEAT               (0x000F, "heartbeat"),
 
     // Extensions defined in RFC 7301 (TLS Application-Layer Protocol Negotiation Extension)
     CH_ALPN                 (0x0010, "application_layer_protocol_negotiation",
@@ -406,7 +406,7 @@ enum SSLExtension implements SSLStringizer {
                                 CertificateAuthoritiesExtension.ssStringizer),
 
     OID_FILTERS             (0x0030, "oid_filters"),
-    POST_HANDSHAKE_AUTH     (0x0030, "post_handshake_auth"),
+    POST_HANDSHAKE_AUTH     (0x0031, "post_handshake_auth"),
 
     CH_SIGNATURE_ALGORITHMS_CERT (0x0032, "signature_algorithms_cert",
                                 SSLHandshake.CLIENT_HELLO,

From 4da99158754c25c5d0650f2d042aad3e94a9b0c5 Mon Sep 17 00:00:00 2001
From: "lingjun.cg" <lingjun.cg@alibaba-inc.com>
Date: Mon, 22 Jul 2024 02:01:08 +0000
Subject: [PATCH 159/401] 8333396: Use StringBuilder internally for
 java.text.Format.* formatting

Reviewed-by: naoto, liach, jlu
---
 .../text/CharacterIteratorFieldDelegate.java  |   6 +-
 .../share/classes/java/text/ChoiceFormat.java |  14 +-
 .../java/text/CompactNumberFormat.java        |  77 +++++--
 .../share/classes/java/text/DateFormat.java   |  28 ++-
 .../classes/java/text/DecimalFormat.java      |  78 +++++--
 .../java/text/DontCareFieldPosition.java      |   6 +-
 .../classes/java/text/FieldPosition.java      |   6 +-
 .../share/classes/java/text/Format.java       |  53 ++++-
 .../share/classes/java/text/ListFormat.java   |  14 +-
 .../classes/java/text/MessageFormat.java      |  19 +-
 .../share/classes/java/text/NumberFormat.java |  47 +++-
 .../classes/java/text/SimpleDateFormat.java   |  46 +++-
 .../classes/java/text/StringBufFactory.java   | 216 ++++++++++++++++++
 .../bench/java/text/DateFormatterBench.java   |  79 +++++++
 .../bench/java/text/ListFormatterBench.java   |  69 ++++++
 .../java/text/MessageFormatterBench.java      |  79 +++++++
 16 files changed, 764 insertions(+), 73 deletions(-)
 create mode 100644 src/java.base/share/classes/java/text/StringBufFactory.java
 create mode 100644 test/micro/org/openjdk/bench/java/text/DateFormatterBench.java
 create mode 100644 test/micro/org/openjdk/bench/java/text/ListFormatterBench.java
 create mode 100644 test/micro/org/openjdk/bench/java/text/MessageFormatterBench.java

diff --git a/src/java.base/share/classes/java/text/CharacterIteratorFieldDelegate.java b/src/java.base/share/classes/java/text/CharacterIteratorFieldDelegate.java
index 4d0788491acff..33b811e9ecdd5 100644
--- a/src/java.base/share/classes/java/text/CharacterIteratorFieldDelegate.java
+++ b/src/java.base/share/classes/java/text/CharacterIteratorFieldDelegate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,7 @@ class CharacterIteratorFieldDelegate implements Format.FieldDelegate {
     }
 
     public void formatted(Format.Field attr, Object value, int start, int end,
-                          StringBuffer buffer) {
+                          Format.StringBuf buffer) {
         if (start != end) {
             if (start < size) {
                 // Adjust attributes of existing runs
@@ -93,7 +93,7 @@ public void formatted(Format.Field attr, Object value, int start, int end,
     }
 
     public void formatted(int fieldID, Format.Field attr, Object value,
-                          int start, int end, StringBuffer buffer) {
+                          int start, int end, Format.StringBuf buffer) {
         formatted(attr, value, start, end, buffer);
     }
 
diff --git a/src/java.base/share/classes/java/text/ChoiceFormat.java b/src/java.base/share/classes/java/text/ChoiceFormat.java
index ccb6cc4a04f47..cf951ebf81fda 100644
--- a/src/java.base/share/classes/java/text/ChoiceFormat.java
+++ b/src/java.base/share/classes/java/text/ChoiceFormat.java
@@ -514,7 +514,13 @@ public Object[] getFormats() {
     @Override
     public StringBuffer format(long number, StringBuffer toAppendTo,
                                FieldPosition status) {
-        return format((double)number, toAppendTo, status);
+        return format((double) number, StringBufFactory.of(toAppendTo), status).asStringBuffer();
+    }
+
+    @Override
+    StringBuf format(long number, StringBuf toAppendTo,
+                     FieldPosition status) {
+        return format((double) number, toAppendTo, status);
     }
 
     /**
@@ -531,6 +537,12 @@ public StringBuffer format(long number, StringBuffer toAppendTo,
     @Override
     public StringBuffer format(double number, StringBuffer toAppendTo,
                                FieldPosition status) {
+        return format(number, StringBufFactory.of(toAppendTo), status).asStringBuffer();
+    }
+
+    @Override
+    StringBuf format(double number, StringBuf toAppendTo,
+                         FieldPosition status) {
         // find the number
         int i;
         for (i = 0; i < choiceLimits.length; ++i) {
diff --git a/src/java.base/share/classes/java/text/CompactNumberFormat.java b/src/java.base/share/classes/java/text/CompactNumberFormat.java
index 25fd9923b064a..e3fc7632535dd 100644
--- a/src/java.base/share/classes/java/text/CompactNumberFormat.java
+++ b/src/java.base/share/classes/java/text/CompactNumberFormat.java
@@ -552,6 +552,35 @@ public final StringBuffer format(Object number,
                 && ((BigInteger) number).bitLength() < 64)) {
             return format(((Number) number).longValue(), toAppendTo,
                     fieldPosition);
+        } else if (number instanceof BigDecimal) {
+            return format((BigDecimal) number, StringBufFactory.of(toAppendTo), fieldPosition).asStringBuffer();
+        } else if (number instanceof BigInteger) {
+            return format((BigInteger) number, StringBufFactory.of(toAppendTo), fieldPosition).asStringBuffer();
+        } else if (number instanceof Number) {
+            return format(((Number) number).doubleValue(), toAppendTo, fieldPosition);
+        } else {
+            throw new IllegalArgumentException("Cannot format "
+                    + number.getClass().getName() + " as a number");
+        }
+    }
+
+    @Override
+    StringBuf format(Object number,
+                     StringBuf toAppendTo,
+                     FieldPosition fieldPosition) {
+
+        if (number == null) {
+            throw new IllegalArgumentException("Cannot format null as a number");
+        }
+
+        if (number instanceof Long || number instanceof Integer
+                    || number instanceof Short || number instanceof Byte
+                    || number instanceof AtomicInteger
+                    || number instanceof AtomicLong
+                    || (number instanceof BigInteger
+                                && ((BigInteger) number).bitLength() < 64)) {
+            return format(((Number) number).longValue(), toAppendTo,
+                    fieldPosition);
         } else if (number instanceof BigDecimal) {
             return format((BigDecimal) number, toAppendTo, fieldPosition);
         } else if (number instanceof BigInteger) {
@@ -560,7 +589,7 @@ public final StringBuffer format(Object number,
             return format(((Number) number).doubleValue(), toAppendTo, fieldPosition);
         } else {
             throw new IllegalArgumentException("Cannot format "
-                    + number.getClass().getName() + " as a number");
+                                                       + number.getClass().getName() + " as a number");
         }
     }
 
@@ -591,12 +620,21 @@ public final StringBuffer format(Object number,
     public StringBuffer format(double number, StringBuffer result,
             FieldPosition fieldPosition) {
 
+        fieldPosition.setBeginIndex(0);
+        fieldPosition.setEndIndex(0);
+        return format(number, StringBufFactory.of(result), fieldPosition.getFieldDelegate()).asStringBuffer();
+    }
+
+    @Override
+    StringBuf format(double number, StringBuf result,
+                     FieldPosition fieldPosition) {
+
         fieldPosition.setBeginIndex(0);
         fieldPosition.setEndIndex(0);
         return format(number, result, fieldPosition.getFieldDelegate());
     }
 
-    private StringBuffer format(double number, StringBuffer result,
+    private StringBuf format(double number, StringBuf result,
             FieldDelegate delegate) {
 
         boolean nanOrInfinity = decimalFormat.handleNaN(number, result, delegate);
@@ -681,12 +719,21 @@ false, getMaximumIntegerDigits(), getMinimumIntegerDigits(),
     public StringBuffer format(long number, StringBuffer result,
             FieldPosition fieldPosition) {
 
+        fieldPosition.setBeginIndex(0);
+        fieldPosition.setEndIndex(0);
+        return format(number, StringBufFactory.of(result), fieldPosition.getFieldDelegate()).asStringBuffer();
+    }
+
+    @Override
+    StringBuf format(long number, StringBuf result,
+                     FieldPosition fieldPosition) {
+
         fieldPosition.setBeginIndex(0);
         fieldPosition.setEndIndex(0);
         return format(number, result, fieldPosition.getFieldDelegate());
     }
 
-    private StringBuffer format(long number, StringBuffer result, FieldDelegate delegate) {
+    private StringBuf format(long number, StringBuf result, FieldDelegate delegate) {
         boolean isNegative = (number < 0);
         if (isNegative) {
             number = -number;
@@ -757,15 +804,15 @@ isNegative, false, getMaximumIntegerDigits(),
      *                         of the prefix and the suffix fields can be
      *                         obtained using {@link NumberFormat.Field#PREFIX}
      *                         and {@link NumberFormat.Field#SUFFIX} respectively.
-     * @return        the {@code StringBuffer} passed in as {@code result}
+     * @return        the {@code StringBuf} passed in as {@code result}
      * @throws        ArithmeticException if rounding is needed with rounding
      *                mode being set to {@code RoundingMode.UNNECESSARY}
      * @throws        NullPointerException if any of the given parameter
      *                is {@code null}
      * @see FieldPosition
      */
-    private StringBuffer format(BigDecimal number, StringBuffer result,
-            FieldPosition fieldPosition) {
+    private StringBuf format(BigDecimal number, StringBuf result,
+                             FieldPosition fieldPosition) {
 
         Objects.requireNonNull(number);
         fieldPosition.setBeginIndex(0);
@@ -773,7 +820,7 @@ private StringBuffer format(BigDecimal number, StringBuffer result,
         return format(number, result, fieldPosition.getFieldDelegate());
     }
 
-    private StringBuffer format(BigDecimal number, StringBuffer result,
+    private StringBuf format(BigDecimal number, StringBuf result,
             FieldDelegate delegate) {
 
         boolean isNegative = number.signum() == -1;
@@ -843,15 +890,15 @@ false, getMaximumIntegerDigits(), getMinimumIntegerDigits(),
      *                         prefix and the suffix fields can be obtained
      *                         using {@link NumberFormat.Field#PREFIX} and
      *                         {@link NumberFormat.Field#SUFFIX} respectively.
-     * @return        the {@code StringBuffer} passed in as {@code result}
+     * @return        the {@code StringBuf} passed in as {@code result}
      * @throws        ArithmeticException if rounding is needed with rounding
      *                mode being set to {@code RoundingMode.UNNECESSARY}
      * @throws        NullPointerException if any of the given parameter
      *                is {@code null}
      * @see FieldPosition
      */
-    private StringBuffer format(BigInteger number, StringBuffer result,
-            FieldPosition fieldPosition) {
+    private StringBuf format(BigInteger number, StringBuf result,
+                             FieldPosition fieldPosition) {
 
         Objects.requireNonNull(number);
         fieldPosition.setBeginIndex(0);
@@ -859,7 +906,7 @@ private StringBuffer format(BigInteger number, StringBuffer result,
         return format(number, result, fieldPosition.getFieldDelegate(), false);
     }
 
-    private StringBuffer format(BigInteger number, StringBuffer result,
+    private StringBuf format(BigInteger number, StringBuf result,
             FieldDelegate delegate, boolean formatLong) {
 
         boolean isNegative = number.signum() == -1;
@@ -936,7 +983,7 @@ private String getAffix(boolean isExpanded, boolean isPrefix, boolean isNegative
      *                 {@code NumberFormat.Field.SIGN} and
      *                 {@code NumberFormat.Field.PREFIX} fields
      */
-    private void appendPrefix(StringBuffer result, String prefix,
+    private void appendPrefix(StringBuf result, String prefix,
             FieldDelegate delegate) {
         append(result, expandAffix(prefix), delegate,
                 getFieldPositions(prefix, NumberFormat.Field.PREFIX));
@@ -952,7 +999,7 @@ private void appendPrefix(StringBuffer result, String prefix,
      *                 {@code NumberFormat.Field.SIGN} and
      *                 {@code NumberFormat.Field.SUFFIX} fields
      */
-    private void appendSuffix(StringBuffer result, String suffix,
+    private void appendSuffix(StringBuf result, String suffix,
             FieldDelegate delegate) {
         append(result, expandAffix(suffix), delegate,
                 getFieldPositions(suffix, NumberFormat.Field.SUFFIX));
@@ -968,7 +1015,7 @@ private void appendSuffix(StringBuffer result, String suffix,
      * @param positions a list of {@code FieldPosition} in the given
      *                  string
      */
-    private void append(StringBuffer result, String string,
+    private void append(StringBuf result, String string,
             FieldDelegate delegate, List<FieldPosition> positions) {
         if (!string.isEmpty()) {
             int start = result.length();
@@ -1134,7 +1181,7 @@ private int selectCompactPattern(BigInteger number) {
     public AttributedCharacterIterator formatToCharacterIterator(Object obj) {
         CharacterIteratorFieldDelegate delegate
                 = new CharacterIteratorFieldDelegate();
-        StringBuffer sb = new StringBuffer();
+        StringBuf sb = StringBufFactory.of();
 
         if (obj instanceof Double || obj instanceof Float) {
             format(((Number) obj).doubleValue(), sb, delegate);
diff --git a/src/java.base/share/classes/java/text/DateFormat.java b/src/java.base/share/classes/java/text/DateFormat.java
index a67ba6768366d..e29b3f0509f80 100644
--- a/src/java.base/share/classes/java/text/DateFormat.java
+++ b/src/java.base/share/classes/java/text/DateFormat.java
@@ -346,6 +346,19 @@ else if (obj instanceof Number)
             throw new IllegalArgumentException("Cannot format given Object as a Date");
     }
 
+    @Override
+    final StringBuf format(Object obj, StringBuf toAppendTo,
+                           FieldPosition fieldPosition) {
+        if (obj instanceof Date) {
+            return format((Date) obj, toAppendTo, fieldPosition);
+        } else if (obj instanceof Number) {
+            return format(new Date(((Number) obj).longValue()),
+                    toAppendTo, fieldPosition);
+        } else {
+            throw new IllegalArgumentException("Cannot format given Object as a Date");
+        }
+    }
+
     /**
      * Formats a {@link Date} into a date-time string. The formatted
      * string is appended to the given {@code StringBuffer}.
@@ -371,6 +384,11 @@ else if (obj instanceof Number)
     public abstract StringBuffer format(Date date, StringBuffer toAppendTo,
                                         FieldPosition fieldPosition);
 
+    StringBuf format(Date date, StringBuf toAppendTo,
+                     FieldPosition fieldPosition) {
+        throw new UnsupportedOperationException("Subclasses should override this method");
+    }
+
     /**
      * Formats a {@link Date} into a date-time string.
      *
@@ -379,8 +397,14 @@ public abstract StringBuffer format(Date date, StringBuffer toAppendTo,
      */
     public final String format(Date date)
     {
-        return format(date, new StringBuffer(),
-                      DontCareFieldPosition.INSTANCE).toString();
+        if ("java.text".equals(getClass().getPackageName())
+                    && "java.text".equals(numberFormat.getClass().getPackageName())) {
+            return format(date, StringBufFactory.of(),
+                    DontCareFieldPosition.INSTANCE).toString();
+        } else {
+            return format(date, new StringBuffer(),
+                    DontCareFieldPosition.INSTANCE).toString();
+        }
     }
 
     /**
diff --git a/src/java.base/share/classes/java/text/DecimalFormat.java b/src/java.base/share/classes/java/text/DecimalFormat.java
index 04acca1ceb51d..cc8e9e8662cf8 100644
--- a/src/java.base/share/classes/java/text/DecimalFormat.java
+++ b/src/java.base/share/classes/java/text/DecimalFormat.java
@@ -556,9 +556,9 @@ public final StringBuffer format(Object number,
                     ((BigInteger)number).bitLength () < 64)) {
             return format(((Number)number).longValue(), toAppendTo, pos);
         } else if (number instanceof BigDecimal) {
-            return format((BigDecimal)number, toAppendTo, pos);
+            return format((BigDecimal)number, StringBufFactory.of(toAppendTo), pos).asStringBuffer();
         } else if (number instanceof BigInteger) {
-            return format((BigInteger)number, toAppendTo, pos);
+            return format((BigInteger)number, StringBufFactory.of(toAppendTo), pos).asStringBuffer();
         } else if (number instanceof Number) {
             return format(((Number)number).doubleValue(), toAppendTo, pos);
         } else {
@@ -566,6 +566,28 @@ public final StringBuffer format(Object number,
         }
     }
 
+    @Override
+    final StringBuf format(Object number,
+                           StringBuf toAppendTo,
+                           FieldPosition pos) {
+        if (number instanceof Long || number instanceof Integer ||
+                    number instanceof Short || number instanceof Byte ||
+                    number instanceof AtomicInteger ||
+                    number instanceof AtomicLong ||
+                    (number instanceof BigInteger &&
+                             ((BigInteger) number).bitLength() < 64)) {
+            return format(((Number) number).longValue(), toAppendTo, pos);
+        } else if (number instanceof BigDecimal) {
+            return format((BigDecimal) number, toAppendTo, pos);
+        } else if (number instanceof BigInteger) {
+            return format((BigInteger) number, toAppendTo, pos);
+        } else if (number instanceof Number) {
+            return format(((Number) number).doubleValue(), toAppendTo, pos);
+        } else {
+            throw new IllegalArgumentException("Cannot format given Object as a Number");
+        }
+    }
+
     /**
      * Formats a double to produce a string.
      * @param number    The double to format
@@ -588,6 +610,12 @@ public final StringBuffer format(Object number,
     @Override
     public StringBuffer format(double number, StringBuffer result,
                                FieldPosition fieldPosition) {
+        return format(number, StringBufFactory.of(result), fieldPosition).asStringBuffer();
+    }
+
+    @Override
+    StringBuf format(double number, StringBuf result,
+                     FieldPosition fieldPosition) {
         // If fieldPosition is a DontCareFieldPosition instance we can
         // try to go to fast-path code.
         boolean tryFastPath = false;
@@ -619,8 +647,8 @@ public StringBuffer format(double number, StringBuffer result,
      *                  mode being set to RoundingMode.UNNECESSARY
      * @return The formatted number string
      */
-    StringBuffer format(double number, StringBuffer result,
-                                FieldDelegate delegate) {
+    StringBuf format(double number, StringBuf result,
+                     FieldDelegate delegate) {
 
         boolean nanOrInfinity = handleNaN(number, result, delegate);
         if (nanOrInfinity) {
@@ -666,7 +694,7 @@ StringBuffer format(double number, StringBuffer result,
      * @param delegate notified of locations of sub fields
      * @return true, if number is a NaN; false otherwise
      */
-    boolean handleNaN(double number, StringBuffer result,
+    boolean handleNaN(double number, StringBuf result,
             FieldDelegate delegate) {
         if (Double.isNaN(number)
                 || (Double.isInfinite(number) && multiplier == 0)) {
@@ -691,7 +719,7 @@ boolean handleNaN(double number, StringBuffer result,
      * @return true, if number is a {@code Double.NEGATIVE_INFINITY} or
      *         {@code Double.POSITIVE_INFINITY}; false otherwise
      */
-    boolean handleInfinity(double number, StringBuffer result,
+    boolean handleInfinity(double number, StringBuf result,
             FieldDelegate delegate, boolean isNegative) {
         if (Double.isInfinite(number)) {
             if (isNegative) {
@@ -720,7 +748,7 @@ boolean handleInfinity(double number, StringBuffer result,
         return false;
     }
 
-    StringBuffer doubleSubformat(double number, StringBuffer result,
+    StringBuf doubleSubformat(double number, StringBuf result,
             FieldDelegate delegate, boolean isNegative) {
         synchronized (digitList) {
             int maxIntDigits = super.getMaximumIntegerDigits();
@@ -761,6 +789,14 @@ public StringBuffer format(long number, StringBuffer result,
         fieldPosition.setBeginIndex(0);
         fieldPosition.setEndIndex(0);
 
+        return format(number, StringBufFactory.of(result), fieldPosition.getFieldDelegate()).asStringBuffer();
+    }
+
+    StringBuf format(long number, StringBuf result,
+                     FieldPosition fieldPosition) {
+        fieldPosition.setBeginIndex(0);
+        fieldPosition.setEndIndex(0);
+
         return format(number, result, fieldPosition.getFieldDelegate());
     }
 
@@ -774,8 +810,8 @@ public StringBuffer format(long number, StringBuffer result,
      *                   mode being set to RoundingMode.UNNECESSARY
      * @see java.text.FieldPosition
      */
-    StringBuffer format(long number, StringBuffer result,
-                               FieldDelegate delegate) {
+    StringBuf format(long number, StringBuf result,
+                     FieldDelegate delegate) {
         boolean isNegative = (number < 0);
         if (isNegative) {
             number = -number;
@@ -849,8 +885,8 @@ StringBuffer format(long number, StringBuffer result,
      *                   mode being set to RoundingMode.UNNECESSARY
      * @see java.text.FieldPosition
      */
-    private StringBuffer format(BigDecimal number, StringBuffer result,
-                                FieldPosition fieldPosition) {
+    private StringBuf format(BigDecimal number, StringBuf result,
+                             FieldPosition fieldPosition) {
         fieldPosition.setBeginIndex(0);
         fieldPosition.setEndIndex(0);
         return format(number, result, fieldPosition.getFieldDelegate());
@@ -865,8 +901,8 @@ private StringBuffer format(BigDecimal number, StringBuffer result,
      *                   mode being set to RoundingMode.UNNECESSARY
      * @return The formatted number string
      */
-    StringBuffer format(BigDecimal number, StringBuffer result,
-                                FieldDelegate delegate) {
+    StringBuf format(BigDecimal number, StringBuf result,
+                     FieldDelegate delegate) {
         if (multiplier != 1) {
             number = number.multiply(getBigDecimalMultiplier());
         }
@@ -908,8 +944,8 @@ StringBuffer format(BigDecimal number, StringBuffer result,
      *                   mode being set to RoundingMode.UNNECESSARY
      * @see java.text.FieldPosition
      */
-    private StringBuffer format(BigInteger number, StringBuffer result,
-                               FieldPosition fieldPosition) {
+    private StringBuf format(BigInteger number, StringBuf result,
+                             FieldPosition fieldPosition) {
         fieldPosition.setBeginIndex(0);
         fieldPosition.setEndIndex(0);
 
@@ -926,8 +962,8 @@ private StringBuffer format(BigInteger number, StringBuffer result,
      *                   mode being set to RoundingMode.UNNECESSARY
      * @see java.text.FieldPosition
      */
-    StringBuffer format(BigInteger number, StringBuffer result,
-                               FieldDelegate delegate, boolean formatLong) {
+    StringBuf format(BigInteger number, StringBuf result,
+                     FieldDelegate delegate, boolean formatLong) {
         if (multiplier != 1) {
             number = number.multiply(getBigIntegerMultiplier());
         }
@@ -986,7 +1022,7 @@ StringBuffer format(BigInteger number, StringBuffer result,
     public AttributedCharacterIterator formatToCharacterIterator(Object obj) {
         CharacterIteratorFieldDelegate delegate =
                          new CharacterIteratorFieldDelegate();
-        StringBuffer sb = new StringBuffer();
+        StringBuf sb = StringBufFactory.of();
 
         if (obj instanceof Double || obj instanceof Float) {
             format(((Number)obj).doubleValue(), sb, delegate);
@@ -1779,7 +1815,7 @@ void setDigitList(Number number, boolean isNegative, int maxDigits) {
      * Complete the formatting of a finite number.  On entry, the digitList must
      * be filled in with the correct digits.
      */
-    private StringBuffer subformat(StringBuffer result, FieldDelegate delegate,
+    private StringBuf subformat(StringBuf result, FieldDelegate delegate,
             boolean isNegative, boolean isInteger,
             int maxIntDigits, int minIntDigits,
             int maxFraDigits, int minFraDigits) {
@@ -1821,7 +1857,7 @@ private StringBuffer subformat(StringBuffer result, FieldDelegate delegate,
      * @param maxFraDigits maximum fraction digits
      * @param minFraDigits minimum fraction digits
      */
-    void subformatNumber(StringBuffer result, FieldDelegate delegate,
+    void subformatNumber(StringBuf result, FieldDelegate delegate,
             boolean isNegative, boolean isInteger,
             int maxIntDigits, int minIntDigits,
             int maxFraDigits, int minFraDigits) {
@@ -2108,7 +2144,7 @@ void subformatNumber(StringBuffer result, FieldDelegate delegate,
      * <p>
      * This is used by {@code subformat} to add the prefix/suffix.
      */
-    private void append(StringBuffer result, String string,
+    private void append(StringBuf result, String string,
                         FieldDelegate delegate,
                         FieldPosition[] positions,
                         Format.Field signAttribute) {
diff --git a/src/java.base/share/classes/java/text/DontCareFieldPosition.java b/src/java.base/share/classes/java/text/DontCareFieldPosition.java
index 33c086d370bef..3117c67e78619 100644
--- a/src/java.base/share/classes/java/text/DontCareFieldPosition.java
+++ b/src/java.base/share/classes/java/text/DontCareFieldPosition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,10 +36,10 @@ class DontCareFieldPosition extends FieldPosition {
 
     private final Format.FieldDelegate noDelegate = new Format.FieldDelegate() {
         public void formatted(Format.Field attr, Object value, int start,
-                              int end, StringBuffer buffer) {
+                              int end, Format.StringBuf buffer) {
         }
         public void formatted(int fieldID, Format.Field attr, Object value,
-                              int start, int end, StringBuffer buffer) {
+                              int start, int end, Format.StringBuf buffer) {
         }
     };
 
diff --git a/src/java.base/share/classes/java/text/FieldPosition.java b/src/java.base/share/classes/java/text/FieldPosition.java
index 7b9d23bafcbc5..92d0e9a2e6d3f 100644
--- a/src/java.base/share/classes/java/text/FieldPosition.java
+++ b/src/java.base/share/classes/java/text/FieldPosition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -290,7 +290,7 @@ private class Delegate implements Format.FieldDelegate {
         private boolean encounteredField;
 
         public void formatted(Format.Field attr, Object value, int start,
-                              int end, StringBuffer buffer) {
+                              int end, Format.StringBuf buffer) {
             if (!encounteredField && matchesField(attr)) {
                 setBeginIndex(start);
                 setEndIndex(end);
@@ -299,7 +299,7 @@ public void formatted(Format.Field attr, Object value, int start,
         }
 
         public void formatted(int fieldID, Format.Field attr, Object value,
-                              int start, int end, StringBuffer buffer) {
+                              int start, int end, Format.StringBuf buffer) {
             if (!encounteredField && matchesField(attr, fieldID)) {
                 setBeginIndex(start);
                 setEndIndex(end);
diff --git a/src/java.base/share/classes/java/text/Format.java b/src/java.base/share/classes/java/text/Format.java
index 81efc27acf4d2..6aa6b866bae98 100644
--- a/src/java.base/share/classes/java/text/Format.java
+++ b/src/java.base/share/classes/java/text/Format.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -148,7 +148,8 @@ protected Format() {
     }
 
     /**
-     * Formats an object to produce a string. This is equivalent to
+     * Formats an object to produce a string.
+     * This method returns a string that would be equal to the string returned by
      * <blockquote>
      * {@link #format(Object, StringBuffer, FieldPosition) format}<code>(obj,
      *         new StringBuffer(), new FieldPosition(0)).toString();</code>
@@ -160,7 +161,11 @@ protected Format() {
      *            object
      */
     public final String format (Object obj) {
-        return format(obj, new StringBuffer(), new FieldPosition(0)).toString();
+        if ("java.text".equals(getClass().getPackageName())) {
+            return format(obj, StringBufFactory.of(), new FieldPosition(0)).toString();
+        } else {
+            return format(obj, new StringBuffer(), new FieldPosition(0)).toString();
+        }
     }
 
     /**
@@ -185,6 +190,12 @@ public abstract StringBuffer format(Object obj,
                     StringBuffer toAppendTo,
                     FieldPosition pos);
 
+    StringBuf format(Object obj,
+                     StringBuf toAppendTo,
+                     FieldPosition pos) {
+        throw new UnsupportedOperationException("Subclasses should override this method");
+    }
+
     /**
      * Formats an Object producing an {@code AttributedCharacterIterator}.
      * You can use the returned {@code AttributedCharacterIterator}
@@ -394,7 +405,7 @@ interface FieldDelegate {
          *        NOT modify it.
          */
         public void formatted(Format.Field attr, Object value, int start,
-                              int end, StringBuffer buffer);
+                              int end, StringBuf buffer);
 
         /**
          * Notified when a particular region of the String is formatted.
@@ -408,6 +419,38 @@ public void formatted(Format.Field attr, Object value, int start,
          *        NOT modify it.
          */
         public void formatted(int fieldID, Format.Field attr, Object value,
-                              int start, int end, StringBuffer buffer);
+                              int start, int end, StringBuf buffer);
+    }
+
+    /**
+     * StringBuf is the minimal common interface of {@code StringBuffer} and {@code StringBuilder}.
+     * It is used by the various {@code Format} implementations as the internal string buffer.
+     */
+    sealed interface StringBuf
+            permits StringBufFactory.StringBufferImpl, StringBufFactory.StringBuilderImpl {
+
+        int length();
+
+        String substring(int start, int end);
+
+        String substring(int start);
+
+        StringBuf append(char c);
+
+        StringBuf append(String str);
+
+        StringBuf append(int i);
+
+        StringBuf append(char[] str, int offset, int len);
+
+        StringBuf append(CharSequence s, int start, int end);
+
+        StringBuf append(StringBuffer sb);
+
+        boolean isProxyStringBuilder();
+
+        StringBuffer asStringBuffer();
+
+        StringBuilder asStringBuilder();
     }
 }
diff --git a/src/java.base/share/classes/java/text/ListFormat.java b/src/java.base/share/classes/java/text/ListFormat.java
index bc155605934f5..5cd0e9e365126 100644
--- a/src/java.base/share/classes/java/text/ListFormat.java
+++ b/src/java.base/share/classes/java/text/ListFormat.java
@@ -356,7 +356,7 @@ public String[] getPatterns() {
     public String format(List<String> input) {
         Objects.requireNonNull(input);
 
-        return format(input, new StringBuffer(),
+        return format(input, StringBufFactory.of(),
                 DontCareFieldPosition.INSTANCE).toString();
     }
 
@@ -381,6 +381,18 @@ public StringBuffer format(Object obj, StringBuffer toAppendTo, FieldPosition po
         Objects.requireNonNull(obj);
         Objects.requireNonNull(toAppendTo);
 
+        return format(obj, StringBufFactory.of(toAppendTo)).asStringBuffer();
+    }
+
+    @Override
+    StringBuf format(Object obj, StringBuf toAppendTo, FieldPosition pos) {
+        Objects.requireNonNull(obj);
+        Objects.requireNonNull(toAppendTo);
+
+        return format(obj, toAppendTo);
+    }
+
+    private StringBuf format(Object obj, StringBuf toAppendTo) {
         if (obj instanceof Object[] objs) {
             return generateMessageFormat(objs).format(objs, toAppendTo, DontCareFieldPosition.INSTANCE);
         } else if (obj instanceof List<?> objs) {
diff --git a/src/java.base/share/classes/java/text/MessageFormat.java b/src/java.base/share/classes/java/text/MessageFormat.java
index 8f939f8af2669..74a3e627c18c7 100644
--- a/src/java.base/share/classes/java/text/MessageFormat.java
+++ b/src/java.base/share/classes/java/text/MessageFormat.java
@@ -1027,12 +1027,13 @@ public Format[] getFormats() {
     public final StringBuffer format(Object[] arguments, StringBuffer result,
                                      FieldPosition pos)
     {
-        return subformat(arguments, result, pos, null);
+        return subformat(arguments, StringBufFactory.of(result), pos, null).asStringBuffer();
     }
 
     /**
      * Creates a MessageFormat with the given pattern and uses it
-     * to format the given arguments. This is equivalent to
+     * to format the given arguments.
+     * This method returns a string that would be equal to the string returned by
      * <blockquote>
      *     <code>(new {@link #MessageFormat(String) MessageFormat}(pattern)).{@link #format(java.lang.Object[], java.lang.StringBuffer, java.text.FieldPosition) format}(arguments, new StringBuffer(), null).toString()</code>
      * </blockquote>
@@ -1076,6 +1077,12 @@ public static String format(String pattern, Object ... arguments) {
     public final StringBuffer format(Object arguments, StringBuffer result,
                                      FieldPosition pos)
     {
+        return subformat((Object[]) arguments, StringBufFactory.of(result), pos, null).asStringBuffer();
+    }
+
+    @Override
+    final StringBuf format(Object arguments, StringBuf result,
+                           FieldPosition pos) {
         return subformat((Object[]) arguments, result, pos, null);
     }
 
@@ -1116,7 +1123,7 @@ public final StringBuffer format(Object arguments, StringBuffer result,
      */
     public AttributedCharacterIterator formatToCharacterIterator(Object arguments) {
         Objects.requireNonNull(arguments, "arguments must not be null");
-        StringBuffer result = new StringBuffer();
+        StringBuf result = StringBufFactory.of();
         ArrayList<AttributedCharacterIterator> iterators = new ArrayList<>();
 
         subformat((Object[]) arguments, result, null, iterators);
@@ -1472,7 +1479,7 @@ protected Object readResolve() throws InvalidObjectException {
      *            {@code arguments} array is not of the type
      *            expected by the format element(s) that use it.
      */
-    private StringBuffer subformat(Object[] arguments, StringBuffer result,
+    private StringBuf subformat(Object[] arguments, StringBuf result,
                                    FieldPosition fp, List<AttributedCharacterIterator> characterIterators) {
         // note: this implementation assumes a fast substring & index.
         // if this is not true, would be better to append chars one by one.
@@ -1582,9 +1589,9 @@ private StringBuffer subformat(Object[] arguments, StringBuffer result,
 
     /**
      * Convenience method to append all the characters in
-     * {@code iterator} to the StringBuffer {@code result}.
+     * {@code iterator} to the StringBuf {@code result}.
      */
-    private void append(StringBuffer result, CharacterIterator iterator) {
+    private void append(StringBuf result, CharacterIterator iterator) {
         if (iterator.first() != CharacterIterator.DONE) {
             char aChar;
 
diff --git a/src/java.base/share/classes/java/text/NumberFormat.java b/src/java.base/share/classes/java/text/NumberFormat.java
index 28f116042e9da..b905f3bd8afea 100644
--- a/src/java.base/share/classes/java/text/NumberFormat.java
+++ b/src/java.base/share/classes/java/text/NumberFormat.java
@@ -315,6 +315,23 @@ public StringBuffer format(Object number,
         }
     }
 
+    @Override
+    StringBuf format(Object number,
+                     StringBuf toAppendTo,
+                     FieldPosition pos) {
+        if (number instanceof Long || number instanceof Integer ||
+                    number instanceof Short || number instanceof Byte ||
+                    number instanceof AtomicInteger || number instanceof AtomicLong ||
+                    (number instanceof BigInteger &&
+                             ((BigInteger) number).bitLength() < 64)) {
+            return format(((Number) number).longValue(), toAppendTo, pos);
+        } else if (number instanceof Number) {
+            return format(((Number) number).doubleValue(), toAppendTo, pos);
+        } else {
+            throw new IllegalArgumentException("Cannot format given Object as a Number");
+        }
+    }
+
     /**
      * {@inheritDoc Format}
      *
@@ -347,8 +364,13 @@ public final String format(double number) {
         if (result != null)
             return result;
 
-        return format(number, new StringBuffer(),
-                      DontCareFieldPosition.INSTANCE).toString();
+        if ("java.text".equals(getClass().getPackageName())) {
+            return format(number, StringBufFactory.of(),
+                    DontCareFieldPosition.INSTANCE).toString();
+        } else {
+            return format(number, new StringBuffer(),
+                    DontCareFieldPosition.INSTANCE).toString();
+        }
     }
 
     /*
@@ -367,8 +389,13 @@ public final String format(double number) {
      * @see java.text.Format#format
      */
     public final String format(long number) {
-        return format(number, new StringBuffer(),
-                      DontCareFieldPosition.INSTANCE).toString();
+        if ("java.text".equals(getClass().getPackageName())) {
+            return format(number, StringBufFactory.of(),
+                    DontCareFieldPosition.INSTANCE).toString();
+        } else {
+            return format(number, new StringBuffer(),
+                    DontCareFieldPosition.INSTANCE).toString();
+        }
     }
 
     /**
@@ -394,6 +421,12 @@ public abstract StringBuffer format(double number,
                                         StringBuffer toAppendTo,
                                         FieldPosition pos);
 
+    StringBuf format(double number,
+                     StringBuf toAppendTo,
+                     FieldPosition pos) {
+        throw new UnsupportedOperationException("Subclasses should override this method");
+    }
+
     /**
      * Specialization of format.
      *
@@ -417,6 +450,12 @@ public abstract StringBuffer format(long number,
                                         StringBuffer toAppendTo,
                                         FieldPosition pos);
 
+    StringBuf format(long number,
+                     StringBuf toAppendTo,
+                     FieldPosition pos) {
+        throw new UnsupportedOperationException("Subclasses should override this method");
+    }
+
     /**
      * Parses text from the beginning of the given string to produce a {@code Number}.
      * <p>
diff --git a/src/java.base/share/classes/java/text/SimpleDateFormat.java b/src/java.base/share/classes/java/text/SimpleDateFormat.java
index dbc7235cbc4e1..9f2513eb4b867 100644
--- a/src/java.base/share/classes/java/text/SimpleDateFormat.java
+++ b/src/java.base/share/classes/java/text/SimpleDateFormat.java
@@ -968,11 +968,18 @@ public StringBuffer format(Date date, StringBuffer toAppendTo,
                                FieldPosition pos)
     {
         pos.beginIndex = pos.endIndex = 0;
+        return format(date, StringBufFactory.of(toAppendTo), pos.getFieldDelegate()).asStringBuffer();
+    }
+
+    @Override
+    final StringBuf format(Date date, StringBuf toAppendTo,
+                           FieldPosition pos) {
+        pos.beginIndex = pos.endIndex = 0;
         return format(date, toAppendTo, pos.getFieldDelegate());
     }
 
     // Called from Format after creating a FieldDelegate
-    private StringBuffer format(Date date, StringBuffer toAppendTo,
+    private StringBuf format(Date date, StringBuf toAppendTo,
                                 FieldDelegate delegate) {
         // Convert input date to time field list
         calendar.setTime(date);
@@ -1024,7 +1031,7 @@ private StringBuffer format(Date date, StringBuffer toAppendTo,
      */
     @Override
     public AttributedCharacterIterator formatToCharacterIterator(Object obj) {
-        StringBuffer sb = new StringBuffer();
+        StringBuf sb = StringBufFactory.of();
         CharacterIteratorFieldDelegate delegate = new
                          CharacterIteratorFieldDelegate();
 
@@ -1130,7 +1137,7 @@ else if (obj == null) {
      * Private member function that does the real date/time formatting.
      */
     private void subFormat(int patternCharIndex, int count,
-                           FieldDelegate delegate, StringBuffer buffer,
+                           FieldDelegate delegate, StringBuf buffer,
                            boolean useDateFormatSymbols)
     {
         int     maxIntCount = Integer.MAX_VALUE;
@@ -1320,7 +1327,11 @@ private void subFormat(int patternCharIndex, int count,
             }
 
             int num = (value / 60) * 100 + (value % 60);
-            CalendarUtils.sprintf0d(buffer, num, width);
+            if (buffer.isProxyStringBuilder()) {
+                CalendarUtils.sprintf0d(buffer.asStringBuilder(), num, width);
+            } else {
+                CalendarUtils.sprintf0d(buffer.asStringBuffer(), num, width);
+            }
             break;
 
         case PATTERN_ISO_ZONE:   // 'X'
@@ -1340,7 +1351,11 @@ private void subFormat(int patternCharIndex, int count,
                 value = -value;
             }
 
-            CalendarUtils.sprintf0d(buffer, value / 60, 2);
+            if (buffer.isProxyStringBuilder()) {
+                CalendarUtils.sprintf0d(buffer.asStringBuilder(), value / 60, 2);
+            } else {
+                CalendarUtils.sprintf0d(buffer.asStringBuffer(), value / 60, 2);
+            }
             if (count == 1) {
                 break;
             }
@@ -1348,7 +1363,11 @@ private void subFormat(int patternCharIndex, int count,
             if (count == 3) {
                 buffer.append(':');
             }
-            CalendarUtils.sprintf0d(buffer, value % 60, 2);
+            if (buffer.isProxyStringBuilder()) {
+                CalendarUtils.sprintf0d(buffer.asStringBuilder(), value % 60, 2);
+            } else {
+                CalendarUtils.sprintf0d(buffer.asStringBuffer(), value % 60, 2);
+            }
             break;
 
         default:
@@ -1382,7 +1401,7 @@ private void subFormat(int patternCharIndex, int count,
     /**
      * Formats a number with the specified minimum and maximum number of digits.
      */
-    private void zeroPaddingNumber(int value, int minDigits, int maxDigits, StringBuffer buffer)
+    private void zeroPaddingNumber(int value, int minDigits, int maxDigits, StringBuf buffer)
     {
         // Optimization for 1, 2 and 4 digit numbers. This should
         // cover most cases of formatting date/time related items.
@@ -1425,7 +1444,17 @@ private void zeroPaddingNumber(int value, int minDigits, int maxDigits, StringBu
 
         numberFormat.setMinimumIntegerDigits(minDigits);
         numberFormat.setMaximumIntegerDigits(maxDigits);
-        numberFormat.format((long)value, buffer, DontCareFieldPosition.INSTANCE);
+        if (buffer.isProxyStringBuilder()) {
+            //User can set numberFormat with a user-defined NumberFormat which
+            //not override format(long, StringBuf, FieldPosition).
+            if ("java.text".equals(numberFormat.getClass().getPackageName())) {
+                numberFormat.format((long) value, buffer, DontCareFieldPosition.INSTANCE);
+            } else {
+                buffer.append(numberFormat.format((long) value, new StringBuffer(), DontCareFieldPosition.INSTANCE));
+            }
+        } else {
+            numberFormat.format((long) value, buffer.asStringBuffer(), DontCareFieldPosition.INSTANCE);
+        }
     }
 
 
@@ -2565,5 +2594,4 @@ private void checkNegativeNumberExpression() {
             originalNumberFormat = numberFormat;
         }
     }
-
 }
diff --git a/src/java.base/share/classes/java/text/StringBufFactory.java b/src/java.base/share/classes/java/text/StringBufFactory.java
new file mode 100644
index 0000000000000..bfad0c1093d32
--- /dev/null
+++ b/src/java.base/share/classes/java/text/StringBufFactory.java
@@ -0,0 +1,216 @@
+/*
+ * Copyright (c) 2024, Alibaba Group Holding Limited. 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package java.text;
+
+import java.text.Format.StringBuf;
+
+/**
+ * {@code StringBufFactory} creates implementations of {@code Format.StringBuf},
+ * which is an interface with the minimum overlap required to support {@code StringBuffer}
+ * and {@code StringBuilder} in {@code Format}. This allows for {@code StringBuilder} to be used
+ * in place of {@code StringBuffer} to provide performance benefits for JDK internal
+ * {@code Format} subclasses.
+ */
+final class StringBufFactory {
+
+    private StringBufFactory() {
+    }
+
+    static StringBuf of(StringBuffer sb) {
+        return new StringBufferImpl(sb);
+    }
+
+    static StringBuf of(StringBuilder sb) {
+        return new StringBuilderImpl(sb);
+    }
+
+    static StringBuf of() {
+        return new StringBuilderImpl();
+    }
+
+    final static class StringBufferImpl implements StringBuf {
+        private final StringBuffer sb;
+
+        StringBufferImpl(StringBuffer sb) {
+            this.sb = sb;
+        }
+
+        @Override
+        public int length() {
+            return sb.length();
+        }
+
+        @Override
+        public String substring(int start, int end) {
+            return sb.substring(start, end);
+        }
+
+        @Override
+        public String substring(int start) {
+            return sb.substring(start);
+        }
+
+        @Override
+        public StringBuf append(char c) {
+            sb.append(c);
+            return this;
+        }
+
+        @Override
+        public StringBuf append(String str) {
+            sb.append(str);
+            return this;
+        }
+
+        @Override
+        public StringBuf append(int i) {
+            sb.append(i);
+            return this;
+        }
+
+        @Override
+        public StringBuf append(char[] str, int offset, int len) {
+            sb.append(str, offset, len);
+            return this;
+        }
+
+        @Override
+        public StringBuf append(CharSequence s, int start, int end) {
+            sb.append(s, start, end);
+            return this;
+        }
+
+        @Override
+        public StringBuf append(StringBuffer asb) {
+            sb.append(asb);
+            return this;
+        }
+
+        @Override
+        public boolean isProxyStringBuilder() {
+            return false;
+        }
+
+        @Override
+        public StringBuffer asStringBuffer() {
+            return sb;
+        }
+
+        @Override
+        public StringBuilder asStringBuilder() {
+            throw new AssertionError("Can't cast StringBuffer to StringBuilder");
+        }
+
+        @Override
+        public String toString() {
+            return sb.toString();
+        }
+    }
+
+    final static class StringBuilderImpl implements StringBuf {
+        private final StringBuilder sb;
+
+        StringBuilderImpl(StringBuilder sb) {
+            this.sb = sb;
+        }
+
+        StringBuilderImpl() {
+            this.sb = new StringBuilder();
+        }
+
+        @Override
+        public int length() {
+            return sb.length();
+        }
+
+        @Override
+        public String substring(int start, int end) {
+            return sb.substring(start, end);
+        }
+
+        @Override
+        public String substring(int start) {
+            return sb.substring(start);
+        }
+
+        @Override
+        public StringBuf append(char c) {
+            sb.append(c);
+            return this;
+        }
+
+        @Override
+        public StringBuf append(String str) {
+            sb.append(str);
+            return this;
+        }
+
+        @Override
+        public StringBuf append(int i) {
+            sb.append(i);
+            return this;
+        }
+
+        @Override
+        public StringBuf append(char[] str, int offset, int len) {
+            sb.append(str, offset, len);
+            return this;
+        }
+
+        @Override
+        public StringBuf append(CharSequence s, int start, int end) {
+            sb.append(s, start, end);
+            return this;
+        }
+
+        @Override
+        public StringBuf append(StringBuffer asb) {
+            sb.append(asb);
+            return this;
+        }
+
+
+        @Override
+        public boolean isProxyStringBuilder() {
+            return true;
+        }
+
+        @Override
+        public StringBuffer asStringBuffer() {
+            throw new AssertionError("Can't cast StringBuilder to StringBuffer");
+        }
+
+        @Override
+        public StringBuilder asStringBuilder() {
+            return sb;
+        }
+
+        @Override
+        public String toString() {
+            return sb.toString();
+        }
+    }
+}
diff --git a/test/micro/org/openjdk/bench/java/text/DateFormatterBench.java b/test/micro/org/openjdk/bench/java/text/DateFormatterBench.java
new file mode 100644
index 0000000000000..f9a6340a0fb29
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/text/DateFormatterBench.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2024, Alibaba Group Holding Limited. 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.
+ */
+
+package org.openjdk.bench.java.text;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+import java.text.DateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.concurrent.TimeUnit;
+
+@BenchmarkMode(Mode.Throughput)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@Warmup(iterations = 5, time = 1)
+@Measurement(iterations = 5, time = 1)
+@Fork(3)
+@State(Scope.Benchmark)
+public class DateFormatterBench {
+
+    private Date date;
+
+    private Object objDate;
+
+    @Setup
+    public void setup() {
+        date = new Date();
+        objDate = new Date();
+    }
+
+    private DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.FULL, Locale.ENGLISH);
+
+    @Benchmark
+    public String testFormatDate() {
+        return dateFormat.format(date);
+    }
+
+    @Benchmark
+    public String testFormatObject() {
+        return dateFormat.format(objDate);
+    }
+
+    public static void main(String... args) throws Exception {
+        Options opts = new OptionsBuilder().include(DateFormatterBench.class.getSimpleName()).shouldDoGC(true).build();
+        new Runner(opts).run();
+    }
+}
diff --git a/test/micro/org/openjdk/bench/java/text/ListFormatterBench.java b/test/micro/org/openjdk/bench/java/text/ListFormatterBench.java
new file mode 100644
index 0000000000000..008f4b17148bb
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/text/ListFormatterBench.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2024, Alibaba Group Holding Limited. 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.
+ */
+package org.openjdk.bench.java.text;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+import java.text.ListFormat;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+@BenchmarkMode(Mode.Throughput)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@Warmup(iterations = 5, time = 1)
+@Measurement(iterations = 5, time = 1)
+@Fork(3)
+@State(Scope.Benchmark)
+public class ListFormatterBench {
+
+    private List<String> data;
+
+    @Setup
+    public void setup() {
+        data = List.of("foo", "bar", "baz", "qux", "quux", "quuz");
+    }
+
+    private ListFormat listFormat = ListFormat.getInstance();
+
+    @Benchmark
+    public String testListFormat() {
+        return listFormat.format(data);
+    }
+
+    public static void main(String... args) throws Exception {
+        Options opts = new OptionsBuilder().include(ListFormatterBench.class.getSimpleName()).shouldDoGC(true).build();
+        new Runner(opts).run();
+    }
+}
diff --git a/test/micro/org/openjdk/bench/java/text/MessageFormatterBench.java b/test/micro/org/openjdk/bench/java/text/MessageFormatterBench.java
new file mode 100644
index 0000000000000..5d3399cb46d6d
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/text/MessageFormatterBench.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2024, Alibaba Group Holding Limited. 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.
+ */
+package org.openjdk.bench.java.text;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OperationsPerInvocation;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+import java.text.MessageFormat;
+import java.util.Locale;
+import java.util.concurrent.TimeUnit;
+
+@BenchmarkMode(Mode.Throughput)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@Warmup(iterations = 5, time = 1)
+@Measurement(iterations = 5, time = 1)
+@Fork(3)
+@State(Scope.Benchmark)
+public class MessageFormatterBench {
+
+    private Object[][] values;
+
+    @Setup
+    public void setup() {
+        values = new Object[][]{
+                new Object[]{Integer.valueOf(13), "MyDisk1"},
+                new Object[]{Float.valueOf(25.6f), "MyDisk2"},
+                new Object[]{Double.valueOf(123.89), "MyDisk3"},
+                new Object[]{Long.valueOf(1234567), "MyDisk4"},
+        };
+    }
+
+    private MessageFormat messageFormat = new MessageFormat("There is {0} GB of free space on the {1}.", Locale.ENGLISH);
+
+    @Benchmark
+    @OperationsPerInvocation(4)
+    public void testMessageFormat(final Blackhole bh) {
+        for (Object[] value : values) {
+            bh.consume(messageFormat.format(value));
+        }
+    }
+
+    public static void main(String... args) throws Exception {
+        Options opts = new OptionsBuilder().include(MessageFormatterBench.class.getSimpleName()).shouldDoGC(true).build();
+        new Runner(opts).run();
+    }
+}

From 0db6c15efe255bd313fb2b827d2ee05171e62ae9 Mon Sep 17 00:00:00 2001
From: Adam Sotona <asotona@openjdk.org>
Date: Mon, 22 Jul 2024 07:33:29 +0000
Subject: [PATCH 160/401] 8336833: Endless loop in Javap ClassWriter

Reviewed-by: liach
---
 .../classfile/impl/AbstractInstruction.java   |  2 +-
 test/jdk/jdk/classfile/LimitsTest.java        | 24 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java
index 48e1f0990b2ee..23bf3769608fd 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java
@@ -317,7 +317,7 @@ static int size(CodeImpl code, int codeStart, int pos) {
             int pad = ap - (pos + 1);
             int low = code.classReader.readInt(ap + 4);
             int high = code.classReader.readInt(ap + 8);
-            if (high < low || high - low > code.codeLength >> 2) {
+            if (high < low || (long)high - low > code.codeLength >> 2) {
                 throw new IllegalArgumentException("Invalid tableswitch values low: " + low + " high: " + high);
             }
             int cnt = high - low + 1;
diff --git a/test/jdk/jdk/classfile/LimitsTest.java b/test/jdk/jdk/classfile/LimitsTest.java
index 442707ecd1700..b1914e6d02408 100644
--- a/test/jdk/jdk/classfile/LimitsTest.java
+++ b/test/jdk/jdk/classfile/LimitsTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8320360 8330684 8331320 8331655 8331940 8332486 8335820
+ * @bug 8320360 8330684 8331320 8331655 8331940 8332486 8335820 8336833
  * @summary Testing ClassFile limits.
  * @run junit LimitsTest
  */
@@ -168,6 +168,28 @@ public void writeBody(BufWriter b) {
                                     b.writeU2(0);//exception handlers
                                     b.writeU2(0);//attributes
                                 }})))).methods().get(0).code().get().elementList());
+        assertThrows(IllegalArgumentException.class, () ->
+                ClassFile.of().parse(ClassFile.of().build(ClassDesc.of("TableSwitchClass"), cb -> cb.withMethod(
+                "tableSwitchMethod", MethodTypeDesc.of(ConstantDescs.CD_void), 0, mb ->
+                        ((DirectMethodBuilder)mb).writeAttribute(new UnboundAttribute.AdHocAttribute<CodeAttribute>(Attributes.code()) {
+                                @Override
+                                public void writeBody(BufWriter b) {
+                                    b.writeU2(-1);//max stack
+                                    b.writeU2(-1);//max locals
+                                    b.writeInt(20);
+                                    b.writeU1(Opcode.NOP.bytecode());
+                                    b.writeU1(Opcode.NOP.bytecode());
+                                    b.writeU1(Opcode.NOP.bytecode());
+                                    b.writeU1(Opcode.NOP.bytecode());
+                                    b.writeU1(Opcode.TABLESWITCH.bytecode());
+                                    b.writeU1(0); //padding
+                                    b.writeU2(0); //padding
+                                    b.writeInt(0); //default
+                                    b.writeInt(Integer.MIN_VALUE); //low
+                                    b.writeInt(Integer.MAX_VALUE - 4); //high to jump back and cause infinite loop
+                                    b.writeU2(0);//exception handlers
+                                    b.writeU2(0);//attributes
+                                }})))).methods().get(0).code().get().elementList());
     }
 
     @Test

From c1fdc04ad78e6e4712f2173370012106f9cc45ee Mon Sep 17 00:00:00 2001
From: Aggelos Biboudis <abimpoudis@openjdk.org>
Date: Mon, 22 Jul 2024 10:29:34 +0000
Subject: [PATCH 161/401] 8336781: Erroneous exhaustivity check with boolean
 switch

Reviewed-by: vromero
---
 .../com/sun/tools/javac/comp/Flow.java        |  6 +--
 .../tools/javac/patterns/T8336781.java        | 39 +++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 test/langtools/tools/javac/patterns/T8336781.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
index 89709bd3ec767..792b5ca234655 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
@@ -787,7 +787,7 @@ public void visitSwitchExpression(JCSwitchExpression tree) {
         private boolean exhausts(JCExpression selector, List<JCCase> cases) {
             Set<PatternDescription> patternSet = new HashSet<>();
             Map<Symbol, Set<Symbol>> enum2Constants = new HashMap<>();
-            Set<Object> booleanLiterals = new HashSet<>();
+            Set<Object> booleanLiterals = new HashSet<>(Set.of(0, 1));
             for (JCCase c : cases) {
                 if (!TreeInfo.unguardedCase(c))
                     continue;
@@ -800,7 +800,7 @@ private boolean exhausts(JCExpression selector, List<JCCase> cases) {
                     } else if (l instanceof JCConstantCaseLabel constantLabel) {
                         if (types.unboxedTypeOrType(selector.type).hasTag(TypeTag.BOOLEAN)) {
                             Object value = ((JCLiteral) constantLabel.expr).value;
-                            booleanLiterals.add(value);
+                            booleanLiterals.remove(value);
                         } else {
                             Symbol s = TreeInfo.symbol(constantLabel.expr);
                             if (s != null && s.isEnum()) {
@@ -817,7 +817,7 @@ private boolean exhausts(JCExpression selector, List<JCCase> cases) {
                 }
             }
 
-            if (types.unboxedTypeOrType(selector.type).hasTag(TypeTag.BOOLEAN) && booleanLiterals.size() == 2) {
+            if (types.unboxedTypeOrType(selector.type).hasTag(TypeTag.BOOLEAN) && booleanLiterals.isEmpty()) {
                 return true;
             }
 
diff --git a/test/langtools/tools/javac/patterns/T8336781.java b/test/langtools/tools/javac/patterns/T8336781.java
new file mode 100644
index 0000000000000..01876ed3c0a4b
--- /dev/null
+++ b/test/langtools/tools/javac/patterns/T8336781.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 8336781
+ * @summary Erroneous exhaustivity check with boolean switch
+ * @enablePreview
+ * @compile -XDshould-stop.at=FLOW T8336781.java
+ */
+public class T8336781 {
+    public static void test() {
+        Boolean bool = null;
+        var _ = switch (bool) {
+            case null -> "nothing";
+            case true -> "something true";
+            case false -> "something false";
+        };
+    }
+}

From 7ddd02599c4cb85fdc0a1f0a7c4ce37a09efe16e Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Mon, 22 Jul 2024 13:19:30 +0000
Subject: [PATCH 162/401] 4265389: JSplitPane does not support
 ComponentOrientation

Reviewed-by: tr, abhiscxk
---
 .../share/classes/javax/swing/JSplitPane.java | 27 +++++++
 .../TestSplitPaneOrientationTest.java         | 71 +++++++++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 test/jdk/javax/swing/JSplitPane/TestSplitPaneOrientationTest.java

diff --git a/src/java.desktop/share/classes/javax/swing/JSplitPane.java b/src/java.desktop/share/classes/javax/swing/JSplitPane.java
index 7d4482af07ea8..90f3efb3e69cf 100644
--- a/src/java.desktop/share/classes/javax/swing/JSplitPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JSplitPane.java
@@ -26,6 +26,7 @@
 package javax.swing;
 
 import java.awt.Component;
+import java.awt.ComponentOrientation;
 import java.awt.Graphics;
 import java.beans.BeanProperty;
 import java.beans.ConstructorProperties;
@@ -362,6 +363,32 @@ public JSplitPane(int newOrientation,
 
     }
 
+    /**
+     * {@inheritDoc}
+     * @param orientation {@inheritDoc}
+     */
+    @Override
+    public void setComponentOrientation(ComponentOrientation orientation) {
+        super.setComponentOrientation(orientation);
+        Component leftComponent = this.getLeftComponent();
+        Component rightComponent = this.getRightComponent();
+        if (!this.getComponentOrientation().isLeftToRight()) {
+            if (rightComponent != null) {
+                setLeftComponent(rightComponent);
+            }
+            if (leftComponent != null) {
+                setRightComponent(leftComponent);
+            }
+        } else {
+            if (leftComponent != null) {
+                setLeftComponent(leftComponent);
+            }
+            if (rightComponent != null) {
+                setRightComponent(rightComponent);
+            }
+        }
+    }
+
     /**
      * {@inheritDoc}
      * @param enabled {@inheritDoc}
diff --git a/test/jdk/javax/swing/JSplitPane/TestSplitPaneOrientationTest.java b/test/jdk/javax/swing/JSplitPane/TestSplitPaneOrientationTest.java
new file mode 100644
index 0000000000000..01dfebcb5c276
--- /dev/null
+++ b/test/jdk/javax/swing/JSplitPane/TestSplitPaneOrientationTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 4265389
+ * @summary  Verifies JSplitPane support ComponentOrientation
+ * @run main TestSplitPaneOrientationTest
+ */
+
+import java.awt.ComponentOrientation;
+import javax.swing.JButton;
+import javax.swing.JSplitPane;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+
+public class TestSplitPaneOrientationTest {
+
+    private static void setLookAndFeel(UIManager.LookAndFeelInfo laf) {
+        try {
+            UIManager.setLookAndFeel(laf.getClassName());
+        } catch (UnsupportedLookAndFeelException ignored) {
+            System.out.println("Unsupported LAF: " + laf.getClassName());
+        } catch (ClassNotFoundException | InstantiationException
+                 | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        for (UIManager.LookAndFeelInfo laf : UIManager.getInstalledLookAndFeels()) {
+            System.out.println("Testing LAF : " + laf.getClassName());
+
+            SwingUtilities.invokeAndWait(() -> {
+                setLookAndFeel(laf);
+                JSplitPane jsp = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT,
+                                                new JButton("Left"), new JButton("Right"));
+                jsp.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
+                if (jsp.getRightComponent() instanceof JButton button) {
+                    System.out.println(button.getText());
+                    if (!button.getText().equals("Left")) {
+                        throw new RuntimeException("JSplitPane did not support ComponentOrientation");
+                    }
+                }
+            });
+        }
+    }
+
+}
+

From 92de2b2d5f21af38380b437af51e49c7ac142258 Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nbenalla@openjdk.org>
Date: Mon, 22 Jul 2024 13:27:12 +0000
Subject: [PATCH 163/401] 8336039: Doccheck: HTML warnings, broken links and
 missing files in java.base documentation

Reviewed-by: liach, djelinski
---
 .../lang/classfile/components/CodeStackTracker.java  |  4 ++--
 .../classes/java/lang/classfile/package-info.java    | 12 ++++++------
 .../share/classes/java/lang/foreign/Arena.java       |  2 +-
 .../classes/java/lang/foreign/MemorySegment.java     |  8 ++++----
 .../classes/java/lang/foreign/SymbolLookup.java      |  2 +-
 .../classes/java/net/spi/InetAddressResolver.java    |  4 ++--
 .../share/classes/java/text/MessageFormat.java       |  3 +--
 .../share/classes/javax/security/auth/Subject.java   |  4 ++--
 8 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/classfile/components/CodeStackTracker.java b/src/java.base/share/classes/java/lang/classfile/components/CodeStackTracker.java
index 97ced9ab38562..1b711cfad0ec3 100644
--- a/src/java.base/share/classes/java/lang/classfile/components/CodeStackTracker.java
+++ b/src/java.base/share/classes/java/lang/classfile/components/CodeStackTracker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@
  * and calculating max stack size.
  * <p>
  * Sample use:
- * <p>
+ *
  * {@snippet lang=java :
  *     var stackTracker = CodeStackTracker.of();
  *     codeBuilder.transforming(stackTracker, trackedBuilder -> {
diff --git a/src/java.base/share/classes/java/lang/classfile/package-info.java b/src/java.base/share/classes/java/lang/classfile/package-info.java
index 49413d356607c..b5991b0e951b9 100644
--- a/src/java.base/share/classes/java/lang/classfile/package-info.java
+++ b/src/java.base/share/classes/java/lang/classfile/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,11 +33,11 @@
  * The main class for reading classfiles is {@link java.lang.classfile.ClassModel}; we
  * convert bytes into a {@link java.lang.classfile.ClassModel} with {@link
  * java.lang.classfile.ClassFile#parse(byte[])}:
- * <p>
+ *
  * {@snippet lang=java :
  * ClassModel cm = ClassFile.of().parse(bytes);
  * }
- * <p>
+ *
  * There are several additional overloads of {@code parse} that let you specify
  * various processing options.
  * <p>
@@ -377,7 +377,7 @@
  * <p>
  * Then we can compose {@code fooToBar} and {@code instrumentCalls} with {@link
  * java.lang.classfile.CodeTransform#andThen(java.lang.classfile.CodeTransform)}:
- * <p>
+ *
  * {@snippet lang=java :
  * var cc = ClassFile.of();
  * byte[] newBytes = cc.transform(cc.parse(bytes),
@@ -443,7 +443,7 @@
  * or more, zero or one, exactly one), and a list of components.  The elements
  * of a class are fields, methods, and the attributes that can appear on
  * classes:
- * <p>
+ *
  * {@snippet lang="text" :
  * ClassElement =
  *     FieldModel*(UtfEntry name, Utf8Entry descriptor)
@@ -468,7 +468,7 @@
  *     | PermittedSubclassesAttribute?(List<ClassEntry> permittedSubclasses)
  *     | DeclarationElement*
  * }
- *<p>
+ *
  * where {@code DeclarationElement} are the elements that are common to all declarations
  * (classes,  methods, fields) and so are factored out:
  *
diff --git a/src/java.base/share/classes/java/lang/foreign/Arena.java b/src/java.base/share/classes/java/lang/foreign/Arena.java
index c9a79c9700db9..9585e613805c9 100644
--- a/src/java.base/share/classes/java/lang/foreign/Arena.java
+++ b/src/java.base/share/classes/java/lang/foreign/Arena.java
@@ -61,7 +61,7 @@
  * by the garbage collector. The scope of an automatic arena is an automatic scope. As
  * such, the regions of memory backing memory segments allocated with the automatic arena
  * are deallocated at some unspecified time <em>after</em> the automatic arena (and all
- * the segments allocated by it) becomes <a href="../../../java/lang/ref/package.html#reachability">unreachable</a>,
+ * the segments allocated by it) becomes {@linkplain java.lang.ref##reachability unreachable},
  * as shown below:
  * {@snippet lang = java:
  * MemorySegment segment = Arena.ofAuto().allocate(100, 1); // @highlight regex='ofAuto()'
diff --git a/src/java.base/share/classes/java/lang/foreign/MemorySegment.java b/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
index 83a8b09f9d453..82f6b358a0752 100644
--- a/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
+++ b/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
@@ -517,7 +517,7 @@ public sealed interface MemorySegment permits AbstractMemorySegmentImpl {
      *
      * @apiNote When using this method to pass a segment address to some external
      *          operation (e.g. a JNI function), clients must ensure that the segment is
-     *          kept <a href="../../../java/lang/ref/package.html#reachability">reachable</a>
+     *          kept {@linkplain java.lang.ref##reachability reachable}
      *          for the entire duration of the operation. A failure to do so might result
      *          in the premature deallocation of the region of memory backing the memory
      *          segment, in case the segment has been allocated with an
@@ -785,7 +785,7 @@ public sealed interface MemorySegment permits AbstractMemorySegmentImpl {
      *          backing region of memory is no longer available. Furthermore, if the
      *          provided scope is the scope of an {@linkplain Arena#ofAuto() automatic arena},
      *          the cleanup action must not prevent the scope from becoming
-     *          <a href="../../../java/lang/ref/package.html#reachability">unreachable</a>.
+     *          {@linkplain java.lang.ref##reachability unreachable}.
      *          A failure to do so will permanently prevent the regions of memory
      *          allocated by the automatic arena from being deallocated.
      *
@@ -836,7 +836,7 @@ public sealed interface MemorySegment permits AbstractMemorySegmentImpl {
      *          backing region of memory is no longer available. Furthermore, if the
      *          provided scope is the scope of an {@linkplain Arena#ofAuto() automatic arena},
      *          the cleanup action must not prevent the scope from becoming
-     *          <a href="../../../java/lang/ref/package.html#reachability">unreachable</a>.
+     *          {@linkplain java.lang.ref##reachability unreachable}.
      *          A failure to do so will permanently prevent the regions of memory
      *          allocated by the automatic arena from being deallocated.
      *
@@ -2662,7 +2662,7 @@ static long mismatch(MemorySegment srcSegment, long srcFromOffset, long srcToOff
      * invalidated, either {@link Arena#close() explicitly}, or automatically, by the
      * garbage collector. A segment scope that is invalidated automatically is an
      * <em>automatic scope</em>. An automatic scope is always {@link #isAlive() alive}
-     * as long as it is <a href="../../../java/lang/ref/package.html#reachability">reachable</a>.
+     * as long as it is {@linkplain java.lang.ref##reachability reachable}.
      * Segments associated with an automatic scope are:
      * <ul>
      *     <li>Segments obtained from an {@linkplain Arena#ofAuto() automatic arena};</li>
diff --git a/src/java.base/share/classes/java/lang/foreign/SymbolLookup.java b/src/java.base/share/classes/java/lang/foreign/SymbolLookup.java
index 3bc416b9c6272..a8838ea715c92 100644
--- a/src/java.base/share/classes/java/lang/foreign/SymbolLookup.java
+++ b/src/java.base/share/classes/java/lang/foreign/SymbolLookup.java
@@ -219,7 +219,7 @@ default SymbolLookup or(SymbolLookup other) {
      * were loaded after this method returned.
      * <p>
      * Libraries associated with a class loader are unloaded when the class loader becomes
-     * <a href="../../../java/lang/ref/package.html#reachability">unreachable</a>. The
+     * {@linkplain java.lang.ref##reachability unreachable}. The
      * symbol lookup returned by this method is associated with an automatic
      * {@linkplain MemorySegment.Scope scope} which keeps the caller's class loader
      * reachable. Therefore, libraries associated with the caller's class loader are
diff --git a/src/java.base/share/classes/java/net/spi/InetAddressResolver.java b/src/java.base/share/classes/java/net/spi/InetAddressResolver.java
index be931bc40e0cd..ee6eb50ae033d 100644
--- a/src/java.base/share/classes/java/net/spi/InetAddressResolver.java
+++ b/src/java.base/share/classes/java/net/spi/InetAddressResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -92,7 +92,7 @@ public interface InetAddressResolver {
      * {@linkplain InetAddressResolver#lookupByName(String, LookupPolicy) looking up host addresses}.
      *
      * <p> The default platform-wide lookup policy is constructed by consulting
-     * <a href="doc-files/net-properties.html#Ipv4IPv6">System Properties</a> which affect
+     * <a href="../doc-files/net-properties.html#Ipv4IPv6">System Properties</a> which affect
      * how IPv4 and IPv6 addresses are returned.
      *
      * @since 18
diff --git a/src/java.base/share/classes/java/text/MessageFormat.java b/src/java.base/share/classes/java/text/MessageFormat.java
index 74a3e627c18c7..b2dd7a51251ae 100644
--- a/src/java.base/share/classes/java/text/MessageFormat.java
+++ b/src/java.base/share/classes/java/text/MessageFormat.java
@@ -367,12 +367,11 @@
  *
  * <h2>Usage Information</h2>
  *
- * <p>
+ *
  * The following example demonstrates a general usage of {@code MessageFormat}.
  * In internationalized programs, the message format pattern and other
  * static strings will likely be obtained from resource bundles.
  *
- * <p>
  * {@snippet lang=java :
  * int planet = 7;
  * String event = "a disturbance in the Force";
diff --git a/src/java.base/share/classes/javax/security/auth/Subject.java b/src/java.base/share/classes/javax/security/auth/Subject.java
index 277bbf434b00e..feb9e70b75280 100644
--- a/src/java.base/share/classes/javax/security/auth/Subject.java
+++ b/src/java.base/share/classes/javax/security/auth/Subject.java
@@ -108,9 +108,9 @@
  * and {@code callAs} is similar to {@code doAs} except that the
  * input type and exceptions thrown are slightly different.
  *
- * <p><b><a id="sm-allowed">These methods behave differently depending on
+ * <p id="sm-allowed"><b>These methods behave differently depending on
  * whether a security manager is
- * <a href="../../../java/lang/SecurityManager.html#set-security-manager">allowed or disallowed</a></a></b>:
+ * {@linkplain SecurityManager##set-security-manager allowed or disallowed}</b>:
  * <ul>
  * <li>If a security manager is allowed, which means it is either already set
  * or allowed to be set dynamically, a {@code Subject} object is associated

From c3226aaeb810521257e961be5763552c86ee5651 Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Mon, 22 Jul 2024 13:43:55 +0000
Subject: [PATCH 164/401] 8334394: Race condition in Class::protectionDomain

Reviewed-by: liach, jpai, rriggs, alanb
---
 .../share/classes/java/lang/Class.java        | 36 +++++----
 .../java/lang/Class/ProtectionDomainRace.java | 80 +++++++++++++++++++
 2 files changed, 99 insertions(+), 17 deletions(-)
 create mode 100644 test/jdk/java/lang/Class/ProtectionDomainRace.java

diff --git a/src/java.base/share/classes/java/lang/Class.java b/src/java.base/share/classes/java/lang/Class.java
index fb59de482ecf1..e2ec0909f4500 100644
--- a/src/java.base/share/classes/java/lang/Class.java
+++ b/src/java.base/share/classes/java/lang/Class.java
@@ -55,7 +55,9 @@
 import java.lang.constant.Constable;
 import java.net.URL;
 import java.security.AccessController;
+import java.security.Permissions;
 import java.security.PrivilegedAction;
+import java.security.ProtectionDomain;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -3220,10 +3222,6 @@ private boolean isOpenToCaller(String name, Class<?> caller) {
         return true;
     }
 
-
-    /** protection domain returned when the internal domain is null */
-    private static java.security.ProtectionDomain allPermDomain;
-
     /**
      * Returns the {@code ProtectionDomain} of this class.  If there is a
      * security manager installed, this method first calls the security
@@ -3244,7 +3242,7 @@ private boolean isOpenToCaller(String name, Class<?> caller) {
      * @see java.lang.RuntimePermission
      * @since 1.2
      */
-    public java.security.ProtectionDomain getProtectionDomain() {
+    public ProtectionDomain getProtectionDomain() {
         @SuppressWarnings("removal")
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
@@ -3253,26 +3251,30 @@ public java.security.ProtectionDomain getProtectionDomain() {
         return protectionDomain();
     }
 
+    /** Holder for the protection domain returned when the internal domain is null */
+    private static class Holder {
+        private static final ProtectionDomain allPermDomain;
+        static {
+            Permissions perms = new Permissions();
+            perms.add(SecurityConstants.ALL_PERMISSION);
+            allPermDomain = new ProtectionDomain(null, perms);
+        }
+    }
+
     // package-private
-    java.security.ProtectionDomain protectionDomain() {
-        java.security.ProtectionDomain pd = getProtectionDomain0();
+    ProtectionDomain protectionDomain() {
+        ProtectionDomain pd = getProtectionDomain0();
         if (pd == null) {
-            if (allPermDomain == null) {
-                java.security.Permissions perms =
-                    new java.security.Permissions();
-                perms.add(SecurityConstants.ALL_PERMISSION);
-                allPermDomain =
-                    new java.security.ProtectionDomain(null, perms);
-            }
-            pd = allPermDomain;
+            return Holder.allPermDomain;
+        } else {
+            return pd;
         }
-        return pd;
     }
 
     /**
      * Returns the ProtectionDomain of this class.
      */
-    private native java.security.ProtectionDomain getProtectionDomain0();
+    private native ProtectionDomain getProtectionDomain0();
 
     /*
      * Return the Virtual Machine's Class object for the named
diff --git a/test/jdk/java/lang/Class/ProtectionDomainRace.java b/test/jdk/java/lang/Class/ProtectionDomainRace.java
new file mode 100644
index 0000000000000..52b45d7ab105f
--- /dev/null
+++ b/test/jdk/java/lang/Class/ProtectionDomainRace.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 8334394
+ * @summary ensure there is no race condition in Class::protectionDomain
+ * @run main/othervm ProtectionDomainRace
+ */
+import javax.security.auth.Subject;
+import java.security.PrivilegedAction;
+
+/**
+ * Without the code fix, this test would fail with
+ * java.lang.AssertionError: sun.security.util.ResourcesMgr (PD)
+ *         at java.base/java.lang.invoke.MethodHandleImpl$BindCaller.checkInjectedInvoker(MethodHandleImpl.java:1209)
+ *         at java.base/java.lang.invoke.MethodHandleImpl$BindCaller.makeInjectedInvoker(MethodHandleImpl.java:1110)
+ *         at java.base/java.lang.invoke.MethodHandleImpl$BindCaller$1.computeValue(MethodHandleImpl.java:1117)
+ *         at java.base/java.lang.invoke.MethodHandleImpl$BindCaller$1.computeValue(MethodHandleImpl.java:1114)
+ *         at java.base/java.lang.ClassValue.getFromHashMap(ClassValue.java:229)
+ *         at java.base/java.lang.ClassValue.getFromBackup(ClassValue.java:211)
+ *         at java.base/java.lang.ClassValue.get(ClassValue.java:117)
+ *         at java.base/java.lang.invoke.MethodHandleImpl$BindCaller.bindCallerWithInjectedInvoker(MethodHandleImpl.java:1089)
+ *         at java.base/java.lang.invoke.MethodHandleImpl$BindCaller.bindCaller(MethodHandleImpl.java:1077)
+ *         at java.base/java.lang.invoke.MethodHandleImpl.bindCaller(MethodHandleImpl.java:1032)
+ *         at java.base/java.lang.invoke.MethodHandles$Lookup.maybeBindCaller(MethodHandles.java:4149)
+ *         at java.base/java.lang.invoke.MethodHandles$Lookup.getDirectMethodCommon(MethodHandles.java:4133)
+ *         at java.base/java.lang.invoke.MethodHandles$Lookup.getDirectMethodNoSecurityManager(MethodHandles.java:4077)
+ *         at java.base/java.lang.invoke.MethodHandles$Lookup.getDirectMethodForConstant(MethodHandles.java:4326)
+ *         at java.base/java.lang.invoke.MethodHandles$Lookup.linkMethodHandleConstant(MethodHandles.java:4274)
+ *         at java.base/java.lang.invoke.MethodHandleNatives.linkMethodHandleConstant(MethodHandleNatives.java:628)
+ *         at java.base/sun.security.util.ResourcesMgr.getBundle(ResourcesMgr.java:54)
+ *         at java.base/sun.security.util.ResourcesMgr.getString(ResourcesMgr.java:40)
+ *         at java.base/javax.security.auth.Subject.doAs(Subject.java:517)
+ *         ...
+ * as the Class::protectionDomain might assign different objects to the (original) allPermDomain field.
+ */
+public class ProtectionDomainRace {
+    private static volatile Throwable failed = null;
+    public static void main(String[] args) throws Throwable {
+        PrivilegedAction<?> pa = () -> null;
+        Thread[] threads = new Thread[100];
+        for (int i = 0; i < 100; i++) {
+            threads[i] = new Thread(() -> {
+                try {
+                    Subject.doAs(null, pa);
+                } catch (Throwable t) {
+                    failed = t;
+                }
+            });
+            threads[i].start();
+        }
+        for (int i = 0; i < 100; i++) {
+            threads[i].join();
+        }
+        if (failed != null) {
+            throw failed;
+        }
+    }
+}

From 0725eb1df2357bb0489e2521d96bb424fc233406 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Lund=C3=A9n?= <dlunden@openjdk.org>
Date: Mon, 22 Jul 2024 14:41:40 +0000
Subject: [PATCH 165/401] 8336753: Don't run
 serviceability/sa/ClhsdbDumpheap.java with -Xcomp

Reviewed-by: cjplummer, kvn, thartmann
---
 test/hotspot/jtreg/serviceability/sa/ClhsdbDumpheap.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbDumpheap.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbDumpheap.java
index 31b4d2dad357c..b414a6f4e8d42 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbDumpheap.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbDumpheap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,10 @@
  * @bug 8240989
  * @summary Test clhsdb dumpheap command
  * @requires vm.hasSA
+ * @requires vm.compMode != "Xcomp"
+ * @comment Running this test with -Xcomp is slow and therefore tends to cause
+ *          timeouts. As there is no known direct benefit from running the test
+ *          with -Xcomp, we disable such testing.
  * @library /test/lib
  * @run main/othervm/timeout=240 ClhsdbDumpheap
  */

From c740e1e3b080d43cf9871853538f233843d1b81c Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Mon, 22 Jul 2024 16:00:40 +0000
Subject: [PATCH 166/401] 8333772: Incorrect Kerberos behavior when
 udp_preference_limit = 0

Reviewed-by: ssahoo, mullan
---
 .../classes/sun/security/krb5/KdcComm.java    |  56 +++---
 .../sun/security/krb5/internal/Krb5.java      |   1 +
 .../jdk/sun/security/krb5/auto/KdcPolicy.java |   8 +-
 .../krb5/auto/RealmSpecificValues.java        | 178 ++++++++++++++++++
 4 files changed, 211 insertions(+), 32 deletions(-)
 create mode 100644 test/jdk/sun/security/krb5/auto/RealmSpecificValues.java

diff --git a/src/java.security.jgss/share/classes/sun/security/krb5/KdcComm.java b/src/java.security.jgss/share/classes/sun/security/krb5/KdcComm.java
index 63d9998256758..688a9183304d9 100644
--- a/src/java.security.jgss/share/classes/sun/security/krb5/KdcComm.java
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/KdcComm.java
@@ -62,15 +62,18 @@ public final class KdcComm {
     // them can also be defined in a realm, which overrides value here.
 
     /**
-     * max retry time for a single KDC, default Krb5.KDC_RETRY_LIMIT (3)
+     * max retry time for a single KDC, default Krb5.KDC_RETRY_LIMIT (3),
+     * Must be > 0.
      */
     private static int defaultKdcRetryLimit;
     /**
-     * timeout requesting a ticket from KDC, in millisec, default 30 sec
+     * timeout requesting a ticket from KDC, in millisec, default
+     * Krb5.KDC_TIMEOUT (30000). Must be > 0.
      */
     private static int defaultKdcTimeout;
     /**
-     * max UDP packet size, default unlimited (-1)
+     * max UDP packet size, default Krb5.KDC_DEFAULT_UDP_PREF_LIMIT (1465).
+     * Must be >= 0 and <= Krb5.KDC_HARD_UDP_LIMIT (32700).
      */
     private static int defaultUdpPrefLimit;
 
@@ -146,9 +149,9 @@ public String run() {
             timeout = parseTimeString(temp);
 
             temp = cfg.get("libdefaults", "max_retries");
-            max_retries = parsePositiveIntString(temp);
+            max_retries = parseNonNegativeIntString(temp);
             temp = cfg.get("libdefaults", "udp_preference_limit");
-            udp_pref_limit = parsePositiveIntString(temp);
+            udp_pref_limit = parseNonNegativeIntString(temp);
         } catch (Exception exc) {
            // ignore any exceptions; use default values
            if (DEBUG != null) {
@@ -157,7 +160,7 @@ public String run() {
                                     exc.getMessage());
            }
         }
-        defaultKdcTimeout = timeout > 0 ? timeout : 30*1000; // 30 seconds
+        defaultKdcTimeout = timeout > 0 ? timeout : Krb5.KDC_TIMEOUT;
         defaultKdcRetryLimit =
                 max_retries > 0 ? max_retries : Krb5.KDC_RETRY_LIMIT;
 
@@ -175,11 +178,11 @@ public String run() {
     /**
      * The instance fields
      */
-    private String realm;
+    private final String realm;
 
     public KdcComm(String realm) throws KrbException {
         if (realm == null) {
-           realm = Config.getInstance().getDefaultRealm();
+            realm = Config.getInstance().getDefaultRealm();
             if (realm == null) {
                 throw new KrbException(Krb5.KRB_ERR_GENERIC,
                                        "Cannot find default realm");
@@ -191,11 +194,10 @@ public KdcComm(String realm) throws KrbException {
     public byte[] send(KrbKdcReq req)
         throws IOException, KrbException {
         int udpPrefLimit = getRealmSpecificValue(
-                realm, "udp_preference_limit", defaultUdpPrefLimit);
+                realm, "udp_preference_limit", defaultUdpPrefLimit, false);
 
         byte[] obuf = req.encoding();
-        boolean useTCP = (udpPrefLimit > 0 &&
-             (obuf != null && obuf.length > udpPrefLimit));
+        boolean useTCP = obuf != null && obuf.length > udpPrefLimit;
 
         return send(req, useTCP);
     }
@@ -207,14 +209,6 @@ private byte[] send(KrbKdcReq req, boolean useTCP)
             return null;
         Config cfg = Config.getInstance();
 
-        if (realm == null) {
-            realm = cfg.getDefaultRealm();
-            if (realm == null) {
-                throw new KrbException(Krb5.KRB_ERR_GENERIC,
-                                       "Cannot find default realm");
-            }
-        }
-
         String kdcList = cfg.getKDCList(realm);
         if (kdcList == null) {
             throw new KrbException("Cannot get kdc for realm " + realm);
@@ -296,9 +290,9 @@ private byte[] send(KrbKdcReq req, String tempKdc, boolean useTCP)
 
         int port = Krb5.KDC_INET_DEFAULT_PORT;
         int retries = getRealmSpecificValue(
-                realm, "max_retries", defaultKdcRetryLimit);
+                realm, "max_retries", defaultKdcRetryLimit, true);
         int timeout = getRealmSpecificValue(
-                realm, "kdc_timeout", defaultKdcTimeout);
+                realm, "kdc_timeout", defaultKdcTimeout, true);
         if (badPolicy == BpType.TRY_LESS &&
                 KdcAccessibility.isBad(tempKdc)) {
             if (retries > tryLessMaxRetries) {
@@ -339,7 +333,7 @@ private byte[] send(KrbKdcReq req, String tempKdc, boolean useTCP)
             }
         }
         if (portStr != null) {
-            int tempPort = parsePositiveIntString(portStr);
+            int tempPort = parseNonNegativeIntString(portStr);
             if (tempPort > 0)
                 port = tempPort;
         }
@@ -444,10 +438,10 @@ private static int parseTimeString(String s) {
             return -1;
         }
         if (s.endsWith("s")) {
-            int seconds = parsePositiveIntString(s.substring(0, s.length()-1));
+            int seconds = parseNonNegativeIntString(s.substring(0, s.length()-1));
             return (seconds < 0) ? -1 : (seconds*1000);
         } else {
-            return parsePositiveIntString(s);
+            return parseNonNegativeIntString(s);
         }
     }
 
@@ -461,9 +455,11 @@ private static int parseTimeString(String s) {
      * the global setting if null
      * @param key the key for the setting
      * @param defValue default value
+     * @param mustBePositive true if value must be >0, false if value must be >=0
      * @return a value for the key
      */
-    private int getRealmSpecificValue(String realm, String key, int defValue) {
+    private int getRealmSpecificValue(String realm, String key, int defValue,
+            boolean mustBePositive) {
         int v = defValue;
 
         if (realm == null) return v;
@@ -475,18 +471,22 @@ private int getRealmSpecificValue(String realm, String key, int defValue) {
             if (key.equals("kdc_timeout")) {
                 temp = parseTimeString(value);
             } else {
-                temp = parsePositiveIntString(value);
+                temp = parseNonNegativeIntString(value);
             }
         } catch (Exception exc) {
             // Ignored, defValue will be picked up
         }
 
-        if (temp > 0) v = temp;
+        if (mustBePositive) {
+            if (temp > 0) v = temp;
+        } else {
+            if (temp >= 0) v = temp;
+        }
 
         return v;
     }
 
-    private static int parsePositiveIntString(String intString) {
+    private static int parseNonNegativeIntString(String intString) {
         if (intString == null)
             return -1;
 
diff --git a/src/java.security.jgss/share/classes/sun/security/krb5/internal/Krb5.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/Krb5.java
index 3cbef7e74d24b..c3cac113c4029 100644
--- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/Krb5.java
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/Krb5.java
@@ -134,6 +134,7 @@ public class Krb5 {
     // number of retries before giving up
 
     public static final int KDC_RETRY_LIMIT = 3;
+    public static final int KDC_TIMEOUT = 30000;
     public static final int KDC_DEFAULT_UDP_PREF_LIMIT = 1465;
     public static final int KDC_HARD_UDP_LIMIT = 32700;
 
diff --git a/test/jdk/sun/security/krb5/auto/KdcPolicy.java b/test/jdk/sun/security/krb5/auto/KdcPolicy.java
index 27c2ace4e542d..6c0cd07cea297 100644
--- a/test/jdk/sun/security/krb5/auto/KdcPolicy.java
+++ b/test/jdk/sun/security/krb5/auto/KdcPolicy.java
@@ -38,7 +38,7 @@
 
 /*
  * @test
- * @bug 8164656 8181461 8194486
+ * @bug 8164656 8181461 8194486 8333772
  * @summary krb5.kdc.bad.policy test
  * @library /test/lib
  * @run main jdk.test.lib.FileInstaller TestHosts TestHosts
@@ -219,13 +219,13 @@ static void writeConf(int max, int to, int... ports) throws Exception {
                 inDefaults += "udp_preference_limit = 10000\n";
             } else if (r.nextBoolean()) {
                 inRealm += "   udp_preference_limit = 10000\n";
-                inDefaults += "udp_preference_limit = 1\n";
+                inDefaults += "udp_preference_limit = 0\n";
             } // else no settings means UDP
         } else {
             if (r.nextBoolean()) {
-                inDefaults += "udp_preference_limit = 1\n";
+                inDefaults += "udp_preference_limit = 0\n";
             } else {
-                inRealm += "   udp_preference_limit = 1\n";
+                inRealm += "   udp_preference_limit = 0\n";
                 inDefaults += "udp_preference_limit = 10000\n";
             }
         }
diff --git a/test/jdk/sun/security/krb5/auto/RealmSpecificValues.java b/test/jdk/sun/security/krb5/auto/RealmSpecificValues.java
new file mode 100644
index 0000000000000..55f35907e5d37
--- /dev/null
+++ b/test/jdk/sun/security/krb5/auto/RealmSpecificValues.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.io.*;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import jdk.test.lib.Asserts;
+import sun.security.krb5.Config;
+
+/*
+ * @test
+ * @bug 8333772
+ * @summary check krb5.conf reading on default and realm-specific values
+ * @library /test/lib
+ */
+public class RealmSpecificValues {
+
+    static DebugMatcher cm = new DebugMatcher();
+
+    public static void main(String[] args) throws Exception {
+        System.setProperty("sun.security.krb5.debug", "true");
+        System.setProperty("java.security.krb5.conf", "alternative-krb5.conf");
+
+        // Defaults
+        writeConf(-1, -1, -1, -1, -1, -1);
+        test(true, 3, 30000);
+
+        // Below has settings. For each setting we provide 3 cases:
+        // 1. Set in defaults, 2, set in realms, 3, both
+
+        // udp = 0 is useful
+        writeConf(0, -1, -1, -1, -1, -1);
+        test(false, 3, 30000);
+        writeConf(-1, -1, -1, 0, -1, -1);
+        test(false, 3, 30000);
+        writeConf(1, -1, -1, 0, -1, -1);
+        test(false, 3, 30000);
+
+        // max_retries = 0 is ignored
+        writeConf(-1, 0, -1, -1, -1, -1);
+        test(true, 3, 30000);
+        writeConf(-1, -1, -1, -1, 0, -1);
+        test(true, 3, 30000);
+        writeConf(-1, 6, -1, -1, 0, -1); // Note: 0 is ignored, it does not reset to default
+        test(true, 6, 30000);
+
+        // max_retries = 1 is useful
+        writeConf(-1, 1, -1, -1, -1, -1);
+        test(true, 1, 30000);
+        writeConf(-1, -1, -1, -1, 1, -1);
+        test(true, 1, 30000);
+        writeConf(-1, 3, -1, -1, 1, -1);
+        test(true, 1, 30000);
+
+        // timeout = 0 is ignored
+        writeConf(-1, -1, 0, -1, -1, -1);
+        test(true, 3, 30000);
+        writeConf(-1, -1, -1, -1, -1, 0);
+        test(true, 3, 30000);
+        writeConf(-1, -1, 10000, -1, -1, 0);
+        test(true, 3, 10000);
+
+        // timeout > 0 is useful
+        writeConf(-1, -1, 10000, -1, -1, -1);
+        test(true, 3, 10000);
+        writeConf(-1, -1, -1, -1, -1, 10000);
+        test(true, 3, 10000);
+        writeConf(-1, -1, 20000, -1, -1, 10000);
+        test(true, 3, 10000);
+    }
+
+    static void writeConf(int limit, int retries, int timeout,
+            int limitR, int retriesR, int timeoutR) throws Exception {
+
+        String inDefaults = "";
+        if (limit >= 0) inDefaults += "udp_preference_limit = " + limit + "\n";
+        if (retries >= 0) inDefaults += "max_retries = " + retries + "\n";
+        if (timeout >= 0) inDefaults += "kdc_timeout = " + timeout + "\n";
+
+        String inRealm = "";
+        if (limitR >= 0) inRealm += "udp_preference_limit = " + limitR + "\n";
+        if (retriesR >= 0) inRealm += "max_retries = " + retriesR + "\n";
+        if (timeoutR >= 0) inRealm += "kdc_timeout = " + timeoutR + "\n";
+
+        String conf = "[libdefaults]\n" +
+                "default_realm = " + OneKDC.REALM + "\n" +
+                inDefaults +
+                "\n" +
+                "[realms]\n" +
+                OneKDC.REALM + " = {\n" +
+                "kdc = " + OneKDC.KDCHOST + ":12345\n" +
+                inRealm +
+                "}\n";
+
+        Files.writeString(Paths.get("alternative-krb5.conf"), conf);
+    }
+
+    static void test(boolean isUDP, int retries, int timeout) throws Exception {
+
+        PrintStream oldErr = System.err;
+        ByteArrayOutputStream bo = new ByteArrayOutputStream();
+        System.setErr(new PrintStream(bo));
+        try {
+            Config.refresh();
+            Context.fromUserPass(OneKDC.USER, OneKDC.PASS, false);
+        } catch (Exception e) {
+            // will happen
+        } finally {
+            System.setErr(oldErr);
+        }
+
+        String[] lines = new String(bo.toByteArray()).split("\n");
+        for (String line: lines) {
+            if (cm.match(line)) {
+                System.out.println(line);
+                Asserts.assertEQ(cm.isUDP(), isUDP);
+                Asserts.assertEQ(cm.timeout(), timeout);
+                Asserts.assertEQ(cm.retries(), retries);
+                return;
+            }
+        }
+        Asserts.fail("Should not reach here");
+    }
+
+    /**
+     * A helper class to match the krb5 debug output:
+     * >>> KrbKdcReq send: kdc=kdc.rabbit.hole TCP:12345, timeout=30000,
+     *     number of retries =3, #bytes=141
+     */
+    static class DebugMatcher {
+
+        static final Pattern re = Pattern.compile(
+                ">>> KrbKdcReq send: kdc=\\S+ (TCP|UDP):\\d+, " +
+                        "timeout=(\\d+), number of retries\\s*=(\\d+)");
+
+        Matcher matcher;
+
+        boolean match(String line) {
+            matcher = re.matcher(line);
+            return matcher.find();
+        }
+
+        boolean isUDP() {
+            return matcher.group(1).equals("UDP");
+        }
+
+        int timeout() {
+            return Integer.parseInt(matcher.group(2));
+        }
+
+        int retries() {
+            return Integer.parseInt(matcher.group(3));
+        }
+    }
+}

From 7ea773056433c467dbd321a0a063f4789552ef89 Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevinw@openjdk.org>
Date: Mon, 22 Jul 2024 16:40:34 +0000
Subject: [PATCH 167/401] 8332551: Test
 vmTestbase/nsk/monitoring/MemoryNotificationInfo/from/from001/TestDescription.java
 timed out

Reviewed-by: sspitsyn, lmesnik
---
 .../MemoryNotificationInfo/from/from001.java  | 91 ++++++++++++-------
 .../from/from001/TestDescription.java         | 11 ++-
 2 files changed, 67 insertions(+), 35 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/MemoryNotificationInfo/from/from001.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/MemoryNotificationInfo/from/from001.java
index b6ca1c84e9c4c..6e50e6998cdd5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/MemoryNotificationInfo/from/from001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/MemoryNotificationInfo/from/from001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.TimeUnit;
 import nsk.share.*;
 import nsk.share.gc.Algorithms;
 import nsk.share.gc.Memory;
@@ -39,6 +40,7 @@
 public class from001 {
 
     private static boolean testFailed = false;
+    private static final int MAX_TRIES = 6; // limit attempts to receive Notification data
 
     public static void main(String[] args) {
 
@@ -62,8 +64,8 @@ public static void main(String[] args) {
 
         log.display("null CompositeData check passed.");
 
-        // 2. Check CompositeData that doest not represnt
-        // MemoryNotificationInfo - IllegalArgumentException must be thrown
+        // 2. Check CompositeData that does not represent MemoryNotificationInfo
+        // throws IllegalArgumentException
 
         ObjectName mbeanObjectName = null;
         CompositeData cdata = null;
@@ -85,12 +87,13 @@ public static void main(String[] args) {
             testFailed = true;
         } catch (IllegalArgumentException e) {
 
-            // Expected: CompositeData doest not represnt MemoryNotificationInfo
+            // Expected: CompositeData does not represent MemoryNotificationInfo
         }
 
-        log.display("check for CompositeData doest not represnt MemoryNotificationInfo passed.");
+        log.display("check that CompositeData does not represent MemoryNotificationInfo passed.");
 
-        // 3. Check correct CompositeData
+        // 3. Check correct CompositeData usage:
+        // First try to provoke a Notification on a MemoryPool.
         Object poolObject = null;
         try {
             mbeanObjectName = new ObjectName(ManagementFactory.MEMORY_MXBEAN_NAME);
@@ -123,7 +126,11 @@ public static void main(String[] args) {
             throw new TestFailure("TEST FAILED. See log.");
         }
 
-        // eat memory just to emmit notification
+        if (poolObject == null) {
+            throw new TestFailure("No memory pool found to test.");
+        }
+
+        // eat memory just to emit notification
         Stresser stresser = new Stresser(args) {
 
             @Override
@@ -133,41 +140,57 @@ public boolean continueExecution() {
             }
         };
         stresser.start(0);// we use timeout, not iterations
-        GarbageUtils.eatMemory(stresser);
-
-        boolean messageNotRecieved = true;
-        while(messageNotRecieved) {
+        int oomCount = GarbageUtils.eatMemory(stresser);
+        log.display("eatMemory returns OOM count: " + oomCount);
+
+        // Check for the message.  Poll on queue to avoid waiting forver on failure.
+        // Notification is known to fail, very rarely, with -Xcomp where the allocations
+        // do not affect the monitored pool. Possibly a timing issue, where the "eatMemory"
+        // is done before Notification/threshold processing happens.
+        // The Notification is quite immediate, other than that problem.
+        boolean messageReceived = false;
+        int tries = 0;
+        while (!messageReceived && ++tries < MAX_TRIES) {
             try {
-                from001Listener.queue.take();
-                messageNotRecieved = false;
+                Object r = from001Listener.queue.poll(10000, TimeUnit.MILLISECONDS);
+                if (r == null) {
+                    log.display("poll for Notification data returns null...");
+                    continue;
+                } else {
+                    messageReceived = true;
+                    break;
+                }
             } catch (InterruptedException e) {
-                messageNotRecieved = true;
+                // ignored, continue
             }
         }
 
+        // If we got a Notification, test that the CompositeData can create a MemoryNotificationInfo
+        if (!messageReceived) {
+            throw new TestFailure("No Notification received.");
+        }
         result = MemoryNotificationInfo.from(from001Listener.data.get());
         try {
-           ObjectName poolObjectName = new ObjectName(monitor.getName(poolObject));
-           ObjectName resultObjectName = new ObjectName(
-                     ManagementFactory.MEMORY_POOL_MXBEAN_DOMAIN_TYPE +
-                     ",name=" + result.getPoolName());
-
-           log.display("poolObjectName : " + poolObjectName +
-                              " resultObjectName : " + resultObjectName);
-
-           if (!poolObjectName.equals(resultObjectName)) {
-              log.complain("FAILURE 3.");
-              log.complain("Wrong pool name : " + resultObjectName +
-                           ", expected : " + poolObjectName);
-              testFailed = true;
-           }
+            ObjectName poolObjectName = new ObjectName(monitor.getName(poolObject));
+            ObjectName resultObjectName = new ObjectName(
+                        ManagementFactory.MEMORY_POOL_MXBEAN_DOMAIN_TYPE +
+                        ",name=" + result.getPoolName());
+
+            log.display("poolObjectName : " + poolObjectName +
+                        " resultObjectName : " + resultObjectName);
+
+            if (!poolObjectName.equals(resultObjectName)) {
+                log.complain("FAILURE 3.");
+                log.complain("Wrong pool name : " + resultObjectName +
+                             ", expected : " + poolObjectName);
+                testFailed = true;
+            }
 
         } catch (Exception e) {
             log.complain("Unexpected exception " + e);
             e.printStackTrace(log.getOutStream());
             testFailed = true;
         }
-
         if (testFailed) {
             throw new TestFailure("TEST FAILED. See log.");
         }
@@ -183,9 +206,13 @@ class from001Listener implements NotificationListener {
     static SynchronousQueue<Object> queue = new SynchronousQueue<Object>();
 
     public void handleNotification(Notification notification, Object handback) {
-        if (data.get() != null)
+        if (data.get() != null) {
+            System.out.println("handleNotification: ignoring");
             return;
-        data.set((CompositeData) notification.getUserData());
+        }
+        System.out.println("handleNotification: getting data");
+        CompositeData d = (CompositeData) notification.getUserData();
+        data.set(d);
 
         boolean messageNotSent = true;
         while(messageNotSent){
@@ -193,7 +220,7 @@ public void handleNotification(Notification notification, Object handback) {
                 queue.put(new Object());
                 messageNotSent = false;
             } catch(InterruptedException e) {
-                messageNotSent = true;
+                // ignore, retry
             }
         }
     }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/MemoryNotificationInfo/from/from001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/MemoryNotificationInfo/from/from001/TestDescription.java
index 3630a3dd36d05..629672b2e9176 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/MemoryNotificationInfo/from/from001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/MemoryNotificationInfo/from/from001/TestDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,15 +34,20 @@
  *         MemoryNotificationInfo.from(CompositeData)
  *     returns correct results:
  *     1. null, if CompositeData is null;
- *     2. trows IllegalArgumentException, if CompositeData doest not represnt
+ *     2. throws IllegalArgumentException, if CompositeData does not represent
  *        MemoryNotificationInfo;
- *     3. correct MemoryNotificationInfo object, if CompositeData is correst (i.e
+ *     3. correct MemoryNotificationInfo object, if CompositeData is correct, i.e
  *        all attributes of the CompositeData must have correct values: pool name,
  *        count; init, used, committed, max (from MemoryUsage).
  * COMMENT
  *     Updated according to:
  *     5024531 Fix MBeans design flaw that restricts to use JMX CompositeData
  *
+ * Avoid running with -Xcomp due to rare failure where the MemoryPool does not
+ * increase in usage and send Notification.  Likely the timing changes so "eatMemory"
+ * completes before Notification/threshold processing.
+ *
+ * @requires vm.compMode != "Xcomp"
  * @library /vmTestbase
  *          /test/lib
  * @run main/othervm

From c1c9704268e9e651cd82c8550913d8ac60aa494a Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Mon, 22 Jul 2024 17:17:46 +0000
Subject: [PATCH 168/401] 8336479: Provide Process.waitFor(Duration)

Reviewed-by: liach, jpai, rriggs
---
 .../share/classes/java/lang/Process.java      | 34 ++++++++-
 .../java/lang/Process/WaitForDuration.java    | 73 +++++++++++++++++++
 .../jdk/test/lib/process/ProcessTools.java    | 10 +++
 3 files changed, 115 insertions(+), 2 deletions(-)
 create mode 100644 test/jdk/java/lang/Process/WaitForDuration.java

diff --git a/src/java.base/share/classes/java/lang/Process.java b/src/java.base/share/classes/java/lang/Process.java
index 756705285d966..a01a1f93fd22a 100644
--- a/src/java.base/share/classes/java/lang/Process.java
+++ b/src/java.base/share/classes/java/lang/Process.java
@@ -32,6 +32,7 @@
 import java.lang.ProcessBuilder.Redirect;
 import java.nio.charset.Charset;
 import java.nio.charset.UnsupportedCharsetException;
+import java.time.Duration;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ForkJoinPool;
@@ -475,6 +476,35 @@ public boolean waitFor(long timeout, TimeUnit unit)
         return false;
     }
 
+    /**
+     * Causes the current thread to wait, if necessary, until the
+     * process represented by this {@code Process} object has
+     * terminated, or the specified waiting duration elapses.
+     *
+     * <p>If the process has already terminated then this method returns
+     * immediately with the value {@code true}.  If the process has not
+     * terminated and the duration is not positive, then
+     * this method returns immediately with the value {@code false}.
+     *
+     * <p>The default implementation of this method polls the {@code exitValue}
+     * to check if the process has terminated. Concrete implementations of this
+     * class are strongly encouraged to override this method with a more
+     * efficient implementation.
+     *
+     * @param duration the maximum duration to wait; if not positive,
+     *                this method returns immediately.
+     * @return {@code true} if the process has exited and {@code false} if
+     *         the waiting duration elapsed before the process has exited.
+     * @throws InterruptedException if the current thread is interrupted
+     *         while waiting.
+     * @throws NullPointerException if duration is null
+     * @since 24
+     */
+    public boolean waitFor(Duration duration) throws InterruptedException {
+        Objects.requireNonNull(duration, "duration");
+        return waitFor(TimeUnit.NANOSECONDS.convert(duration), TimeUnit.NANOSECONDS);
+    }
+
     /**
      * Returns the exit value for the process.
      *
@@ -577,8 +607,8 @@ public boolean isAlive() {
 
     /**
      * This is called from the default implementation of
-     * {@code waitFor(long, TimeUnit)}, which is specified to poll
-     * {@code exitValue()}.
+     * {@code waitFor(long, TimeUnit)} and {@code waitFor(Duration)},
+     * which are specified to poll {@code exitValue()}.
      */
     private boolean hasExited() {
         try {
diff --git a/test/jdk/java/lang/Process/WaitForDuration.java b/test/jdk/java/lang/Process/WaitForDuration.java
new file mode 100644
index 0000000000000..d9172b305a0c0
--- /dev/null
+++ b/test/jdk/java/lang/Process/WaitForDuration.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 8336479
+ * @summary Tests for Process.waitFor(Duration)
+ * @library /test/lib
+ * @run junit WaitForDuration
+ */
+
+import java.io.IOException;
+import java.time.Duration;
+import java.util.stream.Stream;
+import jdk.test.lib.process.ProcessTools;
+
+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.*;
+
+public class WaitForDuration {
+    static Stream<Arguments> durations() {
+        return Stream.of(
+            Arguments.of(Duration.ZERO, 3_600_000, false),
+            Arguments.of(Duration.ofSeconds(-100), 3_600_000, false),
+            Arguments.of(Duration.ofSeconds(100), 0, true),
+            Arguments.of(Duration.ofSeconds(Long.MAX_VALUE), 0, true), // nano overflow
+            Arguments.of(Duration.ofSeconds(Long.MIN_VALUE), 3_600_000, false) // nano underflow
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("durations")
+    void testEdgeDurations(Duration d, int sleepMillis, boolean expected)
+            throws IOException, InterruptedException {
+        var pb = ProcessTools.createTestJavaProcessBuilder(
+            WaitForDuration.class.getSimpleName(), Integer.toString(sleepMillis));
+        assertEquals(expected, pb.start().waitFor(d));
+    }
+
+    @Test
+    void testNullDuration() throws IOException, InterruptedException {
+        var pb = ProcessTools.createTestJavaProcessBuilder(
+            WaitForDuration.class.getSimpleName(), "0");
+        assertThrows(NullPointerException.class, () -> pb.start().waitFor(null));
+    }
+
+    public static void main(String... args) throws InterruptedException {
+        Thread.sleep(Integer.parseInt(args[0]));
+    }
+}
diff --git a/test/lib/jdk/test/lib/process/ProcessTools.java b/test/lib/jdk/test/lib/process/ProcessTools.java
index aafb6fe3f4c74..6ab36c8bfd3b9 100644
--- a/test/lib/jdk/test/lib/process/ProcessTools.java
+++ b/test/lib/jdk/test/lib/process/ProcessTools.java
@@ -42,6 +42,7 @@
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -965,6 +966,15 @@ public boolean waitFor(long timeout, TimeUnit unit) throws InterruptedException
             return rslt;
         }
 
+        @Override
+        public boolean waitFor(Duration duration) throws InterruptedException {
+            boolean rslt = p.waitFor(duration);
+            if (rslt) {
+                waitForStreams();
+            }
+            return rslt;
+        }
+
         private void waitForStreams() throws InterruptedException {
             try {
                 stdoutTask.get();

From 8438c5853f4ae5cef4e861cd0b3952371c886f45 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@openjdk.org>
Date: Mon, 22 Jul 2024 17:20:58 +0000
Subject: [PATCH 169/401] 8336844: ZipConstants64 defines duplicate constants
 EXTID_ZIP64 and ZIP64_EXTID

Reviewed-by: jpai, vtewari, lancea
---
 .../share/classes/java/util/zip/ZipConstants64.java         | 3 +--
 src/java.base/share/classes/java/util/zip/ZipFile.java      | 6 +++---
 .../share/classes/java/util/zip/ZipInputStream.java         | 2 +-
 .../share/classes/java/util/zip/ZipOutputStream.java        | 4 ++--
 src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipConstants.java | 3 +--
 .../share/classes/jdk/nio/zipfs/ZipFileSystem.java          | 4 ++--
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/java.base/share/classes/java/util/zip/ZipConstants64.java b/src/java.base/share/classes/java/util/zip/ZipConstants64.java
index d78eaf432d0b2..203e02ed9739c 100644
--- a/src/java.base/share/classes/java/util/zip/ZipConstants64.java
+++ b/src/java.base/share/classes/java/util/zip/ZipConstants64.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,6 @@ class ZipConstants64 {
     static final int  ZIP64_ENDHDR = 56;           // ZIP64 end header size
     static final int  ZIP64_LOCHDR = 20;           // ZIP64 end loc header size
     static final int  ZIP64_EXTHDR = 24;           // EXT header size
-    static final int  ZIP64_EXTID  = 0x0001;       // Extra field Zip64 header ID
 
     static final int  ZIP64_MAGICCOUNT = 0xFFFF;
     static final long ZIP64_MAGICVAL = 0xFFFFFFFFL;
diff --git a/src/java.base/share/classes/java/util/zip/ZipFile.java b/src/java.base/share/classes/java/util/zip/ZipFile.java
index da8ab730873f2..6ab70d4bdb81d 100644
--- a/src/java.base/share/classes/java/util/zip/ZipFile.java
+++ b/src/java.base/share/classes/java/util/zip/ZipFile.java
@@ -1324,7 +1324,7 @@ private void checkExtraFields(int cenPos, int startingOffset,
                             tag, cenPos));
                 }
 
-                if (tag == ZIP64_EXTID) {
+                if (tag == EXTID_ZIP64) {
                     // Get the compressed size;
                     long csize = CENSIZ(cen, cenPos);
                     // Get the uncompressed size;
@@ -1360,7 +1360,7 @@ private void checkZip64ExtraFieldValues(int off, int blockSize, long csize,
                                                 long size, long locoff, int diskNo)
                 throws ZipException {
             byte[] cen = this.cen;
-            // if ZIP64_EXTID blocksize == 0, which may occur with some older
+            // if EXTID_ZIP64 blocksize == 0, which may occur with some older
             // versions of Apache Ant and Commons Compress, validate csize and size
             // to make sure neither field == ZIP64_MAGICVAL
             if (blockSize == 0) {
@@ -1368,7 +1368,7 @@ private void checkZip64ExtraFieldValues(int off, int blockSize, long csize,
                         locoff == ZIP64_MAGICVAL || diskNo == ZIP64_MAGICCOUNT) {
                     zerror("Invalid CEN header (invalid zip64 extra data field size)");
                 }
-                // Only validate the ZIP64_EXTID data if the block size > 0
+                // Only validate the EXTID_ZIP64 data if the block size > 0
                 return;
             }
             // Validate the Zip64 Extended Information Extra Field (0x0001)
diff --git a/src/java.base/share/classes/java/util/zip/ZipInputStream.java b/src/java.base/share/classes/java/util/zip/ZipInputStream.java
index 26f78b395c599..5302cf7516077 100644
--- a/src/java.base/share/classes/java/util/zip/ZipInputStream.java
+++ b/src/java.base/share/classes/java/util/zip/ZipInputStream.java
@@ -679,7 +679,7 @@ private boolean expect64BitDataDescriptor(byte[] extra, int flag, long csize, lo
                 if (i + headerSize + dsize > extra.length) {
                     return false; // Invalid size
                 }
-                if (id == ZIP64_EXTID) {
+                if (id == EXTID_ZIP64) {
                     return true;
                 }
                 i += headerSize + dsize;
diff --git a/src/java.base/share/classes/java/util/zip/ZipOutputStream.java b/src/java.base/share/classes/java/util/zip/ZipOutputStream.java
index 231e6629a54ae..f68c27b265ee1 100644
--- a/src/java.base/share/classes/java/util/zip/ZipOutputStream.java
+++ b/src/java.base/share/classes/java/util/zip/ZipOutputStream.java
@@ -485,7 +485,7 @@ private void writeLOC(XEntry xentry) throws IOException {
         writeShort(elen);
         writeBytes(nameBytes, 0, nameBytes.length);
         if (hasZip64) {
-            writeShort(ZIP64_EXTID);
+            writeShort(EXTID_ZIP64);
             writeShort(16);
             writeLong(e.size);
             writeLong(e.csize);
@@ -643,7 +643,7 @@ private void writeCEN(XEntry xentry) throws IOException {
 
         // take care of EXTID_ZIP64 and EXTID_EXTT
         if (hasZip64) {
-            writeShort(ZIP64_EXTID);// Zip64 extra
+            writeShort(EXTID_ZIP64);// Zip64 extra
             writeShort(elenZIP64);
             if (size == ZIP64_MAGICVAL)
                 writeLong(e.size);
diff --git a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipConstants.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipConstants.java
index 5c249e3dc400e..e1f5954af8a15 100644
--- a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipConstants.java
+++ b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -130,7 +130,6 @@ class ZipConstants {
     static final int  ZIP64_ENDHDR = 56;           // ZIP64 end header size
     static final int  ZIP64_LOCHDR = 20;           // ZIP64 end loc header size
     static final int  ZIP64_EXTHDR = 24;           // EXT header size
-    static final int  ZIP64_EXTID  = 0x0001;       // Extra field Zip64 header ID
 
     static final int  ZIP64_MINVAL32 = 0xFFFF;
     static final long ZIP64_MINVAL = 0xFFFFFFFFL;
diff --git a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java
index 5e5b665790f96..20ed86eae4f1b 100644
--- a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java
+++ b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java
@@ -1710,7 +1710,7 @@ private void checkExtraFields( byte[] cen, int cenPos, long size, long csize,
     private void checkZip64ExtraFieldValues(byte[] cen, int off, int blockSize, long csize,
                                             long size, long locoff, int diskNo)
             throws ZipException {
-        // if ZIP64_EXTID blocksize == 0, which may occur with some older
+        // if EXTID_ZIP64 blocksize == 0, which may occur with some older
         // versions of Apache Ant and Commons Compress, validate csize and size
         // to make sure neither field == ZIP64_MAGICVAL
         if (blockSize == 0) {
@@ -1718,7 +1718,7 @@ private void checkZip64ExtraFieldValues(byte[] cen, int off, int blockSize, long
                     locoff == ZIP64_MINVAL || diskNo == ZIP64_MINVAL32) {
                 zerror("Invalid CEN header (invalid zip64 extra data field size)");
             }
-            // Only validate the ZIP64_EXTID data if the block size > 0
+            // Only validate the EXTID_ZIP64 data if the block size > 0
             return;
         }
         // Validate the Zip64 Extended Information Extra Field (0x0001)

From 31a85f17440ca0d791f694d670119ba8adc1ba7f Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@openjdk.org>
Date: Mon, 22 Jul 2024 17:25:42 +0000
Subject: [PATCH 170/401] 8336491: Unnecessary boxing conversions in
 void-returning lambdas

Reviewed-by: mcimadamore
---
 .../com/sun/tools/javac/comp/Lower.java       |  6 ++
 .../tools/javac/lambda/VoidReturnBoxing.java  | 63 +++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 test/langtools/tools/javac/lambda/VoidReturnBoxing.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
index 7c7db6de0863b..a330f045fe5fe 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
@@ -3329,6 +3329,9 @@ List<JCExpression> boxArgs(List<Type> parameters, List<JCExpression> _args, Type
     /** Expand a boxing or unboxing conversion if needed. */
     @SuppressWarnings("unchecked") // XXX unchecked
     <T extends JCExpression> T boxIfNeeded(T tree, Type type) {
+        Assert.check(!type.hasTag(VOID));
+        if (type.hasTag(NONE))
+            return tree;
         boolean havePrimitive = tree.type.isPrimitive();
         if (havePrimitive == type.isPrimitive())
             return tree;
@@ -3845,6 +3848,9 @@ public void visitLambda(JCLambda tree) {
         Type prevRestype = currentRestype;
         try {
             currentRestype = types.erasure(tree.getDescriptorType(types)).getReturnType();
+            // represent void results as NO_TYPE, to avoid unnecessary boxing in boxIfNeeded
+            if (currentRestype.hasTag(VOID))
+                currentRestype = Type.noType;
             tree.body = tree.getBodyKind() == BodyKind.EXPRESSION ?
                     translate((JCExpression) tree.body, currentRestype) :
                     translate(tree.body);
diff --git a/test/langtools/tools/javac/lambda/VoidReturnBoxing.java b/test/langtools/tools/javac/lambda/VoidReturnBoxing.java
new file mode 100644
index 0000000000000..2dc57af1b796e
--- /dev/null
+++ b/test/langtools/tools/javac/lambda/VoidReturnBoxing.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2024, Alphabet LLC. 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 8336491
+ * @summary Verify that void returning expression lambdas don't box their result
+ * @modules jdk.compiler
+ *          jdk.jdeps/com.sun.tools.javap
+ */
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.nio.file.Path;
+
+public class VoidReturnBoxing {
+
+    public static void main(String[] args) {
+        new VoidReturnBoxing().run();
+    }
+
+    void run() {
+        Path path = Path.of(System.getProperty("test.classes"), "T.class");
+        StringWriter s;
+        String out;
+        try (PrintWriter pw = new PrintWriter(s = new StringWriter())) {
+            com.sun.tools.javap.Main.run(new String[] {"-p", "-c", path.toString()}, pw);
+            out = s.toString();
+        }
+        if (out.contains("java/lang/Integer.valueOf")) {
+            throw new AssertionError(
+                    "Unnecessary boxing of void returning expression lambda result:\n\n" + out);
+        }
+    }
+}
+
+class T {
+    int g() {
+        return 0;
+    }
+
+    Runnable r = () -> g();
+}

From 34eea6a5fa27121bc0e9e8ace0894833d4a9f826 Mon Sep 17 00:00:00 2001
From: Henry Lin <hny@amazon.com>
Date: Mon, 22 Jul 2024 17:29:12 +0000
Subject: [PATCH 171/401] 8333088: ubsan:
 shenandoahAdaptiveHeuristics.cpp:245:44: runtime error: division by zero

Reviewed-by: shade, rkennke
---
 .../gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp
index 331e98b1e85bf..0bcb236ccbd80 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp
@@ -242,7 +242,7 @@ bool ShenandoahAdaptiveHeuristics::should_start_gc() {
 
   double avg_cycle_time = _gc_time_history->davg() + (_margin_of_error_sd * _gc_time_history->dsd());
   double avg_alloc_rate = _allocation_rate.upper_bound(_margin_of_error_sd);
-  if (avg_cycle_time > allocation_headroom / avg_alloc_rate) {
+  if (avg_cycle_time * avg_alloc_rate > allocation_headroom) {
     log_info(gc)("Trigger: Average GC time (%.2f ms) is above the time for average allocation rate (%.0f %sB/s) to deplete free headroom (" SIZE_FORMAT "%s) (margin of error = %.2f)",
                  avg_cycle_time * 1000,
                  byte_size_in_proper_unit(avg_alloc_rate), proper_unit_for_byte_size(avg_alloc_rate),

From b5575942027281166676678e2081b024ec572644 Mon Sep 17 00:00:00 2001
From: Henry Lin <hny@amazon.com>
Date: Mon, 22 Jul 2024 17:29:27 +0000
Subject: [PATCH 172/401] 8333728: ubsan: shenandoahFreeSet.cpp:1347:24:
 runtime error: division by zero

Reviewed-by: shade, rkennke
---
 src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
index 725cfc85da645..582c0d18d3ede 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
@@ -1351,7 +1351,6 @@ void ShenandoahFreeSet::print_on(outputStream* out) const {
 double ShenandoahFreeSet::internal_fragmentation() {
   double squared = 0;
   double linear = 0;
-  int count = 0;
 
   idx_t rightmost = _partitions.rightmost(ShenandoahFreeSetPartitionId::Mutator);
   for (idx_t index = _partitions.leftmost(ShenandoahFreeSetPartitionId::Mutator); index <= rightmost; ) {
@@ -1361,11 +1360,10 @@ double ShenandoahFreeSet::internal_fragmentation() {
     size_t used = r->used();
     squared += used * used;
     linear += used;
-    count++;
     index = _partitions.find_index_of_next_available_region(ShenandoahFreeSetPartitionId::Mutator, index + 1);
   }
 
-  if (count > 0) {
+  if (linear > 0) {
     double s = squared / (ShenandoahHeapRegion::region_size_bytes() * linear);
     return 1 - s;
   } else {

From b144910ebb74be5a12dae57263f2a93452535f02 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Mon, 22 Jul 2024 18:56:30 +0000
Subject: [PATCH 173/401] 8334145: <pid> missing from vm_memory_map_<pid>.txt
 in System.dump_map help text

Reviewed-by: dholmes, stuefe
---
 src/jdk.jcmd/share/man/jcmd.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jdk.jcmd/share/man/jcmd.1 b/src/jdk.jcmd/share/man/jcmd.1
index ec87ee3ae47a9..a639dab16e144 100644
--- a/src/jdk.jcmd/share/man/jcmd.1
+++ b/src/jdk.jcmd/share/man/jcmd.1
@@ -878,7 +878,7 @@ The following \f[I]options\f[R] must be specified using either
 \f[V]-H\f[R]: (Optional) Human readable format (BOOLEAN, false)
 .IP \[bu] 2
 \f[V]-F\f[R]: (Optional) File path (STRING,
-\[dq]vm_memory_map_.txt\[dq])
+\[dq]vm_memory_map_<pid>.txt\[dq])
 .RE
 .TP
 \f[V]System.map\f[R] [\f[I]options\f[R]] (Linux only)

From ed6499446dadc339599271a282ceca4a52dbeed4 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Mon, 22 Jul 2024 19:34:09 +0000
Subject: [PATCH 174/401] 8333391: Test com/sun/jdi/InterruptHangTest.java
 failed: Thread was never interrupted during sleep

Reviewed-by: lmesnik, amenkov
---
 test/jdk/com/sun/jdi/InterruptHangTest.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/jdk/com/sun/jdi/InterruptHangTest.java b/test/jdk/com/sun/jdi/InterruptHangTest.java
index a8062586d27e0..5dcb5efef3196 100644
--- a/test/jdk/com/sun/jdi/InterruptHangTest.java
+++ b/test/jdk/com/sun/jdi/InterruptHangTest.java
@@ -101,8 +101,10 @@ public static void main(String[] args){
         for (int ii = 0; ii < INTERRUPTS_EXPECTED; ii++) {
             boolean wasInterrupted = false;
             try {
-                // Give other thread a chance to interrupt
-                Thread.sleep(100);
+                // Give other thread a chance to interrupt. Normally only a very short
+                // sleep is needed, but we need to account for unexpected delays in
+                // the interrupt due to machine and network hiccups.
+                Thread.sleep(10*1000);
             } catch (InterruptedException ee) {
                 answer++;
                 wasInterrupted = true;

From d63d6e23d123e82cef1372aed31b5846fb6d23fd Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Mon, 22 Jul 2024 22:17:43 +0000
Subject: [PATCH 175/401] 8336935: Test
 sun/security/krb5/auto/RealmSpecificValues.java fails:
 java.lang.RuntimeException: Should not reach here

Reviewed-by: hchao, dholmes
---
 test/jdk/sun/security/krb5/auto/RealmSpecificValues.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/jdk/sun/security/krb5/auto/RealmSpecificValues.java b/test/jdk/sun/security/krb5/auto/RealmSpecificValues.java
index 55f35907e5d37..23dcf10448fbb 100644
--- a/test/jdk/sun/security/krb5/auto/RealmSpecificValues.java
+++ b/test/jdk/sun/security/krb5/auto/RealmSpecificValues.java
@@ -35,6 +35,7 @@
  * @bug 8333772
  * @summary check krb5.conf reading on default and realm-specific values
  * @library /test/lib
+ * @run main/othervm RealmSpecificValues
  */
 public class RealmSpecificValues {
 

From 96e4a1876a3ab0819c017ba9b634711fe19e58c3 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Mon, 22 Jul 2024 22:53:52 +0000
Subject: [PATCH 176/401] 8304929: MethodTypeDesc throws an unchecked exception
 than ReflectiveOperationException when a component class cannot be resolved

Reviewed-by: jvernee
---
 .../internal/constant/MethodTypeDescImpl.java | 29 ++++++++++++-------
 .../lang/constant/MethodTypeDescTest.java     |  8 ++++-
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/constant/MethodTypeDescImpl.java b/src/java.base/share/classes/jdk/internal/constant/MethodTypeDescImpl.java
index 0a75416fe73b4..5061c95cb423f 100644
--- a/src/java.base/share/classes/jdk/internal/constant/MethodTypeDescImpl.java
+++ b/src/java.base/share/classes/jdk/internal/constant/MethodTypeDescImpl.java
@@ -213,16 +213,25 @@ public String descriptorString() {
 
     @Override
     public MethodType resolveConstantDesc(MethodHandles.Lookup lookup) throws ReflectiveOperationException {
-        @SuppressWarnings("removal")
-        MethodType mtype = AccessController.doPrivileged(new PrivilegedAction<>() {
-            @Override
-            public MethodType run() {
-                return MethodType.fromMethodDescriptorString(descriptorString(),
-                                                             lookup.lookupClass().getClassLoader());
-            }
-        });
-
-        // let's check that the lookup has access to all the types in the method type
+        MethodType mtype;
+        try {
+            @SuppressWarnings("removal")
+            MethodType mt = AccessController.doPrivileged(new PrivilegedAction<>() {
+                @Override
+                public MethodType run() {
+                    return MethodType.fromMethodDescriptorString(descriptorString(),
+                        lookup.lookupClass().getClassLoader());
+                }
+            });
+            mtype = mt;
+        } catch (TypeNotPresentException ex) {
+            throw (ClassNotFoundException) ex.getCause();
+        }
+
+        // Some method types, like ones containing a package private class not accessible
+        // to the overriding method, can be valid method descriptors and obtained from
+        // MethodType.fromMethodDescriptor, but ldc instruction will fail to resolve such
+        // MethodType constants due to access control (JVMS 5.4.3.1 and 5.4.3.5)
         lookup.accessClass(mtype.returnType());
         for (Class<?> paramType: mtype.parameterArray()) {
             lookup.accessClass(paramType);
diff --git a/test/jdk/java/lang/constant/MethodTypeDescTest.java b/test/jdk/java/lang/constant/MethodTypeDescTest.java
index fd59a9240e9e4..5f7a2fc691fc8 100644
--- a/test/jdk/java/lang/constant/MethodTypeDescTest.java
+++ b/test/jdk/java/lang/constant/MethodTypeDescTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,6 +21,7 @@
  * questions.
  */
 
+import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.constant.ClassDesc;
 import java.lang.constant.MethodTypeDesc;
@@ -304,4 +305,9 @@ public void testOfListImmutability() {
                 mtd.parameterList().set(1, CD_void));
         assertEquals(mtd, MethodTypeDesc.of(CD_void, CD_Object, CD_int));
     }
+
+    public void testMissingClass() {
+        var mtd = MTD_void.insertParameterTypes(0, ClassDesc.of("does.not.exist.DoesNotExist"));
+        assertThrows(ReflectiveOperationException.class, () -> mtd.resolveConstantDesc(MethodHandles.publicLookup()));
+    }
 }

From aabec4a947ed2a808a1443fa6b2dabedd8c2dd9f Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Mon, 22 Jul 2024 22:54:36 +0000
Subject: [PATCH 177/401] 8335922: Incorrect @Stable usage of
 LambdaForm$Name.index

Reviewed-by: jvernee, shade
---
 .../classes/java/lang/invoke/LambdaForm.java  | 70 ++++++-------------
 1 file changed, 23 insertions(+), 47 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/invoke/LambdaForm.java b/src/java.base/share/classes/java/lang/invoke/LambdaForm.java
index 09ea5df4a235f..3f6e521b27bd9 100644
--- a/src/java.base/share/classes/java/lang/invoke/LambdaForm.java
+++ b/src/java.base/share/classes/java/lang/invoke/LambdaForm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -395,7 +395,7 @@ private static Name[] buildEmptyNames(int arity, MethodType mt, boolean isVoid)
         Name[] names = arguments(isVoid ? 0 : 1, mt);
         if (!isVoid) {
             Name zero = new Name(constantZero(basicType(mt.returnType())));
-            names[arity] = zero.newIndex(arity);
+            names[arity] = zero.withIndex(arity);
         }
         assert(namesOK(arity, names));
         return names;
@@ -495,28 +495,18 @@ LambdaForm uncustomize() {
      *  @return true if we can interpret
      */
     private static boolean normalizeNames(int arity, Name[] names) {
-        Name[] oldNames = null;
+        Name[] oldNames = names.clone();
         int maxOutArity = 0;
-        int changesStart = 0;
         for (int i = 0; i < names.length; i++) {
             Name n = names[i];
-            if (!n.initIndex(i)) {
-                if (oldNames == null) {
-                    oldNames = names.clone();
-                    changesStart = i;
-                }
-                names[i] = n.cloneWithIndex(i);
-            }
+            names[i] = n.withIndex(i);
             if (n.arguments != null && maxOutArity < n.arguments.length)
                 maxOutArity = n.arguments.length;
         }
         if (oldNames != null) {
-            int startFixing = arity;
-            if (startFixing <= changesStart)
-                startFixing = changesStart+1;
-            for (int i = startFixing; i < names.length; i++) {
-                Name fixed = names[i].replaceNames(oldNames, names, changesStart, i);
-                names[i] = fixed.newIndex(i);
+            for (int i = Math.max(1, arity); i < names.length; i++) {
+                Name fixed = names[i].replaceNames(oldNames, names, 0, i);
+                names[i] = fixed.withIndex(i);
             }
         }
         int maxInterned = Math.min(arity, INTERNED_ARGUMENT_LIMIT);
@@ -1339,30 +1329,24 @@ public static String shortenSignature(String signature) {
 
     static final class Name {
         final BasicType type;
-        @Stable short index;
+        final short index;
         final NamedFunction function;
         final Object constraint;  // additional type information, if not null
         @Stable final Object[] arguments;
 
         private static final Object[] EMPTY_ARGS = new Object[0];
 
-        private Name(int index, BasicType type, NamedFunction function, Object[] arguments) {
+        private Name(int index, BasicType type, NamedFunction function, Object[] arguments, Object constraint) {
             this.index = (short)index;
             this.type = type;
             this.function = function;
             this.arguments = arguments;
-            this.constraint = null;
-            assert(this.index == index && typesMatch(function, this.arguments));
-        }
-        private Name(Name that, Object constraint) {
-            this.index = that.index;
-            this.type = that.type;
-            this.function = that.function;
-            this.arguments = that.arguments;
             this.constraint = constraint;
+            assert(this.index == index && typesMatch(function, arguments));
             assert(constraint == null || isParam());  // only params have constraints
             assert(constraint == null || constraint instanceof ClassSpecializer.SpeciesData || constraint instanceof Class);
         }
+
         Name(MethodHandle function, Object... arguments) {
             this(new NamedFunction(function), arguments);
         }
@@ -1374,49 +1358,41 @@ private Name(Name that, Object constraint) {
             this(new NamedFunction(function), arguments);
         }
         Name(NamedFunction function) {
-            this(-1, function.returnType(), function, EMPTY_ARGS);
+            this(-1, function.returnType(), function, EMPTY_ARGS, null);
         }
         Name(NamedFunction function, Object arg) {
-            this(-1, function.returnType(), function, new Object[] { arg });
+            this(-1, function.returnType(), function, new Object[] { arg }, null);
         }
         Name(NamedFunction function, Object arg0, Object arg1) {
-            this(-1, function.returnType(), function, new Object[] { arg0, arg1 });
+            this(-1, function.returnType(), function, new Object[] { arg0, arg1 }, null);
         }
         Name(NamedFunction function, Object... arguments) {
-            this(-1, function.returnType(), function, Arrays.copyOf(arguments, arguments.length, Object[].class));
+            this(-1, function.returnType(), function, Arrays.copyOf(arguments, arguments.length, Object[].class), null);
         }
         /** Create a raw parameter of the given type, with an expected index. */
         Name(int index, BasicType type) {
-            this(index, type, null, null);
+            this(index, type, null, null, null);
         }
         /** Create a raw parameter of the given type. */
         Name(BasicType type) { this(-1, type); }
 
         BasicType type() { return type; }
         int index() { return index; }
-        boolean initIndex(int i) {
-            if (index != i) {
-                if (index != -1)  return false;
-                index = (short)i;
-            }
-            return true;
-        }
+
         char typeChar() {
             return type.btChar;
         }
 
-        Name newIndex(int i) {
-            if (initIndex(i))  return this;
-            return cloneWithIndex(i);
-        }
-        Name cloneWithIndex(int i) {
-            Object[] newArguments = (arguments == null) ? null : arguments.clone();
-            return new Name(i, type, function, newArguments).withConstraint(constraint);
+        Name withIndex(int i) {
+            if (i == this.index) return this;
+            return new Name(i, type, function, arguments, constraint);
         }
+
         Name withConstraint(Object constraint) {
             if (constraint == this.constraint)  return this;
-            return new Name(this, constraint);
+            return new Name(index, type, function, arguments, constraint);
         }
+
         Name replaceName(Name oldName, Name newName) {  // FIXME: use replaceNames uniformly
             if (oldName == newName)  return this;
             @SuppressWarnings("LocalVariableHidesMemberVariable")

From 22914e0774f5bb8ded3d825bea1dc312b12d4d4a Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Tue, 23 Jul 2024 04:59:58 +0000
Subject: [PATCH 178/401] 8335938: Review XxxBuilder.original and
 XxxModel.parent

Reviewed-by: asotona
---
 .../classes/java/lang/classfile/ClassBuilder.java |  9 +--------
 .../classes/java/lang/classfile/CodeBuilder.java  |  6 ------
 .../classes/java/lang/classfile/FieldBuilder.java |  8 +-------
 .../java/lang/classfile/MethodBuilder.java        |  9 +--------
 .../classfile/impl/AbstractDirectBuilder.java     |  8 +-------
 .../classfile/impl/BufferedCodeBuilder.java       |  5 -----
 .../classfile/impl/BufferedFieldBuilder.java      | 15 +++------------
 .../classfile/impl/BufferedMethodBuilder.java     |  7 +------
 .../classfile/impl/ChainedClassBuilder.java       | 11 ++---------
 .../classfile/impl/ChainedFieldBuilder.java       |  9 +--------
 .../classfile/impl/ChainedMethodBuilder.java      |  7 -------
 .../classfile/impl/NonterminalCodeBuilder.java    | 10 +---------
 12 files changed, 12 insertions(+), 92 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/classfile/ClassBuilder.java b/src/java.base/share/classes/java/lang/classfile/ClassBuilder.java
index f1b8bb13d27e5..a55b93e7c07f4 100644
--- a/src/java.base/share/classes/java/lang/classfile/ClassBuilder.java
+++ b/src/java.base/share/classes/java/lang/classfile/ClassBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 import java.lang.constant.MethodTypeDesc;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Optional;
 import java.util.function.Consumer;
 
 import java.lang.classfile.constantpool.ClassEntry;
@@ -58,12 +57,6 @@ public sealed interface ClassBuilder
         extends ClassFileBuilder<ClassElement, ClassBuilder>
         permits ChainedClassBuilder, DirectClassBuilder {
 
-    /**
-     * {@return the {@link ClassModel} representing the class being transformed,
-     * if this class builder represents the transformation of some {@link ClassModel}}
-     */
-    Optional<ClassModel> original();
-
     /**
      * Sets the classfile version.
      * @param major the major version number
diff --git a/src/java.base/share/classes/java/lang/classfile/CodeBuilder.java b/src/java.base/share/classes/java/lang/classfile/CodeBuilder.java
index dffa9c7f89a85..64a677d63ade0 100644
--- a/src/java.base/share/classes/java/lang/classfile/CodeBuilder.java
+++ b/src/java.base/share/classes/java/lang/classfile/CodeBuilder.java
@@ -128,12 +128,6 @@ public sealed interface CodeBuilder
         extends ClassFileBuilder<CodeElement, CodeBuilder>
         permits CodeBuilder.BlockCodeBuilder, ChainedCodeBuilder, TerminalCodeBuilder, NonterminalCodeBuilder {
 
-    /**
-     * {@return the {@link CodeModel} representing the method body being transformed,
-     * if this code builder represents the transformation of some {@link CodeModel}}
-     */
-    Optional<CodeModel> original();
-
     /** {@return a fresh unbound label} */
     Label newLabel();
 
diff --git a/src/java.base/share/classes/java/lang/classfile/FieldBuilder.java b/src/java.base/share/classes/java/lang/classfile/FieldBuilder.java
index 18a598398ec9a..c0e733676f77c 100644
--- a/src/java.base/share/classes/java/lang/classfile/FieldBuilder.java
+++ b/src/java.base/share/classes/java/lang/classfile/FieldBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
 import jdk.internal.classfile.impl.TerminalFieldBuilder;
 import java.lang.reflect.AccessFlag;
 
-import java.util.Optional;
 import java.util.function.Consumer;
 import jdk.internal.javac.PreviewFeature;
 
@@ -68,9 +67,4 @@ default FieldBuilder withFlags(AccessFlag... flags) {
         return with(AccessFlags.ofField(flags));
     }
 
-    /**
-     * {@return the {@link FieldModel} representing the field being transformed,
-     * if this field builder represents the transformation of some {@link FieldModel}}
-     */
-    Optional<FieldModel> original();
 }
diff --git a/src/java.base/share/classes/java/lang/classfile/MethodBuilder.java b/src/java.base/share/classes/java/lang/classfile/MethodBuilder.java
index ece292c361b21..4cf34c95ed079 100644
--- a/src/java.base/share/classes/java/lang/classfile/MethodBuilder.java
+++ b/src/java.base/share/classes/java/lang/classfile/MethodBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 
 package java.lang.classfile;
 
-import java.util.Optional;
 import java.util.function.Consumer;
 
 import java.lang.classfile.constantpool.Utf8Entry;
@@ -50,12 +49,6 @@ public sealed interface MethodBuilder
         extends ClassFileBuilder<MethodElement, MethodBuilder>
         permits ChainedMethodBuilder, TerminalMethodBuilder {
 
-    /**
-     * {@return the {@link MethodModel} representing the method being transformed,
-     * if this method builder represents the transformation of some {@link MethodModel}}
-     */
-    Optional<MethodModel> original();
-
     /**
      * Sets the method access flags.
      * @param flags the access flags, as a bit mask
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractDirectBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractDirectBuilder.java
index 2feba5f9e0bb2..f574627491f6e 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractDirectBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractDirectBuilder.java
@@ -24,10 +24,8 @@
  */
 package jdk.internal.classfile.impl;
 
-import java.lang.classfile.constantpool.ConstantPool;
-import java.util.Optional;
-
 import java.lang.classfile.Attribute;
+import java.lang.classfile.constantpool.ConstantPool;
 
 public class AbstractDirectBuilder<M> {
     protected final SplitConstantPool constantPool;
@@ -48,10 +46,6 @@ public boolean canWriteDirect(ConstantPool source) {
         return constantPool().canWriteDirect(source);
     }
 
-    public Optional<M> original() {
-        return Optional.ofNullable(original);
-    }
-
     public void setOriginal(M original) {
         this.original = original;
     }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedCodeBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedCodeBuilder.java
index e9a8f2e1e1c89..c3a601fa1df87 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedCodeBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedCodeBuilder.java
@@ -70,11 +70,6 @@ public BufferedCodeBuilder(MethodInfo methodInfo,
         elements.add(startLabel);
     }
 
-    @Override
-    public Optional<CodeModel> original() {
-        return Optional.ofNullable(original);
-    }
-
     @Override
     public Label newLabel() {
         return new LabelImpl(this, -1);
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedFieldBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedFieldBuilder.java
index 2ba7ef14d0d3c..a92513390b495 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedFieldBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedFieldBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,19 +41,16 @@ public final class BufferedFieldBuilder
     private final Utf8Entry desc;
     private final List<FieldElement> elements = new ArrayList<>();
     private AccessFlags flags;
-    private final FieldModel original;
 
     public BufferedFieldBuilder(SplitConstantPool constantPool,
                                 ClassFileImpl context,
                                 Utf8Entry name,
-                                Utf8Entry type,
-                                FieldModel original) {
+                                Utf8Entry type) {
         this.constantPool = constantPool;
         this.context = context;
         this.name = name;
         this.desc = type;
         this.flags = AccessFlags.ofField();
-        this.original = original;
     }
 
     @Override
@@ -61,11 +58,6 @@ public ConstantPoolBuilder constantPool() {
         return constantPool;
     }
 
-    @Override
-    public Optional<FieldModel> original() {
-        return Optional.ofNullable(original);
-    }
-
     @Override
     public FieldBuilder with(FieldElement element) {
         elements.add(element);
@@ -91,8 +83,7 @@ public Model() {
 
         @Override
         public Optional<ClassModel> parent() {
-            FieldModel fm = original().orElse(null);
-            return fm == null? Optional.empty() : fm.parent();
+            return Optional.empty();
         }
 
         @Override
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java
index eaa2e2b710e76..f92ee1adf34ca 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java
@@ -91,11 +91,6 @@ public ConstantPoolBuilder constantPool() {
         return constantPool;
     }
 
-    @Override
-    public Optional<MethodModel> original() {
-        return Optional.ofNullable(original);
-    }
-
     @Override
     public Utf8Entry methodName() {
         return name;
@@ -172,7 +167,7 @@ public AccessFlags flags() {
 
         @Override
         public Optional<ClassModel> parent() {
-            return original().flatMap(MethodModel::parent);
+            return Optional.empty();
         }
 
         @Override
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedClassBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedClassBuilder.java
index 045652782171f..d31debf6f35a5 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedClassBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedClassBuilder.java
@@ -24,7 +24,6 @@
  */
 package jdk.internal.classfile.impl;
 
-import java.util.Optional;
 import java.util.function.Consumer;
 
 import java.lang.classfile.*;
@@ -51,15 +50,10 @@ public ClassBuilder with(ClassElement element) {
         return this;
     }
 
-    @Override
-    public Optional<ClassModel> original() {
-        return terminal.original();
-    }
-
     @Override
     public ClassBuilder withField(Utf8Entry name, Utf8Entry descriptor, Consumer<? super FieldBuilder> handler) {
         consumer.accept(new BufferedFieldBuilder(terminal.constantPool, terminal.context,
-                                                        name, descriptor, null)
+                                                        name, descriptor)
                                        .run(handler)
                                        .toModel());
         return this;
@@ -68,8 +62,7 @@ public ClassBuilder withField(Utf8Entry name, Utf8Entry descriptor, Consumer<? s
     @Override
     public ClassBuilder transformField(FieldModel field, FieldTransform transform) {
         BufferedFieldBuilder builder = new BufferedFieldBuilder(terminal.constantPool, terminal.context,
-                                                                field.fieldName(), field.fieldType(),
-                                                                field);
+                                                                field.fieldName(), field.fieldType());
         builder.transform(field, transform);
         consumer.accept(builder.toModel());
         return this;
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedFieldBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedFieldBuilder.java
index 3c89232467c7e..b3a30b5351ba7 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedFieldBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedFieldBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,12 +24,10 @@
  */
 package jdk.internal.classfile.impl;
 
-import java.util.Optional;
 import java.util.function.Consumer;
 
 import java.lang.classfile.FieldBuilder;
 import java.lang.classfile.FieldElement;
-import java.lang.classfile.FieldModel;
 import java.lang.classfile.constantpool.ConstantPoolBuilder;
 
 public final class ChainedFieldBuilder implements FieldBuilder {
@@ -50,11 +48,6 @@ public ConstantPoolBuilder constantPool() {
         return terminal.constantPool();
     }
 
-    @Override
-    public Optional<FieldModel> original() {
-        return terminal.original();
-    }
-
     @Override
     public FieldBuilder with(FieldElement element) {
         consumer.accept(element);
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedMethodBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedMethodBuilder.java
index 866dda2c5bc53..a7084116b9bd3 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedMethodBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ChainedMethodBuilder.java
@@ -24,7 +24,6 @@
  */
 package jdk.internal.classfile.impl;
 
-import java.util.Optional;
 import java.util.function.Consumer;
 
 import java.lang.classfile.CodeBuilder;
@@ -32,7 +31,6 @@
 import java.lang.classfile.CodeTransform;
 import java.lang.classfile.MethodBuilder;
 import java.lang.classfile.MethodElement;
-import java.lang.classfile.MethodModel;
 import java.lang.classfile.constantpool.ConstantPoolBuilder;
 
 public final class ChainedMethodBuilder implements MethodBuilder {
@@ -75,9 +73,4 @@ public ConstantPoolBuilder constantPool() {
         return terminal.constantPool();
     }
 
-    @Override
-    public Optional<MethodModel> original() {
-        return terminal.original();
-    }
-
 }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/NonterminalCodeBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/NonterminalCodeBuilder.java
index 9c27f0f5f9f72..f40da3a2beac6 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/NonterminalCodeBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/NonterminalCodeBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,10 +24,7 @@
  */
 package jdk.internal.classfile.impl;
 
-import java.util.Optional;
-
 import java.lang.classfile.CodeBuilder;
-import java.lang.classfile.CodeModel;
 import java.lang.classfile.Label;
 import java.lang.classfile.constantpool.ConstantPoolBuilder;
 
@@ -59,11 +56,6 @@ public ConstantPoolBuilder constantPool() {
         return terminal.constantPool();
     }
 
-    @Override
-    public Optional<CodeModel> original() {
-        return terminal.original();
-    }
-
     @Override
     public Label newLabel() {
         return terminal.newLabel();

From 9f03f687556ee61436a1cb8c89ff063a7cbeaa51 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Tue, 23 Jul 2024 05:13:49 +0000
Subject: [PATCH 179/401] 8336339: (se) SelectionKey.interestOps(int) should
 not throw ClosedSelectorException

Reviewed-by: jpai, bpb
---
 .../classes/sun/nio/ch/EPollSelectorImpl.java |   7 -
 .../sun/nio/ch/KQueueSelectorImpl.java        |   7 -
 .../spi/AbstractSelectableChannel.java        |   6 +-
 .../classes/sun/nio/ch/SelectorImpl.java      |  17 +--
 .../classes/sun/nio/ch/PollSelectorImpl.java  |   1 -
 .../sun/nio/ch/WEPollSelectorImpl.java        |   7 -
 .../sun/nio/ch/WindowsSelectorImpl.java       |   3 +-
 .../Selector/RaceUpdatesAndClose.java         | 122 ++++++++++++++++++
 8 files changed, 136 insertions(+), 34 deletions(-)
 create mode 100644 test/jdk/java/nio/channels/Selector/RaceUpdatesAndClose.java

diff --git a/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java b/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java
index cb55932fd7e99..a07a927e635ed 100644
--- a/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java
+++ b/src/java.base/linux/classes/sun/nio/ch/EPollSelectorImpl.java
@@ -26,7 +26,6 @@
 package sun.nio.ch;
 
 import java.io.IOException;
-import java.nio.channels.ClosedSelectorException;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
 import java.nio.channels.spi.SelectorProvider;
@@ -92,11 +91,6 @@ class EPollSelectorImpl extends SelectorImpl {
         EPoll.ctl(epfd, EPOLL_CTL_ADD, eventfd.efd(), EPOLLIN);
     }
 
-    private void ensureOpen() {
-        if (!isOpen())
-            throw new ClosedSelectorException();
-    }
-
     @Override
     protected int doSelect(Consumer<SelectionKey> action, long timeout)
         throws IOException
@@ -243,7 +237,6 @@ protected void implDereg(SelectionKeyImpl ski) throws IOException {
 
     @Override
     public void setEventOps(SelectionKeyImpl ski) {
-        ensureOpen();
         synchronized (updateLock) {
             updateKeys.addLast(ski);
         }
diff --git a/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java b/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java
index 6c84984f515d4..6abc9e31879dd 100644
--- a/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java
+++ b/src/java.base/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java
@@ -26,7 +26,6 @@
 package sun.nio.ch;
 
 import java.io.IOException;
-import java.nio.channels.ClosedSelectorException;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
 import java.nio.channels.spi.SelectorProvider;
@@ -97,11 +96,6 @@ class KQueueSelectorImpl extends SelectorImpl {
         KQueue.register(kqfd, fd0, EVFILT_READ, EV_ADD);
     }
 
-    private void ensureOpen() {
-        if (!isOpen())
-            throw new ClosedSelectorException();
-    }
-
     @Override
     protected int doSelect(Consumer<SelectionKey> action, long timeout)
         throws IOException
@@ -285,7 +279,6 @@ protected void implDereg(SelectionKeyImpl ski) throws IOException {
 
     @Override
     public void setEventOps(SelectionKeyImpl ski) {
-        ensureOpen();
         synchronized (updateLock) {
             updateKeys.addLast(ski);
         }
diff --git a/src/java.base/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java b/src/java.base/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java
index 558158cc852fb..4b342603caf63 100644
--- a/src/java.base/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java
+++ b/src/java.base/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -137,6 +137,8 @@ private SelectionKey findKey(Selector sel) {
 
     void removeKey(SelectionKey k) {                    // package-private
         synchronized (keyLock) {
+            if (keys == null)
+                return;
             for (int i = 0; i < keys.length; i++)
                 if (keys[i] == k) {
                     keys[i] = null;
@@ -233,7 +235,7 @@ public final SelectionKey register(Selector sel, int ops, Object att)
                     k.interestOps(ops);
                 } else {
                     // New registration
-                    k = ((AbstractSelector)sel).register(this, ops, att);
+                    k = ((AbstractSelector) sel).register(this, ops, att);
                     addKey(k);
                 }
                 return k;
diff --git a/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java b/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java
index bb0d603790fe6..de7a1f98daf31 100644
--- a/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -188,11 +188,11 @@ public final void implCloseSelector() throws IOException {
                 // Deregister channels
                 Iterator<SelectionKey> i = keys.iterator();
                 while (i.hasNext()) {
-                    SelectionKeyImpl ski = (SelectionKeyImpl)i.next();
+                    SelectionKeyImpl ski = (SelectionKeyImpl) i.next();
                     deregister(ski);
                     SelectableChannel selch = ski.channel();
                     if (!selch.isOpen() && !selch.isRegistered())
-                        ((SelChImpl)selch).kill();
+                        ((SelChImpl) selch).kill();
                     selectedKeys.remove(ski);
                     i.remove();
                 }
@@ -221,13 +221,14 @@ protected final SelectionKey register(AbstractSelectableChannel ch,
         keys.add(k);
         try {
             k.interestOps(ops);
-        } catch (ClosedSelectorException e) {
+        } catch (CancelledKeyException e) {
+            // key observed and cancelled. Okay to return a cancelled key.
+        }
+        if (!isOpen()) {
             assert ch.keyFor(this) == null;
             keys.remove(k);
             k.cancel();
-            throw e;
-        } catch (CancelledKeyException e) {
-            // key observed and cancelled. Okay to return a cancelled key.
+            throw new ClosedSelectorException();
         }
         return k;
     }
@@ -277,7 +278,7 @@ protected final void processDeregisterQueue() throws IOException {
 
                 SelectableChannel ch = ski.channel();
                 if (!ch.isOpen() && !ch.isRegistered())
-                    ((SelChImpl)ch).kill();
+                    ((SelChImpl) ch).kill();
             }
         }
     }
diff --git a/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java b/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java
index a3bff8d1e6523..d29eacb81c1b0 100644
--- a/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java
+++ b/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java
@@ -231,7 +231,6 @@ protected void implDereg(SelectionKeyImpl ski) throws IOException {
 
     @Override
     public void setEventOps(SelectionKeyImpl ski) {
-        ensureOpen();
         synchronized (updateLock) {
             updateKeys.addLast(ski);
         }
diff --git a/src/java.base/windows/classes/sun/nio/ch/WEPollSelectorImpl.java b/src/java.base/windows/classes/sun/nio/ch/WEPollSelectorImpl.java
index bbcfab9bbf19c..f2bff88675fdb 100644
--- a/src/java.base/windows/classes/sun/nio/ch/WEPollSelectorImpl.java
+++ b/src/java.base/windows/classes/sun/nio/ch/WEPollSelectorImpl.java
@@ -28,7 +28,6 @@
 import java.io.FileDescriptor;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.nio.channels.ClosedSelectorException;
 import java.nio.channels.Pipe;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
@@ -89,11 +88,6 @@ class WEPollSelectorImpl extends SelectorImpl {
         WEPoll.ctl(eph, EPOLL_CTL_ADD, fd0Val, WEPoll.EPOLLIN);
     }
 
-    private void ensureOpen() {
-        if (!isOpen())
-            throw new ClosedSelectorException();
-    }
-
     @Override
     protected int doSelect(Consumer<SelectionKey> action, long timeout)
         throws IOException
@@ -228,7 +222,6 @@ protected void implDereg(SelectionKeyImpl ski) throws IOException {
 
     @Override
     public void setEventOps(SelectionKeyImpl ski) {
-        ensureOpen();
         synchronized (updateLock) {
             updateKeys.addLast(ski);
         }
diff --git a/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java b/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
index 977a1653fdd31..eb681bc5ab935 100644
--- a/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
+++ b/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -606,7 +606,6 @@ protected void implDereg(SelectionKeyImpl ski) {
 
     @Override
     public void setEventOps(SelectionKeyImpl ski) {
-        ensureOpen();
         synchronized (updateLock) {
             updateKeys.addLast(ski);
         }
diff --git a/test/jdk/java/nio/channels/Selector/RaceUpdatesAndClose.java b/test/jdk/java/nio/channels/Selector/RaceUpdatesAndClose.java
new file mode 100644
index 0000000000000..8173d3d761f71
--- /dev/null
+++ b/test/jdk/java/nio/channels/Selector/RaceUpdatesAndClose.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 8336339
+ * @summary Race registration and selection key updates with Selector.close
+ * @run junit RaceUpdatesAndClose
+ */
+
+import java.nio.channels.CancelledKeyException;
+import java.nio.channels.ClosedSelectorException;
+import java.nio.channels.DatagramChannel;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Phaser;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.RepeatedTest;
+
+class RaceUpdatesAndClose {
+    private static ExecutorService executor;
+
+    @BeforeAll
+    static void setup() throws Exception {
+        executor = Executors.newFixedThreadPool(2);
+    }
+
+    @AfterAll
+    static void finish() {
+        executor.shutdown();
+    }
+
+    /**
+     * Race SelectableChannel.register and Selector.close.
+     */
+    @RepeatedTest(100)
+    void raceRegisterAndClose() throws Exception {
+        try (Selector sel = Selector.open();
+             DatagramChannel dc = DatagramChannel.open()) {
+
+            dc.configureBlocking(false);
+
+            Phaser phaser = new Phaser(2);
+
+            // register
+            var task1 = executor.submit(() -> {
+                phaser.arriveAndAwaitAdvance();
+                try {
+                    dc.register(sel, SelectionKey.OP_READ);
+                } catch (ClosedSelectorException e) { }
+                return null;
+            });
+
+            // close selector
+            var task2 = executor.submit(() -> {
+                phaser.arriveAndAwaitAdvance();
+                sel.close();
+                return null;
+            });
+
+            task1.get();
+            task2.get();
+        }
+    }
+
+    /**
+     * Race SelectionKey.interestOps and Selector.close.
+     */
+    @RepeatedTest(100)
+    void raceInterestOpsAndClose() throws Exception {
+        try (Selector sel = Selector.open();
+             DatagramChannel dc = DatagramChannel.open()) {
+
+            dc.configureBlocking(false);
+            SelectionKey key = dc.register(sel, SelectionKey.OP_READ);
+
+            Phaser phaser = new Phaser(2);
+
+            // interestOps
+            var task1 = executor.submit(() -> {
+                phaser.arriveAndAwaitAdvance();
+                try {
+                    key.interestOps(0);
+                } catch (CancelledKeyException e) { }
+            });
+
+            // close selector
+            var task2 = executor.submit(() -> {
+                phaser.arriveAndAwaitAdvance();
+                sel.close();
+                return null;
+            });
+
+            task1.get();
+            task2.get();
+        }
+    }
+}

From 48030a2a8670e6274abb6c77f19dd3d92517e888 Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Tue, 23 Jul 2024 05:23:48 +0000
Subject: [PATCH 180/401] 8336855: Duplicate protected declaration and comment
 in interp_masm_aarch64.hpp

Reviewed-by: jiefu, shade
---
 src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
index f0f032409d35d..34dca56eaf746 100644
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -35,8 +35,6 @@
 typedef ByteSize (*OffsetFunction)(uint);
 
 class InterpreterMacroAssembler: public MacroAssembler {
- protected:
-
  protected:
   // Interpreter specific version of call_VM_base
   using MacroAssembler::call_VM_leaf_base;
@@ -112,8 +110,6 @@ class InterpreterMacroAssembler: public MacroAssembler {
 
   void get_dispatch();
 
-  // Helpers for runtime call arguments/results
-
   // Helpers for runtime call arguments/results
   void get_method(Register reg) {
     ldr(reg, Address(rfp, frame::interpreter_frame_method_offset * wordSize));
@@ -181,7 +177,7 @@ class InterpreterMacroAssembler: public MacroAssembler {
   void load_ptr(int n, Register val);
   void store_ptr(int n, Register val);
 
-// Load float value from 'address'. The value is loaded onto the FPU register v0.
+  // Load float value from 'address'. The value is loaded onto the FPU register v0.
   void load_float(Address src);
   void load_double(Address src);
 

From 4c7b3e7fc39a06e208ea1668095d055457549d63 Mon Sep 17 00:00:00 2001
From: Raffaello Giulietti <rgiulietti@openjdk.org>
Date: Tue, 23 Jul 2024 07:43:57 +0000
Subject: [PATCH 181/401] 8334758: Incorrect note in Javadoc for a few
 RandomGenerator methods

Reviewed-by: bpb
---
 .../java/util/random/RandomGenerator.java     | 51 +++++++++----------
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/src/java.base/share/classes/java/util/random/RandomGenerator.java b/src/java.base/share/classes/java/util/random/RandomGenerator.java
index b38c4eee8f0cc..e019e073a2dac 100644
--- a/src/java.base/share/classes/java/util/random/RandomGenerator.java
+++ b/src/java.base/share/classes/java/util/random/RandomGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -809,12 +809,11 @@ default int nextInt() {
      *
      * @throws IllegalArgumentException if {@code bound} is not positive
      *
-     * @implSpec The default implementation checks that {@code bound} is a
-     * positive {@code int}. Then invokes {@code nextInt()}, limiting the result
-     * to be greater than or equal zero and less than {@code bound}. If {@code bound}
-     * is a power of two then limiting is a simple masking operation. Otherwise,
-     * the result is re-calculated by invoking {@code nextInt()} until the
-     * result is greater than or equal zero and less than {@code bound}.
+     * @implSpec The default implementation checks that {@code bound} is positive.
+     * It then invokes {@link #nextInt()} one or more times to ensure a uniform
+     * distribution in the range 0 (inclusive)
+     * to {@code bound} (exclusive).
+     * It assumes the distribution of {@link #nextInt()} to be uniform.
      */
     default int nextInt(int bound) {
         RandomSupport.checkBound(bound);
@@ -835,13 +834,12 @@ default int nextInt(int bound) {
      * @throws IllegalArgumentException if {@code origin} is greater than
      *         or equal to {@code bound}
      *
-     * @implSpec The default implementation checks that {@code origin} and
-     * {@code bound} are positive {@code ints}. Then invokes {@code nextInt()},
-     * limiting the result to be greater that or equal {@code origin} and less
-     * than {@code bound}. If {@code bound} is a power of two then limiting is a
-     * simple masking operation. Otherwise, the result is re-calculated  by
-     * invoking {@code nextInt()} until the result is greater than or equal
-     * {@code origin} and less than {@code bound}.
+     * @implSpec The default implementation checks that {@code origin}
+     * is less than {@code bound}.
+     * It then invokes {@link #nextInt()} one or more times to ensure a uniform
+     * distribution in the range {@code origin} (inclusive)
+     * to {@code bound} (exclusive).
+     * It assumes the distribution of {@link #nextInt()} to be uniform.
      */
     default int nextInt(int origin, int bound) {
         RandomSupport.checkRange(origin, bound);
@@ -868,13 +866,11 @@ default int nextInt(int origin, int bound) {
      *
      * @throws IllegalArgumentException if {@code bound} is not positive
      *
-     * @implSpec The default implementation checks that {@code bound} is a
-     * positive  {@code long}. Then invokes {@code nextLong()}, limiting the
-     * result to be greater than or equal zero and less than {@code bound}. If
-     * {@code bound} is a power of two then limiting is a simple masking
-     * operation. Otherwise, the result is re-calculated by invoking
-     * {@code nextLong()} until the result is greater than or equal zero and
-     * less than {@code bound}.
+     * @implSpec The default implementation checks that {@code bound} is positive.
+     * It then invokes {@link #nextLong()} one or more times to ensure a uniform
+     * distribution in the range 0 (inclusive)
+     * to {@code bound} (exclusive).
+     * It assumes the distribution of {@link #nextLong()} to be uniform.
      */
     default long nextLong(long bound) {
         RandomSupport.checkBound(bound);
@@ -895,13 +891,12 @@ default long nextLong(long bound) {
      * @throws IllegalArgumentException if {@code origin} is greater than
      *         or equal to {@code bound}
      *
-     * @implSpec The default implementation checks that {@code origin} and
-     * {@code bound} are positive {@code longs}. Then invokes {@code nextLong()},
-     * limiting the result to be greater than or equal {@code origin} and less
-     * than {@code bound}. If {@code bound} is a power of two then limiting is a
-     * simple masking operation. Otherwise, the result is re-calculated by
-     * invoking {@code nextLong()} until the result is greater than or equal
-     * {@code origin} and less than {@code bound}.
+     * @implSpec The default implementation checks that {@code origin}
+     * is less than {@code bound}.
+     * It then invokes {@link #nextLong()} one or more times to ensure a uniform
+     * distribution in the range {@code origin} (inclusive)
+     * to {@code bound} (exclusive).
+     * It assumes the distribution of {@link #nextLong()} to be uniform.
      */
     default long nextLong(long origin, long bound) {
         RandomSupport.checkRange(origin, bound);

From e83b4b236eca48d0b75094006f7f888398194fe4 Mon Sep 17 00:00:00 2001
From: Claes Redestad <redestad@openjdk.org>
Date: Tue, 23 Jul 2024 11:50:57 +0000
Subject: [PATCH 182/401] 8335182: Consolidate and streamline String concat
 code shapes

Reviewed-by: liach, jvernee
---
 .../classes/java/lang/StringConcatHelper.java | 196 ++++------
 .../share/classes/java/lang/System.java       |   4 -
 .../java/lang/invoke/StringConcatFactory.java |  34 +-
 .../jdk/internal/access/JavaLangAccess.java   |   6 -
 .../openjdk/bench/java/lang/StringConcat.java |  12 +
 .../bench/java/lang/StringConcatStartup.java  | 354 ++++++++++++++++++
 6 files changed, 452 insertions(+), 154 deletions(-)
 create mode 100644 test/micro/org/openjdk/bench/java/lang/StringConcatStartup.java

diff --git a/src/java.base/share/classes/java/lang/StringConcatHelper.java b/src/java.base/share/classes/java/lang/StringConcatHelper.java
index 49f556e5aa620..e47e124ed4da6 100644
--- a/src/java.base/share/classes/java/lang/StringConcatHelper.java
+++ b/src/java.base/share/classes/java/lang/StringConcatHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -119,91 +119,64 @@ static long mix(long lengthCoder, long value) {
      */
     static long mix(long lengthCoder, String value) {
         lengthCoder += value.length();
-        if (value.coder() == String.UTF16) {
+        if (!value.isLatin1()) {
             lengthCoder |= UTF16;
         }
         return checkOverflow(lengthCoder);
     }
 
     /**
-     * Prepends the stringly representation of boolean value into buffer,
+     * Prepends constant and the stringly representation of value into buffer,
      * given the coder and final index. Index is measured in chars, not in bytes!
      *
      * @param indexCoder final char index in the buffer, along with coder packed
      *                   into higher bits.
      * @param buf        buffer to append to
      * @param value      boolean value to encode
+     * @param prefix     a constant to prepend before value
      * @return           updated index (coder value retained)
      */
-    static long prepend(long indexCoder, byte[] buf, boolean value) {
+    static long prepend(long indexCoder, byte[] buf, boolean value, String prefix) {
         int index = (int)indexCoder;
         if (indexCoder < UTF16) {
             if (value) {
-                buf[--index] = 'e';
-                buf[--index] = 'u';
-                buf[--index] = 'r';
-                buf[--index] = 't';
+                index -= 4;
+                buf[index] = 't';
+                buf[index + 1] = 'r';
+                buf[index + 2] = 'u';
+                buf[index + 3] = 'e';
             } else {
-                buf[--index] = 'e';
-                buf[--index] = 's';
-                buf[--index] = 'l';
-                buf[--index] = 'a';
-                buf[--index] = 'f';
+                index -= 5;
+                buf[index] = 'f';
+                buf[index + 1] = 'a';
+                buf[index + 2] = 'l';
+                buf[index + 3] = 's';
+                buf[index + 4] = 'e';
             }
+            index -= prefix.length();
+            prefix.getBytes(buf, index, String.LATIN1);
             return index;
         } else {
             if (value) {
-                StringUTF16.putChar(buf, --index, 'e');
-                StringUTF16.putChar(buf, --index, 'u');
-                StringUTF16.putChar(buf, --index, 'r');
-                StringUTF16.putChar(buf, --index, 't');
+                index -= 4;
+                StringUTF16.putChar(buf, index, 't');
+                StringUTF16.putChar(buf, index + 1, 'r');
+                StringUTF16.putChar(buf, index + 2, 'u');
+                StringUTF16.putChar(buf, index + 3, 'e');
             } else {
-                StringUTF16.putChar(buf, --index, 'e');
-                StringUTF16.putChar(buf, --index, 's');
-                StringUTF16.putChar(buf, --index, 'l');
-                StringUTF16.putChar(buf, --index, 'a');
-                StringUTF16.putChar(buf, --index, 'f');
+                index -= 5;
+                StringUTF16.putChar(buf, index, 'f');
+                StringUTF16.putChar(buf, index + 1, 'a');
+                StringUTF16.putChar(buf, index + 2, 'l');
+                StringUTF16.putChar(buf, index + 3, 's');
+                StringUTF16.putChar(buf, index + 4, 'e');
             }
+            index -= prefix.length();
+            prefix.getBytes(buf, index, String.UTF16);
             return index | UTF16;
         }
     }
 
-    /**
-     * Prepends constant and the stringly representation of value into buffer,
-     * given the coder and final index. Index is measured in chars, not in bytes!
-     *
-     * @param indexCoder final char index in the buffer, along with coder packed
-     *                   into higher bits.
-     * @param buf        buffer to append to
-     * @param value      boolean value to encode
-     * @param prefix     a constant to prepend before value
-     * @return           updated index (coder value retained)
-     */
-    static long prepend(long indexCoder, byte[] buf, boolean value, String prefix) {
-        indexCoder = prepend(indexCoder, buf, value);
-        indexCoder = prepend(indexCoder, buf, prefix);
-        return indexCoder;
-    }
-
-    /**
-     * Prepends the stringly representation of char value into buffer,
-     * given the coder and final index. Index is measured in chars, not in bytes!
-     *
-     * @param indexCoder final char index in the buffer, along with coder packed
-     *                   into higher bits.
-     * @param buf        buffer to append to
-     * @param value      char value to encode
-     * @return           updated index (coder value retained)
-     */
-    static long prepend(long indexCoder, byte[] buf, char value) {
-        if (indexCoder < UTF16) {
-            buf[(int)(--indexCoder)] = (byte) (value & 0xFF);
-        } else {
-            StringUTF16.putChar(buf, (int)(--indexCoder), value);
-        }
-        return indexCoder;
-    }
-
     /**
      * Prepends constant and the stringly representation of value into buffer,
      * given the coder and final index. Index is measured in chars, not in bytes!
@@ -216,26 +189,17 @@ static long prepend(long indexCoder, byte[] buf, char value) {
      * @return           updated index (coder value retained)
      */
     static long prepend(long indexCoder, byte[] buf, char value, String prefix) {
-        indexCoder = prepend(indexCoder, buf, value);
-        indexCoder = prepend(indexCoder, buf, prefix);
-        return indexCoder;
-    }
-
-    /**
-     * Prepends the stringly representation of integer value into buffer,
-     * given the coder and final index. Index is measured in chars, not in bytes!
-     *
-     * @param indexCoder final char index in the buffer, along with coder packed
-     *                   into higher bits.
-     * @param buf        buffer to append to
-     * @param value      integer value to encode
-     * @return           updated index (coder value retained)
-     */
-    static long prepend(long indexCoder, byte[] buf, int value) {
+        int index = (int)indexCoder;
         if (indexCoder < UTF16) {
-            return StringLatin1.getChars(value, (int)indexCoder, buf);
+            buf[--index] = (byte) (value & 0xFF);
+            index -= prefix.length();
+            prefix.getBytes(buf, index, String.LATIN1);
+            return index;
         } else {
-            return StringUTF16.getChars(value, (int)indexCoder, buf) | UTF16;
+            StringUTF16.putChar(buf, --index, value);
+            index -= prefix.length();
+            prefix.getBytes(buf, index, String.UTF16);
+            return index | UTF16;
         }
     }
 
@@ -251,26 +215,17 @@ static long prepend(long indexCoder, byte[] buf, int value) {
      * @return           updated index (coder value retained)
      */
     static long prepend(long indexCoder, byte[] buf, int value, String prefix) {
-        indexCoder = prepend(indexCoder, buf, value);
-        indexCoder = prepend(indexCoder, buf, prefix);
-        return indexCoder;
-    }
-
-    /**
-     * Prepends the stringly representation of long value into buffer,
-     * given the coder and final index. Index is measured in chars, not in bytes!
-     *
-     * @param indexCoder final char index in the buffer, along with coder packed
-     *                   into higher bits.
-     * @param buf        buffer to append to
-     * @param value      long value to encode
-     * @return           updated index (coder value retained)
-     */
-    static long prepend(long indexCoder, byte[] buf, long value) {
+        int index = (int)indexCoder;
         if (indexCoder < UTF16) {
-            return StringLatin1.getChars(value, (int)indexCoder, buf);
+            index = StringLatin1.getChars(value, index, buf);
+            index -= prefix.length();
+            prefix.getBytes(buf, index, String.LATIN1);
+            return index;
         } else {
-            return StringUTF16.getChars(value, (int)indexCoder, buf) | UTF16;
+            index = StringUTF16.getChars(value, index, buf);
+            index -= prefix.length();
+            prefix.getBytes(buf, index, String.UTF16);
+            return index | UTF16;
         }
     }
 
@@ -286,29 +241,18 @@ static long prepend(long indexCoder, byte[] buf, long value) {
      * @return           updated index (coder value retained)
      */
     static long prepend(long indexCoder, byte[] buf, long value, String prefix) {
-        indexCoder = prepend(indexCoder, buf, value);
-        indexCoder = prepend(indexCoder, buf, prefix);
-        return indexCoder;
-    }
-
-    /**
-     * Prepends the stringly representation of String value into buffer,
-     * given the coder and final index. Index is measured in chars, not in bytes!
-     *
-     * @param indexCoder final char index in the buffer, along with coder packed
-     *                   into higher bits.
-     * @param buf        buffer to append to
-     * @param value      String value to encode
-     * @return           updated index (coder value retained)
-     */
-    static long prepend(long indexCoder, byte[] buf, String value) {
-        indexCoder -= value.length();
+        int index = (int)indexCoder;
         if (indexCoder < UTF16) {
-            value.getBytes(buf, (int)indexCoder, String.LATIN1);
+            index = StringLatin1.getChars(value, index, buf);
+            index -= prefix.length();
+            prefix.getBytes(buf, index, String.LATIN1);
+            return index;
         } else {
-            value.getBytes(buf, (int)indexCoder, String.UTF16);
+            index = StringUTF16.getChars(value, index, buf);
+            index -= prefix.length();
+            prefix.getBytes(buf, index, String.UTF16);
+            return index | UTF16;
         }
-        return indexCoder;
     }
 
     /**
@@ -323,9 +267,18 @@ static long prepend(long indexCoder, byte[] buf, String value) {
      * @return           updated index (coder value retained)
      */
     static long prepend(long indexCoder, byte[] buf, String value, String prefix) {
-        indexCoder = prepend(indexCoder, buf, value);
-        indexCoder = prepend(indexCoder, buf, prefix);
-        return indexCoder;
+        int index = ((int)indexCoder) - value.length();
+        if (indexCoder < UTF16) {
+            value.getBytes(buf, index, String.LATIN1);
+            index -= prefix.length();
+            prefix.getBytes(buf, index, String.LATIN1);
+            return index;
+        } else {
+            value.getBytes(buf, index, String.UTF16);
+            index -= prefix.length();
+            prefix.getBytes(buf, index, String.UTF16);
+            return index | UTF16;
+        }
     }
 
     /**
@@ -375,8 +328,7 @@ static String simpleConcat(Object first, Object second) {
         byte[] buf = newArray(indexCoder);
         // prepend each argument in reverse order, since we prepending
         // from the end of the byte array
-        indexCoder = prepend(indexCoder, buf, s2);
-        indexCoder = prepend(indexCoder, buf, s1);
+        indexCoder = prepend(indexCoder, buf, s2, s1);
         return newString(buf, indexCoder);
     }
 
@@ -443,8 +395,10 @@ static byte[] newArrayWithSuffix(String suffix, long indexCoder) {
      */
     @ForceInline
     static byte[] newArray(long indexCoder) {
-        byte coder = (byte)(indexCoder >> 32);
-        int index = ((int)indexCoder) << coder;
+        int index = (int)indexCoder;
+        if (indexCoder >= UTF16) {
+            index <<= 1;
+        }
         if (index < 0) {
             throw new OutOfMemoryError("Overflow: String length out of range");
         }
diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java
index 5e28b9ce95b7c..3157a20027843 100644
--- a/src/java.base/share/classes/java/lang/System.java
+++ b/src/java.base/share/classes/java/lang/System.java
@@ -2611,10 +2611,6 @@ public MethodHandle stringConcatHelper(String name, MethodType methodType) {
                 return StringConcatHelper.lookupStatic(name, methodType);
             }
 
-            public long stringConcatHelperPrepend(long indexCoder, byte[] buf, String value) {
-                return StringConcatHelper.prepend(indexCoder, buf, value);
-            }
-
             public long stringConcatInitialCoder() {
                 return StringConcatHelper.initialCoder();
             }
diff --git a/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
index 29896fd8f93df..cf552c434be53 100644
--- a/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
+++ b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java
@@ -565,17 +565,17 @@ private static MethodHandle generateMHInlineCopy(MethodType mt, String[] constan
 
         // Fold in byte[] instantiation at argument 0
         MethodHandle newArrayCombinator;
-        if (suffix != null) {
-            // newArray variant that deals with prepending any trailing constant
-            //
-            // initialLengthCoder is adjusted to have the correct coder
-            // and length: The newArrayWithSuffix method expects only the coder of the
-            // suffix to be encoded into indexCoder
-            initialLengthCoder -= suffix.length();
-            newArrayCombinator = newArrayWithSuffix(suffix);
-        } else {
-            newArrayCombinator = newArray();
+        if (suffix == null || suffix.isEmpty()) {
+            suffix = "";
         }
+        // newArray variant that deals with prepending any trailing constant
+        //
+        // initialLengthCoder is adjusted to have the correct coder
+        // and length: The newArrayWithSuffix method expects only the coder of the
+        // suffix to be encoded into indexCoder
+        initialLengthCoder -= suffix.length();
+        newArrayCombinator = newArrayWithSuffix(suffix);
+
         mh = MethodHandles.foldArgumentsWithCombiner(mh, 0, newArrayCombinator,
                 1 // index
         );
@@ -738,9 +738,7 @@ private static MethodHandle noPrefixPrepender(Class<?> cl) {
         int idx = classIndex(cl);
         MethodHandle prepend = NO_PREFIX_PREPENDERS[idx];
         if (prepend == null) {
-            NO_PREFIX_PREPENDERS[idx] = prepend = JLA.stringConcatHelper("prepend",
-                    methodType(long.class, long.class, byte[].class,
-                            Wrapper.asPrimitiveType(cl))).rebind();
+            NO_PREFIX_PREPENDERS[idx] = prepend = MethodHandles.insertArguments(prepender(cl), 3, "");
         }
         return prepend;
     }
@@ -902,16 +900,6 @@ private static MethodHandle newArrayWithSuffix(String suffix) {
         return MethodHandles.insertArguments(mh, 0, suffix);
     }
 
-    private @Stable static MethodHandle NEW_ARRAY;
-    private static MethodHandle newArray() {
-        MethodHandle mh = NEW_ARRAY;
-        if (mh == null) {
-            NEW_ARRAY = mh =
-                    JLA.stringConcatHelper("newArray", methodType(byte[].class, long.class));
-        }
-        return mh;
-    }
-
     /**
      * Public gateways to public "stringify" methods. These methods have the
      * form String apply(T obj), and normally delegate to {@code String.valueOf},
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
index c31e745cd89a6..2254c065e2e8f 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
@@ -432,12 +432,6 @@ public interface JavaLangAccess {
      */
     MethodHandle stringConcatHelper(String name, MethodType methodType);
 
-    /**
-     * Prepends constant and the stringly representation of value into buffer,
-     * given the coder and final index. Index is measured in chars, not in bytes!
-     */
-    long stringConcatHelperPrepend(long indexCoder, byte[] buf, String value);
-
     /**
      * Get the string concat initial coder
      */
diff --git a/test/micro/org/openjdk/bench/java/lang/StringConcat.java b/test/micro/org/openjdk/bench/java/lang/StringConcat.java
index c4d2d1bfe1155..015ad224631f1 100644
--- a/test/micro/org/openjdk/bench/java/lang/StringConcat.java
+++ b/test/micro/org/openjdk/bench/java/lang/StringConcat.java
@@ -219,4 +219,16 @@ public String concat23StringConst() {
                  * questions.
                 """;
     }
+
+    public static void main(String... args) {
+        StringConcat concat = new StringConcat();
+        concat.concat4String();
+        concat.concat123String();
+        concat.concat6String();
+        concat.concat13String();
+        concat.concat23String();
+        concat.concatConstInt();
+    }
+
+
 }
diff --git a/test/micro/org/openjdk/bench/java/lang/StringConcatStartup.java b/test/micro/org/openjdk/bench/java/lang/StringConcatStartup.java
new file mode 100644
index 0000000000000..d146fbf9885a9
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/StringConcatStartup.java
@@ -0,0 +1,354 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+package org.openjdk.bench.java.lang;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Benchmarks stressing String concat startup. Provides a main method that takes names of the sub-benchmarks
+ * of choice as arguments to work well as a standalone startup test/diagnostic
+ *
+ *   StringSingle
+ *   MixedSmall - small number of mixed expressions
+ *   StringLarge - large number of expressions with a mix of String arguments and constants
+ *   MixedLarge - large number of expressions with a mix of constants, Strings and primivitive arguments
+ */
+public class StringConcatStartup {
+
+    public static void main(String... args) {
+        String[] selection = new String[] { "StringLarge", "MixedSmall", "StringSingle", "MixedLarge" };
+        if (args.length > 0) {
+            selection = args;
+        }
+        for (String select : selection) {
+            switch (select) {
+                case "StringSingle" -> new StringSingle().run();
+                case "MixedSmall" -> new MixedSmall().run();
+                case "StringLarge" -> new StringLarge().run();
+                case "MixedLarge" -> new MixedLarge().run();
+            }
+        }
+    }
+
+    @BenchmarkMode(Mode.SingleShotTime)
+    @OutputTimeUnit(TimeUnit.MILLISECONDS)
+    @State(Scope.Thread)
+    @Fork(value = 40, warmups = 2)
+    public static class StringSingle {
+
+        public String s = "foo";
+
+        @Benchmark
+        public String run() {
+            return "" + s;
+        }
+    }
+
+
+    @BenchmarkMode(Mode.SingleShotTime)
+    @OutputTimeUnit(TimeUnit.MILLISECONDS)
+    @State(Scope.Thread)
+    @Fork(value = 20, warmups = 2)
+    public static class MixedSmall {
+
+        public String s = "foo";
+        public int i = 17;
+        public long l = 21L;
+        public char c = 'a';
+        public boolean z = true;
+
+        @Benchmark
+        public String run() {
+            String concat;
+            concat = "foo" + s + "bar" + i + "baz" + l + "bur" + c + "dub" + z + "foo";
+            concat = "bar" + i + "baz" + l + c + "dub" + z + "foo";
+            concat = "bar" + i + "baz" + l + "dub" + z;
+            concat = s + "bar" + i + s + "bur" + c + "dub" + s + "foo";
+            return concat;
+        }
+    }
+
+    @BenchmarkMode(Mode.SingleShotTime)
+    @OutputTimeUnit(TimeUnit.MILLISECONDS)
+    @State(Scope.Thread)
+    @Fork(value = 10, warmups = 2)
+    public static class StringLarge {
+
+        public String i = "1";
+        public String l = "2";
+        public String b = "3";
+        public String s = "4";
+        public String c = "5";
+        public String S = "6";
+        public String z = "7";
+        public String f = "8";
+        public String d = "9";
+
+        @Benchmark
+        public void run() {
+            String concat;
+            concat = "" + "S" + f + l + z + f + "S" + d + S + d + S;
+            concat = "" + "S" + S + i + b + b + z + i + s + S + b + "S";
+            concat = "" + S + f + f + f + b + f + "S" + S + S + i + b;
+            concat = "" + b + l + i + l + b + S + i + i + f + z;
+            concat = "" + f + z + d + b + "S" + c + S + f + s + s + d;
+            concat = "" + f + b + d + d + l + s + s + b + l + c + z;
+            concat = "" + S + z + l + s + s + i + f + c + i + i + d;
+            concat = "" + b + "S" + c + d + "S" + d + s + "S" + f + c + l + "S" + i + z + d + "S";
+            concat = "" + S + "S" + S + i + c + z + i + i + S + b;
+            concat = "" + S + S + d + s + z + f + z + i + b + s + s + "S";
+            concat = "" + i + z + f + d + f + S + c + "S" + i;
+            concat = "" + c + c + c + "S" + S + l;
+            concat = "" + z + d + s + i + l + i + z + c + i + f + l + s + b + S + S + s + z + "S" + c + z;
+            concat = "" + d + b + l + S + s + b + "S" + c + d + c + c + l + d + S + b + l + b + S + d + "S";
+            concat = "" + c + z + c + d + b + S + c + b + S + "S" + d + s + c + s + b + c + b + z + s + i;
+            concat = "" + l + S + "S";
+            concat = "" + s + i + f + S + f + i + s + d + S + l + i + "S" + i + S + d + i + l + c + i + d;
+            concat = "" + S + l + s + i + b + f + z + c + S + d + s + f + l + i + s + b + f + s + d + l;
+            concat = "" + i + d + b + d + S + b + d + "S" + "S" + i + l + i + b + "S" + "S" + s + "S" + i + b + c;
+            concat = "" + "S" + l + "S" + s + d + l + i + l + z + s + i + z + b + b + c + S + d + d + s + i;
+            concat = "" + b + c + i + b + z + d + z + z + d + z + l + b + z + f + b + c + d + c + z + c;
+            concat = "" + b + z + f + b + z + f + s + z + f + "S" + l + f + l + z + b + z + i + l + i + S;
+            concat = "" + c + b + "S" + z;
+            concat = "" + b + "S" + i + "S" + S + i + l + c + i + c + z + z + d + "S" + z + z + c + z + z + i;
+            concat = "" + f + c + c + "S" + c + s + i + z + b + s + f + b + i + i + z + f + d + f + i + i;
+            concat = "" + d + s + z + l + s + d + S + i + S + s + i + c + b + c + s + "S" + d + S + f + s;
+            concat = "" + S + f + s + z + d + d + S + s + s + z + f + z + "S" + i + d + d + S + c + S + "S";
+            concat = "" + c + c + b + S + "S" + "S" + d + S + s + b + c + d + z + c + b + i + S + z + i + s;
+            concat = "" + l + l + d + z + s + s + i + i + l + c + f + z + i + f + l + z + s + d + f + l;
+            concat = "" + f + d + "S" + s;
+            concat = "" + d + S + "S" + S + f + "S" + c + i + s + b + c + b + l + f + S + c + c + i + z + s;
+            concat = "" + z + "S" + s + S + s + d + d + s + f + "S" + f + "S" + i + S + "S" + c + l + b + f + f;
+            concat = "" + l + f + d + b + s + f + d + "S" + l + s + "S" + b + b + s + S + S + "S" + "S" + d + b;
+            concat = "" + b + l + f + b + S + f + z + s + S + f + b + b + s + s + b + s + l + d + l;
+            concat = "" + b + b + S + S + S + z + z + d + "S" + l + "S" + s + i + "S" + c + f + S + f + i;
+            concat = "" + l + l + f + i + S + s + "S" + "S" + z + d + "S" + l + d + b + f + f + l + b + b;
+            concat = "" + l + f + "S" + f + f + i + l + l + i + S + b + f + d + i + c + c + d + d + i;
+            concat = "" + l + b + s + d + i + i + d + c + "S" + s + f + d + z + d + S + c;
+            concat = "" + f + s + "S" + z + s + "S" + b + b + b + d + d + b + z + l + c + b;
+            concat = "" + l + d + "S" + b + z + z + f + c + z + c + c + c + c + d;
+            concat = "" + z + d + l + "S" + i + s + b + b + d + s + s;
+            concat = "" + f + i + d + S + f + f + i + s + d + S + c + l + d + s + c + i;
+            concat = "" + f + c + i + "S" + "S" + c + f + b + l + i + s + c + i + S + S + i;
+            concat = "" + z + S + z + d + d + S + "S" + f + d + s + s + "S" + l + z + l + c;
+            concat = "" + b + c + s + f + S + l + b + f + "S" + l + "S" + c + c + z + b + b;
+            concat = "" + c + b + z + s + d + l + l + S + l + "S" + f + S + c + f + s + f;
+            concat = "" + z + z + d + i + z + s + z + S + f + S + "S" + "S" + l + d + c + d;
+            concat = "" + c + S + s + f + c + i + b + l + S + c + l + f + f + l + i + l;
+            concat = "" + "S" + i + f + d + s + S + S + l + s + S + l + "S" + b + l + s + l + d + d + f + S;
+            concat = "" + l + z + c + l + f + f + d + s + l + b + d + f + S + S + "S" + i + i + s + f + i;
+            concat = "" + S + S + l + S + z + d + s + c + "S" + d + f + d + f + f + z + i + f + l + S + s;
+            concat = "" + z + d + z + l + f + s + d + z + i + S + S + d + i + z + c + i + i + f + b + "S";
+            concat = "" + b + d + "S" + f + f + d + s + i + b + l + i + b + f + f + b + f + l + i + z + l;
+            concat = "" + c + z + s + "S" + z + f + "S" + i + f + s + l + i + "S" + d + i + b + i + S + b + l;
+            concat = "" + d + l + s + c + l + d + "S" + "S" + s + S + f + z + b + s + b + f + z + z + l + l;
+            concat = "" + f + b + "S" + s + i + "S" + s + f + c + f + c + f + i + i + b + i + i + b + S + S;
+            concat = "" + i + i + s + i + s + S + s + "S" + c + c + f + s + d + l + l + d + f + l + i + S;
+            concat = "" + z + d + z + "S" + c + i + f + s + b + S + i + c + s + b + c + f + s + z + f + c;
+            concat = "" + f + s + f + b + l + z + f + f + f + c + z + S + b + s + z + i + s + S + i + b;
+            concat = "" + d + i + S + b + i + "S" + l + S + S + S + z + i + z + b;
+            concat = "" + "S" + S + s + l + f + i + l + b + f + S + d + c + b + d;
+            concat = "" + c + i + i + d + S + z + c + i + c + S + f + i + c + c;
+            concat = "" + "S" + "S" + c + d + z + l + d + z + f + b + d + z + S + f;
+            concat = "" + b + d + z + d + i + z + d + b + d + "S" + c + f + d;
+            concat = "" + d + s + f + c + i + "S" + b + b + S + i + s + d + "S" + f;
+            concat = "" + l + S + d + b + S + s + "S" + s + s + l + S + "S" + c + d;
+            concat = "" + c + s + z + c + S + S + "S" + l + S + f + f + c + S + f;
+            concat = "" + d + i + s + c + z + "S" + d + f + "S" + S + c + b + "S" + c;
+            concat = "" + i + b + "S" + l + S + d + "S" + c + b + s + f + l + f + "S";
+            concat = "" + c + b + f + "S" + S + s + i + l + s + z + z + f + l + b;
+            concat = "" + S + s + "S" + d + s + z + "S" + i + i + z + S + b + f + i;
+            concat = "" + z + S + S + "S" + S + S + z + b + S + z + b + f + s + l;
+            concat = "" + s + z + d + "S" + z + l + f + z + s + z + d + l + s + l;
+            concat = "" + l + d + i + s + i + c + i + f + b + f + s + b + s + s;
+            concat = "" + z + "S" + S + "S" + "S" + i + "S" + s + d + z + l;
+            concat = "" + i + S + S + "S" + f + "S" + "S" + z + S + z + b + z + c + b;
+            concat = "" + i + f + f + d + z + f + z + b + "S" + c + l + l + z + s + S + s;
+            concat = "" + b + b + z + "S" + f + s + "S" + l +c + S + i + i + b + "S" + S;
+            concat = "" + i + "S" + d + d + d + "S" + f + "S" + b + s + S + i + "S" + d + b;
+            concat = "" + s + f + b + d + c + d + c + S + S + b + i + b + z + c;
+            concat = "" + l + l + S + l + f + s + i + c + z + f + d + l + f + b + l + f + f + i + i + z;
+            concat = "" + l + l + l + l + s + s + f + i + i + f + z + c + S + s + f + "S" + "S" + s + z + s;
+            concat = "" + S + z + f + b + l + c + i + l;
+            concat = "" + c + z + b + f + i + i + f + d + f + f + d + d + l + d + S + "S" + i + c + b + f;
+            concat = "" + s + d + S + d + b + l + l + f + b + "S" + i + z + b + S + S + c + S + f + S + z;
+            concat = "" + l + S + S + i + l + s + d + f + z + i + "S" + b + f + c + z + c + S + c + i + s;
+            concat = "" + l + S + S + s + f + S + s + "S" + c + c + c;
+            concat = "" + s + "S" + c + d + z + c + l + c + z + S + i + f + c + c + s + "S" + S + z + s + "S";
+            concat = "" + c + i + z + s + b + s + s + b + "S" + d + "S" + z + f + "S" + c + S + s + S + b + i;
+            concat = "" + s + c + d + d + "S" + "S" + l + s + i + l + l + f + S + f + f + i + S + d + l + c;
+            concat = "" + "S" + S + b + c + i + "S" + c + c + s + i + "S" + b + i + b + b + S + f + l + s + "S";
+            concat = "" + l + l + b + f + i + i + f + z + c + S + b + f + z + "S" + s + z + "S" + f + S + s;
+            concat = "" + i + c + b + i + b + z + "S" + i + c + i + l + "S" + z + b + b + i + i + c + i + f;
+            concat = "" + "S" + c + d + z + d + f + c + c + b + "S" + l + f + d + "S" + s + s + S + i + s + i;
+            concat = "" + S + "S" + d + c + "S" + S + "S" + b + f + z + "S" + l + d + f + "S" + S + d + b + c + c;
+            concat = "" + f + S + l + s + l + z + S + d + S + b + f + c + s + b + "S" + z + "S" + "S" + b + z;
+            concat = "" + f + s + c + i + S + b + s + S + i + S + c + b + s + d + i + "S" + s + l + c + s;
+            concat = "" + l + f + s + b + d + b + i + c + c + b + s + f + i + z + s + i + s + "S" + l + z;
+            concat = "" + d + z + z + c + b + b + s + b + S + l + d + i + S + d + "S" + i + S + i + b + S;
+            concat = "" + c + d + "S" + f + i + b + d + c + z + f + "S" + i + d + b + f + s + "S" + c + S + i;
+            concat = "" + i + z + "S" + b + S + s + c + s + f + S + S + f + z + s + b + d + z + i + s + z;
+            concat = "" + z + s + z + l + "S" + S + s + "S" + i + b + c + s + l + l + s + i + c + i + i + d;
+            concat = "" + "S" + b + l + z + c + f + l + S + "S" + l + i + z + z + l + S + "S" + z + S + z + c + "S";
+            concat = "" + "S" + f + S + i + i + i + "S" + i + i + l + c + l + S + S + z + b + i + c + f + S;
+            concat = "" + c + z + S + S + b + i + c;
+            concat = "" + S + s + S + c;
+        }
+    }
+
+    @BenchmarkMode(Mode.SingleShotTime)
+    @OutputTimeUnit(TimeUnit.MILLISECONDS)
+    @State(Scope.Thread)
+    @Fork(value = 10, warmups = 2)
+    public static class MixedLarge {
+
+        public int i = 17;
+        public long l = 21L;
+        public byte b = (byte)17;
+        public short s = (short)17;
+        public char c = 'a';
+        public String S = "S";
+        public float f = 1.0f;
+        public double d = 2.0;
+        public boolean z = true;
+
+        @Benchmark
+        public void run() {
+            String concat;
+            concat = "" + "S" + f + l + z + f + "S" + d + S + d + S;
+            concat = "" + "S" + S + i + b + b + z + i + s + S + b + "S";
+            concat = "" + S + f + f + f + b + f + "S" + S + S + i + b;
+            concat = "" + b + l + i + l + b + S + i + i + f + z;
+            concat = "" + f + z + d + b + "S" + c + S + f + s + s + d;
+            concat = "" + f + b + d + d + l + s + s + b + l + c + z;
+            concat = "" + S + z + l + s + s + i + f + c + i + i + d;
+            concat = "" + b + "S" + c + d + "S" + d + s + "S" + f + c + l + "S" + i + z + d + "S";
+            concat = "" + S + "S" + S + i + c + z + i + i + S + b;
+            concat = "" + S + S + d + s + z + f + z + i + b + s + s + "S";
+            concat = "" + i + z + f + d + f + S + c + "S" + i;
+            concat = "" + c + c + c + "S" + S + l;
+            concat = "" + z + d + s + i + l + i + z + c + i + f + l + s + b + S + S + s + z + "S" + c + z;
+            concat = "" + d + b + l + S + s + b + "S" + c + d + c + c + l + d + S + b + l + b + S + d + "S";
+            concat = "" + c + z + c + d + b + S + c + b + S + "S" + d + s + c + s + b + c + b + z + s + i;
+            concat = "" + l + S + "S";
+            concat = "" + s + i + f + S + f + i + s + d + S + l + i + "S" + i + S + d + i + l + c + i + d;
+            concat = "" + S + l + s + i + b + f + z + c + S + d + s + f + l + i + s + b + f + s + d + l;
+            concat = "" + i + d + b + d + S + b + d + "S" + "S" + i + l + i + b + "S" + "S" + s + "S" + i + b + c;
+            concat = "" + "S" + l + "S" + s + d + l + i + l + z + s + i + z + b + b + c + S + d + d + s + i;
+            concat = "" + b + c + i + b + z + d + z + z + d + z + l + b + z + f + b + c + d + c + z + c;
+            concat = "" + b + z + f + b + z + f + s + z + f + "S" + l + f + l + z + b + z + i + l + i + S;
+            concat = "" + c + b + "S" + z;
+            concat = "" + b + "S" + i + "S" + S + i + l + c + i + c + z + z + d + "S" + z + z + c + z + z + i;
+            concat = "" + f + c + c + "S" + c + s + i + z + b + s + f + b + i + i + z + f + d + f + i + i;
+            concat = "" + d + s + z + l + s + d + S + i + S + s + i + c + b + c + s + "S" + d + S + f + s;
+            concat = "" + S + f + s + z + d + d + S + s + s + z + f + z + "S" + i + d + d + S + c + S + "S";
+            concat = "" + c + c + b + S + "S" + "S" + d + S + s + b + c + d + z + c + b + i + S + z + i + s;
+            concat = "" + l + l + d + z + s + s + i + i + l + c + f + z + i + f + l + z + s + d + f + l;
+            concat = "" + f + d + "S" + s;
+            concat = "" + d + S + "S" + S + f + "S" + c + i + s + b + c + b + l + f + S + c + c + i + z + s;
+            concat = "" + z + "S" + s + S + s + d + d + s + f + "S" + f + "S" + i + S + "S" + c + l + b + f + f;
+            concat = "" + l + f + d + b + s + f + d + "S" + l + s + "S" + b + b + s + S + S + "S" + "S" + d + b;
+            concat = "" + b + l + f + b + S + f + z + s + S + f + b + b + s + s + b + s + l + d + l;
+            concat = "" + b + b + S + S + S + z + z + d + "S" + l + "S" + s + i + "S" + c + f + S + f + i;
+            concat = "" + l + l + f + i + S + s + "S" + "S" + z + d + "S" + l + d + b + f + f + l + b + b;
+            concat = "" + l + f + "S" + f + f + i + l + l + i + S + b + f + d + i + c + c + d + d + i;
+            concat = "" + l + b + s + d + i + i + d + c + "S" + s + f + d + z + d + S + c;
+            concat = "" + f + s + "S" + z + s + "S" + b + b + b + d + d + b + z + l + c + b;
+            concat = "" + l + d + "S" + b + z + z + f + c + z + c + c + c + c + d;
+            concat = "" + z + d + l + "S" + i + s + b + b + d + s + s;
+            concat = "" + f + i + d + S + f + f + i + s + d + S + c + l + d + s + c + i;
+            concat = "" + f + c + i + "S" + "S" + c + f + b + l + i + s + c + i + S + S + i;
+            concat = "" + z + S + z + d + d + S + "S" + f + d + s + s + "S" + l + z + l + c;
+            concat = "" + b + c + s + f + S + l + b + f + "S" + l + "S" + c + c + z + b + b;
+            concat = "" + c + b + z + s + d + l + l + S + l + "S" + f + S + c + f + s + f;
+            concat = "" + z + z + d + i + z + s + z + S + f + S + "S" + "S" + l + d + c + d;
+            concat = "" + c + S + s + f + c + i + b + l + S + c + l + f + f + l + i + l;
+            concat = "" + "S" + i + f + d + s + S + S + l + s + S + l + "S" + b + l + s + l + d + d + f + S;
+            concat = "" + l + z + c + l + f + f + d + s + l + b + d + f + S + S + "S" + i + i + s + f + i;
+            concat = "" + S + S + l + S + z + d + s + c + "S" + d + f + d + f + f + z + i + f + l + S + s;
+            concat = "" + z + d + z + l + f + s + d + z + i + S + S + d + i + z + c + i + i + f + b + "S";
+            concat = "" + b + d + "S" + f + f + d + s + i + b + l + i + b + f + f + b + f + l + i + z + l;
+            concat = "" + c + z + s + "S" + z + f + "S" + i + f + s + l + i + "S" + d + i + b + i + S + b + l;
+            concat = "" + d + l + s + c + l + d + "S" + "S" + s + S + f + z + b + s + b + f + z + z + l + l;
+            concat = "" + f + b + "S" + s + i + "S" + s + f + c + f + c + f + i + i + b + i + i + b + S + S;
+            concat = "" + i + i + s + i + s + S + s + "S" + c + c + f + s + d + l + l + d + f + l + i + S;
+            concat = "" + z + d + z + "S" + c + i + f + s + b + S + i + c + s + b + c + f + s + z + f + c;
+            concat = "" + f + s + f + b + l + z + f + f + f + c + z + S + b + s + z + i + s + S + i + b;
+            concat = "" + d + i + S + b + i + "S" + l + S + S + S + z + i + z + b;
+            concat = "" + "S" + S + s + l + f + i + l + b + f + S + d + c + b + d;
+            concat = "" + c + i + i + d + S + z + c + i + c + S + f + i + c + c;
+            concat = "" + "S" + "S" + c + d + z + l + d + z + f + b + d + z + S + f;
+            concat = "" + b + d + z + d + i + z + d + b + d + "S" + c + f + d;
+            concat = "" + d + s + f + c + i + "S" + b + b + S + i + s + d + "S" + f;
+            concat = "" + l + S + d + b + S + s + "S" + s + s + l + S + "S" + c + d;
+            concat = "" + c + s + z + c + S + S + "S" + l + S + f + f + c + S + f;
+            concat = "" + d + i + s + c + z + "S" + d + f + "S" + S + c + b + "S" + c;
+            concat = "" + i + b + "S" + l + S + d + "S" + c + b + s + f + l + f + "S";
+            concat = "" + c + b + f + "S" + S + s + i + l + s + z + z + f + l + b;
+            concat = "" + S + s + "S" + d + s + z + "S" + i + i + z + S + b + f + i;
+            concat = "" + z + S + S + "S" + S + S + z + b + S + z + b + f + s + l;
+            concat = "" + s + z + d + "S" + z + l + f + z + s + z + d + l + s + l;
+            concat = "" + l + d + i + s + i + c + i + f + b + f + s + b + s + s;
+            concat = "" + z + "S" + S + "S" + "S" + i + "S" + s + d + z + l;
+            concat = "" + i + S + S + "S" + f + "S" + "S" + z + S + z + b + z + c + b;
+            concat = "" + i + f + f + d + z + f + z + b + "S" + c + l + l + z + s + S + s;
+            concat = "" + b + b + z + "S" + f + s + "S" + l +c + S + i + i + b + "S" + S;
+            concat = "" + i + "S" + d + d + d + "S" + f + "S" + b + s + S + i + "S" + d + b;
+            concat = "" + s + f + b + d + c + d + c + S + S + b + i + b + z + c;
+            concat = "" + l + l + S + l + f + s + i + c + z + f + d + l + f + b + l + f + f + i + i + z;
+            concat = "" + l + l + l + l + s + s + f + i + i + f + z + c + S + s + f + "S" + "S" + s + z + s;
+            concat = "" + S + z + f + b + l + c + i + l;
+            concat = "" + c + z + b + f + i + i + f + d + f + f + d + d + l + d + S + "S" + i + c + b + f;
+            concat = "" + s + d + S + d + b + l + l + f + b + "S" + i + z + b + S + S + c + S + f + S + z;
+            concat = "" + l + S + S + i + l + s + d + f + z + i + "S" + b + f + c + z + c + S + c + i + s;
+            concat = "" + l + S + S + s + f + S + s + "S" + c + c + c;
+            concat = "" + s + "S" + c + d + z + c + l + c + z + S + i + f + c + c + s + "S" + S + z + s + "S";
+            concat = "" + c + i + z + s + b + s + s + b + "S" + d + "S" + z + f + "S" + c + S + s + S + b + i;
+            concat = "" + s + c + d + d + "S" + "S" + l + s + i + l + l + f + S + f + f + i + S + d + l + c;
+            concat = "" + "S" + S + b + c + i + "S" + c + c + s + i + "S" + b + i + b + b + S + f + l + s + "S";
+            concat = "" + l + l + b + f + i + i + f + z + c + S + b + f + z + "S" + s + z + "S" + f + S + s;
+            concat = "" + i + c + b + i + b + z + "S" + i + c + i + l + "S" + z + b + b + i + i + c + i + f;
+            concat = "" + "S" + c + d + z + d + f + c + c + b + "S" + l + f + d + "S" + s + s + S + i + s + i;
+            concat = "" + S + "S" + d + c + "S" + S + "S" + b + f + z + "S" + l + d + f + "S" + S + d + b + c + c;
+            concat = "" + f + S + l + s + l + z + S + d + S + b + f + c + s + b + "S" + z + "S" + "S" + b + z;
+            concat = "" + f + s + c + i + S + b + s + S + i + S + c + b + s + d + i + "S" + s + l + c + s;
+            concat = "" + l + f + s + b + d + b + i + c + c + b + s + f + i + z + s + i + s + "S" + l + z;
+            concat = "" + d + z + z + c + b + b + s + b + S + l + d + i + S + d + "S" + i + S + i + b + S;
+            concat = "" + c + d + "S" + f + i + b + d + c + z + f + "S" + i + d + b + f + s + "S" + c + S + i;
+            concat = "" + i + z + "S" + b + S + s + c + s + f + S + S + f + z + s + b + d + z + i + s + z;
+            concat = "" + z + s + z + l + "S" + S + s + "S" + i + b + c + s + l + l + s + i + c + i + i + d;
+            concat = "" + "S" + b + l + z + c + f + l + S + "S" + l + i + z + z + l + S + "S" + z + S + z + c + "S";
+            concat = "" + "S" + f + S + i + i + i + "S" + i + i + l + c + l + S + S + z + b + i + c + f + S;
+            concat = "" + c + z + S + S + b + i + c;
+            concat = "" + S + s + S + c;
+        }
+    }
+}

From a2a236f9041083e4b8f11e068da0031dd5f52c2b Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Tue, 23 Jul 2024 12:11:47 +0000
Subject: [PATCH 183/401] 8335939: Hide element writing across the ClassFile
 API

Reviewed-by: asotona
---
 .../java/lang/classfile/Annotation.java       |  3 +-
 .../lang/classfile/AnnotationElement.java     |  3 +-
 .../java/lang/classfile/AnnotationValue.java  |  4 +-
 .../java/lang/classfile/Attribute.java        |  2 +-
 .../lang/classfile/BootstrapMethodEntry.java  |  3 +-
 .../java/lang/classfile/BufWriter.java        | 39 -------------
 .../java/lang/classfile/ClassFileElement.java |  4 +-
 .../java/lang/classfile/ClassReader.java      | 15 -----
 .../java/lang/classfile/CustomAttribute.java  |  8 +--
 .../java/lang/classfile/FieldModel.java       |  2 +-
 .../java/lang/classfile/MethodModel.java      |  2 +-
 .../java/lang/classfile/WritableElement.java  | 53 ------------------
 .../constantpool/ConstantPoolBuilder.java     |  4 +-
 .../classfile/constantpool/PoolEntry.java     |  5 +-
 .../classfile/instruction/LocalVariable.java  | 15 +----
 .../instruction/LocalVariableType.java        | 12 +---
 .../impl/AbstractAttributeMapper.java         | 40 ++++++++------
 .../impl/AbstractBoundLocalVariable.java      |  8 +--
 .../classfile/impl/AbstractPoolEntry.java     | 21 +++----
 .../impl/AbstractPseudoInstruction.java       | 10 ++--
 .../classfile/impl/AbstractUnboundModel.java  |  2 +-
 .../classfile/impl/AnnotationImpl.java        | 45 ++++++++-------
 .../classfile/impl/AnnotationReader.java      | 23 +++++++-
 .../classfile/impl/AttributeHolder.java       |  9 +--
 .../impl/BootstrapMethodEntryImpl.java        |  6 +-
 .../classfile/impl/BoundAttribute.java        |  4 +-
 .../classfile/impl/BufWriterImpl.java         | 25 +--------
 .../classfile/impl/BufferedCodeBuilder.java   |  4 +-
 .../classfile/impl/BufferedFieldBuilder.java  |  2 +-
 .../classfile/impl/BufferedMethodBuilder.java |  3 +-
 .../classfile/impl/ClassReaderImpl.java       | 10 ++--
 .../jdk/internal/classfile/impl/CodeImpl.java |  6 +-
 .../classfile/impl/DirectClassBuilder.java    | 22 ++++----
 .../classfile/impl/DirectCodeBuilder.java     | 37 ++++++-------
 .../classfile/impl/DirectFieldBuilder.java    | 10 ++--
 .../classfile/impl/DirectMethodBuilder.java   |  9 +--
 .../internal/classfile/impl/FieldImpl.java    |  6 +-
 .../internal/classfile/impl/MethodImpl.java   |  7 +--
 .../classfile/impl/SplitConstantPool.java     | 13 ++---
 .../internal/classfile/impl/StackCounter.java |  2 +-
 .../classfile/impl/StackMapGenerator.java     |  4 +-
 .../classfile/impl/TemporaryConstantPool.java |  5 --
 .../classfile/impl/UnboundAttribute.java      | 19 +++----
 .../jdk/internal/classfile/impl/Util.java     | 55 ++++++++++++++++++-
 .../jdk/jdk/classfile/BoundAttributeTest.java |  4 +-
 test/jdk/jdk/classfile/CorpusTest.java        | 12 ++--
 test/jdk/jdk/classfile/LimitsTest.java        |  9 +--
 test/jdk/jdk/classfile/LowAdaptTest.java      |  7 +--
 test/jdk/jdk/classfile/VerifierSelfTest.java  |  4 +-
 .../AnnotationDefaultVerifier.java            |  6 +-
 50 files changed, 263 insertions(+), 360 deletions(-)
 delete mode 100644 src/java.base/share/classes/java/lang/classfile/WritableElement.java

diff --git a/src/java.base/share/classes/java/lang/classfile/Annotation.java b/src/java.base/share/classes/java/lang/classfile/Annotation.java
index 3e7548d0859bc..28c3672bf914e 100644
--- a/src/java.base/share/classes/java/lang/classfile/Annotation.java
+++ b/src/java.base/share/classes/java/lang/classfile/Annotation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,7 +51,6 @@
  */
 @PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
 public sealed interface Annotation
-        extends WritableElement<Annotation>
         permits TypeAnnotation, AnnotationImpl {
 
     /**
diff --git a/src/java.base/share/classes/java/lang/classfile/AnnotationElement.java b/src/java.base/share/classes/java/lang/classfile/AnnotationElement.java
index 41acb18e788e8..80adb07ec4b2a 100644
--- a/src/java.base/share/classes/java/lang/classfile/AnnotationElement.java
+++ b/src/java.base/share/classes/java/lang/classfile/AnnotationElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,6 @@
  */
 @PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
 public sealed interface AnnotationElement
-        extends WritableElement<AnnotationElement>
         permits AnnotationImpl.AnnotationElementImpl {
 
     /**
diff --git a/src/java.base/share/classes/java/lang/classfile/AnnotationValue.java b/src/java.base/share/classes/java/lang/classfile/AnnotationValue.java
index 2882296b6bc51..919c8a0441dde 100644
--- a/src/java.base/share/classes/java/lang/classfile/AnnotationValue.java
+++ b/src/java.base/share/classes/java/lang/classfile/AnnotationValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@
  * @since 22
  */
 @PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
-public sealed interface AnnotationValue extends WritableElement<AnnotationValue>
+public sealed interface AnnotationValue
         permits AnnotationValue.OfAnnotation, AnnotationValue.OfArray,
                 AnnotationValue.OfConstant, AnnotationValue.OfClass,
                 AnnotationValue.OfEnum {
diff --git a/src/java.base/share/classes/java/lang/classfile/Attribute.java b/src/java.base/share/classes/java/lang/classfile/Attribute.java
index ad67bdf53652d..718f164e8ef7f 100644
--- a/src/java.base/share/classes/java/lang/classfile/Attribute.java
+++ b/src/java.base/share/classes/java/lang/classfile/Attribute.java
@@ -80,7 +80,7 @@
  */
 @PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
 public sealed interface Attribute<A extends Attribute<A>>
-        extends WritableElement<A>
+        extends ClassFileElement
         permits AnnotationDefaultAttribute, BootstrapMethodsAttribute,
                 CharacterRangeTableAttribute, CodeAttribute, CompilationIDAttribute,
                 ConstantValueAttribute, DeprecatedAttribute, EnclosingMethodAttribute,
diff --git a/src/java.base/share/classes/java/lang/classfile/BootstrapMethodEntry.java b/src/java.base/share/classes/java/lang/classfile/BootstrapMethodEntry.java
index c472dca8530d7..5ff3c449fe9ae 100644
--- a/src/java.base/share/classes/java/lang/classfile/BootstrapMethodEntry.java
+++ b/src/java.base/share/classes/java/lang/classfile/BootstrapMethodEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,6 @@
  */
 @PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
 public sealed interface BootstrapMethodEntry
-        extends WritableElement<BootstrapMethodEntry>
         permits BootstrapMethodEntryImpl {
 
     /**
diff --git a/src/java.base/share/classes/java/lang/classfile/BufWriter.java b/src/java.base/share/classes/java/lang/classfile/BufWriter.java
index 11d6a4501f0cb..c71b44e7c0286 100644
--- a/src/java.base/share/classes/java/lang/classfile/BufWriter.java
+++ b/src/java.base/share/classes/java/lang/classfile/BufWriter.java
@@ -24,8 +24,6 @@
  */
 package java.lang.classfile;
 
-import java.util.List;
-
 import java.lang.classfile.constantpool.ConstantPool;
 import java.lang.classfile.constantpool.ConstantPoolBuilder;
 import java.lang.classfile.constantpool.PoolEntry;
@@ -110,13 +108,6 @@ public sealed interface BufWriter
      */
     void writeBytes(byte[] arr);
 
-    /**
-     * Write the contents of another {@link BufWriter} to the buffer
-     *
-     * @param other the other {@linkplain BufWriter}
-     */
-    void writeBytes(BufWriter other);
-
     /**
      * Write a range of a byte array to the buffer
      *
@@ -166,38 +157,8 @@ public sealed interface BufWriter
      */
     void writeIndexOrZero(PoolEntry entry);
 
-    /**
-     * Write a list of entities to the buffer.  The length of the list is
-     * written as a {@code u2}, followed by the bytes corresponding to each
-     * element in the list.  Writing of the entities is delegated to the entry.
-     *
-     * @param list the entities
-     * @param <T> the type of entity
-     */
-    <T extends WritableElement<?>> void writeList(List<T> list);
-
-    /**
-     * Write a list of constant pool entry indexes to the buffer.  The length
-     * of the list is written as a {@code u2}, followed by a {@code u2} for each
-     * entry in the list.
-     *
-     * @param list the list of entries
-     * @throws IllegalArgumentException if any entry has invalid index
-     */
-    void writeListIndices(List<? extends PoolEntry> list);
-
     /**
      * {@return the number of bytes that have been written to the buffer}
      */
     int size();
-
-    /**
-     * Copy the contents of the buffer into a byte array.
-     *
-     * @param array the byte array
-     * @param bufferOffset the offset into the array at which to write the
-     *                     contents of the buffer
-     * @throws IndexOutOfBoundsException if copying outside of the array bounds
-     */
-    void copyTo(byte[] array, int bufferOffset);
 }
diff --git a/src/java.base/share/classes/java/lang/classfile/ClassFileElement.java b/src/java.base/share/classes/java/lang/classfile/ClassFileElement.java
index 6452f52e04226..a4a8203038f15 100644
--- a/src/java.base/share/classes/java/lang/classfile/ClassFileElement.java
+++ b/src/java.base/share/classes/java/lang/classfile/ClassFileElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,6 @@
  */
 @PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
 public sealed interface ClassFileElement
-        permits AttributedElement, CompoundElement, WritableElement,
+        permits AttributedElement, CompoundElement, Attribute,
                 ClassElement, CodeElement, FieldElement, MethodElement {
 }
diff --git a/src/java.base/share/classes/java/lang/classfile/ClassReader.java b/src/java.base/share/classes/java/lang/classfile/ClassReader.java
index ef4a36729e679..735aae444fc0c 100644
--- a/src/java.base/share/classes/java/lang/classfile/ClassReader.java
+++ b/src/java.base/share/classes/java/lang/classfile/ClassReader.java
@@ -189,19 +189,4 @@ public sealed interface ClassReader extends ConstantPool
      * @param len the length of the range
      */
     void copyBytesTo(BufWriter buf, int offset, int len);
-
-    /**
-     * Compare a range of bytes from the classfile to a range of bytes within
-     * a {@link BufWriter}.
-     *
-     * @param bufWriter the {@linkplain BufWriter}
-     * @param bufWriterOffset the offset within the {@linkplain BufWriter}
-     * @param classReaderOffset the offset within the classfile
-     * @param length the length of the range
-     * @return whether the two ranges were identical
-     */
-    boolean compare(BufWriter bufWriter,
-                    int bufWriterOffset,
-                    int classReaderOffset,
-                    int length);
 }
diff --git a/src/java.base/share/classes/java/lang/classfile/CustomAttribute.java b/src/java.base/share/classes/java/lang/classfile/CustomAttribute.java
index 31544a0ba92bf..9fe492dc22c4c 100644
--- a/src/java.base/share/classes/java/lang/classfile/CustomAttribute.java
+++ b/src/java.base/share/classes/java/lang/classfile/CustomAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,12 +59,6 @@ public final String attributeName() {
         return mapper.name();
     }
 
-    @Override
-    @SuppressWarnings("unchecked")
-    public final void writeTo(BufWriter buf) {
-        mapper.writeAttribute(buf, (T) this);
-    }
-
     @Override
     public String toString() {
         return String.format("CustomAttribute[name=%s]", mapper.name());
diff --git a/src/java.base/share/classes/java/lang/classfile/FieldModel.java b/src/java.base/share/classes/java/lang/classfile/FieldModel.java
index 35465dfe97d00..e14f264ca2a98 100644
--- a/src/java.base/share/classes/java/lang/classfile/FieldModel.java
+++ b/src/java.base/share/classes/java/lang/classfile/FieldModel.java
@@ -42,7 +42,7 @@
  */
 @PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
 public sealed interface FieldModel
-        extends WritableElement<FieldModel>, CompoundElement<FieldElement>, AttributedElement, ClassElement
+        extends CompoundElement<FieldElement>, AttributedElement, ClassElement
         permits BufferedFieldBuilder.Model, FieldImpl {
 
     /** {@return the access flags} */
diff --git a/src/java.base/share/classes/java/lang/classfile/MethodModel.java b/src/java.base/share/classes/java/lang/classfile/MethodModel.java
index 3d91683e21889..651bc194ee3e0 100644
--- a/src/java.base/share/classes/java/lang/classfile/MethodModel.java
+++ b/src/java.base/share/classes/java/lang/classfile/MethodModel.java
@@ -42,7 +42,7 @@
  */
 @PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
 public sealed interface MethodModel
-        extends WritableElement<MethodModel>, CompoundElement<MethodElement>, AttributedElement, ClassElement
+        extends CompoundElement<MethodElement>, AttributedElement, ClassElement
         permits BufferedMethodBuilder.Model, MethodImpl {
 
     /** {@return the access flags} */
diff --git a/src/java.base/share/classes/java/lang/classfile/WritableElement.java b/src/java.base/share/classes/java/lang/classfile/WritableElement.java
deleted file mode 100644
index 9a4db4e370f4b..0000000000000
--- a/src/java.base/share/classes/java/lang/classfile/WritableElement.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-package java.lang.classfile;
-
-import java.lang.classfile.constantpool.ConstantPoolBuilder;
-import java.lang.classfile.constantpool.PoolEntry;
-import jdk.internal.classfile.impl.DirectFieldBuilder;
-import jdk.internal.classfile.impl.DirectMethodBuilder;
-import jdk.internal.javac.PreviewFeature;
-
-/**
- * A classfile element that can encode itself as a stream of bytes in the
- * encoding expected by the classfile format.
- *
- * @param <T> the type of the entity
- *
- * @sealedGraph
- * @since 22
- */
-@PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
-public sealed interface WritableElement<T> extends ClassFileElement
-        permits Annotation, AnnotationElement, AnnotationValue, Attribute,
-                PoolEntry, BootstrapMethodEntry, FieldModel, MethodModel,
-                ConstantPoolBuilder, DirectFieldBuilder, DirectMethodBuilder {
-    /**
-     * Writes the element to the specified writer
-     *
-     * @param buf the writer
-     */
-    void writeTo(BufWriter buf);
-}
diff --git a/src/java.base/share/classes/java/lang/classfile/constantpool/ConstantPoolBuilder.java b/src/java.base/share/classes/java/lang/classfile/constantpool/ConstantPoolBuilder.java
index a43e6f102ed72..c092717547692 100644
--- a/src/java.base/share/classes/java/lang/classfile/constantpool/ConstantPoolBuilder.java
+++ b/src/java.base/share/classes/java/lang/classfile/constantpool/ConstantPoolBuilder.java
@@ -33,13 +33,11 @@
 import java.util.List;
 
 import java.lang.classfile.BootstrapMethodEntry;
-import java.lang.classfile.BufWriter;
 import java.lang.classfile.ClassBuilder;
 import java.lang.classfile.ClassModel;
 import jdk.internal.classfile.impl.ClassReaderImpl;
 import java.lang.constant.ModuleDesc;
 import java.lang.constant.PackageDesc;
-import java.lang.classfile.WritableElement;
 import jdk.internal.classfile.impl.AbstractPoolEntry.ClassEntryImpl;
 import jdk.internal.classfile.impl.AbstractPoolEntry.NameAndTypeEntryImpl;
 import jdk.internal.classfile.impl.SplitConstantPool;
@@ -61,7 +59,7 @@
  */
 @PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
 public sealed interface ConstantPoolBuilder
-        extends ConstantPool, WritableElement<ConstantPool>
+        extends ConstantPool
         permits SplitConstantPool, TemporaryConstantPool {
 
     /**
diff --git a/src/java.base/share/classes/java/lang/classfile/constantpool/PoolEntry.java b/src/java.base/share/classes/java/lang/classfile/constantpool/PoolEntry.java
index 49bd978e56a39..c8b74a139280e 100644
--- a/src/java.base/share/classes/java/lang/classfile/constantpool/PoolEntry.java
+++ b/src/java.base/share/classes/java/lang/classfile/constantpool/PoolEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,6 @@
  */
 package java.lang.classfile.constantpool;
 
-import java.lang.classfile.WritableElement;
 import jdk.internal.javac.PreviewFeature;
 
 /**
@@ -34,7 +33,7 @@
  * @since 22
  */
 @PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
-public sealed interface PoolEntry extends WritableElement<PoolEntry>
+public sealed interface PoolEntry
         permits AnnotationConstantValueEntry, DynamicConstantPoolEntry,
                 LoadableConstantEntry, MemberRefEntry, ModuleEntry, NameAndTypeEntry,
                 PackageEntry {
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/LocalVariable.java b/src/java.base/share/classes/java/lang/classfile/instruction/LocalVariable.java
index cd37ab949926a..4d3d755386763 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/LocalVariable.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/LocalVariable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,9 +24,6 @@
  */
 package java.lang.classfile.instruction;
 
-import java.lang.constant.ClassDesc;
-
-import java.lang.classfile.BufWriter;
 import java.lang.classfile.ClassFile;
 import java.lang.classfile.CodeElement;
 import java.lang.classfile.CodeModel;
@@ -34,6 +31,8 @@
 import java.lang.classfile.PseudoInstruction;
 import java.lang.classfile.attribute.LocalVariableTableAttribute;
 import java.lang.classfile.constantpool.Utf8Entry;
+import java.lang.constant.ClassDesc;
+
 import jdk.internal.classfile.impl.AbstractPseudoInstruction;
 import jdk.internal.classfile.impl.BoundLocalVariable;
 import jdk.internal.classfile.impl.TemporaryConstantPool;
@@ -84,14 +83,6 @@ default ClassDesc typeSymbol() {
      */
     Label endScope();
 
-    /**
-     * Writes the local variable to the specified writer
-     *
-     * @param buf the writer
-     * @return true if the variable has been written
-     */
-    boolean writeTo(BufWriter buf);
-
     /**
      * {@return a local variable pseudo-instruction}
      *
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/LocalVariableType.java b/src/java.base/share/classes/java/lang/classfile/instruction/LocalVariableType.java
index 1415d0bb57cdc..4409abe6db272 100644
--- a/src/java.base/share/classes/java/lang/classfile/instruction/LocalVariableType.java
+++ b/src/java.base/share/classes/java/lang/classfile/instruction/LocalVariableType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,6 @@
  */
 package java.lang.classfile.instruction;
 
-import java.lang.classfile.BufWriter;
 import java.lang.classfile.ClassFile;
 import java.lang.classfile.CodeElement;
 import java.lang.classfile.CodeModel;
@@ -33,6 +32,7 @@
 import java.lang.classfile.Signature;
 import java.lang.classfile.attribute.LocalVariableTypeTableAttribute;
 import java.lang.classfile.constantpool.Utf8Entry;
+
 import jdk.internal.classfile.impl.AbstractPseudoInstruction;
 import jdk.internal.classfile.impl.BoundLocalVariableType;
 import jdk.internal.classfile.impl.TemporaryConstantPool;
@@ -81,14 +81,6 @@ default Signature signatureSymbol() {
      */
     Label endScope();
 
-    /**
-     * Writes the local variable to the specified writer
-     *
-     * @param buf the writer
-     * @return true if the variable has been written
-     */
-    boolean writeTo(BufWriter buf);
-
     /**
      * {@return a local variable type pseudo-instruction}
      *
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractAttributeMapper.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractAttributeMapper.java
index 9bb3f275ba1a2..0029b503d7a2d 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractAttributeMapper.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractAttributeMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -101,7 +101,7 @@ public AnnotationDefaultAttribute readAttribute(AttributedElement e, ClassReader
 
         @Override
         protected void writeBody(BufWriter buf, AnnotationDefaultAttribute attr) {
-            attr.defaultValue().writeTo(buf);
+            AnnotationReader.writeAnnotationValue((BufWriterImpl) buf, attr.defaultValue());
         }
     }
 
@@ -119,7 +119,11 @@ public BootstrapMethodsAttribute readAttribute(AttributedElement e, ClassReader
 
         @Override
         protected void writeBody(BufWriter buf, BootstrapMethodsAttribute attr) {
-            buf.writeList(attr.bootstrapMethods());
+            var b = (BufWriterImpl) buf;
+            b.writeU2(attr.bootstrapMethodsSize());
+            for (var bsm : attr.bootstrapMethods()) {
+                ((BootstrapMethodEntryImpl) bsm).writeTo(b);
+            }
         }
     }
 
@@ -254,7 +258,7 @@ public ExceptionsAttribute readAttribute(AttributedElement e, ClassReader cf, in
 
         @Override
         protected void writeBody(BufWriter buf, ExceptionsAttribute attr) {
-            buf.writeListIndices(attr.exceptions());
+            Util.writeListIndices(buf, attr.exceptions());
         }
     }
 
@@ -408,19 +412,19 @@ protected void writeBody(BufWriter buf, ModuleAttribute attr) {
             for (ModuleExportInfo export : attr.exports()) {
                 buf.writeIndex(export.exportedPackage());
                 buf.writeU2(export.exportsFlagsMask());
-                buf.writeListIndices(export.exportsTo());
+                Util.writeListIndices(buf, export.exportsTo());
             }
             buf.writeU2(attr.opens().size());
             for (ModuleOpenInfo open : attr.opens()) {
                 buf.writeIndex(open.openedPackage());
                 buf.writeU2(open.opensFlagsMask());
-                buf.writeListIndices(open.opensTo());
+                Util.writeListIndices(buf, open.opensTo());
             }
-            buf.writeListIndices(attr.uses());
+            Util.writeListIndices(buf, attr.uses());
             buf.writeU2(attr.provides().size());
             for (ModuleProvideInfo provide : attr.provides()) {
                 buf.writeIndex(provide.provides());
-                buf.writeListIndices(provide.providesWith());
+                Util.writeListIndices(buf, provide.providesWith());
             }
         }
     }
@@ -482,7 +486,7 @@ public ModulePackagesAttribute readAttribute(AttributedElement e, ClassReader cf
 
         @Override
         protected void writeBody(BufWriter buf, ModulePackagesAttribute attr) {
-            buf.writeListIndices(attr.packages());
+            Util.writeListIndices(buf, attr.packages());
         }
     }
 
@@ -554,7 +558,7 @@ public NestMembersAttribute readAttribute(AttributedElement e, ClassReader cf, i
 
         @Override
         protected void writeBody(BufWriter buf, NestMembersAttribute attr) {
-            buf.writeListIndices(attr.nestMembers());
+            Util.writeListIndices(buf, attr.nestMembers());
         }
     }
 
@@ -572,7 +576,7 @@ public PermittedSubclassesAttribute readAttribute(AttributedElement e, ClassRead
 
         @Override
         protected void writeBody(BufWriter buf, PermittedSubclassesAttribute attr) {
-            buf.writeListIndices(attr.permittedSubclasses());
+            Util.writeListIndices(buf, attr.permittedSubclasses());
         }
     }
 
@@ -595,7 +599,7 @@ protected void writeBody(BufWriter buf, RecordAttribute attr) {
             for (RecordComponentInfo info : components) {
                 buf.writeIndex(info.name());
                 buf.writeIndex(info.descriptor());
-                buf.writeList(info.attributes());
+                Util.writeAttributes((BufWriterImpl) buf, info.attributes());
             }
         }
     }
@@ -614,7 +618,7 @@ public RuntimeInvisibleAnnotationsAttribute readAttribute(AttributedElement encl
 
         @Override
         protected void writeBody(BufWriter buf, RuntimeInvisibleAnnotationsAttribute attr) {
-            buf.writeList(attr.annotations());
+            AnnotationReader.writeAnnotations(buf, attr.annotations());
         }
     }
 
@@ -635,7 +639,7 @@ protected void writeBody(BufWriter buf, RuntimeInvisibleParameterAnnotationsAttr
             List<List<Annotation>> lists = attr.parameterAnnotations();
             buf.writeU1(lists.size());
             for (List<Annotation> list : lists)
-                buf.writeList(list);
+                AnnotationReader.writeAnnotations(buf, list);
         }
     }
 
@@ -653,7 +657,7 @@ public RuntimeInvisibleTypeAnnotationsAttribute readAttribute(AttributedElement
 
         @Override
         protected void writeBody(BufWriter buf, RuntimeInvisibleTypeAnnotationsAttribute attr) {
-            buf.writeList(attr.annotations());
+            AnnotationReader.writeAnnotations(buf, attr.annotations());
         }
     }
 
@@ -671,7 +675,7 @@ public RuntimeVisibleAnnotationsAttribute readAttribute(AttributedElement enclos
 
         @Override
         protected void writeBody(BufWriter buf, RuntimeVisibleAnnotationsAttribute attr) {
-            buf.writeList(attr.annotations());
+            AnnotationReader.writeAnnotations(buf, attr.annotations());
         }
     }
 
@@ -692,7 +696,7 @@ protected void writeBody(BufWriter buf, RuntimeVisibleParameterAnnotationsAttrib
             List<List<Annotation>> lists = attr.parameterAnnotations();
             buf.writeU1(lists.size());
             for (List<Annotation> list : lists)
-                buf.writeList(list);
+                AnnotationReader.writeAnnotations(buf, list);
         }
     }
 
@@ -710,7 +714,7 @@ public RuntimeVisibleTypeAnnotationsAttribute readAttribute(AttributedElement e,
 
         @Override
         protected void writeBody(BufWriter buf, RuntimeVisibleTypeAnnotationsAttribute attr) {
-            buf.writeList(attr.annotations());
+            AnnotationReader.writeAnnotations(buf, attr.annotations());
         }
     }
 
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractBoundLocalVariable.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractBoundLocalVariable.java
index d3f49e3168afb..dcbd8c8fee83d 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractBoundLocalVariable.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractBoundLocalVariable.java
@@ -24,12 +24,11 @@
  */
 package jdk.internal.classfile.impl;
 
-import java.lang.classfile.BufWriter;
 import java.lang.classfile.Label;
 import java.lang.classfile.constantpool.Utf8Entry;
 
 public class AbstractBoundLocalVariable
-        extends AbstractElement {
+        extends AbstractElement implements Util.WritableLocalVariable {
     protected final CodeImpl code;
     protected final int offset;
     private Utf8Entry nameEntry;
@@ -80,8 +79,9 @@ public int slot() {
         return code.classReader.readU2(offset + 8);
     }
 
-    public boolean writeTo(BufWriter b) {
-        var lc = ((BufWriterImpl)b).labelContext();
+    @Override
+    public boolean writeLocalTo(BufWriterImpl b) {
+        var lc = b.labelContext();
         int startBci = lc.labelToBci(startScope());
         int endBci = lc.labelToBci(endScope());
         if (startBci == -1 || endBci == -1) {
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
index f846ca6fa9011..c6e6c4dce57a7 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPoolEntry.java
@@ -34,7 +34,6 @@
 import java.lang.classfile.constantpool.ConstantDynamicEntry;
 import java.lang.classfile.constantpool.ConstantPool;
 import java.lang.classfile.constantpool.ConstantPoolBuilder;
-import java.lang.classfile.BufWriter;
 import java.lang.classfile.constantpool.DoubleEntry;
 import java.lang.classfile.constantpool.FieldRefEntry;
 import java.lang.classfile.constantpool.FloatEntry;
@@ -123,6 +122,8 @@ public int width() {
         return (tag == ClassFile.TAG_LONG || tag == ClassFile.TAG_DOUBLE) ? 2 : 1;
     }
 
+    abstract void writeTo(BufWriterImpl buf);
+
     abstract PoolEntry clone(ConstantPoolBuilder cp);
 
     public static final class Utf8EntryImpl extends AbstractPoolEntry implements Utf8Entry {
@@ -407,7 +408,7 @@ public boolean equalsString(String s) {
         }
 
         @Override
-        public void writeTo(BufWriter pool) {
+        void writeTo(BufWriterImpl pool) {
             if (rawBytes != null) {
                 pool.writeU1(tag);
                 pool.writeU2(rawLen);
@@ -478,7 +479,7 @@ public T ref1() {
             return ref1;
         }
 
-        public void writeTo(BufWriter pool) {
+        void writeTo(BufWriterImpl pool) {
             pool.writeU1(tag);
             pool.writeU2(ref1.index());
         }
@@ -508,7 +509,7 @@ public U ref2() {
             return ref2;
         }
 
-        public void writeTo(BufWriter pool) {
+        void writeTo(BufWriterImpl pool) {
             pool.writeU1(tag);
             pool.writeU2(ref1.index());
             pool.writeU2(ref2.index());
@@ -814,7 +815,7 @@ public NameAndTypeEntryImpl nameAndType() {
             return nameAndType;
         }
 
-        public void writeTo(BufWriter pool) {
+        void writeTo(BufWriterImpl pool) {
             pool.writeU1(tag);
             pool.writeU2(bsmIndex);
             pool.writeU2(nameAndType.index());
@@ -919,7 +920,7 @@ public DirectMethodHandleDesc asSymbol() {
         }
 
         @Override
-        public void writeTo(BufWriter pool) {
+        void writeTo(BufWriterImpl pool) {
             pool.writeU1(tag);
             pool.writeU1(refKind);
             pool.writeU2(reference.index());
@@ -1069,7 +1070,7 @@ public static final class IntegerEntryImpl extends PrimitiveEntry<Integer>
         }
 
         @Override
-        public void writeTo(BufWriter pool) {
+        void writeTo(BufWriterImpl pool) {
             pool.writeU1(tag);
             pool.writeInt(val);
         }
@@ -1102,7 +1103,7 @@ public static final class FloatEntryImpl extends PrimitiveEntry<Float>
         }
 
         @Override
-        public void writeTo(BufWriter pool) {
+        void writeTo(BufWriterImpl pool) {
             pool.writeU1(tag);
             pool.writeFloat(val);
         }
@@ -1134,7 +1135,7 @@ public static final class LongEntryImpl extends PrimitiveEntry<Long> implements
         }
 
         @Override
-        public void writeTo(BufWriter pool) {
+        void writeTo(BufWriterImpl pool) {
             pool.writeU1(tag);
             pool.writeLong(val);
         }
@@ -1166,7 +1167,7 @@ public static final class DoubleEntryImpl extends PrimitiveEntry<Double> impleme
         }
 
         @Override
-        public void writeTo(BufWriter pool) {
+        void writeTo(BufWriterImpl pool) {
             pool.writeU1(tag);
             pool.writeDouble(val);
         }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPseudoInstruction.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPseudoInstruction.java
index ffc360379059c..00d817b8cb0cb 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPseudoInstruction.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractPseudoInstruction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -154,7 +154,8 @@ public void writeTo(DirectCodeBuilder writer) {
 
     }
 
-    private abstract static sealed class AbstractLocalPseudo extends AbstractPseudoInstruction {
+    private abstract static sealed class AbstractLocalPseudo extends AbstractPseudoInstruction
+            implements Util.WritableLocalVariable {
         protected final int slot;
         protected final Utf8Entry name;
         protected final Utf8Entry descriptor;
@@ -189,8 +190,9 @@ public Label endScope() {
             return endScope;
         }
 
-        public boolean writeTo(BufWriter b) {
-            var lc = ((BufWriterImpl)b).labelContext();
+        @Override
+        public boolean writeLocalTo(BufWriterImpl b) {
+            var lc = b.labelContext();
             int startBci = lc.labelToBci(startScope());
             int endBci = lc.labelToBci(endScope());
             if (startBci == -1 || endBci == -1) {
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractUnboundModel.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractUnboundModel.java
index 5aebec8ab40f6..788bdffe1cd5b 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractUnboundModel.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractUnboundModel.java
@@ -35,7 +35,7 @@
 
 public abstract sealed class AbstractUnboundModel<E extends ClassFileElement>
         extends AbstractElement
-        implements CompoundElement<E>, AttributedElement
+        implements CompoundElement<E>, AttributedElement, Util.Writable
         permits BufferedCodeBuilder.Model, BufferedFieldBuilder.Model, BufferedMethodBuilder.Model {
     private final List<E> elements;
     private List<Attribute<?>> attributes;
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AnnotationImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AnnotationImpl.java
index 4fc2d5cf63bfe..8290fcd286ed9 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AnnotationImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AnnotationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
 
 import static java.lang.classfile.ClassFile.*;
 
-public final class AnnotationImpl implements Annotation {
+public final class AnnotationImpl implements Annotation, Util.Writable {
     private final Utf8Entry className;
     private final List<AnnotationElement> elements;
 
@@ -53,9 +53,13 @@ public List<AnnotationElement> elements() {
     }
 
     @Override
-    public void writeTo(BufWriter buf) {
+    public void writeTo(BufWriterImpl buf) {
         buf.writeIndex(className());
-        buf.writeList(elements());
+        buf.writeU2(elements().size());
+        for (var e : elements) {
+            buf.writeIndex(e.name());
+            AnnotationReader.writeAnnotationValue(buf, e.value());
+        }
     }
 
     @Override
@@ -81,16 +85,16 @@ public String toString() {
 
     public record AnnotationElementImpl(Utf8Entry name,
                                         AnnotationValue value)
-            implements AnnotationElement {
+            implements AnnotationElement, Util.Writable {
 
         @Override
-        public void writeTo(BufWriter buf) {
+        public void writeTo(BufWriterImpl buf) {
             buf.writeIndex(name());
-            value().writeTo(buf);
+            AnnotationReader.writeAnnotationValue(buf, value());
         }
     }
 
-    public sealed interface OfConstantImpl extends AnnotationValue.OfConstant
+    public sealed interface OfConstantImpl extends AnnotationValue.OfConstant, Util.Writable
             permits AnnotationImpl.OfStringImpl, AnnotationImpl.OfDoubleImpl,
                     AnnotationImpl.OfFloatImpl, AnnotationImpl.OfLongImpl,
                     AnnotationImpl.OfIntegerImpl, AnnotationImpl.OfShortImpl,
@@ -98,7 +102,7 @@ public sealed interface OfConstantImpl extends AnnotationValue.OfConstant
                     AnnotationImpl.OfBooleanImpl {
 
         @Override
-        default void writeTo(BufWriter buf) {
+        default void writeTo(BufWriterImpl buf) {
             buf.writeU1(tag());
             buf.writeIndex(constant());
         }
@@ -237,7 +241,7 @@ public boolean booleanValue() {
     }
 
     public record OfArrayImpl(List<AnnotationValue> values)
-            implements AnnotationValue.OfArray {
+            implements AnnotationValue.OfArray, Util.Writable {
 
         public OfArrayImpl(List<AnnotationValue> values) {
             this.values = List.copyOf(values);
@@ -249,22 +253,25 @@ public char tag() {
         }
 
         @Override
-        public void writeTo(BufWriter buf) {
+        public void writeTo(BufWriterImpl buf) {
             buf.writeU1(tag());
-            buf.writeList(values);
+            buf.writeU2(values.size());
+            for (var e : values) {
+                AnnotationReader.writeAnnotationValue(buf, e);
+            }
         }
 
     }
 
     public record OfEnumImpl(Utf8Entry className, Utf8Entry constantName)
-            implements AnnotationValue.OfEnum {
+            implements AnnotationValue.OfEnum, Util.Writable {
         @Override
         public char tag() {
             return AEV_ENUM;
         }
 
         @Override
-        public void writeTo(BufWriter buf) {
+        public void writeTo(BufWriterImpl buf) {
             buf.writeU1(tag());
             buf.writeIndex(className);
             buf.writeIndex(constantName);
@@ -273,29 +280,29 @@ public void writeTo(BufWriter buf) {
     }
 
     public record OfAnnotationImpl(Annotation annotation)
-            implements AnnotationValue.OfAnnotation {
+            implements AnnotationValue.OfAnnotation, Util.Writable {
         @Override
         public char tag() {
             return AEV_ANNOTATION;
         }
 
         @Override
-        public void writeTo(BufWriter buf) {
+        public void writeTo(BufWriterImpl buf) {
             buf.writeU1(tag());
-            annotation.writeTo(buf);
+            AnnotationReader.writeAnnotation(buf, annotation);
         }
 
     }
 
     public record OfClassImpl(Utf8Entry className)
-            implements AnnotationValue.OfClass {
+            implements AnnotationValue.OfClass, Util.Writable {
         @Override
         public char tag() {
             return AEV_CLASS;
         }
 
         @Override
-        public void writeTo(BufWriter buf) {
+        public void writeTo(BufWriterImpl buf) {
             buf.writeU1(tag());
             buf.writeIndex(className);
         }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AnnotationReader.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AnnotationReader.java
index 7b5920b3e7853..2ada13aaba82c 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AnnotationReader.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AnnotationReader.java
@@ -28,6 +28,7 @@
 import java.lang.classfile.Annotation;
 import java.lang.classfile.AnnotationElement;
 import java.lang.classfile.AnnotationValue;
+import java.lang.classfile.BufWriter;
 import java.lang.classfile.ClassReader;
 import java.lang.classfile.constantpool.*;
 import java.lang.classfile.TypeAnnotation;
@@ -39,7 +40,7 @@
 import java.lang.classfile.constantpool.Utf8Entry;
 import jdk.internal.access.SharedSecrets;
 
-class AnnotationReader {
+public final class AnnotationReader {
     private AnnotationReader() { }
 
     public static List<Annotation> readAnnotations(ClassReader classReader, int p) {
@@ -280,4 +281,24 @@ private static int skipTypeAnnotation(ClassReader classReader, int p) {
         p = skipElementValuePairs(classReader, p);
         return p;
     }
+
+    public static void writeAnnotation(BufWriterImpl buf, Annotation annotation) {
+        // handles annotations and type annotations
+        // TODO annotation cleanup later
+        ((Util.Writable) annotation).writeTo(buf);
+    }
+
+    public static void writeAnnotations(BufWriter buf, List<? extends Annotation> list) {
+        // handles annotations and type annotations
+        var internalBuf = (BufWriterImpl) buf;
+        internalBuf.writeU2(list.size());
+        for (var e : list) {
+            writeAnnotation(internalBuf, e);
+        }
+    }
+
+    public static void writeAnnotationValue(BufWriterImpl buf, AnnotationValue value) {
+        // TODO annotation cleanup later
+        ((Util.Writable) value).writeTo(buf);
+    }
 }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AttributeHolder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AttributeHolder.java
index be5176ad1df08..ba51474c131e2 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AttributeHolder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AttributeHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
 
 import java.lang.classfile.Attribute;
 import java.lang.classfile.AttributeMapper;
-import java.lang.classfile.BufWriter;
 
 public class AttributeHolder {
     private final List<Attribute<?>> attributes = new ArrayList<>();
@@ -50,10 +49,8 @@ public int size() {
         return attributes.size();
     }
 
-    public void writeTo(BufWriter buf) {
-        buf.writeU2(attributes.size());
-        for (Attribute<?> a : attributes)
-            a.writeTo(buf);
+    public void writeTo(BufWriterImpl buf) {
+        Util.writeAttributes(buf, attributes);
     }
 
     boolean isPresent(AttributeMapper<?> am) {
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BootstrapMethodEntryImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BootstrapMethodEntryImpl.java
index d6876a82a9c2b..267c11c584578 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BootstrapMethodEntryImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BootstrapMethodEntryImpl.java
@@ -28,7 +28,6 @@
 
 import java.lang.classfile.constantpool.ConstantPool;
 import java.lang.classfile.BootstrapMethodEntry;
-import java.lang.classfile.BufWriter;
 import java.lang.classfile.constantpool.LoadableConstantEntry;
 import java.lang.classfile.constantpool.MethodHandleEntry;
 
@@ -87,9 +86,8 @@ public int hashCode() {
         return hash;
     }
 
-    @Override
-    public void writeTo(BufWriter writer) {
+    void writeTo(BufWriterImpl writer) {
         writer.writeIndex(bootstrapMethod());
-        writer.writeListIndices(arguments());
+        Util.writeListIndices(writer, arguments());
     }
 }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java
index 6a23be54f4855..a0428d9d09d37 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java
@@ -48,7 +48,7 @@
 
 public abstract sealed class BoundAttribute<T extends Attribute<T>>
         extends AbstractElement
-        implements Attribute<T> {
+        implements Attribute<T>, Util.Writable {
 
     static final int NAME_AND_LENGTH_PREFIX = 6;
     private final AttributeMapper<T> mapper;
@@ -101,7 +101,7 @@ public void writeTo(DirectFieldBuilder builder) {
 
     @Override
     @SuppressWarnings("unchecked")
-    public void writeTo(BufWriter buf) {
+    public void writeTo(BufWriterImpl buf) {
         if (!buf.canWriteDirect(classReader))
             attributeMapper().writeAttribute(buf, (T) this);
         else
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BufWriterImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BufWriterImpl.java
index 87161588203a3..ac34d78e0e586 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BufWriterImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BufWriterImpl.java
@@ -27,10 +27,8 @@
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
-import java.util.List;
 
 import java.lang.classfile.BufWriter;
-import java.lang.classfile.WritableElement;
 import java.lang.classfile.constantpool.ClassEntry;
 import java.lang.classfile.constantpool.ConstantPool;
 import java.lang.classfile.constantpool.ConstantPoolBuilder;
@@ -126,10 +124,8 @@ public void writeBytes(byte[] arr) {
         writeBytes(arr, 0, arr.length);
     }
 
-    @Override
-    public void writeBytes(BufWriter other) {
-        BufWriterImpl o = (BufWriterImpl) other;
-        writeBytes(o.elems, 0, o.offset);
+    public void writeBytes(BufWriterImpl other) {
+        writeBytes(other.elems, 0, other.offset);
     }
 
     @Override
@@ -175,7 +171,6 @@ public ByteBuffer asByteBuffer() {
         return ByteBuffer.wrap(elems, 0, offset).slice();
     }
 
-    @Override
     public void copyTo(byte[] array, int bufferOffset) {
         System.arraycopy(elems, 0, array, bufferOffset, size());
     }
@@ -198,20 +193,4 @@ public void writeIndexOrZero(PoolEntry entry) {
         else
             writeIndex(entry);
     }
-
-    @Override
-    public<T extends WritableElement<?>> void writeList(List<T> list) {
-        writeU2(list.size());
-        for (T t : list) {
-            t.writeTo(this);
-        }
-    }
-
-    @Override
-    public void writeListIndices(List<? extends PoolEntry> list) {
-        writeU2(list.size());
-        for (PoolEntry info : list) {
-            writeIndex(info);
-        }
-    }
 }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedCodeBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedCodeBuilder.java
index c3a601fa1df87..4743c58607c84 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedCodeBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedCodeBuilder.java
@@ -24,7 +24,6 @@
  */
 package jdk.internal.classfile.impl;
 
-import java.lang.classfile.BufWriter;
 import java.lang.classfile.CodeBuilder;
 import java.lang.classfile.CodeElement;
 import java.lang.classfile.CodeModel;
@@ -201,7 +200,8 @@ public void accept(CodeBuilder cb) {
             });
         }
 
-        public void writeTo(BufWriter buf) {
+        @Override
+        public void writeTo(BufWriterImpl buf) {
             DirectCodeBuilder.build(methodInfo, cb -> elements.forEach(cb), constantPool, context, null).writeTo(buf);
         }
 
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedFieldBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedFieldBuilder.java
index a92513390b495..660a999f2a3e5 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedFieldBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedFieldBuilder.java
@@ -112,7 +112,7 @@ public void accept(FieldBuilder fieldBuilder) {
         }
 
         @Override
-        public void writeTo(BufWriter buf) {
+        public void writeTo(BufWriterImpl buf) {
             DirectFieldBuilder fb = new DirectFieldBuilder(constantPool, context, name, desc, null);
             elements.forEach(fb);
             fb.writeTo(buf);
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java
index f92ee1adf34ca..880c6717db87c 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java
@@ -33,7 +33,6 @@
 
 import java.lang.classfile.AccessFlags;
 
-import java.lang.classfile.BufWriter;
 import java.lang.classfile.ClassModel;
 import java.lang.classfile.CodeBuilder;
 import java.lang.classfile.CodeModel;
@@ -211,7 +210,7 @@ public void accept(MethodBuilder mb) {
         }
 
         @Override
-        public void writeTo(BufWriter buf) {
+        public void writeTo(BufWriterImpl buf) {
             DirectMethodBuilder mb = new DirectMethodBuilder(constantPool, context, name, desc, methodFlags(), null);
             elements.forEach(mb);
             mb.writeTo(buf);
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassReaderImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassReaderImpl.java
index 25d4e2e68e8e8..9695b16ad515c 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassReaderImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassReaderImpl.java
@@ -321,12 +321,13 @@ ClassModel getContainedClass() {
         return containedClass;
     }
 
-    boolean writeBootstrapMethods(BufWriter buf) {
+    boolean writeBootstrapMethods(BufWriterImpl buf) {
         Optional<BootstrapMethodsAttribute> a
                 = containedClass.findAttribute(Attributes.bootstrapMethods());
         if (a.isEmpty())
             return false;
-        a.get().writeTo(buf);
+        // BootstrapMethodAttribute implementations are all internal writable
+        ((Util.Writable) a.get()).writeTo(buf);
         return true;
     }
 
@@ -465,13 +466,12 @@ public <T extends PoolEntry> T readEntryOrNull(int offset, Class<T> cls) {
         return entryByIndex(index, cls);
     }
 
-    @Override
-    public boolean compare(BufWriter bufWriter,
+    public boolean compare(BufWriterImpl bufWriter,
                            int bufWriterOffset,
                            int classReaderOffset,
                            int length) {
         try {
-            return Arrays.equals(((BufWriterImpl) bufWriter).elems,
+            return Arrays.equals(bufWriter.elems,
                                  bufWriterOffset, bufWriterOffset + length,
                                  buffer, classReaderOffset, classReaderOffset + length);
         } catch (IndexOutOfBoundsException e) {
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java
index 4b2a21072f013..7669cbfdd30ca 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java
@@ -141,7 +141,7 @@ public List<Attribute<?>> attributes() {
     }
 
     @Override
-    public void writeTo(BufWriter buf) {
+    public void writeTo(BufWriterImpl buf) {
         if (buf.canWriteDirect(classReader)) {
             super.writeTo(buf);
         }
@@ -154,7 +154,7 @@ public void accept(CodeBuilder cb) {
                                         }
                                     },
                                     (SplitConstantPool)buf.constantPool(),
-                                    ((BufWriterImpl)buf).context(),
+                                    buf.context(),
                                     null).writeTo(buf);
         }
     }
@@ -210,7 +210,7 @@ public void accept(int s, int e, int h, int c) {
         return exceptionTable;
     }
 
-    public boolean compareCodeBytes(BufWriter buf, int offset, int len) {
+    public boolean compareCodeBytes(BufWriterImpl buf, int offset, int len) {
         return codeLength == len
                && classReader.compare(buf, offset, codeStart, codeLength);
     }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/DirectClassBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/DirectClassBuilder.java
index 915c3ad8cf4d9..21fde0f6002df 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/DirectClassBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/DirectClassBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-import java.lang.classfile.BufWriter;
 import java.lang.classfile.ClassBuilder;
 import java.lang.classfile.ClassElement;
 import java.lang.classfile.ClassModel;
@@ -44,7 +43,6 @@
 import java.lang.classfile.MethodBuilder;
 import java.lang.classfile.MethodModel;
 import java.lang.classfile.MethodTransform;
-import java.lang.classfile.WritableElement;
 import java.lang.classfile.constantpool.Utf8Entry;
 
 public final class DirectClassBuilder
@@ -52,8 +50,8 @@ public final class DirectClassBuilder
         implements ClassBuilder {
 
     final ClassEntry thisClassEntry;
-    private final List<WritableElement<FieldModel>> fields = new ArrayList<>();
-    private final List<WritableElement<MethodModel>> methods = new ArrayList<>();
+    private final List<Util.Writable> fields = new ArrayList<>();
+    private final List<Util.Writable> methods = new ArrayList<>();
     private ClassEntry superclassEntry;
     private List<ClassEntry> interfaceEntries;
     private int majorVersion;
@@ -78,7 +76,7 @@ public ClassBuilder with(ClassElement element) {
         if (element instanceof AbstractElement ae) {
             ae.writeTo(this);
         } else {
-            writeAttribute((CustomAttribute)element);
+            writeAttribute((CustomAttribute<?>) element);
         }
         return this;
     }
@@ -120,12 +118,12 @@ public ClassBuilder transformMethod(MethodModel method, MethodTransform transfor
 
     // internal / for use by elements
 
-    public ClassBuilder withField(WritableElement<FieldModel> field) {
+    ClassBuilder withField(Util.Writable field) {
         fields.add(field);
         return this;
     }
 
-    public ClassBuilder withMethod(WritableElement<MethodModel> method) {
+    ClassBuilder withMethod(Util.Writable method) {
         methods.add(method);
         return this;
     }
@@ -172,13 +170,13 @@ else if ((flags & ClassFile.ACC_MODULE) == 0 && !"java/lang/Object".equals(thisC
 
         // We maintain two writers, and then we join them at the end
         int size = sizeHint == 0 ? 256 : sizeHint;
-        BufWriter head = new BufWriterImpl(constantPool, context, size);
+        BufWriterImpl head = new BufWriterImpl(constantPool, context, size);
         BufWriterImpl tail = new BufWriterImpl(constantPool, context, size, thisClassEntry, majorVersion);
 
         // The tail consists of fields and methods, and attributes
         // This should trigger all the CP/BSM mutation
-        tail.writeList(fields);
-        tail.writeList(methods);
+        Util.writeList(tail, fields);
+        Util.writeList(tail, methods);
         int attributesOffset = tail.size();
         attributes.writeTo(tail);
 
@@ -197,7 +195,7 @@ else if ((flags & ClassFile.ACC_MODULE) == 0 && !"java/lang/Object".equals(thisC
         head.writeU2(flags);
         head.writeIndex(thisClassEntry);
         head.writeIndexOrZero(superclass);
-        head.writeListIndices(ies);
+        Util.writeListIndices(head, ies);
 
         // Join head and tail into an exact-size buffer
         byte[] result = new byte[head.size() + tail.size()];
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/DirectCodeBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/DirectCodeBuilder.java
index 0b6549a82da9e..536750ebd2f0e 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/DirectCodeBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/DirectCodeBuilder.java
@@ -24,7 +24,6 @@
  */
 package jdk.internal.classfile.impl;
 
-import java.lang.constant.MethodTypeDesc;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -36,20 +35,17 @@
 
 import java.lang.classfile.Attribute;
 import java.lang.classfile.Attributes;
-import java.lang.classfile.BufWriter;
 import java.lang.classfile.ClassFile;
 import java.lang.classfile.CodeBuilder;
 import java.lang.classfile.CodeElement;
 import java.lang.classfile.CodeModel;
 import java.lang.classfile.CustomAttribute;
-import java.lang.classfile.Instruction;
 import java.lang.classfile.Label;
 import java.lang.classfile.Opcode;
 import java.lang.classfile.TypeKind;
 import java.lang.classfile.instruction.SwitchCase;
 import java.lang.classfile.attribute.CodeAttribute;
 import java.lang.classfile.attribute.LineNumberTableAttribute;
-import java.lang.classfile.attribute.StackMapTableAttribute;
 import java.lang.classfile.constantpool.ClassEntry;
 import java.lang.classfile.constantpool.ConstantPoolBuilder;
 import java.lang.classfile.constantpool.DoubleEntry;
@@ -83,7 +79,7 @@ public final class DirectCodeBuilder
     private final boolean transformFwdJumps, transformBackJumps;
     private final Label startLabel, endLabel;
     final MethodInfo methodInfo;
-    final BufWriter bytecodesBufWriter;
+    final BufWriterImpl bytecodesBufWriter;
     private CodeAttribute mruParent;
     private int[] mruParentTable;
     private Map<CodeAttribute, int[]> parentMap;
@@ -100,7 +96,7 @@ or model maxLocals (for transformation)
        allocLocal(TypeKind) bumps by nSlots
      */
 
-    public static Attribute<CodeAttribute> build(MethodInfo methodInfo,
+    public static UnboundAttribute<CodeAttribute> build(MethodInfo methodInfo,
                                                  Consumer<? super CodeBuilder> handler,
                                                  SplitConstantPool constantPool,
                                                  ClassFileImpl context,
@@ -144,7 +140,7 @@ public CodeBuilder with(CodeElement element) {
         if (element instanceof AbstractElement ae) {
             ae.writeTo(this);
         } else {
-            writeAttribute((CustomAttribute)element);
+            writeAttribute((CustomAttribute<?>) element);
         }
         return this;
     }
@@ -193,9 +189,9 @@ public MethodInfo methodInfo() {
         return methodInfo;
     }
 
-    private Attribute<CodeAttribute> content = null;
+    private UnboundAttribute<CodeAttribute> content = null;
 
-    private void writeExceptionHandlers(BufWriter buf) {
+    private void writeExceptionHandlers(BufWriterImpl buf) {
         int pos = buf.size();
         int handlersSize = handlers.size();
         buf.writeU2(handlersSize);
@@ -233,7 +229,7 @@ private void buildContent() {
                 Attribute<?> a = new UnboundAttribute.AdHocAttribute<>(Attributes.characterRangeTable()) {
 
                     @Override
-                    public void writeBody(BufWriter b) {
+                    public void writeBody(BufWriterImpl b) {
                         int pos = b.size();
                         int crSize = characterRanges.size();
                         b.writeU2(crSize);
@@ -264,12 +260,12 @@ public void writeBody(BufWriter b) {
             if (!localVariables.isEmpty()) {
                 Attribute<?> a = new UnboundAttribute.AdHocAttribute<>(Attributes.localVariableTable()) {
                     @Override
-                    public void writeBody(BufWriter b) {
+                    public void writeBody(BufWriterImpl b) {
                         int pos = b.size();
                         int lvSize = localVariables.size();
                         b.writeU2(lvSize);
                         for (LocalVariable l : localVariables) {
-                            if (!l.writeTo(b)) {
+                            if (!Util.writeLocalVariable(b, l)) {
                                 if (context.deadLabelsOption() == ClassFile.DeadLabelsOption.DROP_DEAD_LABELS) {
                                     lvSize--;
                                 } else {
@@ -287,12 +283,12 @@ public void writeBody(BufWriter b) {
             if (!localVariableTypes.isEmpty()) {
                 Attribute<?> a = new UnboundAttribute.AdHocAttribute<>(Attributes.localVariableTypeTable()) {
                     @Override
-                    public void writeBody(BufWriter b) {
+                    public void writeBody(BufWriterImpl b) {
                         int pos = b.size();
                         int lvtSize = localVariableTypes.size();
                         b.writeU2(localVariableTypes.size());
                         for (LocalVariableType l : localVariableTypes) {
-                            if (!l.writeTo(b)) {
+                            if (!Util.writeLocalVariable(b, l)) {
                                 if (context.deadLabelsOption() == ClassFile.DeadLabelsOption.DROP_DEAD_LABELS) {
                                     lvtSize--;
                                 } else {
@@ -352,8 +348,7 @@ private void tryGenerateStackMaps(boolean codeMatch, BufWriterImpl buf) {
             }
 
             @Override
-            public void writeBody(BufWriter b) {
-                BufWriterImpl buf = (BufWriterImpl) b;
+            public void writeBody(BufWriterImpl buf) {
                 buf.setLabelContext(DirectCodeBuilder.this);
 
                 int codeLength = curPc();
@@ -389,8 +384,8 @@ public void writeBody(BufWriter b) {
 
                 buf.writeInt(codeLength);
                 buf.writeBytes(bytecodesBufWriter);
-                writeExceptionHandlers(b);
-                attributes.writeTo(b);
+                writeExceptionHandlers(buf);
+                attributes.writeTo(buf);
                 buf.setLabelContext(null);
             }
         };
@@ -427,12 +422,12 @@ public void writeLineNumber(int pc, int lineNo) {
         }
 
         @Override
-        public void writeBody(BufWriter b) {
+        public void writeBody(BufWriterImpl b) {
             throw new UnsupportedOperationException();
         }
 
         @Override
-        public void writeTo(BufWriter b) {
+        public void writeTo(BufWriterImpl b) {
             b.writeIndex(b.constantPool().utf8Entry(Attributes.NAME_LINE_NUMBER_TABLE));
             push();
             b.writeInt(buf.size() + 2);
@@ -447,7 +442,7 @@ private boolean codeAndExceptionsMatch(int codeLength) {
             codeAttributesMatch = cai.codeLength == curPc()
                                   && cai.compareCodeBytes(bytecodesBufWriter, 0, codeLength);
             if (codeAttributesMatch) {
-                BufWriter bw = new BufWriterImpl(constantPool, context);
+                var bw = new BufWriterImpl(constantPool, context);
                 writeExceptionHandlers(bw);
                 codeAttributesMatch = cai.classReader.compare(bw, 0, cai.exceptionHandlerPos, bw.size());
             }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/DirectFieldBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/DirectFieldBuilder.java
index 7bdab531e4493..ce51bb1d26bc4 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/DirectFieldBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/DirectFieldBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,17 +27,15 @@
 
 import java.util.function.Consumer;
 
-import java.lang.classfile.BufWriter;
 import java.lang.classfile.CustomAttribute;
 import java.lang.classfile.FieldBuilder;
 import java.lang.classfile.FieldElement;
 import java.lang.classfile.FieldModel;
-import java.lang.classfile.WritableElement;
 import java.lang.classfile.constantpool.Utf8Entry;
 
 public final class DirectFieldBuilder
         extends AbstractDirectBuilder<FieldModel>
-        implements TerminalFieldBuilder, WritableElement<FieldModel> {
+        implements TerminalFieldBuilder, Util.Writable {
     private final Utf8Entry name;
     private final Utf8Entry desc;
     private int flags;
@@ -59,7 +57,7 @@ public FieldBuilder with(FieldElement element) {
         if (element instanceof AbstractElement ae) {
             ae.writeTo(this);
         } else {
-            writeAttribute((CustomAttribute)element);
+            writeAttribute((CustomAttribute<?>) element);
         }
         return this;
     }
@@ -74,7 +72,7 @@ void setFlags(int flags) {
     }
 
     @Override
-    public void writeTo(BufWriter buf) {
+    public void writeTo(BufWriterImpl buf) {
         buf.writeU2(flags);
         buf.writeIndex(name);
         buf.writeIndex(desc);
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/DirectMethodBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/DirectMethodBuilder.java
index a4b3bbe1b84b8..f79eb0af0cb53 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/DirectMethodBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/DirectMethodBuilder.java
@@ -28,7 +28,6 @@
 import java.lang.constant.MethodTypeDesc;
 import java.util.function.Consumer;
 
-import java.lang.classfile.BufWriter;
 import java.lang.classfile.ClassFile;
 import java.lang.classfile.CodeBuilder;
 import java.lang.classfile.CodeModel;
@@ -37,12 +36,11 @@
 import java.lang.classfile.MethodBuilder;
 import java.lang.classfile.MethodElement;
 import java.lang.classfile.MethodModel;
-import java.lang.classfile.WritableElement;
 import java.lang.classfile.constantpool.Utf8Entry;
 
 public final class DirectMethodBuilder
         extends AbstractDirectBuilder<MethodModel>
-        implements TerminalMethodBuilder, WritableElement<MethodModel> {
+        implements TerminalMethodBuilder, Util.Writable {
 
     final Utf8Entry name;
     final Utf8Entry desc;
@@ -115,7 +113,7 @@ public MethodBuilder with(MethodElement element) {
         if (element instanceof AbstractElement ae) {
             ae.writeTo(this);
         } else {
-            writeAttribute((CustomAttribute)element);
+            writeAttribute((CustomAttribute<?>) element);
         }
         return this;
     }
@@ -148,8 +146,7 @@ public DirectMethodBuilder run(Consumer<? super MethodBuilder> handler) {
     }
 
     @Override
-    public void writeTo(BufWriter b) {
-        BufWriterImpl buf = (BufWriterImpl) b;
+    public void writeTo(BufWriterImpl buf) {
         buf.writeU2(flags);
         buf.writeIndex(name);
         buf.writeIndex(desc);
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/FieldImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/FieldImpl.java
index ba424c862fdc9..ab42b96084a0f 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/FieldImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/FieldImpl.java
@@ -33,7 +33,7 @@
 
 public final class FieldImpl
         extends AbstractElement
-        implements FieldModel {
+        implements FieldModel, Util.Writable {
 
     private final ClassReader reader;
     private final int startPos, endPos, attributesPos;
@@ -78,7 +78,7 @@ public List<Attribute<?>> attributes() {
     }
 
     @Override
-    public void writeTo(BufWriter buf) {
+    public void writeTo(BufWriterImpl buf) {
         if (buf.canWriteDirect(reader)) {
             reader.copyBytesTo(buf, startPos, endPos - startPos);
         }
@@ -86,7 +86,7 @@ public void writeTo(BufWriter buf) {
             buf.writeU2(flags().flagsMask());
             buf.writeIndex(fieldName());
             buf.writeIndex(fieldType());
-            buf.writeList(attributes());
+            Util.writeAttributes(buf, attributes());
         }
     }
 
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/MethodImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/MethodImpl.java
index 62a83dffc6e87..40223d58d6b1c 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/MethodImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/MethodImpl.java
@@ -34,7 +34,7 @@
 
 public final class MethodImpl
         extends AbstractElement
-        implements MethodModel, MethodInfo {
+        implements MethodModel, MethodInfo, Util.Writable {
 
     private final ClassReader reader;
     private final int startPos, endPos, attributesPos;
@@ -101,8 +101,7 @@ public List<Attribute<?>> attributes() {
     }
 
     @Override
-    public void writeTo(BufWriter b) {
-        BufWriterImpl buf = (BufWriterImpl) b;
+    public void writeTo(BufWriterImpl buf) {
         if (buf.canWriteDirect(reader)) {
             reader.copyBytesTo(buf, startPos, endPos - startPos);
         }
@@ -110,7 +109,7 @@ public void writeTo(BufWriter b) {
             buf.writeU2(flags().flagsMask());
             buf.writeIndex(methodName());
             buf.writeIndex(methodType());
-            buf.writeList(attributes());
+            Util.writeAttributes(buf, attributes());
         }
     }
 
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.java b/src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.java
index 6c5a8a266c0d1..f7905712b18d6 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/SplitConstantPool.java
@@ -29,12 +29,10 @@
 import java.util.Arrays;
 import java.util.List;
 
-import java.lang.classfile.Attribute;
 import java.lang.classfile.Attributes;
 import java.lang.classfile.ClassReader;
 import java.lang.classfile.ClassFile;
 import java.lang.classfile.BootstrapMethodEntry;
-import java.lang.classfile.BufWriter;
 import java.lang.classfile.attribute.BootstrapMethodsAttribute;
 import java.lang.classfile.constantpool.*;
 import java.util.Objects;
@@ -135,7 +133,7 @@ public boolean canWriteDirect(ConstantPool other) {
         return this == other || parent == other;
     }
 
-    public boolean writeBootstrapMethods(BufWriter buf) {
+    public boolean writeBootstrapMethods(BufWriterImpl buf) {
         if (bsmSize == 0)
             return false;
         int pos = buf.size();
@@ -148,11 +146,11 @@ public boolean writeBootstrapMethods(BufWriter buf) {
             buf.patchInt(pos + 6, 2, bsmSize);
         }
         else {
-            Attribute<BootstrapMethodsAttribute> a
+            UnboundAttribute<BootstrapMethodsAttribute> a
                     = new UnboundAttribute.AdHocAttribute<>(Attributes.bootstrapMethods()) {
 
                 @Override
-                public void writeBody(BufWriter b) {
+                public void writeBody(BufWriterImpl b) {
                     buf.writeU2(bsmSize);
                     for (int i = 0; i < bsmSize; i++)
                         bootstrapMethodEntry(i).writeTo(buf);
@@ -163,8 +161,7 @@ public void writeBody(BufWriter b) {
         return true;
     }
 
-    @Override
-    public void writeTo(BufWriter buf) {
+    void writeTo(BufWriterImpl buf) {
         int writeFrom = 1;
         if (size() >= 65536) {
             throw new IllegalArgumentException(String.format("Constant pool is too large %d", size()));
@@ -175,7 +172,7 @@ public void writeTo(BufWriter buf) {
             writeFrom = parent.size();
         }
         for (int i = writeFrom; i < size(); ) {
-            PoolEntry info = entryByIndex(i);
+            var info = (AbstractPoolEntry) entryByIndex(i);
             info.writeTo(buf);
             i += info.width();
         }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/StackCounter.java b/src/java.base/share/classes/jdk/internal/classfile/impl/StackCounter.java
index 899a43571a3f7..876cb201b7954 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/StackCounter.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/StackCounter.java
@@ -51,7 +51,7 @@ static StackCounter of(DirectCodeBuilder dcb, BufWriterImpl buf) {
                 dcb.methodInfo.methodName().stringValue(),
                 dcb.methodInfo.methodTypeSymbol(),
                 (dcb.methodInfo.methodFlags() & ACC_STATIC) != 0,
-                ((BufWriterImpl) dcb.bytecodesBufWriter).asByteBuffer(),
+                dcb.bytecodesBufWriter.asByteBuffer(),
                 dcb.constantPool,
                 dcb.handlers);
     }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/StackMapGenerator.java b/src/java.base/share/classes/jdk/internal/classfile/impl/StackMapGenerator.java
index 5b103a21f8a73..514c1d32f4138 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/StackMapGenerator.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/StackMapGenerator.java
@@ -152,7 +152,7 @@ static StackMapGenerator of(DirectCodeBuilder dcb, BufWriterImpl buf) {
                 dcb.methodInfo.methodName().stringValue(),
                 dcb.methodInfo.methodTypeSymbol(),
                 (dcb.methodInfo.methodFlags() & ACC_STATIC) != 0,
-                ((BufWriterImpl) dcb.bytecodesBufWriter).asByteBuffer(),
+                dcb.bytecodesBufWriter.asByteBuffer(),
                 dcb.constantPool,
                 dcb.context,
                 dcb.handlers);
@@ -383,7 +383,7 @@ private void removeRangeFromExcTable(int rangeStart, int rangeEnd) {
     public Attribute<? extends StackMapTableAttribute> stackMapTableAttribute() {
         return frames.isEmpty() ? null : new UnboundAttribute.AdHocAttribute<>(Attributes.stackMapTable()) {
             @Override
-            public void writeBody(BufWriter b) {
+            public void writeBody(BufWriterImpl b) {
                 b.writeU2(frames.size());
                 Frame prevFrame =  new Frame(classHierarchy);
                 prevFrame.setLocalsFromArg(methodName, methodDesc, isStatic, thisType);
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/TemporaryConstantPool.java b/src/java.base/share/classes/jdk/internal/classfile/impl/TemporaryConstantPool.java
index e5f7d9cca799f..784e844b712f2 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/TemporaryConstantPool.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/TemporaryConstantPool.java
@@ -189,9 +189,4 @@ public int bootstrapMethodCount() {
     public boolean canWriteDirect(ConstantPool constantPool) {
         return false;
     }
-
-    @Override
-    public void writeTo(BufWriter buf) {
-        throw new UnsupportedOperationException();
-    }
 }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/UnboundAttribute.java b/src/java.base/share/classes/jdk/internal/classfile/impl/UnboundAttribute.java
index 70b58e423f69a..6d71497f693ed 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/UnboundAttribute.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/UnboundAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,6 @@
 import java.lang.classfile.AttributeMapper;
 import java.lang.classfile.Attributes;
 import java.lang.classfile.BootstrapMethodEntry;
-import java.lang.classfile.BufWriter;
 import java.lang.classfile.constantpool.ClassEntry;
 import java.lang.classfile.Label;
 import java.lang.classfile.TypeAnnotation;
@@ -95,7 +94,7 @@
 
 public abstract sealed class UnboundAttribute<T extends Attribute<T>>
         extends AbstractElement
-        implements Attribute<T> {
+        implements Attribute<T>, Util.Writable {
     protected final AttributeMapper<T> mapper;
 
     public UnboundAttribute(AttributeMapper<T> mapper) {
@@ -114,7 +113,7 @@ public String attributeName() {
 
     @Override
     @SuppressWarnings("unchecked")
-    public void writeTo(BufWriter buf) {
+    public void writeTo(BufWriterImpl buf) {
         mapper.writeAttribute(buf, (T) this);
     }
 
@@ -752,7 +751,7 @@ public UnboundRecordComponentInfo(Utf8Entry name, Utf8Entry descriptor, List<Att
     public record UnboundTypeAnnotation(TargetInfo targetInfo,
                                         List<TypePathComponent> targetPath,
                                         Utf8Entry className,
-                                        List<AnnotationElement> elements) implements TypeAnnotation {
+                                        List<AnnotationElement> elements) implements TypeAnnotation, Util.Writable {
 
         public UnboundTypeAnnotation(TargetInfo targetInfo, List<TypePathComponent> targetPath,
                                      Utf8Entry className, List<AnnotationElement> elements) {
@@ -769,8 +768,8 @@ private int labelToBci(LabelContext lr, Label label) {
         }
 
         @Override
-        public void writeTo(BufWriter buf) {
-            LabelContext lr = ((BufWriterImpl) buf).labelContext();
+        public void writeTo(BufWriterImpl buf) {
+            LabelContext lr = buf.labelContext();
             // target_type
             buf.writeU1(targetInfo.targetType().targetTypeValue());
 
@@ -818,7 +817,7 @@ public void writeTo(BufWriter buf) {
             buf.writeU2(elements.size());
             for (AnnotationElement pair : elements()) {
                 buf.writeIndex(pair.name());
-                pair.value().writeTo(buf);
+                AnnotationReader.writeAnnotationValue(buf, pair.value());
             }
         }
     }
@@ -904,10 +903,10 @@ public AdHocAttribute(AttributeMapper<T> mapper) {
             super(mapper);
         }
 
-        public abstract void writeBody(BufWriter b);
+        public abstract void writeBody(BufWriterImpl b);
 
         @Override
-        public void writeTo(BufWriter b) {
+        public void writeTo(BufWriterImpl b) {
             b.writeIndex(b.constantPool().utf8Entry(mapper.name()));
             b.writeInt(0);
             int start = b.size();
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/Util.java b/src/java.base/share/classes/jdk/internal/classfile/impl/Util.java
index 0e969272c4028..079ac9551aba6 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/Util.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/Util.java
@@ -24,6 +24,9 @@
  */
 package jdk.internal.classfile.impl;
 
+import java.lang.classfile.CustomAttribute;
+import java.lang.classfile.PseudoInstruction;
+import java.lang.classfile.constantpool.PoolEntry;
 import java.lang.constant.ClassDesc;
 import java.lang.constant.MethodTypeDesc;
 import java.util.AbstractList;
@@ -47,7 +50,6 @@
 import static java.lang.classfile.ClassFile.ACC_STATIC;
 import java.lang.classfile.attribute.CodeAttribute;
 import java.lang.classfile.components.ClassPrinter;
-import java.lang.classfile.constantpool.ConstantPoolBuilder;
 import java.nio.ByteBuffer;
 import java.util.function.Consumer;
 
@@ -188,6 +190,31 @@ public static MethodTypeDesc methodTypeSymbol(NameAndTypeEntry nat) {
         return ((AbstractPoolEntry.NameAndTypeEntryImpl)nat).methodTypeSymbol();
     }
 
+    @SuppressWarnings("unchecked")
+    private static <T> void writeAttribute(BufWriterImpl writer, Attribute<?> attr) {
+        if (attr instanceof CustomAttribute<?> ca) {
+            var mapper = (AttributeMapper<T>) ca.attributeMapper();
+            mapper.writeAttribute(writer, (T) ca);
+        } else {
+            assert attr instanceof BoundAttribute || attr instanceof UnboundAttribute;
+            ((Writable) attr).writeTo(writer);
+        }
+    }
+
+    public static void writeAttributes(BufWriterImpl buf, List<? extends Attribute<?>> list) {
+        buf.writeU2(list.size());
+        for (var e : list) {
+            writeAttribute(buf, e);
+        }
+    }
+
+    static void writeList(BufWriterImpl buf, List<Writable> list) {
+        buf.writeU2(list.size());
+        for (var e : list) {
+            e.writeTo(buf);
+        }
+    }
+
     public static int slotSize(ClassDesc desc) {
         return switch (desc.descriptorString().charAt(0)) {
             case 'V' -> 0;
@@ -216,7 +243,7 @@ public static void dumpMethod(SplitConstantPool cp,
                     clb.withMethod(methodName, methodDesc, acc, mb ->
                             ((DirectMethodBuilder)mb).writeAttribute(new UnboundAttribute.AdHocAttribute<CodeAttribute>(Attributes.code()) {
                                 @Override
-                                public void writeBody(BufWriter b) {
+                                public void writeBody(BufWriterImpl b) {
                                     b.writeU2(-1);//max stack
                                     b.writeU2(-1);//max locals
                                     b.writeInt(bytecode.limit());
@@ -237,4 +264,28 @@ public void writeBody(BufWriter b) {
             }
         }
     }
+
+    public static void writeListIndices(BufWriter writer, List<? extends PoolEntry> list) {
+        writer.writeU2(list.size());
+        for (PoolEntry info : list) {
+            writer.writeIndex(info);
+        }
+    }
+
+    public static boolean writeLocalVariable(BufWriterImpl buf, PseudoInstruction lvOrLvt) {
+        return ((WritableLocalVariable) lvOrLvt).writeLocalTo(buf);
+    }
+
+    /**
+     * A generic interface for objects to write to a
+     * buf writer. Do not implement unless necessary,
+     * as this writeTo is public, which can be troublesome.
+     */
+    interface Writable {
+        void writeTo(BufWriterImpl writer);
+    }
+
+    interface WritableLocalVariable {
+        boolean writeLocalTo(BufWriterImpl buf);
+    }
 }
diff --git a/test/jdk/jdk/classfile/BoundAttributeTest.java b/test/jdk/jdk/classfile/BoundAttributeTest.java
index f6d2d0e9010a1..6a164bec2f9d7 100644
--- a/test/jdk/jdk/classfile/BoundAttributeTest.java
+++ b/test/jdk/jdk/classfile/BoundAttributeTest.java
@@ -27,6 +27,7 @@
  * @summary Testing BoundAttributes
  * @run junit BoundAttributeTest
  */
+import jdk.internal.classfile.impl.BufWriterImpl;
 import jdk.internal.classfile.impl.DirectClassBuilder;
 import jdk.internal.classfile.impl.UnboundAttribute;
 import org.junit.jupiter.api.Assertions;
@@ -34,7 +35,6 @@
 import org.opentest4j.AssertionFailedError;
 
 import java.lang.classfile.Attributes;
-import java.lang.classfile.BufWriter;
 import java.lang.classfile.ClassModel;
 import java.lang.classfile.ClassFile;
 import java.lang.classfile.CodeBuilder;
@@ -84,7 +84,7 @@ void testBadEntryTypeInList() {
             var oneClass = cp.classEntry(oneClassString);
             ((DirectClassBuilder) clb).writeAttribute(new UnboundAttribute.AdHocAttribute<>(Attributes.nestMembers()) {
                 @Override
-                public void writeBody(BufWriter b) {
+                public void writeBody(BufWriterImpl b) {
                     b.writeU2(2);
                     b.writeIndex(oneClass);
                     b.writeIndex(oneClassString);
diff --git a/test/jdk/jdk/classfile/CorpusTest.java b/test/jdk/jdk/classfile/CorpusTest.java
index 2dfbef10d6709..a2af166797827 100644
--- a/test/jdk/jdk/classfile/CorpusTest.java
+++ b/test/jdk/jdk/classfile/CorpusTest.java
@@ -31,6 +31,8 @@
 import helpers.ClassRecord;
 import helpers.ClassRecord.CompatibilityFilter;
 import helpers.Transforms;
+import jdk.internal.classfile.impl.BufWriterImpl;
+import jdk.internal.classfile.impl.Util;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.api.parallel.Execution;
@@ -85,7 +87,7 @@ static void splitTableAttributes(String sourceClassFile, String targetClassFile)
             switch (coe) {
                 case LineNumber ln -> dcob.writeAttribute(new UnboundAttribute.AdHocAttribute<>(Attributes.lineNumberTable()) {
                     @Override
-                    public void writeBody(BufWriter b) {
+                    public void writeBody(BufWriterImpl b) {
                         b.writeU2(1);
                         b.writeU2(curPc);
                         b.writeU2(ln.line());
@@ -93,16 +95,16 @@ public void writeBody(BufWriter b) {
                 });
                 case LocalVariable lv -> dcob.writeAttribute(new UnboundAttribute.AdHocAttribute<>(Attributes.localVariableTable()) {
                     @Override
-                    public void writeBody(BufWriter b) {
+                    public void writeBody(BufWriterImpl b) {
                         b.writeU2(1);
-                        lv.writeTo(b);
+                        Util.writeLocalVariable(b, lv);
                     }
                 });
                 case LocalVariableType lvt -> dcob.writeAttribute(new UnboundAttribute.AdHocAttribute<>(Attributes.localVariableTypeTable()) {
                     @Override
-                    public void writeBody(BufWriter b) {
+                    public void writeBody(BufWriterImpl b) {
                         b.writeU2(1);
-                        lvt.writeTo(b);
+                        Util.writeLocalVariable(b, lvt);
                     }
                 });
                 default -> cob.with(coe);
diff --git a/test/jdk/jdk/classfile/LimitsTest.java b/test/jdk/jdk/classfile/LimitsTest.java
index b1914e6d02408..9c7b8d9e72d4a 100644
--- a/test/jdk/jdk/classfile/LimitsTest.java
+++ b/test/jdk/jdk/classfile/LimitsTest.java
@@ -28,7 +28,6 @@
  * @run junit LimitsTest
  */
 import java.lang.classfile.Attributes;
-import java.lang.classfile.BufWriter;
 import java.lang.constant.ClassDesc;
 import java.lang.constant.ConstantDescs;
 import java.lang.constant.MethodTypeDesc;
@@ -44,6 +43,8 @@
 import java.lang.classfile.constantpool.IntegerEntry;
 import java.lang.classfile.instruction.LocalVariable;
 import java.util.List;
+
+import jdk.internal.classfile.impl.BufWriterImpl;
 import jdk.internal.classfile.impl.DirectCodeBuilder;
 import jdk.internal.classfile.impl.DirectMethodBuilder;
 import jdk.internal.classfile.impl.LabelContext;
@@ -130,7 +131,7 @@ void testInvalidLookupSwitch() {
                 "lookupSwitchMethod", MethodTypeDesc.of(ConstantDescs.CD_void), 0, mb ->
                         ((DirectMethodBuilder)mb).writeAttribute(new UnboundAttribute.AdHocAttribute<CodeAttribute>(Attributes.code()) {
                                 @Override
-                                public void writeBody(BufWriter b) {
+                                public void writeBody(BufWriterImpl b) {
                                     b.writeU2(-1);//max stack
                                     b.writeU2(-1);//max locals
                                     b.writeInt(16);
@@ -155,7 +156,7 @@ void testInvalidTableSwitch() {
                 "tableSwitchMethod", MethodTypeDesc.of(ConstantDescs.CD_void), 0, mb ->
                         ((DirectMethodBuilder)mb).writeAttribute(new UnboundAttribute.AdHocAttribute<CodeAttribute>(Attributes.code()) {
                                 @Override
-                                public void writeBody(BufWriter b) {
+                                public void writeBody(BufWriterImpl b) {
                                     b.writeU2(-1);//max stack
                                     b.writeU2(-1);//max locals
                                     b.writeInt(16);
@@ -173,7 +174,7 @@ public void writeBody(BufWriter b) {
                 "tableSwitchMethod", MethodTypeDesc.of(ConstantDescs.CD_void), 0, mb ->
                         ((DirectMethodBuilder)mb).writeAttribute(new UnboundAttribute.AdHocAttribute<CodeAttribute>(Attributes.code()) {
                                 @Override
-                                public void writeBody(BufWriter b) {
+                                public void writeBody(BufWriterImpl b) {
                                     b.writeU2(-1);//max stack
                                     b.writeU2(-1);//max locals
                                     b.writeInt(20);
diff --git a/test/jdk/jdk/classfile/LowAdaptTest.java b/test/jdk/jdk/classfile/LowAdaptTest.java
index 46d033a8676e8..9fa2620913b16 100644
--- a/test/jdk/jdk/classfile/LowAdaptTest.java
+++ b/test/jdk/jdk/classfile/LowAdaptTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,11 +39,8 @@
 import java.lang.reflect.AccessFlag;
 import java.lang.classfile.ClassModel;
 import java.lang.classfile.ClassFile;
-import java.lang.classfile.Opcode;
-import java.lang.classfile.TypeKind;
 import helpers.ByteArrayClassLoader;
 import java.lang.classfile.attribute.SourceFileAttribute;
-import jdk.internal.classfile.impl.DirectClassBuilder;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -75,7 +72,7 @@ void testAdapt() throws Exception {
         byte[] clazz = cc.build(ClassDesc.of(test), cb -> {
             cb.withFlags(AccessFlag.PUBLIC);
             cb.with(SourceFileAttribute.of("/some/madeup/TestClass.java"));
-            cl.methods().forEach(m -> ((DirectClassBuilder) cb).withMethod(m));
+            cl.methods().forEach(cb::with);
 
             cb.withMethod("doit", MethodTypeDesc.of(CD_int, CD_int),
                           AccessFlags.ofMethod(AccessFlag.PUBLIC, AccessFlag.STATIC).flagsMask(),
diff --git a/test/jdk/jdk/classfile/VerifierSelfTest.java b/test/jdk/jdk/classfile/VerifierSelfTest.java
index 84a5ded161089..d0943d2eee9f5 100644
--- a/test/jdk/jdk/classfile/VerifierSelfTest.java
+++ b/test/jdk/jdk/classfile/VerifierSelfTest.java
@@ -47,6 +47,8 @@
 import java.lang.classfile.attribute.*;
 import java.lang.classfile.components.ClassPrinter;
 import java.lang.constant.ModuleDesc;
+
+import jdk.internal.classfile.impl.BufWriterImpl;
 import jdk.internal.classfile.impl.DirectClassBuilder;
 import jdk.internal.classfile.impl.UnboundAttribute;
 import org.junit.jupiter.api.Test;
@@ -103,7 +105,7 @@ void testInvalidAttrLocation() {
         var bytes = cc.build(ClassDesc.of("InvalidAttrLocationClass"), cb ->
             ((DirectClassBuilder)cb).writeAttribute(new UnboundAttribute.AdHocAttribute<LocalVariableTableAttribute>(Attributes.localVariableTable()) {
                 @Override
-                public void writeBody(BufWriter b) {
+                public void writeBody(BufWriterImpl b) {
                     b.writeU2(0);
                 }
             }));
diff --git a/test/langtools/tools/javac/classfiles/attributes/AnnotationDefault/AnnotationDefaultVerifier.java b/test/langtools/tools/javac/classfiles/attributes/AnnotationDefault/AnnotationDefaultVerifier.java
index a5598d1f24270..d85b37aa3a395 100644
--- a/test/langtools/tools/javac/classfiles/attributes/AnnotationDefault/AnnotationDefaultVerifier.java
+++ b/test/langtools/tools/javac/classfiles/attributes/AnnotationDefault/AnnotationDefaultVerifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,8 +70,8 @@ private TestElementValue get(int tag) {
 
     private abstract class TestElementValue {
         public void testLength(TestResult testCase, AnnotationDefaultAttribute attr) {
-            BufWriter buf = new BufWriterImpl(ConstantPoolBuilder.of(), (ClassFileImpl) ClassFile.of());
-            attr.defaultValue().writeTo(buf);
+            var buf = new BufWriterImpl(ConstantPoolBuilder.of(), (ClassFileImpl) ClassFile.of());
+            AnnotationReader.writeAnnotationValue(buf, attr.defaultValue());
             testCase.checkEquals(((BoundAttribute<?>)attr).payloadLen(), buf.size(),
                     "attribute_length");
         }

From 0e555b5ded819cc3b363673320dc848c321861ce Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Tue, 23 Jul 2024 12:22:53 +0000
Subject: [PATCH 184/401] 8204582: Extra spaces in jlink documentation make it
 incorrect.

Reviewed-by: alanb
---
 src/jdk.jlink/share/man/jlink.1 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/jdk.jlink/share/man/jlink.1 b/src/jdk.jlink/share/man/jlink.1
index 9f4bf38ffa580..5cadc153a376b 100644
--- a/src/jdk.jlink/share/man/jlink.1
+++ b/src/jdk.jlink/share/man/jlink.1
@@ -44,8 +44,8 @@ into a custom runtime image
 .SH SYNOPSIS
 .PP
 \f[V]jlink\f[R] [\f[I]options\f[R]] \f[V]--module-path\f[R]
-\f[I]modulepath\f[R] \f[V]--add-modules\f[R] \f[I]module\f[R] [,
-\f[I]module\f[R]...]
+\f[I]modulepath\f[R] \f[V]--add-modules\f[R]
+\f[I]module\f[R][,\f[I]module\f[R]...]
 .TP
 \f[I]options\f[R]
 Command-line options separated by spaces.
@@ -69,7 +69,7 @@ transitive dependences, to create a custom runtime image.
 Developers are responsible for updating their custom runtime images.
 .SH JLINK OPTIONS
 .TP
-\f[V]--add-modules\f[R] \f[I]mod\f[R] [\f[V],\f[R] \f[I]mod\f[R]...]
+\f[V]--add-modules\f[R] \f[I]mod\f[R][\f[V],\f[R]\f[I]mod\f[R]...]
 Adds the named modules, \f[I]mod\f[R], to the default set of root
 modules.
 The default set of root modules is empty.
@@ -110,7 +110,7 @@ Specifies the launcher command name for the module or the command name
 for the module and main class (the module and the main class names are
 separated by a slash (\f[V]/\f[R])).
 .TP
-\f[V]--limit-modules\f[R] \f[I]mod\f[R] [\f[V],\f[R] \f[I]mod\f[R]...]
+\f[V]--limit-modules\f[R] \f[I]mod\f[R][\f[V],\f[R]\f[I]mod\f[R]...]
 Limits the universe of observable modules to those in the transitive
 closure of the named modules, \f[V]mod\f[R], plus the main module, if
 any, plus any further modules specified in the \f[V]--add-modules\f[R]

From 8e1f17e351bc7949b318a0542a4a4cb30ead5a97 Mon Sep 17 00:00:00 2001
From: Sonia Zaldana Calles <szaldana@openjdk.org>
Date: Tue, 23 Jul 2024 15:49:34 +0000
Subject: [PATCH 185/401] 8327054: DiagnosticCommand Compiler.perfmap does not
 log on output()

Reviewed-by: lmesnik, stuefe, kevinw, cjplummer
---
 src/hotspot/share/code/codeCache.cpp               |  4 ++--
 src/hotspot/share/code/codeCache.hpp               |  2 +-
 src/hotspot/share/runtime/java.cpp                 |  2 +-
 src/hotspot/share/services/diagnosticCommand.cpp   |  2 +-
 .../serviceability/dcmd/compiler/PerfMapTest.java  | 14 +++++++++++++-
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/share/code/codeCache.cpp b/src/hotspot/share/code/codeCache.cpp
index 36656515942c3..4a54fd8d0a9c2 100644
--- a/src/hotspot/share/code/codeCache.cpp
+++ b/src/hotspot/share/code/codeCache.cpp
@@ -1788,7 +1788,7 @@ void CodeCache::log_state(outputStream* st) {
 }
 
 #ifdef LINUX
-void CodeCache::write_perf_map(const char* filename) {
+void CodeCache::write_perf_map(const char* filename, outputStream* st) {
   MutexLocker mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
 
   // Perf expects to find the map file at /tmp/perf-<pid>.map
@@ -1801,7 +1801,7 @@ void CodeCache::write_perf_map(const char* filename) {
 
   fileStream fs(filename, "w");
   if (!fs.is_open()) {
-    log_warning(codecache)("Failed to create %s for perf map", filename);
+    st->print_cr("Warning: Failed to create %s for perf map", filename);
     return;
   }
 
diff --git a/src/hotspot/share/code/codeCache.hpp b/src/hotspot/share/code/codeCache.hpp
index 8fcbf32b64484..565f600453e69 100644
--- a/src/hotspot/share/code/codeCache.hpp
+++ b/src/hotspot/share/code/codeCache.hpp
@@ -223,7 +223,7 @@ class CodeCache : AllStatic {
   static void print_trace(const char* event, CodeBlob* cb, uint size = 0) PRODUCT_RETURN;
   static void print_summary(outputStream* st, bool detailed = true); // Prints a summary of the code cache usage
   static void log_state(outputStream* st);
-  LINUX_ONLY(static void write_perf_map(const char* filename = nullptr);)
+  LINUX_ONLY(static void write_perf_map(const char* filename, outputStream* st);) // Prints warnings and error messages to outputStream
   static const char* get_code_heap_name(CodeBlobType code_blob_type)  { return (heap_available(code_blob_type) ? get_code_heap(code_blob_type)->name() : "Unused"); }
   static void report_codemem_full(CodeBlobType code_blob_type, bool print);
 
diff --git a/src/hotspot/share/runtime/java.cpp b/src/hotspot/share/runtime/java.cpp
index 7ffe56d9715a3..23df464aba8bb 100644
--- a/src/hotspot/share/runtime/java.cpp
+++ b/src/hotspot/share/runtime/java.cpp
@@ -484,7 +484,7 @@ void before_exit(JavaThread* thread, bool halt) {
 
 #ifdef LINUX
   if (DumpPerfMapAtExit) {
-    CodeCache::write_perf_map();
+    CodeCache::write_perf_map(nullptr, tty);
   }
   if (PrintMemoryMapAtExit) {
     MemMapPrinter::print_all_mappings(tty);
diff --git a/src/hotspot/share/services/diagnosticCommand.cpp b/src/hotspot/share/services/diagnosticCommand.cpp
index 7d2325c16b651..e6328e95abd9e 100644
--- a/src/hotspot/share/services/diagnosticCommand.cpp
+++ b/src/hotspot/share/services/diagnosticCommand.cpp
@@ -865,7 +865,7 @@ void PerfMapDCmd::execute(DCmdSource source, TRAPS) {
   // The check for _filename.is_set() is because we don't want to use
   // DEFAULT_PERFMAP_FILENAME, since it is meant as a description
   // of the default, not the actual default.
-  CodeCache::write_perf_map(_filename.is_set() ? _filename.value() : nullptr);
+  CodeCache::write_perf_map(_filename.is_set() ? _filename.value() : nullptr, output());
 }
 #endif // LINUX
 
diff --git a/test/hotspot/jtreg/serviceability/dcmd/compiler/PerfMapTest.java b/test/hotspot/jtreg/serviceability/dcmd/compiler/PerfMapTest.java
index 6bbe62044d023..7a72efd68ba6c 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/compiler/PerfMapTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/compiler/PerfMapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2023, Arm Limited. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -113,4 +113,16 @@ public void specifiedDefaultMapFile() throws IOException {
         run(new JMXExecutor(), "Compiler.perfmap " + path.toString(), path);
         Files.deleteIfExists(path);
     }
+
+    @Test
+    public void logErrorsDcmdOutputStream() throws IOException {
+        String test_dir = System.getProperty("test.dir", ".");
+        Path path = Paths.get("nonexistent", test_dir);
+        try {
+            OutputAnalyzer output = new JMXExecutor().execute("Compiler.perfmap %s".formatted(path));
+            output.shouldContain("Warning: Failed to create nonexistent/%s for perf map".formatted(test_dir));
+        } finally {
+            Files.deleteIfExists(path);
+        }
+    }
 }

From 8efcb40c47d8730d84620a9e980ab9eeb5f51441 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Tue, 23 Jul 2024 16:27:09 +0000
Subject: [PATCH 186/401] 8335823: Update --release 23 symbol information for
 JDK 23 build 33

Reviewed-by: iris, liach
---
 .../share/data/symbols/java.base-N.sym.txt    | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/jdk.compiler/share/data/symbols/java.base-N.sym.txt b/src/jdk.compiler/share/data/symbols/java.base-N.sym.txt
index 8fab1f56765cd..fd1bd11f6b9c3 100644
--- a/src/jdk.compiler/share/data/symbols/java.base-N.sym.txt
+++ b/src/jdk.compiler/share/data/symbols/java.base-N.sym.txt
@@ -707,6 +707,7 @@ innerclass innerClass jdk/internal/classfile/impl/AbstractPoolEntry$ClassEntryIm
 innerclass innerClass jdk/internal/classfile/impl/AbstractPoolEntry$AbstractNamedEntry outerClass jdk/internal/classfile/impl/AbstractPoolEntry innerClassName AbstractNamedEntry flags 408
 innerclass innerClass jdk/internal/classfile/impl/AbstractPoolEntry$AbstractRefsEntry outerClass jdk/internal/classfile/impl/AbstractPoolEntry innerClassName AbstractRefsEntry flags 408
 innerclass innerClass jdk/internal/classfile/impl/AbstractPoolEntry$AbstractRefEntry outerClass jdk/internal/classfile/impl/AbstractPoolEntry innerClassName AbstractRefEntry flags 408
+-method name phiMix descriptor (I)I
 
 class name jdk/internal/classfile/impl/AbstractPoolEntry$AbstractDynamicConstantPoolEntry
 header extends jdk/internal/classfile/impl/AbstractPoolEntry nestHost jdk/internal/classfile/impl/AbstractPoolEntry sealed true permittedSubclasses jdk/internal/classfile/impl/AbstractPoolEntry$InvokeDynamicEntryImpl,jdk/internal/classfile/impl/AbstractPoolEntry$ConstantDynamicEntryImpl flags 421
@@ -799,6 +800,10 @@ innerclass innerClass jdk/internal/classfile/impl/BoundAttribute$BoundSyntheticA
 innerclass innerClass jdk/internal/classfile/impl/BoundAttribute$BoundStackMapTableAttribute outerClass jdk/internal/classfile/impl/BoundAttribute innerClassName BoundStackMapTableAttribute flags 19
 method name standardAttribute descriptor (Ljava/lang/classfile/constantpool/Utf8Entry;)Ljava/lang/classfile/AttributeMapper; flags 9 signature (Ljava/lang/classfile/constantpool/Utf8Entry;)Ljava/lang/classfile/AttributeMapper<*>;
 
+class name jdk/internal/classfile/impl/BufferedCodeBuilder
+header extends java/lang/Object implements jdk/internal/classfile/impl/TerminalCodeBuilder nestMembers jdk/internal/classfile/impl/BufferedCodeBuilder$Model flags 31
+innerclass innerClass jdk/internal/classfile/impl/BufferedCodeBuilder$Model outerClass jdk/internal/classfile/impl/BufferedCodeBuilder innerClassName Model flags 11
+
 class name jdk/internal/classfile/impl/ClassPrinterImpl
 header extends java/lang/Object nestMembers jdk/internal/classfile/impl/ClassPrinterImpl$MapNodeImpl,jdk/internal/classfile/impl/ClassPrinterImpl$MapNodeImpl$PrivateListNodeImpl,jdk/internal/classfile/impl/ClassPrinterImpl$ListNodeImpl,jdk/internal/classfile/impl/ClassPrinterImpl$LeafNodeImpl flags 31
 innerclass innerClass jdk/internal/classfile/impl/ClassPrinterImpl$LeafNodeImpl outerClass jdk/internal/classfile/impl/ClassPrinterImpl innerClassName LeafNodeImpl flags 19
@@ -914,6 +919,16 @@ innerclass innerClass java/lang/classfile/ClassFileTransform$ResolvedTransform o
 innerclass innerClass java/lang/classfile/Signature$ThrowableSig outerClass java/lang/classfile/Signature innerClassName ThrowableSig flags 609
 innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
 
+class name jdk/internal/classfile/impl/DirectCodeBuilder
+header extends jdk/internal/classfile/impl/AbstractDirectBuilder implements jdk/internal/classfile/impl/TerminalCodeBuilder flags 31 signature Ljdk/internal/classfile/impl/AbstractDirectBuilder<Ljava/lang/classfile/CodeModel;>;Ljdk/internal/classfile/impl/TerminalCodeBuilder;
+innerclass innerClass java/lang/classfile/ClassFile$ShortJumpsOption outerClass java/lang/classfile/ClassFile innerClassName ShortJumpsOption flags 4019
+innerclass innerClass jdk/internal/classfile/impl/AbstractPseudoInstruction$ExceptionCatchImpl outerClass jdk/internal/classfile/impl/AbstractPseudoInstruction innerClassName ExceptionCatchImpl flags 19
+innerclass innerClass java/lang/classfile/ClassFile$DeadLabelsOption outerClass java/lang/classfile/ClassFile innerClassName DeadLabelsOption flags 4019
+innerclass innerClass java/lang/classfile/ClassFile$DebugElementsOption outerClass java/lang/classfile/ClassFile innerClassName DebugElementsOption flags 4019
+
+class name jdk/internal/classfile/impl/LabelContext
+header extends java/lang/Object sealed true permittedSubclasses jdk/internal/classfile/impl/TerminalCodeBuilder,jdk/internal/classfile/impl/CodeImpl flags 601
+
 class name jdk/internal/classfile/impl/SignaturesImpl
 header extends java/lang/Object nestMembers jdk/internal/classfile/impl/SignaturesImpl$MethodSignatureImpl,jdk/internal/classfile/impl/SignaturesImpl$ClassSignatureImpl,jdk/internal/classfile/impl/SignaturesImpl$TypeParamImpl,jdk/internal/classfile/impl/SignaturesImpl$TypeArgImpl,jdk/internal/classfile/impl/SignaturesImpl$UnboundedTypeArgImpl,jdk/internal/classfile/impl/SignaturesImpl$ClassTypeSigImpl,jdk/internal/classfile/impl/SignaturesImpl$ArrayTypeSigImpl,jdk/internal/classfile/impl/SignaturesImpl$TypeVarSigImpl,jdk/internal/classfile/impl/SignaturesImpl$BaseTypeSigImpl flags 31
 innerclass innerClass java/lang/classfile/Signature$ClassTypeSig outerClass java/lang/classfile/Signature innerClassName ClassTypeSig flags 609
@@ -1017,6 +1032,12 @@ method name hashCode descriptor ()I flags 1
 class name jdk/internal/classfile/impl/TemporaryConstantPool
 method name entryByIndex descriptor (ILjava/lang/Class;)Ljava/lang/classfile/constantpool/PoolEntry; flags 1 signature <T::Ljava/lang/classfile/constantpool/PoolEntry;>(ILjava/lang/Class<TT;>;)TT;
 
+class name jdk/internal/classfile/impl/TerminalCodeBuilder
+header extends java/lang/Object implements java/lang/classfile/CodeBuilder,jdk/internal/classfile/impl/LabelContext sealed true permittedSubclasses jdk/internal/classfile/impl/DirectCodeBuilder,jdk/internal/classfile/impl/BufferedCodeBuilder flags 601
+method name curTopLocal descriptor ()I flags 401
+
+-class name jdk/internal/classfile/impl/TransformingCodeBuilder
+
 class name jdk/internal/classfile/impl/UnboundAttribute
 header extends jdk/internal/classfile/impl/AbstractElement implements java/lang/classfile/Attribute nestMembers jdk/internal/classfile/impl/UnboundAttribute$EmptyBootstrapAttribute,jdk/internal/classfile/impl/UnboundAttribute$AdHocAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundModuleAttribute,jdk/internal/classfile/impl/UnboundAttribute$TypePathComponentImpl,jdk/internal/classfile/impl/UnboundAttribute$UnboundTypeAnnotation,jdk/internal/classfile/impl/UnboundAttribute$UnboundRecordComponentInfo,jdk/internal/classfile/impl/UnboundAttribute$UnboundModuleRequiresInfo,jdk/internal/classfile/impl/UnboundAttribute$UnboundModuleProvideInfo,jdk/internal/classfile/impl/UnboundAttribute$UnboundModuleOpenInfo,jdk/internal/classfile/impl/UnboundAttribute$UnboundModuleHashInfo,jdk/internal/classfile/impl/UnboundAttribute$UnboundModuleExportInfo,jdk/internal/classfile/impl/UnboundAttribute$UnboundMethodParameterInfo,jdk/internal/classfile/impl/UnboundAttribute$UnboundLocalVariableTypeInfo,jdk/internal/classfile/impl/UnboundAttribute$UnboundLocalVariableInfo,jdk/internal/classfile/impl/UnboundAttribute$UnboundLineNumberInfo,jdk/internal/classfile/impl/UnboundAttribute$UnboundInnerClassInfo,jdk/internal/classfile/impl/UnboundAttribute$UnboundCharacterRangeInfo,jdk/internal/classfile/impl/UnboundAttribute$UnboundRuntimeInvisibleTypeAnnotationsAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundRuntimeVisibleTypeAnnotationsAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundRuntimeInvisibleParameterAnnotationsAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundRuntimeVisibleParameterAnnotationsAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundRuntimeInvisibleAnnotationsAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundRuntimeVisibleAnnotationsAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundLocalVariableTypeTableAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundLocalVariableTableAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundLineNumberTableAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundCharacterRangeTableAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundSourceDebugExtensionAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundSourceIDAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundCompilationIDAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundNestHostAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundNestMembersAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundPermittedSubclassesAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundModuleResolutionAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundModulePackagesAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundModuleHashesAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundModuleMainClassAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundModuleTargetAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundMethodParametersAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundEnclosingMethodAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundRecordAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundInnerClassesAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundStackMapTableAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundSourceFileAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundAnnotationDefaultAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundExceptionsAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundSignatureAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundSyntheticAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundDeprecatedAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundConstantValueAttribute sealed true permittedSubclasses jdk/internal/classfile/impl/UnboundAttribute$UnboundConstantValueAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundDeprecatedAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundSyntheticAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundSignatureAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundExceptionsAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundAnnotationDefaultAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundSourceFileAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundStackMapTableAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundInnerClassesAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundRecordAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundEnclosingMethodAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundMethodParametersAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundModuleTargetAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundModuleMainClassAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundModuleHashesAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundModulePackagesAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundModuleResolutionAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundPermittedSubclassesAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundNestMembersAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundNestHostAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundCompilationIDAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundSourceIDAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundSourceDebugExtensionAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundCharacterRangeTableAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundLineNumberTableAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundLocalVariableTableAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundLocalVariableTypeTableAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundRuntimeVisibleAnnotationsAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundRuntimeInvisibleAnnotationsAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundRuntimeVisibleParameterAnnotationsAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundRuntimeInvisibleParameterAnnotationsAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundRuntimeVisibleTypeAnnotationsAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundRuntimeInvisibleTypeAnnotationsAttribute,jdk/internal/classfile/impl/UnboundAttribute$UnboundModuleAttribute,jdk/internal/classfile/impl/UnboundAttribute$AdHocAttribute,jdk/internal/classfile/impl/UnboundAttribute$EmptyBootstrapAttribute flags 421 signature <T::Ljava/lang/classfile/Attribute<TT;>;>Ljdk/internal/classfile/impl/AbstractElement;Ljava/lang/classfile/Attribute<TT;>;
 innerclass innerClass jdk/internal/classfile/impl/UnboundAttribute$EmptyBootstrapAttribute outerClass jdk/internal/classfile/impl/UnboundAttribute innerClassName EmptyBootstrapAttribute flags 19

From 2f2223d7524c4405cc7ca6ab77da62016bbfa911 Mon Sep 17 00:00:00 2001
From: William Kemper <wkemper@openjdk.org>
Date: Tue, 23 Jul 2024 16:50:25 +0000
Subject: [PATCH 187/401] 8336944: Shenandoah: Should only relativize stack
 chunks for successful evacuations

Reviewed-by: shade, ysr
---
 src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index 5c5b6f7ebe58d..f93ca9d6d7dd0 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -1178,11 +1178,10 @@ oop ShenandoahHeap::evacuate_object(oop p, Thread* thread) {
 
   // Try to install the new forwarding pointer.
   oop copy_val = cast_to_oop(copy);
-  ContinuationGCSupport::relativize_stack_chunk(copy_val);
-
   oop result = ShenandoahForwarding::try_update_forwardee(p, copy_val);
   if (result == copy_val) {
     // Successfully evacuated. Our copy is now the public one!
+    ContinuationGCSupport::relativize_stack_chunk(copy_val);
     shenandoah_assert_correct(nullptr, copy_val);
     return copy_val;
   }  else {

From 4c91d5cb4176e5f4970dc00835d802d857390d72 Mon Sep 17 00:00:00 2001
From: Ben Perez <ben.perez@oracle.com>
Date: Tue, 23 Jul 2024 19:35:11 +0000
Subject: [PATCH 188/401] 8322133: getParameterSpec(ECGenParameterSpec.class)
 on EC AlgorithmParameters  does not return standard names

Reviewed-by: mullan
---
 .../sun/security/util/ECParameters.java       |  5 +-
 .../EC/CurveGetParameterSpec.java             | 47 +++++++++++++++++++
 2 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 test/jdk/com/sun/crypto/provider/AlgorithmParameters/EC/CurveGetParameterSpec.java

diff --git a/src/java.base/share/classes/sun/security/util/ECParameters.java b/src/java.base/share/classes/sun/security/util/ECParameters.java
index 429b022cc1baa..79b38ead6fa74 100644
--- a/src/java.base/share/classes/sun/security/util/ECParameters.java
+++ b/src/java.base/share/classes/sun/security/util/ECParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -203,8 +203,7 @@ protected void engineInit(byte[] params, String decodingMethod)
         }
 
         if (spec.isAssignableFrom(ECGenParameterSpec.class)) {
-            // Ensure the name is the Object ID
-            String name = namedCurve.getObjectId();
+            String name = namedCurve.getNameAndAliases()[0];
             return spec.cast(new ECGenParameterSpec(name));
         }
 
diff --git a/test/jdk/com/sun/crypto/provider/AlgorithmParameters/EC/CurveGetParameterSpec.java b/test/jdk/com/sun/crypto/provider/AlgorithmParameters/EC/CurveGetParameterSpec.java
new file mode 100644
index 0000000000000..ba4d64c290298
--- /dev/null
+++ b/test/jdk/com/sun/crypto/provider/AlgorithmParameters/EC/CurveGetParameterSpec.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 8322133
+ * @summary Make sure getParameterSpec returns std name for EC AlgorithmParameters
+ * @modules java.base/sun.security.util
+ */
+
+import java.security.AlgorithmParameters;
+import java.security.KeyPairGenerator;
+import java.security.spec.ECGenParameterSpec;
+
+public class CurveGetParameterSpec {
+    public static void main(String[] args) throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("EC");
+        kpg.initialize(new ECGenParameterSpec("secp384r1"));
+        var k = kpg.generateKeyPair().getPublic();
+        var a = AlgorithmParameters.getInstance("EC");
+        a.init(k.getParams());
+        String name = a.getParameterSpec(ECGenParameterSpec.class).getName();
+        if (!name.equals("secp384r1")) {
+            throw new Exception("EC getParameterSpec does not return std name secp384r1. Instead returns: " + name);
+        }
+    }
+}

From 476d2ae69d6f67fdf9e2a9353f224141318690f2 Mon Sep 17 00:00:00 2001
From: Shaojin Wen <shaojin.wensj@alibaba-inc.com>
Date: Tue, 23 Jul 2024 20:21:08 +0000
Subject: [PATCH 189/401] 8336831: Optimize StringConcatHelper.simpleConcat

Reviewed-by: liach, redestad, rriggs
---
 .../share/classes/java/lang/String.java       |  2 +-
 .../classes/java/lang/StringConcatHelper.java | 47 +++++++++++++------
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/String.java b/src/java.base/share/classes/java/lang/String.java
index 68c16c93e4ba3..3d8481be1c3ad 100644
--- a/src/java.base/share/classes/java/lang/String.java
+++ b/src/java.base/share/classes/java/lang/String.java
@@ -2987,7 +2987,7 @@ public String concat(String str) {
         if (str.isEmpty()) {
             return this;
         }
-        return StringConcatHelper.simpleConcat(this, str);
+        return StringConcatHelper.doConcat(this, str);
     }
 
     /**
diff --git a/src/java.base/share/classes/java/lang/StringConcatHelper.java b/src/java.base/share/classes/java/lang/StringConcatHelper.java
index e47e124ed4da6..bcd9c65890f2a 100644
--- a/src/java.base/share/classes/java/lang/StringConcatHelper.java
+++ b/src/java.base/share/classes/java/lang/StringConcatHelper.java
@@ -321,15 +321,24 @@ static String simpleConcat(Object first, Object second) {
             // newly created string required, see JLS 15.18.1
             return new String(s1);
         }
-        // start "mixing" in length and coder or arguments, order is not
-        // important
-        long indexCoder = mix(initialCoder(), s1);
-        indexCoder = mix(indexCoder, s2);
-        byte[] buf = newArray(indexCoder);
-        // prepend each argument in reverse order, since we prepending
-        // from the end of the byte array
-        indexCoder = prepend(indexCoder, buf, s2, s1);
-        return newString(buf, indexCoder);
+        return doConcat(s1, s2);
+    }
+
+    /**
+     * Perform a simple concatenation between two non-empty strings.
+     *
+     * @param s1         first argument
+     * @param s2         second argument
+     * @return String    resulting string
+     */
+    @ForceInline
+    static String doConcat(String s1, String s2) {
+        byte coder = (byte) (s1.coder() | s2.coder());
+        int newLength = (s1.length() + s2.length()) << coder;
+        byte[] buf = newArray(newLength);
+        s1.getBytes(buf, 0, coder);
+        s2.getBytes(buf, s1.length(), coder);
+        return new String(buf, coder);
     }
 
     /**
@@ -395,14 +404,22 @@ static byte[] newArrayWithSuffix(String suffix, long indexCoder) {
      */
     @ForceInline
     static byte[] newArray(long indexCoder) {
-        int index = (int)indexCoder;
-        if (indexCoder >= UTF16) {
-            index <<= 1;
-        }
-        if (index < 0) {
+        byte coder = (byte)(indexCoder >> 32);
+        int index = ((int)indexCoder) << coder;
+        return newArray(index);
+    }
+
+    /**
+     * Allocates an uninitialized byte array based on the length
+     * @param length
+     * @return the newly allocated byte array
+     */
+    @ForceInline
+    static byte[] newArray(int length) {
+        if (length < 0) {
             throw new OutOfMemoryError("Overflow: String length out of range");
         }
-        return (byte[]) UNSAFE.allocateUninitializedArray(byte.class, index);
+        return (byte[]) UNSAFE.allocateUninitializedArray(byte.class, length);
     }
 
     /**

From 3251eea1f4289a0505052be204407c02ca38b0ad Mon Sep 17 00:00:00 2001
From: Martin Balao <mbalao@openjdk.org>
Date: Wed, 24 Jul 2024 02:39:35 +0000
Subject: [PATCH 190/401] 8336499: Failure when creating non-CRT RSA private
 keys in SunPKCS11

Co-authored-by: Francisco Ferrari Bihurriet <fferrari@openjdk.org>
Co-authored-by: Martin Balao <mbalao@openjdk.org>
Reviewed-by: fferrari, valeriep
---
 .../classes/sun/security/pkcs11/P11Key.java   | 100 +++++++++++-------
 1 file changed, 63 insertions(+), 37 deletions(-)

diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
index 837a3a3dba1c8..d528f1b848584 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
@@ -561,47 +561,73 @@ static class P11RSAPrivateKeyInternal extends P11PrivateKey {
         static P11RSAPrivateKeyInternal of(Session session, long keyID,
                 String algorithm, int keyLength, CK_ATTRIBUTE[] attrs,
                 boolean keySensitive) {
-            if (keySensitive) {
-                return new P11RSAPrivateKeyInternal(session, keyID, algorithm,
+            P11RSAPrivateKeyInternal p11Key = null;
+            if (!keySensitive) {
+                // Key is not sensitive: try to interpret as CRT or non-CRT.
+                p11Key = asCRT(session, keyID, algorithm, keyLength, attrs);
+                if (p11Key == null) {
+                    p11Key = asNonCRT(session, keyID, algorithm, keyLength,
+                            attrs);
+                }
+            }
+            if (p11Key == null) {
+                // Key is sensitive or there was a failure while querying its
+                // attributes: handle as opaque.
+                p11Key = new P11RSAPrivateKeyInternal(session, keyID, algorithm,
                         keyLength, attrs);
-            } else {
-                CK_ATTRIBUTE[] rsaAttrs = new CK_ATTRIBUTE[] {
-                        new CK_ATTRIBUTE(CKA_MODULUS),
-                        new CK_ATTRIBUTE(CKA_PRIVATE_EXPONENT),
-                        new CK_ATTRIBUTE(CKA_PUBLIC_EXPONENT),
-                        new CK_ATTRIBUTE(CKA_PRIME_1),
-                        new CK_ATTRIBUTE(CKA_PRIME_2),
-                        new CK_ATTRIBUTE(CKA_EXPONENT_1),
-                        new CK_ATTRIBUTE(CKA_EXPONENT_2),
-                        new CK_ATTRIBUTE(CKA_COEFFICIENT),
-                };
-                boolean isCRT = true;
-                Session tempSession = null;
-                try {
-                    tempSession = session.token.getOpSession();
-                    session.token.p11.C_GetAttributeValue(tempSession.id(),
-                            keyID, rsaAttrs);
-                    for (CK_ATTRIBUTE attr : rsaAttrs) {
-                        isCRT &= (attr.pValue instanceof byte[]);
-                        if (!isCRT) break;
+            }
+            return p11Key;
+        }
+
+        private static CK_ATTRIBUTE[] tryFetchAttributes(Session session,
+                long keyID, long... attrTypes) {
+            int i = 0;
+            CK_ATTRIBUTE[] attrs = new CK_ATTRIBUTE[attrTypes.length];
+            for (long attrType : attrTypes) {
+                attrs[i++] = new CK_ATTRIBUTE(attrType);
+            }
+            try {
+                session.token.p11.C_GetAttributeValue(session.id(), keyID,
+                        attrs);
+                for (CK_ATTRIBUTE attr : attrs) {
+                    if (!(attr.pValue instanceof byte[])) {
+                        return null;
                     }
-                } catch (PKCS11Exception e) {
-                    // ignore, assume not available
-                    isCRT = false;
-                } finally {
-                    session.token.releaseSession(tempSession);
-                }
-                BigInteger n = rsaAttrs[0].getBigInteger();
-                BigInteger d = rsaAttrs[1].getBigInteger();
-                if (isCRT) {
-                    return new P11RSAPrivateKey(session, keyID, algorithm,
-                           keyLength, attrs, n, d,
-                           Arrays.copyOfRange(rsaAttrs, 2, rsaAttrs.length));
-                } else {
-                    return new P11RSAPrivateNonCRTKey(session, keyID,
-                           algorithm, keyLength, attrs, n, d);
                 }
+                return attrs;
+            } catch (PKCS11Exception ignored) {
+                // ignore, assume not available
+                return null;
+            }
+        }
+
+        private static P11RSAPrivateKeyInternal asCRT(Session session,
+                long keyID, String algorithm, int keyLength,
+                CK_ATTRIBUTE[] attrs) {
+            CK_ATTRIBUTE[] rsaCRTAttrs = tryFetchAttributes(session, keyID,
+                    CKA_MODULUS, CKA_PRIVATE_EXPONENT, CKA_PUBLIC_EXPONENT,
+                    CKA_PRIME_1, CKA_PRIME_2, CKA_EXPONENT_1, CKA_EXPONENT_2,
+                    CKA_COEFFICIENT);
+            if (rsaCRTAttrs == null) {
+                return null;
+            }
+            return new P11RSAPrivateKey(session, keyID, algorithm, keyLength,
+                    attrs, rsaCRTAttrs[0].getBigInteger(),
+                    rsaCRTAttrs[1].getBigInteger(),
+                    Arrays.copyOfRange(rsaCRTAttrs, 2, rsaCRTAttrs.length));
+        }
+
+        private static P11RSAPrivateKeyInternal asNonCRT(Session session,
+                long keyID, String algorithm, int keyLength,
+                CK_ATTRIBUTE[] attrs) {
+            CK_ATTRIBUTE[] rsaNonCRTAttrs = tryFetchAttributes(session, keyID,
+                    CKA_MODULUS, CKA_PRIVATE_EXPONENT);
+            if (rsaNonCRTAttrs == null) {
+                return null;
             }
+            return new P11RSAPrivateNonCRTKey(session, keyID, algorithm,
+                    keyLength, attrs, rsaNonCRTAttrs[0].getBigInteger(),
+                    rsaNonCRTAttrs[1].getBigInteger());
         }
 
         protected transient BigInteger n;

From 5b4824cf9aba297fa6873ebdadc0e9545647e90d Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Wed, 24 Jul 2024 07:21:45 +0000
Subject: [PATCH 191/401] 8336827:
 compiler/vectorization/TestFloat16VectorConvChain.java  timeouts on ppc64
 platforms after JDK-8335860

Reviewed-by: kvn, mdoerr, shade
---
 .../compiler/vectorization/TestFloat16VectorConvChain.java      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorConvChain.java b/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorConvChain.java
index 9a2b9d6b8487a..384cc411d3eb8 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorConvChain.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorConvChain.java
@@ -24,6 +24,8 @@
 /**
 * @test
 * @summary Test Float16 vector conversion chain.
+* @requires (vm.cpu.features ~= ".*avx512vl.*" | vm.cpu.features ~= ".*f16c.*") | os.arch == "aarch64"
+*           | (os.arch == "riscv64" & vm.cpu.features ~= ".*zfh.*")
 * @library /test/lib /
 * @run driver compiler.vectorization.TestFloat16VectorConvChain
 */

From 05d88de05e9b7814ecd5517aacd17f0feafdff3c Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Wed, 24 Jul 2024 09:10:38 +0000
Subject: [PATCH 192/401] 8336098: G1: Refactor G1RebuildRSAndScrubTask

Reviewed-by: tschatzl, gli
---
 .../gc/g1/g1ConcurrentRebuildAndScrub.cpp     | 149 ++++++------------
 1 file changed, 52 insertions(+), 97 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp b/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp
index 1b6b1eed7b13b..35cff96eb930e 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp
@@ -89,10 +89,14 @@ class G1RebuildRSAndScrubTask : public WorkerTask {
 
     // Yield if enough has been processed; returns if the concurrent marking cycle
     // has been aborted for any reason.
-    bool yield_if_necessary() {
+    bool yield_if_necessary(G1HeapRegion* hr) {
       if (_processed_words >= ProcessingYieldLimitInWords) {
         reset_processed_words();
-        _cm->do_yield_check();
+        // If a yield occurs (potential young-gc pause), must recheck for
+        // potential regions reclamation.
+        if (_cm->do_yield_check() && !should_rebuild_or_scrub(hr)) {
+          return true;
+        }
       }
       return _cm->has_aborted();
     }
@@ -111,8 +115,7 @@ class G1RebuildRSAndScrubTask : public WorkerTask {
     // Helper used by both humongous objects and when chunking an object larger than the
     // G1RebuildRemSetChunkSize. The heap region is needed check whether the region has
     // been reclaimed during yielding.
-    // Returns true if marking has been aborted or false if completed.
-    bool scan_large_object(G1HeapRegion* hr, const oop obj, MemRegion scan_range) {
+    void scan_large_object(G1HeapRegion* hr, const oop obj, MemRegion scan_range) {
       HeapWord* start = scan_range.start();
       HeapWord* limit = scan_range.end();
       do {
@@ -122,20 +125,14 @@ class G1RebuildRSAndScrubTask : public WorkerTask {
         // Update processed words and yield, for humongous objects we will yield
         // after each chunk.
         add_processed_words(mr.word_size());
-        bool mark_aborted = yield_if_necessary();
-        if (mark_aborted) {
-          return true;
-        } else if (!should_rebuild_or_scrub(hr)) {
-          // We need to check should_rebuild_or_scrub() again because the region might
-          // have been reclaimed during above yield/safepoint.
-          log_trace(gc, marking)("Rebuild aborted for reclaimed region: %u", hr->hrm_index());
-          return false;
+
+        if (yield_if_necessary(hr)) {
+          return;
         }
 
         // Step to next chunk of the large object.
         start = mr.end();
       } while (start < limit);
-      return false;
     }
 
     // Scan for references into regions that need remembered set update for the given
@@ -165,102 +162,66 @@ class G1RebuildRSAndScrubTask : public WorkerTask {
       return obj_size;
     }
 
-    // Scrub a range of dead objects starting at scrub_start. Will never scrub past limit.
-    HeapWord* scrub_to_next_live(G1HeapRegion* hr, HeapWord* scrub_start, HeapWord* limit) {
-      assert(!_bitmap->is_marked(scrub_start), "Should not scrub live object");
-
-      HeapWord* scrub_end = _bitmap->get_next_marked_addr(scrub_start, limit);
-      hr->fill_range_with_dead_objects(scrub_start, scrub_end);
-
-      // Return the next object to handle.
-      return scrub_end;
-    }
-
-    // Scan the given region from bottom to parsable_bottom. Returns whether marking has
-    // been aborted.
-    bool scan_and_scrub_to_pb(G1HeapRegion* hr, HeapWord* start, HeapWord* const limit) {
-
-      while (start < limit) {
-        if (_bitmap->is_marked(start)) {
-          //  Live object, need to scan to rebuild remembered sets for this object.
-          start += scan_object(hr, start);
-        } else {
-          // Found dead object (which klass has potentially been unloaded). Scrub to next
-          // marked object and continue.
-          start = scrub_to_next_live(hr, start, limit);
-        }
-
-        bool mark_aborted = yield_if_necessary();
-        if (mark_aborted) {
-          return true;
-        } else if (!should_rebuild_or_scrub(hr)) {
-          // We need to check should_rebuild_or_scrub() again because the region might
-          // have been reclaimed during above yield/safepoint.
-          log_trace(gc, marking)("Scan and scrub aborted for reclaimed region: %u", hr->hrm_index());
-          return false;
-        }
-      }
-      return false;
-    }
-
-    // Scan the given region from parsable_bottom to tars. Returns whether marking has
-    // been aborted.
-    bool scan_from_pb_to_tars(G1HeapRegion* hr, HeapWord* start, HeapWord* const limit) {
-
-      while (start < limit) {
-        start += scan_object(hr, start);
-        // Avoid stalling safepoints and stop iteration if mark cycle has been aborted.
-        bool mark_aborted = yield_if_necessary();
-        if (mark_aborted) {
-          return true;
-        } else if (!should_rebuild_or_scrub(hr)) {
-          // We need to check should_rebuild_or_scrub() again because the region might
-          // have been reclaimed during above yield/safepoint.
-          log_trace(gc, marking)("Scan aborted for reclaimed region: %u", hr->hrm_index());
-          return false;
-        }
+    // Scan or scrub depending on if addr is marked.
+    HeapWord* scan_or_scrub(G1HeapRegion* hr, HeapWord* addr, HeapWord* limit) {
+      if (_bitmap->is_marked(addr)) {
+        //  Live object, need to scan to rebuild remembered sets for this object.
+        return addr + scan_object(hr, addr);
+      } else {
+        // Found dead object (which klass has potentially been unloaded). Scrub to next marked object.
+        HeapWord* scrub_end = _bitmap->get_next_marked_addr(addr, limit);
+        hr->fill_range_with_dead_objects(addr, scrub_end);
+        // Return the next object to handle.
+        return scrub_end;
       }
-      return false;
     }
 
-    // Scan and scrub the given region to tars. Returns whether marking has
-    // been aborted.
-    bool scan_and_scrub_region(G1HeapRegion* hr, HeapWord* const pb) {
+    // Scan and scrub the given region to tars.
+    void scan_and_scrub_region(G1HeapRegion* hr, HeapWord* const pb) {
       assert(should_rebuild_or_scrub(hr), "must be");
 
       log_trace(gc, marking)("Scrub and rebuild region: " HR_FORMAT " pb: " PTR_FORMAT " TARS: " PTR_FORMAT " TAMS: " PTR_FORMAT,
                              HR_FORMAT_PARAMS(hr), p2i(pb), p2i(_cm->top_at_rebuild_start(hr)), p2i(_cm->top_at_mark_start(hr)));
 
-      if (scan_and_scrub_to_pb(hr, hr->bottom(), pb)) {
-        log_trace(gc, marking)("Scan and scrub aborted for region: %u", hr->hrm_index());
-        return true;
-      }
+      {
+        // Step 1: Scan the given region from bottom to parsable_bottom.
+        HeapWord* start = hr->bottom();
+        HeapWord* limit = pb;
+        while (start < limit) {
+          start = scan_or_scrub(hr, start, limit);
 
-      // Yielding during scrubbing and scanning might have reclaimed the region, so need to
-      // re-check after above.
-      if (!should_rebuild_or_scrub(hr)) {
-        return false;
+          if (yield_if_necessary(hr)) {
+            return;
+          }
+        }
       }
+
       // Scrubbing completed for this region - notify that we are done with it, resetting
       // pb to bottom.
       hr->note_end_of_scrubbing();
 
-      // Rebuild from TAMS (= parsable_bottom) to TARS.
-      if (scan_from_pb_to_tars(hr, pb, _cm->top_at_rebuild_start(hr))) {
-        log_trace(gc, marking)("Rebuild aborted for region: %u (%s)", hr->hrm_index(), hr->get_short_type_str());
-        return true;
+      {
+        // Step 2: Rebuild from TAMS (= parsable_bottom) to TARS.
+        HeapWord* start = pb;
+        HeapWord* limit = _cm->top_at_rebuild_start(hr);
+        while (start < limit) {
+          start += scan_object(hr, start);
+
+          if (yield_if_necessary(hr)) {
+            return;
+          }
+        }
       }
-      return false;
     }
 
     // Scan a humongous region for remembered set updates. Scans in chunks to avoid
-    // stalling safepoints. Returns whether the concurrent marking phase has been aborted.
-    bool scan_humongous_region(G1HeapRegion* hr, HeapWord* const pb) {
+    // stalling safepoints.
+    void scan_humongous_region(G1HeapRegion* hr, HeapWord* const pb) {
       assert(should_rebuild_or_scrub(hr), "must be");
 
       if (!_should_rebuild_remset) {
         // When not rebuilding there is nothing to do for humongous objects.
-        return false;
+        return;
       }
 
       // At this point we should only have live humongous objects, that
@@ -278,12 +239,7 @@ class G1RebuildRSAndScrubTask : public WorkerTask {
       HeapWord* humongous_end = hr->humongous_start_region()->bottom() + humongous->size();
       MemRegion mr(hr->bottom(), MIN2(hr->top(), humongous_end));
 
-      bool mark_aborted = scan_large_object(hr, humongous, mr);
-      if (mark_aborted) {
-        log_trace(gc, marking)("Rebuild aborted for region: %u (%s)", hr->hrm_index(), hr->get_short_type_str());
-        return true;
-      }
-      return false;
+      scan_large_object(hr, humongous, mr);
     }
 
   public:
@@ -312,17 +268,16 @@ class G1RebuildRSAndScrubTask : public WorkerTask {
         return false;
       }
 
-      bool mark_aborted;
       if (hr->needs_scrubbing()) {
         // This is a region with potentially unparsable (dead) objects.
-        mark_aborted = scan_and_scrub_region(hr, pb);
+        scan_and_scrub_region(hr, pb);
       } else {
         assert(hr->is_humongous(), "must be, but %u is %s", hr->hrm_index(), hr->get_short_type_str());
         // No need to scrub humongous, but we should scan it to rebuild remsets.
-        mark_aborted = scan_humongous_region(hr, pb);
+        scan_humongous_region(hr, pb);
       }
 
-      return mark_aborted;
+      return _cm->has_aborted();
     }
   };
 

From 332df83e7cb1f272c08f8e4955d6abaf3f091ace Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Wed, 24 Jul 2024 12:13:15 +0000
Subject: [PATCH 193/401] 8336927: Missing equals and hashCode in
 java.lang.classfile.Annotation

Reviewed-by: asotona
---
 .../classfile/impl/AnnotationImpl.java        | 22 +++-------------
 test/jdk/jdk/classfile/AnnotationTest.java    | 25 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AnnotationImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AnnotationImpl.java
index 8290fcd286ed9..03353e272a675 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AnnotationImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AnnotationImpl.java
@@ -32,24 +32,10 @@
 
 import static java.lang.classfile.ClassFile.*;
 
-public final class AnnotationImpl implements Annotation, Util.Writable {
-    private final Utf8Entry className;
-    private final List<AnnotationElement> elements;
-
-    public AnnotationImpl(Utf8Entry className,
-                          List<AnnotationElement> elems) {
-        this.className = className;
-        this.elements = List.copyOf(elems);
-    }
-
-    @Override
-    public Utf8Entry className() {
-        return className;
-    }
-
-    @Override
-    public List<AnnotationElement> elements() {
-        return elements;
+public record AnnotationImpl(Utf8Entry className, List<AnnotationElement> elements)
+        implements Annotation, Util.Writable {
+    public AnnotationImpl {
+        elements = List.copyOf(elements);
     }
 
     @Override
diff --git a/test/jdk/jdk/classfile/AnnotationTest.java b/test/jdk/jdk/classfile/AnnotationTest.java
index 0226affe7c260..4ed3b2141ad47 100644
--- a/test/jdk/jdk/classfile/AnnotationTest.java
+++ b/test/jdk/jdk/classfile/AnnotationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -207,4 +207,27 @@ void testAnnosNoCPB() {
         assertAnno(mannos.get(0), "LAnno;", true);
         assertAnno(fannos.get(0), "LAnno;", true);
     }
+
+    @Test
+    void testEquality() {
+        assertEquals(Annotation.of(CD_Object), Annotation.of(ClassDesc.of("java.lang.Object")));
+        assertNotEquals(Annotation.of(CD_Object), Annotation.of(CD_String));
+        assertEquals(Annotation.of(CD_Object, AnnotationElement.of("fly", AnnotationValue.ofInt(5))),
+                Annotation.of(CD_Object, AnnotationElement.ofInt("fly", 5)));
+        assertEquals(AnnotationElement.ofFloat("one", 1.2F),
+                AnnotationElement.ofFloat("one", 1.2F));
+        assertEquals(AnnotationElement.ofFloat("one", 1.2F),
+                AnnotationElement.of("one", AnnotationValue.ofFloat(1.2F)));
+        assertNotEquals(AnnotationElement.ofFloat("one", 1.2F),
+                AnnotationElement.ofFloat("two", 1.2F));
+        assertNotEquals(AnnotationElement.ofFloat("one", 1.2F),
+                AnnotationElement.ofFloat("one", 2.1F));
+        assertNotEquals(AnnotationElement.ofFloat("one", 1.2F),
+                AnnotationElement.ofDouble("one", 1.2F));
+        assertEquals(AnnotationValue.ofInt(23), AnnotationValue.ofInt(23));
+        assertNotEquals(AnnotationValue.ofInt(23), AnnotationValue.ofInt(42));
+        assertNotEquals(AnnotationValue.ofInt(23), AnnotationValue.ofLong(23));
+        assertEquals(AnnotationValue.ofAnnotation(Annotation.of(CD_Object)),
+                AnnotationValue.ofAnnotation(Annotation.of(Object.class.describeConstable().orElseThrow())));
+    }
 }

From aa15b895c96fd62152d5ae5a1a9dfd28610c5125 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Wed, 24 Jul 2024 15:12:53 +0000
Subject: [PATCH 194/401] 8336485: jdk/jfr/jcmd/TestJcmdView.java
 RuntimeException: 'Invoked Concurrent' missing from stdout/stderr

Reviewed-by: mgronlun
---
 test/jdk/jdk/jfr/jcmd/TestJcmdView.java | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/test/jdk/jdk/jfr/jcmd/TestJcmdView.java b/test/jdk/jdk/jfr/jcmd/TestJcmdView.java
index bf3e3f6ba88e4..44db54e785038 100644
--- a/test/jdk/jdk/jfr/jcmd/TestJcmdView.java
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,6 +47,7 @@ public class TestJcmdView {
     public static void main(String... args) throws Throwable {
         CountDownLatch jvmInformation = new CountDownLatch(1);
         CountDownLatch systemGC = new CountDownLatch(1);
+        CountDownLatch threadSleep = new CountDownLatch(1);
         CountDownLatch gcHeapSummary = new CountDownLatch(1);
         CountDownLatch oldCollection = new CountDownLatch(1);
         CountDownLatch garbageCollection = new CountDownLatch(1);
@@ -56,6 +57,7 @@ public static void main(String... args) throws Throwable {
             rs.setMaxSize(Long.MAX_VALUE);
             rs.enable("jdk.JVMInformation").with("period", "beginChunk");
             rs.enable("jdk.SystemGC");
+            rs.enable("jdk.ThreadSleep").withoutThreshold().withStackTrace();
             rs.enable("jdk.GCHeapSummary");
             rs.enable("jdk.GarbageCollection");
             rs.enable("jdk.OldGarbageCollection");
@@ -70,6 +72,11 @@ public static void main(String... args) throws Throwable {
                 System.out.println(e);
                 storeLastTimestamp(e);
             });
+            rs.onEvent("jdk.ThreadSleep", e -> {
+                threadSleep.countDown();
+                System.out.println(e);
+                storeLastTimestamp(e);
+            });
             rs.onEvent("jdk.GCHeapSummary", e -> {
                 gcHeapSummary.countDown();
                 System.out.println(e);
@@ -90,9 +97,12 @@ public static void main(String... args) throws Throwable {
             System.gc();
             System.gc();
             System.gc();
+            // Emit thread sleep event
+            Thread.sleep(1);
             // Wait for them being in the repository
             jvmInformation.await();
             systemGC.await();
+            threadSleep.await();
             gcHeapSummary.await();
             oldCollection.await();
             // Wait for Instant.now() to advance 1 s past the last event timestamp.
@@ -160,13 +170,13 @@ private static void testTableView() throws Throwable {
 
     private static void testEventType() throws Throwable {
         OutputAnalyzer output = JcmdHelper.jcmd(
-             "JFR.view", "verbose=true", "width=300", "cell-height=100", "SystemGC");
+             "JFR.view", "verbose=true", "width=300", "cell-height=100", "ThreadSleep");
         // Verify title
-        output.shouldContain("System GC");
+        output.shouldContain("Thread Sleep");
         // Verify headings
-        output.shouldContain("Invoked Concurrent");
+        output.shouldContain("Sleep Time");
         // Verify verbose headings
-        output.shouldContain("invokedConcurrent");
+        output.shouldContain("time");
         // Verify thread value
         output.shouldContain(Thread.currentThread().getName());
         // Verify stack frame

From b2599f8b0ed227f7b67fbbb77b4a5af1f12730e2 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Wed, 24 Jul 2024 15:13:02 +0000
Subject: [PATCH 195/401] 8336316: JFR: Use SettingControl::getValue() instead
 of setValue() for ActiveSetting event

Reviewed-by: mgronlun
---
 .../share/classes/jdk/jfr/internal/Control.java        | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/Control.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/Control.java
index 16f827a2df528..05c75a0e48e9b 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/Control.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/Control.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -108,15 +108,18 @@ public void setValue(String value) {
             // VM events requires no access control context
             try {
                 delegate.setValue(value);
+                lastValue = delegate.getValue();
             } catch (Throwable t) {
                 Logger.log(LogTag.JFR_SETTING, LogLevel.WARN, "Exception occurred when setting value \"" + value + "\" for " + getClass());
+                lastValue = null;
             }
         } else {
-            AccessController.doPrivileged(new PrivilegedAction<Void>() {
+            lastValue = AccessController.doPrivileged(new PrivilegedAction<String>() {
                 @Override
-                public Void run() {
+                public String run() {
                     try {
                         delegate.setValue(value);
+                        return delegate.getValue();
                     } catch (Throwable t) {
                         // Prevent malicious user to propagate exception callback in the wrong context
                         Logger.log(LogTag.JFR_SETTING, LogLevel.WARN, "Exception occurred when setting value \"" + value + "\" for " + getClass());
@@ -125,7 +128,6 @@ public Void run() {
                 }
             }, context);
         }
-        lastValue = value;
     }
 
 

From 04e8cb8641bfdad717b368c087619905bccdf5e6 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Wed, 24 Jul 2024 15:43:53 +0000
Subject: [PATCH 196/401] 8336815: Several methods in java.net.Socket and
 ServerSocket do not specify behavior when already bound, connected or closed

Reviewed-by: alanb
---
 .../share/classes/java/net/ServerSocket.java  |  31 +--
 .../share/classes/java/net/Socket.java        | 101 +++++-----
 .../ServerSocket/ClosedServerSocketTest.java  | 123 ++++++++++++
 .../jdk/java/net/Socket/ClosedSocketTest.java | 176 ++++++++++++++++++
 4 files changed, 367 insertions(+), 64 deletions(-)
 create mode 100644 test/jdk/java/net/ServerSocket/ClosedServerSocketTest.java
 create mode 100644 test/jdk/java/net/Socket/ClosedSocketTest.java

diff --git a/src/java.base/share/classes/java/net/ServerSocket.java b/src/java.base/share/classes/java/net/ServerSocket.java
index b3e570c858a62..bb0fae2b88d2b 100644
--- a/src/java.base/share/classes/java/net/ServerSocket.java
+++ b/src/java.base/share/classes/java/net/ServerSocket.java
@@ -328,8 +328,8 @@ private SocketImpl getImpl() throws SocketException {
      * an ephemeral port and a valid local address to bind the socket.
      *
      * @param   endpoint        The IP address and port number to bind to.
-     * @throws  IOException if the bind operation fails, or if the socket
-     *                     is already bound.
+     * @throws  IOException if the bind operation fails, the socket
+     *                      is already bound or the socket is closed.
      * @throws  SecurityException       if a {@code SecurityManager} is present and
      * its {@code checkListen} method doesn't allow the operation.
      * @throws  IllegalArgumentException if endpoint is a
@@ -357,8 +357,8 @@ public void bind(SocketAddress endpoint) throws IOException {
      * @param   endpoint        The IP address and port number to bind to.
      * @param   backlog         requested maximum length of the queue of
      *                          incoming connections.
-     * @throws  IOException if the bind operation fails, or if the socket
-     *                     is already bound.
+     * @throws  IOException if the bind operation fails, the socket
+     *                      is already bound or the socket is closed.
      * @throws  SecurityException       if a {@code SecurityManager} is present and
      * its {@code checkListen} method doesn't allow the operation.
      * @throws  IllegalArgumentException if endpoint is a
@@ -518,7 +518,7 @@ public SocketAddress getLocalSocketAddress() {
      * client socket implementation factory}, if one has been set.
      *
      * @throws     IOException  if an I/O error occurs when waiting for a
-     *               connection.
+     *               connection, the socket is not bound or the socket is closed.
      * @throws     SecurityException  if a security manager exists and its
      *             {@code checkAccept} method doesn't allow the operation.
      * @throws     SocketTimeoutException if a timeout was previously set with setSoTimeout and
@@ -736,6 +736,9 @@ private void ensureCompatible(SocketImpl si) throws IOException {
      * <p> If this socket has an associated channel then the channel is closed
      * as well.
      *
+     * <p> Once closed, several of the methods defined by this class will throw
+     * an exception if invoked on the closed socket.
+     *
      * @throws     IOException  if an I/O error occurs when closing the socket.
      */
     public void close() throws IOException {
@@ -806,8 +809,8 @@ public boolean isClosed() {
      * operation to have effect.
      *
      * @param timeout the specified timeout, in milliseconds
-     * @throws  SocketException if there is an error in the underlying protocol,
-     *          such as a TCP error
+     * @throws SocketException if there is an error in the underlying protocol,
+     *         such as a TCP error, or the socket is closed.
      * @throws  IllegalArgumentException  if {@code timeout} is negative
      * @since   1.1
      * @see #getSoTimeout()
@@ -824,7 +827,7 @@ public void setSoTimeout(int timeout) throws SocketException {
      * Retrieve setting for {@link SocketOptions#SO_TIMEOUT SO_TIMEOUT}.
      * 0 returns implies that the option is disabled (i.e., timeout of infinity).
      * @return the {@link SocketOptions#SO_TIMEOUT SO_TIMEOUT} value
-     * @throws    IOException if an I/O error occurs
+     * @throws IOException if an I/O error occurs or the socket is closed.
      * @since   1.1
      * @see #setSoTimeout(int)
      */
@@ -887,8 +890,8 @@ public void setReuseAddress(boolean on) throws SocketException {
      *
      * @return a {@code boolean} indicating whether or not
      *         {@code SO_REUSEADDR} is enabled.
-     * @throws    SocketException if there is an error
-     * in the underlying protocol, such as a TCP error.
+     * @throws SocketException if there is an error in the underlying protocol, such as a TCP error,
+     *         or the socket is closed.
      * @since   1.4
      * @see #setReuseAddress(boolean)
      */
@@ -1001,8 +1004,8 @@ public static synchronized void setSocketFactory(SocketImplFactory fac) throws I
      * requested value but the TCP receive window in sockets accepted from
      * this ServerSocket will be no larger than 64K bytes.
      *
-     * @throws    SocketException if there is an error
-     * in the underlying protocol, such as a TCP error.
+     * @throws SocketException if there is an error in the underlying protocol,
+     *         such as a TCP error, or the socket is closed.
      *
      * @param size the size to which to set the receive buffer
      * size. This value must be greater than 0.
@@ -1029,8 +1032,8 @@ public void setReceiveBufferSize(int size) throws SocketException {
      * <p>Note, the value actually set in the accepted socket is determined by
      * calling {@link Socket#getReceiveBufferSize()}.
      * @return the value of the {@code SO_RCVBUF} option for this {@code Socket}.
-     * @throws    SocketException if there is an error
-     *            in the underlying protocol, such as a TCP error.
+     * @throws SocketException if there is an error in the underlying protocol,
+     *         such as a TCP error, or the socket is closed.
      * @see #setReceiveBufferSize(int)
      * @since 1.4
      */
diff --git a/src/java.base/share/classes/java/net/Socket.java b/src/java.base/share/classes/java/net/Socket.java
index 99a7bb6ca522e..23c225fbb2d29 100644
--- a/src/java.base/share/classes/java/net/Socket.java
+++ b/src/java.base/share/classes/java/net/Socket.java
@@ -683,7 +683,8 @@ void setConnected() {
      * </ol>
      *
      * @param   endpoint the {@code SocketAddress}
-     * @throws  IOException if an error occurs during the connection
+     * @throws  IOException if an error occurs during the connection, the socket
+     *          is already connected or the socket is closed
      * @throws  java.nio.channels.IllegalBlockingModeException
      *          if this socket has an associated channel,
      *          and the channel is in non-blocking mode
@@ -717,7 +718,8 @@ public void connect(SocketAddress endpoint) throws IOException {
      *
      * @param   endpoint the {@code SocketAddress}
      * @param   timeout  the timeout value to be used in milliseconds.
-     * @throws  IOException if an error occurs during the connection
+     * @throws  IOException if an error occurs during the connection, the socket
+     *          is already connected or the socket is closed
      * @throws  SocketTimeoutException if timeout expires before connecting
      * @throws  java.nio.channels.IllegalBlockingModeException
      *          if this socket has an associated channel,
@@ -780,8 +782,8 @@ public void connect(SocketAddress endpoint, int timeout) throws IOException {
      * an ephemeral port and a valid local address to bind the socket.
      *
      * @param   bindpoint the {@code SocketAddress} to bind to
-     * @throws  IOException if the bind operation fails, or if the socket
-     *                     is already bound.
+     * @throws  IOException if the bind operation fails, the socket
+     *          is already bound or the socket is closed.
      * @throws  IllegalArgumentException if bindpoint is a
      *          SocketAddress subclass not supported by this socket
      * @throws  SecurityException  if a security manager exists and its
@@ -1174,8 +1176,8 @@ public void close() throws IOException {
      * will close the associated socket.
      *
      * @return     an output stream for writing bytes to this socket.
-     * @throws     IOException  if an I/O error occurs when creating the
-     *               output stream or if the socket is not connected.
+     * @throws IOException  if an I/O error occurs when creating the
+     *         output stream, the socket is not connected or the socket is closed.
      */
     public OutputStream getOutputStream() throws IOException {
         int s = state;
@@ -1251,8 +1253,8 @@ public void close() throws IOException {
      * @param on {@code true} to enable {@code TCP_NODELAY},
      * {@code false} to disable.
      *
-     * @throws    SocketException if there is an error
-     * in the underlying protocol, such as a TCP error.
+     * @throws SocketException if there is an error in the underlying protocol,
+     *         such as a TCP error, or the socket is closed.
      *
      * @since   1.1
      *
@@ -1269,8 +1271,8 @@ public void setTcpNoDelay(boolean on) throws SocketException {
      *
      * @return a {@code boolean} indicating whether or not
      *         {@code TCP_NODELAY} is enabled.
-     * @throws    SocketException if there is an error
-     * in the underlying protocol, such as a TCP error.
+     * @throws SocketException if there is an error in the underlying protocol,
+     *         such as a TCP error, or the socket is closed.
      * @since   1.1
      * @see #setTcpNoDelay(boolean)
      */
@@ -1289,9 +1291,9 @@ public boolean getTcpNoDelay() throws SocketException {
      *
      * @param on     whether or not to linger on.
      * @param linger how long to linger for, if on is true.
-     * @throws    SocketException if there is an error
-     * in the underlying protocol, such as a TCP error.
-     * @throws    IllegalArgumentException if the linger value is negative.
+     * @throws SocketException if there is an error in the underlying protocol,
+     *         such as a TCP error, or the socket is closed.
+     * @throws  IllegalArgumentException if the linger value is negative.
      * @since 1.1
      * @see #getSoLinger()
      */
@@ -1318,8 +1320,8 @@ public void setSoLinger(boolean on, int linger) throws SocketException {
      * The setting only affects socket close.
      *
      * @return the setting for {@code SO_LINGER}.
-     * @throws    SocketException if there is an error
-     * in the underlying protocol, such as a TCP error.
+     * @throws SocketException if there is an error in the underlying protocol,
+     *         such as a TCP error, or the socket is closed.
      * @since   1.1
      * @see #setSoLinger(boolean, int)
      */
@@ -1368,8 +1370,8 @@ public void sendUrgentData(int data) throws IOException {
      * @param on {@code true} to enable {@code SO_OOBINLINE},
      *           {@code false} to disable.
      *
-     * @throws    SocketException if there is an error
-     * in the underlying protocol, such as a TCP error.
+     * @throws SocketException if there is an error in the underlying protocol,
+     *         such as a TCP error, or the socket is closed.
      *
      * @since   1.4
      *
@@ -1387,8 +1389,8 @@ public void setOOBInline(boolean on) throws SocketException {
      * @return a {@code boolean} indicating whether or not
      *         {@code SO_OOBINLINE} is enabled.
      *
-     * @throws    SocketException if there is an error
-     * in the underlying protocol, such as a TCP error.
+     * @throws SocketException if there is an error in the underlying protocol,
+     *         such as a TCP error, or the socket is closed.
      * @since   1.4
      * @see #setOOBInline(boolean)
      */
@@ -1409,8 +1411,8 @@ public boolean getOOBInline() throws SocketException {
      *  to have effect.
      *
      * @param timeout the specified timeout, in milliseconds.
-     * @throws  SocketException if there is an error in the underlying protocol,
-     *          such as a TCP error
+     * @throws SocketException if there is an error in the underlying protocol,
+     *         such as a TCP error, or the socket is closed.
      * @throws  IllegalArgumentException if {@code timeout} is negative
      * @since   1.1
      * @see #getSoTimeout()
@@ -1428,8 +1430,8 @@ public void setSoTimeout(int timeout) throws SocketException {
      * 0 returns implies that the option is disabled (i.e., timeout of infinity).
      *
      * @return the setting for {@code SO_TIMEOUT}
-     * @throws    SocketException if there is an error
-     * in the underlying protocol, such as a TCP error.
+     * @throws SocketException if there is an error in the underlying protocol,
+     *         such as a TCP error, or the socket is closed.
      *
      * @since   1.1
      * @see #setSoTimeout(int)
@@ -1455,14 +1457,12 @@ public int getSoTimeout() throws SocketException {
      * <p>Because {@code SO_SNDBUF} is a hint, applications that want to verify
      * what size the buffers were set to should call {@link #getSendBufferSize()}.
      *
-     * @throws    SocketException if there is an error
-     * in the underlying protocol, such as a TCP error.
-     *
      * @param size the size to which to set the send buffer
      * size. This value must be greater than 0.
      *
-     * @throws    IllegalArgumentException if the
-     * value is 0 or is negative.
+     * @throws SocketException if there is an error in the underlying protocol,
+     *         such as a TCP error, or the socket is closed.
+     * @throws  IllegalArgumentException if the value is 0 or is negative.
      *
      * @see #getSendBufferSize()
      * @since 1.2
@@ -1481,8 +1481,8 @@ public void setSendBufferSize(int size) throws SocketException {
      * for output on this {@code Socket}.
      * @return the value of the {@code SO_SNDBUF} option for this {@code Socket}.
      *
-     * @throws    SocketException if there is an error
-     * in the underlying protocol, such as a TCP error.
+     * @throws SocketException if there is an error in the underlying protocol,
+     *         such as a TCP error, or the socket is closed.
      *
      * @see #setSendBufferSize(int)
      * @since 1.2
@@ -1529,8 +1529,8 @@ public int getSendBufferSize() throws SocketException {
      * @throws    IllegalArgumentException if the value is 0 or is
      * negative.
      *
-     * @throws    SocketException if there is an error
-     * in the underlying protocol, such as a TCP error.
+     * @throws SocketException if there is an error in the underlying protocol,
+     *         such as a TCP error, or the socket is closed.
      *
      * @see #getReceiveBufferSize()
      * @see ServerSocket#setReceiveBufferSize(int)
@@ -1550,8 +1550,8 @@ public void setReceiveBufferSize(int size) throws SocketException {
      * for input on this {@code Socket}.
      *
      * @return the value of the {@code SO_RCVBUF} option for this {@code Socket}.
-     * @throws    SocketException if there is an error
-     * in the underlying protocol, such as a TCP error.
+     * @throws SocketException if there is an error in the underlying protocol,
+     *         such as a TCP error, or the socket is closed.
      * @see #setReceiveBufferSize(int)
      * @since 1.2
      */
@@ -1570,8 +1570,8 @@ public int getReceiveBufferSize() throws SocketException {
      * Enable/disable {@link StandardSocketOptions#SO_KEEPALIVE SO_KEEPALIVE}.
      *
      * @param on  whether or not to have socket keep alive turned on.
-     * @throws    SocketException if there is an error
-     * in the underlying protocol, such as a TCP error.
+     * @throws SocketException if there is an error in the underlying protocol,
+     *         such as a TCP error, or the socket is closed.
      * @since 1.3
      * @see #getKeepAlive()
      */
@@ -1586,8 +1586,8 @@ public void setKeepAlive(boolean on) throws SocketException {
      *
      * @return a {@code boolean} indicating whether or not
      *         {@code SO_KEEPALIVE} is enabled.
-     * @throws    SocketException if there is an error
-     * in the underlying protocol, such as a TCP error.
+     * @throws SocketException if there is an error in the underlying protocol,
+     *         such as a TCP error, or the socket is closed.
      * @since   1.3
      * @see #setKeepAlive(boolean)
      */
@@ -1637,8 +1637,8 @@ public boolean getKeepAlive() throws SocketException {
      * would be placed into the sin6_flowinfo field of the IP header.
      *
      * @param tc        an {@code int} value for the bitset.
-     * @throws SocketException if there is an error setting the
-     * traffic class or type-of-service
+     * @throws SocketException if there is an error setting the traffic class or type-of-service,
+     *         or the socket is closed.
      * @since 1.4
      * @see #getTrafficClass
      * @see StandardSocketOptions#IP_TOS
@@ -1661,8 +1661,8 @@ public void setTrafficClass(int tc) throws SocketException {
      * set using the {@link #setTrafficClass(int)} method on this Socket.
      *
      * @return the traffic class or type-of-service already set
-     * @throws SocketException if there is an error obtaining the
-     * traffic class or type-of-service value.
+     * @throws SocketException if there is an error obtaining the traffic class
+     *         or type-of-service value, or the socket is closed.
      * @since 1.4
      * @see #setTrafficClass(int)
      * @see StandardSocketOptions#IP_TOS
@@ -1715,8 +1715,8 @@ public void setReuseAddress(boolean on) throws SocketException {
      *
      * @return a {@code boolean} indicating whether or not
      *         {@code SO_REUSEADDR} is enabled.
-     * @throws    SocketException if there is an error
-     * in the underlying protocol, such as a TCP error.
+     * @throws SocketException if there is an error in the underlying protocol,
+     *         such as a TCP error, or the socket is closed.
      * @since   1.4
      * @see #setReuseAddress(boolean)
      */
@@ -1733,8 +1733,9 @@ public boolean getReuseAddress() throws SocketException {
      * will throw a {@link SocketException}.
      * <p>
      * Once a socket has been closed, it is not available for further networking
-     * use (i.e. can't be reconnected or rebound). A new socket needs to be
-     * created.
+     * use (i.e. can't be reconnected or rebound) and several of the methods defined
+     * by this class will throw an exception if invoked on the closed socket. A new
+     * socket needs to be created.
      *
      * <p> Closing this socket will also close the socket's
      * {@link java.io.InputStream InputStream} and
@@ -1767,8 +1768,8 @@ public void close() throws IOException {
      * socket, the stream's {@code available} method will return 0, and its
      * {@code read} methods will return {@code -1} (end of stream).
      *
-     * @throws    IOException if an I/O error occurs when shutting down this
-     * socket.
+     * @throws IOException if an I/O error occurs when shutting down this socket, the
+     *         socket is not connected or the socket is closed.
      *
      * @since 1.3
      * @see java.net.Socket#shutdownOutput()
@@ -1797,8 +1798,8 @@ public void shutdownInput() throws IOException {
      * shutdownOutput() on the socket, the stream will throw
      * an IOException.
      *
-     * @throws    IOException if an I/O error occurs when shutting down this
-     * socket.
+     * @throws IOException if an I/O error occurs when shutting down this socket, the socket
+     *         is not connected or the socket is closed.
      *
      * @since 1.3
      * @see java.net.Socket#shutdownInput()
diff --git a/test/jdk/java/net/ServerSocket/ClosedServerSocketTest.java b/test/jdk/java/net/ServerSocket/ClosedServerSocketTest.java
new file mode 100644
index 0000000000000..81d5cc9c0d08a
--- /dev/null
+++ b/test/jdk/java/net/ServerSocket/ClosedServerSocketTest.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.SocketException;
+import java.net.StandardSocketOptions;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/*
+ * @test
+ * @summary verifies that the APIs on java.net.ServerSocket throw expected exceptions
+ *          when invoked on a closed ServerSocket
+ * @run junit ClosedServerSocketTest
+ */
+public class ClosedServerSocketTest {
+
+    private static final InetAddress loopback = InetAddress.getLoopbackAddress();
+    private static final InetSocketAddress loopbackEphemeral = new InetSocketAddress(loopback, 0);
+
+    /**
+     * Verifies that various operations that specify to throw an IOException on a
+     * closed ServerSocket, do indeed throw it.
+     */
+    @Test
+    public void testIOExceptionThrown() throws Exception {
+        try (final ServerSocket ss = new ServerSocket()) {
+            // close and then invoke the operations on the ServerSocket
+            ss.close();
+            assertTrue(ss.isClosed(), "ServerSocket isn't closed");
+            assertThrows(IOException.class,
+                    ss::accept,
+                    "accept() when already closed didn't throw IOException");
+            assertThrows(IOException.class,
+                    () -> ss.bind(loopbackEphemeral),
+                    "bind() when already closed didn't throw IOException");
+            assertThrows(IOException.class,
+                    () -> ss.bind(loopbackEphemeral, 10),
+                    "bind(SocketAddress, int) when already closed didn't throw IOException");
+            assertThrows(IOException.class,
+                    () -> ss.getOption(StandardSocketOptions.SO_RCVBUF),
+                    "getOption() when already closed didn't throw IOException");
+            assertThrows(IOException.class,
+                    ss::getSoTimeout,
+                    "getSoTimeout() when already closed didn't throw IOException");
+            assertThrows(IOException.class,
+                    () -> ss.setOption(StandardSocketOptions.SO_RCVBUF, 1024),
+                    "setOption() when already closed didn't throw IOException");
+        }
+    }
+
+    /**
+     * Verifies that various operations that specify to throw a SocketOperation on a
+     * closed ServerSocket, do indeed throw it.
+     */
+    @Test
+    public void testSocketExceptionThrown() throws Exception {
+        try (final ServerSocket ss = new ServerSocket()) {
+            // close and then invoke the operations on the ServerSocket
+            ss.close();
+            assertTrue(ss.isClosed(), "ServerSocket isn't closed");
+            assertThrowsExactly(SocketException.class,
+                    ss::getReceiveBufferSize,
+                    "getReceiveBufferSize() when already closed didn't throw SocketException");
+            assertThrowsExactly(SocketException.class,
+                    ss::getReuseAddress,
+                    "getReuseAddress() when already closed didn't throw SocketException");
+            assertThrowsExactly(SocketException.class,
+                    () -> ss.setReceiveBufferSize(1024),
+                    "setReceiveBufferSize() when already closed didn't throw SocketException");
+            assertThrowsExactly(SocketException.class,
+                    () -> ss.setReuseAddress(false),
+                    "setReuseAddress() when already closed didn't throw SocketException");
+            assertThrowsExactly(SocketException.class,
+                    () -> ss.setSoTimeout(1000),
+                    "setSoTimeout() when already closed didn't throw SocketException");
+        }
+    }
+
+    /**
+     * Verifies that various operations that aren't expected to throw an exception on a
+     * closed ServerSocket, complete normally.
+     */
+    @Test
+    public void testNoExceptionThrown() throws Exception {
+        try (final ServerSocket ss = new ServerSocket()) {
+            // close and then invoke the operations on the ServerSocket
+            ss.close();
+            assertTrue(ss.isClosed(), "ServerSocket isn't closed");
+            ss.getInetAddress();
+            ss.getLocalPort();
+            ss.getLocalSocketAddress();
+            ss.isBound();
+            ss.supportedOptions();
+        }
+    }
+}
diff --git a/test/jdk/java/net/Socket/ClosedSocketTest.java b/test/jdk/java/net/Socket/ClosedSocketTest.java
new file mode 100644
index 0000000000000..794f3b9cb185f
--- /dev/null
+++ b/test/jdk/java/net/Socket/ClosedSocketTest.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.SocketException;
+import java.net.StandardSocketOptions;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/*
+ * @test
+ * @summary verifies that the APIs on java.net.Socket throw expected exceptions
+ *          when invoked on a closed socket
+ * @run junit ClosedSocketTest
+ */
+public class ClosedSocketTest {
+
+    private static final InetAddress loopback = InetAddress.getLoopbackAddress();
+    private static final InetSocketAddress loopbackEphemeral = new InetSocketAddress(loopback, 0);
+
+    /**
+     * Verifies that various operations that specify to throw an IOException on a closed socket,
+     * do indeed throw it.
+     */
+    @Test
+    public void testIOExceptionThrown() throws Exception {
+        try (final Socket s = new Socket()) {
+            // close and then invoke the operation on the socket
+            s.close();
+            assertTrue(s.isClosed(), "socket isn't closed");
+            assertThrows(IOException.class, () -> s.bind(loopbackEphemeral),
+                    "bind() when already closed didn't throw IOException");
+            // connect() will never get to the stage of attempting
+            // a connection against this port
+            final int dummyPort = 12345;
+            assertThrows(IOException.class,
+                    () -> s.connect(new InetSocketAddress(loopback, dummyPort)),
+                    "connect() when already closed didn't throw IOException");
+            assertThrows(IOException.class,
+                    () -> s.connect(new InetSocketAddress(loopback, dummyPort), 10),
+                    "connect(SocketAddress, int) when already closed didn't throw IOException");
+            assertThrows(IOException.class,
+                    () -> s.getOption(StandardSocketOptions.SO_RCVBUF),
+                    "getOption() when already closed didn't throw IOException");
+            assertThrows(IOException.class,
+                    s::getOutputStream,
+                    "getOutputStream() when already closed didn't throw IOException");
+            assertThrows(IOException.class,
+                    s::shutdownInput,
+                    "shutdownInput() when already closed didn't throw IOException");
+            assertThrows(IOException.class,
+                    s::shutdownOutput,
+                    "shutdownOutput() when already closed didn't throw IOException");
+        }
+    }
+
+    /**
+     * Verifies that various operations that specify to throw a SocketOperation on a closed socket,
+     * do indeed throw it.
+     */
+    @Test
+    public void testSocketExceptionThrown() throws Exception {
+        try (final Socket s = new Socket()) {
+            // close and then invoke the operations on the socket
+            s.close();
+            assertTrue(s.isClosed(), "socket isn't closed");
+            assertThrowsExactly(SocketException.class,
+                    s::getKeepAlive,
+                    "getKeepAlive() when already closed didn't throw SocketException");
+            assertThrowsExactly(SocketException.class,
+                    s::getOOBInline,
+                    "getOOBInline() when already closed didn't throw SocketException");
+            assertThrowsExactly(SocketException.class,
+                    s::getReceiveBufferSize,
+                    "getReceiveBufferSize() when already closed didn't throw SocketException");
+            assertThrowsExactly(SocketException.class,
+                    s::getReuseAddress,
+                    "getReuseAddress() when already closed didn't throw SocketException");
+            assertThrowsExactly(SocketException.class,
+                    s::getSendBufferSize,
+                    "getSendBufferSize() when already closed didn't throw SocketException");
+            assertThrowsExactly(SocketException.class,
+                    s::getSoLinger,
+                    "getSoLinger() when already closed didn't throw SocketException");
+            assertThrowsExactly(SocketException.class,
+                    s::getSoTimeout,
+                    "getSoTimeout() when already closed didn't throw SocketException");
+            assertThrowsExactly(SocketException.class,
+                    s::getTcpNoDelay,
+                    "getTcpNoDelay() when already closed didn't throw SocketException");
+            assertThrowsExactly(SocketException.class,
+                    s::getTrafficClass,
+                    "getTrafficClass() when already closed didn't throw SocketException");
+            assertThrowsExactly(SocketException.class,
+                    () -> s.setKeepAlive(false),
+                    "setKeepAlive() when already closed didn't throw SocketException");
+            assertThrowsExactly(SocketException.class,
+                    () -> s.setOOBInline(false),
+                    "setOOBInline() when already closed didn't throw SocketException");
+            assertThrowsExactly(SocketException.class,
+                    () -> s.setOption(StandardSocketOptions.SO_RCVBUF, 1024),
+                    "setOption() when already closed didn't throw SocketException");
+            assertThrowsExactly(SocketException.class,
+                    () -> s.setReceiveBufferSize(1024),
+                    "setReceiveBufferSize() when already closed didn't throw SocketException");
+            assertThrowsExactly(SocketException.class,
+                    () -> s.setReuseAddress(false),
+                    "setReuseAddress() when already closed didn't throw SocketException");
+            assertThrowsExactly(SocketException.class,
+                    () -> s.setSendBufferSize(1024),
+                    "setSendBufferSize() when already closed didn't throw SocketException");
+            assertThrowsExactly(SocketException.class,
+                    () -> s.setSoLinger(false, 0),
+                    "setSoLinger() when already closed didn't throw SocketException");
+            assertThrowsExactly(SocketException.class,
+                    () -> s.setSoTimeout(1000),
+                    "setSoTimeout() when already closed didn't throw SocketException");
+            assertThrowsExactly(SocketException.class,
+                    () -> s.setTcpNoDelay(false),
+                    "setTcpNoDelay() when already closed didn't throw SocketException");
+            assertThrowsExactly(SocketException.class,
+                    () -> s.setTrafficClass(123),
+                    "setTrafficClass() when already closed didn't throw SocketException");
+        }
+    }
+
+    /**
+     * Verifies that various operations that aren't expected to throw an exception on a
+     * closed socket, complete normally.
+     */
+    @Test
+    public void testNoExceptionThrown() throws Exception {
+        try (final Socket s = new Socket()) {
+            // close and then invoke various operation on the socket and don't expect an exception
+            s.close();
+            assertTrue(s.isClosed(), "socket isn't closed");
+            s.getInetAddress();
+            s.getLocalAddress();
+            s.getLocalPort();
+            s.getLocalSocketAddress();
+            s.getPort();
+            s.getRemoteSocketAddress();
+            s.isBound();
+            s.isConnected();
+            s.isInputShutdown();
+            s.isOutputShutdown();
+            s.supportedOptions();
+        }
+    }
+}

From 4ea4d7c68444200ab38cbd76762c2f27848e264e Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Wed, 24 Jul 2024 16:48:34 +0000
Subject: [PATCH 197/401] 8336679: Add @implSpec for the default
 implementations in Process.waitFor()

Reviewed-by: bpb, jlu, liach
---
 .../share/classes/java/lang/Process.java      | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/Process.java b/src/java.base/share/classes/java/lang/Process.java
index a01a1f93fd22a..af6753a236bb2 100644
--- a/src/java.base/share/classes/java/lang/Process.java
+++ b/src/java.base/share/classes/java/lang/Process.java
@@ -442,10 +442,13 @@ public final BufferedWriter outputWriter(Charset charset) {
      * terminated and the timeout value is less than, or equal to, zero, then
      * this method returns immediately with the value {@code false}.
      *
-     * <p>The default implementation of this method polls the {@code exitValue}
-     * to check if the process has terminated. Concrete implementations of this
-     * class are strongly encouraged to override this method with a more
-     * efficient implementation.
+     * @implSpec
+     * The default implementation of this method polls the {@code exitValue}
+     * to check if the process has terminated.
+     *
+     * @implNote
+     * Concrete implementations of this class are strongly encouraged to
+     * override this method with a more efficient implementation.
      *
      * @param timeout the maximum time to wait
      * @param unit the time unit of the {@code timeout} argument
@@ -486,10 +489,13 @@ public boolean waitFor(long timeout, TimeUnit unit)
      * terminated and the duration is not positive, then
      * this method returns immediately with the value {@code false}.
      *
-     * <p>The default implementation of this method polls the {@code exitValue}
-     * to check if the process has terminated. Concrete implementations of this
-     * class are strongly encouraged to override this method with a more
-     * efficient implementation.
+     * @implSpec
+     * The default implementation of this method polls the {@code exitValue}
+     * to check if the process has terminated.
+     *
+     * @implNote
+     * Concrete implementations of this class are strongly encouraged to
+     * override this method with a more efficient implementation.
      *
      * @param duration the maximum duration to wait; if not positive,
      *                this method returns immediately.

From 9e8e359513cf15faf549b12ced947d3a78e544aa Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Wed, 24 Jul 2024 20:08:13 +0000
Subject: [PATCH 198/401] 8336787: Examine java.text.Format API for implSpec
 usage

Reviewed-by: liach
---
 src/java.base/share/classes/java/text/Format.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/java.base/share/classes/java/text/Format.java b/src/java.base/share/classes/java/text/Format.java
index 6aa6b866bae98..9926bbfbb1507 100644
--- a/src/java.base/share/classes/java/text/Format.java
+++ b/src/java.base/share/classes/java/text/Format.java
@@ -149,12 +149,12 @@ protected Format() {
 
     /**
      * Formats an object to produce a string.
-     * This method returns a string that would be equal to the string returned by
+     *
+     * @implSpec This method returns a string that would be equal to the string returned by
      * <blockquote>
      * {@link #format(Object, StringBuffer, FieldPosition) format}<code>(obj,
      *         new StringBuffer(), new FieldPosition(0)).toString();</code>
      * </blockquote>
-     *
      * @param obj    The object to format
      * @return       Formatted string.
      * @throws    IllegalArgumentException if the Format cannot format the given
@@ -207,11 +207,11 @@ StringBuf format(Object obj,
      * to define what the legal values are for each attribute in the
      * {@code AttributedCharacterIterator}, but typically the attribute
      * key is also used as the attribute value.
-     * <p>The default implementation creates an
-     * {@code AttributedCharacterIterator} with no attributes. Subclasses
-     * that support fields should override this and create an
-     * {@code AttributedCharacterIterator} with meaningful attributes.
      *
+     * @apiNote Subclasses that support fields should override this and create an
+     * {@code AttributedCharacterIterator} with meaningful attributes.
+     * @implSpec The default implementation creates an
+     * {@code AttributedCharacterIterator} with no attributes.
      * @throws    NullPointerException if obj is null.
      * @throws    IllegalArgumentException when the Format cannot format the
      *            given object.

From 5a8861a3a1b436ce7414176c095c58c9a1e038d6 Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Wed, 24 Jul 2024 20:14:00 +0000
Subject: [PATCH 199/401] 8336847: Use pattern match switch in NumberFormat
 classes

Reviewed-by: liach, naoto
---
 .../java/text/CompactNumberFormat.java        | 104 +++++++---------
 .../classes/java/text/DecimalFormat.java      | 113 ++++++++----------
 .../share/classes/java/text/NumberFormat.java |  44 +++----
 3 files changed, 118 insertions(+), 143 deletions(-)

diff --git a/src/java.base/share/classes/java/text/CompactNumberFormat.java b/src/java.base/share/classes/java/text/CompactNumberFormat.java
index e3fc7632535dd..0cb5eb88079e4 100644
--- a/src/java.base/share/classes/java/text/CompactNumberFormat.java
+++ b/src/java.base/share/classes/java/text/CompactNumberFormat.java
@@ -539,58 +539,42 @@ public CompactNumberFormat(String decimalPattern,
     public final StringBuffer format(Object number,
             StringBuffer toAppendTo,
             FieldPosition fieldPosition) {
-
-        if (number == null) {
-            throw new IllegalArgumentException("Cannot format null as a number");
-        }
-
-        if (number instanceof Long || number instanceof Integer
-                || number instanceof Short || number instanceof Byte
-                || number instanceof AtomicInteger
-                || number instanceof AtomicLong
-                || (number instanceof BigInteger
-                && ((BigInteger) number).bitLength() < 64)) {
-            return format(((Number) number).longValue(), toAppendTo,
-                    fieldPosition);
-        } else if (number instanceof BigDecimal) {
-            return format((BigDecimal) number, StringBufFactory.of(toAppendTo), fieldPosition).asStringBuffer();
-        } else if (number instanceof BigInteger) {
-            return format((BigInteger) number, StringBufFactory.of(toAppendTo), fieldPosition).asStringBuffer();
-        } else if (number instanceof Number) {
-            return format(((Number) number).doubleValue(), toAppendTo, fieldPosition);
-        } else {
-            throw new IllegalArgumentException("Cannot format "
-                    + number.getClass().getName() + " as a number");
-        }
+        return switch (number) {
+            case Long l -> format(l.longValue(), toAppendTo, fieldPosition);
+            case Integer i -> format(i.longValue(), toAppendTo, fieldPosition);
+            case Short s -> format(s.longValue(), toAppendTo, fieldPosition);
+            case Byte b -> format(b.longValue(), toAppendTo, fieldPosition);
+            case AtomicInteger ai -> format(ai.longValue(), toAppendTo, fieldPosition);
+            case AtomicLong al -> format(al.longValue(), toAppendTo, fieldPosition);
+            case BigInteger bi when bi.bitLength() < 64 -> format(bi.longValue(), toAppendTo, fieldPosition);
+            case BigDecimal bd -> format(bd, StringBufFactory.of(toAppendTo), fieldPosition).asStringBuffer();
+            case BigInteger bi -> format(bi, StringBufFactory.of(toAppendTo), fieldPosition).asStringBuffer();
+            case Number n -> format(n.doubleValue(), toAppendTo, fieldPosition);
+            case null -> throw new IllegalArgumentException("Cannot format null as a number");
+            default -> throw new IllegalArgumentException(
+                    String.format("Cannot format %s as a number", number.getClass().getName()));
+        };
     }
 
     @Override
     StringBuf format(Object number,
                      StringBuf toAppendTo,
                      FieldPosition fieldPosition) {
-
-        if (number == null) {
-            throw new IllegalArgumentException("Cannot format null as a number");
-        }
-
-        if (number instanceof Long || number instanceof Integer
-                    || number instanceof Short || number instanceof Byte
-                    || number instanceof AtomicInteger
-                    || number instanceof AtomicLong
-                    || (number instanceof BigInteger
-                                && ((BigInteger) number).bitLength() < 64)) {
-            return format(((Number) number).longValue(), toAppendTo,
-                    fieldPosition);
-        } else if (number instanceof BigDecimal) {
-            return format((BigDecimal) number, toAppendTo, fieldPosition);
-        } else if (number instanceof BigInteger) {
-            return format((BigInteger) number, toAppendTo, fieldPosition);
-        } else if (number instanceof Number) {
-            return format(((Number) number).doubleValue(), toAppendTo, fieldPosition);
-        } else {
-            throw new IllegalArgumentException("Cannot format "
-                                                       + number.getClass().getName() + " as a number");
-        }
+        return switch (number) {
+            case Long l -> format(l.longValue(), toAppendTo, fieldPosition);
+            case Integer i -> format(i.longValue(), toAppendTo, fieldPosition);
+            case Short s -> format(s.longValue(), toAppendTo, fieldPosition);
+            case Byte b -> format(b.longValue(), toAppendTo, fieldPosition);
+            case AtomicInteger ai -> format(ai.longValue(), toAppendTo, fieldPosition);
+            case AtomicLong al -> format(al.longValue(), toAppendTo, fieldPosition);
+            case BigInteger bi when bi.bitLength() < 64 -> format(bi.longValue(), toAppendTo, fieldPosition);
+            case BigDecimal bd -> format(bd, toAppendTo, fieldPosition);
+            case BigInteger bi -> format(bi, toAppendTo, fieldPosition);
+            case Number n -> format(n.doubleValue(), toAppendTo, fieldPosition);
+            case null -> throw new IllegalArgumentException("Cannot format null as a number");
+            default -> throw new IllegalArgumentException(
+                    String.format("Cannot format %s as a number", number.getClass().getName()));
+        };
     }
 
     /**
@@ -1182,22 +1166,20 @@ public AttributedCharacterIterator formatToCharacterIterator(Object obj) {
         CharacterIteratorFieldDelegate delegate
                 = new CharacterIteratorFieldDelegate();
         StringBuf sb = StringBufFactory.of();
-
-        if (obj instanceof Double || obj instanceof Float) {
-            format(((Number) obj).doubleValue(), sb, delegate);
-        } else if (obj instanceof Long || obj instanceof Integer
-                || obj instanceof Short || obj instanceof Byte
-                || obj instanceof AtomicInteger || obj instanceof AtomicLong) {
-            format(((Number) obj).longValue(), sb, delegate);
-        } else if (obj instanceof BigDecimal) {
-            format((BigDecimal) obj, sb, delegate);
-        } else if (obj instanceof BigInteger) {
-            format((BigInteger) obj, sb, delegate, false);
-        } else if (obj == null) {
-            throw new NullPointerException(
+        switch (obj) {
+            case Double d -> format(d.doubleValue(), sb, delegate);
+            case Float f -> format(f.doubleValue(), sb, delegate);
+            case Long l -> format(l.longValue(), sb, delegate);
+            case Integer i -> format(i.longValue(), sb, delegate);
+            case Short s -> format(s.longValue(), sb, delegate);
+            case Byte b -> format(b.longValue(), sb, delegate);
+            case AtomicInteger ai -> format(ai.longValue(), sb, delegate);
+            case AtomicLong al -> format(al.longValue(), sb, delegate);
+            case BigDecimal bd -> format(bd, sb, delegate);
+            case BigInteger bi -> format(bi, sb, delegate, false);
+            case null -> throw new NullPointerException(
                     "formatToCharacterIterator must be passed non-null object");
-        } else {
-            throw new IllegalArgumentException(
+            default -> throw new IllegalArgumentException(
                     "Cannot format given Object as a Number");
         }
         return delegate.getIterator(sb.toString());
diff --git a/src/java.base/share/classes/java/text/DecimalFormat.java b/src/java.base/share/classes/java/text/DecimalFormat.java
index cc8e9e8662cf8..07a1c6932e7e3 100644
--- a/src/java.base/share/classes/java/text/DecimalFormat.java
+++ b/src/java.base/share/classes/java/text/DecimalFormat.java
@@ -548,44 +548,38 @@ public DecimalFormat (String pattern, DecimalFormatSymbols symbols) {
     public final StringBuffer format(Object number,
                                      StringBuffer toAppendTo,
                                      FieldPosition pos) {
-        if (number instanceof Long || number instanceof Integer ||
-                   number instanceof Short || number instanceof Byte ||
-                   number instanceof AtomicInteger ||
-                   number instanceof AtomicLong ||
-                   (number instanceof BigInteger &&
-                    ((BigInteger)number).bitLength () < 64)) {
-            return format(((Number)number).longValue(), toAppendTo, pos);
-        } else if (number instanceof BigDecimal) {
-            return format((BigDecimal)number, StringBufFactory.of(toAppendTo), pos).asStringBuffer();
-        } else if (number instanceof BigInteger) {
-            return format((BigInteger)number, StringBufFactory.of(toAppendTo), pos).asStringBuffer();
-        } else if (number instanceof Number) {
-            return format(((Number)number).doubleValue(), toAppendTo, pos);
-        } else {
-            throw new IllegalArgumentException("Cannot format given Object as a Number");
-        }
+        return switch (number) {
+            case Long l -> format(l.longValue(), toAppendTo, pos);
+            case Integer i -> format(i.longValue(), toAppendTo, pos);
+            case Short s -> format(s.longValue(), toAppendTo, pos);
+            case Byte b -> format(b.longValue(), toAppendTo, pos);
+            case AtomicInteger ai -> format(ai.longValue(), toAppendTo, pos);
+            case AtomicLong al -> format(al.longValue(), toAppendTo, pos);
+            case BigInteger bi when bi.bitLength() < 64 -> format(bi.longValue(), toAppendTo, pos);
+            case BigDecimal bd -> format(bd, StringBufFactory.of(toAppendTo), pos).asStringBuffer();
+            case BigInteger bi -> format(bi, StringBufFactory.of(toAppendTo), pos).asStringBuffer();
+            case Number n -> format(n.doubleValue(), toAppendTo, pos);
+            case null, default -> throw new IllegalArgumentException("Cannot format given Object as a Number");
+        };
     }
 
     @Override
     final StringBuf format(Object number,
                            StringBuf toAppendTo,
                            FieldPosition pos) {
-        if (number instanceof Long || number instanceof Integer ||
-                    number instanceof Short || number instanceof Byte ||
-                    number instanceof AtomicInteger ||
-                    number instanceof AtomicLong ||
-                    (number instanceof BigInteger &&
-                             ((BigInteger) number).bitLength() < 64)) {
-            return format(((Number) number).longValue(), toAppendTo, pos);
-        } else if (number instanceof BigDecimal) {
-            return format((BigDecimal) number, toAppendTo, pos);
-        } else if (number instanceof BigInteger) {
-            return format((BigInteger) number, toAppendTo, pos);
-        } else if (number instanceof Number) {
-            return format(((Number) number).doubleValue(), toAppendTo, pos);
-        } else {
-            throw new IllegalArgumentException("Cannot format given Object as a Number");
-        }
+        return switch (number) {
+            case Long l -> format(l.longValue(), toAppendTo, pos);
+            case Integer i -> format(i.longValue(), toAppendTo, pos);
+            case Short s -> format(s.longValue(), toAppendTo, pos);
+            case Byte b -> format(b.longValue(), toAppendTo, pos);
+            case AtomicInteger ai -> format(ai.longValue(), toAppendTo, pos);
+            case AtomicLong al -> format(al.longValue(), toAppendTo, pos);
+            case BigInteger bi when bi.bitLength() < 64 -> format(bi.longValue(), toAppendTo, pos);
+            case BigDecimal bd -> format(bd, toAppendTo, pos);
+            case BigInteger bi -> format(bi, toAppendTo, pos);
+            case Number n -> format(n.doubleValue(), toAppendTo, pos);
+            case null, default -> throw new IllegalArgumentException("Cannot format given Object as a Number");
+        };
     }
 
     /**
@@ -1021,25 +1015,23 @@ StringBuf format(BigInteger number, StringBuf result,
     @Override
     public AttributedCharacterIterator formatToCharacterIterator(Object obj) {
         CharacterIteratorFieldDelegate delegate =
-                         new CharacterIteratorFieldDelegate();
+                new CharacterIteratorFieldDelegate();
         StringBuf sb = StringBufFactory.of();
-
-        if (obj instanceof Double || obj instanceof Float) {
-            format(((Number)obj).doubleValue(), sb, delegate);
-        } else if (obj instanceof Long || obj instanceof Integer ||
-                   obj instanceof Short || obj instanceof Byte ||
-                   obj instanceof AtomicInteger || obj instanceof AtomicLong) {
-            format(((Number)obj).longValue(), sb, delegate);
-        } else if (obj instanceof BigDecimal) {
-            format((BigDecimal)obj, sb, delegate);
-        } else if (obj instanceof BigInteger) {
-            format((BigInteger)obj, sb, delegate, false);
-        } else if (obj == null) {
-            throw new NullPointerException(
-                "formatToCharacterIterator must be passed non-null object");
-        } else {
-            throw new IllegalArgumentException(
-                "Cannot format given Object as a Number");
+        switch (obj) {
+            case Double d -> format(d.doubleValue(), sb, delegate);
+            case Float f -> format(f.doubleValue(), sb, delegate);
+            case Long l -> format(l.longValue(), sb, delegate);
+            case Integer i -> format(i.longValue(), sb, delegate);
+            case Short s -> format(s.longValue(), sb, delegate);
+            case Byte b -> format(b.longValue(), sb, delegate);
+            case AtomicInteger ai -> format(ai.longValue(), sb, delegate);
+            case AtomicLong al -> format(al.longValue(), sb, delegate);
+            case BigDecimal bd -> format(bd, sb, delegate);
+            case BigInteger bi -> format(bi, sb, delegate, false);
+            case null -> throw new NullPointerException(
+                    "formatToCharacterIterator must be passed non-null object");
+            default -> throw new IllegalArgumentException(
+                    "Cannot format given Object as a Number");
         }
         return delegate.getIterator(sb.toString());
     }
@@ -1790,22 +1782,23 @@ String fastFormat(double d) {
     }
 
     /**
-     * Sets the {@code DigitList} used by this {@code DecimalFormat}
+     * Utility method that sets the {@code DigitList} used by this {@code DecimalFormat}
      * instance.
+     *
      * @param number the number to format
      * @param isNegative true, if the number is negative; false otherwise
      * @param maxDigits the max digits
+     * @throws AssertionError if provided a Number subclass that is not supported
+     *         by {@code DigitList}
      */
     void setDigitList(Number number, boolean isNegative, int maxDigits) {
-
-        if (number instanceof Double) {
-            digitList.set(isNegative, (Double) number, maxDigits, true);
-        } else if (number instanceof BigDecimal) {
-            digitList.set(isNegative, (BigDecimal) number, maxDigits, true);
-        } else if (number instanceof Long) {
-            digitList.set(isNegative, (Long) number, maxDigits);
-        } else if (number instanceof BigInteger) {
-            digitList.set(isNegative, (BigInteger) number, maxDigits);
+        switch (number) {
+            case Double d -> digitList.set(isNegative, d, maxDigits, true);
+            case BigDecimal bd -> digitList.set(isNegative, bd, maxDigits, true);
+            case Long l -> digitList.set(isNegative, l, maxDigits);
+            case BigInteger bi -> digitList.set(isNegative, bi, maxDigits);
+            default -> throw new AssertionError(
+                    String.format("DigitList does not support %s", number.getClass().getName()));
         }
     }
 
diff --git a/src/java.base/share/classes/java/text/NumberFormat.java b/src/java.base/share/classes/java/text/NumberFormat.java
index b905f3bd8afea..e397d4ba15d9d 100644
--- a/src/java.base/share/classes/java/text/NumberFormat.java
+++ b/src/java.base/share/classes/java/text/NumberFormat.java
@@ -302,34 +302,34 @@ protected NumberFormat() {
     public StringBuffer format(Object number,
                                StringBuffer toAppendTo,
                                FieldPosition pos) {
-        if (number instanceof Long || number instanceof Integer ||
-            number instanceof Short || number instanceof Byte ||
-            number instanceof AtomicInteger || number instanceof AtomicLong ||
-            (number instanceof BigInteger &&
-             ((BigInteger)number).bitLength() < 64)) {
-            return format(((Number)number).longValue(), toAppendTo, pos);
-        } else if (number instanceof Number) {
-            return format(((Number)number).doubleValue(), toAppendTo, pos);
-        } else {
-            throw new IllegalArgumentException("Cannot format given Object as a Number");
-        }
+        return switch (number) {
+            case Long l -> format(l.longValue(), toAppendTo, pos);
+            case Integer i -> format(i.longValue(), toAppendTo, pos);
+            case Short s -> format(s.longValue(), toAppendTo, pos);
+            case Byte b -> format(b.longValue(), toAppendTo, pos);
+            case AtomicInteger ai -> format(ai.longValue(), toAppendTo, pos);
+            case AtomicLong al -> format(al.longValue(), toAppendTo, pos);
+            case BigInteger bi when bi.bitLength() < 64 -> format(bi.longValue(), toAppendTo, pos);
+            case Number n -> format(n.doubleValue(), toAppendTo, pos);
+            case null, default -> throw new IllegalArgumentException("Cannot format given Object as a Number");
+        };
     }
 
     @Override
     StringBuf format(Object number,
                      StringBuf toAppendTo,
                      FieldPosition pos) {
-        if (number instanceof Long || number instanceof Integer ||
-                    number instanceof Short || number instanceof Byte ||
-                    number instanceof AtomicInteger || number instanceof AtomicLong ||
-                    (number instanceof BigInteger &&
-                             ((BigInteger) number).bitLength() < 64)) {
-            return format(((Number) number).longValue(), toAppendTo, pos);
-        } else if (number instanceof Number) {
-            return format(((Number) number).doubleValue(), toAppendTo, pos);
-        } else {
-            throw new IllegalArgumentException("Cannot format given Object as a Number");
-        }
+        return switch (number) {
+            case Long l -> format(l.longValue(), toAppendTo, pos);
+            case Integer i -> format(i.longValue(), toAppendTo, pos);
+            case Short s -> format(s.longValue(), toAppendTo, pos);
+            case Byte b -> format(b.longValue(), toAppendTo, pos);
+            case AtomicInteger ai -> format(ai.longValue(), toAppendTo, pos);
+            case AtomicLong al -> format(al.longValue(), toAppendTo, pos);
+            case BigInteger bi when bi.bitLength() < 64 -> format(bi.longValue(), toAppendTo, pos);
+            case Number n -> format(n.doubleValue(), toAppendTo, pos);
+            case null, default -> throw new IllegalArgumentException("Cannot format given Object as a Number");
+        };
     }
 
     /**

From e716f5ed53c20f4235787e2d6927a16ebcf67b8f Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Wed, 24 Jul 2024 20:26:11 +0000
Subject: [PATCH 200/401] 8336755: Remove unused UNALIGNED field from view
 buffers

Reviewed-by: alanb, liach, bpb
---
 .../classes/java/nio/Direct-X-Buffer.java.template     | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template b/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template
index e8551bd78c6f7..6c0da82933160 100644
--- a/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template
+++ b/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template
@@ -56,14 +56,6 @@ class Direct$Type$Buffer$RW$$BO$
 {
 
 #if[rw]
-
-    // Cached unaligned-access capability
-    protected static final boolean UNALIGNED = Bits.unaligned();
-
-    // Base address, used in all indexing calculations
-    // NOTE: moved up to Buffer.java for speed in JNI GetDirectBufferAddress
-    //    protected long address;
-
     // An object attached to this buffer. If this buffer is a view of another
     // buffer then we use this field to keep a reference to that buffer to
     // ensure that its memory isn't freed before we are done with it.
@@ -74,6 +66,8 @@ class Direct$Type$Buffer$RW$$BO$
     }
 
 #if[byte]
+    // Cached unaligned-access capability
+    static final boolean UNALIGNED = Bits.unaligned();
 
     private record Deallocator(long address, long size, int capacity) implements Runnable {
         private Deallocator {

From 021c2c36ac243009c71147072d405636cab0b12c Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Wed, 24 Jul 2024 21:15:18 +0000
Subject: [PATCH 201/401] 8337067: Test
 runtime/classFileParserBug/Bad_NCDFE_Msg.java won't compile

Reviewed-by: lfoltan
---
 .../jtreg/runtime/classFileParserBug/Bad_NCDFE_Msg.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/runtime/classFileParserBug/Bad_NCDFE_Msg.java b/test/hotspot/jtreg/runtime/classFileParserBug/Bad_NCDFE_Msg.java
index 1baf5bdc8a8b2..a69a374619203 100644
--- a/test/hotspot/jtreg/runtime/classFileParserBug/Bad_NCDFE_Msg.java
+++ b/test/hotspot/jtreg/runtime/classFileParserBug/Bad_NCDFE_Msg.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
  *          java.management
  * @compile C.java
  * @run driver Bad_NCDFE_Msg
+ */
 
 import java.io.File;
 import jdk.test.lib.process.ProcessTools;

From 24f67d0254c08a668d24f28ec0fa768ef10feed5 Mon Sep 17 00:00:00 2001
From: Neethu Prasad <nprasad@openjdk.org>
Date: Wed, 24 Jul 2024 22:22:18 +0000
Subject: [PATCH 202/401] 8334232: Optimize C1 classes layout

Reviewed-by: phh, kvn
---
 src/hotspot/share/c1/c1_Instruction.hpp |  6 ++--
 src/hotspot/share/c1/c1_LIR.cpp         |  4 +--
 src/hotspot/share/c1/c1_LIR.hpp         | 42 ++++++++++++-------------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/hotspot/share/c1/c1_Instruction.hpp b/src/hotspot/share/c1/c1_Instruction.hpp
index 32ff3d9f61cab..e577e7fd90bad 100644
--- a/src/hotspot/share/c1/c1_Instruction.hpp
+++ b/src/hotspot/share/c1/c1_Instruction.hpp
@@ -281,11 +281,11 @@ class Instruction: public CompilationResourceObj {
 #endif
   int          _use_count;                       // the number of instructions referring to this value (w/o prev/next); only roots can have use count = 0 or > 1
   int          _pin_state;                       // set of PinReason describing the reason for pinning
+  unsigned int _flags;                           // Flag bits
   ValueType*   _type;                            // the instruction value type
   Instruction* _next;                            // the next instruction if any (null for BlockEnd instructions)
   Instruction* _subst;                           // the substitution instruction if any
   LIR_Opr      _operand;                         // LIR specific information
-  unsigned int _flags;                           // Flag bits
 
   ValueStack*  _state_before;                    // Copy of state with input operands still on stack (or null)
   ValueStack*  _exception_state;                 // Copy of state for exception handling
@@ -403,11 +403,11 @@ class Instruction: public CompilationResourceObj {
 #endif
     _use_count(0)
   , _pin_state(0)
+  , _flags(0)
   , _type(type)
   , _next(nullptr)
   , _subst(nullptr)
   , _operand(LIR_OprFact::illegalOpr)
-  , _flags(0)
   , _state_before(state_before)
   , _exception_handlers(nullptr)
   , _block(nullptr)
@@ -1518,9 +1518,9 @@ LEAF(MonitorExit, AccessMonitor)
 LEAF(Intrinsic, StateSplit)
  private:
   vmIntrinsics::ID _id;
+  ArgsNonNullState _nonnull_state;
   Values*          _args;
   Value            _recv;
-  ArgsNonNullState _nonnull_state;
 
  public:
   // preserves_state can be set to true for Intrinsics
diff --git a/src/hotspot/share/c1/c1_LIR.cpp b/src/hotspot/share/c1/c1_LIR.cpp
index 3f53011024b01..f03ed38284c97 100644
--- a/src/hotspot/share/c1/c1_LIR.cpp
+++ b/src/hotspot/share/c1/c1_LIR.cpp
@@ -296,13 +296,13 @@ LIR_OpTypeCheck::LIR_OpTypeCheck(LIR_Code code, LIR_Opr result, LIR_Opr object,
   , _tmp1(tmp1)
   , _tmp2(tmp2)
   , _tmp3(tmp3)
-  , _fast_check(fast_check)
   , _info_for_patch(info_for_patch)
   , _info_for_exception(info_for_exception)
   , _stub(stub)
   , _profiled_method(nullptr)
   , _profiled_bci(-1)
   , _should_profile(false)
+  , _fast_check(fast_check)
 {
   if (code == lir_checkcast) {
     assert(info_for_exception != nullptr, "checkcast throws exceptions");
@@ -323,13 +323,13 @@ LIR_OpTypeCheck::LIR_OpTypeCheck(LIR_Code code, LIR_Opr object, LIR_Opr array, L
   , _tmp1(tmp1)
   , _tmp2(tmp2)
   , _tmp3(tmp3)
-  , _fast_check(false)
   , _info_for_patch(nullptr)
   , _info_for_exception(info_for_exception)
   , _stub(nullptr)
   , _profiled_method(nullptr)
   , _profiled_bci(-1)
   , _should_profile(false)
+  , _fast_check(false)
 {
   if (code == lir_store_check) {
     _stub = new ArrayStoreExceptionStub(object, info_for_exception);
diff --git a/src/hotspot/share/c1/c1_LIR.hpp b/src/hotspot/share/c1/c1_LIR.hpp
index c69d29f8d619d..5d73ab5b88dba 100644
--- a/src/hotspot/share/c1/c1_LIR.hpp
+++ b/src/hotspot/share/c1/c1_LIR.hpp
@@ -528,44 +528,44 @@ class LIR_Address: public LIR_OprPtr {
  private:
   LIR_Opr   _base;
   LIR_Opr   _index;
-  Scale     _scale;
   intx      _disp;
+  Scale     _scale;
   BasicType _type;
 
  public:
   LIR_Address(LIR_Opr base, LIR_Opr index, BasicType type):
        _base(base)
      , _index(index)
-     , _scale(times_1)
      , _disp(0)
+     , _scale(times_1)
      , _type(type) { verify(); }
 
   LIR_Address(LIR_Opr base, intx disp, BasicType type):
        _base(base)
      , _index(LIR_Opr::illegalOpr())
-     , _scale(times_1)
      , _disp(disp)
+     , _scale(times_1)
      , _type(type) { verify(); }
 
   LIR_Address(LIR_Opr base, BasicType type):
        _base(base)
      , _index(LIR_Opr::illegalOpr())
-     , _scale(times_1)
      , _disp(0)
+     , _scale(times_1)
      , _type(type) { verify(); }
 
   LIR_Address(LIR_Opr base, LIR_Opr index, intx disp, BasicType type):
        _base(base)
      , _index(index)
-     , _scale(times_1)
      , _disp(disp)
+     , _scale(times_1)
      , _type(type) { verify(); }
 
   LIR_Address(LIR_Opr base, LIR_Opr index, Scale scale, intx disp, BasicType type):
        _base(base)
      , _index(index)
-     , _scale(scale)
      , _disp(disp)
+     , _scale(scale)
      , _type(type) { verify(); }
 
   LIR_Opr base()  const                          { return _base;  }
@@ -1544,13 +1544,13 @@ class LIR_OpTypeCheck: public LIR_Op {
   LIR_Opr       _tmp1;
   LIR_Opr       _tmp2;
   LIR_Opr       _tmp3;
-  bool          _fast_check;
   CodeEmitInfo* _info_for_patch;
   CodeEmitInfo* _info_for_exception;
   CodeStub*     _stub;
   ciMethod*     _profiled_method;
   int           _profiled_bci;
   bool          _should_profile;
+  bool          _fast_check;
 
 public:
   LIR_OpTypeCheck(LIR_Code code, LIR_Opr result, LIR_Opr object, ciKlass* klass,
@@ -1593,13 +1593,13 @@ class LIR_Op2: public LIR_Op {
  protected:
   LIR_Opr   _opr1;
   LIR_Opr   _opr2;
-  BasicType _type;
   LIR_Opr   _tmp1;
   LIR_Opr   _tmp2;
   LIR_Opr   _tmp3;
   LIR_Opr   _tmp4;
   LIR_Opr   _tmp5;
   LIR_Condition _condition;
+  BasicType _type;
 
   void verify() const;
 
@@ -1609,13 +1609,13 @@ class LIR_Op2: public LIR_Op {
     , _fpu_stack_size(0)
     , _opr1(opr1)
     , _opr2(opr2)
-    , _type(type)
     , _tmp1(LIR_OprFact::illegalOpr)
     , _tmp2(LIR_OprFact::illegalOpr)
     , _tmp3(LIR_OprFact::illegalOpr)
     , _tmp4(LIR_OprFact::illegalOpr)
     , _tmp5(LIR_OprFact::illegalOpr)
-    , _condition(condition) {
+    , _condition(condition)
+    , _type(type) {
     assert(code == lir_cmp || code == lir_branch || code == lir_cond_float_branch || code == lir_assert, "code check");
   }
 
@@ -1624,13 +1624,13 @@ class LIR_Op2: public LIR_Op {
     , _fpu_stack_size(0)
     , _opr1(opr1)
     , _opr2(opr2)
-    , _type(type)
     , _tmp1(LIR_OprFact::illegalOpr)
     , _tmp2(LIR_OprFact::illegalOpr)
     , _tmp3(LIR_OprFact::illegalOpr)
     , _tmp4(LIR_OprFact::illegalOpr)
     , _tmp5(LIR_OprFact::illegalOpr)
-    , _condition(condition) {
+    , _condition(condition)
+    , _type(type) {
     assert(code == lir_cmove, "code check");
     assert(type != T_ILLEGAL, "cmove should have type");
   }
@@ -1641,13 +1641,13 @@ class LIR_Op2: public LIR_Op {
     , _fpu_stack_size(0)
     , _opr1(opr1)
     , _opr2(opr2)
-    , _type(type)
     , _tmp1(LIR_OprFact::illegalOpr)
     , _tmp2(LIR_OprFact::illegalOpr)
     , _tmp3(LIR_OprFact::illegalOpr)
     , _tmp4(LIR_OprFact::illegalOpr)
     , _tmp5(LIR_OprFact::illegalOpr)
-    , _condition(lir_cond_unknown) {
+    , _condition(lir_cond_unknown)
+    , _type(type) {
     assert(code != lir_cmp && code != lir_branch && code != lir_cond_float_branch && is_in_range(code, begin_op2, end_op2), "code check");
   }
 
@@ -1657,13 +1657,13 @@ class LIR_Op2: public LIR_Op {
     , _fpu_stack_size(0)
     , _opr1(opr1)
     , _opr2(opr2)
-    , _type(T_ILLEGAL)
     , _tmp1(tmp1)
     , _tmp2(tmp2)
     , _tmp3(tmp3)
     , _tmp4(tmp4)
     , _tmp5(tmp5)
-    , _condition(lir_cond_unknown) {
+    , _condition(lir_cond_unknown)
+    , _type(T_ILLEGAL)    {
     assert(code != lir_cmp && code != lir_branch && code != lir_cond_float_branch && is_in_range(code, begin_op2, end_op2), "code check");
   }
 
@@ -1748,8 +1748,8 @@ class LIR_OpAllocArray : public LIR_Op {
   LIR_Opr   _tmp2;
   LIR_Opr   _tmp3;
   LIR_Opr   _tmp4;
-  BasicType _type;
   CodeStub* _stub;
+  BasicType _type;
   bool      _zero_array;
 
  public:
@@ -1761,8 +1761,8 @@ class LIR_OpAllocArray : public LIR_Op {
     , _tmp2(t2)
     , _tmp3(t3)
     , _tmp4(t4)
-    , _type(type)
     , _stub(stub)
+    , _type(type)
     , _zero_array(zero_array) {}
 
   LIR_Opr   klass()   const                      { return _klass;       }
@@ -1811,13 +1811,13 @@ class LIR_Op4: public LIR_Op {
   LIR_Opr   _opr2;
   LIR_Opr   _opr3;
   LIR_Opr   _opr4;
-  BasicType _type;
   LIR_Opr   _tmp1;
   LIR_Opr   _tmp2;
   LIR_Opr   _tmp3;
   LIR_Opr   _tmp4;
   LIR_Opr   _tmp5;
   LIR_Condition _condition;
+  BasicType _type;
 
  public:
   LIR_Op4(LIR_Code code, LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr opr3, LIR_Opr opr4,
@@ -1827,13 +1827,13 @@ class LIR_Op4: public LIR_Op {
     , _opr2(opr2)
     , _opr3(opr3)
     , _opr4(opr4)
-    , _type(type)
     , _tmp1(LIR_OprFact::illegalOpr)
     , _tmp2(LIR_OprFact::illegalOpr)
     , _tmp3(LIR_OprFact::illegalOpr)
     , _tmp4(LIR_OprFact::illegalOpr)
     , _tmp5(LIR_OprFact::illegalOpr)
-    , _condition(condition) {
+    , _condition(condition)
+    , _type(type) {
     assert(code == lir_cmove, "code check");
     assert(type != T_ILLEGAL, "cmove should have type");
   }

From 0898ab7f7496689e5de52a5dc4530ca21def1fca Mon Sep 17 00:00:00 2001
From: Shaojin Wen <shaojin.wensj@alibaba-inc.com>
Date: Wed, 24 Jul 2024 22:39:49 +0000
Subject: [PATCH 203/401] 8336741: Optimize LocalTime.toString with
 StringBuilder.repeat

Reviewed-by: liach, rriggs, naoto
---
 .../share/classes/java/time/LocalTime.java    |  18 ++-
 .../jdk/internal/util/DecimalDigits.java      |  28 +++-
 .../bench/java/time/ToStringBench.java        | 124 ++++++++++++++++++
 3 files changed, 164 insertions(+), 6 deletions(-)
 create mode 100644 test/micro/org/openjdk/bench/java/time/ToStringBench.java

diff --git a/src/java.base/share/classes/java/time/LocalTime.java b/src/java.base/share/classes/java/time/LocalTime.java
index 499dca627e286..fd2c5ce4d4563 100644
--- a/src/java.base/share/classes/java/time/LocalTime.java
+++ b/src/java.base/share/classes/java/time/LocalTime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -92,6 +92,8 @@
 import java.time.temporal.ValueRange;
 import java.util.Objects;
 
+import jdk.internal.util.DecimalDigits;
+
 /**
  * A time without a time-zone in the ISO-8601 calendar system,
  * such as {@code 10:15:30}.
@@ -1640,13 +1642,19 @@ public String toString() {
             buf.append(secondValue < 10 ? ":0" : ":").append(secondValue);
             if (nanoValue > 0) {
                 buf.append('.');
-                if (nanoValue % 1000_000 == 0) {
-                    buf.append(Integer.toString((nanoValue / 1000_000) + 1000).substring(1));
+                int zeros = 9 - DecimalDigits.stringSize(nanoValue);
+                if (zeros > 0) {
+                    buf.repeat('0', zeros);
+                }
+                int digits;
+                if (nanoValue % 1_000_000 == 0) {
+                    digits = nanoValue / 1_000_000;
                 } else if (nanoValue % 1000 == 0) {
-                    buf.append(Integer.toString((nanoValue / 1000) + 1000_000).substring(1));
+                    digits = nanoValue / 1000;
                 } else {
-                    buf.append(Integer.toString((nanoValue) + 1000_000_000).substring(1));
+                    digits = nanoValue;
                 }
+                buf.append(digits);
             }
         }
         return buf.toString();
diff --git a/src/java.base/share/classes/jdk/internal/util/DecimalDigits.java b/src/java.base/share/classes/jdk/internal/util/DecimalDigits.java
index bdcbe15ea844f..ea1c9fec73057 100644
--- a/src/java.base/share/classes/jdk/internal/util/DecimalDigits.java
+++ b/src/java.base/share/classes/jdk/internal/util/DecimalDigits.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -84,4 +84,30 @@ private DecimalDigits() {
     public static short digitPair(int i) {
         return DIGITS[i];
     }
+
+    /**
+     * Returns the string representation size for a given int value.
+     *
+     * @param x int value
+     * @return string size
+     *
+     * @implNote There are other ways to compute this: e.g. binary search,
+     * but values are biased heavily towards zero, and therefore linear search
+     * wins. The iteration results are also routinely inlined in the generated
+     * code after loop unrolling.
+     */
+    public static int stringSize(int x) {
+        int d = 1;
+        if (x >= 0) {
+            d = 0;
+            x = -x;
+        }
+        int p = -10;
+        for (int i = 1; i < 10; i++) {
+            if (x > p)
+                return i + d;
+            p = 10 * p;
+        }
+        return 10 + d;
+    }
 }
diff --git a/test/micro/org/openjdk/bench/java/time/ToStringBench.java b/test/micro/org/openjdk/bench/java/time/ToStringBench.java
new file mode 100644
index 0000000000000..3d62e21ba8fab
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/time/ToStringBench.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2024, Alibaba Group Holding Limited. 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.
+ */
+package org.openjdk.bench.java.time;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZonedDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+
+import java.util.Locale;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+
+@BenchmarkMode(Mode.Throughput)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@Warmup(iterations = 5, time = 1)
+@Measurement(iterations = 5, time = 1)
+@Fork(3)
+@State(Scope.Thread)
+public class ToStringBench {
+    private static final Instant[] INSTANTS;
+    private static final ZonedDateTime[] ZONED_DATE_TIMES;
+    private static final LocalDateTime[] LOCAL_DATE_TIMES;
+    private static final LocalDate[] LOCAL_DATES;
+    private static final LocalTime[] LOCAL_TIMES;
+
+    static {
+        Instant loInstant = Instant.EPOCH.plus(Duration.ofDays(365*50)); // 2020-01-01
+        Instant hiInstant = loInstant.plus(Duration.ofDays(1));
+        long maxOffsetNanos = Duration.between(loInstant, hiInstant).toNanos();
+        Random random = new Random(0);
+        INSTANTS = IntStream
+                .range(0, 1_000)
+                .mapToObj(ignored -> {
+                    final long offsetNanos = (long) Math.floor(random.nextDouble() * maxOffsetNanos);
+                    return loInstant.plus(offsetNanos, ChronoUnit.NANOS);
+                })
+                .toArray(Instant[]::new);
+
+        ZONED_DATE_TIMES = Stream.of(INSTANTS)
+                .map(instant -> ZonedDateTime.ofInstant(instant, ZoneOffset.UTC))
+                .toArray(ZonedDateTime[]::new);
+
+        LOCAL_DATE_TIMES = Stream.of(ZONED_DATE_TIMES)
+                .map(zdt -> zdt.toLocalDateTime())
+                .toArray(LocalDateTime[]::new);
+
+        LOCAL_DATES = Stream.of(LOCAL_DATE_TIMES)
+                .map(ldt -> ldt.toLocalDate())
+                .toArray(LocalDate[]::new);
+
+        LOCAL_TIMES = Stream.of(LOCAL_DATE_TIMES)
+                .map(ldt -> ldt.toLocalTime())
+                .toArray(LocalTime[]::new);
+    }
+
+    @Benchmark
+    public void zonedDateTimeToString(Blackhole bh) {
+        for (final ZonedDateTime zonedDateTime : ZONED_DATE_TIMES) {
+            bh.consume(zonedDateTime.toString());
+        }
+    }
+
+    @Benchmark
+    public void localDateTimeToString(Blackhole bh) {
+        for (LocalDateTime localDateTime : LOCAL_DATE_TIMES) {
+            bh.consume(localDateTime.toString());
+        }
+    }
+
+    @Benchmark
+    public void localDateToString(Blackhole bh) {
+        for (LocalDate localDate : LOCAL_DATES) {
+            bh.consume(localDate.toString());
+        }
+    }
+
+    @Benchmark
+    public void localTimeToString(Blackhole bh) {
+        for (LocalTime localTime : LOCAL_TIMES) {
+            bh.consume(localTime.toString());
+        }
+    }
+}
\ No newline at end of file

From d3e51daf7331b84b4e78f7f10360848d7c549c1a Mon Sep 17 00:00:00 2001
From: Serguei Spitsyn <sspitsyn@openjdk.org>
Date: Thu, 25 Jul 2024 01:35:03 +0000
Subject: [PATCH 204/401] 8334085: Test crash:
 assert(thread->held_monitor_count() == 0) failed: Must be

Reviewed-by: dholmes, pchilanomate
---
 src/hotspot/share/runtime/continuationFreezeThaw.cpp       | 4 ++--
 .../jvmti/GetOwnedMonitorInfo/GetOwnedMonitorInfoTest.java | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/runtime/continuationFreezeThaw.cpp b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
index 87f60debc140a..ea0647fd518e0 100644
--- a/src/hotspot/share/runtime/continuationFreezeThaw.cpp
+++ b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
@@ -2450,8 +2450,8 @@ static inline intptr_t* thaw_internal(JavaThread* thread, const Continuation::th
   intptr_t* const sp = thw.thaw(kind);
   assert(is_aligned(sp, frame::frame_alignment), "");
 
-  // All the frames have been thawed so we know they don't hold any monitors
-  assert(thread->held_monitor_count() == 0, "Must be");
+  // All or part of the frames have been thawed so we know they don't hold any monitors except JNI monitors.
+  assert(thread->held_monitor_count() == thread->jni_monitor_count(), "Must be");
 
 #ifdef ASSERT
   intptr_t* sp0 = sp;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorInfo/GetOwnedMonitorInfoTest.java b/test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorInfo/GetOwnedMonitorInfoTest.java
index 80ca790a11d77..420f1cedaca9d 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorInfo/GetOwnedMonitorInfoTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorInfo/GetOwnedMonitorInfoTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 
 /**
  * @test
- * @bug 8185164 8320515
+ * @bug 8185164 8320515 8334085
  * @summary Checks that a contended monitor does not show up in the list of owned monitors.
  *          8320515 piggy-backs on this test and injects an owned monitor with a dead object,
             and checks that that monitor isn't exposed to GetOwnedMonitorInfo.
@@ -86,6 +86,9 @@ public static void runTest(boolean isVirtual, boolean jni) throws Exception {
                 System.out.println("Thread doing JNI call: "
                                    + Thread.currentThread().getName());
 
+                // Extra unmount helps to reproduce 8334085.
+                // Two sub-sequential thaws are needed in that scenario.
+                Thread.yield();
                 jniMonitorEnterAndLetObjectDie();
             }
 

From 6e228ce382d1fad6cba0d0df8a507e6bd32a9a4a Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Thu, 25 Jul 2024 04:59:01 +0000
Subject: [PATCH 205/401] 8336254: Virtual thread implementation + test updates

Reviewed-by: sspitsyn, kevinw
---
 make/test/JtregNativeHotspot.gmk              |   2 +
 .../share/classes/java/lang/System.java       |  10 +-
 .../classes/java/lang/VirtualThread.java      | 292 +++++++---
 .../util/concurrent/locks/LockSupport.java    |  24 +-
 .../jdk/internal/access/JavaLangAccess.java   |   6 -
 .../jdk/internal/misc/VirtualThreads.java     |  95 ----
 .../GetFrameCount/framecnt01/framecnt01.java  |   4 +-
 .../GetThreadState/GetThreadStateTest.java    | 196 ++++---
 .../VThreadEventTest/VThreadEventTest.java    | 218 +++-----
 .../VThreadEventTest/libVThreadEventTest.cpp  |  40 ++
 .../Thread/virtual/CarrierThreadInfo.java     | 243 ++++++++
 .../Thread/virtual/CarrierThreadWaits.java    | 110 ----
 .../lang/Thread/virtual/CustomScheduler.java  | 141 +++--
 .../lang/Thread/virtual/GetStackTrace.java    | 129 -----
 .../virtual/GetStackTraceWhenRunnable.java    |  85 ---
 .../java/lang/Thread/virtual/JfrEvents.java   | 187 +++----
 .../lang/Thread/virtual/MonitorEnterExit.java | 410 ++++++++++++++
 .../Thread/virtual/MonitorWaitNotify.java     | 517 +++++++++++++++---
 .../virtual/ParkWithFixedThreadPool.java      |   6 +-
 .../java/lang/Thread/virtual/Reflection.java  |  13 +-
 .../java/lang/Thread/virtual/StackFrames.java | 160 ++++++
 .../java/lang/Thread/virtual/StackTraces.java |  82 ---
 .../java/lang/Thread/virtual/ThreadAPI.java   | 408 +++++++++-----
 .../VirtualThreadPinnedEventThrows.java       |  14 +-
 ...et.java => CompletableFutureTimedGet.java} |  40 +-
 .../stress/GetStackTraceALotWhenBlocking.java |  96 ++++
 ...java => GetStackTraceALotWhenParking.java} |  23 +-
 .../stress/GetStackTraceALotWhenPinned.java   |  10 +-
 .../lang/Thread/virtual/stress/PinALot.java   |  16 +-
 .../lang/Thread/virtual/stress/PingPong.java  |  10 +-
 .../lang/Thread/virtual/stress/Skynet.java    |   4 +-
 .../lang/Thread/virtual/stress/SleepALot.java |  16 +-
 .../Thread/virtual/stress/TimedWaitALot.java  | 129 +++++
 .../lang/Thread/virtual/stress/YieldALot.java |  21 +-
 .../ThreadMXBean/LockedMonitorInNative.java   |  97 ++++
 .../ThreadMXBean/VirtualThreads.java          |  66 +--
 .../ThreadMXBean/libLockedMonitorInNative.c   |  43 ++
 .../misc/ThreadFlock/ThreadFlockTest.java     |   6 +-
 .../test/lib/thread/VThreadScheduler.java}    |  65 ++-
 39 files changed, 2706 insertions(+), 1328 deletions(-)
 delete mode 100644 src/java.base/share/classes/jdk/internal/misc/VirtualThreads.java
 create mode 100644 test/jdk/java/lang/Thread/virtual/CarrierThreadInfo.java
 delete mode 100644 test/jdk/java/lang/Thread/virtual/CarrierThreadWaits.java
 delete mode 100644 test/jdk/java/lang/Thread/virtual/GetStackTrace.java
 delete mode 100644 test/jdk/java/lang/Thread/virtual/GetStackTraceWhenRunnable.java
 create mode 100644 test/jdk/java/lang/Thread/virtual/MonitorEnterExit.java
 create mode 100644 test/jdk/java/lang/Thread/virtual/StackFrames.java
 delete mode 100644 test/jdk/java/lang/Thread/virtual/StackTraces.java
 rename test/jdk/java/lang/Thread/virtual/stress/{TimedGet.java => CompletableFutureTimedGet.java} (79%)
 create mode 100644 test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWhenBlocking.java
 rename test/jdk/java/lang/Thread/virtual/stress/{GetStackTraceALot.java => GetStackTraceALotWhenParking.java} (85%)
 create mode 100644 test/jdk/java/lang/Thread/virtual/stress/TimedWaitALot.java
 create mode 100644 test/jdk/java/lang/management/ThreadMXBean/LockedMonitorInNative.java
 create mode 100644 test/jdk/java/lang/management/ThreadMXBean/libLockedMonitorInNative.c
 rename test/{jdk/java/lang/Thread/virtual/ThreadBuilders.java => lib/jdk/test/lib/thread/VThreadScheduler.java} (63%)

diff --git a/make/test/JtregNativeHotspot.gmk b/make/test/JtregNativeHotspot.gmk
index ecc7e34c917e0..fee5fe86031ff 100644
--- a/make/test/JtregNativeHotspot.gmk
+++ b/make/test/JtregNativeHotspot.gmk
@@ -871,6 +871,7 @@ ifeq ($(call isTargetOs, windows), true)
   BUILD_HOTSPOT_JTREG_EXECUTABLES_CFLAGS_exeFPRegs := -MT
   BUILD_HOTSPOT_JTREG_EXCLUDE += exesigtest.c libterminatedThread.c libTestJNI.c libCompleteExit.c libMonitorWithDeadObjectTest.c libTestPsig.c exeGetCreatedJavaVMs.c
   BUILD_HOTSPOT_JTREG_LIBRARIES_JDK_LIBS_libnativeStack := java.base:libjvm
+  BUILD_HOTSPOT_JTREG_LIBRARIES_JDK_LIBS_libVThreadEventTest := java.base:libjvm
 else
   BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbootclssearch_agent += -lpthread
   BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsystemclssearch_agent += -lpthread
@@ -1509,6 +1510,7 @@ else
   BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libCompleteExit += -lpthread
   BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libMonitorWithDeadObjectTest += -lpthread
   BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnativeStack += -lpthread
+  BUILD_HOTSPOT_JTREG_LIBRARIES_JDK_LIBS_libVThreadEventTest := java.base:libjvm
   BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exeGetCreatedJavaVMs := -lpthread
   BUILD_HOTSPOT_JTREG_EXECUTABLES_JDK_LIBS_exeGetCreatedJavaVMs := java.base:libjvm
 
diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java
index 3157a20027843..dbe4d806947a3 100644
--- a/src/java.base/share/classes/java/lang/System.java
+++ b/src/java.base/share/classes/java/lang/System.java
@@ -65,7 +65,6 @@
 import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.WeakHashMap;
-import java.util.concurrent.Callable;
 import java.util.function.Supplier;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Stream;
@@ -2264,6 +2263,7 @@ private static class Out extends FileOutputStream {
             super(fd);
         }
 
+        @Override
         public void write(int b) throws IOException {
             boolean attempted = Blocker.begin();
             try {
@@ -2677,14 +2677,6 @@ public Thread currentCarrierThread() {
                 return Thread.currentCarrierThread();
             }
 
-            public <V> V executeOnCarrierThread(Callable<V> task) throws Exception {
-                if (Thread.currentThread() instanceof VirtualThread vthread) {
-                    return vthread.executeOnCarrierThread(task);
-                } else {
-                    return task.call();
-                }
-            }
-
             public <T> T getCarrierThreadLocal(CarrierThreadLocal<T> local) {
                 return ((ThreadLocal<T>)local).getCarrierThreadLocal();
             }
diff --git a/src/java.base/share/classes/java/lang/VirtualThread.java b/src/java.base/share/classes/java/lang/VirtualThread.java
index cf2fed3bf5d71..da05e77f12b53 100644
--- a/src/java.base/share/classes/java/lang/VirtualThread.java
+++ b/src/java.base/share/classes/java/lang/VirtualThread.java
@@ -40,6 +40,7 @@
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 import jdk.internal.event.VirtualThreadEndEvent;
 import jdk.internal.event.VirtualThreadPinnedEvent;
 import jdk.internal.event.VirtualThreadStartEvent;
@@ -62,14 +63,13 @@
 import static java.util.concurrent.TimeUnit.*;
 
 /**
- * A thread that is scheduled by the Java virtual machine rather than the operating
- * system.
+ * A thread that is scheduled by the Java virtual machine rather than the operating system.
  */
 final class VirtualThread extends BaseVirtualThread {
     private static final Unsafe U = Unsafe.getUnsafe();
     private static final ContinuationScope VTHREAD_SCOPE = new ContinuationScope("VirtualThreads");
     private static final ForkJoinPool DEFAULT_SCHEDULER = createDefaultScheduler();
-    private static final ScheduledExecutorService UNPARKER = createDelayedTaskScheduler();
+    private static final ScheduledExecutorService[] DELAYED_TASK_SCHEDULERS = createDelayedTaskSchedulers();
     private static final int TRACE_PINNING_MODE = tracePinningMode();
 
     private static final long STATE = U.objectFieldOffset(VirtualThread.class, "state");
@@ -217,7 +217,7 @@ public void run() {
      * on the current thread before the task runs or continues. It unmounts when the
      * task completes or yields.
      */
-    @ChangesCurrentThread
+    @ChangesCurrentThread // allow mount/unmount to be inlined
     private void runContinuation() {
         // the carrier must be a platform thread
         if (Thread.currentThread().isVirtual()) {
@@ -257,42 +257,109 @@ private void runContinuation() {
      * Submits the runContinuation task to the scheduler. For the default scheduler,
      * and calling it on a worker thread, the task will be pushed to the local queue,
      * otherwise it will be pushed to an external submission queue.
+     * @param scheduler the scheduler
+     * @param retryOnOOME true to retry indefinitely if OutOfMemoryError is thrown
      * @throws RejectedExecutionException
      */
-    private void submitRunContinuation() {
-        try {
-            scheduler.execute(runContinuation);
-        } catch (RejectedExecutionException ree) {
-            submitFailed(ree);
-            throw ree;
+    @ChangesCurrentThread
+    private void submitRunContinuation(Executor scheduler, boolean retryOnOOME) {
+        boolean done = false;
+        while (!done) {
+            try {
+                // The scheduler's execute method is invoked in the context of the
+                // carrier thread. For the default scheduler this ensures that the
+                // current thread is a ForkJoinWorkerThread so the task will be pushed
+                // to the local queue. For other schedulers, it avoids deadlock that
+                // would arise due to platform and virtual threads contending for a
+                // lock on the scheduler's submission queue.
+                if (currentThread() instanceof VirtualThread vthread) {
+                    vthread.switchToCarrierThread();
+                    try {
+                        scheduler.execute(runContinuation);
+                    } finally {
+                        switchToVirtualThread(vthread);
+                    }
+                } else {
+                    scheduler.execute(runContinuation);
+                }
+                done = true;
+            } catch (RejectedExecutionException ree) {
+                submitFailed(ree);
+                throw ree;
+            } catch (OutOfMemoryError e) {
+                if (retryOnOOME) {
+                    U.park(false, 100_000_000); // 100ms
+                } else {
+                    throw e;
+                }
+            }
         }
     }
 
     /**
      * Submits the runContinuation task to given scheduler with a lazy submit.
+     * If OutOfMemoryError is thrown then the submit will be retried until it succeeds.
      * @throws RejectedExecutionException
      * @see ForkJoinPool#lazySubmit(ForkJoinTask)
      */
     private void lazySubmitRunContinuation(ForkJoinPool pool) {
+        assert Thread.currentThread() instanceof CarrierThread;
         try {
             pool.lazySubmit(ForkJoinTask.adapt(runContinuation));
         } catch (RejectedExecutionException ree) {
             submitFailed(ree);
             throw ree;
+        } catch (OutOfMemoryError e) {
+            submitRunContinuation(pool, true);
         }
     }
 
     /**
      * Submits the runContinuation task to the given scheduler as an external submit.
+     * If OutOfMemoryError is thrown then the submit will be retried until it succeeds.
      * @throws RejectedExecutionException
      * @see ForkJoinPool#externalSubmit(ForkJoinTask)
      */
     private void externalSubmitRunContinuation(ForkJoinPool pool) {
+        assert Thread.currentThread() instanceof CarrierThread;
         try {
             pool.externalSubmit(ForkJoinTask.adapt(runContinuation));
         } catch (RejectedExecutionException ree) {
             submitFailed(ree);
             throw ree;
+        } catch (OutOfMemoryError e) {
+            submitRunContinuation(pool, true);
+        }
+    }
+
+    /**
+     * Submits the runContinuation task to the scheduler. For the default scheduler,
+     * and calling it on a worker thread, the task will be pushed to the local queue,
+     * otherwise it will be pushed to an external submission queue.
+     * If OutOfMemoryError is thrown then the submit will be retried until it succeeds.
+     * @throws RejectedExecutionException
+     */
+    private void submitRunContinuation() {
+        submitRunContinuation(scheduler, true);
+    }
+
+    /**
+     * Submits the runContinuation task to the scheduler. For the default scheduler, and
+     * calling it a virtual thread that uses the default scheduler, the task will be
+     * pushed to an external submission queue. This method may throw OutOfMemoryError.
+     * @throws RejectedExecutionException
+     * @throws OutOfMemoryError
+     */
+    private void externalSubmitRunContinuationOrThrow() {
+        if (scheduler == DEFAULT_SCHEDULER && currentCarrierThread() instanceof CarrierThread ct) {
+            try {
+                ct.getPool().externalSubmit(ForkJoinTask.adapt(runContinuation));
+            } catch (RejectedExecutionException ree) {
+                submitFailed(ree);
+                throw ree;
+            }
+        } else {
+            submitRunContinuation(scheduler, false);
         }
     }
 
@@ -385,6 +452,8 @@ private void mount() {
     @ChangesCurrentThread
     @ReservedStackAccess
     private void unmount() {
+        assert !Thread.holdsLock(interruptLock);
+
         // set Thread.currentThread() to return the platform thread
         Thread carrier = this.carrierThread;
         carrier.setCurrentThread(carrier);
@@ -417,7 +486,7 @@ private void switchToCarrierThread() {
      */
     @ChangesCurrentThread
     @JvmtiMountTransition
-    private void switchToVirtualThread(VirtualThread vthread) {
+    private static void switchToVirtualThread(VirtualThread vthread) {
         Thread carrier = vthread.carrierThread;
         assert carrier == Thread.currentCarrierThread();
         carrier.setCurrentThread(vthread);
@@ -474,13 +543,12 @@ private void afterYield() {
 
             // may have been unparked while parking
             if (parkPermit && compareAndSetState(newState, UNPARKED)) {
-                // lazy submit to continue on the current thread as carrier if possible
-                if (currentThread() instanceof CarrierThread ct) {
+                // lazy submit to continue on the current carrier if possible
+                if (currentThread() instanceof CarrierThread ct && ct.getQueuedTaskCount() == 0) {
                     lazySubmitRunContinuation(ct.getPool());
                 } else {
                     submitRunContinuation();
                 }
-
             }
             return;
         }
@@ -561,8 +629,8 @@ void start(ThreadContainer container) {
             // scoped values may be inherited
             inheritScopedValueBindings(container);
 
-            // submit task to run thread
-            submitRunContinuation();
+            // submit task to run thread, using externalSubmit if possible
+            externalSubmitRunContinuationOrThrow();
             started = true;
         } finally {
             if (!started) {
@@ -707,7 +775,7 @@ private Future<?> scheduleUnpark(long nanos) {
         // need to switch to current carrier thread to avoid nested parking
         switchToCarrierThread();
         try {
-            return UNPARKER.schedule(this::unpark, nanos, NANOSECONDS);
+            return schedule(this::unpark, nanos, NANOSECONDS);
         } finally {
             switchToVirtualThread(this);
         }
@@ -718,6 +786,7 @@ private Future<?> scheduleUnpark(long nanos) {
      */
     @ChangesCurrentThread
     private void cancel(Future<?> future) {
+        assert Thread.currentThread() == this;
         if (!future.isDone()) {
             // need to switch to current carrier thread to avoid nested parking
             switchToCarrierThread();
@@ -730,33 +799,26 @@ private void cancel(Future<?> future) {
     }
 
     /**
-     * Re-enables this virtual thread for scheduling. If the virtual thread was
-     * {@link #park() parked} then it will be unblocked, otherwise its next call
-     * to {@code park} or {@linkplain #parkNanos(long) parkNanos} is guaranteed
-     * not to block.
+     * Re-enables this virtual thread for scheduling. If this virtual thread is parked
+     * then its task is scheduled to continue, otherwise its next call to {@code park} or
+     * {@linkplain #parkNanos(long) parkNanos} is guaranteed not to block.
      * @throws RejectedExecutionException if the scheduler cannot accept a task
      */
     @Override
-    @ChangesCurrentThread
     void unpark() {
-        Thread currentThread = Thread.currentThread();
-        if (!getAndSetParkPermit(true) && currentThread != this) {
+        if (!getAndSetParkPermit(true) && currentThread() != this) {
             int s = state();
-            boolean parked = (s == PARKED) || (s == TIMED_PARKED);
-            if (parked && compareAndSetState(s, UNPARKED)) {
-                if (currentThread instanceof VirtualThread vthread) {
-                    vthread.switchToCarrierThread();
-                    try {
-                        submitRunContinuation();
-                    } finally {
-                        switchToVirtualThread(vthread);
-                    }
-                } else {
-                    submitRunContinuation();
-                }
-            } else if ((s == PINNED) || (s == TIMED_PINNED)) {
+
+            // unparked while parked
+            if ((s == PARKED || s == TIMED_PARKED) && compareAndSetState(s, UNPARKED)) {
+                submitRunContinuation();
+                return;
+            }
+
+            // unparked while parked when pinned
+            if (s == PINNED || s == TIMED_PINNED) {
                 // unpark carrier thread when pinned
-                notifyJvmtiDisableSuspend(true);
+                disableSuspendAndPreempt();
                 try {
                     synchronized (carrierThreadAccessLock()) {
                         Thread carrier = carrierThread;
@@ -765,8 +827,9 @@ void unpark() {
                         }
                     }
                 } finally {
-                    notifyJvmtiDisableSuspend(false);
+                    enableSuspendAndPreempt();
                 }
+                return;
             }
         }
     }
@@ -859,11 +922,11 @@ boolean joinNanos(long nanos) throws InterruptedException {
 
     @Override
     void blockedOn(Interruptible b) {
-        notifyJvmtiDisableSuspend(true);
+        disableSuspendAndPreempt();
         try {
             super.blockedOn(b);
         } finally {
-            notifyJvmtiDisableSuspend(false);
+            enableSuspendAndPreempt();
         }
     }
 
@@ -874,9 +937,9 @@ public void interrupt() {
             checkAccess();
 
             // if current thread is a virtual thread then prevent it from being
-            // suspended when entering or holding interruptLock
+            // suspended or unmounted when entering or holding interruptLock
             Interruptible blocker;
-            notifyJvmtiDisableSuspend(true);
+            disableSuspendAndPreempt();
             try {
                 synchronized (interruptLock) {
                     interrupted = true;
@@ -890,18 +953,22 @@ public void interrupt() {
                     if (carrier != null) carrier.setInterrupt();
                 }
             } finally {
-                notifyJvmtiDisableSuspend(false);
+                enableSuspendAndPreempt();
             }
 
             // notify blocker after releasing interruptLock
             if (blocker != null) {
                 blocker.postInterrupt();
             }
+
+            // make available parking permit, unpark thread if parked
+            unpark();
+
         } else {
             interrupted = true;
             carrierThread.setInterrupt();
+            setParkPermit(true);
         }
-        unpark();
     }
 
     @Override
@@ -914,14 +981,14 @@ boolean getAndClearInterrupt() {
         assert Thread.currentThread() == this;
         boolean oldValue = interrupted;
         if (oldValue) {
-            notifyJvmtiDisableSuspend(true);
+            disableSuspendAndPreempt();
             try {
                 synchronized (interruptLock) {
                     interrupted = false;
                     carrierThread.clearInterrupt();
                 }
             } finally {
-                notifyJvmtiDisableSuspend(false);
+                enableSuspendAndPreempt();
             }
         }
         return oldValue;
@@ -946,16 +1013,18 @@ Thread.State threadState() {
                 return Thread.State.RUNNABLE;
             case RUNNING:
                 // if mounted then return state of carrier thread
-                notifyJvmtiDisableSuspend(true);
-                try {
-                    synchronized (carrierThreadAccessLock()) {
-                        Thread carrierThread = this.carrierThread;
-                        if (carrierThread != null) {
-                            return carrierThread.threadState();
+                if (Thread.currentThread() != this) {
+                    disableSuspendAndPreempt();
+                    try {
+                        synchronized (carrierThreadAccessLock()) {
+                            Thread carrierThread = this.carrierThread;
+                            if (carrierThread != null) {
+                                return carrierThread.threadState();
+                            }
                         }
+                    } finally {
+                        enableSuspendAndPreempt();
                     }
-                } finally {
-                    notifyJvmtiDisableSuspend(false);
                 }
                 // runnable, mounted
                 return Thread.State.RUNNABLE;
@@ -1068,32 +1137,49 @@ public String toString() {
             sb.append(name);
         }
         sb.append("]/");
-        Thread carrier = carrierThread;
-        if (carrier != null) {
-            // include the carrier thread state and name when mounted
-            notifyJvmtiDisableSuspend(true);
+
+        // add the carrier state and thread name when mounted
+        boolean mounted;
+        if (Thread.currentThread() == this) {
+            mounted = appendCarrierInfo(sb);
+        } else {
+            disableSuspendAndPreempt();
             try {
                 synchronized (carrierThreadAccessLock()) {
-                    carrier = carrierThread;
-                    if (carrier != null) {
-                        String stateAsString = carrier.threadState().toString();
-                        sb.append(stateAsString.toLowerCase(Locale.ROOT));
-                        sb.append('@');
-                        sb.append(carrier.getName());
-                    }
+                    mounted = appendCarrierInfo(sb);
                 }
             } finally {
-                notifyJvmtiDisableSuspend(false);
+                enableSuspendAndPreempt();
             }
         }
-        // include virtual thread state when not mounted
-        if (carrier == null) {
+
+        // add virtual thread state when not mounted
+        if (!mounted) {
             String stateAsString = threadState().toString();
             sb.append(stateAsString.toLowerCase(Locale.ROOT));
         }
+
         return sb.toString();
     }
 
+    /**
+     * Appends the carrier state and thread name to the string buffer if mounted.
+     * @return true if mounted, false if not mounted
+     */
+    private boolean appendCarrierInfo(StringBuilder sb) {
+        assert Thread.currentThread() == this || Thread.holdsLock(carrierThreadAccessLock());
+        Thread carrier = carrierThread;
+        if (carrier != null) {
+            String stateAsString = carrier.threadState().toString();
+            sb.append(stateAsString.toLowerCase(Locale.ROOT));
+            sb.append('@');
+            sb.append(carrier.getName());
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     @Override
     public int hashCode() {
         return (int) threadId();
@@ -1127,6 +1213,22 @@ private Object carrierThreadAccessLock() {
         return interruptLock;
     }
 
+    /**
+     * Disallow the current thread be suspended or preempted.
+     */
+    private void disableSuspendAndPreempt() {
+        notifyJvmtiDisableSuspend(true);
+        Continuation.pin();
+    }
+
+    /**
+     * Allow the current thread be suspended or preempted.
+     */
+    private void enableSuspendAndPreempt() {
+        Continuation.unpin();
+        notifyJvmtiDisableSuspend(false);
+    }
+
     // -- wrappers for get/set of state, parking permit, and carrier thread --
 
     private int state() {
@@ -1188,10 +1290,16 @@ private void setCarrierThread(Thread carrier) {
     private static native void registerNatives();
     static {
         registerNatives();
+
+        // ensure VTHREAD_GROUP is created, may be accessed by JVMTI
+        var group = Thread.virtualThreadGroup();
+
+        // ensure VirtualThreadPinnedEvent is loaded/initialized
+        U.ensureClassInitialized(VirtualThreadPinnedEvent.class);
     }
 
     /**
-     * Creates the default scheduler.
+     * Creates the default ForkJoinPool scheduler.
      */
     @SuppressWarnings("removal")
     private static ForkJoinPool createDefaultScheduler() {
@@ -1229,22 +1337,42 @@ private static ForkJoinPool createDefaultScheduler() {
     }
 
     /**
-     * Creates the ScheduledThreadPoolExecutor used for timed unpark.
+     * Schedule a runnable task to run after a delay.
      */
-    private static ScheduledExecutorService createDelayedTaskScheduler() {
-        String propValue = GetPropertyAction.privilegedGetProperty("jdk.unparker.maxPoolSize");
-        int poolSize;
+    private static Future<?> schedule(Runnable command, long delay, TimeUnit unit) {
+        long tid = Thread.currentThread().threadId();
+        int index = (int) tid & (DELAYED_TASK_SCHEDULERS.length - 1);
+        return DELAYED_TASK_SCHEDULERS[index].schedule(command, delay, unit);
+    }
+
+    /**
+     * Creates the ScheduledThreadPoolExecutors used to execute delayed tasks.
+     */
+    private static ScheduledExecutorService[] createDelayedTaskSchedulers() {
+        String propName = "jdk.virtualThreadScheduler.timerQueues";
+        String propValue = GetPropertyAction.privilegedGetProperty(propName);
+        int queueCount;
         if (propValue != null) {
-            poolSize = Integer.parseInt(propValue);
+            queueCount = Integer.parseInt(propValue);
+            if (queueCount != Integer.highestOneBit(queueCount)) {
+                throw new RuntimeException("Value of " + propName + " must be power of 2");
+            }
         } else {
-            poolSize = 1;
+            int ncpus = Runtime.getRuntime().availableProcessors();
+            queueCount = Math.max(Integer.highestOneBit(ncpus / 4), 1);
+        }
+        var schedulers = new ScheduledExecutorService[queueCount];
+        for (int i = 0; i < queueCount; i++) {
+            ScheduledThreadPoolExecutor stpe = (ScheduledThreadPoolExecutor)
+                Executors.newScheduledThreadPool(1, task -> {
+                    Thread t = InnocuousThread.newThread("VirtualThread-unparker", task);
+                    t.setDaemon(true);
+                    return t;
+                });
+            stpe.setRemoveOnCancelPolicy(true);
+            schedulers[i] = stpe;
         }
-        ScheduledThreadPoolExecutor stpe = (ScheduledThreadPoolExecutor)
-            Executors.newScheduledThreadPool(poolSize, task -> {
-                return InnocuousThread.newThread("VirtualThread-unparker", task);
-            });
-        stpe.setRemoveOnCancelPolicy(true);
-        return stpe;
+        return schedulers;
     }
 
     /**
diff --git a/src/java.base/share/classes/java/util/concurrent/locks/LockSupport.java b/src/java.base/share/classes/java/util/concurrent/locks/LockSupport.java
index 28fe0d4dca3d6..d6c45c7b04fd1 100644
--- a/src/java.base/share/classes/java/util/concurrent/locks/LockSupport.java
+++ b/src/java.base/share/classes/java/util/concurrent/locks/LockSupport.java
@@ -35,7 +35,9 @@
 
 package java.util.concurrent.locks;
 
-import jdk.internal.misc.VirtualThreads;
+import java.util.concurrent.TimeUnit;
+import jdk.internal.access.JavaLangAccess;
+import jdk.internal.access.SharedSecrets;
 import jdk.internal.misc.Unsafe;
 
 /**
@@ -176,7 +178,7 @@ public static void setCurrentBlocker(Object blocker) {
     public static void unpark(Thread thread) {
         if (thread != null) {
             if (thread.isVirtual()) {
-                VirtualThreads.unpark(thread);
+                JLA.unparkVirtualThread(thread);
             } else {
                 U.unpark(thread);
             }
@@ -216,7 +218,7 @@ public static void park(Object blocker) {
         setBlocker(t, blocker);
         try {
             if (t.isVirtual()) {
-                VirtualThreads.park();
+                JLA.parkVirtualThread();
             } else {
                 U.park(false, 0L);
             }
@@ -264,7 +266,7 @@ public static void parkNanos(Object blocker, long nanos) {
             setBlocker(t, blocker);
             try {
                 if (t.isVirtual()) {
-                    VirtualThreads.park(nanos);
+                    JLA.parkVirtualThread(nanos);
                 } else {
                     U.park(false, nanos);
                 }
@@ -311,11 +313,7 @@ public static void parkUntil(Object blocker, long deadline) {
         Thread t = Thread.currentThread();
         setBlocker(t, blocker);
         try {
-            if (t.isVirtual()) {
-                VirtualThreads.parkUntil(deadline);
-            } else {
-                U.park(true, deadline);
-            }
+            parkUntil(deadline);
         } finally {
             setBlocker(t, null);
         }
@@ -366,7 +364,7 @@ public static Object getBlocker(Thread t) {
      */
     public static void park() {
         if (Thread.currentThread().isVirtual()) {
-            VirtualThreads.park();
+            JLA.parkVirtualThread();
         } else {
             U.park(false, 0L);
         }
@@ -405,7 +403,7 @@ public static void park() {
     public static void parkNanos(long nanos) {
         if (nanos > 0) {
             if (Thread.currentThread().isVirtual()) {
-                VirtualThreads.park(nanos);
+                JLA.parkVirtualThread(nanos);
             } else {
                 U.park(false, nanos);
             }
@@ -444,7 +442,8 @@ public static void parkNanos(long nanos) {
      */
     public static void parkUntil(long deadline) {
         if (Thread.currentThread().isVirtual()) {
-            VirtualThreads.parkUntil(deadline);
+            long millis = deadline - System.currentTimeMillis();
+            JLA.parkVirtualThread(TimeUnit.MILLISECONDS.toNanos(millis));
         } else {
             U.park(true, deadline);
         }
@@ -462,4 +461,5 @@ static final long getThreadId(Thread thread) {
     private static final long PARKBLOCKER
         = U.objectFieldOffset(Thread.class, "parkBlocker");
 
+    private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
 }
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
index 2254c065e2e8f..725991fb04fee 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
@@ -42,7 +42,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.stream.Stream;
@@ -504,11 +503,6 @@ public interface JavaLangAccess {
      */
     Thread currentCarrierThread();
 
-    /**
-     * Executes the given value returning task on the current carrier thread.
-     */
-    <V> V executeOnCarrierThread(Callable<V> task) throws Exception;
-
     /**
      * Returns the value of the current carrier thread's copy of a thread-local.
      */
diff --git a/src/java.base/share/classes/jdk/internal/misc/VirtualThreads.java b/src/java.base/share/classes/jdk/internal/misc/VirtualThreads.java
deleted file mode 100644
index 04a93afad9473..0000000000000
--- a/src/java.base/share/classes/jdk/internal/misc/VirtualThreads.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package jdk.internal.misc;
-
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.RejectedExecutionException;
-import jdk.internal.access.JavaLangAccess;
-import jdk.internal.access.SharedSecrets;
-
-/**
- * Defines static methods to support execution in the context of a virtual thread.
- */
-public final class VirtualThreads {
-    private static final JavaLangAccess JLA;
-    static {
-        JLA = SharedSecrets.getJavaLangAccess();
-        if (JLA == null) {
-            throw new InternalError("JavaLangAccess not setup");
-        }
-    }
-    private VirtualThreads() { }
-
-    /**
-     * Parks the current virtual thread until it is unparked or interrupted.
-     * If already unparked then the parking permit is consumed and this method
-     * completes immediately (meaning it doesn't yield). It also completes
-     * immediately if the interrupt status is set.
-     * @throws WrongThreadException if the current thread is not a virtual thread
-     */
-    public static void park() {
-        JLA.parkVirtualThread();
-    }
-
-    /**
-     * Parks the current virtual thread up to the given waiting time or until it
-     * is unparked or interrupted. If already unparked then the parking permit is
-     * consumed and this method completes immediately (meaning it doesn't yield).
-     * It also completes immediately if the interrupt status is set or the waiting
-     * time is {@code <= 0}.
-     * @param nanos the maximum number of nanoseconds to wait
-     * @throws WrongThreadException if the current thread is not a virtual thread
-     */
-    public static void park(long nanos) {
-        JLA.parkVirtualThread(nanos);
-    }
-
-    /**
-     * Parks the current virtual thread until the given deadline or until is is
-     * unparked or interrupted. If already unparked then the parking permit is
-     * consumed and this method completes immediately (meaning it doesn't yield).
-     * It also completes immediately if the interrupt status is set or the
-     * deadline has past.
-     * @param deadline absolute time, in milliseconds, from the epoch
-     * @throws WrongThreadException if the current thread is not a virtual thread
-     */
-    public static void parkUntil(long deadline) {
-        long millis = deadline - System.currentTimeMillis();
-        long nanos = TimeUnit.NANOSECONDS.convert(millis, TimeUnit.MILLISECONDS);
-        park(nanos);
-    }
-
-    /**
-     * Re-enables a virtual thread for scheduling. If the thread was parked then
-     * it will be unblocked, otherwise its next attempt to park will not block
-     * @param thread the virtual thread to unpark
-     * @throws IllegalArgumentException if the thread is not a virtual thread
-     * @throws RejectedExecutionException if the scheduler cannot accept a task
-     */
-    public static void unpark(Thread thread) {
-        JLA.unparkVirtualThread(thread);
-    }
-}
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameCount/framecnt01/framecnt01.java b/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameCount/framecnt01/framecnt01.java
index 8d757283a3093..8a7177ec25d5f 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameCount/framecnt01/framecnt01.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameCount/framecnt01/framecnt01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -79,7 +79,7 @@ public static void main(String args[]) throws Exception {
         }
 
         // this is too fragile, implementation can change at any time.
-        checkFrames(vThread1, false, 14);
+        checkFrames(vThread1, false, 13);
         LockSupport.unpark(vThread1);
         vThread1.join();
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadState/GetThreadStateTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadState/GetThreadStateTest.java
index 4ee1d1a0bfcae..cc8f5638c76b8 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadState/GetThreadStateTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadState/GetThreadStateTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,24 +25,29 @@
  * @test id=default
  * @bug 8312498
  * @summary Basic test for JVMTI GetThreadState with virtual threads
+ * @modules java.base/java.lang:+open
  * @library /test/lib
- * @run junit/othervm/native GetThreadStateTest
+ * @run junit/othervm/native --enable-native-access=ALL-UNNAMED GetThreadStateTest
  */
 
 /*
  * @test id=no-vmcontinuations
  * @requires vm.continuations
+ * @modules java.base/java.lang:+open
  * @library /test/lib
- * @run junit/othervm/native -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations GetThreadStateTest
+ * @run junit/othervm/native -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations --enable-native-access=ALL-UNNAMED GetThreadStateTest
  */
 
 import java.util.StringJoiner;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.LockSupport;
 
+import jdk.test.lib.thread.VThreadRunner;
 import jdk.test.lib.thread.VThreadPinner;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import static org.junit.jupiter.api.Assertions.*;
 
 class GetThreadStateTest {
@@ -51,6 +56,11 @@ class GetThreadStateTest {
     static void setup() {
         System.loadLibrary("GetThreadStateTest");
         init();
+
+        // need >=2 carriers for testing pinning when main thread is a virtual thread
+        if (Thread.currentThread().isVirtual()) {
+            VThreadRunner.ensureParallelism(2);
+        }
     }
 
     /**
@@ -105,21 +115,29 @@ void testRunnable() throws Exception {
     }
 
     /**
-     * Test state of thread waiting to enter a monitor.
+     * Test state of thread waiting to enter a monitor when pinned and not pinned.
      */
-    @Test
-    void testMonitorEnter() throws Exception {
-        var started = new AtomicBoolean();
+    @ParameterizedTest
+    @ValueSource(booleans = { true, false })
+    void testMonitorEnter(boolean pinned) throws Exception {
+        var ready = new AtomicBoolean();
         Object lock = new Object();
         var thread = Thread.ofVirtual().unstarted(() -> {
-            started.set(true);
-            synchronized (lock) { }
+            if (pinned) {
+                VThreadPinner.runPinned(() -> {
+                    ready.set(true);
+                    synchronized (lock) { }
+                });
+            } else {
+                ready.set(true);
+                synchronized (lock) { }
+            }
         });
         try {
             synchronized (lock) {
                 // start thread and wait for it to start execution
                 thread.start();
-                awaitTrue(started);
+                awaitTrue(ready);
 
                 // thread should block on monitor enter
                 int expected = JVMTI_THREAD_STATE_ALIVE | JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER;
@@ -135,23 +153,31 @@ void testMonitorEnter() throws Exception {
     }
 
     /**
-     * Test state of thread waiting in Object.wait().
+     * Test state of thread waiting in Object.wait() when pinned and not pinned.
      */
-    @Test
-    void testObjectWait() throws Exception {
-        var started = new AtomicBoolean();
+    @ParameterizedTest
+    @ValueSource(booleans = { true, false })
+    void testObjectWait(boolean pinned) throws Exception {
+        var ready = new AtomicBoolean();
         Object lock = new Object();
         var thread = Thread.ofVirtual().start(() -> {
             synchronized (lock) {
-                started.set(true);
                 try {
-                    lock.wait();
+                    if (pinned) {
+                        VThreadPinner.runPinned(() -> {
+                            ready.set(true);
+                            lock.wait();
+                        });
+                    } else {
+                        ready.set(true);
+                        lock.wait();
+                    }
                 } catch (InterruptedException e) { }
             }
         });
         try {
             // wait for thread to start execution
-            awaitTrue(started);
+            awaitTrue(ready);
 
             // thread should wait
             int expected = JVMTI_THREAD_STATE_ALIVE |
@@ -177,23 +203,33 @@ void testObjectWait() throws Exception {
     }
 
     /**
-     * Test state of thread waiting in Object.wait(millis).
+     * Test state of thread waiting in Object.wait(millis) when pinned and not pinned.
      */
-    @Test
-    void testObjectWaitMillis() throws Exception {
-        var started = new AtomicBoolean();
+    @ParameterizedTest
+    @ValueSource(booleans = { true, false })
+    void testObjectWaitMillis(boolean pinned) throws Exception {
+        var ready = new AtomicBoolean();
         Object lock = new Object();
         var thread = Thread.ofVirtual().start(() -> {
             synchronized (lock) {
-                started.set(true);
-                try {
-                    lock.wait(Long.MAX_VALUE);
-                } catch (InterruptedException e) { }
+                synchronized (lock) {
+                    try {
+                        if (pinned) {
+                            VThreadPinner.runPinned(() -> {
+                                ready.set(true);
+                                lock.wait(Long.MAX_VALUE);
+                            });
+                        } else {
+                            ready.set(true);
+                            lock.wait(Long.MAX_VALUE);
+                        }
+                    } catch (InterruptedException e) { }
+                }
             }
         });
         try {
             // wait for thread to start execution
-            awaitTrue(started);
+            awaitTrue(ready);
 
             // thread should wait
             int expected = JVMTI_THREAD_STATE_ALIVE |
@@ -219,83 +255,31 @@ void testObjectWaitMillis() throws Exception {
     }
 
     /**
-     * Test state of thread parked with LockSupport.park.
+     * Test state of thread parked with LockSupport.park when pinned and not pinned.
      */
-    @Test
-    void testPark() throws Exception {
-        var started = new AtomicBoolean();
+    @ParameterizedTest
+    @ValueSource(booleans = { true, false })
+    void testPark(boolean pinned) throws Exception {
+        var ready = new AtomicBoolean();
         var done = new AtomicBoolean();
         var thread = Thread.ofVirtual().start(() -> {
-            started.set(true);
-            while (!done.get()) {
-                LockSupport.park();
-            }
-        });
-        try {
-            // wait for thread to start execution
-            awaitTrue(started);
-
-            // thread should park
-            int expected = JVMTI_THREAD_STATE_ALIVE |
-                    JVMTI_THREAD_STATE_WAITING |
-                    JVMTI_THREAD_STATE_WAITING_INDEFINITELY |
-                    JVMTI_THREAD_STATE_PARKED;
-            await(thread, expected);
-        } finally {
-            done.set(true);
-            LockSupport.unpark(thread);
-            thread.join();
-        }
-    }
-
-    /**
-     * Test state of thread parked with LockSupport.parkNanos.
-     */
-    @Test
-    void testParkNanos() throws Exception {
-        var started = new AtomicBoolean();
-        var done = new AtomicBoolean();
-        var thread = Thread.ofVirtual().start(() -> {
-            started.set(true);
-            while (!done.get()) {
-                LockSupport.parkNanos(Long.MAX_VALUE);
-            }
-        });
-        try {
-            // wait for thread to start execution
-            awaitTrue(started);
-
-            // thread should park
-            int expected = JVMTI_THREAD_STATE_ALIVE |
-                    JVMTI_THREAD_STATE_WAITING |
-                    JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT |
-                    JVMTI_THREAD_STATE_PARKED;
-            await(thread, expected);
-        } finally {
-            done.set(true);
-            LockSupport.unpark(thread);
-            thread.join();
-        }
-    }
-
-    /**
-     * Test state of thread parked with LockSupport.park while holding a monitor.
-     */
-    @Test
-    void testParkWhenPinned() throws Exception {
-        var started = new AtomicBoolean();
-        var done = new AtomicBoolean();
-        var thread = Thread.ofVirtual().start(() -> {
-            VThreadPinner.runPinned(() -> {
-                started.set(true);
+            if (pinned) {
+                VThreadPinner.runPinned(() -> {
+                    ready.set(true);
+                    while (!done.get()) {
+                        LockSupport.park();
+                    }
+                });
+            } else {
+                ready.set(true);
                 while (!done.get()) {
                     LockSupport.park();
                 }
-            });
+            }
         });
         try {
             // wait for thread to start execution
-            awaitTrue(started);
+            awaitTrue(ready);
 
             // thread should park
             int expected = JVMTI_THREAD_STATE_ALIVE |
@@ -311,23 +295,31 @@ void testParkWhenPinned() throws Exception {
     }
 
     /**
-     * Test state of thread parked with LockSupport.parkNanos while holding a monitor.
+     * Test state of thread parked with LockSupport.parkNanos when pinned and not pinned.
      */
-    @Test
-    void testParkNanosWhenPinned() throws Exception {
-        var started = new AtomicBoolean();
+    @ParameterizedTest
+    @ValueSource(booleans = { true, false })
+    void testParkNanos(boolean pinned) throws Exception {
+        var ready = new AtomicBoolean();
         var done = new AtomicBoolean();
         var thread = Thread.ofVirtual().start(() -> {
-            VThreadPinner.runPinned(() -> {
-                started.set(true);
+            if (pinned) {
+                VThreadPinner.runPinned(() -> {
+                    ready.set(true);
+                    while (!done.get()) {
+                        LockSupport.parkNanos(Long.MAX_VALUE);
+                    }
+                });
+            } else {
+                ready.set(true);
                 while (!done.get()) {
                     LockSupport.parkNanos(Long.MAX_VALUE);
                 }
-            });
+            }
         });
         try {
             // wait for thread to start execution
-            awaitTrue(started);
+            awaitTrue(ready);
 
             // thread should park
             int expected = JVMTI_THREAD_STATE_ALIVE |
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/VThreadEventTest.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/VThreadEventTest.java
index 61b94a4484bc1..845e9adba019b 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/VThreadEventTest.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/VThreadEventTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,47 +28,22 @@
  * @requires vm.continuations
  * @requires vm.jvmti
  * @requires vm.compMode != "Xcomp"
+ * @modules java.base/java.lang:+open
+ * @library /test/lib
  * @run main/othervm/native
- *     -Djdk.virtualThreadScheduler.parallelism=9
  *     -Djdk.attach.allowAttachSelf=true -XX:+EnableDynamicAgentLoading VThreadEventTest attach
  */
 
 import com.sun.tools.attach.VirtualMachine;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.LockSupport;
 import java.util.List;
 import java.util.ArrayList;
-
-/*
- * The test uses custom implementation of the CountDownLatch class.
- * The reason is we want the state of tested thread to be predictable.
- * With java.util.concurrent.CountDownLatch it is not clear what thread state is expected.
- */
-class CountDownLatch {
-    private int count = 0;
-
-    CountDownLatch(int count) {
-        this.count = count;
-    }
-
-    public synchronized void countDown() {
-        count--;
-        notify();
-    }
-
-    public synchronized void await() throws InterruptedException {
-        while (count > 0) {
-            wait(1);
-        }
-    }
-}
+import jdk.test.lib.thread.VThreadRunner;
 
 public class VThreadEventTest {
-    static final int TCNT1 = 10;
-    static final int TCNT2 = 4;
-    static final int TCNT3 = 4;
-    static final int THREAD_CNT = TCNT1 + TCNT2 + TCNT3;
+    static final int PARKED_THREAD_COUNT = 4;
+    static final int SPINNING_THREAD_COUNT = 4;
 
     private static void log(String msg) { System.out.println(msg); }
 
@@ -77,128 +52,96 @@ public class VThreadEventTest {
     private static native int threadUnmountCount();
 
     private static volatile boolean attached;
-    private static boolean failed;
-    private static List<Thread> test1Threads = new ArrayList(TCNT1);
-
-    private static CountDownLatch ready0 = new CountDownLatch(THREAD_CNT);
-    private static CountDownLatch ready1 = new CountDownLatch(TCNT1);
-    private static CountDownLatch ready2 = new CountDownLatch(THREAD_CNT);
-    private static CountDownLatch mready = new CountDownLatch(1);
-
-    private static void await(CountDownLatch dumpedLatch) {
-        try {
-            dumpedLatch.await();
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
+
+    // called by agent when it is initialized and has enabled events
+    static void agentStarted() {
+        attached = true;
     }
 
-    // The test1 vthreads are kept unmounted until interrupted after agent attach.
-    static final Runnable test1 = () -> {
-        synchronized (test1Threads) {
-            test1Threads.add(Thread.currentThread());
+    public static void main(String[] args) throws Exception {
+        if (Thread.currentThread().isVirtual()) {
+            System.out.println("Skipping test as current thread is a virtual thread");
+            return;
         }
-        log("test1 vthread started");
-        ready0.countDown();
-        await(mready);
-        ready1.countDown(); // to guaranty state is not State.WAITING after await(mready)
-        try {
-            Thread.sleep(20000); // big timeout to keep unmounted until interrupted
-        } catch (InterruptedException ex) {
-            // it is expected, ignore
+        VThreadRunner.ensureParallelism(SPINNING_THREAD_COUNT+1);
+
+        // start threads that park (unmount)
+        var threads1 = new ArrayList<Thread>();
+        for (int i = 0; i < PARKED_THREAD_COUNT; i++) {
+            var started = new AtomicBoolean();
+            var thread = Thread.startVirtualThread(() -> {
+                started.set(true);
+                LockSupport.park();
+            });
+
+            // wait for thread to start execution + park
+            while (!started.get()) {
+                Thread.sleep(10);
+            }
+            await(thread, Thread.State.WAITING);
+            threads1.add(thread);
         }
-        ready2.countDown();
-    };
-
-    // The test2 vthreads are kept mounted until agent attach.
-    static final Runnable test2 = () -> {
-        log("test2 vthread started");
-        ready0.countDown();
-        await(mready);
-        while (!attached) {
-            // keep mounted
+
+        // start threads that spin (stay mounted)
+        var threads2 = new ArrayList<Thread>();
+        for (int i = 0; i < SPINNING_THREAD_COUNT; i++) {
+            var started = new AtomicBoolean();
+            var thread = Thread.startVirtualThread(() -> {
+                started.set(true);
+                while (!attached) {
+                    Thread.onSpinWait();
+                }
+            });
+
+            // wait for thread to start execution
+            while (!started.get()) {
+                Thread.sleep(10);
+            }
+            threads2.add(thread);
         }
-        ready2.countDown();
-    };
-
-    // The test3 vthreads are kept mounted until agent attach.
-    static final Runnable test3 = () -> {
-        log("test3 vthread started");
-        ready0.countDown();
-        await(mready);
+
+        // attach to the current VM
+        VirtualMachine vm = VirtualMachine.attach(String.valueOf(ProcessHandle.current().pid()));
+        vm.loadAgentLibrary("VThreadEventTest");
+
+        // wait for agent to start
         while (!attached) {
-            // keep mounted
+            Thread.sleep(10);
         }
-        LockSupport.parkNanos(10_000_000L); // will cause extra mount and unmount
-        ready2.countDown();
-    };
 
-    public static void main(String[] args) throws Exception {
-        if (Runtime.getRuntime().availableProcessors() < 8) {
-            log("WARNING: test expects at least 8 processors.");
+        // unpark the threads that were parked
+        for (Thread thread : threads1) {
+            LockSupport.unpark(thread);
         }
-        try (ExecutorService executorService = Executors.newVirtualThreadPerTaskExecutor()) {
-            for (int i = 0; i < TCNT1; i++) {
-                executorService.execute(test1);
-            }
-            for (int i = 0; i < TCNT2; i++) {
-                executorService.execute(test2);
-            }
-            for (int i = 0; i < TCNT3; i++) {
-                executorService.execute(test3);
-            }
-            await(ready0);
-            mready.countDown();
-            await(ready1); // to guarantee state is not State.TIMED_WAITING after await(mready) in test1()
-            // wait for test1 threads to reach TIMED_WAITING state in sleep()
-            for (Thread t : test1Threads) {
-                Thread.State state = t.getState();
-                log("DBG: state: " + state);
-                while (state != Thread.State.TIMED_WAITING) {
-                    Thread.sleep(10);
-                    state = t.getState();
-                    log("DBG: state: " + state);
-                }
-            }
-
-            VirtualMachine vm = VirtualMachine.attach(String.valueOf(ProcessHandle.current().pid()));
-            vm.loadAgentLibrary("VThreadEventTest");
-            Thread.sleep(200); // to allow the agent to get ready
 
-            attached = true;
-            for (Thread t : test1Threads) {
-                 t.interrupt();
-            }
-            ready2.await();
+        // wait for all threads to terminate
+        for (Thread thread : threads1) {
+            thread.join();
         }
-        // wait until all VirtualThreadEnd events have been sent
-        for (int sleepNo = 1; threadEndCount() < THREAD_CNT; sleepNo++) {
-            Thread.sleep(100);
-            if (sleepNo % 100 == 0) { // 10 sec period of waiting
-                log("main: waited seconds: " + sleepNo/10);
-            }
+        for (Thread thread : threads2) {
+            thread.join();
         }
+
         int threadEndCnt = threadEndCount();
         int threadMountCnt = threadMountCount();
         int threadUnmountCnt = threadUnmountCount();
-        int threadEndExp = THREAD_CNT;
-        int threadMountExp = THREAD_CNT - TCNT2;
-        int threadUnmountExp = THREAD_CNT + TCNT3;
 
-        log("ThreadEnd cnt: "     + threadEndCnt     + " (expected: " + threadEndExp + ")");
-        log("ThreadMount cnt: "   + threadMountCnt   + " (expected: " + threadMountExp + ")");
-        log("ThreadUnmount cnt: " + threadUnmountCnt + " (expected: " + threadUnmountExp + ")");
+        int threadCount = PARKED_THREAD_COUNT + SPINNING_THREAD_COUNT;
+        log("VirtualThreadEnd events: " + threadEndCnt + ", expected: " + threadCount);
+        log("VirtualThreadMount events: " + threadMountCnt + ", expected: " + PARKED_THREAD_COUNT);
+        log("VirtualThreadUnmount events: " + threadUnmountCnt + ", expected: " + threadCount);
 
-        if (threadEndCnt != threadEndExp) {
-            log("FAILED: unexpected count of ThreadEnd events");
+        boolean failed = false;
+        if (threadEndCnt != threadCount) {
+            log("FAILED: unexpected count of VirtualThreadEnd events");
             failed = true;
         }
-        if (threadMountCnt != threadMountExp) {
-            log("FAILED: unexpected count of ThreadMount events");
+        if (threadMountCnt != PARKED_THREAD_COUNT) {
+            log("FAILED: unexpected count of VirtualThreadMount events");
             failed = true;
         }
-        if (threadUnmountCnt != threadUnmountExp) {
-            log("FAILED: unexpected count of ThreadUnmount events");
+        if (threadUnmountCnt != threadCount) {
+            log("FAILED: unexpected count of VirtualThreadUnmount events");
             failed = true;
         }
         if (failed) {
@@ -206,5 +149,14 @@ public static void main(String[] args) throws Exception {
         }
     }
 
+    private static void await(Thread thread, Thread.State expectedState) throws InterruptedException {
+        Thread.State state = thread.getState();
+        while (state != expectedState) {
+            assert state != Thread.State.TERMINATED : "Thread has terminated";
+            Thread.sleep(10);
+            state = thread.getState();
+        }
+    }
+
 }
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/libVThreadEventTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/libVThreadEventTest.cpp
index afd06e66b32cc..c97a8ef3471aa 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/libVThreadEventTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/libVThreadEventTest.cpp
@@ -65,6 +65,11 @@ Agent_OnAttach(JavaVM *vm, char *options, void *reserved) {
   jvmtiEventCallbacks callbacks;
   jvmtiCapabilities caps;
   jvmtiError err;
+  JNIEnv *env;
+  jsize nVMs;
+  jint res;
+  jclass clazz;
+  jmethodID mid;
 
   LOG("Agent_OnAttach started\n");
   if (vm->GetEnv(reinterpret_cast<void **>(&jvmti), JVMTI_VERSION) != JNI_OK || !jvmti) {
@@ -97,6 +102,41 @@ Agent_OnAttach(JavaVM *vm, char *options, void *reserved) {
   check_jvmti_error(err, "SetEventNotificationMode for VirtualThreadUnmount");
 
   LOG("vthread events enabled\n");
+
+  // call VThreadEventTest.agentStarted to notify test that agent has started
+
+  res = JNI_GetCreatedJavaVMs(&vm, 1, &nVMs);
+  if (res != JNI_OK) {
+      LOG("JNI_GetCreatedJavaVMs failed: %d\n", res);
+      return JNI_ERR;
+  }
+
+  res = vm->GetEnv((void **) &env, JNI_VERSION_21);
+  if (res != JNI_OK) {
+    LOG("GetEnv failed: %d\n", res);
+    return JNI_ERR;
+  }
+
+  clazz = env->FindClass("VThreadEventTest");
+  if (clazz == NULL) {
+      LOG("FindClass failed\n");
+      return JNI_ERR;
+  }
+
+  mid = env->GetStaticMethodID(clazz, "agentStarted", "()V");
+  if (mid == NULL) {
+      LOG("GetStaticMethodID failed\n");
+      return JNI_ERR;
+  }
+
+  env->CallStaticVoidMethod(clazz, mid);
+  if (env->ExceptionOccurred()) {
+      LOG("CallStaticVoidMethod failed\n");
+      return JNI_ERR;
+  }
+
+  LOG("Agent_OnAttach done\n");
+
   return JVMTI_ERROR_NONE;
 }
 
diff --git a/test/jdk/java/lang/Thread/virtual/CarrierThreadInfo.java b/test/jdk/java/lang/Thread/virtual/CarrierThreadInfo.java
new file mode 100644
index 0000000000000..75ef0376a7e0e
--- /dev/null
+++ b/test/jdk/java/lang/Thread/virtual/CarrierThreadInfo.java
@@ -0,0 +1,243 @@
+/*
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 id=default
+ * @bug 8284161 8286788
+ * @summary Test java.lang.management.ThreadInfo contains expected information for carrier threads
+ * @requires vm.continuations
+ * @modules java.base/java.lang:+open
+ * @library /test/lib
+ * @run junit CarrierThreadInfo
+ */
+
+/**
+ * @test id=LM_LIGHTWEIGHT
+ * @requires vm.continuations
+ * @modules java.base/java.lang:+open
+ * @library /test/lib
+ * @run junit/othervm -XX:LockingMode=2 CarrierThreadInfo
+ */
+
+/**
+ * @test id=LM_LEGACY
+ * @requires vm.continuations
+ * @modules java.base/java.lang:+open
+ * @library /test/lib
+ * @run junit/othervm -XX:LockingMode=1 CarrierThreadInfo
+ */
+
+/**
+ * @test id=LM_MONITOR
+ * @requires vm.continuations
+ * @modules java.base/java.lang:+open
+ * @library /test/lib
+ * @run junit/othervm -XX:LockingMode=0 CarrierThreadInfo
+ */
+
+import java.lang.management.LockInfo;
+import java.lang.management.ManagementFactory;
+import java.lang.management.ThreadInfo;
+import java.lang.management.ThreadMXBean;
+import java.util.Arrays;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+
+import jdk.test.lib.thread.VThreadScheduler;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+class CarrierThreadInfo {
+
+    /**
+     * Test that ThreadInfo.getLockedMonitors returns information about a lock held by
+     * a carrier thread.
+     */
+    @Test
+    void testCarrierThreadHoldsLock() throws Exception {
+        Object lock = new Object();
+        ThreadFactory factory = task -> Thread.ofPlatform().unstarted(() -> {
+            synchronized (lock) {
+                task.run();
+            }
+        });
+
+        try (var scheduler = new CustomScheduler(factory)) {
+            var started = new AtomicBoolean();
+            var done = new AtomicBoolean();
+            Thread vthread = scheduler.forkVirtualThread(() -> {
+                started.set(true);
+                while (!done.get()) {
+                    Thread.onSpinWait();
+                }
+            });
+            try {
+                awaitTrue(started);
+
+                // carrier threads holds the lock
+                long carrierId = scheduler.carrier().threadId();
+                ThreadInfo threadInfo = ManagementFactory.getPlatformMXBean(ThreadMXBean.class)
+                        .getThreadInfo(new long[] { carrierId }, true, true)[0];
+                boolean holdsLock = Arrays.stream(threadInfo.getLockedMonitors())
+                        .anyMatch(mi -> mi.getIdentityHashCode() == System.identityHashCode(lock));
+                assertTrue(holdsLock, "Carrier should hold lock");
+
+            } finally {
+                done.set(true);
+            }
+        }
+    }
+
+    /**
+     * Test that ThreadInfo.getLockedMonitors does not return information about a lock
+     * held by mounted virtual thread.
+     */
+    @Test
+    void testVirtualThreadHoldsLock() throws Exception {
+        ThreadFactory factory = Executors.defaultThreadFactory();
+        try (var scheduler = new CustomScheduler(factory)) {
+            var started = new AtomicBoolean();
+            var lock = new Object();
+            var done = new AtomicBoolean();
+            Thread vthread = scheduler.forkVirtualThread(() -> {
+                started.set(true);
+                while (!done.get()) {
+                    Thread.onSpinWait();
+                }
+            });
+            try {
+                awaitTrue(started);
+
+                // carrier threads does not hold lock
+                long carrierId = scheduler.carrier().threadId();
+                ThreadInfo threadInfo = ManagementFactory.getPlatformMXBean(ThreadMXBean.class)
+                        .getThreadInfo(new long[] { carrierId }, true, true)[0];
+                boolean holdsLock = Arrays.stream(threadInfo.getLockedMonitors())
+                        .anyMatch(mi -> mi.getIdentityHashCode() == System.identityHashCode(lock));
+                assertFalse(holdsLock, "Carrier should not hold lock");
+
+            } finally {
+                done.set(true);
+            }
+        }
+    }
+
+    /**
+     * Test that ThreadInfo.getLockOwnerId and getLockInfo return information about a
+     * synthetic lock that make it appear that the carrier is blocking waiting on the
+     * virtual thread.
+     */
+    @Test
+    void testCarrierThreadWaits() throws Exception {
+        ThreadFactory factory = Executors.defaultThreadFactory();
+        try (var scheduler = new CustomScheduler(factory)) {
+            var started = new AtomicBoolean();
+            var done = new AtomicBoolean();
+            Thread vthread = scheduler.forkVirtualThread(() -> {
+                started.set(true);
+                while (!done.get()) {
+                    Thread.onSpinWait();
+                }
+            });
+            try {
+                awaitTrue(started);
+
+                long carrierId = scheduler.carrier().threadId();
+                long vthreadId = vthread.threadId();
+
+                ThreadInfo threadInfo = ManagementFactory.getThreadMXBean().getThreadInfo(carrierId);
+                assertNotNull(threadInfo);
+
+                // carrier should be blocked waiting for lock owned by virtual thread
+                assertEquals(vthreadId, threadInfo.getLockOwnerId());
+
+                // carrier thread should be on blocked waiting on virtual thread
+                LockInfo lockInfo = threadInfo.getLockInfo();
+                assertNotNull(lockInfo);
+                assertEquals(vthread.getClass().getName(), lockInfo.getClassName());
+                assertEquals(System.identityHashCode(vthread), lockInfo.getIdentityHashCode());
+
+            } finally {
+                done.set(true);
+            }
+        }
+    }
+
+    /**
+     * Custom scheduler with a single carrier thread.
+     */
+    private static class CustomScheduler implements AutoCloseable {
+        private final ExecutorService pool;
+        private final Executor scheduler;
+        private final AtomicReference<Thread> carrierRef = new AtomicReference<>();
+
+        CustomScheduler(ThreadFactory factory) {
+            pool = Executors.newSingleThreadExecutor(factory);
+            scheduler = task -> {
+                pool.submit(() -> {
+                    carrierRef.set(Thread.currentThread());
+                    try {
+                        task.run();
+                    } finally {
+                        carrierRef.set(null);
+                    }
+                });
+            };
+        }
+
+        /**
+         * Returns the carrier thread if a virtual thread is mounted.
+         */
+        Thread carrier() throws InterruptedException {
+            return carrierRef.get();
+        }
+
+        /**
+         * Starts a virtual thread to execute the give task.
+         */
+        Thread forkVirtualThread(Runnable task) {
+            ThreadFactory factory = VThreadScheduler.virtualThreadFactory(scheduler);
+            Thread thread = factory.newThread(task);
+            thread.start();
+            return thread;
+        }
+
+        @Override
+        public void close() {
+            pool.close();
+        }
+    }
+
+    /**
+     * Waits for the boolean value to become true.
+     */
+    private static void awaitTrue(AtomicBoolean ref) throws InterruptedException {
+        while (!ref.get()) {
+            Thread.sleep(20);
+        }
+    }
+}
diff --git a/test/jdk/java/lang/Thread/virtual/CarrierThreadWaits.java b/test/jdk/java/lang/Thread/virtual/CarrierThreadWaits.java
deleted file mode 100644
index d1d5e72204f0f..0000000000000
--- a/test/jdk/java/lang/Thread/virtual/CarrierThreadWaits.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2022, 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 8284161 8286788
- * @summary Test that a carrier thread waits on a virtual thread
- * @requires vm.continuations
- * @modules java.base/java.lang:+open
- * @run junit CarrierThreadWaits
- */
-
-/**
- * @test
- * @requires vm.continuations & vm.debug
- * @modules java.base/java.lang:+open
- * @run junit/othervm -XX:LockingMode=0 CarrierThreadWaits
- */
-
-import java.lang.management.LockInfo;
-import java.lang.management.ManagementFactory;
-import java.lang.management.ThreadInfo;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ForkJoinPool;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
-class CarrierThreadWaits {
-
-    @Test
-    void testCarrierThreadWaiting() throws Exception {
-        try (ForkJoinPool pool = new ForkJoinPool(1)) {
-            var carrierRef = new AtomicReference<Thread>();
-            var vthreadRef = new AtomicReference<Thread>();
-
-            Executor scheduler = task -> {
-                pool.submit(() -> {
-                    Thread carrier = Thread.currentThread();
-                    carrierRef.set(carrier);
-                    Thread vthread = vthreadRef.get();
-
-                    System.err.format("%s run task (%s) ...%n", carrier, vthread);
-                    task.run();
-                    System.err.format("%s task done (%s)%n", carrier, vthread);
-                });
-            };
-
-            // start a virtual thread that spins and remains mounted until "done"
-            var started = new AtomicBoolean();
-            var done = new AtomicBoolean();
-            Thread.Builder builder = ThreadBuilders.virtualThreadBuilder(scheduler);
-            Thread vthread = builder.unstarted(() -> {
-                started.set(true);
-                while (!done.get()) {
-                    Thread.onSpinWait();
-                }
-            });
-            vthreadRef.set(vthread);
-            vthread.start();
-
-            try {
-                // wait for virtual thread to start
-                while (!started.get()) {
-                    Thread.sleep(10);
-                }
-
-                Thread carrier = carrierRef.get();
-
-                long carrierId = carrier.threadId();
-                long vthreadId = vthread.threadId();
-
-                // carrier thread should be on WAITING on virtual thread
-                ThreadInfo ti = ManagementFactory.getThreadMXBean().getThreadInfo(carrierId);
-                Thread.State state = ti.getThreadState();
-                LockInfo lockInfo = ti.getLockInfo();
-                assertEquals(Thread.State.WAITING, state);
-                assertNotNull(lockInfo);
-                assertEquals(vthread.getClass().getName(), lockInfo.getClassName());
-                assertEquals(System.identityHashCode(vthread), lockInfo.getIdentityHashCode());
-                assertEquals(vthreadId, ti.getLockOwnerId());
-            } finally {
-                done.set(true);
-            }
-        }
-    }
-
-}
diff --git a/test/jdk/java/lang/Thread/virtual/CustomScheduler.java b/test/jdk/java/lang/Thread/virtual/CustomScheduler.java
index 5bde81905ecdc..4289add0a3ad0 100644
--- a/test/jdk/java/lang/Thread/virtual/CustomScheduler.java
+++ b/test/jdk/java/lang/Thread/virtual/CustomScheduler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @summary Test virtual threads using a custom scheduler
  * @requires vm.continuations
  * @modules java.base/java.lang:+open
+ * @library /test/lib
  * @run junit CustomScheduler
  */
 
@@ -35,9 +36,12 @@
 import java.util.List;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.LockSupport;
 
+import jdk.test.lib.thread.VThreadScheduler;
+import jdk.test.lib.thread.VThreadRunner;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.AfterAll;
@@ -65,10 +69,13 @@ static void shutdown() {
      */
     @Test
     void testCustomScheduler1() throws Exception {
-        AtomicReference<Executor> ref = new AtomicReference<>();
-        ThreadBuilders.virtualThreadBuilder(scheduler1).start(() -> {
-            ref.set(scheduler(Thread.currentThread()));
-        }).join();
+        var ref = new AtomicReference<Executor>();
+        ThreadFactory factory = VThreadScheduler.virtualThreadFactory(scheduler1);
+        Thread thread = factory.newThread(() -> {
+            ref.set(VThreadScheduler.scheduler(Thread.currentThread()));
+        });
+        thread.start();
+        thread.join();
         assertTrue(ref.get() == scheduler1);
     }
 
@@ -77,17 +84,7 @@ void testCustomScheduler1() throws Exception {
      */
     @Test
     void testCustomScheduler2() throws Exception {
-        AtomicReference<Executor> ref = new AtomicReference<>();
-        Thread.ofVirtual().start(() -> {
-            try {
-                ThreadBuilders.virtualThreadBuilder(scheduler1).start(() -> {
-                    ref.set(scheduler(Thread.currentThread()));
-                }).join();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }).join();
-        assertTrue(ref.get() == scheduler1);
+        VThreadRunner.run(this::testCustomScheduler1);
     }
 
     /**
@@ -96,16 +93,19 @@ void testCustomScheduler2() throws Exception {
      */
     @Test
     void testCustomScheduler3() throws Exception {
-        AtomicReference<Executor> ref = new AtomicReference<>();
-        ThreadBuilders.virtualThreadBuilder(scheduler1).start(() -> {
+        var ref = new AtomicReference<Executor>();
+        ThreadFactory factory = VThreadScheduler.virtualThreadFactory(scheduler1);
+        Thread thread = factory.newThread(() -> {
             try {
                 Thread.ofVirtual().start(() -> {
-                    ref.set(scheduler(Thread.currentThread()));
+                    ref.set(VThreadScheduler.scheduler(Thread.currentThread()));
                 }).join();
             } catch (Exception e) {
                 e.printStackTrace();
             }
-        }).join();
+        });
+        thread.start();
+        thread.join();
         assertTrue(ref.get() == scheduler1);
     }
 
@@ -115,16 +115,22 @@ void testCustomScheduler3() throws Exception {
      */
     @Test
     void testCustomScheduler4() throws Exception {
-        AtomicReference<Executor> ref = new AtomicReference<>();
-        ThreadBuilders.virtualThreadBuilder(scheduler1).start(() -> {
+        var ref = new AtomicReference<Executor>();
+        ThreadFactory factory1 = VThreadScheduler.virtualThreadFactory(scheduler1);
+        ThreadFactory factory2 = VThreadScheduler.virtualThreadFactory(scheduler2);
+        Thread thread1 = factory1.newThread(() -> {
             try {
-                ThreadBuilders.virtualThreadBuilder(scheduler2).start(() -> {
-                    ref.set(scheduler(Thread.currentThread()));
-                }).join();
+                Thread thread2 = factory2.newThread(() -> {
+                    ref.set(VThreadScheduler.scheduler(Thread.currentThread()));
+                });
+                thread2.start();
+                thread2.join();
             } catch (Exception e) {
                 e.printStackTrace();
             }
-        }).join();
+        });
+        thread1.start();
+        thread1.join();
         assertTrue(ref.get() == scheduler2);
     }
 
@@ -149,8 +155,9 @@ void testBadCarrier() {
             }
             assertTrue(exc.get() instanceof WrongThreadException);
         };
-
-        ThreadBuilders.virtualThreadBuilder(scheduler).start(LockSupport::park);
+        ThreadFactory factory = VThreadScheduler.virtualThreadFactory(scheduler);
+        Thread thread = factory.newThread(LockSupport::park);
+        thread.start();
     }
 
     /**
@@ -162,11 +169,12 @@ void testParkWithInterruptSet() {
         Thread carrier = Thread.currentThread();
         assumeFalse(carrier.isVirtual(), "Main thread is a virtual thread");
         try {
-            var builder = ThreadBuilders.virtualThreadBuilder(Runnable::run);
-            Thread vthread = builder.start(() -> {
+            ThreadFactory factory = VThreadScheduler.virtualThreadFactory(Runnable::run);
+            Thread vthread = factory.newThread(() -> {
                 Thread.currentThread().interrupt();
                 Thread.yield();
             });
+            vthread.start();
             assertTrue(vthread.isInterrupted());
             assertFalse(carrier.isInterrupted());
         } finally {
@@ -183,10 +191,11 @@ void testTerminateWithInterruptSet() {
         Thread carrier = Thread.currentThread();
         assumeFalse(carrier.isVirtual(), "Main thread is a virtual thread");
         try {
-            var builder = ThreadBuilders.virtualThreadBuilder(Runnable::run);
-            Thread vthread = builder.start(() -> {
+            ThreadFactory factory = VThreadScheduler.virtualThreadFactory(Runnable::run);
+            Thread vthread = factory.newThread(() -> {
                 Thread.currentThread().interrupt();
             });
+            vthread.start();
             assertTrue(vthread.isInterrupted());
             assertFalse(carrier.isInterrupted());
         } finally {
@@ -204,11 +213,13 @@ void testRunWithInterruptSet() throws Exception {
             Thread.currentThread().interrupt();
             task.run();
         };
+        ThreadFactory factory = VThreadScheduler.virtualThreadFactory(scheduler);
         try {
             AtomicBoolean interrupted = new AtomicBoolean();
-            Thread vthread = ThreadBuilders.virtualThreadBuilder(scheduler).start(() -> {
+            Thread vthread = factory.newThread(() -> {
                 interrupted.set(Thread.currentThread().isInterrupted());
             });
+            vthread.start();
             assertFalse(vthread.isInterrupted());
         } finally {
             Thread.interrupted();
@@ -216,18 +227,60 @@ void testRunWithInterruptSet() throws Exception {
     }
 
     /**
-     * Returns the scheduler for the given virtual thread.
+     * Test custom scheduler throwing OOME when starting a thread.
      */
-    private static Executor scheduler(Thread thread) {
-        if (!thread.isVirtual())
-            throw new IllegalArgumentException("Not a virtual thread");
-        try {
-            Field scheduler = Class.forName("java.lang.VirtualThread")
-                    .getDeclaredField("scheduler");
-            scheduler.setAccessible(true);
-            return (Executor) scheduler.get(thread);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
+    @Test
+    void testThreadStartOOME() throws Exception {
+        Executor scheduler = task -> {
+            System.err.println("OutOfMemoryError");
+            throw new OutOfMemoryError();
+        };
+        ThreadFactory factory = VThreadScheduler.virtualThreadFactory(scheduler);
+        Thread thread = factory.newThread(() -> { });
+        assertThrows(OutOfMemoryError.class, thread::start);
+    }
+
+    /**
+     * Test custom scheduler throwing OOME when unparking a thread.
+     */
+    @Test
+    void testThreadUnparkOOME() throws Exception {
+        try (ExecutorService executor = Executors.newFixedThreadPool(1)) {
+            AtomicInteger counter = new AtomicInteger();
+            Executor scheduler = task -> {
+                switch (counter.getAndIncrement()) {
+                    case 0 -> executor.execute(task);             // Thread.start
+                    case 1, 2 -> {                                // unpark attempt 1+2
+                        System.err.println("OutOfMemoryError");
+                        throw new OutOfMemoryError();
+                    }
+                    default -> executor.execute(task);
+                }
+                executor.execute(task);
+            };
+
+            // start thread and wait for it to park
+            ThreadFactory factory = VThreadScheduler.virtualThreadFactory(scheduler);
+            var thread = factory.newThread(LockSupport::park);
+            thread.start();
+            await(thread, Thread.State.WAITING);
+
+            // unpark thread, this should retry until OOME is not thrown
+            LockSupport.unpark(thread);
+            thread.join();
+        }
+
+    }
+
+    /**
+     * Waits for the given thread to reach a given state.
+     */
+    private void await(Thread thread, Thread.State expectedState) throws InterruptedException {
+        Thread.State state = thread.getState();
+        while (state != expectedState) {
+            assertTrue(state != Thread.State.TERMINATED, "Thread has terminated");
+            Thread.sleep(10);
+            state = thread.getState();
         }
     }
 }
diff --git a/test/jdk/java/lang/Thread/virtual/GetStackTrace.java b/test/jdk/java/lang/Thread/virtual/GetStackTrace.java
deleted file mode 100644
index 86d5cf7319c3e..0000000000000
--- a/test/jdk/java/lang/Thread/virtual/GetStackTrace.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2022, 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
- * @summary Test Thread.getStackTrace to examine the stack trace of a virtual
- *     thread and its carrier
- * @requires vm.continuations
- * @modules java.base/java.lang:+open
- * @run main GetStackTrace
- */
-
-import java.util.Objects;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.Executor;
-import java.util.concurrent.LinkedTransferQueue;
-import java.util.stream.Stream;
-
-public class GetStackTrace {
-
-    private static final Object LOCK = new Object();
-
-    public static void main(String[] args) throws Exception {
-        try (var scheduler = new Scheduler()) {
-            Thread vthread = scheduler.startVirtualThread(() -> {
-                synchronized (LOCK) {
-                    try {
-                        LOCK.wait();
-                    } catch (InterruptedException e) { }
-                }
-            });
-
-            try {
-                // wait for virtual thread to wait
-                while (vthread.getState() != Thread.State.WAITING) {
-                    Thread.sleep(10);
-                }
-
-                // bottom-most frame of virtual thread should be VirtualThread.run
-                System.out.println(vthread);
-                StackTraceElement[] vthreadStack = vthread.getStackTrace();
-                Stream.of(vthreadStack).forEach(System.out::println);
-                assertEquals("run", vthreadStack[vthreadStack.length - 1].getMethodName());
-
-                System.out.println();
-
-                // top-most frame of carrier thread should be Continuation.run
-                // bottom-most frame of carrier thread should be Thread.run
-                var carrier = scheduler.thread();
-                System.out.println(carrier);
-                StackTraceElement[] carrierStack = carrier.getStackTrace();
-                Stream.of(carrierStack).forEach(System.out::println);
-                assertEquals("run", carrierStack[0].getMethodName());
-                assertEquals("run", carrierStack[carrierStack.length - 1].getMethodName());
-            } finally {
-                vthread.interrupt();
-            }
-        }
-    }
-
-    /**
-     * A scheduler with one thread.
-     */
-    private static class Scheduler implements AutoCloseable, Executor {
-        private final BlockingQueue<Runnable> tasks = new LinkedTransferQueue<>();
-        private final Thread thread;
-        private volatile boolean done;
-
-        Scheduler() {
-            this.thread = Thread.ofPlatform().start(() -> {
-                try {
-                    while (!done) {
-                        Runnable task = tasks.take();
-                        task.run();
-                    }
-                } catch (InterruptedException e) { }
-            });
-        }
-
-        Thread thread() {
-            return thread;
-        }
-
-        @Override
-        public void close() throws InterruptedException {
-            done = true;
-            thread.interrupt();
-            thread.join();
-        }
-
-        @Override
-        public void execute(Runnable task) {
-            tasks.add(task);
-        }
-
-        Thread startVirtualThread(Runnable task) {
-            return ThreadBuilders.virtualThreadBuilder(this).start(task);
-        }
-    }
-
-    private static void assertTrue(boolean e) {
-        if (!e) throw new RuntimeException();
-    }
-
-    private static void assertEquals(Object x, Object y) {
-        if (!Objects.equals(x, y))
-            throw new RuntimeException();
-    }
-}
diff --git a/test/jdk/java/lang/Thread/virtual/GetStackTraceWhenRunnable.java b/test/jdk/java/lang/Thread/virtual/GetStackTraceWhenRunnable.java
deleted file mode 100644
index 38760eb52a8f0..0000000000000
--- a/test/jdk/java/lang/Thread/virtual/GetStackTraceWhenRunnable.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2021, 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
- * @summary Test Thread::getStackTrace on a virtual thread that is runnable-unmounted
- * @requires vm.continuations
- * @run main/othervm -Djdk.virtualThreadScheduler.maxPoolSize=1 GetStackTraceWhenRunnable
- */
-
-import java.io.IOException;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.locks.LockSupport;
-
-public class GetStackTraceWhenRunnable {
-
-    public static void main(String[] args) throws Exception {
-
-        // start thread1 and wait for it to park
-        Thread thread1 = Thread.startVirtualThread(LockSupport::park);
-        while (thread1.getState() != Thread.State.WAITING) {
-            Thread.sleep(20);
-        }
-
-        // start thread2 to pin the carrier thread
-        var started = new AtomicBoolean();
-        var done = new AtomicBoolean();
-        Thread thread2 = Thread.startVirtualThread(() -> {
-            started.set(true);
-            while (!done.get()) {
-                Thread.onSpinWait();
-            }
-        });
-        try {
-            // wait for thread2 to start
-            while (!started.get()) {
-                Thread.sleep(10);
-            }
-
-            // unpark thread1 and check that it is "stuck" in the runnable state
-            // (the carrier thread is pinned, no other virtual thread can run)
-            LockSupport.unpark(thread1);
-            for (int i = 0; i < 5; i++) {
-                assertTrue(thread1.getState() == Thread.State.RUNNABLE);
-                Thread.sleep(100);
-            }
-
-            // print thread1's stack trace
-            StackTraceElement[] stack = thread1.getStackTrace();
-            assertTrue(stack.length > 0);
-            for (StackTraceElement e : stack) {
-                System.out.println(e);
-            }
-        } finally {
-            done.set(true);
-            thread2.join();
-            thread1.join();
-        }
-    }
-
-    static void assertTrue(boolean e) {
-        if (!e) throw new RuntimeException();
-    }
-}
diff --git a/test/jdk/java/lang/Thread/virtual/JfrEvents.java b/test/jdk/java/lang/Thread/virtual/JfrEvents.java
index 282a8959fe879..539ac2104ed93 100644
--- a/test/jdk/java/lang/Thread/virtual/JfrEvents.java
+++ b/test/jdk/java/lang/Thread/virtual/JfrEvents.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,9 +40,7 @@
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.LockSupport;
-import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -52,15 +50,25 @@
 import jdk.jfr.consumer.RecordingFile;
 
 import jdk.test.lib.thread.VThreadPinner;
-import jdk.test.lib.thread.VThreadRunner.ThrowingRunnable;
+import jdk.test.lib.thread.VThreadRunner;
+import jdk.test.lib.thread.VThreadScheduler;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
 import static org.junit.jupiter.api.Assertions.*;
 
 class JfrEvents {
 
+    @BeforeAll
+    static void setup() {
+        int minParallelism = 2;
+        if (Thread.currentThread().isVirtual()) {
+            minParallelism++;
+        }
+        VThreadRunner.ensureParallelism(minParallelism);
+    }
+
     /**
      * Test jdk.VirtualThreadStart and jdk.VirtualThreadEnd events.
      */
@@ -93,100 +101,42 @@ void testVirtualThreadStartAndEnd() throws Exception {
     }
 
     /**
-     * Arguments for testVirtualThreadPinned to test jdk.VirtualThreadPinned event.
-     *   [0] label/description
-     *   [1] the operation to park/wait
-     *   [2] the Thread.State when parked/waiting
-     *   [3] the action to unpark/notify the thread
-     */
-    static Stream<Arguments> pinnedCases() {
-        Object lock = new Object();
-
-        // park with native frame on stack
-        var finish1 = new AtomicBoolean();
-        var parkWhenPinned = Arguments.of(
-            "LockSupport.park when pinned",
-            (ThrowingRunnable<Exception>) () -> {
-                VThreadPinner.runPinned(() -> {
-                    while (!finish1.get()) {
-                        LockSupport.park();
-                    }
-                });
-            },
-            Thread.State.WAITING,
-                (Consumer<Thread>) t -> {
-                    finish1.set(true);
-                    LockSupport.unpark(t);
-                }
-        );
-
-        // timed park with native frame on stack
-        var finish2 = new AtomicBoolean();
-        var timedParkWhenPinned = Arguments.of(
-            "LockSupport.parkNanos when pinned",
-            (ThrowingRunnable<Exception>) () -> {
-                VThreadPinner.runPinned(() -> {
-                    while (!finish2.get()) {
-                        LockSupport.parkNanos(Long.MAX_VALUE);
-                    }
-                });
-            },
-            Thread.State.TIMED_WAITING,
-            (Consumer<Thread>) t -> {
-                finish2.set(true);
-                LockSupport.unpark(t);
-            }
-        );
-
-        return Stream.of(parkWhenPinned, timedParkWhenPinned);
-    }
-
-    /**
-     * Test jdk.VirtualThreadPinned event.
+     * Test jdk.VirtualThreadPinned event when parking while pinned.
      */
     @ParameterizedTest
-    @MethodSource("pinnedCases")
-    void testVirtualThreadPinned(String label,
-                                 ThrowingRunnable<Exception> parker,
-                                 Thread.State expectedState,
-                                 Consumer<Thread> unparker) throws Exception {
-
+    @ValueSource(booleans = { true, false })
+    void testParkWhenPinned(boolean timed) throws Exception {
         try (Recording recording = new Recording()) {
             recording.enable("jdk.VirtualThreadPinned");
-
             recording.start();
-            try {
-                var exception = new AtomicReference<Throwable>();
-                var thread = Thread.ofVirtual().start(() -> {
-                    try {
-                        parker.run();
-                    } catch (Throwable e) {
-                        exception.set(e);
+
+            var started = new AtomicBoolean();
+            var done = new AtomicBoolean();
+            var vthread = Thread.startVirtualThread(() -> {
+                VThreadPinner.runPinned(() -> {
+                    started.set(true);
+                    while (!done.get()) {
+                        if (timed) {
+                            LockSupport.parkNanos(Long.MAX_VALUE);
+                        } else {
+                            LockSupport.park();
+                        }
                     }
                 });
-                try {
-                    // wait for thread to park/wait
-                    Thread.State state = thread.getState();
-                    while (state != expectedState) {
-                        assertTrue(state != Thread.State.TERMINATED, thread.toString());
-                        Thread.sleep(10);
-                        state = thread.getState();
-                    }
-                } finally {
-                    unparker.accept(thread);
-                    thread.join();
-                    assertNull(exception.get());
-                }
+            });
+
+            try {
+                // wait for thread to start and park
+                awaitTrue(started);
+                await(vthread, timed ? Thread.State.TIMED_WAITING : Thread.State.WAITING);
             } finally {
+                done.set(true);
+                LockSupport.unpark(vthread);
+                vthread.join();
                 recording.stop();
             }
 
-            Map<String, Integer> events = sumEvents(recording);
-            System.err.println(events);
-
-            // should have at least one pinned event
-            int pinnedCount = events.getOrDefault("jdk.VirtualThreadPinned", 0);
-            assertTrue(pinnedCount >= 1, "Expected one or more events");
+            assertContainsPinnedEvent(recording, vthread);
         }
     }
 
@@ -203,16 +153,14 @@ void testVirtualThreadSubmitFailed() throws Exception {
                 Executor scheduler = task -> pool.execute(task);
 
                 // create virtual thread that uses custom scheduler
-                ThreadFactory factory = ThreadBuilders.virtualThreadBuilder(scheduler).factory();
+                ThreadFactory factory = VThreadScheduler.virtualThreadFactory(scheduler);
 
                 // start a thread
                 Thread thread = factory.newThread(LockSupport::park);
                 thread.start();
 
                 // wait for thread to park
-                while (thread.getState() != Thread.State.WAITING) {
-                    Thread.sleep(10);
-                }
+                await(thread, Thread.State.WAITING);
 
                 // shutdown scheduler
                 pool.shutdown();
@@ -232,14 +180,23 @@ void testVirtualThreadSubmitFailed() throws Exception {
                 recording.stop();
             }
 
-            Map<String, Integer> events = sumEvents(recording);
-            System.err.println(events);
-
-            int count = events.getOrDefault("jdk.VirtualThreadSubmitFailed", 0);
-            assertEquals(2, count);
+            List<RecordedEvent> submitFailedEvents = find(recording, "jdk.VirtualThreadSubmitFailed");
+            System.err.println(submitFailedEvents);
+            assertTrue(submitFailedEvents.size() == 2, "Expected two events");
         }
     }
 
+    /**
+     * Returns the list of events in the given recording with the given name.
+     */
+    private static List<RecordedEvent> find(Recording recording, String name) throws IOException {
+        Path recordingFile = recordingFile(recording);
+        return RecordingFile.readAllEvents(recordingFile)
+                .stream()
+                .filter(e -> e.getEventType().getName().equals(name))
+                .toList();
+    }
+
     /**
      * Read the events from the recording and return a map of event name to count.
      */
@@ -264,4 +221,38 @@ private static Path recordingFile(Recording recording) throws IOException {
         }
         return recordingFile;
     }
+
+    /**
+     * Assert that a recording contains a jdk.VirtualThreadPinned event on the given thread.
+     */
+    private void assertContainsPinnedEvent(Recording recording, Thread thread) throws IOException {
+        List<RecordedEvent> pinnedEvents = find(recording, "jdk.VirtualThreadPinned");
+        assertTrue(pinnedEvents.size() > 0, "No jdk.VirtualThreadPinned events in recording");
+        System.err.println(pinnedEvents);
+
+        long tid = thread.threadId();
+        assertTrue(pinnedEvents.stream()
+                        .anyMatch(e -> e.getThread().getJavaThreadId() == tid),
+                "jdk.VirtualThreadPinned for javaThreadId = " + tid + " not found");
+    }
+
+    /**
+     * Waits for the given boolean to be set to true.
+     */
+    private void awaitTrue(AtomicBoolean b) throws InterruptedException {
+        while (!b.get()) {
+            Thread.sleep(10);
+        }
+    }
+
+    /**
+     * Waits for the given thread to reach a given state.
+     */
+    private static void await(Thread thread, Thread.State expectedState) throws InterruptedException {
+        Thread.State state = thread.getState();
+        while (state != expectedState) {
+            Thread.sleep(10);
+            state = thread.getState();
+        }
+    }
 }
diff --git a/test/jdk/java/lang/Thread/virtual/MonitorEnterExit.java b/test/jdk/java/lang/Thread/virtual/MonitorEnterExit.java
new file mode 100644
index 0000000000000..d1f2bf0c1bfea
--- /dev/null
+++ b/test/jdk/java/lang/Thread/virtual/MonitorEnterExit.java
@@ -0,0 +1,410 @@
+/*
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 id=default
+ * @summary Test virtual thread with monitor enter/exit
+ * @modules java.base/java.lang:+open
+ * @library /test/lib
+ * @run junit/othervm --enable-native-access=ALL-UNNAMED MonitorEnterExit
+ */
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.LockSupport;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import jdk.test.lib.thread.VThreadPinner;
+import jdk.test.lib.thread.VThreadRunner;
+import jdk.test.lib.thread.VThreadScheduler;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.RepeatedTest;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.api.condition.*;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assumptions.*;
+
+class MonitorEnterExit {
+    static final int MAX_ENTER_DEPTH = 256;
+
+    @BeforeAll
+    static void setup() {
+        // need >=2 carriers for testing pinning when main thread is a virtual thread
+        if (Thread.currentThread().isVirtual()) {
+            VThreadRunner.ensureParallelism(2);
+        }
+    }
+
+    /**
+     * Test monitor enter with no contention.
+     */
+    @Test
+    void testEnterNoContention() throws Exception {
+        var lock = new Object();
+        VThreadRunner.run(() -> {
+            synchronized (lock) {
+                assertTrue(Thread.holdsLock(lock));
+            }
+            assertFalse(Thread.holdsLock(lock));
+        });
+    }
+
+    /**
+     * Test monitor enter with contention, monitor is held by platform thread.
+     */
+    @Test
+    void testEnterWhenHeldByPlatformThread() throws Exception {
+        testEnterWithContention();
+    }
+
+    /**
+     * Test monitor enter with contention, monitor is held by virtual thread.
+     */
+    @Test
+    void testEnterWhenHeldByVirtualThread() throws Exception {
+        VThreadRunner.run(this::testEnterWithContention);
+    }
+
+    /**
+     * Test monitor enter with contention, monitor will be held by caller thread.
+     */
+    private void testEnterWithContention() throws Exception {
+        var lock = new Object();
+        var started = new CountDownLatch(1);
+        var entered = new AtomicBoolean();
+        var vthread = Thread.ofVirtual().unstarted(() -> {
+            started.countDown();
+            synchronized (lock) {
+                assertTrue(Thread.holdsLock(lock));
+                entered.set(true);
+            }
+            assertFalse(Thread.holdsLock(lock));
+        });
+        try {
+            synchronized (lock) {
+                vthread.start();
+
+                // wait for thread to start and block
+                started.await();
+                await(vthread, Thread.State.BLOCKED);
+
+                assertFalse(entered.get());
+            }
+        } finally {
+            vthread.join();
+        }
+        assertTrue(entered.get());
+    }
+
+    /**
+     * Test monitor reenter.
+     */
+    @Test
+    void testReenter() throws Exception {
+        var lock = new Object();
+        VThreadRunner.run(() -> {
+            testReenter(lock, 0);
+            assertFalse(Thread.holdsLock(lock));
+        });
+    }
+
+    private void testReenter(Object lock, int depth) {
+        if (depth < MAX_ENTER_DEPTH) {
+            synchronized (lock) {
+                assertTrue(Thread.holdsLock(lock));
+                testReenter(lock, depth + 1);
+                assertTrue(Thread.holdsLock(lock));
+            }
+        }
+    }
+
+    /**
+     * Test monitor enter when pinned.
+     */
+    @Test
+    void testEnterWhenPinned() throws Exception {
+        var lock = new Object();
+        VThreadPinner.runPinned(() -> {
+            synchronized (lock) {
+                assertTrue(Thread.holdsLock(lock));
+            }
+            assertFalse(Thread.holdsLock(lock));
+        });
+    }
+
+    /**
+     * Test monitor reenter when pinned.
+     */
+    @Test
+    void testReenterWhenPinned() throws Exception {
+        VThreadRunner.run(() -> {
+            var lock = new Object();
+            synchronized (lock) {
+                VThreadPinner.runPinned(() -> {
+                    assertTrue(Thread.holdsLock(lock));
+                    synchronized (lock) {
+                        assertTrue(Thread.holdsLock(lock));
+                    }
+                    assertTrue(Thread.holdsLock(lock));
+                });
+            }
+            assertFalse(Thread.holdsLock(lock));
+        });
+    }
+
+    /**
+     * Test contended monitor enter when pinned. Monitor is held by platform thread.
+     */
+    @Test
+    void testContendedEnterWhenPinnedHeldByPlatformThread() throws Exception {
+        testEnterWithContentionWhenPinned();
+    }
+
+    /**
+     * Test contended monitor enter when pinned. Monitor is held by virtual thread.
+     */
+    @Test
+    void testContendedEnterWhenPinnedHeldByVirtualThread() throws Exception {
+        // need at least two carrier threads
+        int previousParallelism = VThreadRunner.ensureParallelism(2);
+        try {
+            VThreadRunner.run(this::testEnterWithContentionWhenPinned);
+        } finally {
+            VThreadRunner.setParallelism(previousParallelism);
+        }
+    }
+
+    /**
+     * Test contended monitor enter when pinned, monitor will be held by caller thread.
+     */
+    private void testEnterWithContentionWhenPinned() throws Exception {
+        var lock = new Object();
+        var started = new CountDownLatch(1);
+        var entered = new AtomicBoolean();
+        Thread vthread = Thread.ofVirtual().unstarted(() -> {
+            VThreadPinner.runPinned(() -> {
+                started.countDown();
+                synchronized (lock) {
+                    entered.set(true);
+                }
+            });
+        });
+        synchronized (lock) {
+            // start thread and wait for it to block
+            vthread.start();
+            started.await();
+            await(vthread, Thread.State.BLOCKED);
+            assertFalse(entered.get());
+        }
+        vthread.join();
+
+        // check thread entered monitor
+        assertTrue(entered.get());
+    }
+
+    /**
+     * Returns a stream of elements that are ordered pairs of platform and virtual thread
+     * counts. 0,2,4,..16 platform threads. 2,4,6,..32 virtual threads.
+     */
+    static Stream<Arguments> threadCounts() {
+        return IntStream.range(0, 17)
+                .filter(i -> i % 2 == 0)
+                .mapToObj(i -> i)
+                .flatMap(np -> IntStream.range(2, 33)
+                        .filter(i -> i % 2 == 0)
+                        .mapToObj(vp -> Arguments.of(np, vp)));
+    }
+
+    /**
+     * Test mutual exclusion of monitors with platform and virtual threads.
+     */
+    @ParameterizedTest
+    @MethodSource("threadCounts")
+    void testMutualExclusion(int nPlatformThreads, int nVirtualThreads) throws Exception {
+        class Counter {
+            int count;
+            synchronized void increment() {
+                count++;
+                Thread.yield();
+            }
+        }
+        var counter = new Counter();
+        int nThreads = nPlatformThreads + nVirtualThreads;
+        var threads = new Thread[nThreads];
+        int index = 0;
+        for (int i = 0; i < nPlatformThreads; i++) {
+            threads[index] = Thread.ofPlatform()
+                    .name("platform-" + index)
+                    .unstarted(counter::increment);
+            index++;
+        }
+        for (int i = 0; i < nVirtualThreads; i++) {
+            threads[index] = Thread.ofVirtual()
+                    .name("virtual-" + index)
+                    .unstarted(counter::increment);
+            index++;
+        }
+        // start all threads
+        for (Thread thread : threads) {
+            thread.start();
+        }
+        // wait for all threads to terminate
+        for (Thread thread : threads) {
+            thread.join();
+        }
+        assertEquals(nThreads, counter.count);
+    }
+
+    /**
+     * Test unblocking a virtual thread waiting to enter a monitor held by a platform thread.
+     */
+    @RepeatedTest(20)
+    void testUnblockingByPlatformThread() throws Exception {
+        testUnblocking();
+    }
+
+    /**
+     * Test unblocking a virtual thread waiting to enter a monitor held by another
+     * virtual thread.
+     */
+    @RepeatedTest(20)
+    void testUnblockingByVirtualThread() throws Exception {
+        VThreadRunner.run(this::testUnblocking);
+    }
+
+    /**
+     * Test unblocking a virtual thread waiting to enter a monitor, monitor will be
+     * initially be held by caller thread.
+     */
+    private void testUnblocking() throws Exception {
+        var lock = new Object();
+        var started = new CountDownLatch(1);
+        var entered = new AtomicBoolean();
+        var vthread = Thread.ofVirtual().unstarted(() -> {
+            started.countDown();
+            synchronized (lock) {
+                entered.set(true);
+            }
+        });
+        try {
+            synchronized (lock) {
+                vthread.start();
+                started.await();
+
+                // random delay before exiting monitor
+                switch (ThreadLocalRandom.current().nextInt(4)) {
+                    case 0 -> { /* no delay */}
+                    case 1 -> Thread.onSpinWait();
+                    case 2 -> Thread.yield();
+                    case 3 -> await(vthread, Thread.State.BLOCKED);
+                    default -> fail();
+                }
+
+                assertFalse(entered.get());
+            }
+        } finally {
+            vthread.join();
+        }
+        assertTrue(entered.get());
+    }
+
+    /**
+     * Test that unblocking a virtual thread waiting to enter a monitor does not consume
+     * the thread's parking permit.
+     */
+    @Test
+    void testParkingPermitNotConsumed() throws Exception {
+        var lock = new Object();
+        var started = new CountDownLatch(1);
+        var vthread = Thread.ofVirtual().unstarted(() -> {
+            started.countDown();
+            LockSupport.unpark(Thread.currentThread());
+            synchronized (lock) { }  // should block
+            LockSupport.park();      // should not park
+        });
+
+        synchronized (lock) {
+            vthread.start();
+            // wait for thread to start and block
+            started.await();
+            await(vthread, Thread.State.BLOCKED);
+        }
+        vthread.join();
+    }
+
+    /**
+     * Test that unblocking a virtual thread waiting to enter a monitor does not make
+     * available the thread's parking permit.
+     */
+    @Test
+    void testParkingPermitNotOffered() throws Exception {
+        var lock = new Object();
+        var started = new CountDownLatch(1);
+        var vthread = Thread.ofVirtual().unstarted(() -> {
+            started.countDown();
+            synchronized (lock) { }  // should block
+            LockSupport.park();      // should park
+        });
+
+        synchronized (lock) {
+            vthread.start();
+            // wait for thread to start and block
+            started.await();
+            await(vthread, Thread.State.BLOCKED);
+        }
+
+        try {
+            // wait for thread to park, it should not terminate
+            await(vthread, Thread.State.WAITING);
+            vthread.join(Duration.ofMillis(100));
+            assertEquals(Thread.State.WAITING, vthread.getState());
+        } finally {
+            LockSupport.unpark(vthread);
+            vthread.join();
+        }
+    }
+
+    /**
+     * Waits for the given thread to reach a given state.
+     */
+    private void await(Thread thread, Thread.State expectedState) throws InterruptedException {
+        Thread.State state = thread.getState();
+        while (state != expectedState) {
+            assertTrue(state != Thread.State.TERMINATED, "Thread has terminated");
+            Thread.sleep(10);
+            state = thread.getState();
+        }
+    }
+}
diff --git a/test/jdk/java/lang/Thread/virtual/MonitorWaitNotify.java b/test/jdk/java/lang/Thread/virtual/MonitorWaitNotify.java
index 1320cc8f15f3f..5f730dbbf0ad9 100644
--- a/test/jdk/java/lang/Thread/virtual/MonitorWaitNotify.java
+++ b/test/jdk/java/lang/Thread/virtual/MonitorWaitNotify.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,41 +21,78 @@
  * questions.
  */
 
-/**
- * @test
+/*
+ * @test id=default
  * @summary Test virtual threads using Object.wait/notifyAll
  * @modules java.base/java.lang:+open
  * @library /test/lib
- * @run junit MonitorWaitNotify
+ * @run junit/othervm --enable-native-access=ALL-UNNAMED MonitorWaitNotify
  */
 
-import java.util.concurrent.Semaphore;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.LockSupport;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+import java.util.stream.Collectors;
 
+import jdk.test.lib.thread.VThreadScheduler;
+import jdk.test.lib.thread.VThreadRunner;
 import jdk.test.lib.thread.VThreadRunner;
+import jdk.test.lib.thread.VThreadPinner;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assumptions.*;
 
 class MonitorWaitNotify {
 
+    @BeforeAll
+    static void setup() {
+        // need >=2 carriers for testing pinning
+        VThreadRunner.ensureParallelism(2);
+    }
+
     /**
      * Test virtual thread waits, notified by platform thread.
      */
-    @Test
-    void testWaitNotify1() throws Exception {
+    @ParameterizedTest
+    @ValueSource(booleans = { true, false })
+    void testWaitNotify1(boolean pinned) throws Exception {
         var lock = new Object();
-        var ready = new Semaphore(0);
+        var ready = new AtomicBoolean();
         var thread = Thread.ofVirtual().start(() -> {
             synchronized (lock) {
-                ready.release();
                 try {
-                    lock.wait();
+                    if (pinned) {
+                        VThreadPinner.runPinned(() -> {
+                            ready.set(true);
+                            lock.wait();
+                        });
+                    } else {
+                        ready.set(true);
+                        lock.wait();
+                    }
                 } catch (InterruptedException e) { }
             }
         });
-        // thread invokes notify
-        ready.acquire();
+        awaitTrue(ready);
+
+        // notify, thread should block waiting to reenter
         synchronized (lock) {
             lock.notifyAll();
+            await(thread, Thread.State.BLOCKED);
         }
         thread.join();
     }
@@ -66,15 +103,13 @@ void testWaitNotify1() throws Exception {
     @Test
     void testWaitNotify2() throws Exception {
         var lock = new Object();
-        var ready = new Semaphore(0);
-        var thread = Thread.ofVirtual().start(() -> {
-            ready.acquireUninterruptibly();
+        var thread = Thread.ofVirtual().unstarted(() -> {
             synchronized (lock) {
                 lock.notifyAll();
             }
         });
         synchronized (lock) {
-            ready.release();
+            thread.start();
             lock.wait();
         }
         thread.join();
@@ -83,89 +118,447 @@ void testWaitNotify2() throws Exception {
     /**
      * Test virtual thread waits, notified by another virtual thread.
      */
-    @Test
-    void testWaitNotify3() throws Exception {
-        // need at least two carrier threads due to pinning
-        int previousParallelism = VThreadRunner.ensureParallelism(2);
-        try {
-            var lock = new Object();
-            var ready = new Semaphore(0);
-            var thread1 = Thread.ofVirtual().start(() -> {
-                synchronized (lock) {
-                    ready.release();
-                    try {
+    @ParameterizedTest
+    @ValueSource(booleans = { true, false })
+    void testWaitNotify3(boolean pinned) throws Exception {
+        var lock = new Object();
+        var ready = new AtomicBoolean();
+        var thread1 = Thread.ofVirtual().start(() -> {
+            synchronized (lock) {
+                try {
+                    if (pinned) {
+                        VThreadPinner.runPinned(() -> {
+                            ready.set(true);
+                            lock.wait();
+                        });
+                    } else {
+                        ready.set(true);
                         lock.wait();
-                    } catch (InterruptedException e) { }
+                    }
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
                 }
-            });
-            var thread2 = Thread.ofVirtual().start(() -> {
-                ready.acquireUninterruptibly();
+            }
+        });
+        var thread2 = Thread.ofVirtual().start(() -> {
+            try {
+                awaitTrue(ready);
+
+                // notify, thread should block waiting to reenter
                 synchronized (lock) {
                     lock.notifyAll();
+                    await(thread1, Thread.State.BLOCKED);
                 }
-            });
-            thread1.join();
-            thread2.join();
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        });
+        thread1.join();
+        thread2.join();
+    }
+
+    /**
+     * Test notifyAll when there are no threads waiting.
+     */
+    @ParameterizedTest
+    @ValueSource(ints = { 0, 30000, Integer.MAX_VALUE })
+    void testNotifyBeforeWait(int timeout) throws Exception {
+        var lock = new Object();
+
+        // no threads waiting
+        synchronized (lock) {
+            lock.notifyAll();
+        }
+
+        var ready = new AtomicBoolean();
+        var thread = Thread.ofVirtual().start(() -> {
+            try {
+                synchronized (lock) {
+                    ready.set(true);
+
+                    // thread should wait
+                    if (timeout > 0) {
+                        lock.wait(timeout);
+                    } else {
+                        lock.wait();
+                    }
+                }
+            } catch (InterruptedException e) { }
+        });
+
+        try {
+            // wait for thread to start and wait
+            awaitTrue(ready);
+            Thread.State expectedState = timeout > 0
+                    ? Thread.State.TIMED_WAITING
+                    : Thread.State.WAITING;
+            await(thread, expectedState);
+
+            // poll thread state again, it should still be waiting
+            Thread.sleep(10);
+            assertEquals(thread.getState(), expectedState);
         } finally {
-            // restore
-            VThreadRunner.setParallelism(previousParallelism);
+            synchronized (lock) {
+                lock.notifyAll();
+            }
+            thread.join();
         }
     }
+    /**
+     * Test duration of timed Object.wait.
+     */
+    @Test
+    void testTimedWaitDuration1() throws Exception {
+        var lock = new Object();
+
+        var durationRef = new AtomicReference<Long>();
+        var thread = Thread.ofVirtual().start(() -> {
+            try {
+                synchronized (lock) {
+                    long start = millisTime();
+                    lock.wait(2000);
+                    durationRef.set(millisTime() - start);
+                }
+            } catch (InterruptedException e) { }
+        });
+
+        thread.join();
+
+        long duration = durationRef.get();
+        checkDuration(duration, 1900, 20_000);
+    }
 
     /**
-     * Test interrupt status set when calling Object.wait.
+     * Test duration of timed Object.wait. This test invokes wait twice, first with a short
+     * timeout, the second with a longer timeout. The test scenario ensures that the
+     * timeout from the first wait doesn't interfere with the second wait.
      */
     @Test
-    void testWaitNotify4() throws Exception {
+    void testTimedWaitDuration2() throws Exception {
+        var lock = new Object();
+
+        var ready = new AtomicBoolean();
+        var waited = new AtomicBoolean();
+        var durationRef = new AtomicReference<Long>();
+        var thread = Thread.ofVirtual().start(() -> {
+            try {
+                synchronized (lock) {
+                    ready.set(true);
+                    lock.wait(200);
+                    waited.set(true);
+
+                    long start = millisTime();
+                    lock.wait(2000);
+                    durationRef.set(millisTime() - start);
+                }
+            } catch (InterruptedException e) { }
+        });
+
+        awaitTrue(ready);
+        synchronized (lock) {
+            // wake thread if waiting in first wait
+            if (!waited.get()) {
+                lock.notifyAll();
+            }
+        }
+
+        thread.join();
+
+        long duration = durationRef.get();
+        checkDuration(duration, 1900, 20_000);
+    }
+
+    /**
+     * Testing invoking Object.wait with interrupt status set.
+     */
+    @ParameterizedTest
+    @ValueSource(ints = { 0, 30000, Integer.MAX_VALUE })
+    void testWaitWithInterruptSet(int timeout) throws Exception {
         VThreadRunner.run(() -> {
-            Thread t = Thread.currentThread();
-            t.interrupt();
             Object lock = new Object();
+            synchronized (lock) {
+                Thread.currentThread().interrupt();
+                if (timeout > 0) {
+                    assertThrows(InterruptedException.class, () -> lock.wait(timeout));
+                } else {
+                    assertThrows(InterruptedException.class, lock::wait);
+                }
+                assertFalse(Thread.currentThread().isInterrupted());
+            }
+        });
+    }
+
+    /**
+     * Test interrupting a virtual thread waiting in Object.wait.
+     */
+    @ParameterizedTest
+    @ValueSource(ints = { 0, 30000, Integer.MAX_VALUE })
+    void testInterruptWait(int timeout) throws Exception {
+        var lock = new Object();
+        var ready = new AtomicBoolean();
+        var interruptedException = new AtomicBoolean();
+        var vthread = Thread.ofVirtual().start(() -> {
+            synchronized (lock) {
+                try {
+                    ready.set(true);
+                    if (timeout > 0) {
+                        lock.wait(timeout);
+                    } else {
+                        lock.wait();
+                    }
+                } catch (InterruptedException e) {
+                    // check stack trace has the expected frames
+                    Set<String> expected = Set.of("wait0", "wait", "run");
+                    Set<String> methods = Stream.of(e.getStackTrace())
+                            .map(StackTraceElement::getMethodName)
+                            .collect(Collectors.toSet());
+                    assertTrue(methods.containsAll(expected));
+
+                    interruptedException.set(true);
+                }
+            }
+        });
+
+        // wait for thread to start and wait
+        awaitTrue(ready);
+        await(vthread, timeout > 0 ? Thread.State.TIMED_WAITING : Thread.State.WAITING);
+
+        // interrupt thread, should block, then throw InterruptedException
+        synchronized (lock) {
+            vthread.interrupt();
+            await(vthread, Thread.State.BLOCKED);
+        }
+        vthread.join();
+        assertTrue(interruptedException.get());
+    }
+
+    /**
+     * Test interrupting a virtual thread blocked waiting to reenter after waiting.
+     */
+    @ParameterizedTest
+    @ValueSource(ints = { 0, 30000, Integer.MAX_VALUE })
+    void testInterruptReenterAfterWait(int timeout) throws Exception {
+        var lock = new Object();
+        var ready = new AtomicBoolean();
+        var interruptedException = new AtomicBoolean();
+        var vthread = Thread.ofVirtual().start(() -> {
+            synchronized (lock) {
+                try {
+                    ready.set(true);
+                    if (timeout > 0) {
+                        lock.wait(timeout);
+                    } else {
+                        lock.wait();
+                    }
+                } catch (InterruptedException e) {
+                    interruptedException.set(true);
+                }
+            }
+        });
+
+        // wait for thread to start and wait
+        awaitTrue(ready);
+        await(vthread, timeout > 0 ? Thread.State.TIMED_WAITING : Thread.State.WAITING);
+
+        // notify, thread should block waiting to reenter
+        synchronized (lock) {
+            lock.notifyAll();
+            await(vthread, Thread.State.BLOCKED);
+
+            // interrupt when blocked
+            vthread.interrupt();
+        }
+
+        vthread.join();
+        assertFalse(interruptedException.get());
+        assertTrue(vthread.isInterrupted());
+    }
+
+    /**
+     * Test Object.wait when the monitor entry count > 1.
+     */
+    @ParameterizedTest
+    @ValueSource(ints = { 0, 30000, Integer.MAX_VALUE })
+    void testWaitWhenEnteredManyTimes(int timeout) throws Exception {
+        var lock = new Object();
+        var ready = new AtomicBoolean();
+        var vthread = Thread.ofVirtual().start(() -> {
+            synchronized (lock) {
+                synchronized (lock) {
+                    synchronized (lock) {
+                        try {
+                            ready.set(true);
+                            if (timeout > 0) {
+                                lock.wait(timeout);
+                            } else {
+                                lock.wait();
+                            }
+                        } catch (InterruptedException e) { }
+                    }
+                }
+            }
+        });
+
+        // wait for thread to start and wait
+        awaitTrue(ready);
+        await(vthread, timeout > 0 ? Thread.State.TIMED_WAITING : Thread.State.WAITING);
+
+        // notify, thread should block waiting to reenter
+        synchronized (lock) {
+            lock.notifyAll();
+            await(vthread, Thread.State.BLOCKED);
+        }
+        vthread.join();
+    }
+
+    /**
+     * Test that Object.wait does not consume the thread's parking permit.
+     */
+    @Test
+    void testParkingPermitNotConsumed() throws Exception {
+        var lock = new Object();
+        var started = new CountDownLatch(1);
+        var completed = new AtomicBoolean();
+        var vthread = Thread.ofVirtual().start(() -> {
+            started.countDown();
+            LockSupport.unpark(Thread.currentThread());
             synchronized (lock) {
                 try {
                     lock.wait();
-                    fail();
                 } catch (InterruptedException e) {
-                    // interrupt status should be cleared
-                    assertFalse(t.isInterrupted());
+                    fail("wait interrupted");
                 }
             }
+            LockSupport.park();      // should not park
+            completed.set(true);
         });
+
+        // wait for thread to start and wait
+        started.await();
+        await(vthread, Thread.State.WAITING);
+
+        // wakeup thread
+        synchronized (lock) {
+            lock.notifyAll();
+        }
+
+        // thread should terminate
+        vthread.join();
+        assertTrue(completed.get());
     }
 
     /**
-     * Test interrupt when blocked in Object.wait.
+     * Test that Object.wait does not make available the thread's parking permit.
      */
     @Test
-    void testWaitNotify5() throws Exception {
-        VThreadRunner.run(() -> {
-            Thread t = Thread.currentThread();
-            scheduleInterrupt(t, 1000);
-            Object lock = new Object();
+    void testParkingPermitNotOffered() throws Exception {
+        var lock = new Object();
+        var started = new CountDownLatch(1);
+        var readyToPark = new CountDownLatch(1);
+        var completed = new AtomicBoolean();
+        var vthread = Thread.ofVirtual().start(() -> {
+            started.countDown();
             synchronized (lock) {
                 try {
                     lock.wait();
-                    fail();
                 } catch (InterruptedException e) {
-                    // interrupt status should be cleared
-                    assertFalse(t.isInterrupted());
+                    fail("wait interrupted");
                 }
             }
+            readyToPark.countDown();
+            LockSupport.park();      // should park
+            completed.set(true);
         });
+
+        // wait for thread to start and wait
+        started.await();
+        await(vthread, Thread.State.WAITING);
+
+        // wakeup thread
+        synchronized (lock) {
+            lock.notifyAll();
+        }
+
+        // thread should park
+        readyToPark.await();
+        await(vthread, Thread.State.WAITING);
+
+        LockSupport.unpark(vthread);
+
+        // thread should terminate
+        vthread.join();
+        assertTrue(completed.get());
     }
 
     /**
-     * Schedule a thread to be interrupted after a delay.
+     * Test that wait(long) throws IAE when timeout is negative.
      */
-    private static void scheduleInterrupt(Thread thread, long delay) {
-        Runnable interruptTask = () -> {
-            try {
-                Thread.sleep(delay);
-                thread.interrupt();
-            } catch (Exception e) {
-                e.printStackTrace();
+    @Test
+    void testIllegalArgumentException() throws Exception {
+        VThreadRunner.run(() -> {
+            Object obj = new Object();
+            synchronized (obj) {
+                assertThrows(IllegalArgumentException.class, () -> obj.wait(-1L));
+                assertThrows(IllegalArgumentException.class, () -> obj.wait(-1000L));
+                assertThrows(IllegalArgumentException.class, () -> obj.wait(Long.MIN_VALUE));
             }
-        };
-        new Thread(interruptTask).start();
+        });
+    }
+
+    /**
+     * Test that wait throws IMSE when not owner.
+     */
+    @Test
+    void testIllegalMonitorStateException() throws Exception {
+        VThreadRunner.run(() -> {
+            Object obj = new Object();
+            assertThrows(IllegalMonitorStateException.class, () -> obj.wait());
+            assertThrows(IllegalMonitorStateException.class, () -> obj.wait(0));
+            assertThrows(IllegalMonitorStateException.class, () -> obj.wait(1000));
+            assertThrows(IllegalMonitorStateException.class, () -> obj.wait(Long.MAX_VALUE));
+        });
+    }
+
+    /**
+     * Waits for the boolean value to become true.
+     */
+    private static void awaitTrue(AtomicBoolean ref) throws InterruptedException {
+        while (!ref.get()) {
+            Thread.sleep(20);
+        }
+    }
+
+    /**
+     * Waits for the given thread to reach a given state.
+     */
+    private void await(Thread thread, Thread.State expectedState) throws InterruptedException {
+        Thread.State state = thread.getState();
+        while (state != expectedState) {
+            assertTrue(state != Thread.State.TERMINATED, "Thread has terminated");
+            Thread.sleep(10);
+            state = thread.getState();
+        }
+    }
+
+    /**
+     * Returns the current time in milliseconds.
+     */
+    private static long millisTime() {
+        long now = System.nanoTime();
+        return TimeUnit.MILLISECONDS.convert(now, TimeUnit.NANOSECONDS);
+    }
+
+    /**
+     * Check a duration is within expected bounds.
+     * @param duration, in milliseconds
+     * @param min minimum expected duration, in milliseconds
+     * @param max maximum expected duration, in milliseconds
+     * @return the duration (now - start), in milliseconds
+     */
+    private static void checkDuration(long duration, long min, long max) {
+        assertTrue(duration >= min,
+                "Duration " + duration + "ms, expected >= " + min + "ms");
+        assertTrue(duration <= max,
+                "Duration " + duration + "ms, expected <= " + max + "ms");
     }
 }
diff --git a/test/jdk/java/lang/Thread/virtual/ParkWithFixedThreadPool.java b/test/jdk/java/lang/Thread/virtual/ParkWithFixedThreadPool.java
index 950f036458d6f..28a32fc504ab4 100644
--- a/test/jdk/java/lang/Thread/virtual/ParkWithFixedThreadPool.java
+++ b/test/jdk/java/lang/Thread/virtual/ParkWithFixedThreadPool.java
@@ -26,12 +26,14 @@
  * @summary Test virtual thread park when scheduler is a fixed thread pool
  * @requires vm.continuations
  * @modules java.base/java.lang:+open
+ * @library /test/lib
  * @run main ParkWithFixedThreadPool
  */
 
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 import java.util.concurrent.locks.LockSupport;
+import jdk.test.lib.thread.VThreadScheduler;
 
 public class ParkWithFixedThreadPool {
     public static void main(String[] args) throws Exception {
@@ -58,9 +60,7 @@ public void run() {
                 }
             };
 
-            ThreadFactory factory = ThreadBuilders.virtualThreadBuilder(scheduler)
-                    .name("vthread-", 0)
-                    .factory();
+            ThreadFactory factory = VThreadScheduler.virtualThreadFactory(scheduler);
 
             for (int i = 0; i < vthreadCount; i++) {
                 vthreads[i] = factory.newThread(target);
diff --git a/test/jdk/java/lang/Thread/virtual/Reflection.java b/test/jdk/java/lang/Thread/virtual/Reflection.java
index 4dd34e6c72695..f508b7949ffbf 100644
--- a/test/jdk/java/lang/Thread/virtual/Reflection.java
+++ b/test/jdk/java/lang/Thread/virtual/Reflection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,7 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.locks.LockSupport;
 
+import jdk.test.lib.thread.VThreadScheduler;
 import jdk.test.lib.thread.VThreadRunner;
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
@@ -142,11 +143,10 @@ static void foo() { }
      */
     @Test
     void testInvokeStatic6() throws Exception {
-        assumeTrue(ThreadBuilders.supportsCustomScheduler(), "No support for custom schedulers");
+        assumeTrue(VThreadScheduler.supportsCustomScheduler(), "No support for custom schedulers");
         Method parkMethod = Parker.class.getDeclaredMethod("park");
         try (ExecutorService scheduler = Executors.newFixedThreadPool(1)) {
-            Thread.Builder builder = ThreadBuilders.virtualThreadBuilder(scheduler);
-            ThreadFactory factory = builder.factory();
+            ThreadFactory factory = VThreadScheduler.virtualThreadFactory(scheduler);
 
             var ready = new CountDownLatch(1);
             Thread vthread = factory.newThread(() -> {
@@ -321,11 +321,10 @@ static void foo() { }
      */
     @Test
     void testNewInstance6() throws Exception {
-        assumeTrue(ThreadBuilders.supportsCustomScheduler(), "No support for custom schedulers");
+        assumeTrue(VThreadScheduler.supportsCustomScheduler(), "No support for custom schedulers");
         Constructor<?> ctor = Parker.class.getDeclaredConstructor();
         try (ExecutorService scheduler = Executors.newFixedThreadPool(1)) {
-            Thread.Builder builder = ThreadBuilders.virtualThreadBuilder(scheduler);
-            ThreadFactory factory = builder.factory();
+            ThreadFactory factory = VThreadScheduler.virtualThreadFactory(scheduler);
 
             var ready = new CountDownLatch(1);
             Thread vthread = factory.newThread(() -> {
diff --git a/test/jdk/java/lang/Thread/virtual/StackFrames.java b/test/jdk/java/lang/Thread/virtual/StackFrames.java
new file mode 100644
index 0000000000000..6ae65d031dd61
--- /dev/null
+++ b/test/jdk/java/lang/Thread/virtual/StackFrames.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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
+ * @summary Test stack traces in exceptions, stack frames walked by the StackWalker,
+ *    and the stack trace returned by Thread.getStackTrace
+ * @requires vm.continuations
+ * @modules java.base/java.lang:+open java.management
+ * @library /test/lib
+ * @run junit StackFrames
+ * @run junit/othervm -XX:+UnlockDiagnosticVMOptions -XX:+ShowCarrierFrames StackFrames
+ */
+
+import java.lang.management.ManagementFactory;
+import java.util.Arrays;
+import java.util.Set;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.ForkJoinWorkerThread;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Stream;
+import static java.lang.StackWalker.Option.*;
+
+import jdk.test.lib.thread.VThreadRunner;
+import jdk.test.lib.thread.VThreadScheduler;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+class StackFrames {
+
+    /**
+     * Test that the stack trace in exceptions does not include the carrier thread
+     * frames, except when running with -XX:+ShowCarrierFrames.
+     */
+    @Test
+    void testStackTraceException() throws Exception {
+        VThreadRunner.run(() -> {
+            Exception e = new Exception();
+            boolean found = Arrays.stream(e.getStackTrace())
+                    .map(StackTraceElement::getClassName)
+                    .anyMatch("java.util.concurrent.ForkJoinPool"::equals);
+            assertTrue(found == hasJvmArgument("-XX:+ShowCarrierFrames"));
+        });
+    }
+
+    /**
+     * Test that StackWalker does not include carrier thread frames in the stream of
+     * stack frames.
+     */
+    @Test
+    void testStackWalker() throws Exception {
+        VThreadRunner.run(() -> {
+            StackWalker walker = StackWalker.getInstance(Set.of(RETAIN_CLASS_REFERENCE));
+            boolean found = walker.walk(sf ->
+                    sf.map(StackWalker.StackFrame::getDeclaringClass)
+                            .anyMatch(c -> c == ForkJoinPool.class));
+            assertFalse(found);
+        });
+    }
+
+    /**
+     * Test Thread.getStackTrace returns the expected bottom frame for both the carrier
+     * and virtual thread.
+     */
+    @Test
+    void testBottomFrames() throws Exception {
+        try (ForkJoinPool pool = new ForkJoinPool(1)) {
+            var carrierRef = new AtomicReference<Thread>();
+            Executor scheduler = task -> {
+                pool.submit(() -> {
+                    carrierRef.set(Thread.currentThread());
+                    task.run();
+                });
+            };
+            ThreadFactory factory = VThreadScheduler.virtualThreadFactory(scheduler);
+
+            var ready = new AtomicBoolean();
+            var done = new AtomicBoolean();
+
+            // create virtual thread to use custom scheduler
+            var vthread = factory.newThread(() -> {
+                ready.set(true);
+                while (!done.get()) {
+                    Thread.onSpinWait();
+                }
+            });
+
+            vthread.start();
+            try {
+                awaitTrue(ready);
+
+                // get carrier Thread
+                Thread carrier = carrierRef.get();
+                assertTrue(carrier instanceof ForkJoinWorkerThread);
+
+                // bottom-most frame of virtual thread should be VirtualThread.run
+                System.err.println(vthread);
+                StackTraceElement[] vthreadStack = vthread.getStackTrace();
+                Stream.of(vthreadStack).forEach(e -> System.err.println("    " + e));
+                StackTraceElement bottomFrame = vthreadStack[vthreadStack.length - 1];
+                assertEquals("java.lang.VirtualThread.run",
+                        bottomFrame.getClassName() + "." + bottomFrame.getMethodName());
+
+                // bottom-most frame of carrier thread should be Thread.run
+                System.err.println(carrier);
+                StackTraceElement[] carrierStack = carrier.getStackTrace();
+                Stream.of(carrierStack).forEach(e -> System.err.println("    " + e));
+                bottomFrame = carrierStack[carrierStack.length - 1];
+                assertEquals("java.util.concurrent.ForkJoinWorkerThread.run",
+                        bottomFrame.getClassName() + "." + bottomFrame.getMethodName());
+
+            } finally {
+                done.set(true);
+                vthread.join();
+            }
+        }
+    }
+
+    /**
+     * Returns true if started with the given VM option.
+     */
+    private static boolean hasJvmArgument(String arg) {
+        for (String argument : ManagementFactory.getRuntimeMXBean().getInputArguments()) {
+            if (argument.equals(arg)) return true;
+        }
+        return false;
+    }
+
+    /**
+     * Waits for the boolean value to become true.
+     */
+    private static void awaitTrue(AtomicBoolean ref) throws InterruptedException {
+        while (!ref.get()) {
+            Thread.sleep(20);
+        }
+    }
+}
diff --git a/test/jdk/java/lang/Thread/virtual/StackTraces.java b/test/jdk/java/lang/Thread/virtual/StackTraces.java
deleted file mode 100644
index cb1877090fecd..0000000000000
--- a/test/jdk/java/lang/Thread/virtual/StackTraces.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2020, 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
- * @summary Test stack traces in exceptions and stack frames walked by the StackWalker
- *     API do not include the carrier stack frames
- * @requires vm.continuations
- * @modules java.management
- * @library /test/lib
- * @run junit StackTraces
- * @run junit/othervm -XX:+UnlockDiagnosticVMOptions -XX:+ShowCarrierFrames StackTraces
- */
-
-import java.lang.management.ManagementFactory;
-import java.util.Arrays;
-import java.util.Set;
-import java.util.concurrent.ForkJoinPool;
-import static java.lang.StackWalker.Option.*;
-
-import jdk.test.lib.thread.VThreadRunner;
-import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
-class StackTraces {
-
-    /**
-     * Test that the stack trace in exceptions does not include the carrier thread
-     * frames, except when running with -XX:+ShowCarrierFrames.
-     */
-    @Test
-    void testStackTrace() throws Exception {
-        VThreadRunner.run(() -> {
-            Exception e = new Exception();
-            boolean found = Arrays.stream(e.getStackTrace())
-                    .map(StackTraceElement::getClassName)
-                    .anyMatch("java.util.concurrent.ForkJoinPool"::equals);
-            assertTrue(found == hasJvmArgument("-XX:+ShowCarrierFrames"));
-        });
-    }
-
-    /**
-     * Test that StackWalker does not include carrier thread frames.
-     */
-    @Test
-    void testStackWalker() throws Exception {
-        VThreadRunner.run(() -> {
-            StackWalker walker = StackWalker.getInstance(Set.of(RETAIN_CLASS_REFERENCE));
-            boolean found = walker.walk(sf ->
-                    sf.map(StackWalker.StackFrame::getDeclaringClass)
-                            .anyMatch(c -> c == ForkJoinPool.class));
-            assertFalse(found);
-        });
-    }
-
-    private static boolean hasJvmArgument(String arg) {
-        for (String argument : ManagementFactory.getRuntimeMXBean().getInputArguments()) {
-            if (argument.equals(arg)) return true;
-        }
-        return false;
-    }
-}
diff --git a/test/jdk/java/lang/Thread/virtual/ThreadAPI.java b/test/jdk/java/lang/Thread/virtual/ThreadAPI.java
index b1ccb21910acf..3bb5c75a1b50d 100644
--- a/test/jdk/java/lang/Thread/virtual/ThreadAPI.java
+++ b/test/jdk/java/lang/Thread/virtual/ThreadAPI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,13 +61,16 @@
 import java.util.stream.Stream;
 import java.nio.channels.Selector;
 
-import jdk.test.lib.thread.VThreadRunner;
 import jdk.test.lib.thread.VThreadPinner;
+import jdk.test.lib.thread.VThreadRunner;
+import jdk.test.lib.thread.VThreadScheduler;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.junit.jupiter.api.Assumptions.*;
 
@@ -78,9 +81,12 @@ class ThreadAPI {
     private static ScheduledExecutorService scheduler;
 
     @BeforeAll
-    static void setup() throws Exception {
+    static void setup() {
         ThreadFactory factory = Executors.defaultThreadFactory();
         scheduler = Executors.newSingleThreadScheduledExecutor(factory);
+
+        // need >=2 carriers for testing pinning
+        VThreadRunner.ensureParallelism(2);
     }
 
     @AfterAll
@@ -719,14 +725,7 @@ void testJoin33() throws Exception {
      */
     @Test
     void testJoin34() throws Exception {
-        // need at least two carrier threads due to pinning
-        int previousParallelism = VThreadRunner.ensureParallelism(2);
-        try {
-            VThreadRunner.run(this::testJoin33);
-        } finally {
-            // restore
-            VThreadRunner.setParallelism(previousParallelism);
-        }
+        VThreadRunner.run(this::testJoin33);
     }
 
     /**
@@ -1084,11 +1083,10 @@ void testSetDaemon2() throws Exception {
      */
     @Test
     void testYield1() throws Exception {
-        assumeTrue(ThreadBuilders.supportsCustomScheduler(), "No support for custom schedulers");
+        assumeTrue(VThreadScheduler.supportsCustomScheduler(), "No support for custom schedulers");
         var list = new CopyOnWriteArrayList<String>();
         try (ExecutorService scheduler = Executors.newFixedThreadPool(1)) {
-            Thread.Builder builder = ThreadBuilders.virtualThreadBuilder(scheduler);
-            ThreadFactory factory = builder.factory();
+            ThreadFactory factory = VThreadScheduler.virtualThreadFactory(scheduler);
             var thread = factory.newThread(() -> {
                 list.add("A");
                 var child = factory.newThread(() -> {
@@ -1112,11 +1110,10 @@ void testYield1() throws Exception {
      */
     @Test
     void testYield2() throws Exception {
-        assumeTrue(ThreadBuilders.supportsCustomScheduler(), "No support for custom schedulers");
+        assumeTrue(VThreadScheduler.supportsCustomScheduler(), "No support for custom schedulers");
         var list = new CopyOnWriteArrayList<String>();
         try (ExecutorService scheduler = Executors.newFixedThreadPool(1)) {
-            Thread.Builder builder = ThreadBuilders.virtualThreadBuilder(scheduler);
-            ThreadFactory factory = builder.factory();
+            ThreadFactory factory = VThreadScheduler.virtualThreadFactory(scheduler);
             var thread = factory.newThread(() -> {
                 list.add("A");
                 var child = factory.newThread(() -> {
@@ -1708,50 +1705,59 @@ void testGetState3() throws Exception {
      */
     @Test
     void testGetState4() throws Exception {
-        assumeTrue(ThreadBuilders.supportsCustomScheduler(), "No support for custom schedulers");
+        assumeTrue(VThreadScheduler.supportsCustomScheduler(), "No support for custom schedulers");
         AtomicBoolean completed = new AtomicBoolean();
         try (ExecutorService scheduler = Executors.newFixedThreadPool(1)) {
-            Thread.Builder builder = ThreadBuilders.virtualThreadBuilder(scheduler);
-            Thread t1 = builder.start(() -> {
-                Thread t2 = builder.unstarted(LockSupport::park);
-                assertEquals(Thread.State.NEW, t2.getState());
+            ThreadFactory factory = VThreadScheduler.virtualThreadFactory(scheduler);
+            Thread thread1 = factory.newThread(() -> {
+                Thread thread2 = factory.newThread(LockSupport::park);
+                assertEquals(Thread.State.NEW, thread2.getState());
 
                 // start t2 to make it runnable
-                t2.start();
+                thread2.start();
                 try {
-                    assertEquals(Thread.State.RUNNABLE, t2.getState());
+                    assertEquals(Thread.State.RUNNABLE, thread2.getState());
 
                     // yield to allow t2 to run and park
                     Thread.yield();
-                    assertEquals(Thread.State.WAITING, t2.getState());
+                    assertEquals(Thread.State.WAITING, thread2.getState());
                 } finally {
                     // unpark t2 to make it runnable again
-                    LockSupport.unpark(t2);
+                    LockSupport.unpark(thread2);
                 }
 
                 // t2 should be runnable (not mounted)
-                assertEquals(Thread.State.RUNNABLE, t2.getState());
+                assertEquals(Thread.State.RUNNABLE, thread2.getState());
 
                 completed.set(true);
             });
-            t1.join();
+            thread1.start();
+            thread1.join();
         }
         assertTrue(completed.get() == true);
     }
 
     /**
-     * Test Thread::getState when thread is waiting to enter a monitor.
+     * Test Thread::getState when thread is blocked waiting to enter a monitor.
      */
-    @Test
-    void testGetState5() throws Exception {
-        var started = new CountDownLatch(1);
+    @ParameterizedTest
+    @ValueSource(booleans = { true, false })
+    void testGetState5(boolean pinned) throws Exception {
+        var ready = new AtomicBoolean();
         var thread = Thread.ofVirtual().unstarted(() -> {
-            started.countDown();
-            synchronized (lock) { }
+            if (pinned) {
+                VThreadPinner.runPinned(() -> {
+                    ready.set(true);
+                    synchronized (lock) { }
+                });
+            } else {
+                ready.set(true);
+                synchronized (lock) { }
+            }
         });
         synchronized (lock) {
             thread.start();
-            started.await();
+            awaitTrue(ready);
 
             // wait for thread to block
             await(thread, Thread.State.BLOCKED);
@@ -1762,16 +1768,35 @@ void testGetState5() throws Exception {
     /**
      * Test Thread::getState when thread is waiting in Object.wait.
      */
-    @Test
-    void testGetState6() throws Exception {
+    @ParameterizedTest
+    @ValueSource(booleans = { true, false })
+    void testGetState6(boolean pinned) throws Exception {
+        var ready = new AtomicBoolean();
         var thread = Thread.ofVirtual().start(() -> {
             synchronized (lock) {
-                try { lock.wait(); } catch (InterruptedException e) { }
+                try {
+                    if (pinned) {
+                        VThreadPinner.runPinned(() -> {
+                            ready.set(true);
+                            lock.wait();
+                        });
+                    } else {
+                        ready.set(true);
+                        lock.wait();
+                    }
+                } catch (InterruptedException e) { }
             }
         });
         try {
             // wait for thread to wait
+            awaitTrue(ready);
             await(thread, Thread.State.WAITING);
+
+            // notify, thread should block trying to reenter
+            synchronized (lock) {
+                lock.notifyAll();
+                await(thread, Thread.State.BLOCKED);
+            }
         } finally {
             thread.interrupt();
             thread.join();
@@ -1781,18 +1806,35 @@ void testGetState6() throws Exception {
     /**
      * Test Thread::getState when thread is waiting in Object.wait(millis).
      */
-    @Test
-    void testGetState7() throws Exception {
+    @ParameterizedTest
+    @ValueSource(booleans = { true, false })
+    void testGetState7(boolean pinned) throws Exception {
+        var ready = new AtomicBoolean();
         var thread = Thread.ofVirtual().start(() -> {
             synchronized (lock) {
                 try {
-                    lock.wait(Long.MAX_VALUE);
+                    if (pinned) {
+                        VThreadPinner.runPinned(() -> {
+                            ready.set(true);
+                            lock.wait(Long.MAX_VALUE);
+                        });
+                    } else {
+                        ready.set(true);
+                        lock.wait(Long.MAX_VALUE);
+                    }
                 } catch (InterruptedException e) { }
             }
         });
         try {
-            // wait for thread to wait
+            // wait for thread to timed-wait
+            awaitTrue(ready);
             await(thread, Thread.State.TIMED_WAITING);
+
+            // notify, thread should block trying to reenter
+            synchronized (lock) {
+                lock.notifyAll();
+                await(thread, Thread.State.BLOCKED);
+            }
         } finally {
             thread.interrupt();
             thread.join();
@@ -1933,7 +1975,7 @@ void testHoldsLock2() throws Exception {
      * Test Thread::getStackTrace on unstarted thread.
      */
     @Test
-    void testGetStackTrace1() {
+    void testGetStackTraceUnstarted() {
         var thread = Thread.ofVirtual().unstarted(() -> { });
         StackTraceElement[] stack = thread.getStackTrace();
         assertTrue(stack.length == 0);
@@ -1943,136 +1985,224 @@ void testGetStackTrace1() {
      * Test Thread::getStackTrace on thread that has been started but has not run.
      */
     @Test
-    void testGetStackTrace2() throws Exception {
-        assumeTrue(ThreadBuilders.supportsCustomScheduler(), "No support for custom schedulers");
+    void testGetStackTraceStarted() throws Exception {
+        assumeTrue(VThreadScheduler.supportsCustomScheduler(), "No support for custom schedulers");
         Executor scheduler = task -> { };
-        Thread.Builder builder = ThreadBuilders.virtualThreadBuilder(scheduler);
-        Thread thread = builder.start(() -> { });
+        ThreadFactory factory = VThreadScheduler.virtualThreadFactory(scheduler);
+        Thread thread = factory.newThread(() -> { });
+        thread.start();
         StackTraceElement[] stack = thread.getStackTrace();
         assertTrue(stack.length == 0);
     }
 
     /**
-     * Test Thread::getStackTrace on running thread.
+     * Test Thread::getStackTrace on thread that is runnable-mounted.
      */
     @Test
-    void testGetStackTrace3() throws Exception {
-        var sel = Selector.open();
-        var thread = Thread.ofVirtual().start(() -> {
-            try { sel.select(); } catch (Exception e) { }
-        });
-        try {
-            while (!contains(thread.getStackTrace(), "select")) {
-                assertTrue(thread.isAlive());
-                Thread.sleep(20);
+    void testGetStackTraceRunnableMounted() throws Exception {
+        var ready = new AtomicBoolean();
+        var done = new AtomicBoolean();
+
+        class Foo {
+            void spinUntilDone() {
+                ready.set(true);
+                while (!done.get()) {
+                    Thread.onSpinWait();
+                }
             }
+        }
+
+        Foo foo = new Foo();
+        var thread = Thread.ofVirtual().start(foo::spinUntilDone);
+        try {
+            awaitTrue(ready);
+            StackTraceElement[] stack = thread.getStackTrace();
+            assertTrue(contains(stack, Foo.class.getName() + ".spinUntilDone"));
         } finally {
-            sel.close();
+            done.set(true);
             thread.join();
         }
     }
 
     /**
-     * Test Thread::getStackTrace on thread waiting in Object.wait.
+     * Test Thread::getStackTrace on thread that is runnable-unmounted.
      */
     @Test
-    void testGetStackTrace4() throws Exception {
-        assumeTrue(ThreadBuilders.supportsCustomScheduler(), "No support for custom schedulers");
-        try (ForkJoinPool pool = new ForkJoinPool(1)) {
-            AtomicReference<Thread> ref = new AtomicReference<>();
-            Executor scheduler = task -> {
-                pool.submit(() -> {
-                    ref.set(Thread.currentThread());
-                    task.run();
-                });
-            };
+    void testGetStackTraceRunnableUnmounted() throws Exception {
+        assumeTrue(VThreadScheduler.supportsCustomScheduler(), "No support for custom schedulers");
 
-            Thread.Builder builder = ThreadBuilders.virtualThreadBuilder(scheduler);
-            Thread vthread = builder.start(() -> {
-                synchronized (lock) {
-                    try {
-                        lock.wait();
-                    } catch (Exception e) { }
+        // custom scheduler with one carrier thread
+        try (ExecutorService scheduler = Executors.newFixedThreadPool(1)) {
+            ThreadFactory factory = VThreadScheduler.virtualThreadFactory(scheduler);
+
+            // start thread1 to park
+            Thread thread1 = factory.newThread(LockSupport::park);
+            thread1.start();
+            await(thread1, Thread.State.WAITING);
+
+            // start thread2 to spin and pin the carrier thread
+            var started = new AtomicBoolean();
+            var done = new AtomicBoolean();
+            Thread thread2 = factory.newThread(() -> {
+                started.set(true);
+                while (!done.get()) {
+                    Thread.onSpinWait();
                 }
             });
+            thread2.start();
+            awaitTrue(started);
 
-            // get carrier Thread
-            Thread carrier;
-            while ((carrier = ref.get()) == null) {
-                Thread.sleep(20);
-            }
+            try {
+                // unpark thread1, it should be "stuck" in runnable state
+                // (the carrier thread is pinned, no other virtual thread can run)
+                LockSupport.unpark(thread1);
+                assertEquals(Thread.State.RUNNABLE, thread1.getState());
 
-            // wait for virtual thread to block in wait
-            await(vthread, Thread.State.WAITING);
+                // print thread1's stack trace
+                StackTraceElement[] stack = thread1.getStackTrace();
+                assertTrue(contains(stack, "LockSupport.park"));
 
-            // get stack trace of both carrier and virtual thread
-            StackTraceElement[] carrierStackTrace = carrier.getStackTrace();
-            StackTraceElement[] vthreadStackTrace = vthread.getStackTrace();
+            } finally {
+                done.set(true);
+            }
+        }
+    }
 
-            // allow virtual thread to terminate
-            synchronized (lock) {
-                lock.notifyAll();
+    /**
+     * Test Thread::getStackTrace on thread blocked on monitor enter.
+     */
+    @ParameterizedTest
+    @ValueSource(booleans = { true, false })
+    void testGetStackTraceBlocked(boolean pinned) throws Exception {
+        class Foo {
+            void enter() {
+                synchronized (this) { }
+            }
+        }
+        Foo foo = new Foo();
+        var ready = new AtomicBoolean();
+        var thread = Thread.ofVirtual().unstarted(() -> {
+            if (pinned) {
+                VThreadPinner.runPinned(() -> {
+                    ready.set(true);
+                    foo.enter();
+                });
+            } else {
+                ready.set(true);
+                foo.enter();
             }
+        });
+        synchronized (foo) {
+            thread.start();
+            awaitTrue(ready);
 
-            // check carrier thread's stack trace
-            assertTrue(contains(carrierStackTrace, "java.util.concurrent.ForkJoinPool.runWorker"));
-            assertFalse(contains(carrierStackTrace, "java.lang.Object.wait"));
+            // wait for thread to block
+            await(thread, Thread.State.BLOCKED);
 
-            // check virtual thread's stack trace
-            assertFalse(contains(vthreadStackTrace, "java.util.concurrent.ForkJoinPool.runWorker"));
-            assertTrue(contains(vthreadStackTrace, "java.lang.Object.wait"));
+            StackTraceElement[] stack = thread.getStackTrace();
+            assertTrue(contains(stack, Foo.class.getName() + ".enter"));
         }
+        thread.join();
     }
 
     /**
-     * Test Thread::getStackTrace on parked thread.
+     * Test Thread::getStackTrace when thread is waiting in Object.wait.
      */
-    @Test
-    void testGetStackTrace5() throws Exception {
-        var thread = Thread.ofVirtual().start(LockSupport::park);
-        await(thread, Thread.State.WAITING);
+    @ParameterizedTest
+    @ValueSource(booleans = { true, false })
+    void testGetStackTraceWaiting(boolean pinned) throws Exception {
+        var ready = new AtomicBoolean();
+        var thread = Thread.ofVirtual().start(() -> {
+            synchronized (lock) {
+                try {
+                    if (pinned) {
+                        VThreadPinner.runPinned(() -> {
+                            ready.set(true);
+                            lock.wait();
+                        });
+                    } else {
+                        ready.set(true);
+                        lock.wait();
+                    }
+                } catch (InterruptedException e) { }
+            }
+        });
         try {
+            // wait for thread to wait
+            awaitTrue(ready);
+            await(thread, Thread.State.WAITING);
+
             StackTraceElement[] stack = thread.getStackTrace();
-            assertTrue(contains(stack, "LockSupport.park"));
+            assertTrue(contains(stack, "Object.wait"));
         } finally {
-            LockSupport.unpark(thread);
+            thread.interrupt();
             thread.join();
         }
     }
 
     /**
-     * Test Thread::getStackTrace on timed-parked thread.
+     * Test Thread::getStackTrace when thread is waiting in timed-Object.wait.
      */
-    @Test
-    void testGetStackTrace6() throws Exception {
+    @ParameterizedTest
+    @ValueSource(booleans = { true, false })
+    void testGetStackTraceTimedWaiting(boolean pinned) throws Exception {
+        var ready = new AtomicBoolean();
         var thread = Thread.ofVirtual().start(() -> {
-            LockSupport.parkNanos(Long.MAX_VALUE);
+            synchronized (lock) {
+                try {
+                    if (pinned) {
+                        VThreadPinner.runPinned(() -> {
+                            ready.set(true);
+                            lock.wait(Long.MAX_VALUE);
+                        });
+                    } else {
+                        ready.set(true);
+                        lock.wait(Long.MAX_VALUE);
+                    }
+                } catch (InterruptedException e) { }
+            }
         });
-        await(thread, Thread.State.TIMED_WAITING);
         try {
+            // wait for thread to wait
+            awaitTrue(ready);
+            await(thread, Thread.State.TIMED_WAITING);
+
             StackTraceElement[] stack = thread.getStackTrace();
-            assertTrue(contains(stack, "LockSupport.parkNanos"));
+            assertTrue(contains(stack, "Object.wait"));
         } finally {
-            LockSupport.unpark(thread);
+            thread.interrupt();
             thread.join();
         }
     }
 
     /**
-     * Test Thread::getStackTrace on parked thread that is pinned.
+     * Test Thread::getStackTrace when thread in park.
      */
-    @Test
-    void testGetStackTrace7() throws Exception {
-        AtomicBoolean done = new AtomicBoolean();
+    @ParameterizedTest
+    @ValueSource(booleans = { true, false })
+    void testGetStackTraceParked(boolean pinned) throws Exception {
+        var ready = new AtomicBoolean();
+        var done = new AtomicBoolean();
         var thread = Thread.ofVirtual().start(() -> {
-            VThreadPinner.runPinned(() -> {
+            if (pinned) {
+                VThreadPinner.runPinned(() -> {
+                    ready.set(true);
+                    while (!done.get()) {
+                        LockSupport.park();
+                    }
+                });
+            } else {
+                ready.set(true);
                 while (!done.get()) {
                     LockSupport.park();
                 }
-            });
+            }
         });
-        await(thread, Thread.State.WAITING);
         try {
+            // wait for thread to park
+            awaitTrue(ready);
+            await(thread, Thread.State.WAITING);
+
             StackTraceElement[] stack = thread.getStackTrace();
             assertTrue(contains(stack, "LockSupport.park"));
         } finally {
@@ -2083,20 +2213,33 @@ void testGetStackTrace7() throws Exception {
     }
 
     /**
-     * Test Thread::getStackTrace on timed-parked thread that is pinned.
+     * Test Thread::getStackTrace when thread in timed-park.
      */
-    @Test
-    void testGetStackTrace8() throws Exception {
-        AtomicBoolean done = new AtomicBoolean();
+    @ParameterizedTest
+    @ValueSource(booleans = { true, false })
+    void testGetStackTraceTimedPark(boolean pinned) throws Exception {
+        var ready = new AtomicBoolean();
+        var done = new AtomicBoolean();
         var thread = Thread.ofVirtual().start(() -> {
-            VThreadPinner.runPinned(() -> {
+            if (pinned) {
+                ready.set(true);
+                VThreadPinner.runPinned(() -> {
+                    while (!done.get()) {
+                        LockSupport.parkNanos(Long.MAX_VALUE);
+                    }
+                });
+            } else {
+                ready.set(true);
                 while (!done.get()) {
                     LockSupport.parkNanos(Long.MAX_VALUE);
                 }
-            });
+            }
         });
-        await(thread, Thread.State.TIMED_WAITING);
         try {
+            // wait for thread to park
+            awaitTrue(ready);
+            await(thread, Thread.State.TIMED_WAITING);
+
             StackTraceElement[] stack = thread.getStackTrace();
             assertTrue(contains(stack, "LockSupport.parkNanos"));
         } finally {
@@ -2110,7 +2253,7 @@ void testGetStackTrace8() throws Exception {
      * Test Thread::getStackTrace on terminated thread.
      */
     @Test
-    void testGetStackTrace9() throws Exception {
+    void testGetStackTraceTerminated() throws Exception {
         var thread = Thread.ofVirtual().start(() -> { });
         thread.join();
         StackTraceElement[] stack = thread.getStackTrace();
@@ -2133,7 +2276,7 @@ void testGetAllStackTraces1() throws Exception {
      */
     @Test
     void testGetAllStackTraces2() throws Exception {
-        assumeTrue(ThreadBuilders.supportsCustomScheduler(), "No support for custom schedulers");
+        assumeTrue(VThreadScheduler.supportsCustomScheduler(), "No support for custom schedulers");
         try (ForkJoinPool pool = new ForkJoinPool(1)) {
             AtomicReference<Thread> ref = new AtomicReference<>();
             Executor scheduler = task -> {
@@ -2143,14 +2286,15 @@ void testGetAllStackTraces2() throws Exception {
                 });
             };
 
-            Thread.Builder builder = ThreadBuilders.virtualThreadBuilder(scheduler);
-            Thread vthread = builder.start(() -> {
+            ThreadFactory factory = VThreadScheduler.virtualThreadFactory(scheduler);
+            Thread vthread = factory.newThread(() -> {
                 synchronized (lock) {
                     try {
                         lock.wait();
                     } catch (Exception e) { }
                 }
             });
+            vthread.start();
 
             // get carrier Thread
             Thread carrier;
@@ -2168,8 +2312,9 @@ void testGetAllStackTraces2() throws Exception {
             synchronized (lock) {
                 lock.notifyAll();
             }
+            vthread.join();
 
-            // get stack trace for the carrier thread
+            // stack trace for the carrier thread
             StackTraceElement[] stackTrace = map.get(carrier);
             assertNotNull(stackTrace);
             assertTrue(contains(stackTrace, "java.util.concurrent.ForkJoinPool"));
@@ -2417,6 +2562,15 @@ Throwable exception() {
         }
     }
 
+    /**
+     * Waits for the boolean value to become true.
+     */
+    private static void awaitTrue(AtomicBoolean ref) throws Exception {
+        while (!ref.get()) {
+            Thread.sleep(20);
+        }
+    }
+
     /**
      * Waits for the given thread to reach a given state.
      */
diff --git a/test/jdk/java/lang/Thread/virtual/VirtualThreadPinnedEventThrows.java b/test/jdk/java/lang/Thread/virtual/VirtualThreadPinnedEventThrows.java
index 1ae73b280cb13..0c5f1c3d6b435 100644
--- a/test/jdk/java/lang/Thread/virtual/VirtualThreadPinnedEventThrows.java
+++ b/test/jdk/java/lang/Thread/virtual/VirtualThreadPinnedEventThrows.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /**
  * @test
  * @summary Test parking when pinned and emitting the JFR VirtualThreadPinnedEvent throws
- * @modules java.base/jdk.internal.event
+ * @modules java.base/java.lang:+open java.base/jdk.internal.event
  * @library /test/lib
  * @compile/module=java.base jdk/internal/event/VirtualThreadPinnedEvent.java
  * @run junit/othervm --enable-native-access=ALL-UNNAMED VirtualThreadPinnedEventThrows
@@ -36,12 +36,22 @@
 import java.util.concurrent.locks.LockSupport;
 import jdk.internal.event.VirtualThreadPinnedEvent;
 
+import jdk.test.lib.thread.VThreadRunner;
 import jdk.test.lib.thread.VThreadPinner;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeAll;
 import static org.junit.jupiter.api.Assertions.*;
 
 class VirtualThreadPinnedEventThrows {
 
+    @BeforeAll
+    static void setup() {
+        // need >=2 carriers for testing pinning when main thread is a virtual thread
+        if (Thread.currentThread().isVirtual()) {
+            VThreadRunner.ensureParallelism(2);
+        }
+    }
+
     /**
      * Test parking when pinned and creating the VirtualThreadPinnedEvent fails with OOME.
      */
diff --git a/test/jdk/java/lang/Thread/virtual/stress/TimedGet.java b/test/jdk/java/lang/Thread/virtual/stress/CompletableFutureTimedGet.java
similarity index 79%
rename from test/jdk/java/lang/Thread/virtual/stress/TimedGet.java
rename to test/jdk/java/lang/Thread/virtual/stress/CompletableFutureTimedGet.java
index 60125e1ac5677..29ad90895f57e 100644
--- a/test/jdk/java/lang/Thread/virtual/stress/TimedGet.java
+++ b/test/jdk/java/lang/Thread/virtual/stress/CompletableFutureTimedGet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,17 +25,18 @@
  * @test
  * @summary Stress parking with CompletableFuture timed get
  * @requires vm.debug != true & vm.continuations
- * @run main/othervm -Xmx1g TimedGet 100000
+ * @run main/othervm -Xmx1g CompletableFutureTimedGet 100000
  */
 
 import java.time.Duration;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-public class TimedGet {
+public class CompletableFutureTimedGet {
 
     static final String RESULT = "foo";
 
@@ -77,30 +78,27 @@ public static void main(String... args) throws InterruptedException {
 
         // wait for all threads to terminate
         long lastTimestamp = System.currentTimeMillis();
-        int i = 0;
-        while (i < threadCount) {
-            Thread t = threads.get(i);
-            boolean terminated;
-            if (t.isAlive()) {
-                terminated = t.join(Duration.ofMillis(500));
-
-                // print trace message so the output tracks progress
-                long currentTime = System.currentTimeMillis();
-                if ((currentTime - lastTimestamp) > 500) {
-                    System.out.println(completed.get());
-                    lastTimestamp = currentTime;
+        boolean done;
+        do {
+            done = true;
+            for (Thread t : threads) {
+                if (!t.join(Duration.ofSeconds(1))) {
+                    done = false;
                 }
-            } else {
-                terminated = true;
             }
-            if (terminated) {
-                i++;
+
+            // print trace message so the output tracks progress
+            long currentTime = System.currentTimeMillis();
+            if (done || ((currentTime - lastTimestamp) > 500)) {
+                System.out.format("%s => completed %d of %d%n",
+                        Instant.now(), completed.get(), threadCount);
+                lastTimestamp = currentTime;
             }
-        }
+
+        } while (!done);
 
         // all tasks should have completed successfully
         int completedCount = completed.get();
-        System.out.println(completedCount);
         if (completedCount != threadCount) {
             throw new RuntimeException("completed = " + completedCount);
         }
diff --git a/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWhenBlocking.java b/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWhenBlocking.java
new file mode 100644
index 0000000000000..a5aea9ee3984c
--- /dev/null
+++ b/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWhenBlocking.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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
+ * @summary Stress test Thread.getStackTrace on virtual threads that are blocking or
+ *     blocked on monitorenter
+ * @requires vm.debug != true
+ * @modules java.base/java.lang:+open
+ * @library /test/lib
+ * @run main/othervm GetStackTraceALotWhenBlocking 500000
+ */
+
+/*
+ * @test
+ * @requires vm.debug == true & vm.continuations
+ * @modules java.base/java.lang:+open
+ * @library /test/lib
+ * @run main/othervm/timeout=300 GetStackTraceALotWhenBlocking 50000
+ */
+
+import java.time.Instant;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.atomic.AtomicBoolean;
+import jdk.test.lib.thread.VThreadRunner;
+
+public class GetStackTraceALotWhenBlocking {
+
+    public static void main(String[] args) throws Exception {
+        // need at least two carriers
+        VThreadRunner.ensureParallelism(2);
+
+        int iterations = args.length > 0 ? Integer.parseInt(args[0]) : 100_000;
+
+        var done = new AtomicBoolean();
+        var lock = new Object();
+
+        Runnable task = () -> {
+            long count = 0L;
+            while (!done.get()) {
+                synchronized (lock) {
+                    pause();
+                }
+                count++;
+            }
+            System.out.format("%s %s => %d loops%n", Instant.now(), Thread.currentThread(), count);
+        };
+
+        var thread1 = Thread.ofVirtual().start(task);
+        var thread2 = Thread.ofVirtual().start(task);
+        try {
+            for (int i = 1; i <= iterations; i++) {
+                if ((i % 10_000) == 0) {
+                    System.out.format("%s => %d of %d%n", Instant.now(), i, iterations);
+                }
+
+                thread1.getStackTrace();
+                pause();
+                thread2.getStackTrace();
+                pause();
+            }
+        } finally {
+            done.set(true);
+            thread1.join();
+            thread2.join();
+        }
+    }
+
+    private static void pause() {
+        if (ThreadLocalRandom.current().nextBoolean()) {
+            Thread.onSpinWait();
+        } else {
+            Thread.yield();
+        }
+    }
+}
diff --git a/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALot.java b/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWhenParking.java
similarity index 85%
rename from test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALot.java
rename to test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWhenParking.java
index c86daf1bc6fa8..d35f39a991a81 100644
--- a/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALot.java
+++ b/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWhenParking.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,30 +23,32 @@
 
 /**
  * @test
- * @summary Stress test asynchronous Thread.getStackTrace
+ * @summary Stress test asynchronous Thread.getStackTrace when parking
  * @requires vm.debug != true & vm.continuations
  * @modules java.base/java.lang:+open
- * @compile GetStackTraceALot.java ../ThreadBuilders.java
- * @run main GetStackTraceALot
+ * @library /test/lib
+ * @run main GetStackTraceALotWhenParking
  */
 
 /**
  * @test
  * @requires vm.debug == true & vm.continuations
  * @modules java.base/java.lang:+open
- * @compile GetStackTraceALot.java ../ThreadBuilders.java
- * @run main/timeout=300 GetStackTraceALot 1000
+ * @library /test/lib
+ * @run main/timeout=300 GetStackTraceALotWhenParking 1000
  */
 
 import java.time.Duration;
+import java.time.Instant;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.LockSupport;
+import jdk.test.lib.thread.VThreadScheduler;
 
-public class GetStackTraceALot {
+public class GetStackTraceALotWhenParking {
     static class RoundRobinExecutor implements Executor, AutoCloseable {
         private final ExecutorService[] executors;
         private int next;
@@ -83,7 +85,9 @@ public static void main(String[] args) throws Exception {
         AtomicInteger count = new AtomicInteger();
 
         try (RoundRobinExecutor executor = new RoundRobinExecutor()) {
-            Thread thread = ThreadBuilders.virtualThreadBuilder(executor).start(() -> {
+            ThreadFactory factory = VThreadScheduler.virtualThreadFactory(executor);
+
+            Thread thread = factory.newThread(() -> {
                 while (count.incrementAndGet() < ITERATIONS) {
                     long start = System.nanoTime();
                     while ((System.nanoTime() - start) < SPIN_NANOS) {
@@ -92,6 +96,7 @@ public static void main(String[] args) throws Exception {
                     LockSupport.parkNanos(500_000);
                 }
             });
+            thread.start();
 
             long start = System.nanoTime();
             while (thread.isAlive()) {
@@ -99,7 +104,7 @@ public static void main(String[] args) throws Exception {
                 // printStackTrace(stackTrace);
                 Thread.sleep(5);
                 if ((System.nanoTime() - start) > 500_000_000) {
-                    System.out.println(count.get());
+                    System.out.format("%s => %d of %d%n", Instant.now(), count.get(), ITERATIONS);
                     start = System.nanoTime();
                 }
             }
diff --git a/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWhenPinned.java b/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWhenPinned.java
index 35986718a38c9..d7e6c3a8de460 100644
--- a/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWhenPinned.java
+++ b/test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALotWhenPinned.java
@@ -28,7 +28,7 @@
  * @requires vm.debug != true
  * @modules java.base/java.lang:+open
  * @library /test/lib
- * @run main/othervm GetStackTraceALotWhenPinned 500000
+ * @run main/othervm --enable-native-access=ALL-UNNAMED GetStackTraceALotWhenPinned 500000
  */
 
 /*
@@ -36,7 +36,7 @@
  * @requires vm.debug == true
  * @modules java.base/java.lang:+open
  * @library /test/lib
- * @run main/othervm/timeout=300 GetStackTraceALotWhenPinned 200000
+ * @run main/othervm/timeout=300 --enable-native-access=ALL-UNNAMED GetStackTraceALotWhenPinned 200000
  */
 
 import java.time.Instant;
@@ -79,7 +79,7 @@ public static void main(String[] args) throws Exception {
         });
 
         long lastTimestamp = System.currentTimeMillis();
-        for (int i = 0; i < iterations; i++) {
+        for (int i = 1; i <= iterations; i++) {
             // wait for virtual thread to arrive
             barrier.await();
 
@@ -87,8 +87,8 @@ public static void main(String[] args) throws Exception {
             LockSupport.unpark(thread);
 
             long currentTime = System.currentTimeMillis();
-            if ((currentTime - lastTimestamp) > 500) {
-                System.out.format("%s %d remaining ...%n", Instant.now(), (iterations - i));
+            if (i == iterations || ((currentTime - lastTimestamp) > 500)) {
+                System.out.format("%s => %d of %d%n", Instant.now(), i, iterations);
                 lastTimestamp = currentTime;
             }
         }
diff --git a/test/jdk/java/lang/Thread/virtual/stress/PinALot.java b/test/jdk/java/lang/Thread/virtual/stress/PinALot.java
index a420ebb330e7b..7f95847fc7665 100644
--- a/test/jdk/java/lang/Thread/virtual/stress/PinALot.java
+++ b/test/jdk/java/lang/Thread/virtual/stress/PinALot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,17 +46,17 @@
 public class PinALot {
 
     public static void main(String[] args) throws Exception {
-        int iterations = 1_000_000;
+        int iterations;
         if (args.length > 0) {
             iterations = Integer.parseInt(args[0]);
+        } else {
+            iterations = 1_000_000;
         }
-        final int ITERATIONS = iterations;
 
         AtomicInteger count = new AtomicInteger();
-
         Thread thread = Thread.ofVirtual().start(() -> {
             VThreadPinner.runPinned(() -> {
-                while (count.incrementAndGet() < ITERATIONS) {
+                while (count.incrementAndGet() < iterations) {
                     LockSupport.parkNanos(1);
                 }
             });
@@ -65,12 +65,12 @@ public static void main(String[] args) throws Exception {
         boolean terminated;
         do {
             terminated = thread.join(Duration.ofSeconds(1));
-            System.out.println(Instant.now() + " => " + count.get());
+            System.out.println(Instant.now() + " => " + count.get() + " of " + iterations);
         } while (!terminated);
 
         int countValue = count.get();
-        if (countValue != ITERATIONS) {
-            throw new RuntimeException("count = " + countValue);
+        if (countValue != iterations) {
+            throw new RuntimeException("Thread terminated, count=" + countValue);
         }
     }
 }
diff --git a/test/jdk/java/lang/Thread/virtual/stress/PingPong.java b/test/jdk/java/lang/Thread/virtual/stress/PingPong.java
index 404444b99ce56..2266d192fcaa5 100644
--- a/test/jdk/java/lang/Thread/virtual/stress/PingPong.java
+++ b/test/jdk/java/lang/Thread/virtual/stress/PingPong.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,7 @@
  */
 
 import java.time.Duration;
+import java.time.Instant;
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.LinkedTransferQueue;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -91,11 +92,12 @@ public static void main(String[] args) throws Exception {
         boolean terminated;
         do {
             terminated = t1.join(Duration.ofMillis(500));
-            if (terminated)
+            if (terminated) {
                 terminated = t2.join(Duration.ofMillis(500));
-            System.out.format("%d %s%n", count1.get(), count2.get());
+            }
+            System.out.format("%s => T1 %d of %d, T2 %d of %d%n",
+                    Instant.now(), count1.get(), iterations, count2.get(), iterations);
         } while (!terminated);
-
     }
 
     interface Exchanger<E> {
diff --git a/test/jdk/java/lang/Thread/virtual/stress/Skynet.java b/test/jdk/java/lang/Thread/virtual/stress/Skynet.java
index ee45fc827b005..5b63fe84b1d89 100644
--- a/test/jdk/java/lang/Thread/virtual/stress/Skynet.java
+++ b/test/jdk/java/lang/Thread/virtual/stress/Skynet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -69,7 +69,7 @@ static void skynet(int num, long expected) {
         long end = System.currentTimeMillis();
         System.out.format("Result: %d in %s ms%n", sum, (end-start));
         if (sum != expected)
-            throw new AssertionError("unexpected result!");
+            throw new RuntimeException("Expected " + expected);
     }
 
     static void skynet(Channel<Long> result, int num, int size, int div) {
diff --git a/test/jdk/java/lang/Thread/virtual/stress/SleepALot.java b/test/jdk/java/lang/Thread/virtual/stress/SleepALot.java
index 12771ab499a7d..ed1c985ba7c98 100644
--- a/test/jdk/java/lang/Thread/virtual/stress/SleepALot.java
+++ b/test/jdk/java/lang/Thread/virtual/stress/SleepALot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,16 +41,16 @@
 public class SleepALot {
 
     public static void main(String[] args) throws Exception {
-        int iterations = 1_000_000;
+        int iterations;
         if (args.length > 0) {
             iterations = Integer.parseInt(args[0]);
+        } else {
+            iterations = 1_000_000;
         }
-        final int ITERATIONS = iterations;
 
         AtomicInteger count = new AtomicInteger();
-
         Thread thread = Thread.ofVirtual().start(() -> {
-            while (count.incrementAndGet() < ITERATIONS) {
+            while (count.incrementAndGet() < iterations) {
                 try {
                     Thread.sleep(Duration.ofNanos(100));
                 } catch (InterruptedException ignore) { }
@@ -60,12 +60,12 @@ public static void main(String[] args) throws Exception {
         boolean terminated;
         do {
             terminated = thread.join(Duration.ofSeconds(1));
-            System.out.println(Instant.now() + " => " + count.get());
+            System.out.println(Instant.now() + " => " + count.get() + " of " + iterations);
         } while (!terminated);
 
         int countValue = count.get();
-        if (countValue != ITERATIONS) {
-            throw new RuntimeException("count = " + countValue);
+        if (countValue != iterations) {
+            throw new RuntimeException("Thread terminated, count=" + countValue);
         }
     }
 }
diff --git a/test/jdk/java/lang/Thread/virtual/stress/TimedWaitALot.java b/test/jdk/java/lang/Thread/virtual/stress/TimedWaitALot.java
new file mode 100644
index 0000000000000..2a2fce62d62c9
--- /dev/null
+++ b/test/jdk/java/lang/Thread/virtual/stress/TimedWaitALot.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 id=timeout
+ * @summary Stress test timed-Object.wait
+ * @run main/othervm TimedWaitALot 200
+ */
+
+/*
+ * @test id=timeout-notify
+ * @summary Test timed-Object.wait where the waiting thread is awakened with Object.notify
+ *     at around the same time that the timeout expires.
+ * @run main/othervm TimedWaitALot 200 true false
+ */
+
+/*
+ * @test id=timeout-interrupt
+ * @summary Test timed-Object.wait where the waiting thread is awakened with Thread.interrupt
+ *     at around the same time that the timeout expires.
+ * @run main/othervm TimedWaitALot 200 false true
+ */
+
+/*
+ * @test id=timeout-notify-interrupt
+ * @summary Test timed-Object.wait where the waiting thread is awakened with Object.notify
+ *     and Thread.interrupt at around the same time that the timeout expires.
+ * @run main/othervm TimedWaitALot 100 true true
+ */
+
+import java.time.Instant;
+import java.util.concurrent.Executors;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadLocalRandom;
+
+public class TimedWaitALot {
+    public static void main(String[] args) throws Exception {
+        int iterations = Integer.parseInt(args[0]);
+        boolean notify = args.length >= 2 && "true".equals(args[1]);
+        boolean interrupt = args.length >=3 && "true".equals(args[2]);
+
+        // test all timeouts concurrently
+        int[] timeouts = { 10, 20, 50, 100 };
+        for (int i = 1; i <= iterations; i++) {
+            System.out.println(Instant.now() + " => " + i + " of " + iterations);
+            test(notify, interrupt, timeouts);
+        }
+    }
+
+    /**
+     * Start a first virtual thread to wait in Object.wait(millis).
+     * If {@code notify} is true, start a virtual thread to use Object.notifyAll at around
+     * the same time that the timeout expires.
+     * If {@code interrupt} is true, start virtual thread to interrupts the first virtual
+     * thread at around the same time as the timeout expires.
+     */
+    static void test(boolean notify, boolean interrupt, int... timeouts) throws Exception {
+        try (var executor = Executors.newVirtualThreadPerTaskExecutor()) {
+            for (int timeout : timeouts) {
+                var queue = new SynchronousQueue<Thread>();
+                var lock = new Object();
+
+                // virtual thread waits with Object.wait(timeout)
+                executor.submit(() -> {
+                    queue.put(Thread.currentThread());
+                    synchronized (lock) {
+                        lock.wait(timeout);
+                    }
+                    return null;
+                });
+
+                // wait for thread to start
+                Thread thread = queue.take();
+
+                // start thread to Object.notifyAll at around time that the timeout expires
+                if (notify) {
+                    if (ThreadLocalRandom.current().nextBoolean()) {
+                        synchronized (lock) {
+                            sleepLessThan(timeout);
+                            lock.notifyAll();
+                        }
+                    } else {
+                        sleepLessThan(timeout);
+                        synchronized (lock) {
+                            lock.notifyAll();
+                        }
+                    }
+                }
+
+                // start thread to interrupt first thread at around time that the timeout expires
+                if (interrupt) {
+                    executor.submit(() -> {
+                        sleepLessThan(timeout);
+                        thread.interrupt();
+                        return null;
+                    });
+                }
+            }
+        }
+    }
+
+    /**
+     * Sleeps for just less than the given timeout, in millis.
+     */
+    private static void sleepLessThan(long timeout) throws InterruptedException {
+        int delta = ThreadLocalRandom.current().nextInt(10);
+        Thread.sleep(timeout - delta);
+    }
+}
diff --git a/test/jdk/java/lang/Thread/virtual/stress/YieldALot.java b/test/jdk/java/lang/Thread/virtual/stress/YieldALot.java
index 3eabfff1c4c33..b793993a1b7d2 100644
--- a/test/jdk/java/lang/Thread/virtual/stress/YieldALot.java
+++ b/test/jdk/java/lang/Thread/virtual/stress/YieldALot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @summary Stress test Thread.yield
  * @requires vm.debug != true
- * @run main YieldALot 350000
+ * @run main YieldALot 500000
  */
 
 /*
@@ -35,34 +35,35 @@
  */
 
 import java.time.Duration;
+import java.time.Instant;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class YieldALot {
 
     public static void main(String[] args) throws Exception {
-        int iterations = 1_000_000;
+        int iterations;
         if (args.length > 0) {
             iterations = Integer.parseInt(args[0]);
+        } else {
+            iterations = 1_000_000;
         }
-        final int ITERATIONS = iterations;
 
         AtomicInteger count = new AtomicInteger();
-
         Thread thread = Thread.ofVirtual().start(() -> {
-            while (count.incrementAndGet() < ITERATIONS) {
+            while (count.incrementAndGet() < iterations) {
                 Thread.yield();
             }
         });
 
         boolean terminated;
         do {
-            terminated = thread.join(Duration.ofMillis(500));
-            System.out.println(count.get());
+            terminated = thread.join(Duration.ofSeconds(1));
+            System.out.println(Instant.now() + " => " + count.get() + " of " + iterations);
         } while (!terminated);
 
         int countValue = count.get();
-        if (countValue != ITERATIONS) {
-            throw new RuntimeException("count = " + countValue);
+        if (countValue != iterations) {
+            throw new RuntimeException("Thread terminated, count=" + countValue);
         }
     }
 }
diff --git a/test/jdk/java/lang/management/ThreadMXBean/LockedMonitorInNative.java b/test/jdk/java/lang/management/ThreadMXBean/LockedMonitorInNative.java
new file mode 100644
index 0000000000000..e1e490aa040c0
--- /dev/null
+++ b/test/jdk/java/lang/management/ThreadMXBean/LockedMonitorInNative.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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
+ * @summary Test ThreadMXBean.getLockedMonitors returns information about an object
+ *    monitor lock entered with a synchronized native method or JNI MonitorEnter
+ * @run junit/othervm LockedMonitorInNative
+ */
+
+import java.lang.management.ManagementFactory;
+import java.lang.management.ThreadInfo;
+import java.lang.management.ThreadMXBean;
+import java.util.Arrays;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeAll;
+import static org.junit.jupiter.api.Assertions.*;
+
+public class LockedMonitorInNative {
+
+    @BeforeAll
+    static void setup() throws Exception {
+        System.loadLibrary("LockedMonitorInNative");
+    }
+
+    /**
+     * Test ThreadMXBean.getLockedMonitors returns information about an object
+     * monitor lock entered with a synchronized native method.
+     */
+    @Test
+    void testSynchronizedNative() {
+        Object lock = this;
+        runWithSynchronizedNative(() -> {
+            assertTrue(holdsLock(lock), "Thread does not hold lock");
+        });
+    }
+
+    /**
+     * Test ThreadMXBean.getLockedMonitors returns information about an object
+     * monitor lock entered with JNI MonitorEnter.
+     */
+    @Test
+    void testMonitorEnteredInNative() {
+        var lock = new Object();
+        runWithMonitorEnteredInNative(lock, () -> {
+            assertTrue(holdsLock(lock), "Thread does not hold lock");
+        });
+    }
+
+    private boolean holdsLock(Object lock) {
+        int hc = System.identityHashCode(lock);
+        long tid = Thread.currentThread().threadId();
+        ThreadInfo ti = ManagementFactory.getPlatformMXBean(ThreadMXBean.class)
+                .getThreadInfo(new long[] { tid }, true, true)[0];
+        return Arrays.stream(ti.getLockedMonitors())
+                .anyMatch(mi -> mi.getIdentityHashCode() == hc);
+    }
+
+    /**
+     * Invokes the given task's run method while holding the monitor for "this".
+     */
+    private synchronized native void runWithSynchronizedNative(Runnable task);
+
+    /**
+     * Invokes the given task's run method while holding the monitor for the given
+     * object. The monitor is entered with JNI MonitorEnter, and exited with JNI MonitorExit.
+     */
+    private native void runWithMonitorEnteredInNative(Object lock, Runnable task);
+
+    /**
+     * Called from native methods to run the given task.
+     */
+    private void run(Runnable task) {
+        task.run();
+    }
+}
diff --git a/test/jdk/java/lang/management/ThreadMXBean/VirtualThreads.java b/test/jdk/java/lang/management/ThreadMXBean/VirtualThreads.java
index 35fe819313a72..7830c93ac13fa 100644
--- a/test/jdk/java/lang/management/ThreadMXBean/VirtualThreads.java
+++ b/test/jdk/java/lang/management/ThreadMXBean/VirtualThreads.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,19 +41,20 @@
 import java.lang.management.ManagementFactory;
 import java.lang.management.ThreadInfo;
 import java.lang.management.ThreadMXBean;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.nio.channels.Selector;
 import java.util.Arrays;
 import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.LockSupport;
 import java.util.stream.Collectors;
 
+import jdk.test.lib.thread.VThreadPinner;
 import jdk.test.lib.thread.VThreadRunner;
+import jdk.test.lib.thread.VThreadScheduler;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -195,7 +196,7 @@ void testGetThreadInfo4(int maxDepth) {
      */
     @Test
     void testGetThreadInfoCarrierThread() throws Exception {
-        assumeTrue(supportsCustomScheduler(), "No support for custom schedulers");
+        assumeTrue(VThreadScheduler.supportsCustomScheduler(), "No support for custom schedulers");
         try (ExecutorService pool = Executors.newFixedThreadPool(1)) {
             var carrierRef = new AtomicReference<Thread>();
             Executor scheduler = (task) -> {
@@ -204,19 +205,30 @@ void testGetThreadInfoCarrierThread() throws Exception {
                     task.run();
                 });
             };
+            ThreadFactory factory = VThreadScheduler.virtualThreadFactory(scheduler);
 
             // start virtual thread so carrier Thread can be captured
-            virtualThreadBuilder(scheduler).start(() -> { }).join();
+            Thread thread = factory.newThread(() -> { });
+            thread.start();
+            thread.join();
             Thread carrier = carrierRef.get();
             assertTrue(carrier != null && !carrier.isVirtual());
 
             try (Selector sel = Selector.open()) {
-                // start virtual thread that blocks in a native method
-                virtualThreadBuilder(scheduler).start(() -> {
+                String selClassName = sel.getClass().getName();
+
+                // start virtual thread that blocks while pinned
+                Thread vthread = factory.newThread(() -> {
                     try {
-                        sel.select();
+                        VThreadPinner.runPinned(sel::select);
                     } catch (Exception e) { }
                 });
+                vthread.start();
+
+                // wait for virtual thread to block in select
+                while (!contains(vthread.getStackTrace(), selClassName)) {
+                    Thread.sleep(20);
+                }
 
                 // invoke getThreadInfo get and check the stack trace
                 long tid = carrier.getId();
@@ -225,7 +237,7 @@ void testGetThreadInfoCarrierThread() throws Exception {
                 // should only see carrier frames
                 StackTraceElement[] stack = info.getStackTrace();
                 assertTrue(contains(stack, "java.util.concurrent.ThreadPoolExecutor"));
-                assertFalse(contains(stack, "java.nio.channels.Selector"));
+                assertFalse(contains(stack, selClassName));
 
                 // carrier should not be holding any monitors
                 assertEquals(0, info.getLockedMonitors().length);
@@ -351,40 +363,4 @@ private static boolean contains(StackTraceElement[] stack, String className) {
                 .map(StackTraceElement::getClassName)
                 .anyMatch(className::equals);
     }
-
-    /**
-     * Returns a builder to create virtual threads that use the given scheduler.
-     * @throws UnsupportedOperationException if there is no support for custom schedulers
-     */
-    private static Thread.Builder.OfVirtual virtualThreadBuilder(Executor scheduler) {
-        Thread.Builder.OfVirtual builder = Thread.ofVirtual();
-        try {
-            Class<?> clazz = Class.forName("java.lang.ThreadBuilders$VirtualThreadBuilder");
-            Constructor<?> ctor = clazz.getDeclaredConstructor(Executor.class);
-            ctor.setAccessible(true);
-            return (Thread.Builder.OfVirtual) ctor.newInstance(scheduler);
-        } catch (InvocationTargetException e) {
-            Throwable cause = e.getCause();
-            if (cause instanceof RuntimeException re) {
-                throw re;
-            }
-            throw new RuntimeException(e);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     * Return true if custom schedulers are supported.
-     */
-    private static boolean supportsCustomScheduler() {
-        try (var pool = Executors.newCachedThreadPool()) {
-            try {
-                virtualThreadBuilder(pool);
-                return true;
-            } catch (UnsupportedOperationException e) {
-                return false;
-            }
-        }
-    }
 }
diff --git a/test/jdk/java/lang/management/ThreadMXBean/libLockedMonitorInNative.c b/test/jdk/java/lang/management/ThreadMXBean/libLockedMonitorInNative.c
new file mode 100644
index 0000000000000..20975188907e6
--- /dev/null
+++ b/test/jdk/java/lang/management/ThreadMXBean/libLockedMonitorInNative.c
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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"
+
+JNIEXPORT void JNICALL
+Java_LockedMonitorInNative_runWithSynchronizedNative(JNIEnv *env, jobject obj, jobject task) {
+    jclass clazz = (*env)->GetObjectClass(env, obj);
+    jmethodID mid = (*env)->GetMethodID(env, clazz, "run", "(Ljava/lang/Runnable;)V");
+    if (mid != NULL) {
+        (*env)->CallVoidMethod(env, obj, mid, task);
+    }
+}
+
+JNIEXPORT void JNICALL
+Java_LockedMonitorInNative_runWithMonitorEnteredInNative(JNIEnv *env, jobject obj, jobject lock, jobject task) {
+    jclass clazz = (*env)->GetObjectClass(env, obj);
+    jmethodID mid = (*env)->GetMethodID(env, clazz, "run", "(Ljava/lang/Runnable;)V");
+    if (mid != NULL && (*env)->MonitorEnter(env, lock) == 0) {
+        (*env)->CallVoidMethod(env, obj, mid, task);
+        (*env)->MonitorExit(env, lock);  // can be called with pending exception
+    }
+}
diff --git a/test/jdk/jdk/internal/misc/ThreadFlock/ThreadFlockTest.java b/test/jdk/jdk/internal/misc/ThreadFlock/ThreadFlockTest.java
index 2f1da20e052f9..e6bc191a3ba49 100644
--- a/test/jdk/jdk/internal/misc/ThreadFlock/ThreadFlockTest.java
+++ b/test/jdk/jdk/internal/misc/ThreadFlock/ThreadFlockTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -426,7 +426,7 @@ void testAwaitAllWithTimeout1(ThreadFactory factory) throws Exception {
             long startMillis = millisTime();
             boolean done = flock.awaitAll(Duration.ofSeconds(30));
             assertTrue(done);
-            checkDuration(startMillis, 1900, 4000);
+            checkDuration(startMillis, 1900, 20_000);
         }
     }
 
@@ -453,7 +453,7 @@ void testAwaitAllWithTimeout2(ThreadFactory factory) throws Exception {
                     flock.awaitAll(Duration.ofSeconds(2));
                     fail("awaitAll did not throw");
                 } catch (TimeoutException e) {
-                    checkDuration(startMillis, 1900, 4000);
+                    checkDuration(startMillis, 1900, 20_000);
                 }
             } finally {
                 latch.countDown();
diff --git a/test/jdk/java/lang/Thread/virtual/ThreadBuilders.java b/test/lib/jdk/test/lib/thread/VThreadScheduler.java
similarity index 63%
rename from test/jdk/java/lang/Thread/virtual/ThreadBuilders.java
rename to test/lib/jdk/test/lib/thread/VThreadScheduler.java
index a6a5d6abdbca5..46b75fbe5eb9c 100644
--- a/test/jdk/java/lang/Thread/virtual/ThreadBuilders.java
+++ b/test/lib/jdk/test/lib/thread/VThreadScheduler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,28 +21,50 @@
  * questions.
  */
 
+package jdk.test.lib.thread;
+
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
 
 /**
- * Helper class for creating Thread buidlers.
+ * Helper class to allow tests run virtual threads with a custom scheduler.
  *
  * Tests using this class need to open java.base/java.lang.
  */
-class ThreadBuilders {
-    private ThreadBuilders() { }
+public class VThreadScheduler {
+    private VThreadScheduler() { }
 
-    private static final Constructor<?> VTBUILDER_CTOR;
-    static {
+    /**
+     * Returns the scheduler for the given virtual thread.
+     */
+    public static Executor scheduler(Thread thread) {
+        if (!thread.isVirtual())
+            throw new IllegalArgumentException("Not a virtual thread");
         try {
-            Class<?> clazz = Class.forName("java.lang.ThreadBuilders$VirtualThreadBuilder");
-            Constructor<?> ctor = clazz.getDeclaredConstructor(Executor.class);
-            ctor.setAccessible(true);
-            VTBUILDER_CTOR = ctor;
+            Field scheduler = Class.forName("java.lang.VirtualThread")
+                    .getDeclaredField("scheduler");
+            scheduler.setAccessible(true);
+            return (Executor) scheduler.get(thread);
         } catch (Exception e) {
-            throw new InternalError(e);
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Return true if custom schedulers are supported.
+     */
+    public static boolean supportsCustomScheduler() {
+        try (var pool = Executors.newCachedThreadPool()) {
+            try {
+                virtualThreadBuilder(pool);
+                return true;
+            } catch (UnsupportedOperationException e) {
+                return false;
+            }
         }
     }
 
@@ -50,9 +72,12 @@ private ThreadBuilders() { }
      * Returns a builder to create virtual threads that use the given scheduler.
      * @throws UnsupportedOperationException if custom schedulers are not supported
      */
-    static Thread.Builder.OfVirtual virtualThreadBuilder(Executor scheduler) {
+    public static Thread.Builder.OfVirtual virtualThreadBuilder(Executor scheduler) {
         try {
-            return (Thread.Builder.OfVirtual) VTBUILDER_CTOR.newInstance(scheduler);
+            Class<?> clazz = Class.forName("java.lang.ThreadBuilders$VirtualThreadBuilder");
+            Constructor<?> ctor = clazz.getDeclaredConstructor(Executor.class);
+            ctor.setAccessible(true);
+            return (Thread.Builder.OfVirtual) ctor.newInstance(scheduler);
         } catch (InvocationTargetException e) {
             Throwable cause = e.getCause();
             if (cause instanceof RuntimeException re) {
@@ -65,16 +90,10 @@ static Thread.Builder.OfVirtual virtualThreadBuilder(Executor scheduler) {
     }
 
     /**
-     * Return true if custom schedulers are supported.
+     * Returns a ThreadFactory to create virtual threads that use the given scheduler.
+     * @throws UnsupportedOperationException if custom schedulers are not supported
      */
-    static boolean supportsCustomScheduler() {
-        try (var pool = Executors.newCachedThreadPool()) {
-            try {
-                virtualThreadBuilder(pool);
-                return true;
-            } catch (UnsupportedOperationException e) {
-                return false;
-            }
-        }
+    public static ThreadFactory virtualThreadFactory(Executor scheduler) {
+        return virtualThreadBuilder(scheduler).factory();
     }
 }

From 9d8791864ec48f3321707d7f7805cd3618fc3b51 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Thu, 25 Jul 2024 07:47:45 +0000
Subject: [PATCH 206/401] 8335191: RISC-V: verify perf of chacha20

Reviewed-by: fyang
---
 src/hotspot/cpu/riscv/vm_version_riscv.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.cpp b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
index c52c809f9350c..d5a74d186062f 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.cpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
@@ -252,7 +252,9 @@ void VM_Version::initialize() {
   }
 
   // ChaCha20
-  if (UseRVV) {
+  if (UseRVV && MaxVectorSize >= 32) {
+    // performance tests on hardwares (MaxVectorSize == 16, 32) show that
+    // it brings regression when MaxVectorSize == 16.
     if (FLAG_IS_DEFAULT(UseChaCha20Intrinsics)) {
       FLAG_SET_DEFAULT(UseChaCha20Intrinsics, true);
     }

From 8081f8702a89c4895302377be62da22fc34f2c74 Mon Sep 17 00:00:00 2001
From: Shaojin Wen <shaojin.wensj@alibaba-inc.com>
Date: Thu, 25 Jul 2024 09:16:32 +0000
Subject: [PATCH 207/401] 8334342: Add MergeStore JMH benchmarks

Reviewed-by: epeter, thartmann
---
 .../bench/vm/compiler/MergeStoreBench.java    | 1132 +++++++++++++++++
 1 file changed, 1132 insertions(+)
 create mode 100644 test/micro/org/openjdk/bench/vm/compiler/MergeStoreBench.java

diff --git a/test/micro/org/openjdk/bench/vm/compiler/MergeStoreBench.java b/test/micro/org/openjdk/bench/vm/compiler/MergeStoreBench.java
new file mode 100644
index 0000000000000..26c8287c4de67
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/compiler/MergeStoreBench.java
@@ -0,0 +1,1132 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Alibaba Group Holding Limited. 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.
+ */
+package org.openjdk.bench.vm.compiler;
+
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.Blackhole;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.lang.reflect.Field;
+import java.nio.ByteOrder;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+
+import jdk.internal.misc.Unsafe;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+@Warmup(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
+@Measurement(iterations = 5, time = 1000, timeUnit = TimeUnit.MILLISECONDS)
+@Fork(value = 3, jvmArgsAppend = {"--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED"})
+public class MergeStoreBench {
+    private static final Unsafe UNSAFE = Unsafe.getUnsafe();
+
+    final static VarHandle INT_L  = MethodHandles.byteArrayViewVarHandle(int[].class , ByteOrder.LITTLE_ENDIAN);
+    final static VarHandle INT_B  = MethodHandles.byteArrayViewVarHandle(int[].class , ByteOrder.BIG_ENDIAN);
+    final static VarHandle LONG_L = MethodHandles.byteArrayViewVarHandle(long[].class, ByteOrder.LITTLE_ENDIAN);
+    final static VarHandle LONG_B = MethodHandles.byteArrayViewVarHandle(long[].class, ByteOrder.BIG_ENDIAN);
+    final static VarHandle CHAR_L = MethodHandles.byteArrayViewVarHandle(char[].class, ByteOrder.LITTLE_ENDIAN);
+    final static VarHandle CHAR_B = MethodHandles.byteArrayViewVarHandle(char[].class, ByteOrder.BIG_ENDIAN);
+
+    final static int NUMBERS = 8192;
+
+    final byte[] bytes4 = new byte[NUMBERS * 4];
+    final byte[] bytes8 = new byte[NUMBERS * 8];
+    final int [] ints   = new int [NUMBERS    ];
+    final long[] longs  = new long[NUMBERS    ];
+    final char[] chars  = new char[NUMBERS    ];
+
+    @Setup
+    public void setup() {
+        Random r = new Random();
+        for (int i = 0; i < ints.length; i++) {
+            ints[i] = r.nextInt();
+            INT_L.set(bytes4, i * 4, i);
+        }
+
+        for (int i = 0; i < longs.length; i++) {
+            longs[i] = r.nextLong();
+            LONG_L.set(bytes8, i * 8, i);
+        }
+    }
+
+    /*
+     * The names of these cases have the following `B/L/V/U` suffixes, which are:
+     * ```
+     * B BigEndian
+     * L LittleEndian
+     * V VarHandle
+     * U Unsafe
+     * R ReverseBytes
+     * C Unsafe.getChar & putChar
+     * S Unsafe.getShort & putShort
+     * ```
+     */
+
+    @Benchmark
+    public void getIntB(Blackhole BH) {
+        int sum = 0;
+        for (int i = 0; i < ints.length; i++) {
+            sum += getIntB(bytes4, i * 4);
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getIntBU(Blackhole BH) {
+        int sum = 0;
+        for (int i = 0; i < ints.length; i++) {
+            sum += getIntBU(bytes4, i * 4);
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getIntBV(Blackhole BH) {
+        int sum = 0;
+        for (int i = 0; i < ints.length; i++) {
+            sum += (int) INT_B.get(bytes4, i * 4);
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getIntL(Blackhole BH) {
+        int sum = 0;
+        for (int i = 0; i < ints.length; i++) {
+            sum += getIntL(bytes4, i * 4);
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getIntLU(Blackhole BH) {
+        int sum = 0;
+        for (int i = 0; i < ints.length; i++) {
+            sum += getIntLU(bytes4, i * 4);
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getIntLV(Blackhole BH) {
+        int sum = 0;
+        for (int i = 0; i < ints.length; i++) {
+            sum += (int) INT_L.get(bytes4, i * 4);
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getIntRB(Blackhole BH) {
+        int sum = 0;
+        for (int i = 0; i < ints.length; i++) {
+            sum += getIntRB(bytes4, i * 4);
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getIntRBU(Blackhole BH) {
+        int sum = 0;
+        for (int i = 0; i < ints.length; i++) {
+            sum += getIntRBU(bytes4, i * 4);
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getIntRL(Blackhole BH) {
+        int sum = 0;
+        for (int i = 0; i < ints.length; i++) {
+            sum += getIntRL(bytes4, i * 4);
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getIntRLU(Blackhole BH) {
+        int sum = 0;
+        for (int i = 0; i < ints.length; i++) {
+            sum += getIntRLU(bytes4, i * 4);
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getIntRU(Blackhole BH) {
+        int sum = 0;
+        for (int i = 0; i < ints.length; i++) {
+            sum += Integer.reverseBytes(
+                    UNSAFE.getInt(bytes4, Unsafe.ARRAY_BYTE_BASE_OFFSET + i * 4));
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getIntU(Blackhole BH) {
+        int sum = 0;
+        for (int i = 0; i < ints.length; i++) {
+            sum += UNSAFE.getInt(bytes4, Unsafe.ARRAY_BYTE_BASE_OFFSET + i * 4);
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setIntB(Blackhole BH) {
+        int sum = 0;
+        for (int i = 0; i < ints.length; i++) {
+            int v = ints[i];
+            setIntB(bytes4, i * 4, v);
+            sum += v;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setIntBU(Blackhole BH) {
+        int sum = 0;
+        for (int i = 0; i < ints.length; i++) {
+            int v = ints[i];
+            setIntBU(bytes4, i * 4, v);
+            sum += v;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setIntBV(Blackhole BH) {
+        int sum = 0;
+        for (int i = 0; i < ints.length; i++) {
+            int v = ints[i];
+            INT_B.set(bytes4, i * 4, v);
+            sum += v;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setIntL(Blackhole BH) {
+        int sum = 0;
+        for (int i = 0; i < ints.length; i++) {
+            int v = ints[i];
+            setIntL(bytes4, i * 4, v);
+            sum += v;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setIntLU(Blackhole BH) {
+        int sum = 0;
+        for (int i = 0; i < ints.length; i++) {
+            int v = ints[i];
+            setIntLU(bytes4, i * 4, v);
+            sum += v;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setIntLV(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < ints.length; i++) {
+            int v = ints[i];
+            INT_L.set(bytes4, i * 4, v);
+            sum += v;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setIntRB(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < ints.length; i++) {
+            int v = ints[i];
+            setIntRB(bytes4, i * 4, ints[i]);
+            sum += v;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setIntRBU(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < ints.length; i++) {
+            int v = ints[i];
+            setIntRBU(bytes4, i * 4, v);
+            sum += v;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setIntRL(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < ints.length; i++) {
+            int v = ints[i];
+            setIntRL(bytes4, i * 4, ints[i]);
+            sum += v;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setIntRLU(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < ints.length; i++) {
+            int v = ints[i];
+            setIntRLU(bytes4, i * 4, v);
+            sum += v;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setIntRU(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < ints.length; i++) {
+            int v = ints[i];
+            v = Integer.reverseBytes(v);
+            UNSAFE.putInt(bytes4, Unsafe.ARRAY_BYTE_BASE_OFFSET + i * 4, v);
+            sum += v;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setIntU(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < ints.length; i++) {
+            int v = ints[i];
+            UNSAFE.putInt(bytes4, Unsafe.ARRAY_BYTE_BASE_OFFSET + i * 4, v);
+            sum += v;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getLongB(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            sum += getLongB(bytes8, i * 8);
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getLongBU(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            sum += getLongBU(bytes8, i * 8);
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getLongBV(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < ints.length; i++) {
+            sum += (long) LONG_B.get(bytes8, i * 8);
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getLongL(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            sum += getLongL(bytes8, i * 8);
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getLongLU(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            sum += getLongLU(bytes8, i * 8);
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getLongLV(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < ints.length; i++) {
+            sum += (long) LONG_L.get(bytes8, i * 8);
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getLongRB(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            sum += getLongRB(bytes8, i * 8);
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getLongRBU(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            sum += getLongRBU(bytes8, i * 8);
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getLongRL(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            sum += getLongRL(bytes8, i * 8);
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getLongRLU(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            sum += getLongRLU(bytes8, i * 8);
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getLongRU(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            sum += Long.reverseBytes(
+                    UNSAFE.getLong(bytes8, Unsafe.ARRAY_BYTE_BASE_OFFSET + i * 8));
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getLongU(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            sum += UNSAFE.getLong(bytes8, Unsafe.ARRAY_BYTE_BASE_OFFSET + i * 8);
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setLongB(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            long v = longs[i];
+            setLongB(bytes8, i * 8, v);
+            sum += v;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setLongBU(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            long v = longs[i];
+            setLongBU(bytes8, i * 8, v);
+            sum += v;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setLongBV(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            long v = longs[i];
+            LONG_B.set(bytes8, i * 8, v);
+            sum += v;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setLongL(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            long v = longs[i];
+            setLongL(bytes8, i * 8, v);
+            sum += v;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setLongLU(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            long v = longs[i];
+            setLongLU(bytes8, i * 8, v);
+            sum += v;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setLongLV(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            long v = longs[i];
+            LONG_L.set(bytes8, i * 8, v);
+            sum += v;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setLongRB(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            long v = longs[i];
+            setLongRB(bytes8, i * 8, v);
+            sum += v;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setLongRBU(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            long v = longs[i];
+            setLongRBU(bytes8, i * 8, v);
+            sum += v;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setLongRL(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            long v = longs[i];
+            setLongRL(bytes8, i * 8, v);
+            sum += v;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setLongRLU(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            long v = longs[i];
+            setLongRLU(bytes8, i * 8, v);
+            sum += v;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setLongRU(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            long v = longs[i];
+            v = Long.reverseBytes(v);
+            UNSAFE.putLong(bytes8, Unsafe.ARRAY_BYTE_BASE_OFFSET + i * 8, v);
+            sum += v;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setLongU(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            long v = longs[i];
+            UNSAFE.putLong(bytes8, Unsafe.ARRAY_BYTE_BASE_OFFSET + i * 8, v);
+            sum += v;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getCharB(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            char c = getCharB(bytes4, i);
+            sum += c;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getCharBV(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            char c = (char) CHAR_B.get(bytes4, Unsafe.ARRAY_BYTE_BASE_OFFSET + i * 2);
+            sum += c;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getCharBU(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            char c = getCharBU(bytes4, i);
+            sum += c;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getCharL(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            char c = getCharL(bytes4, i);
+            sum += c;
+        }
+        BH.consume(sum);
+    }
+    @Benchmark
+    public void getCharLU(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            char c = getCharLU(bytes4, i);
+            sum += c;
+        }
+        BH.consume(sum);
+    }
+
+
+    @Benchmark
+    public void getCharLV(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            char c = (char) CHAR_L.get(bytes4, Unsafe.ARRAY_BYTE_BASE_OFFSET + i * 2);
+            sum += c;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void getCharC(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            char c = UNSAFE.getChar(bytes4, Unsafe.ARRAY_BYTE_BASE_OFFSET + i * 2);
+            sum += c;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setCharBS(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < chars.length; i++) {
+            char c = chars[i];
+            putShortB(bytes4, i * 2, c);
+            sum += c;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setCharBV(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < chars.length; i++) {
+            char c = chars[i];
+            CHAR_B.set(bytes4, i * 2, c);
+            sum += c;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setCharLS(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < chars.length; i++) {
+            char c = chars[i];
+            putShortL(bytes4, i * 2, c);
+            sum += c;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setCharLV(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < chars.length; i++) {
+            char c = chars[i];
+            CHAR_L.set(bytes4, i * 2, c);
+            sum += c;
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void setCharC(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < chars.length; i++) {
+            char c = chars[i];
+            UNSAFE.putChar(bytes4, Unsafe.ARRAY_BYTE_BASE_OFFSET + i * 2, c);
+            sum += c;
+        }
+        BH.consume(sum);
+    }
+
+    /*
+     * putChars4 Test whether four constant chars can be MergeStored
+     *
+     */
+    @Benchmark
+    public void putChars4B(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            putChars4B(bytes8, i * 4);
+            sum += longs[i];
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void putChars4BU(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            putChars4BU(bytes8, i * 4);
+            sum += longs[i];
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void putChars4BV(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            putChars4BV(bytes8, i * 4);
+            sum += longs[i];
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void putChars4L(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            putChars4L(bytes8, i * 4);
+            sum += longs[i];
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void putChars4LU(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            putChars4LU(bytes8, i * 4);
+            sum += longs[i];
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void putChars4LV(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            putChars4LV(bytes8, i * 4);
+            sum += longs[i];
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void putChars4C(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            putChars4C(bytes8, i * 4);
+            sum += longs[i];
+        }
+        BH.consume(sum);
+    }
+
+    @Benchmark
+    public void putChars4S(Blackhole BH) {
+        long sum = 0;
+        for (int i = 0; i < longs.length; i++) {
+            putChars4S(bytes8, i * 4);
+            sum += longs[i];
+        }
+        BH.consume(sum);
+    }
+
+    static int getIntB(byte[] array, int offset) {
+        return ((array[offset    ] & 0xff) << 24)
+             | ((array[offset + 1] & 0xff) << 16)
+             | ((array[offset + 2] & 0xff) <<  8)
+             | ((array[offset + 3] & 0xff)      );
+    }
+
+    static int getIntBU(byte[] array, int offset) {
+        final long address = Unsafe.ARRAY_BYTE_BASE_OFFSET + offset;
+        return ((UNSAFE.getByte(array, address    ) & 0xff) << 24)
+             | ((UNSAFE.getByte(array, address + 1) & 0xff) << 16)
+             | ((UNSAFE.getByte(array, address + 2) & 0xff) <<  8)
+             | ((UNSAFE.getByte(array, address + 3) & 0xff)      );
+    }
+
+    static int getIntL(byte[] array, int offset) {
+        return ((array[offset       ] & 0xff)      )
+                | ((array[offset + 1] & 0xff) <<  8)
+                | ((array[offset + 2] & 0xff) << 16)
+                | ((array[offset + 3] & 0xff) << 24);
+    }
+
+    static int getIntRB(byte[] array, int offset) {
+        return Integer.reverseBytes(getIntB(array, offset));
+    }
+
+    static int getIntRBU(byte[] array, int offset) {
+        return Integer.reverseBytes(getIntBU(array, offset));
+    }
+
+    static int getIntRL(byte[] array, int offset) {
+        return Integer.reverseBytes(getIntL(array, offset));
+    }
+
+    static int getIntRLU(byte[] array, int offset) {
+        return Integer.reverseBytes(getIntLU(array, offset));
+    }
+
+    static void setIntB(byte[] array, int offset, int value) {
+        array[offset    ] = (byte) (value >> 24);
+        array[offset + 1] = (byte) (value >> 16);
+        array[offset + 2] = (byte) (value >>  8);
+        array[offset + 3] = (byte) (value      );
+    }
+
+    static void setIntBU(byte[] array, int offset, int value) {
+        final long address = Unsafe.ARRAY_BYTE_BASE_OFFSET + offset;
+        UNSAFE.putByte(array, address    , (byte) (value >> 24));
+        UNSAFE.putByte(array, address + 1, (byte) (value >> 16));
+        UNSAFE.putByte(array, address + 2, (byte) (value >>  8));
+        UNSAFE.putByte(array, address + 3, (byte) (value      ));
+    }
+
+    public static void setIntL(byte[] array, int offset, int value) {
+        array[offset    ] = (byte)  value;
+        array[offset + 1] = (byte) (value >> 8);
+        array[offset + 2] = (byte) (value >> 16);
+        array[offset + 3] = (byte) (value >> 24);
+    }
+
+    public static void setIntLU(byte[] array, int offset, int value) {
+        final long address = Unsafe.ARRAY_BYTE_BASE_OFFSET + offset;
+        UNSAFE.putByte(array, address    , (byte)  value       );
+        UNSAFE.putByte(array, address + 1, (byte) (value >>  8));
+        UNSAFE.putByte(array, address + 2, (byte) (value >> 16));
+        UNSAFE.putByte(array, address + 3, (byte) (value >> 24));
+    }
+
+    public static void setIntRL(byte[] array, int offset, int value) {
+        value = Integer.reverseBytes(value);
+        setIntL(array, offset, value);
+    }
+
+    public static void setIntRLU(byte[] array, int offset, int value) {
+        value = Integer.reverseBytes(value);
+        setIntLU(array, offset, value);
+    }
+
+    public static void setIntRB(byte[] array, int offset, int value) {
+        value = Integer.reverseBytes(value);
+        setIntB(array, offset, value);
+    }
+
+    public static void setIntRBU(byte[] array, int offset, int value) {
+        value = Integer.reverseBytes(value);
+        setIntBU(array, offset, value);
+    }
+
+    static long getLongB(byte[] array, int offset) {
+        return (((long) array[offset    ] & 0xff) << 56)
+             | (((long) array[offset + 1] & 0xff) << 48)
+             | (((long) array[offset + 2] & 0xff) << 40)
+             | (((long) array[offset + 3] & 0xff) << 32)
+             | (((long) array[offset + 4] & 0xff) << 24)
+             | (((long) array[offset + 5] & 0xff) << 16)
+             | (((long) array[offset + 6] & 0xff) << 8)
+             | (((long) array[offset + 7] & 0xff)     );
+    }
+
+    static long getLongBU(byte[] array, int offset) {
+        final long address = Unsafe.ARRAY_BYTE_BASE_OFFSET + offset;
+        return (((long)(UNSAFE.getByte(array, address)     & 0xff)) << 56)
+             | (((long)(UNSAFE.getByte(array, address + 1) & 0xff)) << 48)
+             | (((long)(UNSAFE.getByte(array, address + 2) & 0xff)) << 40)
+             | (((long)(UNSAFE.getByte(array, address + 3) & 0xff)) << 32)
+             | (((long)(UNSAFE.getByte(array, address + 4) & 0xff)) << 24)
+             | (((long)(UNSAFE.getByte(array, address + 5) & 0xff)) << 16)
+             | (((long)(UNSAFE.getByte(array, address + 6) & 0xff)) <<  8)
+             | (((long)(UNSAFE.getByte(array, address + 7) & 0xff))      );
+    }
+
+    public static long getLongL(byte[] array, int offset) {
+        return (((long) array[offset    ] & 0xff)      )
+             | (((long) array[offset + 1] & 0xff) <<  8)
+             | (((long) array[offset + 2] & 0xff) << 16)
+             | (((long) array[offset + 3] & 0xff) << 24)
+             | (((long) array[offset + 4] & 0xff) << 32)
+             | (((long) array[offset + 5] & 0xff) << 40)
+             | (((long) array[offset + 6] & 0xff) << 48)
+             | (((long) array[offset + 7] & 0xff) << 56);
+    }
+
+    static long getLongLU(byte[] array, int offset) {
+        final long address = Unsafe.ARRAY_BYTE_BASE_OFFSET + offset;
+        return (((long)(UNSAFE.getByte(array, address    ) & 0xff))      )
+             | (((long)(UNSAFE.getByte(array, address + 1) & 0xff)) <<  8)
+             | (((long)(UNSAFE.getByte(array, address + 2) & 0xff)) << 16)
+             | (((long)(UNSAFE.getByte(array, address + 3) & 0xff)) << 24)
+             | (((long)(UNSAFE.getByte(array, address + 4) & 0xff)) << 32)
+             | (((long)(UNSAFE.getByte(array, address + 5) & 0xff)) << 40)
+             | (((long)(UNSAFE.getByte(array, address + 6) & 0xff)) << 48)
+             | (((long)(UNSAFE.getByte(array, address + 7) & 0xff)) << 56);
+    }
+
+    static long getLongRB(byte[] array, int offset) {
+        return getLongB(array, offset);
+    }
+
+    static long getLongRBU(byte[] array, int offset) {
+        return getLongBU(array, offset);
+    }
+
+    static long getLongRL(byte[] array, int offset) {
+        return getLongL(array, offset);
+    }
+
+    static long getLongRLU(byte[] array, int offset) {
+        return getLongLU(array, offset);
+    }
+
+    static void setLongB(byte[] array, int offset, long value) {
+        array[offset]     = (byte) (value >> 56);
+        array[offset + 1] = (byte) (value >> 48);
+        array[offset + 2] = (byte) (value >> 40);
+        array[offset + 3] = (byte) (value >> 32);
+        array[offset + 4] = (byte) (value >> 24);
+        array[offset + 5] = (byte) (value >> 16);
+        array[offset + 6] = (byte) (value >>  8);
+        array[offset + 7] = (byte) (value      );
+    }
+
+    public static void setLongL(byte[] array, int offset, long value) {
+        array[offset]     = (byte)  value       ;
+        array[offset + 1] = (byte) (value >> 8 );
+        array[offset + 2] = (byte) (value >> 16);
+        array[offset + 3] = (byte) (value >> 24);
+        array[offset + 4] = (byte) (value >> 32);
+        array[offset + 5] = (byte) (value >> 40);
+        array[offset + 6] = (byte) (value >> 48);
+        array[offset + 7] = (byte) (value >> 56);
+    }
+
+    public static void setLongRL(byte[] array, int offset, long value) {
+        value = Long.reverseBytes(value);
+        setLongL(array, offset, value);
+    }
+
+    public static void setLongRLU(byte[] array, int offset, long value) {
+        value = Long.reverseBytes(value);
+        setLongLU(array, offset, value);
+    }
+
+    public static void setLongRB(byte[] array, int offset, long value) {
+        value = Long.reverseBytes(value);
+        setLongB(array, offset, value);
+    }
+
+    public static void setLongRBU(byte[] array, int offset, long value) {
+        value = Long.reverseBytes(value);
+        setLongBU(array, offset, value);
+    }
+
+    public static void setLongBU(byte[] array, int offset, long value) {
+        final long address = Unsafe.ARRAY_BYTE_BASE_OFFSET + offset;
+        UNSAFE.putByte(array, address    , (byte) (value >> 56));
+        UNSAFE.putByte(array, address + 1, (byte) (value >> 48));
+        UNSAFE.putByte(array, address + 2, (byte) (value >> 40));
+        UNSAFE.putByte(array, address + 3, (byte) (value >> 32));
+        UNSAFE.putByte(array, address + 4, (byte) (value >> 24));
+        UNSAFE.putByte(array, address + 5, (byte) (value >> 16));
+        UNSAFE.putByte(array, address + 6, (byte) (value >>  8));
+        UNSAFE.putByte(array, address + 7, (byte)  value       );
+    }
+
+    public static void setLongLU(byte[] array, int offset, long value) {
+        final long address = Unsafe.ARRAY_BYTE_BASE_OFFSET + offset;
+        UNSAFE.putByte(array, address    , (byte)  value       );
+        UNSAFE.putByte(array, address + 1, (byte) (value >>  8));
+        UNSAFE.putByte(array, address + 2, (byte) (value >> 16));
+        UNSAFE.putByte(array, address + 3, (byte) (value >> 24));
+        UNSAFE.putByte(array, address + 4, (byte) (value >> 32));
+        UNSAFE.putByte(array, address + 5, (byte) (value >> 40));
+        UNSAFE.putByte(array, address + 6, (byte) (value >> 48));
+        UNSAFE.putByte(array, address + 7, (byte) (value >> 56));
+    }
+
+    public static int getIntLU(byte[] array, int offset) {
+        final long address = Unsafe.ARRAY_BYTE_BASE_OFFSET + offset;
+        return ((UNSAFE.getByte(array, address    ) & 0xff)      )
+             | ((UNSAFE.getByte(array, address + 1) & 0xff) <<  8)
+             | ((UNSAFE.getByte(array, address + 2) & 0xff) << 16)
+             | ((UNSAFE.getByte(array, address + 3) & 0xff) << 24);
+    }
+
+    public static char getCharB(byte[] val, int index) {
+        index <<= 1;
+        return (char)(((val[index    ] & 0xff) << 8)
+                    | ((val[index + 1] & 0xff)));
+    }
+
+    public static char getCharBR(byte[] val, int index) {
+        return Character.reverseBytes(getCharB(val, index));
+    }
+
+    public static char getCharL(byte[] val, int index) {
+        index <<= 1;
+        return (char)(((val[index    ] & 0xff))
+                    | ((val[index + 1] & 0xff) << 8));
+    }
+
+    public static char getCharLR(byte[] val, int index) {
+        return Character.reverseBytes(getCharL(val, index));
+    }
+
+    public static char getCharBU(byte[] array, int offset) {
+        final long address = Unsafe.ARRAY_BYTE_BASE_OFFSET + (offset << 1);
+        return (char) (((UNSAFE.getByte(array, address    ) & 0xff) << 8)
+                     | ((UNSAFE.getByte(array, address + 1) & 0xff)     ));
+    }
+
+    public static char getCharLU(byte[] array, int offset) {
+        final long address = Unsafe.ARRAY_BYTE_BASE_OFFSET + (offset << 1);
+        return (char) (((UNSAFE.getByte(array, address    ) & 0xff)     )
+                     | ((UNSAFE.getByte(array, address + 1) & 0xff) << 8));
+    }
+
+    public void putChars4B(byte[] bytes, int offset) {
+        char c0 = 'n', c1 = 'u', c2 = 'l', c3 = 'l';
+        putShortB(bytes, offset    , c0);
+        putShortB(bytes, offset + 1, c1);
+        putShortB(bytes, offset + 2, c2);
+        putShortB(bytes, offset + 3, c3);
+    }
+
+    public void putChars4BU(byte[] bytes, int offset) {
+        char c0 = 'n', c1 = 'u', c2 = 'l', c3 = 'l';
+        putShortBU(bytes, offset    , c0);
+        putShortBU(bytes, offset + 1, c1);
+        putShortBU(bytes, offset + 2, c2);
+        putShortBU(bytes, offset + 3, c3);
+    }
+
+    public void putChars4BV(byte[] bytes, int offset) {
+        char c0 = 'n', c1 = 'u', c2 = 'l', c3 = 'l';
+        offset <<= 1;
+        CHAR_B.set(bytes, offset    , c0);
+        CHAR_B.set(bytes, offset + 2, c1);
+        CHAR_B.set(bytes, offset + 4, c2);
+        CHAR_B.set(bytes, offset + 6, c3);
+    }
+
+    public void putChars4L(byte[] bytes, int offset) {
+        char c0 = 'n', c1 = 'u', c2 = 'l', c3 = 'l';
+        putShortL(bytes, offset    , c0);
+        putShortL(bytes, offset + 1, c1);
+        putShortL(bytes, offset + 2, c2);
+        putShortL(bytes, offset + 3, c3);
+    }
+
+    public void putChars4LV(byte[] bytes, int offset) {
+        char c0 = 'n', c1 = 'u', c2 = 'l', c3 = 'l';
+        offset <<= 1;
+        CHAR_L.set(bytes, offset    , c0);
+        CHAR_L.set(bytes, offset + 2, c1);
+        CHAR_L.set(bytes, offset + 4, c2);
+        CHAR_L.set(bytes, offset + 6, c3);
+    }
+
+    public void putChars4LU(byte[] bytes, int offset) {
+        char c0 = 'n', c1 = 'u', c2 = 'l', c3 = 'l';
+        putShortLU(bytes, offset    , c0);
+        putShortLU(bytes, offset + 1, c1);
+        putShortLU(bytes, offset + 2, c2);
+        putShortLU(bytes, offset + 3, c3);
+    }
+
+    public void putChars4C(byte[] bytes, int offset) {
+        char c0 = 'n', c1 = 'u', c2 = 'l', c3 = 'l';
+        final long address = Unsafe.ARRAY_BYTE_BASE_OFFSET + (offset << 1);
+        UNSAFE.putChar(bytes, address    , c0);
+        UNSAFE.putChar(bytes, address + 2, c1);
+        UNSAFE.putChar(bytes, address + 4, c2);
+        UNSAFE.putChar(bytes, address + 6, c3);
+    }
+
+    public void putChars4S(byte[] bytes, int offset) {
+        char c0 = 'n', c1 = 'u', c2 = 'l', c3 = 'l';
+        final long address = Unsafe.ARRAY_BYTE_BASE_OFFSET + (offset << 1);
+        UNSAFE.putShort(bytes, address    , (short) c0);
+        UNSAFE.putShort(bytes, address + 2, (short) c1);
+        UNSAFE.putShort(bytes, address + 4, (short) c2);
+        UNSAFE.putShort(bytes, address + 6, (short) c3);
+    }
+
+    private static void putShortB(byte[] val, int index, int c) {
+        index <<= 1;
+        val[index    ] = (byte)(c >> 8);
+        val[index + 1] = (byte)(c     );
+    }
+
+    public static void putShortBU(byte[] array, int offset, int c) {
+        final long address = Unsafe.ARRAY_BYTE_BASE_OFFSET + (offset << 1);
+        UNSAFE.putByte(array, address    , (byte) (c >>  8));
+        UNSAFE.putByte(array, address + 1, (byte) (c      ));
+    }
+
+    private static void putShortL(byte[] val, int index, int c) {
+        index <<= 1;
+        val[index    ] = (byte)(c     );
+        val[index + 1] = (byte)(c >> 8);
+    }
+
+    public static void putShortLU(byte[] array, int offset, int c) {
+        final long address = Unsafe.ARRAY_BYTE_BASE_OFFSET + (offset << 1);
+        UNSAFE.putByte(array, address    , (byte) (c     ));
+        UNSAFE.putByte(array, address + 1, (byte) (c >> 8));
+    }
+}

From 3baff2af6a30cc6cb2e0d4391db1cf7e61c33f64 Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Thu, 25 Jul 2024 09:26:11 +0000
Subject: [PATCH 208/401] 8335393: C2: assert(!had_error) failed: bad dominance

Reviewed-by: thartmann, chagedorn
---
 src/hotspot/share/opto/loopTransform.cpp      | 31 +++++++-
 .../rangechecks/TestEmptyLoopDeadCast.java    | 72 +++++++++++++++++++
 2 files changed, 101 insertions(+), 2 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/rangechecks/TestEmptyLoopDeadCast.java

diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index 1b29d31ba68f7..e961d5a3949b1 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -2871,6 +2871,7 @@ void PhaseIdealLoop::do_range_check(IdealLoopTree *loop, Node_List &old_new) {
   // Must know if its a count-up or count-down loop
 
   int stride_con = cl->stride_con();
+  bool abs_stride_is_one = stride_con == 1 || stride_con == -1;
   Node* zero = _igvn.longcon(0);
   Node* one  = _igvn.longcon(1);
   // Use symmetrical int range [-max_jint,max_jint]
@@ -2882,6 +2883,15 @@ void PhaseIdealLoop::do_range_check(IdealLoopTree *loop, Node_List &old_new) {
   Node* loop_entry = cl->skip_strip_mined()->in(LoopNode::EntryControl);
   assert(loop_entry->is_Proj() && loop_entry->in(0)->is_If(), "if projection only");
 
+  // if abs(stride) == 1, an Assertion Predicate for the final iv value is added. We don't know the final iv value until
+  // we're done with range check elimination so use a place holder.
+  Node* final_iv_placeholder = nullptr;
+  if (abs_stride_is_one) {
+    final_iv_placeholder = new Node(1);
+    _igvn.set_type(final_iv_placeholder, TypeInt::INT);
+    final_iv_placeholder->init_req(0, loop_entry);
+  }
+
   // Check loop body for tests of trip-counter plus loop-invariant vs loop-variant.
   for (uint i = 0; i < loop->_body.size(); i++) {
     Node *iff = loop->_body[i];
@@ -2985,6 +2995,20 @@ void PhaseIdealLoop::do_range_check(IdealLoopTree *loop, Node_List &old_new) {
           Node* opaque_init = new OpaqueLoopInitNode(C, init);
           register_new_node(opaque_init, loop_entry);
 
+          if (abs_stride_is_one) {
+            // If the main loop becomes empty and the array access for this range check is sunk out of the loop, the index
+            // for the array access will be set to the index value of the final iteration which could be out of loop.
+            // Add an Assertion Predicate for that corner case. The final iv is computed from LoopLimit which is the
+            // LoopNode::limit() only if abs(stride) == 1 otherwise the computation depends on LoopNode::init_trip() as
+            // well. When LoopLimit only depends on LoopNode::limit(), there are cases where the zero trip guard for the
+            // main loop doesn't constant fold after range check elimination but, the array access for the final
+            // iteration of the main loop is out of bound and the index for that access is out of range for the range
+            // check CastII.
+            loop_entry = add_range_check_elimination_assertion_predicate(loop, loop_entry, scale_con, int_offset,
+                                                                         int_limit, stride_con, final_iv_placeholder, false);
+            assert(!assertion_predicate_has_loop_opaque_node(loop_entry->in(0)->as_If()), "unexpected");
+          }
+
           // Initialized Assertion Predicate for the value of the initial main-loop.
           loop_entry = add_range_check_elimination_assertion_predicate(loop, loop_entry, scale_con, int_offset,
                                                                        int_limit, stride_con, init, false);
@@ -3116,11 +3140,14 @@ void PhaseIdealLoop::do_range_check(IdealLoopTree *loop, Node_List &old_new) {
   register_new_node(main_limit, pre_ctrl);
   // Hack the now-private loop bounds
   _igvn.replace_input_of(main_cmp, 2, main_limit);
+  if (abs_stride_is_one) {
+    Node* final_iv = new SubINode(main_limit, cl->stride());
+    register_new_node(final_iv, loop_entry);
+    _igvn.replace_node(final_iv_placeholder, final_iv);
+  }
   // The OpaqueNode is unshared by design
   assert(opqzm->outcnt() == 1, "cannot hack shared node");
   _igvn.replace_input_of(opqzm, 1, main_limit);
-
-  return;
 }
 
 bool IdealLoopTree::compute_has_range_checks() const {
diff --git a/test/hotspot/jtreg/compiler/rangechecks/TestEmptyLoopDeadCast.java b/test/hotspot/jtreg/compiler/rangechecks/TestEmptyLoopDeadCast.java
new file mode 100644
index 0000000000000..105f297c8cbb5
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/rangechecks/TestEmptyLoopDeadCast.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2024, Red Hat 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 8335393
+ * @summary C2: assert(!had_error) failed: bad dominance
+ * @requires vm.compiler2.enabled
+ * @run main/othervm -XX:-TieredCompilation -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:-UseLoopPredicate
+ *                   -XX:LoopMaxUnroll=0 TestEmptyLoopDeadCast
+ */
+
+public class TestEmptyLoopDeadCast {
+    public static void main(String[] args) {
+        int[] array = new int[100];
+        for (int i = 0; i < 20_000; i++) {
+            test1Helper(1, 101, array);
+            test1(0, array);
+            test2Helper(0, -101, array);
+            test2(0, array);
+        }
+    }
+
+    private static int test1(int start, int[] array) {
+        return test1Helper(start, 0, array);
+    }
+
+    private static int test1Helper(int start, int stop, int[] array) {
+        if (array == null) {
+        }
+        int v = 0;
+        for (int i = start; i < stop; i++) {
+            v = array[i - 1];
+        }
+        return v;
+    }
+
+    private static int test2(int start, int[] array) {
+        return test2Helper(start, -1, array);
+    }
+
+    private static int test2Helper(int start, int stop, int[] array) {
+        if (array == null) {
+        }
+        int v = 0;
+        for (int i = start-1; i > stop; i--) {
+            v = array[-1 - i];
+        }
+        return v;
+    }
+
+}

From 00b53481064ed1ca914008d06ce5b530ca7ffe16 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Thu, 25 Jul 2024 13:16:31 +0000
Subject: [PATCH 209/401] 8337192: [BACKOUT] JDK-8336098 G1: Refactor
 G1RebuildRSAndScrubTask

Reviewed-by: tschatzl
---
 .../gc/g1/g1ConcurrentRebuildAndScrub.cpp     | 149 ++++++++++++------
 1 file changed, 97 insertions(+), 52 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp b/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp
index 35cff96eb930e..1b6b1eed7b13b 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp
@@ -89,14 +89,10 @@ class G1RebuildRSAndScrubTask : public WorkerTask {
 
     // Yield if enough has been processed; returns if the concurrent marking cycle
     // has been aborted for any reason.
-    bool yield_if_necessary(G1HeapRegion* hr) {
+    bool yield_if_necessary() {
       if (_processed_words >= ProcessingYieldLimitInWords) {
         reset_processed_words();
-        // If a yield occurs (potential young-gc pause), must recheck for
-        // potential regions reclamation.
-        if (_cm->do_yield_check() && !should_rebuild_or_scrub(hr)) {
-          return true;
-        }
+        _cm->do_yield_check();
       }
       return _cm->has_aborted();
     }
@@ -115,7 +111,8 @@ class G1RebuildRSAndScrubTask : public WorkerTask {
     // Helper used by both humongous objects and when chunking an object larger than the
     // G1RebuildRemSetChunkSize. The heap region is needed check whether the region has
     // been reclaimed during yielding.
-    void scan_large_object(G1HeapRegion* hr, const oop obj, MemRegion scan_range) {
+    // Returns true if marking has been aborted or false if completed.
+    bool scan_large_object(G1HeapRegion* hr, const oop obj, MemRegion scan_range) {
       HeapWord* start = scan_range.start();
       HeapWord* limit = scan_range.end();
       do {
@@ -125,14 +122,20 @@ class G1RebuildRSAndScrubTask : public WorkerTask {
         // Update processed words and yield, for humongous objects we will yield
         // after each chunk.
         add_processed_words(mr.word_size());
-
-        if (yield_if_necessary(hr)) {
-          return;
+        bool mark_aborted = yield_if_necessary();
+        if (mark_aborted) {
+          return true;
+        } else if (!should_rebuild_or_scrub(hr)) {
+          // We need to check should_rebuild_or_scrub() again because the region might
+          // have been reclaimed during above yield/safepoint.
+          log_trace(gc, marking)("Rebuild aborted for reclaimed region: %u", hr->hrm_index());
+          return false;
         }
 
         // Step to next chunk of the large object.
         start = mr.end();
       } while (start < limit);
+      return false;
     }
 
     // Scan for references into regions that need remembered set update for the given
@@ -162,66 +165,102 @@ class G1RebuildRSAndScrubTask : public WorkerTask {
       return obj_size;
     }
 
-    // Scan or scrub depending on if addr is marked.
-    HeapWord* scan_or_scrub(G1HeapRegion* hr, HeapWord* addr, HeapWord* limit) {
-      if (_bitmap->is_marked(addr)) {
-        //  Live object, need to scan to rebuild remembered sets for this object.
-        return addr + scan_object(hr, addr);
-      } else {
-        // Found dead object (which klass has potentially been unloaded). Scrub to next marked object.
-        HeapWord* scrub_end = _bitmap->get_next_marked_addr(addr, limit);
-        hr->fill_range_with_dead_objects(addr, scrub_end);
-        // Return the next object to handle.
-        return scrub_end;
+    // Scrub a range of dead objects starting at scrub_start. Will never scrub past limit.
+    HeapWord* scrub_to_next_live(G1HeapRegion* hr, HeapWord* scrub_start, HeapWord* limit) {
+      assert(!_bitmap->is_marked(scrub_start), "Should not scrub live object");
+
+      HeapWord* scrub_end = _bitmap->get_next_marked_addr(scrub_start, limit);
+      hr->fill_range_with_dead_objects(scrub_start, scrub_end);
+
+      // Return the next object to handle.
+      return scrub_end;
+    }
+
+    // Scan the given region from bottom to parsable_bottom. Returns whether marking has
+    // been aborted.
+    bool scan_and_scrub_to_pb(G1HeapRegion* hr, HeapWord* start, HeapWord* const limit) {
+
+      while (start < limit) {
+        if (_bitmap->is_marked(start)) {
+          //  Live object, need to scan to rebuild remembered sets for this object.
+          start += scan_object(hr, start);
+        } else {
+          // Found dead object (which klass has potentially been unloaded). Scrub to next
+          // marked object and continue.
+          start = scrub_to_next_live(hr, start, limit);
+        }
+
+        bool mark_aborted = yield_if_necessary();
+        if (mark_aborted) {
+          return true;
+        } else if (!should_rebuild_or_scrub(hr)) {
+          // We need to check should_rebuild_or_scrub() again because the region might
+          // have been reclaimed during above yield/safepoint.
+          log_trace(gc, marking)("Scan and scrub aborted for reclaimed region: %u", hr->hrm_index());
+          return false;
+        }
       }
+      return false;
     }
 
-    // Scan and scrub the given region to tars.
-    void scan_and_scrub_region(G1HeapRegion* hr, HeapWord* const pb) {
+    // Scan the given region from parsable_bottom to tars. Returns whether marking has
+    // been aborted.
+    bool scan_from_pb_to_tars(G1HeapRegion* hr, HeapWord* start, HeapWord* const limit) {
+
+      while (start < limit) {
+        start += scan_object(hr, start);
+        // Avoid stalling safepoints and stop iteration if mark cycle has been aborted.
+        bool mark_aborted = yield_if_necessary();
+        if (mark_aborted) {
+          return true;
+        } else if (!should_rebuild_or_scrub(hr)) {
+          // We need to check should_rebuild_or_scrub() again because the region might
+          // have been reclaimed during above yield/safepoint.
+          log_trace(gc, marking)("Scan aborted for reclaimed region: %u", hr->hrm_index());
+          return false;
+        }
+      }
+      return false;
+    }
+
+    // Scan and scrub the given region to tars. Returns whether marking has
+    // been aborted.
+    bool scan_and_scrub_region(G1HeapRegion* hr, HeapWord* const pb) {
       assert(should_rebuild_or_scrub(hr), "must be");
 
       log_trace(gc, marking)("Scrub and rebuild region: " HR_FORMAT " pb: " PTR_FORMAT " TARS: " PTR_FORMAT " TAMS: " PTR_FORMAT,
                              HR_FORMAT_PARAMS(hr), p2i(pb), p2i(_cm->top_at_rebuild_start(hr)), p2i(_cm->top_at_mark_start(hr)));
 
-      {
-        // Step 1: Scan the given region from bottom to parsable_bottom.
-        HeapWord* start = hr->bottom();
-        HeapWord* limit = pb;
-        while (start < limit) {
-          start = scan_or_scrub(hr, start, limit);
-
-          if (yield_if_necessary(hr)) {
-            return;
-          }
-        }
+      if (scan_and_scrub_to_pb(hr, hr->bottom(), pb)) {
+        log_trace(gc, marking)("Scan and scrub aborted for region: %u", hr->hrm_index());
+        return true;
       }
 
+      // Yielding during scrubbing and scanning might have reclaimed the region, so need to
+      // re-check after above.
+      if (!should_rebuild_or_scrub(hr)) {
+        return false;
+      }
       // Scrubbing completed for this region - notify that we are done with it, resetting
       // pb to bottom.
       hr->note_end_of_scrubbing();
 
-      {
-        // Step 2: Rebuild from TAMS (= parsable_bottom) to TARS.
-        HeapWord* start = pb;
-        HeapWord* limit = _cm->top_at_rebuild_start(hr);
-        while (start < limit) {
-          start += scan_object(hr, start);
-
-          if (yield_if_necessary(hr)) {
-            return;
-          }
-        }
+      // Rebuild from TAMS (= parsable_bottom) to TARS.
+      if (scan_from_pb_to_tars(hr, pb, _cm->top_at_rebuild_start(hr))) {
+        log_trace(gc, marking)("Rebuild aborted for region: %u (%s)", hr->hrm_index(), hr->get_short_type_str());
+        return true;
       }
+      return false;
     }
 
     // Scan a humongous region for remembered set updates. Scans in chunks to avoid
-    // stalling safepoints.
-    void scan_humongous_region(G1HeapRegion* hr, HeapWord* const pb) {
+    // stalling safepoints. Returns whether the concurrent marking phase has been aborted.
+    bool scan_humongous_region(G1HeapRegion* hr, HeapWord* const pb) {
       assert(should_rebuild_or_scrub(hr), "must be");
 
       if (!_should_rebuild_remset) {
         // When not rebuilding there is nothing to do for humongous objects.
-        return;
+        return false;
       }
 
       // At this point we should only have live humongous objects, that
@@ -239,7 +278,12 @@ class G1RebuildRSAndScrubTask : public WorkerTask {
       HeapWord* humongous_end = hr->humongous_start_region()->bottom() + humongous->size();
       MemRegion mr(hr->bottom(), MIN2(hr->top(), humongous_end));
 
-      scan_large_object(hr, humongous, mr);
+      bool mark_aborted = scan_large_object(hr, humongous, mr);
+      if (mark_aborted) {
+        log_trace(gc, marking)("Rebuild aborted for region: %u (%s)", hr->hrm_index(), hr->get_short_type_str());
+        return true;
+      }
+      return false;
     }
 
   public:
@@ -268,16 +312,17 @@ class G1RebuildRSAndScrubTask : public WorkerTask {
         return false;
       }
 
+      bool mark_aborted;
       if (hr->needs_scrubbing()) {
         // This is a region with potentially unparsable (dead) objects.
-        scan_and_scrub_region(hr, pb);
+        mark_aborted = scan_and_scrub_region(hr, pb);
       } else {
         assert(hr->is_humongous(), "must be, but %u is %s", hr->hrm_index(), hr->get_short_type_str());
         // No need to scrub humongous, but we should scan it to rebuild remsets.
-        scan_humongous_region(hr, pb);
+        mark_aborted = scan_humongous_region(hr, pb);
       }
 
-      return _cm->has_aborted();
+      return mark_aborted;
     }
   };
 

From 34ee06f51122e8afb875cc3b75f513912272fd9b Mon Sep 17 00:00:00 2001
From: Vicente Romero <vromero@openjdk.org>
Date: Thu, 25 Jul 2024 13:41:32 +0000
Subject: [PATCH 210/401] 8332850: javac crashes if container for repeatable
 annotation is not found

Reviewed-by: darcy
---
 .../com/sun/tools/javac/comp/Annotate.java    |   8 +-
 .../CompletionErrorOnRepeatingAnnosTest.java  | 124 ++++++++++++++++++
 2 files changed, 131 insertions(+), 1 deletion(-)
 create mode 100644 test/langtools/tools/javac/annotations/repeatingAnnotations/CompletionErrorOnRepeatingAnnosTest.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
index 48459dd96bb22..77a7e3332f0c6 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
@@ -945,7 +945,13 @@ private MethodSymbol validateContainer(Type targetContainerType,
         boolean fatalError = false;
 
         // Validate that there is a (and only 1) value method
-        Scope scope = targetContainerType.tsym.members();
+        Scope scope = null;
+        try {
+            scope = targetContainerType.tsym.members();
+        } catch (CompletionFailure ex) {
+            chk.completionError(pos, ex);
+            return null;
+        }
         int nr_value_elems = 0;
         boolean error = false;
         for(Symbol elm : scope.getSymbolsByName(names.value)) {
diff --git a/test/langtools/tools/javac/annotations/repeatingAnnotations/CompletionErrorOnRepeatingAnnosTest.java b/test/langtools/tools/javac/annotations/repeatingAnnotations/CompletionErrorOnRepeatingAnnosTest.java
new file mode 100644
index 0000000000000..b075a51015557
--- /dev/null
+++ b/test/langtools/tools/javac/annotations/repeatingAnnotations/CompletionErrorOnRepeatingAnnosTest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 8332850
+ * @summary javac crashes if container for repeatable annotation is not found
+ * @library /tools/javac/lib /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ */
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.List;
+
+import toolbox.*;
+import toolbox.Task.*;
+
+public class CompletionErrorOnRepeatingAnnosTest {
+    ToolBox tb = new ToolBox();
+
+    public static void main(String... args) throws Exception {
+        CompletionErrorOnRepeatingAnnosTest t = new CompletionErrorOnRepeatingAnnosTest();
+        //t.testMissingContainerAnno();
+        t.testMissingContainerTypeAnno();
+    }
+
+    void testMissingContainerTypeAnno() throws Exception {
+        doTest(
+                """
+                import java.lang.annotation.*;
+                import static java.lang.annotation.RetentionPolicy.*;
+                import static java.lang.annotation.ElementType.*;
+                @Target({TYPE_USE,FIELD}) @Repeatable( As.class) @interface A { }
+                @Target({TYPE_USE,FIELD}) @interface As { A[] value(); }
+                """,
+                """
+                class T {
+                    @A @A String data = "test";
+                }
+                """,
+                List.of(
+                        "T.java:2:5: compiler.err.cant.access: As, (compiler.misc.class.file.not.found: As)",
+                        "T.java:2:8: compiler.err.invalid.repeatable.annotation.no.value: As",
+                        "2 errors"
+                )
+        );
+    }
+
+    void testMissingContainerAnno() throws Exception {
+        doTest(
+                """
+                import java.lang.annotation.Repeatable;
+                @Repeatable(As.class)
+                @interface A {}
+                @interface As {
+                    A[] value();
+                }
+                """,
+                "@A @A class T {}",
+                List.of(
+                        "T.java:1:1: compiler.err.cant.access: As, (compiler.misc.class.file.not.found: As)",
+                        "T.java:1:4: compiler.err.invalid.repeatable.annotation.no.value: As",
+                        "2 errors"
+                )
+        );
+    }
+
+    private void doTest(String annosSrc, String annotatedSrc, List<String> expectedOutput) throws Exception {
+        Path base = Paths.get(".");
+        Path src = base.resolve("src");
+        tb.createDirectories(src);
+        tb.writeJavaFiles(src, annosSrc);
+        Path out = base.resolve("out");
+        tb.createDirectories(out);
+        new JavacTask(tb)
+                .outdir(out)
+                .files(tb.findJavaFiles(src))
+                .run();
+        // let's now compile T.java which uses repeated annotations, we want to load the anno classes from the CP
+        tb.deleteFiles(src.resolve("A.java"));
+        tb.writeJavaFiles(src, annotatedSrc);
+        new JavacTask(tb)
+                .outdir(out)
+                .classpath(out)
+                .files(tb.findJavaFiles(src))
+                .run();
+        // now if we remove As.class there will be an error but javac should not crash
+        tb.deleteFiles(out.resolve("As.class"));
+        List<String> log = new JavacTask(tb)
+                .outdir(out)
+                .classpath(out)
+                .options("-XDrawDiagnostics")
+                .files(tb.findJavaFiles(src))
+                .run(Expect.FAIL)
+                .writeAll()
+                .getOutputLines(Task.OutputKind.DIRECT);
+
+        if (!expectedOutput.equals(log))
+            throw new Exception("expected output not found: " + log);
+    }
+}

From f61a50598958e928e9a4d81130b077cd6eaf876a Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Thu, 25 Jul 2024 15:45:41 +0000
Subject: [PATCH 211/401] 8334647: C2: CastII added by
 PhaseIdealLoop::add_template_assertion_predicate() should have control

Reviewed-by: chagedorn, kvn
---
 src/hotspot/share/opto/castnode.hpp         | 10 ++++++----
 src/hotspot/share/opto/loopPredicate.cpp    |  4 ++--
 src/hotspot/share/opto/loopTransform.cpp    |  2 +-
 src/hotspot/share/opto/loopopts.cpp         |  3 +++
 src/hotspot/share/opto/vectorIntrinsics.cpp |  6 ++----
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/hotspot/share/opto/castnode.hpp b/src/hotspot/share/opto/castnode.hpp
index 3e20a92e848ed..87989235c6701 100644
--- a/src/hotspot/share/opto/castnode.hpp
+++ b/src/hotspot/share/opto/castnode.hpp
@@ -101,12 +101,9 @@ class CastIINode: public ConstraintCastNode {
   virtual uint size_of() const;
 
   public:
-  CastIINode(Node* n, const Type* t, DependencyType dependency = RegularDependency, bool range_check_dependency = false, const TypeTuple* types = nullptr)
-    : ConstraintCastNode(nullptr, n, t, dependency, types), _range_check_dependency(range_check_dependency) {
-    init_class_id(Class_CastII);
-  }
   CastIINode(Node* ctrl, Node* n, const Type* t, DependencyType dependency = RegularDependency, bool range_check_dependency = false, const TypeTuple* types = nullptr)
     : ConstraintCastNode(ctrl, n, t, dependency, types), _range_check_dependency(range_check_dependency) {
+    assert(ctrl != nullptr, "control must be set");
     init_class_id(Class_CastII);
   }
   virtual int Opcode() const;
@@ -134,6 +131,7 @@ class CastLLNode: public ConstraintCastNode {
 public:
   CastLLNode(Node* ctrl, Node* n, const Type* t, DependencyType dependency = RegularDependency, const TypeTuple* types = nullptr)
           : ConstraintCastNode(ctrl, n, t, dependency, types) {
+    assert(ctrl != nullptr, "control must be set");
     init_class_id(Class_CastLL);
   }
 
@@ -147,6 +145,7 @@ class CastFFNode: public ConstraintCastNode {
 public:
   CastFFNode(Node* ctrl, Node* n, const Type* t, DependencyType dependency = RegularDependency, const TypeTuple* types = nullptr)
           : ConstraintCastNode(ctrl, n, t, dependency, types) {
+    assert(ctrl != nullptr, "control must be set");
     init_class_id(Class_CastFF);
   }
   virtual int Opcode() const;
@@ -157,6 +156,7 @@ class CastDDNode: public ConstraintCastNode {
 public:
   CastDDNode(Node* ctrl, Node* n, const Type* t, DependencyType dependency = RegularDependency, const TypeTuple* types = nullptr)
           : ConstraintCastNode(ctrl, n, t, dependency, types) {
+    assert(ctrl != nullptr, "control must be set");
     init_class_id(Class_CastDD);
   }
   virtual int Opcode() const;
@@ -167,6 +167,7 @@ class CastVVNode: public ConstraintCastNode {
 public:
   CastVVNode(Node* ctrl, Node* n, const Type* t, DependencyType dependency = RegularDependency, const TypeTuple* types = nullptr)
           : ConstraintCastNode(ctrl, n, t, dependency, types) {
+    assert(ctrl != nullptr, "control must be set");
     init_class_id(Class_CastVV);
   }
   virtual int Opcode() const;
@@ -192,6 +193,7 @@ class CheckCastPPNode: public ConstraintCastNode {
   public:
   CheckCastPPNode(Node* ctrl, Node* n, const Type* t, DependencyType dependency = RegularDependency, const TypeTuple* types = nullptr)
     : ConstraintCastNode(ctrl, n, t, dependency, types) {
+    assert(ctrl != nullptr, "control must be set");
     init_class_id(Class_CheckCastPP);
   }
 
diff --git a/src/hotspot/share/opto/loopPredicate.cpp b/src/hotspot/share/opto/loopPredicate.cpp
index f8d3fa0b6d91d..b22931e56630e 100644
--- a/src/hotspot/share/opto/loopPredicate.cpp
+++ b/src/hotspot/share/opto/loopPredicate.cpp
@@ -1341,8 +1341,8 @@ IfTrueNode* PhaseIdealLoop::add_template_assertion_predicate(IfNode* iff, IdealL
   // init + (current stride - initial stride) is within the loop so narrow its type by leveraging the type of the iv Phi
   const Type* type_iv = loop->_head->as_CountedLoop()->phi()->bottom_type();
   assert(!type_iv->is_int()->is_con(), "constant indicates one loop iteration for which we bailed out earlier");
-  max_value = new CastIINode(max_value, type_iv);
-  register_new_node(max_value, parse_predicate_proj);
+  max_value = new CastIINode(new_proj, max_value, type_iv);
+  register_new_node(max_value, new_proj);
 
   bol = rc_predicate(new_proj, scale, offset, max_value, limit, stride, rng, (stride > 0) != (scale > 0),
                      overflow);
diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index e961d5a3949b1..6ca7bb51fb458 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -3028,7 +3028,7 @@ void PhaseIdealLoop::do_range_check(IdealLoopTree *loop, Node_List &old_new) {
           max_value = new AddINode(opaque_init, max_value);
           register_new_node(max_value, loop_entry);
           // init + (current stride - initial stride) is within the loop so narrow its type by leveraging the type of the iv Phi
-          max_value = new CastIINode(max_value, loop->_head->as_CountedLoop()->phi()->bottom_type());
+          max_value = new CastIINode(loop_entry, max_value, loop->_head->as_CountedLoop()->phi()->bottom_type());
           register_new_node(max_value, loop_entry);
           loop_entry = add_range_check_elimination_assertion_predicate(
               loop, loop_entry, scale_con, int_offset, int_limit, stride_con, max_value, true
diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp
index ba0ce344122af..361e03f06a219 100644
--- a/src/hotspot/share/opto/loopopts.cpp
+++ b/src/hotspot/share/opto/loopopts.cpp
@@ -4670,6 +4670,9 @@ void DataNodeGraph::clone(Node* node, Node* new_ctrl) {
   _phase->igvn().register_new_node_with_optimizer(clone);
   _orig_to_new.put(node, clone);
   _phase->set_ctrl(clone, new_ctrl);
+  if (node->is_CastII()) {
+    clone->set_req(0, new_ctrl);
+  }
 }
 
 // Rewire the data inputs of all (unprocessed) cloned nodes, whose inputs are still pointing to the same inputs as their
diff --git a/src/hotspot/share/opto/vectorIntrinsics.cpp b/src/hotspot/share/opto/vectorIntrinsics.cpp
index b31f6ace5a6e2..cfcd903e79d95 100644
--- a/src/hotspot/share/opto/vectorIntrinsics.cpp
+++ b/src/hotspot/share/opto/vectorIntrinsics.cpp
@@ -2484,12 +2484,10 @@ bool LibraryCallKit::inline_vector_insert() {
   // Convert insert value back to its appropriate type.
   switch (elem_bt) {
     case T_BYTE:
-      insert_val = gvn().transform(new ConvL2INode(insert_val));
-      insert_val = gvn().transform(new CastIINode(insert_val, TypeInt::BYTE));
+      insert_val = gvn().transform(new ConvL2INode(insert_val, TypeInt::BYTE));
       break;
     case T_SHORT:
-      insert_val = gvn().transform(new ConvL2INode(insert_val));
-      insert_val = gvn().transform(new CastIINode(insert_val, TypeInt::SHORT));
+      insert_val = gvn().transform(new ConvL2INode(insert_val, TypeInt::SHORT));
       break;
     case T_INT:
       insert_val = gvn().transform(new ConvL2INode(insert_val));

From e74edbaea9f09169f597a470f647f3b7d10cc71b Mon Sep 17 00:00:00 2001
From: Xiaolong Peng <xpeng@openjdk.org>
Date: Thu, 25 Jul 2024 16:04:58 +0000
Subject: [PATCH 212/401] 8336640: Shenandoah: Parallel worker use in
 parallel_heap_region_iterate

Reviewed-by: shade, wkemper, ysr
---
 .../share/gc/shenandoah/shenandoahHeap.cpp    | 23 +++++++++++++++----
 .../gc/shenandoah/shenandoah_globals.hpp      |  5 ++--
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index f93ca9d6d7dd0..6c8d1d32941f9 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -1693,19 +1693,20 @@ class ShenandoahParallelHeapRegionTask : public WorkerTask {
 private:
   ShenandoahHeap* const _heap;
   ShenandoahHeapRegionClosure* const _blk;
+  size_t const _stride;
 
   shenandoah_padding(0);
   volatile size_t _index;
   shenandoah_padding(1);
 
 public:
-  ShenandoahParallelHeapRegionTask(ShenandoahHeapRegionClosure* blk) :
+  ShenandoahParallelHeapRegionTask(ShenandoahHeapRegionClosure* blk, size_t stride) :
           WorkerTask("Shenandoah Parallel Region Operation"),
-          _heap(ShenandoahHeap::heap()), _blk(blk), _index(0) {}
+          _heap(ShenandoahHeap::heap()), _blk(blk), _stride(stride), _index(0) {}
 
   void work(uint worker_id) {
     ShenandoahParallelWorkerSession worker_session(worker_id);
-    size_t stride = ShenandoahParallelRegionStride;
+    size_t stride = _stride;
 
     size_t max = _heap->num_regions();
     while (Atomic::load(&_index) < max) {
@@ -1724,8 +1725,20 @@ class ShenandoahParallelHeapRegionTask : public WorkerTask {
 
 void ShenandoahHeap::parallel_heap_region_iterate(ShenandoahHeapRegionClosure* blk) const {
   assert(blk->is_thread_safe(), "Only thread-safe closures here");
-  if (num_regions() > ShenandoahParallelRegionStride) {
-    ShenandoahParallelHeapRegionTask task(blk);
+  const uint active_workers = workers()->active_workers();
+  const size_t n_regions = num_regions();
+  size_t stride = ShenandoahParallelRegionStride;
+  if (stride == 0 && active_workers > 1) {
+    // Automatically derive the stride to balance the work between threads
+    // evenly. Do not try to split work if below the reasonable threshold.
+    constexpr size_t threshold = 4096;
+    stride = n_regions <= threshold ?
+            threshold :
+            (n_regions + active_workers - 1) / active_workers;
+  }
+
+  if (n_regions > stride && active_workers > 1) {
+    ShenandoahParallelHeapRegionTask task(blk, stride);
     workers()->run_task(&task);
   } else {
     heap_region_iterate(blk);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp b/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
index b8baf6b3ebf43..0ee77edaf3f32 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
@@ -318,9 +318,10 @@
           "checking for cancellation, yielding, etc. Larger values improve "\
           "marking performance at expense of responsiveness.")              \
                                                                             \
-  product(uintx, ShenandoahParallelRegionStride, 1024, EXPERIMENTAL,        \
+  product(uintx, ShenandoahParallelRegionStride, 0, EXPERIMENTAL,           \
           "How many regions to process at once during parallel region "     \
-          "iteration. Affects heaps with lots of regions.")                 \
+          "iteration. Affects heaps with lots of regions. "                 \
+          "Set to 0 to let Shenandoah to decide the best value.")           \
                                                                             \
   product(size_t, ShenandoahSATBBufferSize, 1 * K, EXPERIMENTAL,            \
           "Number of entries in an SATB log buffer.")                       \

From 81ed0287175617e6f7ad79dd7036b2fbde27e80a Mon Sep 17 00:00:00 2001
From: Jorn Vernee <jvernee@openjdk.org>
Date: Thu, 25 Jul 2024 16:36:31 +0000
Subject: [PATCH 213/401] 8337060: Test java/foreign/TestConcurrentClose.java
 failed: IllegalStateException: SegmentAccessor::doAccess method not being
 compiled

Reviewed-by: mcimadamore, alanb
---
 test/jdk/java/foreign/TestConcurrentClose.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/test/jdk/java/foreign/TestConcurrentClose.java b/test/jdk/java/foreign/TestConcurrentClose.java
index 7f39ef3904023..06dc7375cdaf2 100644
--- a/test/jdk/java/foreign/TestConcurrentClose.java
+++ b/test/jdk/java/foreign/TestConcurrentClose.java
@@ -36,6 +36,7 @@
  *   -XX:+UnlockDiagnosticVMOptions
  *   -XX:+WhiteBoxAPI
  *   -XX:CompileCommand=dontinline,TestConcurrentClose$SegmentAccessor::doAccess
+ *   -Xbatch
  *   TestConcurrentClose
  */
 
@@ -71,7 +72,7 @@ public class TestConcurrentClose {
 
     static final int ITERATIONS = 5;
     static final int SEGMENT_SIZE = 10_000;
-    static final int MAX_EXECUTOR_WAIT_SECONDS = 20;
+    static final int MAX_EXECUTOR_WAIT_SECONDS = 60;
     static final int NUM_ACCESSORS = 50;
 
     static final AtomicLong start = new AtomicLong();
@@ -176,13 +177,8 @@ static void start(String name) {
     }
 
     private static void awaitCompilation() throws InterruptedException {
-        int retries = 0;
         while (WB.getMethodCompilationLevel(DO_ACCESS_METHOD, false) != C2_COMPILED_LEVEL) {
-            if (retries > 20) {
-                throw new IllegalStateException("SegmentAccessor::doAccess method not being compiled");
-            }
             Thread.sleep(1000);
-            retries++;
         }
     }
 }

From cf0d9e0e521b495a96a3de7775b1b3ae14d20d80 Mon Sep 17 00:00:00 2001
From: Vicente Romero <vromero@openjdk.org>
Date: Thu, 25 Jul 2024 17:03:45 +0000
Subject: [PATCH 214/401] 8337037: compiler internal options are not printing
 the stacktrace after a compiler crash

Reviewed-by: mcimadamore
---
 .../com/sun/tools/javac/code/Types.java       | 45 ++++++----------
 .../com/sun/tools/javac/comp/Infer.java       | 27 +++++-----
 .../sun/tools/javac/comp/LambdaToMethod.java  |  2 +-
 .../com/sun/tools/javac/comp/Lower.java       |  3 +-
 .../com/sun/tools/javac/comp/Resolve.java     | 29 +++++-----
 .../sun/tools/javac/comp/TransPatterns.java   |  3 +-
 .../com/sun/tools/javac/jvm/PoolWriter.java   |  6 +--
 .../javac/util/CompilerInternalException.java | 54 +++++++++++++++++++
 .../classes/jdk/jshell/TreeDissector.java     |  2 +-
 9 files changed, 108 insertions(+), 63 deletions(-)
 create mode 100644 src/jdk.compiler/share/classes/com/sun/tools/javac/util/CompilerInternalException.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
index 28768f2517bed..8576d8cfb2f02 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java
@@ -62,6 +62,8 @@
 import static com.sun.tools.javac.code.Type.*;
 import static com.sun.tools.javac.code.TypeTag.*;
 import static com.sun.tools.javac.jvm.ClassFile.externalize;
+import static com.sun.tools.javac.main.Option.DOE;
+
 import com.sun.tools.javac.resources.CompilerProperties.Fragments;
 
 /**
@@ -99,6 +101,7 @@ public class Types {
     final Name capturedName;
 
     public final Warner noWarnings;
+    public final boolean dumpStacktraceOnError;
 
     // <editor-fold defaultstate="collapsed" desc="Instantiating">
     public static Types instance(Context context) {
@@ -120,6 +123,8 @@ protected Types(Context context) {
         messages = JavacMessages.instance(context);
         diags = JCDiagnostic.Factory.instance(context);
         noWarnings = new Warner(null);
+        Options options = Options.instance(context);
+        dumpStacktraceOnError = options.isSet("dev") || options.isSet(DOE);
     }
     // </editor-fold>
 
@@ -634,12 +639,13 @@ public boolean isConvertible(Type t, Type s) {
      * wraps a diagnostic that can be used to generate more details error
      * messages.
      */
-    public static class FunctionDescriptorLookupError extends RuntimeException {
+    public static class FunctionDescriptorLookupError extends CompilerInternalException {
         private static final long serialVersionUID = 0;
 
         transient JCDiagnostic diagnostic;
 
-        FunctionDescriptorLookupError() {
+        FunctionDescriptorLookupError(boolean dumpStackTraceOnError) {
+            super(dumpStackTraceOnError);
             this.diagnostic = null;
         }
 
@@ -651,12 +657,6 @@ FunctionDescriptorLookupError setMessage(JCDiagnostic diag) {
         public JCDiagnostic getDiagnostic() {
             return diagnostic;
         }
-
-        @Override
-        public Throwable fillInStackTrace() {
-            // This is an internal exception; the stack trace is irrelevant.
-            return this;
-        }
     }
 
     /**
@@ -809,7 +809,7 @@ FunctionDescriptorLookupError failure(String msg, Object... args) {
         }
 
         FunctionDescriptorLookupError failure(JCDiagnostic diag) {
-            return new FunctionDescriptorLookupError().setMessage(diag);
+            return new FunctionDescriptorLookupError(Types.this.dumpStacktraceOnError).setMessage(diag);
         }
     }
 
@@ -5107,41 +5107,30 @@ public RetentionPolicy getRetention(TypeSymbol sym) {
 
     // <editor-fold defaultstate="collapsed" desc="Signature Generation">
 
-    public abstract static class SignatureGenerator {
+    public abstract class SignatureGenerator {
 
-        public static class InvalidSignatureException extends RuntimeException {
+        public class InvalidSignatureException extends CompilerInternalException {
             private static final long serialVersionUID = 0;
 
             private final transient Type type;
 
-            InvalidSignatureException(Type type) {
+            InvalidSignatureException(Type type, boolean dumpStackTraceOnError) {
+                super(dumpStackTraceOnError);
                 this.type = type;
             }
 
             public Type type() {
                 return type;
             }
-
-            @Override
-            public Throwable fillInStackTrace() {
-                // This is an internal exception; the stack trace is irrelevant.
-                return this;
-            }
         }
 
-        private final Types types;
-
         protected abstract void append(char ch);
         protected abstract void append(byte[] ba);
         protected abstract void append(Name name);
         protected void classReference(ClassSymbol c) { /* by default: no-op */ }
 
-        protected SignatureGenerator(Types types) {
-            this.types = types;
-        }
-
         protected void reportIllegalSignature(Type t) {
-            throw new InvalidSignatureException(t);
+            throw new InvalidSignatureException(t, Types.this.dumpStacktraceOnError);
         }
 
         /**
@@ -5257,9 +5246,9 @@ public void assembleClassSig(Type type) {
             if (outer.allparams().nonEmpty()) {
                 boolean rawOuter =
                         c.owner.kind == MTH || // either a local class
-                        c.name == types.names.empty; // or anonymous
+                        c.name == Types.this.names.empty; // or anonymous
                 assembleClassSig(rawOuter
-                        ? types.erasure(outer)
+                        ? Types.this.erasure(outer)
                         : outer);
                 append(rawOuter ? '$' : '.');
                 Assert.check(c.flatname.startsWith(c.owner.enclClass().flatname));
@@ -5281,7 +5270,7 @@ public void assembleParamsSig(List<Type> typarams) {
             for (List<Type> ts = typarams; ts.nonEmpty(); ts = ts.tail) {
                 Type.TypeVar tvar = (Type.TypeVar) ts.head;
                 append(tvar.tsym.name);
-                List<Type> bounds = types.getBounds(tvar);
+                List<Type> bounds = Types.this.getBounds(tvar);
                 if ((bounds.head.tsym.flags() & INTERFACE) != 0) {
                     append(':');
                 }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
index e3e7e1adea533..f5df6adddf377 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
@@ -47,6 +47,7 @@
 import com.sun.tools.javac.comp.Infer.GraphSolver.InferenceGraph.Node;
 import com.sun.tools.javac.comp.Resolve.InapplicableMethodException;
 import com.sun.tools.javac.comp.Resolve.VerboseResolutionMode;
+import com.sun.tools.javac.util.CompilerInternalException;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -68,7 +69,7 @@
 import java.util.function.Predicate;
 
 import static com.sun.tools.javac.code.TypeTag.*;
-import java.util.Comparator;
+import static com.sun.tools.javac.main.Option.DOE;
 
 /** Helper class for type parameter inference, used by the attribution phase.
  *
@@ -97,6 +98,8 @@ public class Infer {
      */
     private List<String> pendingGraphs;
 
+    private final boolean dumpStacktraceOnError;
+
     public static Infer instance(Context context) {
         Infer instance = context.get(inferKey);
         if (instance == null)
@@ -119,6 +122,7 @@ protected Infer(Context context) {
         pendingGraphs = List.nil();
 
         emptyContext = new InferenceContext(this, List.nil());
+        dumpStacktraceOnError = options.isSet("dev") || options.isSet(DOE);
     }
 
     /** A value for prototypes that admit any type, including polymorphic ones. */
@@ -133,8 +137,8 @@ public static class InferenceException extends InapplicableMethodException {
 
         transient List<JCDiagnostic> messages = List.nil();
 
-        InferenceException() {
-            super(null);
+        InferenceException(boolean dumpStacktrace) {
+            super(null, dumpStacktrace);
         }
 
         @Override
@@ -144,7 +148,7 @@ public JCDiagnostic getDiagnostic() {
     }
 
     InferenceException error(JCDiagnostic diag) {
-        InferenceException result = new InferenceException();
+        InferenceException result = new InferenceException(dumpStacktraceOnError);
         if (diag != null) {
             result.messages = result.messages.append(diag);
         }
@@ -1342,20 +1346,15 @@ interface GraphStrategy {
          * A NodeNotFoundException is thrown whenever an inference strategy fails
          * to pick the next node to solve in the inference graph.
          */
-        public static class NodeNotFoundException extends RuntimeException {
+        class NodeNotFoundException extends CompilerInternalException {
             private static final long serialVersionUID = 0;
 
             transient InferenceGraph graph;
 
-            public NodeNotFoundException(InferenceGraph graph) {
+            public NodeNotFoundException(InferenceGraph graph, boolean dumpStacktraceOnError) {
+                super(dumpStacktraceOnError);
                 this.graph = graph;
             }
-
-            @Override
-            public Throwable fillInStackTrace() {
-                // This is an internal exception; the stack trace is irrelevant.
-                return this;
-            }
         }
         /**
          * Pick the next node (leaf) to solve in the graph
@@ -1375,7 +1374,7 @@ abstract class LeafSolver implements GraphStrategy {
         public Node pickNode(InferenceGraph g) {
             if (g.nodes.isEmpty()) {
                 //should not happen
-                throw new NodeNotFoundException(g);
+                throw new NodeNotFoundException(g, Infer.this.dumpStacktraceOnError);
             }
             return g.nodes.get(0);
         }
@@ -1450,7 +1449,7 @@ public Node pickNode(final InferenceGraph g) {
             }
             if (bestPath == noPath) {
                 //no path leads there
-                throw new NodeNotFoundException(g);
+                throw new NodeNotFoundException(g, Infer.this.dumpStacktraceOnError);
             }
             return bestPath.fst.head;
         }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
index 7f1ad8211cb84..2c3d79c0ab6da 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
@@ -1796,7 +1796,7 @@ private class L2MSignatureGenerator extends Types.SignatureGenerator {
         boolean allowIllegalSignatures;
 
         L2MSignatureGenerator(boolean allowIllegalSignatures) {
-            super(types);
+            types.super();
             this.allowIllegalSignatures = allowIllegalSignatures;
         }
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
index a330f045fe5fe..c5fd2177d49a7 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
@@ -62,6 +62,7 @@
 import com.sun.tools.javac.tree.JCTree.JCCase;
 import com.sun.tools.javac.tree.JCTree.JCExpression;
 import com.sun.tools.javac.tree.JCTree.JCExpressionStatement;
+
 import static com.sun.tools.javac.tree.JCTree.JCOperatorExpression.OperandPos.LEFT;
 import com.sun.tools.javac.tree.JCTree.JCSwitchExpression;
 
@@ -2629,7 +2630,7 @@ private class LowerSignatureGenerator extends Types.SignatureGenerator {
         StringBuilder sb = new StringBuilder();
 
         LowerSignatureGenerator() {
-            super(types);
+            types.super();
         }
 
         @Override
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
index 643bb22c85358..c71b6d341dc12 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
@@ -79,6 +79,7 @@
 import static com.sun.tools.javac.code.Kinds.Kind.*;
 import static com.sun.tools.javac.code.TypeTag.*;
 import static com.sun.tools.javac.comp.Resolve.MethodResolutionPhase.*;
+import static com.sun.tools.javac.main.Option.DOE;
 import static com.sun.tools.javac.tree.JCTree.Tag.*;
 import static com.sun.tools.javac.util.Iterators.createCompoundIterator;
 
@@ -112,6 +113,7 @@ public class Resolve {
     private final boolean allowYieldStatement;
     final EnumSet<VerboseResolutionMode> verboseResolutionMode;
     final boolean dumpMethodReferenceSearchResults;
+    final boolean dumpStacktraceOnError;
 
     WriteableScope polymorphicSignatureScope;
 
@@ -149,6 +151,7 @@ protected Resolve(Context context) {
         allowModules = Feature.MODULES.allowedInSource(source);
         allowRecords = Feature.RECORDS.allowedInSource(source);
         dumpMethodReferenceSearchResults = options.isSet("debug.dumpMethodReferenceSearchResults");
+        dumpStacktraceOnError = options.isSet("dev") || options.isSet(DOE);
     }
 
     /** error symbols, which are returned when resolution fails
@@ -584,7 +587,7 @@ Type rawInstantiate(Env<AttrContext> env,
             ForAll pmt = (ForAll) mt;
             if (typeargtypes.length() != pmt.tvars.length())
                  // not enough args
-                throw new InapplicableMethodException(diags.fragment(Fragments.WrongNumberTypeArgs(Integer.toString(pmt.tvars.length()))));
+                throw new InapplicableMethodException(diags.fragment(Fragments.WrongNumberTypeArgs(Integer.toString(pmt.tvars.length()))), dumpStacktraceOnError);
             // Check type arguments are within bounds
             List<Type> formals = pmt.tvars;
             List<Type> actuals = typeargtypes;
@@ -593,7 +596,7 @@ Type rawInstantiate(Env<AttrContext> env,
                                                 pmt.tvars, typeargtypes);
                 for (; bounds.nonEmpty(); bounds = bounds.tail) {
                     if (!types.isSubtypeUnchecked(actuals.head, bounds.head, warn)) {
-                        throw new InapplicableMethodException(diags.fragment(Fragments.ExplicitParamDoNotConformToBounds(actuals.head, bounds)));
+                        throw new InapplicableMethodException(diags.fragment(Fragments.ExplicitParamDoNotConformToBounds(actuals.head, bounds)), dumpStacktraceOnError);
                     }
                 }
                 formals = formals.tail;
@@ -830,7 +833,7 @@ protected void reportMC(DiagnosticPosition pos, MethodCheckDiag diag, InferenceC
             String key = inferDiag ? diag.inferKey : diag.basicKey;
             throw inferDiag ?
                 infer.error(diags.create(DiagnosticType.FRAGMENT, log.currentSource(), pos, key, args)) :
-                methodCheckFailure.setMessage(diags.create(DiagnosticType.FRAGMENT, log.currentSource(), pos, key, args));
+                getMethodCheckFailure().setMessage(diags.create(DiagnosticType.FRAGMENT, log.currentSource(), pos, key, args));
         }
 
         /**
@@ -842,7 +845,7 @@ class SharedInapplicableMethodException extends InapplicableMethodException {
             private static final long serialVersionUID = 0;
 
             SharedInapplicableMethodException() {
-                super(null);
+                super(null, Resolve.this.dumpStacktraceOnError);
             }
 
             SharedInapplicableMethodException setMessage(JCDiagnostic details) {
@@ -851,12 +854,15 @@ SharedInapplicableMethodException setMessage(JCDiagnostic details) {
             }
         }
 
-        SharedInapplicableMethodException methodCheckFailure = new SharedInapplicableMethodException();
+        private SharedInapplicableMethodException methodCheckFailure;
 
         public MethodCheck mostSpecificCheck(List<Type> actuals) {
             return nilMethodCheck;
         }
 
+        private SharedInapplicableMethodException getMethodCheckFailure() {
+            return methodCheckFailure == null ? methodCheckFailure = new SharedInapplicableMethodException() : methodCheckFailure;
+        }
     }
 
     /**
@@ -1036,7 +1042,7 @@ public boolean compatible(Type found, Type req, Warner warn) {
         }
 
         public void report(DiagnosticPosition pos, JCDiagnostic details) {
-            throw new InapplicableMethodException(details);
+            throw new InapplicableMethodException(details, Resolve.this.dumpStacktraceOnError);
         }
 
         public Warner checkWarner(DiagnosticPosition pos, Type found, Type req) {
@@ -1392,24 +1398,19 @@ public MethodCheck mostSpecificCheck(List<Type> actuals) {
         }
     }
 
-    public static class InapplicableMethodException extends RuntimeException {
+    public static class InapplicableMethodException extends CompilerInternalException {
         private static final long serialVersionUID = 0;
 
         transient JCDiagnostic diagnostic;
 
-        InapplicableMethodException(JCDiagnostic diag) {
+        InapplicableMethodException(JCDiagnostic diag, boolean dumpStackTraceOnError) {
+            super(dumpStackTraceOnError);
             this.diagnostic = diag;
         }
 
         public JCDiagnostic getDiagnostic() {
             return diagnostic;
         }
-
-        @Override
-        public Throwable fillInStackTrace() {
-            // This is an internal exception; the stack trace is irrelevant.
-            return this;
-        }
     }
 
 /* ***************************************************************************
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
index 2d522d01641f5..f1f4e73b5a63d 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
@@ -79,6 +79,7 @@
 import com.sun.tools.javac.code.Type;
 import static com.sun.tools.javac.code.TypeTag.BOT;
 import static com.sun.tools.javac.code.TypeTag.VOID;
+
 import com.sun.tools.javac.jvm.PoolConstant.LoadableConstant;
 import com.sun.tools.javac.jvm.Target;
 import com.sun.tools.javac.tree.JCTree;
@@ -786,7 +787,7 @@ private class PrimitiveGenerator extends Types.SignatureGenerator {
         StringBuilder sb = new StringBuilder();
 
         PrimitiveGenerator() {
-            super(types);
+            types.super();
         }
 
         @Override
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/PoolWriter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/PoolWriter.java
index af6f4b67faeb5..bfdb9775e1170 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/PoolWriter.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/PoolWriter.java
@@ -100,7 +100,7 @@ public class PoolWriter {
     public PoolWriter(Types types, Names names) {
         this.types = types;
         this.names = names;
-        this.signatureGen = new SharedSignatureGenerator(types);
+        this.signatureGen = new SharedSignatureGenerator();
         this.pool = new WriteablePoolHelper();
     }
 
@@ -278,8 +278,8 @@ class SharedSignatureGenerator extends Types.SignatureGenerator {
          */
         ByteBuffer sigbuf = new ByteBuffer();
 
-        SharedSignatureGenerator(Types types) {
-            super(types);
+        SharedSignatureGenerator() {
+            types.super();
         }
 
         /**
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/CompilerInternalException.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/CompilerInternalException.java
new file mode 100644
index 0000000000000..3d3c45368c2fa
--- /dev/null
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/CompilerInternalException.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package com.sun.tools.javac.util;
+
+/** The super class of all compiler internal exceptions
+ *
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
+ *  This code and its internal interfaces are subject to change or
+ *  deletion without notice.</b>
+ */
+public class CompilerInternalException extends RuntimeException {
+    private static final long serialVersionUID = 0;
+
+    @SuppressWarnings("this-escape")
+    public CompilerInternalException(boolean dumpStackTraceOnError) {
+        /* by default the stacktrace wont be filled, meaning that method CompilerInternalException::fillInStackTrace
+         * will always be invoked, if we do want to dump the stacktrace then we will invoke super::fillInStackTrace
+         * there is a bit of a dance here that could be fixed once flexible constructor bodies exits the preview
+         * state
+         */
+        if (dumpStackTraceOnError) {
+            super.fillInStackTrace();
+        }
+    }
+
+    @Override
+    public Throwable fillInStackTrace() {
+        return this;
+    }
+}
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/TreeDissector.java b/src/jdk.jshell/share/classes/jdk/jshell/TreeDissector.java
index 518a61d6969a7..fc259b8bc7ca2 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/TreeDissector.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/TreeDissector.java
@@ -246,7 +246,7 @@ private static class TDSignatureGenerator extends Types.SignatureGenerator {
         StringBuilder sb = new StringBuilder();
 
         TDSignatureGenerator(Types types) {
-            super(types);
+            types.super();
         }
 
         @Override

From b5b5a5b8e54ebd766456d2a4781a806ff97816a8 Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Thu, 25 Jul 2024 17:11:59 +0000
Subject: [PATCH 215/401] 8336667: IAE in DerInputStream.toByteArray

Reviewed-by: valeriep
---
 .../sun/security/util/DerInputStream.java     |  4 +-
 .../util/DerInputBuffer/B8336667/PoC.java     | 50 +++++++++++++++
 .../DerInputBuffer/B8336667/Reproducer.java   | 61 +++++++++++++++++++
 3 files changed, 113 insertions(+), 2 deletions(-)
 create mode 100644 test/jdk/sun/security/util/DerInputBuffer/B8336667/PoC.java
 create mode 100644 test/jdk/sun/security/util/DerInputBuffer/B8336667/Reproducer.java

diff --git a/src/java.base/share/classes/sun/security/util/DerInputStream.java b/src/java.base/share/classes/sun/security/util/DerInputStream.java
index 8df4e80eb97ac..e0519f0fa0980 100644
--- a/src/java.base/share/classes/sun/security/util/DerInputStream.java
+++ b/src/java.base/share/classes/sun/security/util/DerInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -114,7 +114,7 @@ public DerValue getDerValue() throws IOException {
             // to the end of return value by DerIndefLenConverter::convertBytes
             // and stay inside result.buffer.
             int unused = result.buffer.length - result.end;
-            this.pos = this.data.length - unused;
+            this.pos = this.end - unused;
         } else {
             this.pos = result.end;
         }
diff --git a/test/jdk/sun/security/util/DerInputBuffer/B8336667/PoC.java b/test/jdk/sun/security/util/DerInputBuffer/B8336667/PoC.java
new file mode 100644
index 0000000000000..d14c213f7b255
--- /dev/null
+++ b/test/jdk/sun/security/util/DerInputBuffer/B8336667/PoC.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 8336667
+ * @summary Ensure the unused bytes are calculated correctly when converting
+ *          indefinite length BER to DER
+ * @modules java.base/sun.security.util
+ * @library /test/lib
+ */
+import jdk.test.lib.Asserts;
+import sun.security.util.DerInputStream;
+
+import java.util.HexFormat;
+
+public class PoC {
+    public static void main(String[] args) throws Exception {
+        // A BER indefinite encoding with some unused bytes at the end
+        var data = HexFormat.of().parseHex("""
+                2480 0401AA 0401BB 0000 -- 2 byte string
+                010100 -- boolean false
+                12345678 -- 4 unused bytes"""
+                .replaceAll("(\\s|--.*)", ""));
+        var dis = new DerInputStream(data, 0, data.length - 4, true);
+        Asserts.assertEQ(dis.getDerValue().getOctetString().length, 2);
+        Asserts.assertFalse(dis.getDerValue().getBoolean());
+        dis.atEnd();
+    }
+}
diff --git a/test/jdk/sun/security/util/DerInputBuffer/B8336667/Reproducer.java b/test/jdk/sun/security/util/DerInputBuffer/B8336667/Reproducer.java
new file mode 100644
index 0000000000000..f1e458035ee92
--- /dev/null
+++ b/test/jdk/sun/security/util/DerInputBuffer/B8336667/Reproducer.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 8336667
+ * @summary Ensure the unused bytes are calculated correctly when converting
+ *          indefinite length BER to DER
+ */
+import java.io.ByteArrayInputStream;
+import java.security.cert.CRLException;
+import java.security.cert.CertificateException;
+import java.util.Base64;
+
+public class Reproducer {
+    private static final String INPUT = """
+            MIIBljCCAVMwgAaB/////////yb////////////////////9////AgDv////////////////////
+            /////2RjPWNvbf////8k/////////yb///////////////////9vbf////8k/////////yb/////
+            ////////////////////AgD/////////////b23/////JP////////8m/////yf/////////////
+            /////wIA//////////////////////////////////////8AAABl//////8m/////////y1CRUdJ
+            TiA9Y290cnVlVlZWVlZWVlZWVjEAAAAAAAAArQdVUwNVBAsTA0RvRDEaMBhAA1UAAAAAAAAAAAAA
+            AAAAAAAAAAAAAAAAAAEXDTAzMDcxNTE2MjAwNFqgHzAdMA8GA1UdHAEB/wQFMAPyAf8wCgYDVR0P
+            BAMCAQIwCwYHKoZIzjgEAwUAAzBkARkTA2NvbTEYMBYGCgmSJomT8ixkARkTCG15VGVzdENBMBIC
+            AQHyAjZG+RfHdO4=""";
+
+    Reproducer(byte[] data) {
+        try {
+            java.security.cert.CertificateFactory.
+                    getInstance("X.509").generateCRLs(new ByteArrayInputStream(data));
+        } catch (CertificateException | CRLException e) {
+            if (System.getProperty("dbg", "false").equals("true")) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public static void main(String[] a) throws Exception {
+        byte[] decodedBytes = Base64.getMimeDecoder().decode(INPUT);
+        new Reproducer(decodedBytes);
+    }
+}

From 8c28f25e1383f10a78b05e47ccf1cc4262069e69 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Thu, 25 Jul 2024 20:59:48 +0000
Subject: [PATCH 216/401] 8337124: (fs)
 sun.nio.fs.WindowsSecurity.enablePrivilege should pin when continuations
 supported

Reviewed-by: jpai, alanb
---
 .../windows/classes/sun/nio/fs/WindowsSecurity.java       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/java.base/windows/classes/sun/nio/fs/WindowsSecurity.java b/src/java.base/windows/classes/sun/nio/fs/WindowsSecurity.java
index 19e3e62412bb6..9bcd800e13cb3 100644
--- a/src/java.base/windows/classes/sun/nio/fs/WindowsSecurity.java
+++ b/src/java.base/windows/classes/sun/nio/fs/WindowsSecurity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,8 @@
 
 package sun.nio.fs;
 
-import jdk.internal.misc.PreviewFeatures;
 import jdk.internal.vm.Continuation;
+import jdk.internal.vm.ContinuationSupport;
 
 import static sun.nio.fs.WindowsNativeDispatcher.*;
 import static sun.nio.fs.WindowsConstants.*;
@@ -106,7 +106,7 @@ static Privilege enablePrivilege(String priv) {
         final boolean needToRevert = elevated;
 
         // prevent yielding with privileges
-        if (PreviewFeatures.isEnabled())
+        if (ContinuationSupport.isSupported())
             Continuation.pin();
 
         return () -> {
@@ -126,7 +126,7 @@ else if (needToRevert)
                 }
             } finally {
                 LocalFree(pLuid);
-                if (PreviewFeatures.isEnabled())
+                if (ContinuationSupport.isSupported())
                     Continuation.unpin();
             }
         };

From 0584af23255b6b8f49190eaf2618f3bcc299adfe Mon Sep 17 00:00:00 2001
From: William Kemper <wkemper@openjdk.org>
Date: Thu, 25 Jul 2024 23:59:56 +0000
Subject: [PATCH 217/401] 8336685: Shenandoah: Remove experimental incremental
 update mode

Reviewed-by: shade
---
 .../c1/shenandoahBarrierSetC1_aarch64.cpp     |   6 -
 .../shenandoahBarrierSetAssembler_aarch64.cpp |  13 +-
 .../shenandoahBarrierSetAssembler_aarch64.hpp |   3 -
 .../c1/shenandoahBarrierSetC1_ppc.cpp         |   9 -
 .../shenandoahBarrierSetAssembler_ppc.cpp     |  26 +-
 .../shenandoahBarrierSetAssembler_ppc.hpp     |   5 -
 .../c1/shenandoahBarrierSetC1_riscv.cpp       |   6 -
 .../shenandoahBarrierSetAssembler_riscv.cpp   |  15 +-
 .../shenandoahBarrierSetAssembler_riscv.hpp   |   2 -
 .../c1/shenandoahBarrierSetC1_x86.cpp         |   7 -
 .../shenandoahBarrierSetAssembler_x86.cpp     |  43 +--
 .../shenandoahBarrierSetAssembler_x86.hpp     |   3 -
 .../shenandoah/c1/shenandoahBarrierSetC1.cpp  |   9 -
 .../shenandoah/c1/shenandoahBarrierSetC1.hpp  |   1 -
 .../shenandoah/c2/shenandoahBarrierSetC2.cpp  |  78 +----
 .../shenandoah/c2/shenandoahBarrierSetC2.hpp  |   8 -
 .../gc/shenandoah/c2/shenandoahSupport.cpp    | 318 +-----------------
 .../gc/shenandoah/c2/shenandoahSupport.hpp    |  17 -
 .../gc/shenandoah/mode/shenandoahIUMode.cpp   |  82 -----
 .../gc/shenandoah/mode/shenandoahIUMode.hpp   |  42 ---
 .../shenandoah/mode/shenandoahPassiveMode.cpp |   1 -
 .../gc/shenandoah/mode/shenandoahSATBMode.cpp |   1 -
 .../gc/shenandoah/shenandoahArguments.cpp     |   2 -
 .../gc/shenandoah/shenandoahBarrierSet.cpp    |   2 +-
 .../gc/shenandoah/shenandoahBarrierSet.hpp    |   2 -
 .../shenandoahBarrierSet.inline.hpp           |   9 -
 .../shenandoahBarrierSetClone.inline.hpp      |  13 +-
 .../shenandoah/shenandoahConcurrentMark.cpp   |  18 +-
 .../share/gc/shenandoah/shenandoahHeap.cpp    |   3 -
 .../gc/shenandoah/shenandoah_globals.hpp      |   3 -
 src/hotspot/share/opto/classes.hpp            |   1 -
 .../compiler/c2/aarch64/TestVolatiles.java    |  14 +-
 .../c2/aarch64/TestVolatilesShenandoah.java   |  27 --
 .../jtreg/gc/TestAllocHumongousFragment.java  |  45 ---
 .../gc/shenandoah/TestAllocIntArrays.java     |  50 ---
 .../gc/shenandoah/TestAllocObjectArrays.java  |  50 ---
 .../jtreg/gc/shenandoah/TestAllocObjects.java |  46 ---
 .../TestDynamicSoftMaxHeapSize.java           |  22 --
 .../gc/shenandoah/TestGCThreadGroups.java     |  18 -
 .../jtreg/gc/shenandoah/TestHeapUncommit.java |  21 --
 .../jtreg/gc/shenandoah/TestJcmdHeapDump.java |  32 --
 .../jtreg/gc/shenandoah/TestLotsOfCycles.java |  32 --
 .../gc/shenandoah/TestObjItrWithHeapDump.java |   1 -
 .../jtreg/gc/shenandoah/TestPeriodicGC.java   |  30 --
 .../TestReferenceRefersToShenandoah.java      |  48 +--
 .../TestReferenceShortcutCycle.java           |  13 -
 .../gc/shenandoah/TestRefprocSanity.java      |  19 --
 .../gc/shenandoah/TestRegionSampling.java     |  19 --
 .../jtreg/gc/shenandoah/TestResizeTLAB.java   |  40 ---
 .../gc/shenandoah/TestRetainObjects.java      |  35 --
 .../jtreg/gc/shenandoah/TestSieveObjects.java |  39 ---
 .../jtreg/gc/shenandoah/TestStringDedup.java  |  18 -
 .../gc/shenandoah/TestStringDedupStress.java  |  31 --
 .../shenandoah/TestStringInternCleanup.java   |  20 --
 .../gc/shenandoah/TestVerifyJCStress.java     |  27 --
 .../gc/shenandoah/TestWrongArrayMember.java   |   3 +-
 .../compiler/BarrierInInfiniteLoop.java       |   2 -
 .../compiler/TestUnexpectedIUBarrierEA.java   |  74 ----
 .../mxbeans/TestChurnNotifications.java       |  17 -
 .../mxbeans/TestPauseNotifications.java       |  15 -
 .../shenandoah/oom/TestClassLoaderLeak.java   |   1 -
 .../gc/shenandoah/options/TestExplicitGC.java |  18 -
 .../gc/shenandoah/options/TestModeUnlock.java |   1 -
 .../options/TestSelectiveBarrierFlags.java    |   2 +-
 .../options/TestWrongBarrierDisable.java      |   9 -
 .../options/TestWrongBarrierEnable.java       |  16 +-
 .../gcbasher/TestGCBasherWithShenandoah.java  |  88 -----
 .../stress/gcold/TestGCOldWithShenandoah.java |  39 ---
 .../systemgc/TestSystemGCWithShenandoah.java  |  14 -
 69 files changed, 40 insertions(+), 1704 deletions(-)
 delete mode 100644 src/hotspot/share/gc/shenandoah/mode/shenandoahIUMode.cpp
 delete mode 100644 src/hotspot/share/gc/shenandoah/mode/shenandoahIUMode.hpp
 delete mode 100644 test/hotspot/jtreg/gc/shenandoah/compiler/TestUnexpectedIUBarrierEA.java

diff --git a/src/hotspot/cpu/aarch64/gc/shenandoah/c1/shenandoahBarrierSetC1_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shenandoah/c1/shenandoahBarrierSetC1_aarch64.cpp
index c02f93313b3cc..261502d582363 100644
--- a/src/hotspot/cpu/aarch64/gc/shenandoah/c1/shenandoahBarrierSetC1_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/shenandoah/c1/shenandoahBarrierSetC1_aarch64.cpp
@@ -41,8 +41,6 @@ void LIR_OpShenandoahCompareAndSwap::emit_code(LIR_Assembler* masm) {
   Register tmp2 = _tmp2->as_register();
   Register result = result_opr()->as_register();
 
-  ShenandoahBarrierSet::assembler()->iu_barrier(masm->masm(), newval, rscratch2);
-
   if (UseCompressedOops) {
     __ encode_heap_oop(tmp1, cmpval);
     cmpval = tmp1;
@@ -102,10 +100,6 @@ LIR_Opr ShenandoahBarrierSetC1::atomic_xchg_at_resolved(LIRAccess& access, LIRIt
   value.load_item();
   LIR_Opr value_opr = value.result();
 
-  if (access.is_oop()) {
-    value_opr = iu_barrier(access.gen(), value_opr, access.access_emit_info(), access.decorators());
-  }
-
   assert(type == T_INT || is_reference_type(type) LP64_ONLY( || type == T_LONG ), "unexpected type");
   LIR_Opr tmp = gen->new_register(T_INT);
   __ xchg(access.resolved_addr(), value_opr, result, tmp);
diff --git a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp
index 5db29729239d3..06f4382015603 100644
--- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp
@@ -47,7 +47,7 @@ void ShenandoahBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, Dec
                                                        Register src, Register dst, Register count, RegSet saved_regs) {
   if (is_oop) {
     bool dest_uninitialized = (decorators & IS_DEST_UNINITIALIZED) != 0;
-    if ((ShenandoahSATBBarrier && !dest_uninitialized) || ShenandoahIUBarrier || ShenandoahLoadRefBarrier) {
+    if ((ShenandoahSATBBarrier && !dest_uninitialized) || ShenandoahLoadRefBarrier) {
 
       Label done;
 
@@ -300,14 +300,6 @@ void ShenandoahBarrierSetAssembler::load_reference_barrier(MacroAssembler* masm,
   __ leave();
 }
 
-void ShenandoahBarrierSetAssembler::iu_barrier(MacroAssembler* masm, Register dst, Register tmp) {
-  if (ShenandoahIUBarrier) {
-    __ push_call_clobbered_registers();
-    satb_write_barrier_pre(masm, noreg, dst, rthread, tmp, rscratch1, true, false);
-    __ pop_call_clobbered_registers();
-  }
-}
-
 //
 // Arguments:
 //
@@ -398,8 +390,7 @@ void ShenandoahBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet
   if (val == noreg) {
     BarrierSetAssembler::store_at(masm, decorators, type, Address(tmp3, 0), noreg, noreg, noreg, noreg);
   } else {
-    iu_barrier(masm, val, tmp1);
-    // G1 barrier needs uncompressed oop for region cross check.
+    // Barrier needs uncompressed oop for region cross check.
     Register new_val = val;
     if (UseCompressedOops) {
       new_val = rscratch2;
diff --git a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp
index 375893702e1de..ee11b2e73f73f 100644
--- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp
@@ -60,9 +60,6 @@ class ShenandoahBarrierSetAssembler: public BarrierSetAssembler {
   void load_reference_barrier(MacroAssembler* masm, Register dst, Address load_addr, DecoratorSet decorators);
 
 public:
-
-  void iu_barrier(MacroAssembler* masm, Register dst, Register tmp);
-
   virtual NMethodPatchingType nmethod_patching_type() { return NMethodPatchingType::conc_data_patch; }
 
 #ifdef COMPILER1
diff --git a/src/hotspot/cpu/ppc/gc/shenandoah/c1/shenandoahBarrierSetC1_ppc.cpp b/src/hotspot/cpu/ppc/gc/shenandoah/c1/shenandoahBarrierSetC1_ppc.cpp
index 6d9a1db1ed4b8..5f87281bdf967 100644
--- a/src/hotspot/cpu/ppc/gc/shenandoah/c1/shenandoahBarrierSetC1_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/shenandoah/c1/shenandoahBarrierSetC1_ppc.cpp
@@ -43,11 +43,6 @@ void LIR_OpShenandoahCompareAndSwap::emit_code(LIR_Assembler *masm) {
   Register tmp2 = _tmp2->as_register();
   Register result = result_opr()->as_register();
 
-  if (ShenandoahIUBarrier) {
-    ShenandoahBarrierSet::assembler()->iu_barrier(masm->masm(), new_val, tmp1, tmp2,
-                                                  MacroAssembler::PRESERVATION_FRAME_LR_GP_FP_REGS);
-  }
-
   if (UseCompressedOops) {
     __ encode_heap_oop(cmp_val, cmp_val);
     __ encode_heap_oop(new_val, new_val);
@@ -122,10 +117,6 @@ LIR_Opr ShenandoahBarrierSetC1::atomic_xchg_at_resolved(LIRAccess &access, LIRIt
   value.load_item();
   LIR_Opr value_opr = value.result();
 
-  if (access.is_oop()) {
-    value_opr = iu_barrier(access.gen(), value_opr, access.access_emit_info(), access.decorators());
-  }
-
   assert(type == T_INT || is_reference_type(type) LP64_ONLY( || type == T_LONG ), "unexpected type");
   LIR_Opr tmp_xchg = gen->new_register(T_INT);
   __ xchg(access.resolved_addr(), value_opr, result, tmp_xchg);
diff --git a/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp b/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp
index 535fe88a68075..62aa9a2bf5930 100644
--- a/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp
@@ -61,20 +61,6 @@ void ShenandoahBarrierSetAssembler::satb_write_barrier(MacroAssembler *masm,
   }
 }
 
-void ShenandoahBarrierSetAssembler::iu_barrier(MacroAssembler *masm,
-                                               Register val,
-                                               Register tmp1, Register tmp2,
-                                               MacroAssembler::PreservationLevel preservation_level,
-                                               DecoratorSet decorators) {
-  // IU barriers are also employed to avoid resurrection of weak references,
-  // even if Shenandoah does not operate in incremental update mode.
-  if (ShenandoahIUBarrier || ShenandoahSATBBarrier) {
-    __ block_comment("iu_barrier (shenandoahgc) {");
-    satb_write_barrier_impl(masm, decorators, noreg, noreg, val, tmp1, tmp2, preservation_level);
-    __ block_comment("} iu_barrier (shenandoahgc)");
-  }
-}
-
 void ShenandoahBarrierSetAssembler::load_reference_barrier(MacroAssembler *masm, DecoratorSet decorators,
                                                            Register base, RegisterOrConstant ind_or_offs,
                                                            Register dst,
@@ -110,7 +96,7 @@ void ShenandoahBarrierSetAssembler::arraycopy_prologue(MacroAssembler *masm, Dec
 
   // Fast path: No barrier required if for every barrier type, it is either disabled or would not store
   // any useful information.
-  if ((!ShenandoahSATBBarrier || dest_uninitialized) && !ShenandoahIUBarrier && !ShenandoahLoadRefBarrier) {
+  if ((!ShenandoahSATBBarrier || dest_uninitialized) && !ShenandoahLoadRefBarrier) {
     return;
   }
 
@@ -582,7 +568,11 @@ void ShenandoahBarrierSetAssembler::load_at(
 
   /* ==== Apply keep-alive barrier, if required (e.g., to inhibit weak reference resurrection) ==== */
   if (ShenandoahBarrierSet::need_keep_alive_barrier(decorators, type)) {
-    iu_barrier(masm, dst, tmp1, tmp2, preservation_level);
+    if (ShenandoahSATBBarrier) {
+      __ block_comment("keep_alive_barrier (shenandoahgc) {");
+      satb_write_barrier_impl(masm, 0, noreg, noreg, dst, tmp1, tmp2, preservation_level);
+      __ block_comment("} keep_alive_barrier (shenandoahgc)");
+    }
   }
 }
 
@@ -597,10 +587,6 @@ void ShenandoahBarrierSetAssembler::store_at(MacroAssembler *masm, DecoratorSet
     if (ShenandoahSATBBarrier) {
       satb_write_barrier(masm, base, ind_or_offs, tmp1, tmp2, tmp3, preservation_level);
     }
-
-    if (ShenandoahIUBarrier && val != noreg) {
-      iu_barrier(masm, val, tmp1, tmp2, preservation_level, decorators);
-    }
   }
 
   BarrierSetAssembler::store_at(masm, decorators, type,
diff --git a/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.hpp b/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.hpp
index 4514f2540ac9b..2e56187c169b2 100644
--- a/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.hpp
@@ -82,11 +82,6 @@ class ShenandoahBarrierSetAssembler: public BarrierSetAssembler {
                           Register tmp1, Register tmp2, Register tmp3,
                           MacroAssembler::PreservationLevel preservation_level);
 
-  void iu_barrier(MacroAssembler* masm,
-                        Register val,
-                        Register tmp1, Register tmp2,
-                        MacroAssembler::PreservationLevel preservation_level, DecoratorSet decorators = 0);
-
   void load_reference_barrier(MacroAssembler* masm, DecoratorSet decorators,
                               Register base, RegisterOrConstant ind_or_offs,
                               Register dst,
diff --git a/src/hotspot/cpu/riscv/gc/shenandoah/c1/shenandoahBarrierSetC1_riscv.cpp b/src/hotspot/cpu/riscv/gc/shenandoah/c1/shenandoahBarrierSetC1_riscv.cpp
index cd568cc723fe9..f503cb762e792 100644
--- a/src/hotspot/cpu/riscv/gc/shenandoah/c1/shenandoahBarrierSetC1_riscv.cpp
+++ b/src/hotspot/cpu/riscv/gc/shenandoah/c1/shenandoahBarrierSetC1_riscv.cpp
@@ -41,8 +41,6 @@ void LIR_OpShenandoahCompareAndSwap::emit_code(LIR_Assembler* masm) {
   Register tmp2 = _tmp2->as_register();
   Register result = result_opr()->as_register();
 
-  ShenandoahBarrierSet::assembler()->iu_barrier(masm->masm(), newval, t1);
-
   if (UseCompressedOops) {
     __ encode_heap_oop(tmp1, cmpval);
     cmpval = tmp1;
@@ -94,10 +92,6 @@ LIR_Opr ShenandoahBarrierSetC1::atomic_xchg_at_resolved(LIRAccess& access, LIRIt
   value.load_item();
   LIR_Opr value_opr = value.result();
 
-  if (access.is_oop()) {
-    value_opr = iu_barrier(access.gen(), value_opr, access.access_emit_info(), access.decorators());
-  }
-
   assert(type == T_INT || is_reference_type(type) LP64_ONLY( || type == T_LONG ), "unexpected type");
   LIR_Opr tmp = gen->new_register(T_INT);
   __ xchg(access.resolved_addr(), value_opr, result, tmp);
diff --git a/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp
index 9be8259e7e85d..9a79a92327723 100644
--- a/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp
@@ -48,7 +48,7 @@ void ShenandoahBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, Dec
                                                        Register src, Register dst, Register count, RegSet saved_regs) {
   if (is_oop) {
     bool dest_uninitialized = (decorators & IS_DEST_UNINITIALIZED) != 0;
-    if ((ShenandoahSATBBarrier && !dest_uninitialized) || ShenandoahIUBarrier || ShenandoahLoadRefBarrier) {
+    if ((ShenandoahSATBBarrier && !dest_uninitialized) || ShenandoahLoadRefBarrier) {
 
       Label done;
 
@@ -308,16 +308,6 @@ void ShenandoahBarrierSetAssembler::load_reference_barrier(MacroAssembler* masm,
   __ leave();
 }
 
-void ShenandoahBarrierSetAssembler::iu_barrier(MacroAssembler* masm, Register dst, Register tmp) {
-  if (ShenandoahIUBarrier) {
-    __ push_call_clobbered_registers();
-
-    satb_write_barrier_pre(masm, noreg, dst, xthread, tmp, t0, true, false);
-
-    __ pop_call_clobbered_registers();
-  }
-}
-
 //
 // Arguments:
 //
@@ -420,8 +410,7 @@ void ShenandoahBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet
   if (val == noreg) {
     BarrierSetAssembler::store_at(masm, decorators, type, Address(tmp3, 0), noreg, noreg, noreg, noreg);
   } else {
-    iu_barrier(masm, val, tmp1);
-    // G1 barrier needs uncompressed oop for region cross check.
+    // Barrier needs uncompressed oop for region cross check.
     Register new_val = val;
     if (UseCompressedOops) {
       new_val = t1;
diff --git a/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.hpp b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.hpp
index 0ae352f325d16..bfdea7f607ea8 100644
--- a/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.hpp
@@ -63,8 +63,6 @@ class ShenandoahBarrierSetAssembler: public BarrierSetAssembler {
 
 public:
 
-  void iu_barrier(MacroAssembler* masm, Register dst, Register tmp);
-
   virtual NMethodPatchingType nmethod_patching_type() { return NMethodPatchingType::conc_data_patch; }
 
 #ifdef COMPILER1
diff --git a/src/hotspot/cpu/x86/gc/shenandoah/c1/shenandoahBarrierSetC1_x86.cpp b/src/hotspot/cpu/x86/gc/shenandoah/c1/shenandoahBarrierSetC1_x86.cpp
index 9995a87f5cf5b..032b33f40e038 100644
--- a/src/hotspot/cpu/x86/gc/shenandoah/c1/shenandoahBarrierSetC1_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/shenandoah/c1/shenandoahBarrierSetC1_x86.cpp
@@ -46,9 +46,6 @@ void LIR_OpShenandoahCompareAndSwap::emit_code(LIR_Assembler* masm) {
   assert(cmpval != addr, "cmp and addr must be in different registers");
   assert(newval != addr, "new value and addr must be in different registers");
 
-  // Apply IU barrier to newval.
-  ShenandoahBarrierSet::assembler()->iu_barrier(masm->masm(), newval, tmp1);
-
 #ifdef _LP64
   if (UseCompressedOops) {
     __ encode_heap_oop(cmpval);
@@ -101,10 +98,6 @@ LIR_Opr ShenandoahBarrierSetC1::atomic_xchg_at_resolved(LIRAccess& access, LIRIt
   value.load_item();
   LIR_Opr value_opr = value.result();
 
-  if (access.is_oop()) {
-    value_opr = iu_barrier(access.gen(), value_opr, access.access_emit_info(), access.decorators());
-  }
-
   // Because we want a 2-arg form of xchg and xadd
   __ move(value_opr, result);
 
diff --git a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
index 25a2b931468cd..47078dff90738 100644
--- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
@@ -121,7 +121,7 @@ void ShenandoahBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, Dec
 
   if (is_reference_type(type)) {
 
-    if ((ShenandoahSATBBarrier && !dest_uninitialized) || ShenandoahIUBarrier || ShenandoahLoadRefBarrier) {
+    if ((ShenandoahSATBBarrier && !dest_uninitialized) || ShenandoahLoadRefBarrier) {
 #ifdef _LP64
       Register thread = r15_thread;
 #else
@@ -472,40 +472,6 @@ void ShenandoahBarrierSetAssembler::load_reference_barrier(MacroAssembler* masm,
 #endif
 }
 
-void ShenandoahBarrierSetAssembler::iu_barrier(MacroAssembler* masm, Register dst, Register tmp) {
-  if (ShenandoahIUBarrier) {
-    iu_barrier_impl(masm, dst, tmp);
-  }
-}
-
-void ShenandoahBarrierSetAssembler::iu_barrier_impl(MacroAssembler* masm, Register dst, Register tmp) {
-  assert(ShenandoahIUBarrier, "should be enabled");
-
-  if (dst == noreg) return;
-
-  if (ShenandoahIUBarrier) {
-    save_machine_state(masm, /* handle_gpr = */ true, /* handle_fp = */ true);
-
-#ifdef _LP64
-    Register thread = r15_thread;
-#else
-    Register thread = rcx;
-    if (thread == dst || thread == tmp) {
-      thread = rdi;
-    }
-    if (thread == dst || thread == tmp) {
-      thread = rbx;
-    }
-    __ get_thread(thread);
-#endif
-    assert_different_registers(dst, tmp, thread);
-
-    satb_write_barrier_pre(masm, noreg, dst, thread, tmp, true, false);
-
-    restore_machine_state(masm, /* handle_gpr = */ true, /* handle_fp = */ true);
-  }
-}
-
 //
 // Arguments:
 //
@@ -626,12 +592,7 @@ void ShenandoahBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet
                                    val != noreg /* tosca_live */,
                                    false /* expand_call */);
     }
-    if (val == noreg) {
-      BarrierSetAssembler::store_at(masm, decorators, type, Address(tmp1, 0), val, noreg, noreg, noreg);
-    } else {
-      iu_barrier(masm, val, tmp3);
-      BarrierSetAssembler::store_at(masm, decorators, type, Address(tmp1, 0), val, noreg, noreg, noreg);
-    }
+    BarrierSetAssembler::store_at(masm, decorators, type, Address(tmp1, 0), val, noreg, noreg, noreg);
     NOT_LP64(imasm->restore_bcp());
   } else {
     BarrierSetAssembler::store_at(masm, decorators, type, dst, val, tmp1, tmp2, tmp3);
diff --git a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp
index 47dfe14492802..c8140f4a76a47 100644
--- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp
@@ -56,10 +56,7 @@ class ShenandoahBarrierSetAssembler: public BarrierSetAssembler {
                                     bool tosca_live,
                                     bool expand_call);
 
-  void iu_barrier_impl(MacroAssembler* masm, Register dst, Register tmp);
-
 public:
-  void iu_barrier(MacroAssembler* masm, Register dst, Register tmp);
 #ifdef COMPILER1
   void gen_pre_barrier_stub(LIR_Assembler* ce, ShenandoahPreBarrierStub* stub);
   void gen_load_reference_barrier_stub(LIR_Assembler* ce, ShenandoahLoadReferenceBarrierStub* stub);
diff --git a/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp b/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp
index 30bf1f7a39507..6b104e7e19935 100644
--- a/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp
+++ b/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp
@@ -183,20 +183,11 @@ LIR_Opr ShenandoahBarrierSetC1::ensure_in_register(LIRGenerator* gen, LIR_Opr ob
   return obj;
 }
 
-LIR_Opr ShenandoahBarrierSetC1::iu_barrier(LIRGenerator* gen, LIR_Opr obj, CodeEmitInfo* info, DecoratorSet decorators) {
-  if (ShenandoahIUBarrier) {
-    obj = ensure_in_register(gen, obj, T_OBJECT);
-    pre_barrier(gen, info, decorators, LIR_OprFact::illegalOpr, obj);
-  }
-  return obj;
-}
-
 void ShenandoahBarrierSetC1::store_at_resolved(LIRAccess& access, LIR_Opr value) {
   if (access.is_oop()) {
     if (ShenandoahSATBBarrier) {
       pre_barrier(access.gen(), access.access_emit_info(), access.decorators(), access.resolved_addr(), LIR_OprFact::illegalOpr /* pre_val */);
     }
-    value = iu_barrier(access.gen(), value, access.access_emit_info(), access.decorators());
   }
   BarrierSetC1::store_at_resolved(access, value);
 }
diff --git a/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.hpp b/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.hpp
index 71093300e8296..98b2aad887130 100644
--- a/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.hpp
+++ b/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.hpp
@@ -200,7 +200,6 @@ class ShenandoahBarrierSetC1 : public BarrierSetC1 {
   void pre_barrier(LIRGenerator* gen, CodeEmitInfo* info, DecoratorSet decorators, LIR_Opr addr_opr, LIR_Opr pre_val);
 
   LIR_Opr load_reference_barrier(LIRGenerator* gen, LIR_Opr obj, LIR_Opr addr, DecoratorSet decorators);
-  LIR_Opr iu_barrier(LIRGenerator* gen, LIR_Opr obj, CodeEmitInfo* info, DecoratorSet decorators);
 
   LIR_Opr load_reference_barrier_impl(LIRGenerator* gen, LIR_Opr obj, LIR_Opr addr, DecoratorSet decorators);
 
diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
index 7d1f5cc16a845..d2820f3aa267f 100644
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
@@ -48,25 +48,7 @@ ShenandoahBarrierSetC2* ShenandoahBarrierSetC2::bsc2() {
 }
 
 ShenandoahBarrierSetC2State::ShenandoahBarrierSetC2State(Arena* comp_arena)
-  : _iu_barriers(new (comp_arena) GrowableArray<ShenandoahIUBarrierNode*>(comp_arena, 8,  0, nullptr)),
-    _load_reference_barriers(new (comp_arena) GrowableArray<ShenandoahLoadReferenceBarrierNode*>(comp_arena, 8,  0, nullptr)) {
-}
-
-int ShenandoahBarrierSetC2State::iu_barriers_count() const {
-  return _iu_barriers->length();
-}
-
-ShenandoahIUBarrierNode* ShenandoahBarrierSetC2State::iu_barrier(int idx) const {
-  return _iu_barriers->at(idx);
-}
-
-void ShenandoahBarrierSetC2State::add_iu_barrier(ShenandoahIUBarrierNode* n) {
-  assert(!_iu_barriers->contains(n), "duplicate entry in barrier list");
-  _iu_barriers->append(n);
-}
-
-void ShenandoahBarrierSetC2State::remove_iu_barrier(ShenandoahIUBarrierNode* n) {
-  _iu_barriers->remove_if_existing(n);
+  : _load_reference_barriers(new (comp_arena) GrowableArray<ShenandoahLoadReferenceBarrierNode*>(comp_arena, 8,  0, nullptr)) {
 }
 
 int ShenandoahBarrierSetC2State::load_reference_barriers_count() const {
@@ -88,13 +70,6 @@ void ShenandoahBarrierSetC2State::remove_load_reference_barrier(ShenandoahLoadRe
   }
 }
 
-Node* ShenandoahBarrierSetC2::shenandoah_iu_barrier(GraphKit* kit, Node* obj) const {
-  if (ShenandoahIUBarrier) {
-    return kit->gvn().transform(new ShenandoahIUBarrierNode(obj));
-  }
-  return obj;
-}
-
 #define __ kit->
 
 bool ShenandoahBarrierSetC2::satb_can_remove_pre_barrier(GraphKit* kit, PhaseValues* phase, Node* adr,
@@ -508,21 +483,8 @@ Node* ShenandoahBarrierSetC2::store_at_resolved(C2Access& access, C2AccessValue&
 
     uint adr_idx = kit->C->get_alias_index(adr_type);
     assert(adr_idx != Compile::AliasIdxTop, "use other store_to_memory factory" );
-    Node* value = val.node();
-    value = shenandoah_iu_barrier(kit, value);
-    val.set_node(value);
     shenandoah_write_barrier_pre(kit, true /* do_load */, /*kit->control(),*/ access.base(), adr, adr_idx, val.node(),
                                  static_cast<const TypeOopPtr*>(val.type()), nullptr /* pre_val */, access.type());
-  } else {
-    assert(access.is_opt_access(), "only for optimization passes");
-    assert(((decorators & C2_TIGHTLY_COUPLED_ALLOC) != 0 || !ShenandoahSATBBarrier) && (decorators & C2_ARRAY_COPY) != 0, "unexpected caller of this code");
-    C2OptAccess& opt_access = static_cast<C2OptAccess&>(access);
-    PhaseGVN& gvn =  opt_access.gvn();
-
-    if (ShenandoahIUBarrier) {
-      Node* enqueue = gvn.transform(new ShenandoahIUBarrierNode(val.node()));
-      val.set_node(enqueue);
-    }
   }
   return BarrierSetC2::store_at_resolved(access, val);
 }
@@ -598,7 +560,6 @@ Node* ShenandoahBarrierSetC2::atomic_cmpxchg_val_at_resolved(C2AtomicParseAccess
                                                    Node* new_val, const Type* value_type) const {
   GraphKit* kit = access.kit();
   if (access.is_oop()) {
-    new_val = shenandoah_iu_barrier(kit, new_val);
     shenandoah_write_barrier_pre(kit, false /* do_load */,
                                  nullptr, nullptr, max_juint, nullptr, nullptr,
                                  expected_val /* pre_val */, T_OBJECT);
@@ -646,7 +607,6 @@ Node* ShenandoahBarrierSetC2::atomic_cmpxchg_bool_at_resolved(C2AtomicParseAcces
                                                               Node* new_val, const Type* value_type) const {
   GraphKit* kit = access.kit();
   if (access.is_oop()) {
-    new_val = shenandoah_iu_barrier(kit, new_val);
     shenandoah_write_barrier_pre(kit, false /* do_load */,
                                  nullptr, nullptr, max_juint, nullptr, nullptr,
                                  expected_val /* pre_val */, T_OBJECT);
@@ -699,9 +659,6 @@ Node* ShenandoahBarrierSetC2::atomic_cmpxchg_bool_at_resolved(C2AtomicParseAcces
 
 Node* ShenandoahBarrierSetC2::atomic_xchg_at_resolved(C2AtomicParseAccess& access, Node* val, const Type* value_type) const {
   GraphKit* kit = access.kit();
-  if (access.is_oop()) {
-    val = shenandoah_iu_barrier(kit, val);
-  }
   Node* result = BarrierSetC2::atomic_xchg_at_resolved(access, val, value_type);
   if (access.is_oop()) {
     result = kit->gvn().transform(new ShenandoahLoadReferenceBarrierNode(nullptr, result, access.decorators()));
@@ -719,7 +676,7 @@ bool ShenandoahBarrierSetC2::is_gc_pre_barrier_node(Node* node) const {
 
 // Support for GC barriers emitted during parsing
 bool ShenandoahBarrierSetC2::is_gc_barrier_node(Node* node) const {
-  if (node->Opcode() == Op_ShenandoahLoadReferenceBarrier || node->Opcode() == Op_ShenandoahIUBarrier) return true;
+  if (node->Opcode() == Op_ShenandoahLoadReferenceBarrier) return true;
   if (node->Opcode() != Op_CallLeaf && node->Opcode() != Op_CallLeafNoFP) {
     return false;
   }
@@ -740,9 +697,6 @@ Node* ShenandoahBarrierSetC2::step_over_gc_barrier(Node* c) const {
   if (c->Opcode() == Op_ShenandoahLoadReferenceBarrier) {
     return c->in(ShenandoahLoadReferenceBarrierNode::ValueIn);
   }
-  if (c->Opcode() == Op_ShenandoahIUBarrier) {
-    c = c->in(1);
-  }
   return c;
 }
 
@@ -775,9 +729,6 @@ bool ShenandoahBarrierSetC2::array_copy_requires_gc_barriers(bool tightly_couple
     }
     return !is_clone;
   }
-  if (phase == Optimization) {
-    return !ShenandoahIUBarrier;
-  }
   return true;
 }
 
@@ -836,11 +787,7 @@ void ShenandoahBarrierSetC2::clone_at_expansion(PhaseMacroExpand* phase, ArrayCo
     debug_only(gc_state_adr_type = phase->C->get_adr_type(gc_state_idx));
 
     Node* gc_state    = phase->transform_later(new LoadBNode(ctrl, mem, gc_state_addr, gc_state_adr_type, TypeInt::BYTE, MemNode::unordered));
-    int flags = ShenandoahHeap::HAS_FORWARDED;
-    if (ShenandoahIUBarrier) {
-      flags |= ShenandoahHeap::MARKING;
-    }
-    Node* stable_and  = phase->transform_later(new AndINode(gc_state, phase->igvn().intcon(flags)));
+    Node* stable_and  = phase->transform_later(new AndINode(gc_state, phase->igvn().intcon(ShenandoahHeap::HAS_FORWARDED)));
     Node* stable_cmp  = phase->transform_later(new CmpINode(stable_and, phase->igvn().zerocon(T_INT)));
     Node* stable_test = phase->transform_later(new BoolNode(stable_cmp, BoolTest::ne));
 
@@ -889,18 +836,12 @@ void ShenandoahBarrierSetC2::clone_at_expansion(PhaseMacroExpand* phase, ArrayCo
 
 // Support for macro expanded GC barriers
 void ShenandoahBarrierSetC2::register_potential_barrier_node(Node* node) const {
-  if (node->Opcode() == Op_ShenandoahIUBarrier) {
-    state()->add_iu_barrier((ShenandoahIUBarrierNode*) node);
-  }
   if (node->Opcode() == Op_ShenandoahLoadReferenceBarrier) {
     state()->add_load_reference_barrier((ShenandoahLoadReferenceBarrierNode*) node);
   }
 }
 
 void ShenandoahBarrierSetC2::unregister_potential_barrier_node(Node* node) const {
-  if (node->Opcode() == Op_ShenandoahIUBarrier) {
-    state()->remove_iu_barrier((ShenandoahIUBarrierNode*) node);
-  }
   if (node->Opcode() == Op_ShenandoahLoadReferenceBarrier) {
     state()->remove_load_reference_barrier((ShenandoahLoadReferenceBarrierNode*) node);
   }
@@ -948,12 +889,7 @@ void ShenandoahBarrierSetC2::eliminate_useless_gc_barriers(Unique_Node_List &use
       }
     }
   }
-  for (int i = state()->iu_barriers_count() - 1; i >= 0; i--) {
-    ShenandoahIUBarrierNode* n = state()->iu_barrier(i);
-    if (!useful.member(n)) {
-      state()->remove_iu_barrier(n);
-    }
-  }
+
   for (int i = state()->load_reference_barriers_count() - 1; i >= 0; i--) {
     ShenandoahLoadReferenceBarrierNode* n = state()->load_reference_barrier(i);
     if (!useful.member(n)) {
@@ -1190,9 +1126,6 @@ bool ShenandoahBarrierSetC2::escape_add_to_con_graph(ConnectionGraph* conn_graph
       }
       return false;
     }
-    case Op_ShenandoahIUBarrier:
-      conn_graph->add_local_var_and_edge(n, PointsToNode::NoEscape, n->in(1), delayed_worklist);
-      break;
     case Op_ShenandoahLoadReferenceBarrier:
       conn_graph->add_local_var_and_edge(n, PointsToNode::NoEscape, n->in(ShenandoahLoadReferenceBarrierNode::ValueIn), delayed_worklist);
       return true;
@@ -1216,9 +1149,6 @@ bool ShenandoahBarrierSetC2::escape_add_final_edges(ConnectionGraph* conn_graph,
     case Op_ShenandoahWeakCompareAndSwapP:
     case Op_ShenandoahWeakCompareAndSwapN:
       return conn_graph->add_final_edges_unsafe_access(n, opcode);
-    case Op_ShenandoahIUBarrier:
-      conn_graph->add_local_var_and_edge(n, PointsToNode::NoEscape, n->in(1), nullptr);
-      return true;
     case Op_ShenandoahLoadReferenceBarrier:
       conn_graph->add_local_var_and_edge(n, PointsToNode::NoEscape, n->in(ShenandoahLoadReferenceBarrierNode::ValueIn), nullptr);
       return true;
diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.hpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.hpp
index 9b8e30c98a1d3..4619b217e96c6 100644
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.hpp
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.hpp
@@ -31,17 +31,11 @@
 
 class ShenandoahBarrierSetC2State : public ArenaObj {
 private:
-  GrowableArray<ShenandoahIUBarrierNode*>* _iu_barriers;
   GrowableArray<ShenandoahLoadReferenceBarrierNode*>* _load_reference_barriers;
 
 public:
   ShenandoahBarrierSetC2State(Arena* comp_arena);
 
-  int iu_barriers_count() const;
-  ShenandoahIUBarrierNode* iu_barrier(int idx) const;
-  void add_iu_barrier(ShenandoahIUBarrierNode* n);
-  void remove_iu_barrier(ShenandoahIUBarrierNode * n);
-
   int load_reference_barriers_count() const;
   ShenandoahLoadReferenceBarrierNode* load_reference_barrier(int idx) const;
   void add_load_reference_barrier(ShenandoahLoadReferenceBarrierNode* n);
@@ -73,8 +67,6 @@ class ShenandoahBarrierSetC2 : public BarrierSetC2 {
                                     Node* pre_val,
                                     BasicType bt) const;
 
-  Node* shenandoah_iu_barrier(GraphKit* kit, Node* obj) const;
-
   void insert_pre_barrier(GraphKit* kit, Node* base_oop, Node* offset,
                           Node* pre_val, bool need_mem_bar) const;
 
diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
index 8cd76dd3d6bc4..0a51f74299545 100644
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
@@ -46,8 +46,7 @@
 
 bool ShenandoahBarrierC2Support::expand(Compile* C, PhaseIterGVN& igvn) {
   ShenandoahBarrierSetC2State* state = ShenandoahBarrierSetC2::bsc2()->state();
-  if ((state->iu_barriers_count() +
-       state->load_reference_barriers_count()) > 0) {
+  if (state->load_reference_barriers_count() > 0) {
     assert(C->post_loop_opts_phase(), "no loop opts allowed");
     C->reset_post_loop_opts_phase(); // ... but we know what we are doing
     C->clear_major_progress();
@@ -186,28 +185,10 @@ bool ShenandoahBarrierC2Support::verify_helper(Node* in, Node_Stack& phis, Vecto
         }
       } else if (in->Opcode() == Op_ShenandoahLoadReferenceBarrier) {
         if (t == ShenandoahOopStore) {
-          uint i = 0;
-          for (; i < phis.size(); i++) {
-            Node* n = phis.node_at(i);
-            if (n->Opcode() == Op_ShenandoahIUBarrier) {
-              break;
-            }
-          }
-          if (i == phis.size()) {
-            return false;
-          }
+          return false;
         }
         barriers_used.push(in);
         if (trace) {tty->print("Found barrier"); in->dump();}
-      } else if (in->Opcode() == Op_ShenandoahIUBarrier) {
-        if (t != ShenandoahOopStore) {
-          in = in->in(1);
-          continue;
-        }
-        if (trace) {tty->print("Found enqueue barrier"); in->dump();}
-        phis.push(in, in->req());
-        in = in->in(1);
-        continue;
       } else if (in->is_Proj() && in->in(0)->is_Allocate()) {
         if (trace) {
           tty->print("Found alloc");
@@ -326,7 +307,7 @@ void ShenandoahBarrierC2Support::verify(RootNode* root) {
           }
         }
 
-        if (verify && !verify_helper(n->in(MemNode::ValueIn), phis, visited, ShenandoahIUBarrier ? ShenandoahOopStore : ShenandoahValue, trace, barriers_used)) {
+        if (verify && !verify_helper(n->in(MemNode::ValueIn), phis, visited, ShenandoahValue, trace, barriers_used)) {
           report_verify_failure("Shenandoah verification: Store should have barriers", n);
         }
       }
@@ -368,7 +349,7 @@ void ShenandoahBarrierC2Support::verify(RootNode* root) {
       }
     } else if (n->is_LoadStore()) {
       if (n->in(MemNode::ValueIn)->bottom_type()->make_ptr() &&
-          !verify_helper(n->in(MemNode::ValueIn), phis, visited, ShenandoahIUBarrier ? ShenandoahOopStore : ShenandoahValue, trace, barriers_used)) {
+          !verify_helper(n->in(MemNode::ValueIn), phis, visited, ShenandoahValue, trace, barriers_used)) {
         report_verify_failure("Shenandoah verification: LoadStore (value) should have barriers", n);
       }
 
@@ -532,7 +513,7 @@ void ShenandoahBarrierC2Support::verify(RootNode* root) {
           }
         }
       }
-    } else if (n->Opcode() == Op_ShenandoahIUBarrier || n->Opcode() == Op_ShenandoahLoadReferenceBarrier) {
+    } else if (n->Opcode() == Op_ShenandoahLoadReferenceBarrier) {
       // skip
     } else if (n->is_AddP()
                || n->is_Phi()
@@ -1113,20 +1094,6 @@ void ShenandoahBarrierC2Support::pin_and_expand(PhaseIdealLoop* phase) {
   ShenandoahBarrierSetC2State* state = ShenandoahBarrierSetC2::bsc2()->state();
 
   Unique_Node_List uses;
-  for (int i = 0; i < state->iu_barriers_count(); i++) {
-    Node* barrier = state->iu_barrier(i);
-    Node* ctrl = phase->get_ctrl(barrier);
-    IdealLoopTree* loop = phase->get_loop(ctrl);
-    Node* head = loop->head();
-    if (head->is_OuterStripMinedLoop()) {
-      // Expanding a barrier here will break loop strip mining
-      // verification. Transform the loop so the loop nest doesn't
-      // appear as strip mined.
-      OuterStripMinedLoopNode* outer = head->as_OuterStripMinedLoop();
-      hide_strip_mined_loop(outer, outer->unique_ctrl_out()->as_CountedLoop(), phase);
-    }
-  }
-
   Node_Stack stack(0);
   Node_List clones;
   for (int i = state->load_reference_barriers_count() - 1; i >= 0; i--) {
@@ -1459,157 +1426,6 @@ void ShenandoahBarrierC2Support::pin_and_expand(PhaseIdealLoop* phase) {
   }
   // Done expanding load-reference-barriers.
   assert(ShenandoahBarrierSetC2::bsc2()->state()->load_reference_barriers_count() == 0, "all load reference barrier nodes should have been replaced");
-
-  for (int i = state->iu_barriers_count() - 1; i >= 0; i--) {
-    Node* barrier = state->iu_barrier(i);
-    Node* pre_val = barrier->in(1);
-
-    if (phase->igvn().type(pre_val)->higher_equal(TypePtr::NULL_PTR)) {
-      ShouldNotReachHere();
-      continue;
-    }
-
-    Node* ctrl = phase->get_ctrl(barrier);
-
-    if (ctrl->is_Proj() && ctrl->in(0)->is_CallJava()) {
-      assert(is_dominator(phase->get_ctrl(pre_val), ctrl->in(0)->in(0), pre_val, ctrl->in(0), phase), "can't move");
-      ctrl = ctrl->in(0)->in(0);
-      phase->set_ctrl(barrier, ctrl);
-    } else if (ctrl->is_CallRuntime()) {
-      assert(is_dominator(phase->get_ctrl(pre_val), ctrl->in(0), pre_val, ctrl, phase), "can't move");
-      ctrl = ctrl->in(0);
-      phase->set_ctrl(barrier, ctrl);
-    }
-
-    Node* init_ctrl = ctrl;
-    IdealLoopTree* loop = phase->get_loop(ctrl);
-    Node* raw_mem = fixer.find_mem(ctrl, barrier);
-    Node* init_raw_mem = raw_mem;
-    Node* raw_mem_for_ctrl = fixer.find_mem(ctrl, nullptr);
-    Node* heap_stable_ctrl = nullptr;
-    Node* null_ctrl = nullptr;
-    uint last = phase->C->unique();
-
-    enum { _heap_stable = 1, _heap_unstable, PATH_LIMIT };
-    Node* region = new RegionNode(PATH_LIMIT);
-    Node* phi = PhiNode::make(region, raw_mem, Type::MEMORY, TypeRawPtr::BOTTOM);
-
-    enum { _fast_path = 1, _slow_path, _null_path, PATH_LIMIT2 };
-    Node* region2 = new RegionNode(PATH_LIMIT2);
-    Node* phi2 = PhiNode::make(region2, raw_mem, Type::MEMORY, TypeRawPtr::BOTTOM);
-
-    // Stable path.
-    test_gc_state(ctrl, raw_mem, heap_stable_ctrl, phase, ShenandoahHeap::MARKING);
-    region->init_req(_heap_stable, heap_stable_ctrl);
-    phi->init_req(_heap_stable, raw_mem);
-
-    // Null path
-    Node* reg2_ctrl = nullptr;
-    test_null(ctrl, pre_val, null_ctrl, phase);
-    if (null_ctrl != nullptr) {
-      reg2_ctrl = null_ctrl->in(0);
-      region2->init_req(_null_path, null_ctrl);
-      phi2->init_req(_null_path, raw_mem);
-    } else {
-      region2->del_req(_null_path);
-      phi2->del_req(_null_path);
-    }
-
-    const int index_offset = in_bytes(ShenandoahThreadLocalData::satb_mark_queue_index_offset());
-    const int buffer_offset = in_bytes(ShenandoahThreadLocalData::satb_mark_queue_buffer_offset());
-    Node* thread = new ThreadLocalNode();
-    phase->register_new_node(thread, ctrl);
-    Node* buffer_adr = new AddPNode(phase->C->top(), thread, phase->igvn().MakeConX(buffer_offset));
-    phase->register_new_node(buffer_adr, ctrl);
-    Node* index_adr = new AddPNode(phase->C->top(), thread, phase->igvn().MakeConX(index_offset));
-    phase->register_new_node(index_adr, ctrl);
-
-    BasicType index_bt = TypeX_X->basic_type();
-    assert(sizeof(size_t) == type2aelembytes(index_bt), "Loading Shenandoah SATBMarkQueue::_index with wrong size.");
-    const TypePtr* adr_type = TypeRawPtr::BOTTOM;
-    Node* index = new LoadXNode(ctrl, raw_mem, index_adr, adr_type, TypeX_X, MemNode::unordered);
-    phase->register_new_node(index, ctrl);
-    Node* index_cmp = new CmpXNode(index, phase->igvn().MakeConX(0));
-    phase->register_new_node(index_cmp, ctrl);
-    Node* index_test = new BoolNode(index_cmp, BoolTest::ne);
-    phase->register_new_node(index_test, ctrl);
-    IfNode* queue_full_iff = new IfNode(ctrl, index_test, PROB_LIKELY(0.999), COUNT_UNKNOWN);
-    if (reg2_ctrl == nullptr) reg2_ctrl = queue_full_iff;
-    phase->register_control(queue_full_iff, loop, ctrl);
-    Node* not_full = new IfTrueNode(queue_full_iff);
-    phase->register_control(not_full, loop, queue_full_iff);
-    Node* full = new IfFalseNode(queue_full_iff);
-    phase->register_control(full, loop, queue_full_iff);
-
-    ctrl = not_full;
-
-    Node* next_index = new SubXNode(index, phase->igvn().MakeConX(sizeof(intptr_t)));
-    phase->register_new_node(next_index, ctrl);
-
-    Node* buffer  = new LoadPNode(ctrl, raw_mem, buffer_adr, adr_type, TypeRawPtr::NOTNULL, MemNode::unordered);
-    phase->register_new_node(buffer, ctrl);
-    Node *log_addr = new AddPNode(phase->C->top(), buffer, next_index);
-    phase->register_new_node(log_addr, ctrl);
-    Node* log_store = new StorePNode(ctrl, raw_mem, log_addr, adr_type, pre_val, MemNode::unordered);
-    phase->register_new_node(log_store, ctrl);
-    // update the index
-    Node* index_update = new StoreXNode(ctrl, log_store, index_adr, adr_type, next_index, MemNode::unordered);
-    phase->register_new_node(index_update, ctrl);
-
-    // Fast-path case
-    region2->init_req(_fast_path, ctrl);
-    phi2->init_req(_fast_path, index_update);
-
-    ctrl = full;
-
-    Node* base = find_bottom_mem(ctrl, phase);
-
-    MergeMemNode* mm = MergeMemNode::make(base);
-    mm->set_memory_at(Compile::AliasIdxRaw, raw_mem);
-    phase->register_new_node(mm, ctrl);
-
-    Node* call = new CallLeafNode(ShenandoahBarrierSetC2::write_ref_field_pre_entry_Type(), CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_field_pre_entry), "shenandoah_wb_pre", TypeRawPtr::BOTTOM);
-    call->init_req(TypeFunc::Control, ctrl);
-    call->init_req(TypeFunc::I_O, phase->C->top());
-    call->init_req(TypeFunc::Memory, mm);
-    call->init_req(TypeFunc::FramePtr, phase->C->top());
-    call->init_req(TypeFunc::ReturnAdr, phase->C->top());
-    call->init_req(TypeFunc::Parms, pre_val);
-    call->init_req(TypeFunc::Parms+1, thread);
-    phase->register_control(call, loop, ctrl);
-
-    Node* ctrl_proj = new ProjNode(call, TypeFunc::Control);
-    phase->register_control(ctrl_proj, loop, call);
-    Node* mem_proj = new ProjNode(call, TypeFunc::Memory);
-    phase->register_new_node(mem_proj, call);
-
-    // Slow-path case
-    region2->init_req(_slow_path, ctrl_proj);
-    phi2->init_req(_slow_path, mem_proj);
-
-    phase->register_control(region2, loop, reg2_ctrl);
-    phase->register_new_node(phi2, region2);
-
-    region->init_req(_heap_unstable, region2);
-    phi->init_req(_heap_unstable, phi2);
-
-    phase->register_control(region, loop, heap_stable_ctrl->in(0));
-    phase->register_new_node(phi, region);
-
-    fix_ctrl(barrier, region, fixer, uses, uses_to_ignore, last, phase);
-    for(uint next = 0; next < uses.size(); next++ ) {
-      Node *n = uses.at(next);
-      assert(phase->get_ctrl(n) == init_ctrl, "bad control");
-      assert(n != init_raw_mem, "should leave input raw mem above the barrier");
-      phase->set_ctrl(n, region);
-      follow_barrier_uses(n, init_ctrl, uses, phase);
-    }
-    fixer.fix_mem(init_ctrl, region, init_raw_mem, raw_mem_for_ctrl, phi, uses);
-
-    phase->igvn().replace_node(barrier, pre_val);
-  }
-  assert(state->iu_barriers_count() == 0, "all enqueue barrier nodes should have been replaced");
-
 }
 
 Node* ShenandoahBarrierC2Support::get_load_addr(PhaseIdealLoop* phase, VectorSet& visited, Node* in) {
@@ -1662,8 +1478,6 @@ Node* ShenandoahBarrierC2Support::get_load_addr(PhaseIdealLoop* phase, VectorSet
     }
     case Op_ShenandoahLoadReferenceBarrier:
       return get_load_addr(phase, visited, in->in(ShenandoahLoadReferenceBarrierNode::ValueIn));
-    case Op_ShenandoahIUBarrier:
-      return get_load_addr(phase, visited, in->in(1));
     case Op_CallDynamicJava:
     case Op_CallLeaf:
     case Op_CallStaticJava:
@@ -1911,126 +1725,6 @@ void ShenandoahBarrierC2Support::optimize_after_expansion(VectorSet &visited, No
   }
 }
 
-ShenandoahIUBarrierNode::ShenandoahIUBarrierNode(Node* val) : Node(nullptr, val) {
-  ShenandoahBarrierSetC2::bsc2()->state()->add_iu_barrier(this);
-}
-
-const Type* ShenandoahIUBarrierNode::bottom_type() const {
-  if (in(1) == nullptr || in(1)->is_top()) {
-    return Type::TOP;
-  }
-  const Type* t = in(1)->bottom_type();
-  if (t == TypePtr::NULL_PTR) {
-    return t;
-  }
-  return t->is_oopptr();
-}
-
-const Type* ShenandoahIUBarrierNode::Value(PhaseGVN* phase) const {
-  if (in(1) == nullptr) {
-    return Type::TOP;
-  }
-  const Type* t = phase->type(in(1));
-  if (t == Type::TOP) {
-    return Type::TOP;
-  }
-  if (t == TypePtr::NULL_PTR) {
-    return t;
-  }
-  return t->is_oopptr();
-}
-
-int ShenandoahIUBarrierNode::needed(Node* n) {
-  if (n == nullptr ||
-      n->is_Allocate() ||
-      n->Opcode() == Op_ShenandoahIUBarrier ||
-      n->bottom_type() == TypePtr::NULL_PTR ||
-      (n->bottom_type()->make_oopptr() != nullptr && n->bottom_type()->make_oopptr()->const_oop() != nullptr)) {
-    return NotNeeded;
-  }
-  if (n->is_Phi() ||
-      n->is_CMove()) {
-    return MaybeNeeded;
-  }
-  return Needed;
-}
-
-Node* ShenandoahIUBarrierNode::next(Node* n) {
-  for (;;) {
-    if (n == nullptr) {
-      return n;
-    } else if (n->bottom_type() == TypePtr::NULL_PTR) {
-      return n;
-    } else if (n->bottom_type()->make_oopptr() != nullptr && n->bottom_type()->make_oopptr()->const_oop() != nullptr) {
-      return n;
-    } else if (n->is_ConstraintCast() ||
-               n->Opcode() == Op_DecodeN ||
-               n->Opcode() == Op_EncodeP) {
-      n = n->in(1);
-    } else if (n->is_Proj()) {
-      n = n->in(0);
-    } else {
-      return n;
-    }
-  }
-  ShouldNotReachHere();
-  return nullptr;
-}
-
-Node* ShenandoahIUBarrierNode::Identity(PhaseGVN* phase) {
-  PhaseIterGVN* igvn = phase->is_IterGVN();
-
-  Node* n = next(in(1));
-
-  int cont = needed(n);
-
-  if (cont == NotNeeded) {
-    return in(1);
-  } else if (cont == MaybeNeeded) {
-    if (igvn == nullptr) {
-      phase->record_for_igvn(this);
-      return this;
-    } else {
-      ResourceMark rm;
-      Unique_Node_List wq;
-      uint wq_i = 0;
-
-      for (;;) {
-        if (n->is_Phi()) {
-          for (uint i = 1; i < n->req(); i++) {
-            Node* m = n->in(i);
-            if (m != nullptr) {
-              wq.push(m);
-            }
-          }
-        } else {
-          assert(n->is_CMove(), "nothing else here");
-          Node* m = n->in(CMoveNode::IfFalse);
-          wq.push(m);
-          m = n->in(CMoveNode::IfTrue);
-          wq.push(m);
-        }
-        Node* orig_n = nullptr;
-        do {
-          if (wq_i >= wq.size()) {
-            return in(1);
-          }
-          n = wq.at(wq_i);
-          wq_i++;
-          orig_n = n;
-          n = next(n);
-          cont = needed(n);
-          if (cont == Needed) {
-            return this;
-          }
-        } while (cont != MaybeNeeded || (orig_n != n && wq.member(n)));
-      }
-    }
-  }
-
-  return this;
-}
-
 #ifdef ASSERT
 static bool has_never_branch(Node* root) {
   for (uint i = 1; i < root->req(); i++) {
@@ -3014,8 +2708,6 @@ bool ShenandoahLoadReferenceBarrierNode::needs_barrier_impl(PhaseGVN* phase, Nod
     case Op_CMoveP:
       return needs_barrier_impl(phase, n->in(2), visited) ||
              needs_barrier_impl(phase, n->in(3), visited);
-    case Op_ShenandoahIUBarrier:
-      return needs_barrier_impl(phase, n->in(1), visited);
     case Op_CreateEx:
       return false;
     default:
diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.hpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.hpp
index 7a6ed74f56393..164502e6358f9 100644
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.hpp
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.hpp
@@ -87,23 +87,6 @@ class ShenandoahBarrierC2Support : public AllStatic {
 #endif
 };
 
-class ShenandoahIUBarrierNode : public Node {
-public:
-  ShenandoahIUBarrierNode(Node* val);
-
-  const Type *bottom_type() const;
-  const Type* Value(PhaseGVN* phase) const;
-  Node* Identity(PhaseGVN* phase);
-
-  int Opcode() const;
-
-private:
-  enum { Needed, NotNeeded, MaybeNeeded };
-
-  static int needed(Node* n);
-  static Node* next(Node* n);
-};
-
 class MemoryGraphFixer : public ResourceObj {
 private:
   Node_List _memory_nodes;
diff --git a/src/hotspot/share/gc/shenandoah/mode/shenandoahIUMode.cpp b/src/hotspot/share/gc/shenandoah/mode/shenandoahIUMode.cpp
deleted file mode 100644
index 7a1cf1bbbdf9a..0000000000000
--- a/src/hotspot/share/gc/shenandoah/mode/shenandoahIUMode.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2020, 2022, 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.
- *
- */
-
-#include "precompiled.hpp"
-#include "gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp"
-#include "gc/shenandoah/heuristics/shenandoahAggressiveHeuristics.hpp"
-#include "gc/shenandoah/heuristics/shenandoahCompactHeuristics.hpp"
-#include "gc/shenandoah/heuristics/shenandoahStaticHeuristics.hpp"
-#include "gc/shenandoah/mode/shenandoahIUMode.hpp"
-#include "gc/shenandoah/shenandoahHeap.inline.hpp"
-#include "logging/log.hpp"
-#include "logging/logTag.hpp"
-#include "runtime/globals_extension.hpp"
-#include "runtime/java.hpp"
-
-void ShenandoahIUMode::initialize_flags() const {
-  if (FLAG_IS_CMDLINE(ClassUnloadingWithConcurrentMark) && ClassUnloading) {
-    log_warning(gc)("Shenandoah I-U mode sets -XX:-ClassUnloadingWithConcurrentMark; see JDK-8261341 for details");
-  }
-  FLAG_SET_DEFAULT(ClassUnloadingWithConcurrentMark, false);
-
-  if (ClassUnloading) {
-    FLAG_SET_DEFAULT(VerifyBeforeExit, false);
-  }
-
-  if (FLAG_IS_DEFAULT(ShenandoahIUBarrier)) {
-    FLAG_SET_DEFAULT(ShenandoahIUBarrier, true);
-  }
-  if (FLAG_IS_DEFAULT(ShenandoahSATBBarrier)) {
-    FLAG_SET_DEFAULT(ShenandoahSATBBarrier, false);
-  }
-
-  SHENANDOAH_ERGO_ENABLE_FLAG(ExplicitGCInvokesConcurrent);
-  SHENANDOAH_ERGO_ENABLE_FLAG(ShenandoahImplicitGCInvokesConcurrent);
-
-  // Final configuration checks
-  SHENANDOAH_CHECK_FLAG_SET(ShenandoahLoadRefBarrier);
-  SHENANDOAH_CHECK_FLAG_UNSET(ShenandoahSATBBarrier);
-  SHENANDOAH_CHECK_FLAG_SET(ShenandoahIUBarrier);
-  SHENANDOAH_CHECK_FLAG_SET(ShenandoahCASBarrier);
-  SHENANDOAH_CHECK_FLAG_SET(ShenandoahCloneBarrier);
-  SHENANDOAH_CHECK_FLAG_SET(ShenandoahStackWatermarkBarrier);
-}
-
-ShenandoahHeuristics* ShenandoahIUMode::initialize_heuristics() const {
-  if (ShenandoahGCHeuristics == nullptr) {
-    vm_exit_during_initialization("Unknown -XX:ShenandoahGCHeuristics option (null)");
-  }
-  ShenandoahHeap* heap = ShenandoahHeap::heap();
-  if (strcmp(ShenandoahGCHeuristics, "aggressive") == 0) {
-    return new ShenandoahAggressiveHeuristics(heap);
-  } else if (strcmp(ShenandoahGCHeuristics, "static") == 0) {
-    return new ShenandoahStaticHeuristics(heap);
-  } else if (strcmp(ShenandoahGCHeuristics, "adaptive") == 0) {
-    return new ShenandoahAdaptiveHeuristics(heap);
-  } else if (strcmp(ShenandoahGCHeuristics, "compact") == 0) {
-    return new ShenandoahCompactHeuristics(heap);
-  }
-  vm_exit_during_initialization("Unknown -XX:ShenandoahGCHeuristics option");
-  return nullptr;
-}
diff --git a/src/hotspot/share/gc/shenandoah/mode/shenandoahIUMode.hpp b/src/hotspot/share/gc/shenandoah/mode/shenandoahIUMode.hpp
deleted file mode 100644
index c20c483c77daf..0000000000000
--- a/src/hotspot/share/gc/shenandoah/mode/shenandoahIUMode.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2020, 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.
- *
- */
-
-#ifndef SHARE_GC_SHENANDOAH_MODE_SHENANDOAHIUMODE_HPP
-#define SHARE_GC_SHENANDOAH_MODE_SHENANDOAHIUMODE_HPP
-
-#include "gc/shenandoah/mode/shenandoahMode.hpp"
-
-class ShenandoahHeuristics;
-
-class ShenandoahIUMode : public ShenandoahMode {
-public:
-  virtual void initialize_flags() const;
-  virtual ShenandoahHeuristics* initialize_heuristics() const;
-
-  virtual const char* name()     { return "Incremental-Update (IU)"; }
-  virtual bool is_diagnostic()   { return false; }
-  virtual bool is_experimental() { return true; }
-};
-
-#endif // SHARE_GC_SHENANDOAH_MODE_SHENANDOAHIUMODE_HPP
diff --git a/src/hotspot/share/gc/shenandoah/mode/shenandoahPassiveMode.cpp b/src/hotspot/share/gc/shenandoah/mode/shenandoahPassiveMode.cpp
index 39eb475a75def..9b83df5424dae 100644
--- a/src/hotspot/share/gc/shenandoah/mode/shenandoahPassiveMode.cpp
+++ b/src/hotspot/share/gc/shenandoah/mode/shenandoahPassiveMode.cpp
@@ -47,7 +47,6 @@ void ShenandoahPassiveMode::initialize_flags() const {
   // Disable known barriers by default.
   SHENANDOAH_ERGO_DISABLE_FLAG(ShenandoahLoadRefBarrier);
   SHENANDOAH_ERGO_DISABLE_FLAG(ShenandoahSATBBarrier);
-  SHENANDOAH_ERGO_DISABLE_FLAG(ShenandoahIUBarrier);
   SHENANDOAH_ERGO_DISABLE_FLAG(ShenandoahCASBarrier);
   SHENANDOAH_ERGO_DISABLE_FLAG(ShenandoahCloneBarrier);
   SHENANDOAH_ERGO_DISABLE_FLAG(ShenandoahStackWatermarkBarrier);
diff --git a/src/hotspot/share/gc/shenandoah/mode/shenandoahSATBMode.cpp b/src/hotspot/share/gc/shenandoah/mode/shenandoahSATBMode.cpp
index 2a4560126568c..c3ea11cf71e2a 100644
--- a/src/hotspot/share/gc/shenandoah/mode/shenandoahSATBMode.cpp
+++ b/src/hotspot/share/gc/shenandoah/mode/shenandoahSATBMode.cpp
@@ -44,7 +44,6 @@ void ShenandoahSATBMode::initialize_flags() const {
 
   // Final configuration checks
   SHENANDOAH_CHECK_FLAG_SET(ShenandoahLoadRefBarrier);
-  SHENANDOAH_CHECK_FLAG_UNSET(ShenandoahIUBarrier);
   SHENANDOAH_CHECK_FLAG_SET(ShenandoahSATBBarrier);
   SHENANDOAH_CHECK_FLAG_SET(ShenandoahCASBarrier);
   SHENANDOAH_CHECK_FLAG_SET(ShenandoahCloneBarrier);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp b/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp
index d9b28c1bb4d3c..bcc370eeb314d 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp
@@ -48,7 +48,6 @@ void ShenandoahArguments::initialize() {
 
   FLAG_SET_DEFAULT(ShenandoahSATBBarrier,            false);
   FLAG_SET_DEFAULT(ShenandoahLoadRefBarrier,         false);
-  FLAG_SET_DEFAULT(ShenandoahIUBarrier,              false);
   FLAG_SET_DEFAULT(ShenandoahCASBarrier,             false);
   FLAG_SET_DEFAULT(ShenandoahCloneBarrier,           false);
 
@@ -142,7 +141,6 @@ void ShenandoahArguments::initialize() {
   if (ShenandoahVerifyOptoBarriers &&
           (!FLAG_IS_DEFAULT(ShenandoahSATBBarrier)            ||
            !FLAG_IS_DEFAULT(ShenandoahLoadRefBarrier)         ||
-           !FLAG_IS_DEFAULT(ShenandoahIUBarrier)              ||
            !FLAG_IS_DEFAULT(ShenandoahCASBarrier)             ||
            !FLAG_IS_DEFAULT(ShenandoahCloneBarrier)
           )) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
index d2857daccf6f3..40b6d70ce454f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
@@ -138,7 +138,7 @@ void ShenandoahBarrierSet::on_thread_detach(Thread *thread) {
 }
 
 void ShenandoahBarrierSet::clone_barrier_runtime(oop src) {
-  if (_heap->has_forwarded_objects() || (ShenandoahIUBarrier && _heap->is_concurrent_mark_in_progress())) {
+  if (_heap->has_forwarded_objects()) {
     clone_barrier(src);
   }
 }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp
index beb6ae492b807..e116e0225db18 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp
@@ -89,7 +89,6 @@ class ShenandoahBarrierSet: public BarrierSet {
   template <DecoratorSet decorators, typename T>
   inline void satb_barrier(T* field);
   inline void satb_enqueue(oop value);
-  inline void iu_barrier(oop obj);
 
   inline void keep_alive_if_weak(DecoratorSet decorators, oop value);
 
@@ -120,7 +119,6 @@ class ShenandoahBarrierSet: public BarrierSet {
   template <class T>
   inline void arraycopy_update(T* src, size_t count);
 
-  inline void clone_marking(oop src);
   inline void clone_evacuation(oop src);
   inline void clone_update(oop src);
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
index bfb69c38c332c..80735f453c63d 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
@@ -164,12 +164,6 @@ inline void ShenandoahBarrierSet::satb_enqueue(oop value) {
   }
 }
 
-inline void ShenandoahBarrierSet::iu_barrier(oop obj) {
-  if (ShenandoahIUBarrier && obj != nullptr && _heap->is_concurrent_mark_in_progress()) {
-    enqueue(obj);
-  }
-}
-
 inline void ShenandoahBarrierSet::keep_alive_if_weak(DecoratorSet decorators, oop value) {
   assert((decorators & ON_UNKNOWN_OOP_REF) == 0, "Reference strength must be known");
   const bool on_strong_oop_ref = (decorators & ON_STRONG_OOP_REF) != 0;
@@ -189,7 +183,6 @@ inline oop ShenandoahBarrierSet::oop_load(DecoratorSet decorators, T* addr) {
 
 template <typename T>
 inline oop ShenandoahBarrierSet::oop_cmpxchg(DecoratorSet decorators, T* addr, oop compare_value, oop new_value) {
-  iu_barrier(new_value);
   oop res;
   oop expected = compare_value;
   do {
@@ -207,7 +200,6 @@ inline oop ShenandoahBarrierSet::oop_cmpxchg(DecoratorSet decorators, T* addr, o
 
 template <typename T>
 inline oop ShenandoahBarrierSet::oop_xchg(DecoratorSet decorators, T* addr, oop new_value) {
-  iu_barrier(new_value);
   oop previous = RawAccess<>::oop_atomic_xchg(addr, new_value);
   // Note: We don't need a keep-alive-barrier here. We already enqueue any loaded reference for SATB anyway,
   // because it must be the previous value.
@@ -245,7 +237,6 @@ inline void ShenandoahBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_st
   shenandoah_assert_marked_if(nullptr, value, !CompressedOops::is_null(value) && ShenandoahHeap::heap()->is_evacuation_in_progress());
   shenandoah_assert_not_in_cset_if(addr, value, value != nullptr && !ShenandoahHeap::heap()->cancelled_gc());
   ShenandoahBarrierSet* const bs = ShenandoahBarrierSet::barrier_set();
-  bs->iu_barrier(value);
   bs->satb_barrier<decorators>(addr);
   Raw::oop_store(addr, value);
 }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSetClone.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSetClone.inline.hpp
index 13371f5e194d9..3b7bf9864deb0 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSetClone.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSetClone.inline.hpp
@@ -74,15 +74,6 @@ class ShenandoahUpdateRefsForOopClosure: public BasicOopIterateClosure {
   virtual void do_oop(narrowOop* p) { do_oop_work(p); }
 };
 
-void ShenandoahBarrierSet::clone_marking(oop obj) {
-  assert(_heap->is_concurrent_mark_in_progress(), "only during marking");
-  assert(ShenandoahIUBarrier, "only with incremental-update");
-  if (!_heap->marking_context()->allocated_after_mark_start(obj)) {
-    ShenandoahUpdateRefsForOopClosure</* has_fwd = */ false, /* evac = */ false, /* enqueue */ true> cl;
-    obj->oop_iterate(&cl);
-  }
-}
-
 void ShenandoahBarrierSet::clone_evacuation(oop obj) {
   assert(_heap->is_evacuation_in_progress(), "only during evacuation");
   if (need_bulk_update(cast_from_oop<HeapWord*>(obj))) {
@@ -105,9 +96,7 @@ void ShenandoahBarrierSet::clone_barrier(oop obj) {
   shenandoah_assert_correct(nullptr, obj);
 
   int gc_state = _heap->gc_state();
-  if ((gc_state & ShenandoahHeap::MARKING) != 0) {
-    clone_marking(obj);
-  } else if ((gc_state & ShenandoahHeap::EVACUATION) != 0) {
+  if ((gc_state & ShenandoahHeap::EVACUATION) != 0) {
     clone_evacuation(obj);
   } else {
     clone_update(obj);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
index fa37fcbcfd300..31157616e0ef8 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
@@ -71,22 +71,14 @@ class ShenandoahConcurrentMarkingTask : public WorkerTask {
 class ShenandoahSATBAndRemarkThreadsClosure : public ThreadClosure {
 private:
   SATBMarkQueueSet& _satb_qset;
-  OopClosure* const _cl;
 
 public:
-  ShenandoahSATBAndRemarkThreadsClosure(SATBMarkQueueSet& satb_qset, OopClosure* cl) :
-    _satb_qset(satb_qset),
-    _cl(cl)  {}
+  explicit ShenandoahSATBAndRemarkThreadsClosure(SATBMarkQueueSet& satb_qset) :
+    _satb_qset(satb_qset) {}
 
-  void do_thread(Thread* thread) {
+  void do_thread(Thread* thread) override {
     // Transfer any partial buffer to the qset for completed buffer processing.
     _satb_qset.flush_queue(ShenandoahThreadLocalData::satb_mark_queue(thread));
-    if (thread->is_Java_thread()) {
-      if (_cl != nullptr) {
-        ResourceMark rm;
-        thread->oops_do(_cl, nullptr);
-      }
-    }
   }
 };
 
@@ -118,9 +110,7 @@ class ShenandoahFinalMarkingTask : public WorkerTask {
       while (satb_mq_set.apply_closure_to_completed_buffer(&cl)) {}
       assert(!heap->has_forwarded_objects(), "Not expected");
 
-      ShenandoahMarkRefsClosure<GENERATION> mark_cl(q, rp);
-      ShenandoahSATBAndRemarkThreadsClosure tc(satb_mq_set,
-                                               ShenandoahIUBarrier ? &mark_cl : nullptr);
+      ShenandoahSATBAndRemarkThreadsClosure tc(satb_mq_set);
       Threads::possibly_parallel_threads_do(true /* is_par */, &tc);
     }
     _cm->mark_loop(worker_id, _terminator, rp, GENERATION, false /*not cancellable*/,
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index 6c8d1d32941f9..eb6de9719dc62 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -66,7 +66,6 @@
 #include "gc/shenandoah/shenandoahVMOperations.hpp"
 #include "gc/shenandoah/shenandoahWorkGroup.hpp"
 #include "gc/shenandoah/shenandoahWorkerPolicy.hpp"
-#include "gc/shenandoah/mode/shenandoahIUMode.hpp"
 #include "gc/shenandoah/mode/shenandoahPassiveMode.hpp"
 #include "gc/shenandoah/mode/shenandoahSATBMode.hpp"
 #if INCLUDE_JFR
@@ -446,8 +445,6 @@ void ShenandoahHeap::initialize_mode() {
   if (ShenandoahGCMode != nullptr) {
     if (strcmp(ShenandoahGCMode, "satb") == 0) {
       _gc_mode = new ShenandoahSATBMode();
-    } else if (strcmp(ShenandoahGCMode, "iu") == 0) {
-      _gc_mode = new ShenandoahIUMode();
     } else if (strcmp(ShenandoahGCMode, "passive") == 0) {
       _gc_mode = new ShenandoahPassiveMode();
     } else {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp b/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
index 0ee77edaf3f32..87702afe98e14 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
@@ -334,9 +334,6 @@
   product(bool, ShenandoahSATBBarrier, true, DIAGNOSTIC,                    \
           "Turn on/off SATB barriers in Shenandoah")                        \
                                                                             \
-  product(bool, ShenandoahIUBarrier, false, DIAGNOSTIC,                     \
-          "Turn on/off I-U barriers barriers in Shenandoah")                \
-                                                                            \
   product(bool, ShenandoahCASBarrier, true, DIAGNOSTIC,                     \
           "Turn on/off CAS barriers in Shenandoah")                         \
                                                                             \
diff --git a/src/hotspot/share/opto/classes.hpp b/src/hotspot/share/opto/classes.hpp
index 7908f21de10ba..dc61377687302 100644
--- a/src/hotspot/share/opto/classes.hpp
+++ b/src/hotspot/share/opto/classes.hpp
@@ -324,7 +324,6 @@ shmacro(ShenandoahCompareAndSwapN)
 shmacro(ShenandoahCompareAndSwapP)
 shmacro(ShenandoahWeakCompareAndSwapN)
 shmacro(ShenandoahWeakCompareAndSwapP)
-shmacro(ShenandoahIUBarrier)
 shmacro(ShenandoahLoadReferenceBarrier)
 macro(SCMemProj)
 macro(CopySignD)
diff --git a/test/hotspot/jtreg/compiler/c2/aarch64/TestVolatiles.java b/test/hotspot/jtreg/compiler/c2/aarch64/TestVolatiles.java
index 10bc237f2be0f..23b9321fc35c1 100644
--- a/test/hotspot/jtreg/compiler/c2/aarch64/TestVolatiles.java
+++ b/test/hotspot/jtreg/compiler/c2/aarch64/TestVolatiles.java
@@ -39,8 +39,7 @@
  * and <testtype> in {G1,
  *                    Serial,
  *                    Parallel,
- *                    Shenandoah,
- *                    ShenandoahIU}
+ *                    Shenandoah}
  */
 
 
@@ -95,13 +94,6 @@ public void runtest(String classname, String testType) throws Throwable {
             procArgs[argcount - 3] = "-XX:+UnlockExperimentalVMOptions";
             procArgs[argcount - 2] = "-XX:+UseShenandoahGC";
             break;
-        case "ShenandoahIU":
-            argcount = 11;
-            procArgs = new String[argcount];
-            procArgs[argcount - 4] = "-XX:+UnlockExperimentalVMOptions";
-            procArgs[argcount - 3] = "-XX:+UseShenandoahGC";
-            procArgs[argcount - 2] = "-XX:ShenandoahGCMode=iu";
-            break;
         default:
             throw new RuntimeException("unexpected test type " + testType);
         }
@@ -286,7 +278,6 @@ private void checkstore(OutputAnalyzer output, String testType, boolean useCompr
             };
             break;
         case "Shenandoah":
-        case "ShenandoahIU":
              // Shenandoah generates normal object graphs for
              // volatile stores
             matches = new String[] {
@@ -358,7 +349,6 @@ private void checkcas(OutputAnalyzer output, String testType, boolean useCompres
             };
             break;
         case "Shenandoah":
-        case "ShenandoahIU":
             // For volatile CAS, Shenanodoah generates normal
             // graphs with a shenandoah-specific cmpxchg
             matches = new String[] {
@@ -445,7 +435,6 @@ private void checkcae(OutputAnalyzer output, String testType, boolean useCompres
             };
             break;
         case "Shenandoah":
-        case "ShenandoahIU":
             // For volatile CAS, Shenanodoah generates normal
             // graphs with a shenandoah-specific cmpxchg
             matches = new String[] {
@@ -512,7 +501,6 @@ private void checkgas(OutputAnalyzer output, String testType, boolean useCompres
             };
             break;
         case "Shenandoah":
-        case "ShenandoahIU":
             matches = new String[] {
                 "membar_release \\(elided\\)",
                 useCompressedOops ? "atomic_xchgw?_acq" : "atomic_xchg_acq",
diff --git a/test/hotspot/jtreg/compiler/c2/aarch64/TestVolatilesShenandoah.java b/test/hotspot/jtreg/compiler/c2/aarch64/TestVolatilesShenandoah.java
index 9678c37a384d6..60c9cc3713e68 100644
--- a/test/hotspot/jtreg/compiler/c2/aarch64/TestVolatilesShenandoah.java
+++ b/test/hotspot/jtreg/compiler/c2/aarch64/TestVolatilesShenandoah.java
@@ -71,33 +71,6 @@
  * @run driver compiler.c2.aarch64.TestVolatilesShenandoah
  *      TestUnsafeVolatileGAA Shenandoah
  *
- * @run driver compiler.c2.aarch64.TestVolatilesShenandoah
- *      TestVolatileLoad ShenandoahIU
- *
- * @run driver compiler.c2.aarch64.TestVolatilesShenandoah
- *      TestVolatileStore ShenandoahIU
- *
- * @run driver compiler.c2.aarch64.TestVolatilesShenandoah
- *      TestUnsafeVolatileLoad ShenandoahIU
- *
- * @run driver compiler.c2.aarch64.TestVolatilesShenandoah
- *      TestUnsafeVolatileStore ShenandoahIU
- *
- * @run driver compiler.c2.aarch64.TestVolatilesShenandoah
- *      TestUnsafeVolatileCAS ShenandoahIU
- *
- * @run driver compiler.c2.aarch64.TestVolatilesShenandoah
- *      TestUnsafeVolatileWeakCAS ShenandoahIU
- *
- * @run driver compiler.c2.aarch64.TestVolatilesShenandoah
- *      TestUnsafeVolatileCAE ShenandoahIU
- *
- * @run driver compiler.c2.aarch64.TestVolatilesShenandoah
- *      TestUnsafeVolatileGAS ShenandoahIU
- *
- * @run driver compiler.c2.aarch64.TestVolatilesShenandoah
- *      TestUnsafeVolatileGAA ShenandoahIU
- *
  */
 
 package compiler.c2.aarch64;
diff --git a/test/hotspot/jtreg/gc/TestAllocHumongousFragment.java b/test/hotspot/jtreg/gc/TestAllocHumongousFragment.java
index 88b838b4bde43..6498a39491101 100644
--- a/test/hotspot/jtreg/gc/TestAllocHumongousFragment.java
+++ b/test/hotspot/jtreg/gc/TestAllocHumongousFragment.java
@@ -120,51 +120,6 @@
  *      TestAllocHumongousFragment
  */
 
-/*
- * @test id=iu-aggressive
- * @summary Make sure Shenandoah can recover from humongous allocation fragmentation
- * @key randomness
- * @requires vm.gc.Shenandoah
- * @library /test/lib
- *
- * @run main/othervm -Xlog:gc -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g -XX:ShenandoahTargetNumRegions=2048
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahOOMDuringEvacALot -XX:+ShenandoahVerify
- *      TestAllocHumongousFragment
- *
- * @run main/othervm -Xlog:gc -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g -XX:ShenandoahTargetNumRegions=2048
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahAllocFailureALot -XX:+ShenandoahVerify
- *      TestAllocHumongousFragment
- *
- * @run main/othervm -Xlog:gc -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g -XX:ShenandoahTargetNumRegions=2048
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahOOMDuringEvacALot
- *      TestAllocHumongousFragment
- *
- * @run main/othervm -Xlog:gc -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g -XX:ShenandoahTargetNumRegions=2048
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahAllocFailureALot
- *      TestAllocHumongousFragment
- */
-
-/*
- * @test id=iu
- * @summary Make sure Shenandoah can recover from humongous allocation fragmentation
- * @key randomness
- * @requires vm.gc.Shenandoah
- * @library /test/lib
- *
- * @run main/othervm -Xlog:gc -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g -XX:ShenandoahTargetNumRegions=2048
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      -XX:+ShenandoahVerify
- *      TestAllocHumongousFragment
- *
- * @run main/othervm -Xlog:gc -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g -XX:ShenandoahTargetNumRegions=2048
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      TestAllocHumongousFragment
- */
-
  /*
  * @test id=g1
  * @summary Make sure G1 can recover from humongous allocation fragmentation
diff --git a/test/hotspot/jtreg/gc/shenandoah/TestAllocIntArrays.java b/test/hotspot/jtreg/gc/shenandoah/TestAllocIntArrays.java
index 35b0cdfa49ee2..b10e90b4055a9 100644
--- a/test/hotspot/jtreg/gc/shenandoah/TestAllocIntArrays.java
+++ b/test/hotspot/jtreg/gc/shenandoah/TestAllocIntArrays.java
@@ -135,56 +135,6 @@
  *      -XX:-UseTLAB -XX:+ShenandoahVerify
  *      TestAllocIntArrays
  */
-
-/*
- * @test id=iu-aggressive
- * @summary Acceptance tests: collector can withstand allocation
- * @key randomness
- * @requires vm.gc.Shenandoah
- * @library /test/lib
- *
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahOOMDuringEvacALot -XX:+ShenandoahVerify
- *      TestAllocIntArrays
- *
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahAllocFailureALot -XX:+ShenandoahVerify
- *      TestAllocIntArrays
- *
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahOOMDuringEvacALot
- *      TestAllocIntArrays
- *
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahAllocFailureALot
- *      TestAllocIntArrays
- *
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      TestAllocIntArrays
- */
-
-/*
- * @test id=iu
- * @summary Acceptance tests: collector can withstand allocation
- * @key randomness
- * @requires vm.gc.Shenandoah
- * @library /test/lib
- *
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      -XX:+ShenandoahVerify
- *      TestAllocIntArrays
- *
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      TestAllocIntArrays
- */
-
 import java.util.Random;
 import jdk.test.lib.Utils;
 
diff --git a/test/hotspot/jtreg/gc/shenandoah/TestAllocObjectArrays.java b/test/hotspot/jtreg/gc/shenandoah/TestAllocObjectArrays.java
index 8eebba4a30894..fa9bb7f017729 100644
--- a/test/hotspot/jtreg/gc/shenandoah/TestAllocObjectArrays.java
+++ b/test/hotspot/jtreg/gc/shenandoah/TestAllocObjectArrays.java
@@ -135,56 +135,6 @@
  *      -XX:-UseTLAB -XX:+ShenandoahVerify
  *      TestAllocObjectArrays
  */
-
-/*
- * @test id=iu-aggressive
- * @summary Acceptance tests: collector can withstand allocation
- * @key randomness
- * @requires vm.gc.Shenandoah
- * @library /test/lib
- *
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahOOMDuringEvacALot -XX:+ShenandoahVerify
- *      TestAllocObjectArrays
- *
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahAllocFailureALot -XX:+ShenandoahVerify
- *      TestAllocObjectArrays
- *
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahOOMDuringEvacALot
- *      TestAllocObjectArrays
- *
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahAllocFailureALot
- *      TestAllocObjectArrays
- *
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      TestAllocObjectArrays
- */
-
-/*
- * @test id=iu
- * @summary Acceptance tests: collector can withstand allocation
- * @key randomness
- * @requires vm.gc.Shenandoah
- * @library /test/lib
- *
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      -XX:+ShenandoahVerify
- *      TestAllocObjectArrays
- *
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      TestAllocObjectArrays
- */
-
 import java.util.Random;
 import jdk.test.lib.Utils;
 
diff --git a/test/hotspot/jtreg/gc/shenandoah/TestAllocObjects.java b/test/hotspot/jtreg/gc/shenandoah/TestAllocObjects.java
index 32178555c9f6b..26dd98ed4035f 100644
--- a/test/hotspot/jtreg/gc/shenandoah/TestAllocObjects.java
+++ b/test/hotspot/jtreg/gc/shenandoah/TestAllocObjects.java
@@ -112,52 +112,6 @@
  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=compact
  *      TestAllocObjects
  */
-
-/*
- * @test id=iu-aggressive
- * @summary Acceptance tests: collector can withstand allocation
- * @requires vm.gc.Shenandoah
- *
- * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahOOMDuringEvacALot -XX:+ShenandoahVerify
- *      TestAllocObjects
- *
- * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahAllocFailureALot -XX:+ShenandoahVerify
- *      TestAllocObjects
- *
- * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahOOMDuringEvacALot
- *      TestAllocObjects
- *
- * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahAllocFailureALot
- *      TestAllocObjects
- *
- * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      TestAllocObjects
- */
-
-/*
- * @test id=iu
- * @summary Acceptance tests: collector can withstand allocation
- * @requires vm.gc.Shenandoah
- *
- * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      -XX:+ShenandoahVerify
- *      TestAllocObjects
- *
- * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      TestAllocObjects
- */
-
 public class TestAllocObjects {
 
     static final long TARGET_MB = Long.getLong("target", 10_000); // 10 Gb allocation
diff --git a/test/hotspot/jtreg/gc/shenandoah/TestDynamicSoftMaxHeapSize.java b/test/hotspot/jtreg/gc/shenandoah/TestDynamicSoftMaxHeapSize.java
index f34fcd8024da5..b47a818694fd4 100644
--- a/test/hotspot/jtreg/gc/shenandoah/TestDynamicSoftMaxHeapSize.java
+++ b/test/hotspot/jtreg/gc/shenandoah/TestDynamicSoftMaxHeapSize.java
@@ -84,28 +84,6 @@
  *     TestDynamicSoftMaxHeapSize
  */
 
-/*
- * @test id=iu-aggressive
- * @requires vm.gc.Shenandoah
- * @library /test/lib
- *
- * @run main/othervm -Xms16m -Xmx512m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -Dtarget=1000
- *      TestDynamicSoftMaxHeapSize
- */
-
-/*
- * @test id=iu
- * @requires vm.gc.Shenandoah
- * @library /test/lib
- *
- * @run main/othervm -Xms16m -Xmx512m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      -Dtarget=10000
- *      TestDynamicSoftMaxHeapSize
- */
-
 import java.util.Random;
 import jdk.test.lib.Utils;
 import jdk.test.lib.process.OutputAnalyzer;
diff --git a/test/hotspot/jtreg/gc/shenandoah/TestGCThreadGroups.java b/test/hotspot/jtreg/gc/shenandoah/TestGCThreadGroups.java
index ff1596d6833d2..1e8aaa32dd6a5 100644
--- a/test/hotspot/jtreg/gc/shenandoah/TestGCThreadGroups.java
+++ b/test/hotspot/jtreg/gc/shenandoah/TestGCThreadGroups.java
@@ -76,24 +76,6 @@
  *      TestGCThreadGroups
  */
 
-/**
- * @test id=iu
- * @summary Test Shenandoah GC uses concurrent/parallel threads correctly
- * @requires vm.gc.Shenandoah
- *
- * @run main/othervm -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      -XX:ConcGCThreads=2 -XX:ParallelGCThreads=4
- *      -Dtarget=1000
- *      TestGCThreadGroups
- *
- * @run main/othervm -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:ConcGCThreads=2 -XX:ParallelGCThreads=4
- *      -Dtarget=1000
- *      TestGCThreadGroups
-*/
-
 public class TestGCThreadGroups {
 
     static final long TARGET_MB = Long.getLong("target", 10_000); // 10 Gb allocation, around 1K cycles to handle
diff --git a/test/hotspot/jtreg/gc/shenandoah/TestHeapUncommit.java b/test/hotspot/jtreg/gc/shenandoah/TestHeapUncommit.java
index 6c54a34dae551..a57d9c7c49a9a 100644
--- a/test/hotspot/jtreg/gc/shenandoah/TestHeapUncommit.java
+++ b/test/hotspot/jtreg/gc/shenandoah/TestHeapUncommit.java
@@ -84,27 +84,6 @@
  *      TestHeapUncommit
  */
 
-/*
- * @test id=iu
- * @summary Acceptance tests: collector can withstand allocation
- * @key randomness
- * @requires vm.gc.Shenandoah
- * @library /test/lib
- *
- * @run main/othervm -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahUncommit -XX:ShenandoahUncommitDelay=0
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      -XX:+ShenandoahVerify
- *      TestHeapUncommit
- *
- * @run main/othervm -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahUncommit -XX:ShenandoahUncommitDelay=0
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      TestHeapUncommit
- *
- * @run main/othervm -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahUncommit -XX:ShenandoahUncommitDelay=0
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      TestHeapUncommit
- */
-
 /*
  * @test id=default-lp
  * @key randomness
diff --git a/test/hotspot/jtreg/gc/shenandoah/TestJcmdHeapDump.java b/test/hotspot/jtreg/gc/shenandoah/TestJcmdHeapDump.java
index 40a36d0a5ef23..6d8b1cb387565 100644
--- a/test/hotspot/jtreg/gc/shenandoah/TestJcmdHeapDump.java
+++ b/test/hotspot/jtreg/gc/shenandoah/TestJcmdHeapDump.java
@@ -94,38 +94,6 @@
  *     TestJcmdHeapDump
  */
 
-/*
- * @test id=iu-aggressive
- * @library /test/lib
- * @modules jdk.attach/com.sun.tools.attach
- * @requires vm.gc.Shenandoah
- *
- * @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahOOMDuringEvacALot
- *      TestJcmdHeapDump
- *
- * @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahAllocFailureALot
- *      TestJcmdHeapDump
- *
- * @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      TestJcmdHeapDump
- */
-
-/*
- * @test id=iu
- * @requires vm.gc.Shenandoah
- * @library /test/lib
- * @modules jdk.attach/com.sun.tools.attach
- *
- * @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      TestJcmdHeapDump
- */
-
 import jdk.test.lib.JDKToolLauncher;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.process.OutputAnalyzer;
diff --git a/test/hotspot/jtreg/gc/shenandoah/TestLotsOfCycles.java b/test/hotspot/jtreg/gc/shenandoah/TestLotsOfCycles.java
index 63d9fa08767d3..9d7738c25cebb 100644
--- a/test/hotspot/jtreg/gc/shenandoah/TestLotsOfCycles.java
+++ b/test/hotspot/jtreg/gc/shenandoah/TestLotsOfCycles.java
@@ -91,38 +91,6 @@
  *     TestLotsOfCycles
  */
 
-/*
- * @test id=iu-aggressive
- * @requires vm.gc.Shenandoah
- *
- * @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahOOMDuringEvacALot
- *      -Dtarget=1000
- *      TestLotsOfCycles
- *
- * @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahAllocFailureALot
- *      -Dtarget=1000
- *      TestLotsOfCycles
- *
- * @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -Dtarget=1000
- *      TestLotsOfCycles
- */
-
-/*
- * @test id=iu
- * @requires vm.gc.Shenandoah
- *
- * @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      -Dtarget=10000
- *      TestLotsOfCycles
- */
-
 public class TestLotsOfCycles {
 
     static final long TARGET_MB = Long.getLong("target", 10_000); // 10 Gb allocation, around 1K cycles to handle
diff --git a/test/hotspot/jtreg/gc/shenandoah/TestObjItrWithHeapDump.java b/test/hotspot/jtreg/gc/shenandoah/TestObjItrWithHeapDump.java
index a0612a60a9f11..b30f7fd9ac46b 100644
--- a/test/hotspot/jtreg/gc/shenandoah/TestObjItrWithHeapDump.java
+++ b/test/hotspot/jtreg/gc/shenandoah/TestObjItrWithHeapDump.java
@@ -56,7 +56,6 @@ public static void main(String[] args) throws Exception {
 
         String[][][] modeHeuristics = new String[][][] {
              {{"satb"},    {"adaptive", "compact", "static", "aggressive"}},
-             {{"iu"},      {"adaptive", "aggressive"}},
              {{"passive"}, {"passive"}}
         };
 
diff --git a/test/hotspot/jtreg/gc/shenandoah/TestPeriodicGC.java b/test/hotspot/jtreg/gc/shenandoah/TestPeriodicGC.java
index 3a5780069eff7..2849b58aa94ad 100644
--- a/test/hotspot/jtreg/gc/shenandoah/TestPeriodicGC.java
+++ b/test/hotspot/jtreg/gc/shenandoah/TestPeriodicGC.java
@@ -97,36 +97,6 @@ public static void main(String[] args) throws Exception {
             );
         }
 
-        testWith("Zero interval with iu mode",
-                 false,
-                 "-Xlog:gc",
-                 "-XX:+UnlockDiagnosticVMOptions",
-                 "-XX:+UnlockExperimentalVMOptions",
-                 "-XX:+UseShenandoahGC",
-                 "-XX:ShenandoahGCMode=iu",
-                 "-XX:ShenandoahGuaranteedGCInterval=0"
-        );
-
-        testWith("Short interval with iu mode",
-                 true,
-                 "-Xlog:gc",
-                 "-XX:+UnlockDiagnosticVMOptions",
-                 "-XX:+UnlockExperimentalVMOptions",
-                 "-XX:+UseShenandoahGC",
-                 "-XX:ShenandoahGCMode=iu",
-                 "-XX:ShenandoahGuaranteedGCInterval=1000"
-        );
-
-        testWith("Long interval with iu mode",
-                 false,
-                 "-Xlog:gc",
-                 "-XX:+UnlockDiagnosticVMOptions",
-                 "-XX:+UnlockExperimentalVMOptions",
-                 "-XX:+UseShenandoahGC",
-                 "-XX:ShenandoahGCMode=iu",
-                 "-XX:ShenandoahGuaranteedGCInterval=100000" // deliberately too long
-        );
-
         testWith("Short interval with aggressive",
                  false,
                  "-Xlog:gc",
diff --git a/test/hotspot/jtreg/gc/shenandoah/TestReferenceRefersToShenandoah.java b/test/hotspot/jtreg/gc/shenandoah/TestReferenceRefersToShenandoah.java
index 8bad2fdbfa4e4..3763a7eea8768 100644
--- a/test/hotspot/jtreg/gc/shenandoah/TestReferenceRefersToShenandoah.java
+++ b/test/hotspot/jtreg/gc/shenandoah/TestReferenceRefersToShenandoah.java
@@ -35,18 +35,6 @@
  *      gc.shenandoah.TestReferenceRefersToShenandoah
  */
 
-/* @test id=iu
- * @requires vm.gc.Shenandoah
- * @library /test/lib
- * @build jdk.test.whitebox.WhiteBox
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm
- *      -Xbootclasspath/a:.
- *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- *      -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      gc.shenandoah.TestReferenceRefersToShenandoah
- */
-
 /* @test id=satb-100
  * @requires vm.gc.Shenandoah
  * @library /test/lib
@@ -60,19 +48,6 @@
  *      gc.shenandoah.TestReferenceRefersToShenandoah
  */
 
-/* @test id=iu-100
- * @requires vm.gc.Shenandoah
- * @library /test/lib
- * @build jdk.test.whitebox.WhiteBox
- * @modules java.base
- * @run main jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm
- *      -Xbootclasspath/a:.
- *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- *      -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGarbageThreshold=100 -Xmx100m
- *      gc.shenandoah.TestReferenceRefersToShenandoah
- */
-
 import java.lang.ref.PhantomReference;
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
@@ -200,10 +175,6 @@ private static void discardStrongReferences() {
         testObject4 = null;
     }
 
-    private static boolean isShenandoahIUMode() {
-        return "iu".equals(WB.getStringVMFlag("ShenandoahGCMode"));
-    }
-
     private static void testConcurrentCollection() throws Exception {
         progress("setup concurrent collection test");
         setup();
@@ -239,14 +210,7 @@ private static void testConcurrentCollection() throws Exception {
             expectCleared(testPhantom1, "testPhantom1");
             expectCleared(testWeak2, "testWeak2");
             expectValue(testWeak3, testObject3, "testWeak3");
-            // This is true for all currently supported concurrent collectors,
-            // except Shenandoah+IU, which allows clearing refs even when
-            // accessed during concurrent marking.
-            if (isShenandoahIUMode()) {
-              expectCleared(testWeak4, "testWeak4");
-            } else {
-              expectNotCleared(testWeak4, "testWeak4");
-            }
+            expectNotCleared(testWeak4, "testWeak4");
 
             progress("verify get returns expected values");
             if (testWeak2.get() != null) {
@@ -261,12 +225,10 @@ private static void testConcurrentCollection() throws Exception {
             }
 
             TestObject obj4 = testWeak4.get();
-            if (!isShenandoahIUMode()) {
-                if (obj4 == null) {
-                    fail("testWeak4.get() returned null");
-                } else if (obj4.value != 4) {
-                    fail("testWeak4.get().value is " + obj4.value);
-                }
+            if (obj4 == null) {
+                fail("testWeak4.get() returned null");
+            } else if (obj4.value != 4) {
+                fail("testWeak4.get().value is " + obj4.value);
             }
 
             progress("verify queue entries");
diff --git a/test/hotspot/jtreg/gc/shenandoah/TestReferenceShortcutCycle.java b/test/hotspot/jtreg/gc/shenandoah/TestReferenceShortcutCycle.java
index 1c2c2ed5ca7a9..b7ae0c1c31adb 100644
--- a/test/hotspot/jtreg/gc/shenandoah/TestReferenceShortcutCycle.java
+++ b/test/hotspot/jtreg/gc/shenandoah/TestReferenceShortcutCycle.java
@@ -36,19 +36,6 @@
  *      gc.shenandoah.TestReferenceShortcutCycle
  */
 
-/* @test id=iu-100
- * @requires vm.gc.Shenandoah
- * @library /test/lib
- * @build jdk.test.whitebox.WhiteBox
- * @modules java.base
- * @run main jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm
- *      -Xbootclasspath/a:.
- *      -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- *      -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGarbageThreshold=100 -Xmx100m
- *      gc.shenandoah.TestReferenceShortcutCycle
- */
-
 import java.lang.ref.PhantomReference;
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
diff --git a/test/hotspot/jtreg/gc/shenandoah/TestRefprocSanity.java b/test/hotspot/jtreg/gc/shenandoah/TestRefprocSanity.java
index 03f008d10c395..0bf7672e7d502 100644
--- a/test/hotspot/jtreg/gc/shenandoah/TestRefprocSanity.java
+++ b/test/hotspot/jtreg/gc/shenandoah/TestRefprocSanity.java
@@ -41,25 +41,6 @@
  *      TestRefprocSanity
  */
 
-/*
- * @test id=iu
- * @summary Test that null references/referents work fine
- * @requires vm.gc.Shenandoah
- *
- * @run main/othervm -Xmx128m -Xms128m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      -XX:+ShenandoahVerify
- *      TestRefprocSanity
- *
- * @run main/othervm -Xmx128m -Xms128m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      TestRefprocSanity
- *
- * @run main/othervm -Xmx128m -Xms128m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      TestRefprocSanity
- */
-
 import java.lang.ref.*;
 
 public class TestRefprocSanity {
diff --git a/test/hotspot/jtreg/gc/shenandoah/TestRegionSampling.java b/test/hotspot/jtreg/gc/shenandoah/TestRegionSampling.java
index dd98585181ce2..dfa09a2f5ab2d 100644
--- a/test/hotspot/jtreg/gc/shenandoah/TestRegionSampling.java
+++ b/test/hotspot/jtreg/gc/shenandoah/TestRegionSampling.java
@@ -73,25 +73,6 @@
  *      TestRegionSampling
  */
 
-/*
- * @test id=iu-aggressive
- * @requires vm.gc.Shenandoah
- *
- * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahRegionSampling
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      TestRegionSampling
- */
-
-/*
- * @test id=iu
- * @requires vm.gc.Shenandoah
- *
- * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahRegionSampling
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      TestRegionSampling
- *
- */
-
 public class TestRegionSampling {
 
     static final long TARGET_MB = Long.getLong("target", 2_000); // 2 Gb allocation
diff --git a/test/hotspot/jtreg/gc/shenandoah/TestResizeTLAB.java b/test/hotspot/jtreg/gc/shenandoah/TestResizeTLAB.java
index 095f99395693b..4e3089d0862c6 100644
--- a/test/hotspot/jtreg/gc/shenandoah/TestResizeTLAB.java
+++ b/test/hotspot/jtreg/gc/shenandoah/TestResizeTLAB.java
@@ -138,46 +138,6 @@
  *      TestResizeTLAB
  */
 
-/*
- * @test id=iu-aggressive
- * @key randomness
- * @summary Test that Shenandoah is able to work with(out) resizeable TLABs
- * @requires vm.gc.Shenandoah
- * @library /test/lib
- *
- * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahVerify
- *      -XX:+ResizeTLAB
- *      TestResizeTLAB
- *
- * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahVerify
- *      -XX:-ResizeTLAB
- *      TestResizeTLAB
- */
-
-/*
- * @test id=iu
- * @key randomness
- * @summary Test that Shenandoah is able to work with(out) resizeable TLABs
- * @requires vm.gc.Shenandoah
- * @library /test/lib
- *
- * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      -XX:+ShenandoahVerify
- *      -XX:+ResizeTLAB
- *      TestResizeTLAB
- *
- * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      -XX:+ShenandoahVerify
- *      -XX:-ResizeTLAB
- *      TestResizeTLAB
- */
-
 import java.util.Random;
 import jdk.test.lib.Utils;
 
diff --git a/test/hotspot/jtreg/gc/shenandoah/TestRetainObjects.java b/test/hotspot/jtreg/gc/shenandoah/TestRetainObjects.java
index 7a28548f610c3..7be388b79451f 100644
--- a/test/hotspot/jtreg/gc/shenandoah/TestRetainObjects.java
+++ b/test/hotspot/jtreg/gc/shenandoah/TestRetainObjects.java
@@ -114,41 +114,6 @@
  *      TestRetainObjects
  */
 
-/*
- * @test id=iu-aggressive
- * @summary Acceptance tests: collector can deal with retained objects
- * @requires vm.gc.Shenandoah
- *
- * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahOOMDuringEvacALot
- *      TestRetainObjects
- *
- * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahAllocFailureALot
- *      TestRetainObjects
- *
- * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      TestRetainObjects
- */
-
-/*
- * @test id=iu
- * @summary Acceptance tests: collector can deal with retained objects
- * @requires vm.gc.Shenandoah
- *
- * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      -XX:+ShenandoahVerify
- *      TestRetainObjects
- *
- * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      TestRetainObjects
- */
-
 public class TestRetainObjects {
 
     static final int COUNT = 10_000_000;
diff --git a/test/hotspot/jtreg/gc/shenandoah/TestSieveObjects.java b/test/hotspot/jtreg/gc/shenandoah/TestSieveObjects.java
index 1b16ba4b8d2e7..2eaead55a6aac 100644
--- a/test/hotspot/jtreg/gc/shenandoah/TestSieveObjects.java
+++ b/test/hotspot/jtreg/gc/shenandoah/TestSieveObjects.java
@@ -127,45 +127,6 @@
  *      TestSieveObjects
  */
 
-/*
- * @test id=iu-aggressive
- * @summary Acceptance tests: collector can deal with retained objects
- * @key randomness
- * @requires vm.gc.Shenandoah
- * @library /test/lib
- *
- * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahOOMDuringEvacALot
- *      TestSieveObjects
- *
- * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahAllocFailureALot
- *      TestSieveObjects
- *
- * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      TestSieveObjects
- */
-
-/*
- * @test id=iu
- * @summary Acceptance tests: collector can deal with retained objects
- * @key randomness
- * @requires vm.gc.Shenandoah
- * @library /test/lib
- *
- * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      -XX:+ShenandoahVerify
- *      TestSieveObjects
- *
- * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      TestSieveObjects
- */
-
 import java.util.Random;
 import jdk.test.lib.Utils;
 
diff --git a/test/hotspot/jtreg/gc/shenandoah/TestStringDedup.java b/test/hotspot/jtreg/gc/shenandoah/TestStringDedup.java
index 94691432f38fb..9fdb822d48c27 100644
--- a/test/hotspot/jtreg/gc/shenandoah/TestStringDedup.java
+++ b/test/hotspot/jtreg/gc/shenandoah/TestStringDedup.java
@@ -65,24 +65,6 @@
  *      TestStringDedup
  */
 
-/*
- * @test id=iu
- * @summary Test Shenandoah string deduplication implementation
- * @key randomness
- * @requires vm.gc.Shenandoah
- * @library /test/lib
- * @modules java.base/java.lang:open
- *          java.management
- *
- * @run main/othervm -Xmx256m -Xlog:gc+stats -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:StringDeduplicationAgeThreshold=3
- *      TestStringDedup
- *
- * @run main/othervm -Xmx256m -Xlog:gc+stats -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive -XX:StringDeduplicationAgeThreshold=3
- *      TestStringDedup
- */
-
 import java.lang.reflect.*;
 import java.util.*;
 import jdk.test.lib.Utils;
diff --git a/test/hotspot/jtreg/gc/shenandoah/TestStringDedupStress.java b/test/hotspot/jtreg/gc/shenandoah/TestStringDedupStress.java
index 0382d0e00ddea..2d928e848ce12 100644
--- a/test/hotspot/jtreg/gc/shenandoah/TestStringDedupStress.java
+++ b/test/hotspot/jtreg/gc/shenandoah/TestStringDedupStress.java
@@ -72,37 +72,6 @@
  *      TestStringDedupStress
  */
 
- /*
- * @test id=iu
- * @summary Test Shenandoah string deduplication implementation
- * @key randomness
- * @requires vm.gc.Shenandoah
- * @library /test/lib
- * @modules java.base/java.lang:open
- *          java.management
- *
- * @run main/othervm -Xmx1g -Xlog:gc+stats -Xlog:gc -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      TestStringDedupStress
- *
- * @run main/othervm -Xmx1g -Xlog:gc+stats -Xlog:gc -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -DtargetStrings=2000000
- *      TestStringDedupStress
- *
- * @run main/othervm -Xmx1g -Xlog:gc+stats -Xlog:gc -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      -XX:+ShenandoahOOMDuringEvacALot
- *      -DtargetStrings=2000000
- *      TestStringDedupStress
- *
- * @run main/othervm -Xmx1g -Xlog:gc+stats -Xlog:gc -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseStringDeduplication
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahOOMDuringEvacALot
- *      -DtargetStrings=2000000
- *      TestStringDedupStress
- */
-
 import java.lang.management.*;
 import java.lang.reflect.*;
 import java.util.*;
diff --git a/test/hotspot/jtreg/gc/shenandoah/TestStringInternCleanup.java b/test/hotspot/jtreg/gc/shenandoah/TestStringInternCleanup.java
index cf663f2329cb8..62c9e16f777f5 100644
--- a/test/hotspot/jtreg/gc/shenandoah/TestStringInternCleanup.java
+++ b/test/hotspot/jtreg/gc/shenandoah/TestStringInternCleanup.java
@@ -75,26 +75,6 @@
  *      TestStringInternCleanup
  */
 
-/*
- * @test id=iu
- * @summary Check that Shenandoah cleans up interned strings
- * @requires vm.gc.Shenandoah
- *
- * @run main/othervm -Xmx64m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ClassUnloadingWithConcurrentMark
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      -XX:+ShenandoahVerify
- *      TestStringInternCleanup
- *
- * @run main/othervm -Xmx64m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ClassUnloadingWithConcurrentMark
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahVerify
- *      TestStringInternCleanup
- *
- * @run main/othervm -Xmx64m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ClassUnloadingWithConcurrentMark
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      TestStringInternCleanup
- */
-
 public class TestStringInternCleanup {
 
     static final int COUNT = 1_000_000;
diff --git a/test/hotspot/jtreg/gc/shenandoah/TestVerifyJCStress.java b/test/hotspot/jtreg/gc/shenandoah/TestVerifyJCStress.java
index 312ab964f5ee1..82bc74daddc4f 100644
--- a/test/hotspot/jtreg/gc/shenandoah/TestVerifyJCStress.java
+++ b/test/hotspot/jtreg/gc/shenandoah/TestVerifyJCStress.java
@@ -58,33 +58,6 @@
  *      TestVerifyJCStress
  */
 
-/*
- * @test id=iu
- * @summary Tests that we pass at least one jcstress-like test with all verification turned on
- * @requires vm.gc.Shenandoah
- * @modules java.base/jdk.internal.misc
- *          java.management
- *
- * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      -XX:+ShenandoahVerify
- *      TestVerifyJCStress
- */
-
-/*
- * @test id=iu-c1
- * @summary Tests that we pass at least one jcstress-like test with all verification turned on
- * @requires vm.gc.Shenandoah
- * @modules java.base/jdk.internal.misc
- *          java.management
- *
- * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      -XX:+ShenandoahVerify -XX:TieredStopAtLevel=1
- *      TestVerifyJCStress
- */
-
-
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.locks.*;
diff --git a/test/hotspot/jtreg/gc/shenandoah/TestWrongArrayMember.java b/test/hotspot/jtreg/gc/shenandoah/TestWrongArrayMember.java
index 6712cb49561f6..6dcdf259c6c68 100644
--- a/test/hotspot/jtreg/gc/shenandoah/TestWrongArrayMember.java
+++ b/test/hotspot/jtreg/gc/shenandoah/TestWrongArrayMember.java
@@ -26,8 +26,7 @@
  * @test
  * @requires vm.gc.Shenandoah
  *
- * @run main/othervm -Xmx128m -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC                         TestWrongArrayMember
- * @run main/othervm -Xmx128m -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu TestWrongArrayMember
+ * @run main/othervm -Xmx128m -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC TestWrongArrayMember
  */
 
 public class TestWrongArrayMember {
diff --git a/test/hotspot/jtreg/gc/shenandoah/compiler/BarrierInInfiniteLoop.java b/test/hotspot/jtreg/gc/shenandoah/compiler/BarrierInInfiniteLoop.java
index 8673005f96f2f..9054c1f470ed6 100644
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/BarrierInInfiniteLoop.java
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/BarrierInInfiniteLoop.java
@@ -30,8 +30,6 @@
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xcomp -XX:CompileOnly=BarrierInInfiniteLoop::test1
  *                   -XX:CompileOnly=BarrierInInfiniteLoop::test2 -XX:CompileOnly=BarrierInInfiniteLoop::test3 -XX:CompileCommand=quiet BarrierInInfiniteLoop
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -Xcomp -XX:CompileOnly=BarrierInInfiniteLoop::test1
- *                   -XX:CompileOnly=BarrierInInfiniteLoop::test2 -XX:CompileOnly=BarrierInInfiniteLoop::test3 -XX:CompileCommand=quiet BarrierInInfiniteLoop
  *
  */
 
diff --git a/test/hotspot/jtreg/gc/shenandoah/compiler/TestUnexpectedIUBarrierEA.java b/test/hotspot/jtreg/gc/shenandoah/compiler/TestUnexpectedIUBarrierEA.java
deleted file mode 100644
index 8662130c37877..0000000000000
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestUnexpectedIUBarrierEA.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2022, 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 8280885
- * @summary Shenandoah: Some tests failed with "EA: missing allocation reference path"
- * @requires vm.gc.Shenandoah
- *
- * @run main/othervm -XX:-BackgroundCompilation -XX:+UseShenandoahGC -XX:+UnlockExperimentalVMOptions -XX:ShenandoahGCMode=iu
- *                   -XX:CompileCommand=dontinline,TestUnexpectedIUBarrierEA::notInlined TestUnexpectedIUBarrierEA
- */
-
-public class TestUnexpectedIUBarrierEA {
-
-    private static Object field;
-
-    public static void main(String[] args) {
-        for (int i = 0; i < 20_000; i++) {
-            test(false);
-        }
-    }
-
-    private static void test(boolean flag) {
-        A a = new A();
-        B b = new B();
-        b.field = a;
-        notInlined();
-        Object o = b.field;
-        if (!(o instanceof A)) {
-
-        }
-        C c = new C();
-        c.field = o;
-        if (flag) {
-            field = c.field;
-        }
-    }
-
-    private static void notInlined() {
-
-    }
-
-    private static class A {
-    }
-
-    private static class B {
-        public Object field;
-    }
-
-    private static class C {
-        public Object field;
-    }
-}
diff --git a/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestChurnNotifications.java b/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestChurnNotifications.java
index 96586b27f65cc..73743aadedc3c 100644
--- a/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestChurnNotifications.java
+++ b/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestChurnNotifications.java
@@ -87,23 +87,6 @@
  *      TestChurnNotifications
  */
 
-/*
- * @test id=iu
- * @summary Check that MX notifications are reported for all cycles
- * @library /test/lib /
- * @requires vm.gc.Shenandoah
- *
- * @run main/othervm -Xmx128m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -Dprecise=false
- *      TestChurnNotifications
- *
- * @run main/othervm -Xmx128m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      -Dprecise=false
- *      TestChurnNotifications
- */
-
 import java.util.*;
 import java.util.concurrent.atomic.*;
 import javax.management.*;
diff --git a/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestPauseNotifications.java b/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestPauseNotifications.java
index 0919a21d370e3..2dd9aba4c6210 100644
--- a/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestPauseNotifications.java
+++ b/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestPauseNotifications.java
@@ -83,21 +83,6 @@
  *      TestPauseNotifications
  */
 
-/*
- * @test id=iu
- * @summary Check that MX notifications are reported for all cycles
- * @library /test/lib /
- * @requires vm.gc.Shenandoah
- *
- * @run main/othervm -Xmx128m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      TestPauseNotifications
- *
- * @run main/othervm -Xmx128m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      TestPauseNotifications
- */
-
 import java.util.*;
 import java.util.concurrent.atomic.*;
 import javax.management.*;
diff --git a/test/hotspot/jtreg/gc/shenandoah/oom/TestClassLoaderLeak.java b/test/hotspot/jtreg/gc/shenandoah/oom/TestClassLoaderLeak.java
index 9d17e91608952..1a3d07bf80d06 100644
--- a/test/hotspot/jtreg/gc/shenandoah/oom/TestClassLoaderLeak.java
+++ b/test/hotspot/jtreg/gc/shenandoah/oom/TestClassLoaderLeak.java
@@ -124,7 +124,6 @@ public static void main(String[] args) throws Exception {
 
         String[][][] modeHeuristics = new String[][][] {
              {{"satb"},    {"adaptive", "compact", "static", "aggressive"}},
-             {{"iu"},      {"adaptive", "aggressive"}},
              {{"passive"}, {"passive"}}
         };
 
diff --git a/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGC.java b/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGC.java
index 7fe5d56f7de99..4effff7ebd556 100644
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGC.java
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGC.java
@@ -125,23 +125,5 @@ public static void main(String[] args) throws Exception {
                 output.shouldNotContain(p);
             }
         }
-
-        {
-            OutputAnalyzer output = ProcessTools.executeLimitedTestJava(
-                    "-Xmx128m",
-                    "-XX:+UnlockExperimentalVMOptions",
-                    "-XX:+UseShenandoahGC",
-                    "-Xlog:gc",
-                    "-XX:+ExplicitGCInvokesConcurrent",
-                    "-XX:ShenandoahGCMode=iu",
-                    TestExplicitGC.class.getName(),
-                    "test");
-            for (String p : full) {
-                output.shouldNotContain(p);
-            }
-            for (String p : concNormal) {
-                output.shouldContain(p);
-            }
-         }
     }
 }
diff --git a/test/hotspot/jtreg/gc/shenandoah/options/TestModeUnlock.java b/test/hotspot/jtreg/gc/shenandoah/options/TestModeUnlock.java
index 802038363b5fa..5422a86a496e2 100644
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestModeUnlock.java
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestModeUnlock.java
@@ -45,7 +45,6 @@ enum Mode {
 
     public static void main(String[] args) throws Exception {
         testWith("-XX:ShenandoahGCMode=satb",    Mode.PRODUCT);
-        testWith("-XX:ShenandoahGCMode=iu",      Mode.EXPERIMENTAL);
         testWith("-XX:ShenandoahGCMode=passive", Mode.DIAGNOSTIC);
     }
 
diff --git a/test/hotspot/jtreg/gc/shenandoah/options/TestSelectiveBarrierFlags.java b/test/hotspot/jtreg/gc/shenandoah/options/TestSelectiveBarrierFlags.java
index 094e62f53f35a..fe29a38c422c6 100644
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestSelectiveBarrierFlags.java
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestSelectiveBarrierFlags.java
@@ -50,7 +50,7 @@ public class TestSelectiveBarrierFlags {
     public static void main(String[] args) throws Exception {
         String[][] opts = {
                 new String[] { "ShenandoahLoadRefBarrier" },
-                new String[] { "ShenandoahSATBBarrier", "ShenandoahIUBarrier" },
+                new String[] { "ShenandoahSATBBarrier" },
                 new String[] { "ShenandoahCASBarrier" },
                 new String[] { "ShenandoahCloneBarrier" },
                 new String[] { "ShenandoahStackWatermarkBarrier" }
diff --git a/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierDisable.java b/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierDisable.java
index aa6b79356498c..9bf1e74585618 100644
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierDisable.java
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierDisable.java
@@ -44,21 +44,12 @@ public static void main(String[] args) throws Exception {
                 "ShenandoahCloneBarrier",
                 "ShenandoahStackWatermarkBarrier",
         };
-        String[] iu = {
-                "ShenandoahLoadRefBarrier",
-                "ShenandoahIUBarrier",
-                "ShenandoahCASBarrier",
-                "ShenandoahCloneBarrier",
-                "ShenandoahStackWatermarkBarrier",
-        };
 
         shouldFailAll("-XX:ShenandoahGCHeuristics=adaptive",   concurrent);
         shouldFailAll("-XX:ShenandoahGCHeuristics=static",     concurrent);
         shouldFailAll("-XX:ShenandoahGCHeuristics=compact",    concurrent);
         shouldFailAll("-XX:ShenandoahGCHeuristics=aggressive", concurrent);
-        shouldFailAll("-XX:ShenandoahGCMode=iu",               iu);
         shouldPassAll("-XX:ShenandoahGCMode=passive",          concurrent);
-        shouldPassAll("-XX:ShenandoahGCMode=passive",          iu);
     }
 
     private static void shouldFailAll(String h, String[] barriers) throws Exception {
diff --git a/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierEnable.java b/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierEnable.java
index 486860728aba9..ea64d3ee71260 100644
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierEnable.java
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierEnable.java
@@ -23,7 +23,7 @@
  */
 
 /* @test
- * @summary Test that disabling wrong barriers fails early
+ * @summary Test that SATB barrier may be enabled for all modes
  * @requires vm.gc.Shenandoah
  * @library /test/lib
  * @run driver TestWrongBarrierEnable
@@ -38,19 +38,13 @@ public class TestWrongBarrierEnable {
 
     public static void main(String[] args) throws Exception {
         String[] concurrent = {
-                "ShenandoahIUBarrier",
-        };
-        String[] iu = {
                 "ShenandoahSATBBarrier",
         };
-
-        shouldFailAll("-XX:ShenandoahGCHeuristics=adaptive",   concurrent);
-        shouldFailAll("-XX:ShenandoahGCHeuristics=static",     concurrent);
-        shouldFailAll("-XX:ShenandoahGCHeuristics=compact",    concurrent);
-        shouldFailAll("-XX:ShenandoahGCHeuristics=aggressive", concurrent);
-        shouldFailAll("-XX:ShenandoahGCMode=iu",               iu);
+        shouldPassAll("-XX:ShenandoahGCHeuristics=adaptive",   concurrent);
+        shouldPassAll("-XX:ShenandoahGCHeuristics=static",     concurrent);
+        shouldPassAll("-XX:ShenandoahGCHeuristics=compact",    concurrent);
+        shouldPassAll("-XX:ShenandoahGCHeuristics=aggressive", concurrent);
         shouldPassAll("-XX:ShenandoahGCMode=passive",          concurrent);
-        shouldPassAll("-XX:ShenandoahGCMode=passive",          iu);
     }
 
     private static void shouldFailAll(String h, String[] barriers) throws Exception {
diff --git a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithShenandoah.java b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithShenandoah.java
index 6e98f99b54823..501605cd0f59a 100644
--- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithShenandoah.java
+++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithShenandoah.java
@@ -99,47 +99,6 @@
  *      gc.stress.gcbasher.TestGCBasherWithShenandoah 120000
  */
 
-/*
- * @test id=iu-aggressive
- * @key stress
- * @library /
- * @requires vm.gc.Shenandoah
- * @requires vm.flavor == "server" & !vm.emulatedClient
- * @summary Stress the Shenandoah GC by trying to make old objects more likely to be garbage than young objects.
- *
- * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahOOMDuringEvacALot
- *      gc.stress.gcbasher.TestGCBasherWithShenandoah 120000
- *
- * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahAllocFailureALot
- *      gc.stress.gcbasher.TestGCBasherWithShenandoah 120000
- *
- * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      gc.stress.gcbasher.TestGCBasherWithShenandoah 120000
- */
-
-/*
- * @test id=iu
- * @key stress
- * @library /
- * @requires vm.gc.Shenandoah
- * @requires vm.flavor == "server" & !vm.emulatedClient
- * @summary Stress the Shenandoah GC by trying to make old objects more likely to be garbage than young objects.
- *
- * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      -XX:+ShenandoahVerify
- *      gc.stress.gcbasher.TestGCBasherWithShenandoah 120000
- *
- * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      gc.stress.gcbasher.TestGCBasherWithShenandoah 120000
- */
-
 /*
  * @test id=passive-deopt-nmethod
  * @key stress
@@ -221,53 +180,6 @@
  *      gc.stress.gcbasher.TestGCBasherWithShenandoah 120000
  */
 
-/*
- * @test id=iu-aggressive-deopt-nmethod
- * @key stress
- * @library /
- * @requires vm.gc.Shenandoah
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.opt.ClassUnloading != false
- * @summary Stress Shenandoah GC with nmethod barrier forced deoptimization enabled.
- *
- * @run main/othervm/timeout=200 -Xlog:gc*=info,nmethod+barrier=trace -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+DeoptimizeNMethodBarriersALot -XX:-Inline
- *      -XX:+ShenandoahOOMDuringEvacALot
- *      gc.stress.gcbasher.TestGCBasherWithShenandoah 120000
- *
- * @run main/othervm/timeout=200 -Xlog:gc*=info,nmethod+barrier=trace -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+DeoptimizeNMethodBarriersALot -XX:-Inline
- *      -XX:+ShenandoahAllocFailureALot
- *      gc.stress.gcbasher.TestGCBasherWithShenandoah 120000
- *
- * @run main/othervm/timeout=200 -Xlog:gc*=info,nmethod+barrier=trace -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+DeoptimizeNMethodBarriersALot -XX:-Inline
- *      gc.stress.gcbasher.TestGCBasherWithShenandoah 120000
- */
-
-/*
- * @test id=iu-deopt-nmethod
- * @key stress
- * @library /
- * @requires vm.gc.Shenandoah
- * @requires vm.flavor == "server" & !vm.emulatedClient & vm.opt.ClassUnloading != false
- * @summary Stress Shenandoah GC with nmethod barrier forced deoptimization enabled.
- *
- * @run main/othervm/timeout=200 -Xlog:gc*=info,nmethod+barrier=trace -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      -XX:+DeoptimizeNMethodBarriersALot -XX:-Inline
- *      -XX:+ShenandoahVerify
- *      gc.stress.gcbasher.TestGCBasherWithShenandoah 120000
- *
- * @run main/othervm/timeout=200 -Xlog:gc*=info,nmethod+barrier=trace -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      -XX:+DeoptimizeNMethodBarriersALot -XX:-Inline
- *      gc.stress.gcbasher.TestGCBasherWithShenandoah 120000
- */
-
-
 public class TestGCBasherWithShenandoah {
     public static void main(String[] args) throws IOException {
         TestGCBasher.main(args);
diff --git a/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithShenandoah.java b/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithShenandoah.java
index f1e34bb1b0b66..7b9794ec4db26 100644
--- a/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithShenandoah.java
+++ b/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithShenandoah.java
@@ -102,45 +102,6 @@
  *      gc.stress.gcold.TestGCOld 50 1 20 10 10000
  */
 
-/*
- * @test id=iu-aggressive
- * @key stress randomness
- * @library / /test/lib
- * @requires vm.gc.Shenandoah
- * @summary Stress the GC by trying to make old objects more likely to be garbage than young objects.
- *
- * @run main/othervm -Xmx384M -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahOOMDuringEvacALot
- *      gc.stress.gcold.TestGCOld 50 1 20 10 10000
- *
- * @run main/othervm -Xmx384M -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      -XX:+ShenandoahAllocFailureALot
- *      gc.stress.gcold.TestGCOld 50 1 20 10 10000
- *
- * @run main/othervm -Xmx384M -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
- *      gc.stress.gcold.TestGCOld 50 1 20 10 10000
- */
-
-/*
- * @test id=iu
- * @key stress randomness
- * @library / /test/lib
- * @requires vm.gc.Shenandoah
- * @summary Stress the GC by trying to make old objects more likely to be garbage than young objects.
- *
- * @run main/othervm/timeout=600 -Xmx384M -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      -XX:+ShenandoahVerify
- *      gc.stress.gcold.TestGCOld 50 1 20 10 10000
- *
- * @run main/othervm -Xmx384M -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      gc.stress.gcold.TestGCOld 50 1 20 10 10000
- */
-
 public class TestGCOldWithShenandoah {
 
     public static void main(String[] args) {
diff --git a/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithShenandoah.java b/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithShenandoah.java
index 1b12e22b62f86..f1b743bfc1523 100644
--- a/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithShenandoah.java
+++ b/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithShenandoah.java
@@ -40,20 +40,6 @@
  *      -XX:+UseShenandoahGC
  *      gc.stress.systemgc.TestSystemGCWithShenandoah 270
  */
-
-/*
- * @test id=iu
- * @key stress
- * @library /
- * @requires vm.gc.Shenandoah
- * @summary Stress the Shenandoah GC full GC by allocating objects of different lifetimes concurrently with System.gc().
- *
- * @run main/othervm/timeout=300 -Xlog:gc*=info -Xmx512m -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions
- *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
- *      -XX:+ShenandoahVerify
- *      gc.stress.systemgc.TestSystemGCWithShenandoah 270
- *
- */
 public class TestSystemGCWithShenandoah {
     public static void main(String[] args) throws Exception {
         TestSystemGC.main(args);

From ee839b7f0ebe471d3877cddd2c87019ccb8ee5ae Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Fri, 26 Jul 2024 03:44:22 +0000
Subject: [PATCH 218/401] 8337239: Fix simple -Wzero-as-null-pointer-constant
 warnings in classfile code

Reviewed-by: dholmes
---
 .../share/classfile/classFileParser.cpp       |  2 +-
 .../share/classfile/defaultMethods.cpp        |  2 +-
 .../share/classfile/javaAssertions.cpp        | 26 +++++++++----------
 src/hotspot/share/classfile/symbolTable.cpp   |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/hotspot/share/classfile/classFileParser.cpp b/src/hotspot/share/classfile/classFileParser.cpp
index 535b67887fca1..bceade3b51b95 100644
--- a/src/hotspot/share/classfile/classFileParser.cpp
+++ b/src/hotspot/share/classfile/classFileParser.cpp
@@ -2296,7 +2296,7 @@ Method* ClassFileParser::parse_method(const ClassFileStream* const cfs,
   u2 max_stack = 0;
   u2 max_locals = 0;
   u4 code_length = 0;
-  const u1* code_start = 0;
+  const u1* code_start = nullptr;
   u2 exception_table_length = 0;
   const unsafe_u2* exception_table_start = nullptr; // (potentially unaligned) pointer to array of u2 elements
   Array<int>* exception_handlers = Universe::the_empty_int_array();
diff --git a/src/hotspot/share/classfile/defaultMethods.cpp b/src/hotspot/share/classfile/defaultMethods.cpp
index dd221efb4098c..58d24c16ad3d8 100644
--- a/src/hotspot/share/classfile/defaultMethods.cpp
+++ b/src/hotspot/share/classfile/defaultMethods.cpp
@@ -870,7 +870,7 @@ static Method* new_method(
     Symbol* sig, AccessFlags flags, int max_stack, int params,
     ConstMethod::MethodType mt, TRAPS) {
 
-  address code_start = 0;
+  address code_start = nullptr;
   int code_length = 0;
   InlineTableSizes sizes;
 
diff --git a/src/hotspot/share/classfile/javaAssertions.cpp b/src/hotspot/share/classfile/javaAssertions.cpp
index 2666683046b14..cf51bfb21d676 100644
--- a/src/hotspot/share/classfile/javaAssertions.cpp
+++ b/src/hotspot/share/classfile/javaAssertions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,12 +38,12 @@
 
 bool                            JavaAssertions::_userDefault = false;
 bool                            JavaAssertions::_sysDefault = false;
-JavaAssertions::OptionList*     JavaAssertions::_classes = 0;
-JavaAssertions::OptionList*     JavaAssertions::_packages = 0;
+JavaAssertions::OptionList*     JavaAssertions::_classes = nullptr;
+JavaAssertions::OptionList*     JavaAssertions::_packages = nullptr;
 
 JavaAssertions::OptionList::OptionList(const char* name, bool enabled,
   OptionList* next) {
-  assert(name != 0, "need a name");
+  assert(name != nullptr, "need a name");
   _name = name;
   _enabled = enabled;
   _next = next;
@@ -51,12 +51,12 @@ JavaAssertions::OptionList::OptionList(const char* name, bool enabled,
 
 int JavaAssertions::OptionList::count(OptionList* p) {
   int rc;
-  for (rc = 0; p != 0; p = p->next(), ++rc) /* empty */;
+  for (rc = 0; p != nullptr; p = p->next(), ++rc) /* empty */;
   return rc;
 }
 
 void JavaAssertions::addOption(const char* name, bool enable) {
-  assert(name != 0, "must have a name");
+  assert(name != nullptr, "must have a name");
 
   // Copy the name.  The storage needs to exist for the lifetime of the vm;
   // it is never freed, so will be leaked (along with other option strings -
@@ -135,7 +135,7 @@ void JavaAssertions::fillJavaArrays(const OptionList* p, int len,
   // matches the order on the command line (the list is in reverse order, since
   // it was created by prepending successive items from the command line).
   int index;
-  for (index = len - 1; p != 0; p = p->next(), --index) {
+  for (index = len - 1; p != nullptr; p = p->next(), --index) {
     assert(index >= 0, "length does not match list");
     TempNewSymbol name = SymbolTable::new_symbol(p->name());
     Handle s = java_lang_String::externalize_classname(name, CHECK);
@@ -147,12 +147,12 @@ void JavaAssertions::fillJavaArrays(const OptionList* p, int len,
 
 inline JavaAssertions::OptionList*
 JavaAssertions::match_class(const char* classname) {
-  for (OptionList* p = _classes; p != 0; p = p->next()) {
+  for (OptionList* p = _classes; p != nullptr; p = p->next()) {
     if (strcmp(p->name(), classname) == 0) {
       return p;
     }
   }
-  return 0;
+  return nullptr;
 }
 
 JavaAssertions::OptionList*
@@ -160,7 +160,7 @@ JavaAssertions::match_package(const char* classname) {
   // Search the package list for any items that apply to classname.  Each
   // sub-package in classname is checked, from most-specific to least, until one
   // is found.
-  if (_packages == 0) return 0;
+  if (_packages == nullptr) return nullptr;
 
   // Find the length of the "most-specific" package in classname.  If classname
   // does not include a package, length will be 0 which will match items for the
@@ -170,7 +170,7 @@ JavaAssertions::match_package(const char* classname) {
 
   do {
     assert(len == 0 || classname[len] == JVM_SIGNATURE_SLASH, "not a package name");
-    for (OptionList* p = _packages; p != 0; p = p->next()) {
+    for (OptionList* p = _packages; p != nullptr; p = p->next()) {
       if (strncmp(p->name(), classname, len) == 0 && p->name()[len] == '\0') {
         return p;
       }
@@ -181,7 +181,7 @@ JavaAssertions::match_package(const char* classname) {
     while (len > 0 && classname[--len] != JVM_SIGNATURE_SLASH) /* empty */;
   } while (len > 0);
 
-  return 0;
+  return nullptr;
 }
 
 inline void JavaAssertions::trace(const char* name,
@@ -193,7 +193,7 @@ const char* typefound, const char* namefound, bool enabled) {
 }
 
 bool JavaAssertions::enabled(const char* classname, bool systemClass) {
-  assert(classname != 0, "must have a classname");
+  assert(classname != nullptr, "must have a classname");
 
   // This will be slow if the number of assertion options on the command line is
   // large--it traverses two lists, one of them multiple times.  Could use a
diff --git a/src/hotspot/share/classfile/symbolTable.cpp b/src/hotspot/share/classfile/symbolTable.cpp
index ddbf180a4a188..95094238946e3 100644
--- a/src/hotspot/share/classfile/symbolTable.cpp
+++ b/src/hotspot/share/classfile/symbolTable.cpp
@@ -193,7 +193,7 @@ class SymbolTableConfig : public AllStatic {
       // We cannot use arena because arena chunks are allocated by the OS. As a result, for example,
       // the archived symbol of "java/lang/Object" may sometimes be lower than "java/lang/String", and
       // sometimes be higher. This would cause non-deterministic contents in the archive.
-      DEBUG_ONLY(static void* last = 0);
+      DEBUG_ONLY(static void* last = nullptr);
       void* p = (void*)MetaspaceShared::symbol_space_alloc(alloc_size);
       assert(p > last, "must increase monotonically");
       DEBUG_ONLY(last = p);

From 29f0f174a0460a98c5500c4cf4bf9abdf9354572 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhiscxk@openjdk.org>
Date: Fri, 26 Jul 2024 06:23:47 +0000
Subject: [PATCH 219/401] 8336879: Always true condition 'img != null' in
 GTKPainter.paintPopupMenuBackground

Reviewed-by: psadhukhan, tr
---
 .../classes/com/sun/java/swing/plaf/gtk/GTKPainter.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java
index e643d3d28ff3d..5d77800f88e5f 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java
@@ -610,10 +610,10 @@ public void paintPopupMenuBackground(SynthContext context, Graphics g,
                 x + insets.left, y + insets.top, w - insets.left - insets.right,
                 h - insets.top - insets.bottom);
             BufferedImage img = ENGINE.finishPainting();
-            if(!isHW) {
+            if (!isHW && img != null) {
                 int border = img.getRGB(0, h / 2);
-                if (img != null && border == img.getRGB(w / 2, h / 2)) {
-                    // fix no menu borders in Adwaita theme
+                if (border == img.getRGB(w / 2, h / 2)) {
+                    // fix no menu borders
                     Graphics g2 = img.getGraphics();
                     Color c = new Color(border);
                     g2.setColor(new Color(Math.max((int) (c.getRed() * 0.8), 0),

From 487450cb5e8b3781f77896125573ee89a556b454 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhiscxk@openjdk.org>
Date: Fri, 26 Jul 2024 06:26:52 +0000
Subject: [PATCH 220/401] 8216471: GTK LnF: Frame is clipped and does not show
 JTable,Tooltip and JTree demo in SwingSet2 demo

Reviewed-by: psadhukhan, achung
---
 src/demo/share/jfc/SwingSet2/SwingSet2.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/demo/share/jfc/SwingSet2/SwingSet2.java b/src/demo/share/jfc/SwingSet2/SwingSet2.java
index 13b3d63a6932f..75eeb4e365785 100644
--- a/src/demo/share/jfc/SwingSet2/SwingSet2.java
+++ b/src/demo/share/jfc/SwingSet2/SwingSet2.java
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -848,7 +848,14 @@ private void updateThisSwingSet() {
         if (frame == null) {
             SwingUtilities.updateComponentTreeUI(this);
         } else {
+            if (currentLookAndFeel.name.contains("GTK")) {
+                this.setPreferredSize(new Dimension(PREFERRED_WIDTH + 260, PREFERRED_HEIGHT + 80));
+            } else {
+                this.setPreferredSize(new Dimension(PREFERRED_WIDTH, PREFERRED_HEIGHT));
+            }
+
             SwingUtilities.updateComponentTreeUI(frame);
+            frame.pack();
         }
 
         SwingUtilities.updateComponentTreeUI(popupMenu);

From 7f11935461a6ff1ef0fac800fb4264a519e21061 Mon Sep 17 00:00:00 2001
From: Shaojin Wen <shaojin.wensj@alibaba-inc.com>
Date: Fri, 26 Jul 2024 07:08:33 +0000
Subject: [PATCH 221/401] 8337167: StringSize deduplication

Reviewed-by: liach, rriggs
---
 .../java/lang/AbstractStringBuilder.java      |  5 +--
 .../share/classes/java/lang/Integer.java      | 29 ++-------------
 .../share/classes/java/lang/Long.java         | 29 ++-------------
 .../classes/java/lang/StringConcatHelper.java |  5 +--
 .../share/classes/java/lang/System.java       |  4 ---
 .../time/format/DateTimeFormatterBuilder.java | 35 +++----------------
 .../jdk/internal/access/JavaLangAccess.java   |  2 --
 .../jdk/internal/util/DecimalDigits.java      | 26 ++++++++++++++
 8 files changed, 40 insertions(+), 95 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/AbstractStringBuilder.java b/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
index 7e5056a539b8c..e0c3aa19f5437 100644
--- a/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
+++ b/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
@@ -27,6 +27,7 @@
 
 import jdk.internal.math.DoubleToDecimal;
 import jdk.internal.math.FloatToDecimal;
+import jdk.internal.util.DecimalDigits;
 
 import java.io.IOException;
 import java.nio.CharBuffer;
@@ -836,7 +837,7 @@ public AbstractStringBuilder append(char c) {
      */
     public AbstractStringBuilder append(int i) {
         int count = this.count;
-        int spaceNeeded = count + Integer.stringSize(i);
+        int spaceNeeded = count + DecimalDigits.stringSize(i);
         ensureCapacityInternal(spaceNeeded);
         if (isLatin1()) {
             StringLatin1.getChars(i, spaceNeeded, value);
@@ -861,7 +862,7 @@ public AbstractStringBuilder append(int i) {
      */
     public AbstractStringBuilder append(long l) {
         int count = this.count;
-        int spaceNeeded = count + Long.stringSize(l);
+        int spaceNeeded = count + DecimalDigits.stringSize(l);
         ensureCapacityInternal(spaceNeeded);
         if (isLatin1()) {
             StringLatin1.getChars(l, spaceNeeded, value);
diff --git a/src/java.base/share/classes/java/lang/Integer.java b/src/java.base/share/classes/java/lang/Integer.java
index 1c5b3c414bab6..7a65046181f00 100644
--- a/src/java.base/share/classes/java/lang/Integer.java
+++ b/src/java.base/share/classes/java/lang/Integer.java
@@ -27,6 +27,7 @@
 
 import jdk.internal.misc.CDS;
 import jdk.internal.misc.VM;
+import jdk.internal.util.DecimalDigits;
 import jdk.internal.vm.annotation.ForceInline;
 import jdk.internal.vm.annotation.IntrinsicCandidate;
 import jdk.internal.vm.annotation.Stable;
@@ -427,7 +428,7 @@ private static void formatUnsignedIntUTF16(int val, int shift, byte[] buf, int l
      */
     @IntrinsicCandidate
     public static String toString(int i) {
-        int size = stringSize(i);
+        int size = DecimalDigits.stringSize(i);
         if (COMPACT_STRINGS) {
             byte[] buf = new byte[size];
             StringLatin1.getChars(i, size, buf);
@@ -457,32 +458,6 @@ public static String toUnsignedString(int i) {
         return Long.toString(toUnsignedLong(i));
     }
 
-    /**
-     * Returns the string representation size for a given int value.
-     *
-     * @param x int value
-     * @return string size
-     *
-     * @implNote There are other ways to compute this: e.g. binary search,
-     * but values are biased heavily towards zero, and therefore linear search
-     * wins. The iteration results are also routinely inlined in the generated
-     * code after loop unrolling.
-     */
-    static int stringSize(int x) {
-        int d = 1;
-        if (x >= 0) {
-            d = 0;
-            x = -x;
-        }
-        int p = -10;
-        for (int i = 1; i < 10; i++) {
-            if (x > p)
-                return i + d;
-            p = 10 * p;
-        }
-        return 10 + d;
-    }
-
     /**
      * Parses the string argument as a signed integer in the radix
      * specified by the second argument. The characters in the string
diff --git a/src/java.base/share/classes/java/lang/Long.java b/src/java.base/share/classes/java/lang/Long.java
index 70bd2d62add0f..ee9533b29eb53 100644
--- a/src/java.base/share/classes/java/lang/Long.java
+++ b/src/java.base/share/classes/java/lang/Long.java
@@ -34,6 +34,7 @@
 import java.util.Optional;
 
 import jdk.internal.misc.CDS;
+import jdk.internal.util.DecimalDigits;
 import jdk.internal.vm.annotation.ForceInline;
 import jdk.internal.vm.annotation.IntrinsicCandidate;
 import jdk.internal.vm.annotation.Stable;
@@ -457,7 +458,7 @@ private static void formatUnsignedLong0UTF16(long val, int shift, byte[] buf, in
      * @return  a string representation of the argument in base&nbsp;10.
      */
     public static String toString(long i) {
-        int size = stringSize(i);
+        int size = DecimalDigits.stringSize(i);
         if (COMPACT_STRINGS) {
             byte[] buf = new byte[size];
             StringLatin1.getChars(i, size, buf);
@@ -487,32 +488,6 @@ public static String toUnsignedString(long i) {
         return toUnsignedString(i, 10);
     }
 
-    /**
-     * Returns the string representation size for a given long value.
-     *
-     * @param x long value
-     * @return string size
-     *
-     * @implNote There are other ways to compute this: e.g. binary search,
-     * but values are biased heavily towards zero, and therefore linear search
-     * wins. The iteration results are also routinely inlined in the generated
-     * code after loop unrolling.
-     */
-    static int stringSize(long x) {
-        int d = 1;
-        if (x >= 0) {
-            d = 0;
-            x = -x;
-        }
-        long p = -10;
-        for (int i = 1; i < 19; i++) {
-            if (x > p)
-                return i + d;
-            p = 10 * p;
-        }
-        return 19 + d;
-    }
-
     /**
      * Parses the string argument as a signed {@code long} in the
      * radix specified by the second argument. The characters in the
diff --git a/src/java.base/share/classes/java/lang/StringConcatHelper.java b/src/java.base/share/classes/java/lang/StringConcatHelper.java
index bcd9c65890f2a..0b4a8992d6c83 100644
--- a/src/java.base/share/classes/java/lang/StringConcatHelper.java
+++ b/src/java.base/share/classes/java/lang/StringConcatHelper.java
@@ -26,6 +26,7 @@
 package java.lang;
 
 import jdk.internal.misc.Unsafe;
+import jdk.internal.util.DecimalDigits;
 import jdk.internal.vm.annotation.ForceInline;
 
 import java.lang.invoke.MethodHandle;
@@ -96,7 +97,7 @@ static long mix(long lengthCoder, char value) {
      * @return            new length and coder
      */
     static long mix(long lengthCoder, int value) {
-        return checkOverflow(lengthCoder + Integer.stringSize(value));
+        return checkOverflow(lengthCoder + DecimalDigits.stringSize(value));
     }
 
     /**
@@ -107,7 +108,7 @@ static long mix(long lengthCoder, int value) {
      * @return            new length and coder
      */
     static long mix(long lengthCoder, long value) {
-        return checkOverflow(lengthCoder + Long.stringSize(value));
+        return checkOverflow(lengthCoder + DecimalDigits.stringSize(value));
     }
 
     /**
diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java
index dbe4d806947a3..0947da8ded747 100644
--- a/src/java.base/share/classes/java/lang/System.java
+++ b/src/java.base/share/classes/java/lang/System.java
@@ -2623,10 +2623,6 @@ public long stringConcatMix(long lengthCoder, char value) {
                 return StringConcatHelper.mix(lengthCoder, value);
             }
 
-            public int stringSize(long i) {
-                return Long.stringSize(i);
-            }
-
             public int getCharsLatin1(long i, int index, byte[] buf) {
                 return StringLatin1.getChars(i, index, buf);
             }
diff --git a/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java b/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java
index 46a80deee00ec..33dea914b6690 100644
--- a/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java
+++ b/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java
@@ -121,6 +121,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import jdk.internal.util.DecimalDigits;
+
 import sun.text.spi.JavaTimeDateTimePatternProvider;
 import sun.util.locale.provider.CalendarDataUtility;
 import sun.util.locale.provider.LocaleProviderAdapter;
@@ -2908,24 +2910,6 @@ NumberPrinterParser withSubsequentWidth(int subsequentWidth) {
             return new NumberPrinterParser(field, minWidth, maxWidth, signStyle, this.subsequentWidth + subsequentWidth);
         }
 
-        /*
-         * Copied from Long.stringSize
-         */
-        private static int stringSize(long x) {
-            int d = 1;
-            if (x >= 0) {
-                d = 0;
-                x = -x;
-            }
-            long p = -10;
-            for (int i = 1; i < 19; i++) {
-                if (x > p)
-                    return i + d;
-                p = 10 * p;
-            }
-            return 19 + d;
-        }
-
         @Override
         public boolean format(DateTimePrintContext context, StringBuilder buf) {
             Long valueLong = context.getValue(field);
@@ -2934,7 +2918,7 @@ public boolean format(DateTimePrintContext context, StringBuilder buf) {
             }
             long value = getValue(context, valueLong);
             DecimalStyle decimalStyle = context.getDecimalStyle();
-            int size = stringSize(value);
+            int size = DecimalDigits.stringSize(value);
             if (value < 0) {
                 size--;
             }
@@ -3369,17 +3353,6 @@ boolean isFixedWidth(DateTimeParseContext context) {
             return false;
         }
 
-        // Simplified variant of Integer.stringSize that assumes positive values
-        private static int stringSize(int x) {
-            int p = 10;
-            for (int i = 1; i < 10; i++) {
-                if (x < p)
-                    return i;
-                p = 10 * p;
-            }
-            return 10;
-        }
-
         private static final int[] TENS = new int[] {
             1,
             10,
@@ -3400,7 +3373,7 @@ public boolean format(DateTimePrintContext context, StringBuilder buf) {
             }
             int val = field.range().checkValidIntValue(value, field);
             DecimalStyle decimalStyle = context.getDecimalStyle();
-            int stringSize = stringSize(val);
+            int stringSize = DecimalDigits.stringSize(val);
             char zero = decimalStyle.getZeroDigit();
             if (val == 0 || stringSize < 10 - maxWidth) {
                 // 0 or would round down to 0
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
index 725991fb04fee..24aeabf6d3621 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
@@ -458,8 +458,6 @@ public interface JavaLangAccess {
      */
     Object classData(Class<?> c);
 
-    int stringSize(long i);
-
     int getCharsLatin1(long i, int index, byte[] buf);
 
     int getCharsUTF16(long i, int index, byte[] buf);
diff --git a/src/java.base/share/classes/jdk/internal/util/DecimalDigits.java b/src/java.base/share/classes/jdk/internal/util/DecimalDigits.java
index ea1c9fec73057..83438e59b8276 100644
--- a/src/java.base/share/classes/jdk/internal/util/DecimalDigits.java
+++ b/src/java.base/share/classes/jdk/internal/util/DecimalDigits.java
@@ -110,4 +110,30 @@ public static int stringSize(int x) {
         }
         return 10 + d;
     }
+
+    /**
+     * Returns the string representation size for a given long value.
+     *
+     * @param x long value
+     * @return string size
+     *
+     * @implNote There are other ways to compute this: e.g. binary search,
+     * but values are biased heavily towards zero, and therefore linear search
+     * wins. The iteration results are also routinely inlined in the generated
+     * code after loop unrolling.
+     */
+    public static int stringSize(long x) {
+        int d = 1;
+        if (x >= 0) {
+            d = 0;
+            x = -x;
+        }
+        long p = -10;
+        for (int i = 1; i < 19; i++) {
+            if (x > p)
+                return i + d;
+            p = 10 * p;
+        }
+        return 19 + d;
+    }
 }

From d10afa26e5c59475e49b353ed34e8e85d0615d92 Mon Sep 17 00:00:00 2001
From: Fei Gao <fgao@openjdk.org>
Date: Fri, 26 Jul 2024 09:36:23 +0000
Subject: [PATCH 222/401] 8336245: AArch64: remove extra register copy when
 converting from long to pointer

Co-authored-by: Andrew Haley <aph@openjdk.org>
Reviewed-by: aph, adinn
---
 src/hotspot/cpu/aarch64/aarch64.ad            |  77 ++++--
 src/hotspot/cpu/aarch64/gc/x/x_aarch64.ad     |  10 +-
 src/hotspot/cpu/aarch64/gc/z/z_aarch64.ad     |  10 +-
 src/hotspot/share/opto/machnode.cpp           |   9 +-
 .../jtreg/compiler/c2/TestCastX2P.java        | 234 ++++++++++++++++++
 5 files changed, 317 insertions(+), 23 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/c2/TestCastX2P.java

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index d4b3d63443877..d8db75961d8af 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -2745,10 +2745,7 @@ typedef void (MacroAssembler::* mem_vector_insn)(FloatRegister Rt,
     }
 
     if (index == -1) {
-      /* If we get an out-of-range offset it is a bug in the compiler,
-         so we assert here. */
-      assert(Address::offset_ok_for_immed(disp, exact_log2(size_in_memory)), "c2 compiler bug");
-      /* Fix up any out-of-range offsets. */
+      // Fix up any out-of-range offsets.
       assert_different_registers(rscratch1, base);
       Address addr = Address(base, disp);
       addr = __ legitimize_address(addr, size_in_memory, rscratch1);
@@ -3348,7 +3345,11 @@ encode %{
     int scale = $mem$$scale;
     int disp = $mem$$disp;
     if (index == -1) {
-      __ prfm(Address(base, disp), PSTL1KEEP);
+      // Fix up any out-of-range offsets.
+      assert_different_registers(rscratch1, base);
+      Address addr = Address(base, disp);
+      addr = __ legitimize_address(addr, 8, rscratch1);
+      __ prfm(addr, PSTL1KEEP);
     } else {
       Register index_reg = as_Register(index);
       if (disp == 0) {
@@ -4229,9 +4230,9 @@ operand immIOffset16()
   interface(CONST_INTER);
 %}
 
-operand immLoffset()
+operand immLOffset()
 %{
-  predicate(Address::offset_ok_for_immed(n->get_long(), 0));
+  predicate(n->get_long() >= -256 && n->get_long() <= 65520);
   match(ConL);
 
   op_cost(0);
@@ -5341,6 +5342,34 @@ operand indOffL16(iRegP reg, immLoffset16 off)
   %}
 %}
 
+operand indirectX2P(iRegL reg)
+%{
+  constraint(ALLOC_IN_RC(ptr_reg));
+  match(CastX2P reg);
+  op_cost(0);
+  format %{ "[$reg]\t# long -> ptr" %}
+  interface(MEMORY_INTER) %{
+    base($reg);
+    index(0xffffffff);
+    scale(0x0);
+    disp(0x0);
+  %}
+%}
+
+operand indOffX2P(iRegL reg, immLOffset off)
+%{
+  constraint(ALLOC_IN_RC(ptr_reg));
+  match(AddP (CastX2P reg) off);
+  op_cost(0);
+  format %{ "[$reg, $off]\t# long -> ptr" %}
+  interface(MEMORY_INTER) %{
+    base($reg);
+    index(0xffffffff);
+    scale(0x0);
+    disp($off);
+  %}
+%}
+
 operand indirectN(iRegN reg)
 %{
   predicate(CompressedOops::shift() == 0);
@@ -5431,7 +5460,7 @@ operand indOffIN(iRegN reg, immIOffset off)
   %}
 %}
 
-operand indOffLN(iRegN reg, immLoffset off)
+operand indOffLN(iRegN reg, immLOffset off)
 %{
   predicate(CompressedOops::shift() == 0);
   constraint(ALLOC_IN_RC(ptr_reg));
@@ -5664,6 +5693,17 @@ operand iRegL2I(iRegL reg) %{
   interface(REG_INTER)
 %}
 
+operand iRegL2P(iRegL reg) %{
+
+  op_cost(0);
+
+  match(CastX2P reg);
+
+  format %{ "l2p($reg)" %}
+
+  interface(REG_INTER)
+%}
+
 opclass vmem2(indirect, indIndex, indOffI2, indOffL2);
 opclass vmem4(indirect, indIndex, indOffI4, indOffL4);
 opclass vmem8(indirect, indIndex, indOffI8, indOffL8);
@@ -5680,21 +5720,21 @@ opclass vmem16(indirect, indIndex, indOffI16, indOffL16);
 // instruction defs. we can turn a memory op into an Address
 
 opclass memory1(indirect, indIndexScaled, indIndexScaledI2L, indIndexI2L, indIndex, indOffI1, indOffL1,
-               indirectN, indIndexScaledN, indIndexScaledI2LN, indIndexI2LN, indIndexN);
+                indirectN, indIndexScaledN, indIndexScaledI2LN, indIndexI2LN, indIndexN, indirectX2P, indOffX2P);
 
 opclass memory2(indirect, indIndexScaled, indIndexScaledI2L, indIndexI2L, indIndex, indOffI2, indOffL2,
-               indirectN, indIndexScaledN, indIndexScaledI2LN, indIndexI2LN, indIndexN);
+                indirectN, indIndexScaledN, indIndexScaledI2LN, indIndexI2LN, indIndexN, indirectX2P, indOffX2P);
 
 opclass memory4(indirect, indIndexScaled, indIndexScaledI2L, indIndexI2L, indIndex, indOffI4, indOffL4,
-               indirectN, indIndexScaledN, indIndexScaledI2LN, indIndexI2LN, indIndexN, indOffIN, indOffLN);
+                indirectN, indIndexScaledN, indIndexScaledI2LN, indIndexI2LN, indIndexN, indOffIN, indOffLN, indirectX2P, indOffX2P);
 
 opclass memory8(indirect, indIndexScaled, indIndexScaledI2L, indIndexI2L, indIndex, indOffI8, indOffL8,
-               indirectN, indIndexScaledN, indIndexScaledI2LN, indIndexI2LN, indIndexN, indOffIN, indOffLN);
+                indirectN, indIndexScaledN, indIndexScaledI2LN, indIndexI2LN, indIndexN, indOffIN, indOffLN, indirectX2P, indOffX2P);
 
 // All of the memory operands. For the pipeline description.
 opclass memory(indirect, indIndexScaled, indIndexScaledI2L, indIndexI2L, indIndex,
                indOffI1, indOffL1, indOffI2, indOffL2, indOffI4, indOffL4, indOffI8, indOffL8,
-               indirectN, indIndexScaledN, indIndexScaledI2LN, indIndexI2LN, indIndexN, indOffIN, indOffLN);
+               indirectN, indIndexScaledN, indIndexScaledI2LN, indIndexI2LN, indIndexN, indOffIN, indOffLN, indirectX2P, indOffX2P);
 
 
 // iRegIorL2I is used for src inputs in rules for 32 bit int (I)
@@ -5711,6 +5751,7 @@ opclass memory(indirect, indIndexScaled, indIndexScaledI2L, indIndexI2L, indInde
 // movw is actually redundant but its not too costly.
 
 opclass iRegIorL2I(iRegI, iRegL2I);
+opclass iRegPorL2P(iRegP, iRegL2P);
 
 //----------PIPELINE-----------------------------------------------------------
 // Rules which define the behavior of the target architectures pipeline.
@@ -9811,7 +9852,7 @@ instruct addI_reg_imm_i2l(iRegINoSp dst, iRegL src1, immIAddSub src2) %{
 %}
 
 // Pointer Addition
-instruct addP_reg_reg(iRegPNoSp dst, iRegP src1, iRegL src2) %{
+instruct addP_reg_reg(iRegPNoSp dst, iRegPorL2P src1, iRegL src2) %{
   match(Set dst (AddP src1 src2));
 
   ins_cost(INSN_COST);
@@ -9826,7 +9867,7 @@ instruct addP_reg_reg(iRegPNoSp dst, iRegP src1, iRegL src2) %{
   ins_pipe(ialu_reg_reg);
 %}
 
-instruct addP_reg_reg_ext(iRegPNoSp dst, iRegP src1, iRegIorL2I src2) %{
+instruct addP_reg_reg_ext(iRegPNoSp dst, iRegPorL2P src1, iRegIorL2I src2) %{
   match(Set dst (AddP src1 (ConvI2L src2)));
 
   ins_cost(1.9 * INSN_COST);
@@ -9841,7 +9882,7 @@ instruct addP_reg_reg_ext(iRegPNoSp dst, iRegP src1, iRegIorL2I src2) %{
   ins_pipe(ialu_reg_reg);
 %}
 
-instruct addP_reg_reg_lsl(iRegPNoSp dst, iRegP src1, iRegL src2, immIScale scale) %{
+instruct addP_reg_reg_lsl(iRegPNoSp dst, iRegPorL2P src1, iRegL src2, immIScale scale) %{
   match(Set dst (AddP src1 (LShiftL src2 scale)));
 
   ins_cost(1.9 * INSN_COST);
@@ -9856,7 +9897,7 @@ instruct addP_reg_reg_lsl(iRegPNoSp dst, iRegP src1, iRegL src2, immIScale scale
   ins_pipe(ialu_reg_reg_shift);
 %}
 
-instruct addP_reg_reg_ext_shift(iRegPNoSp dst, iRegP src1, iRegIorL2I src2, immIScale scale) %{
+instruct addP_reg_reg_ext_shift(iRegPNoSp dst, iRegPorL2P src1, iRegIorL2I src2, immIScale scale) %{
   match(Set dst (AddP src1 (LShiftL (ConvI2L src2) scale)));
 
   ins_cost(1.9 * INSN_COST);
@@ -9889,7 +9930,7 @@ instruct lshift_ext(iRegLNoSp dst, iRegIorL2I src, immI scale, rFlagsReg cr) %{
 // Pointer Immediate Addition
 // n.b. this needs to be more expensive than using an indirect memory
 // operand
-instruct addP_reg_imm(iRegPNoSp dst, iRegP src1, immLAddSub src2) %{
+instruct addP_reg_imm(iRegPNoSp dst, iRegPorL2P src1, immLAddSub src2) %{
   match(Set dst (AddP src1 src2));
 
   ins_cost(INSN_COST);
diff --git a/src/hotspot/cpu/aarch64/gc/x/x_aarch64.ad b/src/hotspot/cpu/aarch64/gc/x/x_aarch64.ad
index c7c7165affb57..6e401724baa82 100644
--- a/src/hotspot/cpu/aarch64/gc/x/x_aarch64.ad
+++ b/src/hotspot/cpu/aarch64/gc/x/x_aarch64.ad
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
 // This code is free software; you can redistribute it and/or modify it
@@ -62,7 +62,13 @@ instruct xLoadP(iRegPNoSp dst, memory8 mem, rFlagsReg cr)
   format %{ "ldr  $dst, $mem" %}
 
   ins_encode %{
-    const Address ref_addr = mem2address($mem->opcode(), as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
+    Address ref_addr = mem2address($mem->opcode(), as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
+    if (ref_addr.getMode() == Address::base_plus_offset) {
+      // Fix up any out-of-range offsets.
+      assert_different_registers(rscratch1, as_Register($mem$$base));
+      assert_different_registers(rscratch1, $dst$$Register);
+      ref_addr = __ legitimize_address(ref_addr, 8, rscratch1);
+    }
     __ ldr($dst$$Register, ref_addr);
     x_load_barrier(masm, this, ref_addr, $dst$$Register, rscratch2 /* tmp */, barrier_data());
   %}
diff --git a/src/hotspot/cpu/aarch64/gc/z/z_aarch64.ad b/src/hotspot/cpu/aarch64/gc/z/z_aarch64.ad
index 92181e2b6b908..56d4538477920 100644
--- a/src/hotspot/cpu/aarch64/gc/z/z_aarch64.ad
+++ b/src/hotspot/cpu/aarch64/gc/z/z_aarch64.ad
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
 // This code is free software; you can redistribute it and/or modify it
@@ -111,7 +111,13 @@ instruct zLoadP(iRegPNoSp dst, memory8 mem, rFlagsReg cr)
   format %{ "ldr  $dst, $mem" %}
 
   ins_encode %{
-    const Address ref_addr = mem2address($mem->opcode(), as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
+    Address ref_addr = mem2address($mem->opcode(), as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
+    if (ref_addr.getMode() == Address::base_plus_offset) {
+      // Fix up any out-of-range offsets.
+      assert_different_registers(rscratch2, as_Register($mem$$base));
+      assert_different_registers(rscratch2, $dst$$Register);
+      ref_addr = __ legitimize_address(ref_addr, 8, rscratch2);
+    }
     __ ldr($dst$$Register, ref_addr);
     z_load_barrier(masm, this, ref_addr, $dst$$Register, rscratch1);
   %}
diff --git a/src/hotspot/share/opto/machnode.cpp b/src/hotspot/share/opto/machnode.cpp
index 57361313f8533..39b804f7e5c96 100644
--- a/src/hotspot/share/opto/machnode.cpp
+++ b/src/hotspot/share/opto/machnode.cpp
@@ -395,7 +395,14 @@ const class TypePtr *MachNode::adr_type() const {
     // 32-bit unscaled narrow oop can be the base of any address expression
     t = t->make_ptr();
   }
-  if (t->isa_intptr_t() && offset != 0 && offset != Type::OffsetBot) {
+
+  if (t->isa_intptr_t() &&
+#if !defined(AARCH64)
+      // AArch64 supports the addressing mode:
+      // [base, 0], in which [base] is converted from a long value
+      offset != 0 &&
+#endif
+      offset != Type::OffsetBot) {
     // We cannot assert that the offset does not look oop-ish here.
     // Depending on the heap layout the cardmark base could land
     // inside some oopish region.  It definitely does for Win2K.
diff --git a/test/hotspot/jtreg/compiler/c2/TestCastX2P.java b/test/hotspot/jtreg/compiler/c2/TestCastX2P.java
new file mode 100644
index 0000000000000..6591692f0cc61
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/TestCastX2P.java
@@ -0,0 +1,234 @@
+/*
+ * Copyright (c) 2024, Arm Limited. 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.
+ */
+
+package compiler.c2;
+
+import jdk.internal.misc.Unsafe;
+import jdk.test.lib.Asserts;
+
+/**
+ * @test TestCastX2P
+ * @summary AArch64: remove extra register copy when converting from long to pointer.
+ * @bug 8336245
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ * @run main/othervm -XX:-TieredCompilation compiler.c2.TestCastX2P
+ */
+
+public class TestCastX2P {
+
+    public static final int LEN = 2040;
+
+    static final Unsafe UNSAFE = Unsafe.getUnsafe();
+
+    public static long lseed = 0xbeef;
+    public static int iseed = 0xbeef;
+    public static short sseed = (short) (0xef);
+    public static byte bseed = (byte) (0xe);
+
+    public static long off1 = 16;
+    public static long off2 = 32;
+    public static long off3 = 64;
+
+    public static class TestLong {
+
+        private static long address = UNSAFE.allocateMemory(LEN);
+
+        static {
+            for (int k = 0; k < 10_000; k++) {
+                for (int i = 0; i < LEN/2; i++) {
+                    UNSAFE.putLong(address+i, lseed);
+                }
+            }
+
+            UNSAFE.putLong(address + off1 + 1030, lseed);
+            UNSAFE.putLong(address + 1023, lseed);
+            UNSAFE.putLong(address + off2 + 1001, lseed);
+        }
+    }
+
+    public static class TestLongIndirect {
+
+        private static long address = UNSAFE.allocateMemory(LEN);
+
+        static {
+            for (int k = 0; k < 1000; k++) {
+                for (int i = 0; i < LEN/2; i++) {
+                    UNSAFE.putLong(address+i, lseed);
+                }
+            }
+
+            UNSAFE.putLong(address + off1, lseed);
+            UNSAFE.putLong(address + off1 + off2, lseed);
+            UNSAFE.putLong(address + off3, lseed);
+        }
+    }
+
+    public static class TestInt {
+
+        private static long address = UNSAFE.allocateMemory(LEN);
+
+        static {
+            for (int k = 0; k < 10_000; k++) {
+                for (int i = 0; i < LEN/2; i++) {
+                    UNSAFE.putInt(address+i, iseed);
+                }
+            }
+
+            UNSAFE.putInt(address + off1 + 274, iseed);
+            UNSAFE.putInt(address + 278, iseed);
+            UNSAFE.putInt(address + off2 + 282, iseed);
+        }
+    }
+
+    public static class TestIntIndirect {
+
+        private static long address = UNSAFE.allocateMemory(LEN);
+
+        static {
+            for (int k = 0; k < 1000; k++) {
+                for (int i = 0; i < LEN/2; i++) {
+                    UNSAFE.putInt(address+i, iseed);
+                }
+            }
+
+            UNSAFE.putInt(address + off1, iseed);
+            UNSAFE.putInt(address + off1 + off2, iseed);
+            UNSAFE.putInt(address + off3, iseed);
+        }
+    }
+
+    public static class TestShort {
+
+        private static long address = UNSAFE.allocateMemory(LEN);
+
+        static {
+            for (int k = 0; k < 10_000; k++) {
+                for (int i = 0; i < LEN/2; i++) {
+                    UNSAFE.putShort(address+i, sseed);
+                }
+            }
+
+            UNSAFE.putShort(address + off1 + 257, sseed);
+            UNSAFE.putShort(address + 277, sseed);
+            UNSAFE.putShort(address + off2 + 283, sseed);
+        }
+    }
+
+    public static class TestShortIndirect {
+
+        private static long address = UNSAFE.allocateMemory(LEN);
+
+        static {
+            for (int k = 0; k < 1000; k++) {
+                for (int i = 0; i < LEN/2; i++) {
+                    UNSAFE.putShort(address+i, sseed);
+                }
+            }
+
+            UNSAFE.putShort(address + off1, sseed);
+            UNSAFE.putShort(address + off1 + off2, sseed);
+            UNSAFE.putShort(address + off3, sseed);
+        }
+    }
+
+    public static class TestByte {
+
+        private static long address = UNSAFE.allocateMemory(LEN);
+
+        static {
+            for (int k = 0; k < 10_000; k++) {
+                for (int i = 0; i < LEN/2; i++) {
+                    UNSAFE.putByte(address+i, bseed);
+                }
+            }
+
+            UNSAFE.putByte(address + off1 + 257, bseed);
+            UNSAFE.putByte(address + 277, bseed);
+            UNSAFE.putByte(address + off2 + 283, bseed);
+        }
+    }
+
+    public static class TestByteIndirect {
+
+        private static long address = UNSAFE.allocateMemory(LEN);
+
+        static {
+            for (int k = 0; k < 1000; k++) {
+                for (int i = 0; i < LEN/2; i++) {
+                    UNSAFE.putByte(address+i, bseed);
+                }
+            }
+
+            UNSAFE.putByte(address + off1, bseed);
+            UNSAFE.putByte(address + off1 + off2, bseed);
+            UNSAFE.putByte(address + off3, bseed);
+        }
+    }
+
+    static void test() {
+        TestLong t1 = new TestLong();
+        Asserts.assertEquals(UNSAFE.getLong(t1.address + off1 + 1030), lseed, "put long failed!");
+        Asserts.assertEquals(UNSAFE.getLong(t1.address + 1023), lseed, "put long failed!");
+        Asserts.assertEquals(UNSAFE.getLong(t1.address + off2 + 1001), lseed, "put long failed!");
+
+        TestLongIndirect t2 = new TestLongIndirect();
+        Asserts.assertEquals(UNSAFE.getLong(t2.address + off1), lseed, "put long failed!");
+        Asserts.assertEquals(UNSAFE.getLong(t2.address + off1 + off2), lseed, "put long failed!");
+        Asserts.assertEquals(UNSAFE.getLong(t2.address + off3), lseed, "put long failed!");
+
+        TestInt t3 = new TestInt();
+        Asserts.assertEquals(UNSAFE.getInt(t3.address + off1 + 274), iseed, "put int failed!");
+        Asserts.assertEquals(UNSAFE.getInt(t3.address + 278), iseed, "put int failed!");
+        Asserts.assertEquals(UNSAFE.getInt(t3.address + off2 + 282), iseed, "put int failed!");
+
+        TestIntIndirect t4 = new TestIntIndirect();
+        Asserts.assertEquals(UNSAFE.getInt(t4.address + off1), iseed, "put int failed!");
+        Asserts.assertEquals(UNSAFE.getInt(t4.address + off1 + off2), iseed, "put int failed!");
+        Asserts.assertEquals(UNSAFE.getInt(t4.address + off3), iseed, "put int failed!");
+
+        TestShort t5 = new TestShort();
+        Asserts.assertEquals(UNSAFE.getShort(t5.address + off1 + 257), sseed, "put short failed!");
+        Asserts.assertEquals(UNSAFE.getShort(t5.address + 277), sseed, "put short failed!");
+        Asserts.assertEquals(UNSAFE.getShort(t5.address + off2 + 283), sseed, "put short failed!");
+
+        TestShortIndirect t6 = new TestShortIndirect();
+        Asserts.assertEquals(UNSAFE.getShort(t6.address + off1), sseed, "put short failed!");
+        Asserts.assertEquals(UNSAFE.getShort(t6.address + off1 + off2), sseed, "put short failed!");
+        Asserts.assertEquals(UNSAFE.getShort(t6.address + off3), sseed, "put short failed!");
+
+        TestByte t7 = new TestByte();
+        Asserts.assertEquals(UNSAFE.getByte(t7.address + off1 + 257), bseed, "put byte failed!");
+        Asserts.assertEquals(UNSAFE.getByte(t7.address + 277), bseed, "put byte failed!");
+        Asserts.assertEquals(UNSAFE.getByte(t7.address + off2 + 283), bseed, "put byte failed!");
+
+        TestByteIndirect t8 = new TestByteIndirect();
+        Asserts.assertEquals(UNSAFE.getByte(t8.address + off1), bseed, "put byte failed!");
+        Asserts.assertEquals(UNSAFE.getByte(t8.address + off1 + off2), bseed, "put byte failed!");
+        Asserts.assertEquals(UNSAFE.getByte(t8.address + off3), bseed, "put byte failed!");
+    }
+
+    public static void main(String[] strArr) {
+        test();
+    }
+}

From 2aeb12ec03944c777d617d0be48982fd225b16e7 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Fri, 26 Jul 2024 11:20:40 +0000
Subject: [PATCH 223/401] 8334482: Shenandoah: Deadlock when safepoint is
 pending during nmethods iteration

Reviewed-by: wkemper, xpeng, rkennke
---
 .../gc/shenandoah/shenandoahCodeRoots.cpp     | 13 +----
 .../gc/shenandoah/shenandoahConcurrentGC.cpp  | 21 +-------
 .../share/gc/shenandoah/shenandoahNMethod.cpp | 48 +++++++++++++------
 .../share/gc/shenandoah/shenandoahNMethod.hpp |  4 +-
 4 files changed, 39 insertions(+), 47 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp
index e61dca2bdbf6d..657cd681f4f64 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp
@@ -103,11 +103,6 @@ class ShenandoahDisarmNMethodsTask : public WorkerTask {
     WorkerTask("Shenandoah Disarm NMethods"),
     _iterator(ShenandoahCodeRoots::table()) {
     assert(SafepointSynchronize::is_at_safepoint(), "Only at a safepoint");
-    _iterator.nmethods_do_begin();
-  }
-
-  ~ShenandoahDisarmNMethodsTask() {
-    _iterator.nmethods_do_end();
   }
 
   virtual void work(uint worker_id) {
@@ -175,13 +170,7 @@ class ShenandoahUnlinkTask : public WorkerTask {
   ShenandoahUnlinkTask(bool unloading_occurred) :
     WorkerTask("Shenandoah Unlink NMethods"),
     _cl(unloading_occurred),
-    _iterator(ShenandoahCodeRoots::table()) {
-    _iterator.nmethods_do_begin();
-  }
-
-  ~ShenandoahUnlinkTask() {
-    _iterator.nmethods_do_end();
-  }
+    _iterator(ShenandoahCodeRoots::table()) {}
 
   virtual void work(uint worker_id) {
     _iterator.nmethods_do(&_cl);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
index aea0af2457500..ac2e732052a28 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
@@ -767,16 +767,9 @@ class ShenandoahConcurrentWeakRootsEvacUpdateTask : public WorkerTask {
     _vm_roots(phase),
     _cld_roots(phase, ShenandoahHeap::heap()->workers()->active_workers(), false /*heap iteration*/),
     _nmethod_itr(ShenandoahCodeRoots::table()),
-    _phase(phase) {
-    if (ShenandoahHeap::heap()->unload_classes()) {
-      _nmethod_itr.nmethods_do_begin();
-    }
-  }
+    _phase(phase) {}
 
   ~ShenandoahConcurrentWeakRootsEvacUpdateTask() {
-    if (ShenandoahHeap::heap()->unload_classes()) {
-      _nmethod_itr.nmethods_do_end();
-    }
     // Notify runtime data structures of potentially dead oops
     _vm_roots.report_num_dead();
   }
@@ -878,17 +871,7 @@ class ShenandoahConcurrentRootsEvacUpdateTask : public WorkerTask {
     _phase(phase),
     _vm_roots(phase),
     _cld_roots(phase, ShenandoahHeap::heap()->workers()->active_workers(), false /*heap iteration*/),
-    _nmethod_itr(ShenandoahCodeRoots::table()) {
-    if (!ShenandoahHeap::heap()->unload_classes()) {
-      _nmethod_itr.nmethods_do_begin();
-    }
-  }
-
-  ~ShenandoahConcurrentRootsEvacUpdateTask() {
-    if (!ShenandoahHeap::heap()->unload_classes()) {
-      _nmethod_itr.nmethods_do_end();
-    }
-  }
+    _nmethod_itr(ShenandoahCodeRoots::table()) {}
 
   void work(uint worker_id) {
     ShenandoahConcurrentWorkerSession worker_session(worker_id);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahNMethod.cpp b/src/hotspot/share/gc/shenandoah/shenandoahNMethod.cpp
index 54efd658eafdf..5eb0b277b5ef8 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahNMethod.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahNMethod.cpp
@@ -31,6 +31,7 @@
 #include "gc/shenandoah/shenandoahOopClosures.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "runtime/continuation.hpp"
+#include "runtime/safepointVerifiers.hpp"
 
 ShenandoahNMethod::ShenandoahNMethod(nmethod* nm, GrowableArray<oop*>& oops, bool non_immediate_oops) :
   _nm(nm), _oops(nullptr), _oops_count(0), _unregistered(false), _lock(), _ic_lock() {
@@ -475,21 +476,40 @@ void ShenandoahNMethodTableSnapshot::concurrent_nmethods_do(NMethodClosure* cl)
 }
 
 ShenandoahConcurrentNMethodIterator::ShenandoahConcurrentNMethodIterator(ShenandoahNMethodTable* table) :
-  _table(table), _table_snapshot(nullptr) {
-}
-
-void ShenandoahConcurrentNMethodIterator::nmethods_do_begin() {
-  MutexLocker mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
-  _table_snapshot = _table->snapshot_for_iteration();
-}
+  _table(table),
+  _table_snapshot(nullptr),
+  _started_workers(0),
+  _finished_workers(0) {}
 
 void ShenandoahConcurrentNMethodIterator::nmethods_do(NMethodClosure* cl) {
-  assert(_table_snapshot != nullptr, "Must first call nmethod_do_begin()");
-  _table_snapshot->concurrent_nmethods_do(cl);
-}
+  // Cannot safepoint when iteration is running, because this can cause deadlocks
+  // with other threads waiting on iteration to be over.
+  NoSafepointVerifier nsv;
 
-void ShenandoahConcurrentNMethodIterator::nmethods_do_end() {
-  MutexLocker mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
-  _table->finish_iteration(_table_snapshot);
-  CodeCache_lock->notify_all();
+  MutexLocker ml(CodeCache_lock, Mutex::_no_safepoint_check_flag);
+
+  if (_finished_workers > 0) {
+    // Some threads have already finished. We are now in rampdown: we are now
+    // waiting for all currently recorded workers to finish. No new workers
+    // should start.
+    return;
+  }
+
+  // Record a new worker and initialize the snapshot if it is a first visitor.
+  if (_started_workers++ == 0) {
+    _table_snapshot = _table->snapshot_for_iteration();
+  }
+
+  // All set, relinquish the lock and go concurrent.
+  {
+    MutexUnlocker mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
+    _table_snapshot->concurrent_nmethods_do(cl);
+  }
+
+  // Record completion. Last worker shuts down the iterator and notifies any waiters.
+  uint count = ++_finished_workers;
+  if (count == _started_workers) {
+    _table->finish_iteration(_table_snapshot);
+    CodeCache_lock->notify_all();
+  }
 }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahNMethod.hpp b/src/hotspot/share/gc/shenandoah/shenandoahNMethod.hpp
index 4e05d254db30a..c15953965001f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahNMethod.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahNMethod.hpp
@@ -181,13 +181,13 @@ class ShenandoahConcurrentNMethodIterator {
 private:
   ShenandoahNMethodTable*         const _table;
   ShenandoahNMethodTableSnapshot*       _table_snapshot;
+  uint                                  _started_workers;
+  uint                                  _finished_workers;
 
 public:
   ShenandoahConcurrentNMethodIterator(ShenandoahNMethodTable* table);
 
-  void nmethods_do_begin();
   void nmethods_do(NMethodClosure* cl);
-  void nmethods_do_end();
 };
 
 #endif // SHARE_GC_SHENANDOAH_SHENANDOAHNMETHOD_HPP

From 374fca0fcbc049f937fa49bb4825edcbbf961f2b Mon Sep 17 00:00:00 2001
From: Alexey Ivanov <aivanov@openjdk.org>
Date: Fri, 26 Jul 2024 11:22:32 +0000
Subject: [PATCH 224/401] 8335967: "text-decoration: none" does not work with
 "A" HTML tags

Reviewed-by: abhiscxk, dmarkov, honkar, prr
---
 .../classes/javax/swing/text/html/CSS.java    |   4 +
 .../HTMLDocument/HTMLTextDecorationNone.java  | 128 ++++++++++++++++++
 2 files changed, 132 insertions(+)
 create mode 100644 test/jdk/javax/swing/text/html/HTMLDocument/HTMLTextDecorationNone.java

diff --git a/src/java.desktop/share/classes/javax/swing/text/html/CSS.java b/src/java.desktop/share/classes/javax/swing/text/html/CSS.java
index 595799926a307..8239565a53f21 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/CSS.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/CSS.java
@@ -844,6 +844,10 @@ Object getInternalCSSValue(CSS.Attribute key, String value) {
     }
 
     static Object mergeTextDecoration(String value) {
+        if (value.startsWith("none")) {
+            return null;
+        }
+
         boolean underline = value.contains("underline");
         boolean strikeThrough = value.contains("line-through");
         if (!underline && !strikeThrough) {
diff --git a/test/jdk/javax/swing/text/html/HTMLDocument/HTMLTextDecorationNone.java b/test/jdk/javax/swing/text/html/HTMLDocument/HTMLTextDecorationNone.java
new file mode 100644
index 0000000000000..318626e5110a6
--- /dev/null
+++ b/test/jdk/javax/swing/text/html/HTMLDocument/HTMLTextDecorationNone.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.Dimension;
+import java.awt.Graphics;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+import javax.swing.JEditorPane;
+import javax.swing.text.View;
+import javax.swing.text.html.CSS;
+
+/*
+ * @test
+ * @bug 8335967
+ * @summary Tests 'text-decoration: none' is respected
+ * @run main HTMLTextDecorationNone
+ */
+public final class HTMLTextDecorationNone {
+    private static final String HTML = """
+            <!DOCTYPE html>
+            <html lang="en">
+            <head>
+                <meta charset="UTF-8">
+                <title>text-decoration: none (&lt;a&gt;)</title>
+                <style>
+                    a.none { text-decoration: none }
+                </style>
+            </head>
+            <body>
+            <p><a href="https://openjdk.org/">underlined</a></p>
+            <p><a href="https://openjdk.org/" style="text-decoration: none">not underlined</a></p>
+            <p><a href="https://openjdk.org/" class="none">not underlined</a></p>
+            <p style="text-decoration: underline"><a
+                   href="https://openjdk.org/" style="text-decoration: none">underlined?</a></p>
+            <p style="text-decoration: underline"><a
+                   href="https://openjdk.org/" class="none">underlined?</a></p>
+            </body>
+            </html>
+            """;
+
+    private static final boolean[] underlined = {true, false, false, true, true};
+
+    public static void main(String[] args) {
+        final JEditorPane html = new JEditorPane("text/html", HTML);
+        html.setEditable(false);
+
+        final Dimension size = html.getPreferredSize();
+        html.setSize(size);
+
+        BufferedImage image = new BufferedImage(size.width, size.height,
+                                                BufferedImage.TYPE_INT_RGB);
+        Graphics g = image.createGraphics();
+        // Paint the editor pane to ensure all views are created
+        html.paint(g);
+        g.dispose();
+
+        int errorCount = 0;
+        String firstError = null;
+
+        System.out.println("----- Views -----");
+        final View bodyView = html.getUI()
+                                  .getRootView(html)
+                                  .getView(1)
+                                  .getView(1);
+        for (int i = 0; i < bodyView.getViewCount(); i++) {
+            View pView = bodyView.getView(i);
+            View contentView = getContentView(pView);
+
+            Object decorationAttr =
+                    contentView.getAttributes()
+                               .getAttribute(CSS.Attribute.TEXT_DECORATION);
+            String decoration = decorationAttr == null
+                                ? "none" : decorationAttr.toString();
+
+            System.out.println(i + ": " + decoration);
+            if (decoration.contains("underline") != underlined[i]) {
+                errorCount++;
+                if (firstError == null) {
+                    firstError = "Line " + i + ": " + decoration + " vs "
+                                 + (underlined[i] ? "underline" : "none");
+                }
+            }
+        }
+
+        if (errorCount > 0) {
+            saveImage(image);
+            throw new RuntimeException(errorCount + " error(s) found, "
+                                       + "the first one: " + firstError);
+        }
+    }
+
+    private static View getContentView(View parent) {
+        View view = parent.getView(0);
+        return view.getViewCount() > 0
+               ? getContentView(view)
+               : view;
+    }
+
+    private static void saveImage(BufferedImage image) {
+        try {
+            ImageIO.write(image, "png",
+                          new File("html.png"));
+        } catch (IOException ignored) { }
+    }
+}

From 5ff7c57f9ff5428ef3d2aedd7e860bb1e8ff29ea Mon Sep 17 00:00:00 2001
From: Shaojin Wen <shaojin.wensj@alibaba-inc.com>
Date: Fri, 26 Jul 2024 12:10:21 +0000
Subject: [PATCH 225/401] 8337168: Optimize LocalDateTime.toString

Reviewed-by: liach, naoto
---
 .../share/classes/java/time/LocalDate.java    | 20 +++++++++++++------
 .../classes/java/time/LocalDateTime.java      |  8 ++++++--
 .../share/classes/java/time/LocalTime.java    | 12 +++++++++--
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/java.base/share/classes/java/time/LocalDate.java b/src/java.base/share/classes/java/time/LocalDate.java
index b0d7ad33c8a3e..2d71fb1ceca54 100644
--- a/src/java.base/share/classes/java/time/LocalDate.java
+++ b/src/java.base/share/classes/java/time/LocalDate.java
@@ -2147,11 +2147,20 @@ public int hashCode() {
      */
     @Override
     public String toString() {
+        var buf = new StringBuilder(10);
+        formatTo(buf);
+        return buf.toString();
+    }
+
+    /**
+     * Prints the toString result to the given buf, avoiding extra string allocations.
+     * Requires extra capacity of 10 to avoid StringBuilder reallocation.
+     */
+    void formatTo(StringBuilder buf) {
         int yearValue = year;
         int monthValue = month;
         int dayValue = day;
         int absYear = Math.abs(yearValue);
-        StringBuilder buf = new StringBuilder(10);
         if (absYear < 1000) {
             if (yearValue < 0) {
                 buf.append('-');
@@ -2164,11 +2173,10 @@ public String toString() {
             }
             buf.append(yearValue);
         }
-        return buf.append(monthValue < 10 ? "-0" : "-")
-            .append(monthValue)
-            .append(dayValue < 10 ? "-0" : "-")
-            .append(dayValue)
-            .toString();
+        buf.append(monthValue < 10 ? "-0" : "-")
+           .append(monthValue)
+           .append(dayValue < 10 ? "-0" : "-")
+           .append(dayValue);
     }
 
     //-----------------------------------------------------------------------
diff --git a/src/java.base/share/classes/java/time/LocalDateTime.java b/src/java.base/share/classes/java/time/LocalDateTime.java
index 024aa1dacbeda..d14afb7d78f9a 100644
--- a/src/java.base/share/classes/java/time/LocalDateTime.java
+++ b/src/java.base/share/classes/java/time/LocalDateTime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1965,7 +1965,11 @@ public int hashCode() {
      */
     @Override
     public String toString() {
-        return date.toString() + 'T' + time.toString();
+        var buf = new StringBuilder(29);
+        date.formatTo(buf);
+        buf.append('T');
+        time.formatTo(buf);
+        return buf.toString();
     }
 
     //-----------------------------------------------------------------------
diff --git a/src/java.base/share/classes/java/time/LocalTime.java b/src/java.base/share/classes/java/time/LocalTime.java
index fd2c5ce4d4563..f28f8d3c5998a 100644
--- a/src/java.base/share/classes/java/time/LocalTime.java
+++ b/src/java.base/share/classes/java/time/LocalTime.java
@@ -1631,7 +1631,16 @@ public int hashCode() {
      */
     @Override
     public String toString() {
-        StringBuilder buf = new StringBuilder(18);
+        var buf = new StringBuilder(18);
+        formatTo(buf);
+        return buf.toString();
+    }
+
+    /**
+     * Prints the toString result to the given buf, avoiding extra string allocations.
+     * Requires extra capacity of 18 to avoid StringBuilder reallocation.
+     */
+    void formatTo(StringBuilder buf) {
         int hourValue = hour;
         int minuteValue = minute;
         int secondValue = second;
@@ -1657,7 +1666,6 @@ public String toString() {
                 buf.append(digits);
             }
         }
-        return buf.toString();
     }
 
     //-----------------------------------------------------------------------

From 3abe8a6e5e459fb764b8cef2425be50fe1a83fab Mon Sep 17 00:00:00 2001
From: Tomas Zezula <tzezula@openjdk.org>
Date: Fri, 26 Jul 2024 14:42:24 +0000
Subject: [PATCH 226/401] 8336663: [JVMCI] VM Crash on ZGC due to incompatible
 handle returned by HotSpotJVMCIRuntime#getJObjectValue

Reviewed-by: dnsimon, never
---
 src/hotspot/share/jvmci/jvmciCompilerToVM.cpp | 18 +++++++++++++
 .../jdk/vm/ci/hotspot/CompilerToVM.java       |  6 +++++
 .../vm/ci/hotspot/HotSpotJVMCIRuntime.java    | 26 +++++++++----------
 3 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
index 5583ad8a6f5be..fb49e9baca2b9 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
@@ -94,6 +94,12 @@ static void requireInHotSpot(const char* caller, JVMCI_TRAPS) {
   }
 }
 
+static void requireNotInHotSpot(const char* caller, JVMCI_TRAPS) {
+    if (JVMCIENV->is_hotspot()) {
+        JVMCI_THROW_MSG(IllegalStateException, err_msg("Cannot call %s from HotSpot", caller));
+    }
+}
+
 class JVMCITraceMark : public StackObj {
   const char* _msg;
  public:
@@ -702,6 +708,17 @@ C2V_VMENTRY_NULL(jobject, lookupJClass, (JNIEnv* env, jobject, jlong jclass_valu
     return JVMCIENV->get_jobject(result);
 C2V_END
 
+C2V_VMENTRY_0(jlong, getJObjectValue, (JNIEnv* env, jobject, jobject constant_jobject))
+    requireNotInHotSpot("getJObjectValue", JVMCI_CHECK_0);
+    if (!THREAD->has_last_Java_frame()) {
+        JVMCI_THROW_MSG_0(IllegalStateException, err_msg("Cannot call getJObjectValue without Java frame anchor"));
+    }
+    JVMCIObject constant = JVMCIENV->wrap(constant_jobject);
+    Handle constant_value = JVMCIENV->asConstant(constant, JVMCI_CHECK_0);
+    jobject jni_handle = JNIHandles::make_local(THREAD, constant_value());
+    return reinterpret_cast<jlong>(jni_handle);
+C2V_END
+
 C2V_VMENTRY_NULL(jobject, getUncachedStringInPool, (JNIEnv* env, jobject, ARGUMENT_PAIR(cp), jint index))
   constantPoolHandle cp(THREAD, UNPACK_PAIR(ConstantPool, cp));
   constantTag tag = cp->tag_at(index);
@@ -3254,6 +3271,7 @@ JNINativeMethod CompilerToVM::methods[] = {
   {CC "shouldInlineMethod",                           CC "(" HS_METHOD2 ")Z",                                                               FN_PTR(shouldInlineMethod)},
   {CC "lookupType",                                   CC "(" STRING HS_KLASS2 "IZ)" HS_RESOLVED_TYPE,                                       FN_PTR(lookupType)},
   {CC "lookupJClass",                                 CC "(J)" HS_RESOLVED_TYPE,                                                            FN_PTR(lookupJClass)},
+  {CC "getJObjectValue",                              CC "(" OBJECTCONSTANT ")J",                                                           FN_PTR(getJObjectValue)},
   {CC "getArrayType",                                 CC "(C" HS_KLASS2 ")" HS_KLASS,                                                       FN_PTR(getArrayType)},
   {CC "lookupClass",                                  CC "(" CLASS ")" HS_RESOLVED_TYPE,                                                    FN_PTR(lookupClass)},
   {CC "lookupNameInPool",                             CC "(" HS_CONSTANT_POOL2 "II)" STRING,                                                FN_PTR(lookupNameInPool)},
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java
index 14646fd027521..593697545266d 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/CompilerToVM.java
@@ -289,6 +289,12 @@ HotSpotResolvedJavaType lookupType(ClassLoader classLoader, String name) throws
 
     native HotSpotResolvedJavaType lookupJClass(long jclass);
 
+    /**
+     * Gets the {@code jobject} value wrapped by {@code peerObject}.
+     * Must not be called if {@link Services#IS_IN_NATIVE_IMAGE} is {@code false}.
+     */
+    native long getJObjectValue(HotSpotObjectConstantImpl peerObject);
+
     /**
      * Resolves the entry at index {@code cpi} in {@code constantPool} to an interned String object.
      *
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
index 3dcf855ff230f..3fd92f8dee5df 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
@@ -925,23 +925,23 @@ JavaType lookupTypeInternal(String name, HotSpotResolvedObjectType accessingType
     }
 
     /**
-     * Gets the {@code jobject} value wrapped by {@code peerObject}. The returned "naked" value is
-     * only valid as long as {@code peerObject} is valid. Note that the latter may be shorter than
-     * the lifetime of {@code peerObject}. As such, this method should only be used to pass an
-     * object parameter across a JNI call from the JVMCI shared library to HotSpot. This method must
-     * only be called from within the JVMCI shared library.
+     * Gets the {@code jobject} value wrapped by {@code peerObject}. The returned value is
+     * a JNI local reference whose lifetime is scoped by the nearest Java caller (from
+     * HotSpot's perspective). You can use {@code PushLocalFrame} and {@code PopLocalFrame} to
+     * shorten the lifetime of the reference. The current thread's state must be
+     * {@code _thread_in_native}. A call from the JVMCI shared library (e.g. libgraal) is in such
+     * a state.
      *
-     * @param peerObject a reference to an object in the peer runtime
-     * @return the {@code jobject} value wrapped by {@code peerObject}
+     * @param peerObject a reference to an object in the HotSpot heap
+     * @return the {@code jobject} value unpacked from {@code peerObject}
      * @throws IllegalArgumentException if the current runtime is not the JVMCI shared library or
-     *             {@code peerObject} is not a peer object reference
+     *             {@code peerObject} is not a HotSpot heap object reference
+     * @throws IllegalStateException if not called from within the JVMCI shared library
+     *         or if there is no Java caller frame on the stack
+     *         (i.e., JavaThread::has_last_Java_frame returns false)
      */
     public long getJObjectValue(HotSpotObjectConstant peerObject) {
-        if (peerObject instanceof IndirectHotSpotObjectConstantImpl) {
-            IndirectHotSpotObjectConstantImpl remote = (IndirectHotSpotObjectConstantImpl) peerObject;
-            return remote.getHandle();
-        }
-        throw new IllegalArgumentException("Cannot get jobject value for " + peerObject + " (" + peerObject.getClass().getName() + ")");
+        return compilerToVm.getJObjectValue((HotSpotObjectConstantImpl)peerObject);
     }
 
     @Override

From 4bcb8f04ed3623da7c84dda28017f473cbc97e53 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Fri, 26 Jul 2024 15:45:12 +0000
Subject: [PATCH 227/401] 8337243: Fix more -Wzero-as-null-pointer-constant
 warnings in compiler code

Reviewed-by: vlivanov, kvn
---
 src/hotspot/share/c1/c1_LIRGenerator.cpp     | 4 ++--
 src/hotspot/share/ci/ciConstantPoolCache.cpp | 4 ++--
 src/hotspot/share/ci/ciStreams.cpp           | 4 ++--
 src/hotspot/share/code/codeCache.cpp         | 4 ++--
 src/hotspot/share/code/dependencies.cpp      | 2 +-
 src/hotspot/share/code/nmethod.cpp           | 2 +-
 src/hotspot/share/code/oopRecorder.cpp       | 8 ++++----
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/hotspot/share/c1/c1_LIRGenerator.cpp b/src/hotspot/share/c1/c1_LIRGenerator.cpp
index cd08413565808..7b519804bfecd 100644
--- a/src/hotspot/share/c1/c1_LIRGenerator.cpp
+++ b/src/hotspot/share/c1/c1_LIRGenerator.cpp
@@ -1300,7 +1300,7 @@ void LIRGenerator::do_isPrimitive(Intrinsic* x) {
   }
 
   __ move(new LIR_Address(rcvr.result(), java_lang_Class::klass_offset(), T_ADDRESS), temp, info);
-  __ cmp(lir_cond_notEqual, temp, LIR_OprFact::metadataConst(0));
+  __ cmp(lir_cond_notEqual, temp, LIR_OprFact::metadataConst(nullptr));
   __ cmove(lir_cond_notEqual, LIR_OprFact::intConst(0), LIR_OprFact::intConst(1), result, T_BOOLEAN);
 }
 
@@ -1333,7 +1333,7 @@ void LIRGenerator::do_getModifiers(Intrinsic* x) {
 
   // Check if this is a Java mirror of primitive type, and select the appropriate klass.
   LIR_Opr klass = new_register(T_METADATA);
-  __ cmp(lir_cond_equal, recv_klass, LIR_OprFact::metadataConst(0));
+  __ cmp(lir_cond_equal, recv_klass, LIR_OprFact::metadataConst(nullptr));
   __ cmove(lir_cond_equal, prim_klass, recv_klass, klass, T_ADDRESS);
 
   // Get the answer.
diff --git a/src/hotspot/share/ci/ciConstantPoolCache.cpp b/src/hotspot/share/ci/ciConstantPoolCache.cpp
index 8dc9cfc75e14b..e831516b0f70b 100644
--- a/src/hotspot/share/ci/ciConstantPoolCache.cpp
+++ b/src/hotspot/share/ci/ciConstantPoolCache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@
 ciConstantPoolCache::ciConstantPoolCache(Arena* arena,
                                  int expected_size) {
   _elements =
-    new (arena) GrowableArray<void*>(arena, expected_size, 0, 0);
+    new (arena) GrowableArray<void*>(arena, expected_size, 0, nullptr);
   _keys = new (arena) GrowableArray<int>(arena, expected_size, 0, 0);
 }
 
diff --git a/src/hotspot/share/ci/ciStreams.cpp b/src/hotspot/share/ci/ciStreams.cpp
index 8220910d74c34..18d2a46a6862c 100644
--- a/src/hotspot/share/ci/ciStreams.cpp
+++ b/src/hotspot/share/ci/ciStreams.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -135,7 +135,7 @@ Bytecodes::Code ciBytecodeStream::next_wide_or_table(Bytecodes::Code bc) {
 // ------------------------------------------------------------------
 // ciBytecodeStream::reset_to_bci
 void ciBytecodeStream::reset_to_bci( int bci ) {
-  _bc_start=_was_wide=0;
+  _bc_start = _was_wide = nullptr;
   _pc = _start+bci;
 }
 
diff --git a/src/hotspot/share/code/codeCache.cpp b/src/hotspot/share/code/codeCache.cpp
index 4a54fd8d0a9c2..ea01dd759587a 100644
--- a/src/hotspot/share/code/codeCache.cpp
+++ b/src/hotspot/share/code/codeCache.cpp
@@ -165,8 +165,8 @@ class CodeBlob_sizes {
 // Iterate over all CodeBlobs (cb) on the given CodeHeap
 #define FOR_ALL_BLOBS(cb, heap) for (CodeBlob* cb = first_blob(heap); cb != nullptr; cb = next_blob(heap, cb))
 
-address CodeCache::_low_bound = 0;
-address CodeCache::_high_bound = 0;
+address CodeCache::_low_bound = nullptr;
+address CodeCache::_high_bound = nullptr;
 volatile int CodeCache::_number_of_nmethods_with_dependencies = 0;
 ExceptionCache* volatile CodeCache::_exception_cache_purge_list = nullptr;
 
diff --git a/src/hotspot/share/code/dependencies.cpp b/src/hotspot/share/code/dependencies.cpp
index 7d3b744313f12..074846e2e7919 100644
--- a/src/hotspot/share/code/dependencies.cpp
+++ b/src/hotspot/share/code/dependencies.cpp
@@ -72,7 +72,7 @@ void Dependencies::initialize(ciEnv* env) {
 #endif
   DEBUG_ONLY(_deps[end_marker] = nullptr);
   for (int i = (int)FIRST_TYPE; i < (int)TYPE_LIMIT; i++) {
-    _deps[i] = new(arena) GrowableArray<ciBaseObject*>(arena, 10, 0, 0);
+    _deps[i] = new(arena) GrowableArray<ciBaseObject*>(arena, 10, 0, nullptr);
   }
   _content_bytes = nullptr;
   _size_in_bytes = (size_t)-1;
diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index 54aeac6be0495..0bab731ac565e 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -3270,7 +3270,7 @@ void nmethod::print_recorded_oop(int log_n, int i) {
   if (value == Universe::non_oop_word()) {
     tty->print("non-oop word");
   } else {
-    if (value == 0) {
+    if (value == nullptr) {
       tty->print("nullptr-oop");
     } else {
       oop_at(i)->print_value_on(tty);
diff --git a/src/hotspot/share/code/oopRecorder.cpp b/src/hotspot/share/code/oopRecorder.cpp
index b8ecc1eccc0d1..fd13b1050410e 100644
--- a/src/hotspot/share/code/oopRecorder.cpp
+++ b/src/hotspot/share/code/oopRecorder.cpp
@@ -68,11 +68,11 @@ template <class T> void ValueRecorder<T>::copy_values_to(nmethod* nm) {
 template <class T> void ValueRecorder<T>::maybe_initialize() {
   if (_handles == nullptr) {
     if (_arena != nullptr) {
-      _handles  = new(_arena) GrowableArray<T>(_arena, 10, 0, 0);
-      _no_finds = new(_arena) GrowableArray<int>(    _arena, 10, 0, 0);
+      _handles  = new(_arena) GrowableArray<T>(_arena, 10, 0, T{});
+      _no_finds = new(_arena) GrowableArray<int>(_arena, 10, 0, 0);
     } else {
-      _handles  = new GrowableArray<T>(10, 0, 0);
-      _no_finds = new GrowableArray<int>(    10, 0, 0);
+      _handles  = new GrowableArray<T>(10, 0, T{});
+      _no_finds = new GrowableArray<int>(10, 0, 0);
     }
   }
 }

From f35af7171213c09107b99104a73022853bff91b0 Mon Sep 17 00:00:00 2001
From: Kelvin Nilsen <kdnilsen@openjdk.org>
Date: Fri, 26 Jul 2024 15:55:12 +0000
Subject: [PATCH 228/401] 8334315: Shenandoah: reduce GC logging noise

Reviewed-by: wkemper, ysr, shade
---
 .../share/gc/shenandoah/shenandoahFreeSet.cpp | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
index 582c0d18d3ede..b47bb109031c8 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
@@ -48,19 +48,19 @@ static const char* partition_name(ShenandoahFreeSetPartitionId t) {
 
 #ifndef PRODUCT
 void ShenandoahRegionPartitions::dump_bitmap() const {
-  log_info(gc)("Mutator range [" SSIZE_FORMAT ", " SSIZE_FORMAT "], Collector range [" SSIZE_FORMAT ", " SSIZE_FORMAT "]",
-               _leftmosts[int(ShenandoahFreeSetPartitionId::Mutator)],
-               _rightmosts[int(ShenandoahFreeSetPartitionId::Mutator)],
-               _leftmosts[int(ShenandoahFreeSetPartitionId::Collector)],
-               _rightmosts[int(ShenandoahFreeSetPartitionId::Collector)]);
-  log_info(gc)("Empty Mutator range [" SSIZE_FORMAT ", " SSIZE_FORMAT
-               "], Empty Collector range [" SSIZE_FORMAT ", " SSIZE_FORMAT "]",
-               _leftmosts_empty[int(ShenandoahFreeSetPartitionId::Mutator)],
-               _rightmosts_empty[int(ShenandoahFreeSetPartitionId::Mutator)],
-               _leftmosts_empty[int(ShenandoahFreeSetPartitionId::Collector)],
-               _rightmosts_empty[int(ShenandoahFreeSetPartitionId::Collector)]);
-
-  log_info(gc)("%6s: %18s %18s %18s", "index", "Mutator Bits", "Collector Bits", "NotFree Bits");
+  log_debug(gc)("Mutator range [" SSIZE_FORMAT ", " SSIZE_FORMAT "], Collector range [" SSIZE_FORMAT ", " SSIZE_FORMAT "]",
+                _leftmosts[int(ShenandoahFreeSetPartitionId::Mutator)],
+                _rightmosts[int(ShenandoahFreeSetPartitionId::Mutator)],
+                _leftmosts[int(ShenandoahFreeSetPartitionId::Collector)],
+                _rightmosts[int(ShenandoahFreeSetPartitionId::Collector)]);
+  log_debug(gc)("Empty Mutator range [" SSIZE_FORMAT ", " SSIZE_FORMAT
+                "], Empty Collector range [" SSIZE_FORMAT ", " SSIZE_FORMAT "]",
+                _leftmosts_empty[int(ShenandoahFreeSetPartitionId::Mutator)],
+                _rightmosts_empty[int(ShenandoahFreeSetPartitionId::Mutator)],
+                _leftmosts_empty[int(ShenandoahFreeSetPartitionId::Collector)],
+                _rightmosts_empty[int(ShenandoahFreeSetPartitionId::Collector)]);
+
+  log_debug(gc)("%6s: %18s %18s %18s", "index", "Mutator Bits", "Collector Bits", "NotFree Bits");
   dump_bitmap_range(0, _max-1);
 }
 
@@ -83,8 +83,8 @@ void ShenandoahRegionPartitions::dump_bitmap_row(idx_t region_idx) const {
   uintx collector_bits = _membership[int(ShenandoahFreeSetPartitionId::Collector)].bits_at(aligned_idx);
   uintx free_bits = mutator_bits | collector_bits;
   uintx notfree_bits =  ~free_bits;
-  log_info(gc)(SSIZE_FORMAT_W(6) ": " SIZE_FORMAT_X_0 " 0x" SIZE_FORMAT_X_0 " 0x" SIZE_FORMAT_X_0,
-               aligned_idx, mutator_bits, collector_bits, notfree_bits);
+  log_debug(gc)(SSIZE_FORMAT_W(6) ": " SIZE_FORMAT_X_0 " 0x" SIZE_FORMAT_X_0 " 0x" SIZE_FORMAT_X_0,
+                aligned_idx, mutator_bits, collector_bits, notfree_bits);
 }
 #endif
 
@@ -1060,8 +1060,8 @@ void ShenandoahFreeSet::move_regions_from_collector_to_mutator(size_t max_xfer_r
   }
 
   size_t collector_xfer = collector_empty_xfer + collector_not_empty_xfer;
-  log_info(gc)("At start of update refs, moving " SIZE_FORMAT "%s to Mutator free partition from Collector Reserve",
-               byte_size_in_proper_unit(collector_xfer), proper_unit_for_byte_size(collector_xfer));
+  log_info(gc, ergo)("At start of update refs, moving " SIZE_FORMAT "%s to Mutator free partition from Collector Reserve",
+                     byte_size_in_proper_unit(collector_xfer), proper_unit_for_byte_size(collector_xfer));
 }
 
 void ShenandoahFreeSet::prepare_to_rebuild(size_t &cset_regions) {

From 4f194f10a1481cdc9df4e6338f6cabd07a34c84c Mon Sep 17 00:00:00 2001
From: William Kemper <wkemper@openjdk.org>
Date: Fri, 26 Jul 2024 15:57:58 +0000
Subject: [PATCH 229/401] 8337241: Shenandoah: Normalize include guards

Reviewed-by: shade
---
 src/hotspot/share/gc/shenandoah/shenandoahController.hpp    | 6 +++---
 src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.hpp    | 6 +++---
 .../share/gc/shenandoah/shenandoahMarkBitMap.inline.hpp     | 6 +++---
 .../share/gc/shenandoah/shenandoahReferenceProcessor.hpp    | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahController.hpp b/src/hotspot/share/gc/shenandoah/shenandoahController.hpp
index 2808f30b44459..6c28ff4e969c7 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahController.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahController.hpp
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef LINUX_X86_64_SERVER_SLOWDEBUG_SHENANDOAHCONTROLLER_HPP
-#define LINUX_X86_64_SERVER_SLOWDEBUG_SHENANDOAHCONTROLLER_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHCONTROLLER_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHCONTROLLER_HPP
 
 #include "gc/shared/gcCause.hpp"
 #include "gc/shared/concurrentGCThread.hpp"
@@ -102,4 +102,4 @@ class ShenandoahController: public ConcurrentGCThread {
   size_t get_gc_id();
   void update_gc_id();
 };
-#endif //LINUX_X86_64_SERVER_SLOWDEBUG_SHENANDOAHCONTROLLER_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHCONTROLLER_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.hpp
index 40f48bae6f55a..06ea6a8e232b8 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.hpp
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKBITMAP_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKBITMAP_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHMARKBITMAP_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHMARKBITMAP_HPP
 
 #include "memory/memRegion.hpp"
 #include "runtime/atomic.hpp"
@@ -176,4 +176,4 @@ class ShenandoahMarkBitMap {
 
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKBITMAP_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHMARKBITMAP_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.inline.hpp
index 62c0eaea139a2..bf9261f47ac5c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkBitMap.inline.hpp
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKBITMAP_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKBITMAP_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHMARKBITMAP_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHMARKBITMAP_INLINE_HPP
 
 #include "gc/shenandoah/shenandoahMarkBitMap.hpp"
 
@@ -205,4 +205,4 @@ inline void ShenandoahMarkBitMap::clear_range_of_words(idx_t beg, idx_t end) {
 }
 
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKBITMAP_INLINE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHMARKBITMAP_INLINE_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.hpp b/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.hpp
index c4ecf8d359a17..fa5235517907e 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.hpp
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHREFERENCEPROCESSOR_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHREFERENCEPROCESSOR_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHREFERENCEPROCESSOR_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHREFERENCEPROCESSOR_HPP
 
 #include "gc/shared/referenceDiscoverer.hpp"
 #include "gc/shared/referencePolicy.hpp"
@@ -188,4 +188,4 @@ class ShenandoahReferenceProcessor : public ReferenceDiscoverer {
   void abandon_partial_discovery();
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHREFERENCEPROCESSOR_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHREFERENCEPROCESSOR_HPP

From 0c3720b42176c7bc92105be87df7449973fbcea0 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhiscxk@openjdk.org>
Date: Fri, 26 Jul 2024 17:39:00 +0000
Subject: [PATCH 230/401] 8335131: Test
 "javax/swing/JColorChooser/Test6977726.java" failed on ubuntu x64 because
 "Preview" title is missing for GTK L&F

Reviewed-by: dnguyen, psadhukhan
---
 test/jdk/javax/swing/JColorChooser/Test6977726.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/test/jdk/javax/swing/JColorChooser/Test6977726.java b/test/jdk/javax/swing/JColorChooser/Test6977726.java
index a79931c93eb55..1ec72036f14d3 100644
--- a/test/jdk/javax/swing/JColorChooser/Test6977726.java
+++ b/test/jdk/javax/swing/JColorChooser/Test6977726.java
@@ -41,7 +41,14 @@ public static void main(String[] args) throws Exception {
         String instructions = """
                 Check that there is a panel with "Text Preview Panel" text
                 and with title "Preview" in the JColorChooser.
-                Test passes if the panel is as described, test fails otherwise.""";
+                Test passes if the panel is as described, test fails otherwise.
+
+                Note: "Preview" title is not applicable for GTK Look and Feel.""";
+
+        // In case this test is run with GTK L&F, the preview panel title
+        // is missing due to the "ColorChooser.showPreviewPanelText" property
+        // which is set to "Boolean.FALSE" for GTK L&F. Test instructions are
+        // modified to reflect that "Preview" title is not applicable for GTK L&F.
 
         PassFailJFrame.builder()
                 .title("Test6977726")

From abc4ca5a8c440f8f3f36a9b35036772c5b5ee7ea Mon Sep 17 00:00:00 2001
From: Alex Menkov <amenkov@openjdk.org>
Date: Fri, 26 Jul 2024 17:55:35 +0000
Subject: [PATCH 231/401] 8330427: Obsolete -XX:+PreserveAllAnnotations

Reviewed-by: dholmes, sspitsyn, coleenp
---
 .../share/classfile/classFileParser.cpp       | 166 +++-------------
 .../share/classfile/classFileParser.hpp       |  14 +-
 .../prims/jvmtiClassFileReconstituter.cpp     |  34 +---
 .../prims/jvmtiClassFileReconstituter.hpp     |   7 -
 src/hotspot/share/runtime/arguments.cpp       |   2 +-
 src/hotspot/share/runtime/globals.hpp         |   4 -
 .../RetransformRecordAnnotation.java          | 187 ------------------
 7 files changed, 39 insertions(+), 375 deletions(-)
 delete mode 100644 test/jdk/java/lang/instrument/RetransformRecordAnnotation.java

diff --git a/src/hotspot/share/classfile/classFileParser.cpp b/src/hotspot/share/classfile/classFileParser.cpp
index bceade3b51b95..ddde58e5d20b3 100644
--- a/src/hotspot/share/classfile/classFileParser.cpp
+++ b/src/hotspot/share/classfile/classFileParser.cpp
@@ -1227,12 +1227,8 @@ void ClassFileParser::parse_field_attributes(const ClassFileStream* const cfs,
   bool is_synthetic = false;
   const u1* runtime_visible_annotations = nullptr;
   int runtime_visible_annotations_length = 0;
-  const u1* runtime_invisible_annotations = nullptr;
-  int runtime_invisible_annotations_length = 0;
   const u1* runtime_visible_type_annotations = nullptr;
   int runtime_visible_type_annotations_length = 0;
-  const u1* runtime_invisible_type_annotations = nullptr;
-  int runtime_invisible_type_annotations_length = 0;
   bool runtime_invisible_annotations_exists = false;
   bool runtime_invisible_type_annotations_exists = false;
   const ConstantPool* const cp = _cp;
@@ -1315,11 +1311,6 @@ void ClassFileParser::parse_field_attributes(const ClassFileStream* const cfs,
           return;
         }
         runtime_invisible_annotations_exists = true;
-        if (PreserveAllAnnotations) {
-          runtime_invisible_annotations_length = attribute_length;
-          runtime_invisible_annotations = cfs->current();
-          assert(runtime_invisible_annotations != nullptr, "null invisible annotations");
-        }
         cfs->skip_u1(attribute_length, CHECK);
       } else if (attribute_name == vmSymbols::tag_runtime_visible_type_annotations()) {
         if (runtime_visible_type_annotations != nullptr) {
@@ -1339,11 +1330,6 @@ void ClassFileParser::parse_field_attributes(const ClassFileStream* const cfs,
         } else {
           runtime_invisible_type_annotations_exists = true;
         }
-        if (PreserveAllAnnotations) {
-          runtime_invisible_type_annotations_length = attribute_length;
-          runtime_invisible_type_annotations = cfs->current();
-          assert(runtime_invisible_type_annotations != nullptr, "null invisible type annotations");
-        }
         cfs->skip_u1(attribute_length, CHECK);
       } else {
         cfs->skip_u1(attribute_length, CHECK);  // Skip unknown attributes
@@ -1356,16 +1342,12 @@ void ClassFileParser::parse_field_attributes(const ClassFileStream* const cfs,
   *constantvalue_index_addr = constantvalue_index;
   *is_synthetic_addr = is_synthetic;
   *generic_signature_index_addr = generic_signature_index;
-  AnnotationArray* a = assemble_annotations(runtime_visible_annotations,
+  AnnotationArray* a = allocate_annotations(runtime_visible_annotations,
                                             runtime_visible_annotations_length,
-                                            runtime_invisible_annotations,
-                                            runtime_invisible_annotations_length,
                                             CHECK);
   parsed_annotations->set_field_annotations(a);
-  a = assemble_annotations(runtime_visible_type_annotations,
+  a = allocate_annotations(runtime_visible_type_annotations,
                            runtime_visible_type_annotations_length,
-                           runtime_invisible_type_annotations,
-                           runtime_invisible_type_annotations_length,
                            CHECK);
   parsed_annotations->set_field_type_annotations(a);
   return;
@@ -2164,57 +2146,40 @@ void ClassFileParser::copy_localvariable_table(const ConstMethod* cm,
 void ClassFileParser::copy_method_annotations(ConstMethod* cm,
                                        const u1* runtime_visible_annotations,
                                        int runtime_visible_annotations_length,
-                                       const u1* runtime_invisible_annotations,
-                                       int runtime_invisible_annotations_length,
                                        const u1* runtime_visible_parameter_annotations,
                                        int runtime_visible_parameter_annotations_length,
-                                       const u1* runtime_invisible_parameter_annotations,
-                                       int runtime_invisible_parameter_annotations_length,
                                        const u1* runtime_visible_type_annotations,
                                        int runtime_visible_type_annotations_length,
-                                       const u1* runtime_invisible_type_annotations,
-                                       int runtime_invisible_type_annotations_length,
                                        const u1* annotation_default,
                                        int annotation_default_length,
                                        TRAPS) {
 
   AnnotationArray* a;
 
-  if (runtime_visible_annotations_length +
-      runtime_invisible_annotations_length > 0) {
-     a = assemble_annotations(runtime_visible_annotations,
+  if (runtime_visible_annotations_length > 0) {
+     a = allocate_annotations(runtime_visible_annotations,
                               runtime_visible_annotations_length,
-                              runtime_invisible_annotations,
-                              runtime_invisible_annotations_length,
                               CHECK);
      cm->set_method_annotations(a);
   }
 
-  if (runtime_visible_parameter_annotations_length +
-      runtime_invisible_parameter_annotations_length > 0) {
-    a = assemble_annotations(runtime_visible_parameter_annotations,
+  if (runtime_visible_parameter_annotations_length > 0) {
+    a = allocate_annotations(runtime_visible_parameter_annotations,
                              runtime_visible_parameter_annotations_length,
-                             runtime_invisible_parameter_annotations,
-                             runtime_invisible_parameter_annotations_length,
                              CHECK);
     cm->set_parameter_annotations(a);
   }
 
   if (annotation_default_length > 0) {
-    a = assemble_annotations(annotation_default,
+    a = allocate_annotations(annotation_default,
                              annotation_default_length,
-                             nullptr,
-                             0,
                              CHECK);
     cm->set_default_annotations(a);
   }
 
-  if (runtime_visible_type_annotations_length +
-      runtime_invisible_type_annotations_length > 0) {
-    a = assemble_annotations(runtime_visible_type_annotations,
+  if (runtime_visible_type_annotations_length > 0) {
+    a = allocate_annotations(runtime_visible_type_annotations,
                              runtime_visible_type_annotations_length,
-                             runtime_invisible_type_annotations,
-                             runtime_invisible_type_annotations_length,
                              CHECK);
     cm->set_type_annotations(a);
   }
@@ -2327,16 +2292,10 @@ Method* ClassFileParser::parse_method(const ClassFileStream* const cfs,
   MethodAnnotationCollector parsed_annotations;
   const u1* runtime_visible_annotations = nullptr;
   int runtime_visible_annotations_length = 0;
-  const u1* runtime_invisible_annotations = nullptr;
-  int runtime_invisible_annotations_length = 0;
   const u1* runtime_visible_parameter_annotations = nullptr;
   int runtime_visible_parameter_annotations_length = 0;
-  const u1* runtime_invisible_parameter_annotations = nullptr;
-  int runtime_invisible_parameter_annotations_length = 0;
   const u1* runtime_visible_type_annotations = nullptr;
   int runtime_visible_type_annotations_length = 0;
-  const u1* runtime_invisible_type_annotations = nullptr;
-  int runtime_invisible_type_annotations_length = 0;
   bool runtime_invisible_annotations_exists = false;
   bool runtime_invisible_type_annotations_exists = false;
   bool runtime_invisible_parameter_annotations_exists = false;
@@ -2607,11 +2566,6 @@ Method* ClassFileParser::parse_method(const ClassFileStream* const cfs,
           return nullptr;
         }
         runtime_invisible_annotations_exists = true;
-        if (PreserveAllAnnotations) {
-          runtime_invisible_annotations_length = method_attribute_length;
-          runtime_invisible_annotations = cfs->current();
-          assert(runtime_invisible_annotations != nullptr, "null invisible annotations");
-        }
         cfs->skip_u1(method_attribute_length, CHECK_NULL);
       } else if (method_attribute_name == vmSymbols::tag_runtime_visible_parameter_annotations()) {
         if (runtime_visible_parameter_annotations != nullptr) {
@@ -2632,12 +2586,6 @@ Method* ClassFileParser::parse_method(const ClassFileStream* const cfs,
           return nullptr;
         }
         runtime_invisible_parameter_annotations_exists = true;
-        if (PreserveAllAnnotations) {
-          runtime_invisible_parameter_annotations_length = method_attribute_length;
-          runtime_invisible_parameter_annotations = cfs->current();
-          assert(runtime_invisible_parameter_annotations != nullptr,
-            "null invisible parameter annotations");
-        }
         cfs->skip_u1(method_attribute_length, CHECK_NULL);
       } else if (method_attribute_name == vmSymbols::tag_annotation_default()) {
         if (annotation_default != nullptr) {
@@ -2668,14 +2616,8 @@ Method* ClassFileParser::parse_method(const ClassFileStream* const cfs,
             "Multiple RuntimeInvisibleTypeAnnotations attributes for method in class file %s",
             THREAD);
           return nullptr;
-        } else {
-          runtime_invisible_type_annotations_exists = true;
-        }
-        if (PreserveAllAnnotations) {
-          runtime_invisible_type_annotations_length = method_attribute_length;
-          runtime_invisible_type_annotations = cfs->current();
-          assert(runtime_invisible_type_annotations != nullptr, "null invisible type annotations");
         }
+        runtime_invisible_type_annotations_exists = true;
         cfs->skip_u1(method_attribute_length, CHECK_NULL);
       } else {
         // Skip unknown attributes
@@ -2709,12 +2651,9 @@ Method* ClassFileParser::parse_method(const ClassFileStream* const cfs,
       checked_exceptions_length,
       method_parameters_length,
       generic_signature_index,
-      runtime_visible_annotations_length +
-           runtime_invisible_annotations_length,
-      runtime_visible_parameter_annotations_length +
-           runtime_invisible_parameter_annotations_length,
-      runtime_visible_type_annotations_length +
-           runtime_invisible_type_annotations_length,
+      runtime_visible_annotations_length,
+      runtime_visible_parameter_annotations_length,
+      runtime_visible_type_annotations_length,
       annotation_default_length,
       0);
 
@@ -2806,16 +2745,10 @@ Method* ClassFileParser::parse_method(const ClassFileStream* const cfs,
   copy_method_annotations(m->constMethod(),
                           runtime_visible_annotations,
                           runtime_visible_annotations_length,
-                          runtime_invisible_annotations,
-                          runtime_invisible_annotations_length,
                           runtime_visible_parameter_annotations,
                           runtime_visible_parameter_annotations_length,
-                          runtime_invisible_parameter_annotations,
-                          runtime_invisible_parameter_annotations_length,
                           runtime_visible_type_annotations,
                           runtime_visible_type_annotations_length,
-                          runtime_invisible_type_annotations,
-                          runtime_invisible_type_annotations_length,
                           annotation_default,
                           annotation_default_length,
                           CHECK_NULL);
@@ -3295,13 +3228,9 @@ u4 ClassFileParser::parse_classfile_record_attribute(const ClassFileStream* cons
     u2 generic_sig_index = 0;
     const u1* runtime_visible_annotations = nullptr;
     int runtime_visible_annotations_length = 0;
-    const u1* runtime_invisible_annotations = nullptr;
-    int runtime_invisible_annotations_length = 0;
     bool runtime_invisible_annotations_exists = false;
     const u1* runtime_visible_type_annotations = nullptr;
     int runtime_visible_type_annotations_length = 0;
-    const u1* runtime_invisible_type_annotations = nullptr;
-    int runtime_invisible_type_annotations_length = 0;
     bool runtime_invisible_type_annotations_exists = false;
 
     // Expected attributes for record components are Signature, Runtime(In)VisibleAnnotations,
@@ -3352,11 +3281,6 @@ u4 ClassFileParser::parse_classfile_record_attribute(const ClassFileStream* cons
           return 0;
         }
         runtime_invisible_annotations_exists = true;
-        if (PreserveAllAnnotations) {
-          runtime_invisible_annotations_length = attribute_length;
-          runtime_invisible_annotations = cfs->current();
-          assert(runtime_invisible_annotations != nullptr, "null record component invisible annotation");
-        }
         cfs->skip_u1(attribute_length, CHECK_0);
 
       } else if (attribute_name == vmSymbols::tag_runtime_visible_type_annotations()) {
@@ -3379,11 +3303,6 @@ u4 ClassFileParser::parse_classfile_record_attribute(const ClassFileStream* cons
           return 0;
         }
         runtime_invisible_type_annotations_exists = true;
-        if (PreserveAllAnnotations) {
-          runtime_invisible_type_annotations_length = attribute_length;
-          runtime_invisible_type_annotations = cfs->current();
-          assert(runtime_invisible_type_annotations != nullptr, "null record component invisible type annotation");
-        }
         cfs->skip_u1(attribute_length, CHECK_0);
 
       } else {
@@ -3393,15 +3312,11 @@ u4 ClassFileParser::parse_classfile_record_attribute(const ClassFileStream* cons
       calculate_attr_size += attribute_length;
     } // End of attributes For loop
 
-    AnnotationArray* annotations = assemble_annotations(runtime_visible_annotations,
+    AnnotationArray* annotations = allocate_annotations(runtime_visible_annotations,
                                                         runtime_visible_annotations_length,
-                                                        runtime_invisible_annotations,
-                                                        runtime_invisible_annotations_length,
                                                         CHECK_0);
-    AnnotationArray* type_annotations = assemble_annotations(runtime_visible_type_annotations,
+    AnnotationArray* type_annotations = allocate_annotations(runtime_visible_type_annotations,
                                                              runtime_visible_type_annotations_length,
-                                                             runtime_invisible_type_annotations,
-                                                             runtime_invisible_type_annotations_length,
                                                              CHECK_0);
 
     RecordComponent* record_component =
@@ -3538,12 +3453,8 @@ void ClassFileParser::parse_classfile_attributes(const ClassFileStream* const cf
   bool parsed_bootstrap_methods_attribute = false;
   const u1* runtime_visible_annotations = nullptr;
   int runtime_visible_annotations_length = 0;
-  const u1* runtime_invisible_annotations = nullptr;
-  int runtime_invisible_annotations_length = 0;
   const u1* runtime_visible_type_annotations = nullptr;
   int runtime_visible_type_annotations_length = 0;
-  const u1* runtime_invisible_type_annotations = nullptr;
-  int runtime_invisible_type_annotations_length = 0;
   bool runtime_invisible_type_annotations_exists = false;
   bool runtime_invisible_annotations_exists = false;
   bool parsed_source_debug_ext_annotations_exist = false;
@@ -3656,11 +3567,6 @@ void ClassFileParser::parse_classfile_attributes(const ClassFileStream* const cf
           return;
         }
         runtime_invisible_annotations_exists = true;
-        if (PreserveAllAnnotations) {
-          runtime_invisible_annotations_length = attribute_length;
-          runtime_invisible_annotations = cfs->current();
-          assert(runtime_invisible_annotations != nullptr, "null invisible annotations");
-        }
         cfs->skip_u1(attribute_length, CHECK);
       } else if (tag == vmSymbols::tag_enclosing_method()) {
         if (parsed_enclosingmethod_attribute) {
@@ -3712,14 +3618,8 @@ void ClassFileParser::parse_classfile_attributes(const ClassFileStream* const cf
           classfile_parse_error(
             "Multiple RuntimeInvisibleTypeAnnotations attributes in class file %s", THREAD);
           return;
-        } else {
-          runtime_invisible_type_annotations_exists = true;
-        }
-        if (PreserveAllAnnotations) {
-          runtime_invisible_type_annotations_length = attribute_length;
-          runtime_invisible_type_annotations = cfs->current();
-          assert(runtime_invisible_type_annotations != nullptr, "null invisible type annotations");
         }
+        runtime_invisible_type_annotations_exists = true;
         cfs->skip_u1(attribute_length, CHECK);
       } else if (_major_version >= JAVA_11_VERSION) {
         if (tag == vmSymbols::tag_nest_members()) {
@@ -3799,15 +3699,11 @@ void ClassFileParser::parse_classfile_attributes(const ClassFileStream* const cf
       cfs->skip_u1(attribute_length, CHECK);
     }
   }
-  _class_annotations = assemble_annotations(runtime_visible_annotations,
+  _class_annotations = allocate_annotations(runtime_visible_annotations,
                                             runtime_visible_annotations_length,
-                                            runtime_invisible_annotations,
-                                            runtime_invisible_annotations_length,
                                             CHECK);
-  _class_type_annotations = assemble_annotations(runtime_visible_type_annotations,
+  _class_type_annotations = allocate_annotations(runtime_visible_type_annotations,
                                                  runtime_visible_type_annotations_length,
-                                                 runtime_invisible_type_annotations,
-                                                 runtime_invisible_type_annotations_length,
                                                  CHECK);
 
   if (parsed_innerclasses_attribute || parsed_enclosingmethod_attribute) {
@@ -3943,28 +3839,16 @@ void ClassFileParser::apply_parsed_class_metadata(
   clear_class_metadata();
 }
 
-AnnotationArray* ClassFileParser::assemble_annotations(const u1* const runtime_visible_annotations,
-                                                       int runtime_visible_annotations_length,
-                                                       const u1* const runtime_invisible_annotations,
-                                                       int runtime_invisible_annotations_length,
+AnnotationArray* ClassFileParser::allocate_annotations(const u1* const anno,
+                                                       int anno_length,
                                                        TRAPS) {
   AnnotationArray* annotations = nullptr;
-  if (runtime_visible_annotations != nullptr ||
-      runtime_invisible_annotations != nullptr) {
+  if (anno != nullptr) {
     annotations = MetadataFactory::new_array<u1>(_loader_data,
-                                          runtime_visible_annotations_length +
-                                          runtime_invisible_annotations_length,
-                                          CHECK_(annotations));
-    if (runtime_visible_annotations != nullptr) {
-      for (int i = 0; i < runtime_visible_annotations_length; i++) {
-        annotations->at_put(i, runtime_visible_annotations[i]);
-      }
-    }
-    if (runtime_invisible_annotations != nullptr) {
-      for (int i = 0; i < runtime_invisible_annotations_length; i++) {
-        int append = runtime_visible_annotations_length+i;
-        annotations->at_put(append, runtime_invisible_annotations[i]);
-      }
+                                                 anno_length,
+                                                 CHECK_(annotations));
+    for (int i = 0; i < anno_length; i++) {
+      annotations->at_put(i, anno[i]);
     }
   }
   return annotations;
diff --git a/src/hotspot/share/classfile/classFileParser.hpp b/src/hotspot/share/classfile/classFileParser.hpp
index f43303722a8ab..69d1f357ca55d 100644
--- a/src/hotspot/share/classfile/classFileParser.hpp
+++ b/src/hotspot/share/classfile/classFileParser.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -347,10 +347,8 @@ class ClassFileParser {
                                                    TRAPS);
 
   // Annotations handling
-  AnnotationArray* assemble_annotations(const u1* const runtime_visible_annotations,
-                                        int runtime_visible_annotations_length,
-                                        const u1* const runtime_invisible_annotations,
-                                        int runtime_invisible_annotations_length,
+  AnnotationArray* allocate_annotations(const u1* const anno,
+                                        int anno_length,
                                         TRAPS);
 
   void set_precomputed_flags(InstanceKlass* k);
@@ -514,16 +512,10 @@ class ClassFileParser {
   void copy_method_annotations(ConstMethod* cm,
                                const u1* runtime_visible_annotations,
                                int runtime_visible_annotations_length,
-                               const u1* runtime_invisible_annotations,
-                               int runtime_invisible_annotations_length,
                                const u1* runtime_visible_parameter_annotations,
                                int runtime_visible_parameter_annotations_length,
-                               const u1* runtime_invisible_parameter_annotations,
-                               int runtime_invisible_parameter_annotations_length,
                                const u1* runtime_visible_type_annotations,
                                int runtime_visible_type_annotations_length,
-                               const u1* runtime_invisible_type_annotations,
-                               int runtime_invisible_type_annotations_length,
                                const u1* annotation_default,
                                int annotation_default_length,
                                TRAPS);
diff --git a/src/hotspot/share/prims/jvmtiClassFileReconstituter.cpp b/src/hotspot/share/prims/jvmtiClassFileReconstituter.cpp
index 8d7ffdf4835ba..ceed1d8ad952a 100644
--- a/src/hotspot/share/prims/jvmtiClassFileReconstituter.cpp
+++ b/src/hotspot/share/prims/jvmtiClassFileReconstituter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -119,10 +119,10 @@ void JvmtiClassFileReconstituter::write_field_infos() {
       write_signature_attribute(generic_signature_index);
     }
     if (anno != nullptr) {
-      write_annotations_attribute("RuntimeVisibleAnnotations", "RuntimeInvisibleAnnotations", anno);
+      write_annotations_attribute("RuntimeVisibleAnnotations", anno);
     }
     if (type_anno != nullptr) {
-      write_annotations_attribute("RuntimeVisibleTypeAnnotations", "RuntimeInvisibleTypeAnnotations", type_anno);
+      write_annotations_attribute("RuntimeVisibleTypeAnnotations", type_anno);
     }
   }
 }
@@ -380,20 +380,6 @@ void JvmtiClassFileReconstituter::write_annotations_attribute(const char* attr_n
   memcpy(writeable_address(length), annos->adr_at(0), length);
 }
 
-void JvmtiClassFileReconstituter::write_annotations_attribute(const char* attr_name,
-                                                              const char* fallback_attr_name,
-                                                              AnnotationArray* annos) {
-  TempNewSymbol sym = SymbolTable::probe(attr_name, (int)strlen(attr_name));
-  if (sym != nullptr) {
-    if (symbol_to_cpool_index(sym) != 0) {
-      write_annotations_attribute(attr_name, annos);
-      return;
-    }
-  }
-  // use fallback name
-  write_annotations_attribute(fallback_attr_name, annos);
-}
-
 //  BootstrapMethods_attribute {
 //    u2 attribute_name_index;
 //    u4 attribute_length;
@@ -533,10 +519,10 @@ void JvmtiClassFileReconstituter::write_record_attribute() {
       write_signature_attribute(component->generic_signature_index());
     }
     if (component->annotations() != nullptr) {
-      write_annotations_attribute("RuntimeVisibleAnnotations", "RuntimeInvisibleAnnotations", component->annotations());
+      write_annotations_attribute("RuntimeVisibleAnnotations", component->annotations());
     }
     if (component->type_annotations() != nullptr) {
-      write_annotations_attribute("RuntimeVisibleTypeAnnotations", "RuntimeInvisibleTypeAnnotations", component->type_annotations());
+      write_annotations_attribute("RuntimeVisibleTypeAnnotations", component->type_annotations());
     }
   }
 }
@@ -775,13 +761,13 @@ void JvmtiClassFileReconstituter::write_method_info(const methodHandle& method)
     write_signature_attribute(generic_signature_index);
   }
   if (anno != nullptr) {
-    write_annotations_attribute("RuntimeVisibleAnnotations", "RuntimeInvisibleAnnotations", anno);
+    write_annotations_attribute("RuntimeVisibleAnnotations", anno);
   }
   if (param_anno != nullptr) {
-    write_annotations_attribute("RuntimeVisibleParameterAnnotations", "RuntimeInvisibleParameterAnnotations", param_anno);
+    write_annotations_attribute("RuntimeVisibleParameterAnnotations", param_anno);
   }
   if (type_anno != nullptr) {
-    write_annotations_attribute("RuntimeVisibleTypeAnnotations", "RuntimeInvisibleTypeAnnotations", type_anno);
+    write_annotations_attribute("RuntimeVisibleTypeAnnotations", type_anno);
   }
 }
 
@@ -841,10 +827,10 @@ void JvmtiClassFileReconstituter::write_class_attributes() {
     write_source_debug_extension_attribute();
   }
   if (anno != nullptr) {
-    write_annotations_attribute("RuntimeVisibleAnnotations", "RuntimeInvisibleAnnotations", anno);
+    write_annotations_attribute("RuntimeVisibleAnnotations", anno);
   }
   if (type_anno != nullptr) {
-    write_annotations_attribute("RuntimeVisibleTypeAnnotations", "RuntimeInvisibleTypeAnnotations", type_anno);
+    write_annotations_attribute("RuntimeVisibleTypeAnnotations", type_anno);
   }
   if (ik()->nest_host_index() != 0) {
     write_nest_host_attribute();
diff --git a/src/hotspot/share/prims/jvmtiClassFileReconstituter.hpp b/src/hotspot/share/prims/jvmtiClassFileReconstituter.hpp
index 2f36a2877d262..015042a8543a7 100644
--- a/src/hotspot/share/prims/jvmtiClassFileReconstituter.hpp
+++ b/src/hotspot/share/prims/jvmtiClassFileReconstituter.hpp
@@ -117,13 +117,6 @@ class JvmtiClassFileReconstituter : public JvmtiConstantPoolReconstituter {
   void write_signature_attribute(u2 generic_signaure_index);
   void write_attribute_name_index(const char* name);
   void write_annotations_attribute(const char* attr_name, AnnotationArray* annos);
-  // With PreserveAllAnnotations option "runtime invisible" annotations
-  // (RuntimeInvisibleAnnotations/RuntimeInvisibleTypeAnnotations/RuntimeInvisibleParameterAnnotations)
-  // are considered "runtime visible" and ClassFileReconstituter writes them as
-  // RuntimeVisibleAnnotations/RuntimeVisibleTypeAnnotations/RuntimeVisibleParameterAnnotations.
-  // This helper method is for the corner case when "runtime visible" attribute name is not presents
-  // in the class constant pool and the annotations are written with fallback "runtime invisible" name.
-  void write_annotations_attribute(const char* attr_name, const char* fallback_attr_name, AnnotationArray* annos);
   void write_bootstrapmethod_attribute();
   void write_nest_host_attribute();
   void write_nest_members_attribute();
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index d353c5a162ae3..966f4855789e4 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -503,7 +503,6 @@ static SpecialFlag const special_jvm_flags[] = {
   { "RequireSharedSpaces",          JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() },
   { "UseSharedSpaces",              JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() },
   { "DontYieldALot",                JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
-  { "PreserveAllAnnotations",       JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
   { "UseNotificationThread",        JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
   { "LockingMode",                  JDK_Version::jdk(24), JDK_Version::jdk(26), JDK_Version::jdk(27) },
   // --- Deprecated alias flags (see also aliased_jvm_flags) - sorted by obsolete_in then expired_in:
@@ -513,6 +512,7 @@ static SpecialFlag const special_jvm_flags[] = {
 
   { "MetaspaceReclaimPolicy",       JDK_Version::undefined(), JDK_Version::jdk(21), JDK_Version::undefined() },
 
+  { "PreserveAllAnnotations",       JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
   { "UseEmptySlotsInSupers",        JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
   { "OldSize",                      JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
 #if defined(X86)
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 7a7a3769ac90f..562549f247efd 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -795,10 +795,6 @@ const int ObjectAlignmentInBytes = 8;
           "but not all -Xrun libraries may support the state of the VM "    \
           "at this time")                                                   \
                                                                             \
-  product(bool, PreserveAllAnnotations, false,                              \
-          "(Deprecated) Preserve RuntimeInvisibleAnnotations as well "      \
-          "as RuntimeVisibleAnnotations")                                   \
-                                                                            \
   develop(uintx, PreallocatedOutOfMemoryErrorCount, 4,                      \
           "Number of OutOfMemoryErrors preallocated with backtrace")        \
                                                                             \
diff --git a/test/jdk/java/lang/instrument/RetransformRecordAnnotation.java b/test/jdk/java/lang/instrument/RetransformRecordAnnotation.java
deleted file mode 100644
index 90d76d1f923e7..0000000000000
--- a/test/jdk/java/lang/instrument/RetransformRecordAnnotation.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * 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 8315575 8328137
- * @summary test that records with invisible annotation can be retransformed
- *
- * @library /test/lib
- * @run shell MakeJAR.sh retransformAgent
- * @run main/othervm -javaagent:retransformAgent.jar -Xlog:redefine+class=trace RetransformRecordAnnotation
- * @run main/othervm -javaagent:retransformAgent.jar -XX:+PreserveAllAnnotations -Xlog:redefine+class=trace RetransformRecordAnnotation
- */
-
-import java.io.File;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.instrument.ClassFileTransformer;
-import java.nio.file.Files;
-import java.security.ProtectionDomain;
-
-public class RetransformRecordAnnotation extends AInstrumentationTestCase {
-
-    @Target({ElementType.TYPE_PARAMETER, ElementType.TYPE_USE})
-    @Retention(RetentionPolicy.RUNTIME)
-    @interface RuntimeTypeAnno {}
-
-    @Retention(RetentionPolicy.RUNTIME)
-    @interface RuntimeParamAnno {
-        String s() default "foo";
-    }
-
-    @Target({ElementType.TYPE_PARAMETER, ElementType.TYPE_USE})
-    @Retention(RetentionPolicy.CLASS)
-    @interface ClassTypeAnno {}
-
-    @Retention(RetentionPolicy.CLASS)
-    @interface ClassParamAnno {
-        String s() default "bar";
-    }
-
-    @RuntimeTypeAnno
-    @RuntimeParamAnno(s = "1")
-    public record VisibleAnnos(@RuntimeTypeAnno @RuntimeParamAnno(s = "2") Object o, Object other) {
-    }
-
-    @ClassTypeAnno
-    @ClassParamAnno(s = "3")
-    public record InvisibleAnnos(@ClassTypeAnno @ClassParamAnno(s = "4") Object o, Object other) {
-    }
-
-    @RuntimeTypeAnno
-    @RuntimeParamAnno(s = "5")
-    @ClassTypeAnno
-    @ClassParamAnno(s = "6")
-    public record MixedAnnos(@RuntimeTypeAnno @RuntimeParamAnno(s = "7")
-                             @ClassTypeAnno @ClassParamAnno(s = "8") Object o, Object other) {
-    }
-
-    public static void main (String[] args) throws Throwable {
-        ATestCaseScaffold test = new RetransformRecordAnnotation();
-        test.beVerbose();
-        test.runTest();
-    }
-
-    private Transformer transformer;
-
-    public RetransformRecordAnnotation() throws Throwable {
-        super("RetransformRecordAnnotation");
-    }
-
-    private void log(Object o) {
-        System.out.println(String.valueOf(o));
-    }
-
-    // Retransforms target class using provided class bytes;
-    private void retransform(Class targetClass, byte[] classBytes) throws Throwable {
-        transformer.prepare(targetClass, classBytes);
-        fInst.retransformClasses(targetClass);
-        assertTrue(targetClass.getName() + " was not seen by transform()",
-                   transformer.getSeenClassBytes() != null);
-    }
-
-    protected final void doRunTest() throws Throwable {
-        transformer = new Transformer();
-        fInst.addTransformer(transformer, true);
-
-        {
-            log("Sanity: retransform to original class bytes");
-            retransform(InvisibleAnnos.class, loadClassBytes(InvisibleAnnos.class));
-            log("");
-        }
-
-        // The following testcases use null as new class bytes (i.e. no transform is performed).
-        // However, it is enough for testing purposes as the JvmtiClassFileReconstituter is still involved
-        // in preparation of the initial class bytes.
-        {
-            log("Test: retransform VisibleAnnos to null");
-            retransform(VisibleAnnos.class, null);
-            log("");
-        }
-
-        {
-            log("Test: retransform InvisibleAnnos to null");
-            retransform(InvisibleAnnos.class, null);
-            log("");
-        }
-
-        {
-            log("Test: retransform MixedAnnos to null");
-            retransform(MixedAnnos.class, null);
-            log("");
-        }
-    }
-
-    private byte[] loadClassBytes(Class cls) throws Exception {
-        String classFileName = cls.getName() + ".class";
-        File classFile = new File(System.getProperty("test.classes", "."), classFileName);
-        log("Reading test class from " + classFile);
-        byte[] classBytes = Files.readAllBytes(classFile.toPath());
-        log("Read " + classBytes.length + " bytes.");
-        return classBytes;
-    }
-
-    public class Transformer implements ClassFileTransformer {
-        private String targetClassName;
-        private byte[] seenClassBytes;
-        private byte[] newClassBytes;
-
-        public Transformer() {
-        }
-
-        // Prepares transformer for Instrumentation.retransformClasses.
-        public void prepare(Class targetClass, byte[] classBytes) {
-            targetClassName = targetClass.getName();
-            newClassBytes = classBytes;
-            seenClassBytes = null;
-        }
-
-        byte[] getSeenClassBytes() {
-            return seenClassBytes;
-        }
-
-        public String toString() {
-            return Transformer.this.getClass().getName();
-        }
-
-        public byte[] transform(ClassLoader loader, String className,
-            Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) {
-
-            if (className.equals(targetClassName)) {
-                log(this + ".transform() sees '" + className
-                        + "' of " + classfileBuffer.length + " bytes.");
-                seenClassBytes = classfileBuffer;
-                if (newClassBytes != null) {
-                    log(this + ".transform() sets new classbytes for '" + className
-                            + "' of " + newClassBytes.length + " bytes.");
-                }
-                return newClassBytes;
-            }
-
-            return null;
-        }
-    }
-}

From 034297a6bd9bfcea7fa48792f54c84a6e976b319 Mon Sep 17 00:00:00 2001
From: Fernando Guallini <fguallini@openjdk.org>
Date: Fri, 26 Jul 2024 18:51:12 +0000
Subject: [PATCH 232/401] 8336240: Test
 com/sun/crypto/provider/Cipher/DES/PerformanceTest.java fails with
 java.lang.ArithmeticException

Reviewed-by: wetmore
---
 test/jdk/ProblemList.txt                      |  1 -
 test/jdk/TEST.groups                          |  1 -
 .../provider/Cipher/DES/PerformanceTest.java  | 19 +++++++++++--------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 05e42b4933046..8e627e27d7a8e 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -606,7 +606,6 @@ sun/security/smartcardio/TestExclusive.java                     8039280 generic-
 sun/security/smartcardio/TestMultiplePresent.java               8039280 generic-all
 sun/security/smartcardio/TestPresent.java                       8039280 generic-all
 sun/security/smartcardio/TestTransmit.java                      8039280 generic-all
-com/sun/crypto/provider/Cipher/DES/PerformanceTest.java         8039280 generic-all
 com/sun/security/auth/callback/TextCallbackHandler/Password.java 8039280 generic-all
 com/sun/security/sasl/gsskerb/AuthOnly.java                     8039280 generic-all
 com/sun/security/sasl/gsskerb/ConfSecurityLayer.java            8039280 generic-all
diff --git a/test/jdk/TEST.groups b/test/jdk/TEST.groups
index 6a5be3736e859..55ae0e9c67b14 100644
--- a/test/jdk/TEST.groups
+++ b/test/jdk/TEST.groups
@@ -621,7 +621,6 @@ jdk_core_manual_no_input = \
 
 jdk_security_manual_no_input = \
     :jdk_security_infra \
-    com/sun/crypto/provider/Cipher/DES/PerformanceTest.java \
     com/sun/crypto/provider/Cipher/AEAD/GCMIncrementByte4.java \
     com/sun/crypto/provider/Cipher/AEAD/GCMIncrementDirect4.java \
     com/sun/security/auth/callback/TextCallbackHandler/Password.java \
diff --git a/test/jdk/com/sun/crypto/provider/Cipher/DES/PerformanceTest.java b/test/jdk/com/sun/crypto/provider/Cipher/DES/PerformanceTest.java
index 698acd083b4c9..33167cafbd90f 100644
--- a/test/jdk/com/sun/crypto/provider/Cipher/DES/PerformanceTest.java
+++ b/test/jdk/com/sun/crypto/provider/Cipher/DES/PerformanceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,11 +26,8 @@
  * @bug 0000000
  * @summary This test checks performance of various ciphers.
  * @author Jan Luehe
- * @run main/manual PerformanceTest
  */
-import java.security.*;
 import java.security.spec.*;
-import java.io.*;
 import javax.crypto.*;
 import javax.crypto.spec.*;
 
@@ -178,14 +175,16 @@ public void runTest(byte[] data, int count) throws Exception {
         long start, end;
         cipher.init(Cipher.ENCRYPT_MODE, cipherKey, params);
 
-        start = System.currentTimeMillis();
+        start = getTimeInMicroseconds();
         for (int i=0; i<count-1; i++) {
             cipher.update(data, 0, data.length);
         }
         cipher.doFinal(data, 0, data.length);
-        end = System.currentTimeMillis();
+        end = getTimeInMicroseconds();
 
-        int speed = (int)((data.length * count)/(end - start));
+        // To avoid dividing by zero in the rare case where end is equal to start
+        long executionTime = end != start ? end - start : 1L;
+        int speed = (int) ((data.length * count) / executionTime);
         sum += speed;
         col.append(speed);
     }
@@ -198,8 +197,12 @@ public void printHeadings() {
         System.out.println
             ("=========================================================");
         System.out.println
-            ("Algorithm                      DataSize Rounds Kbytes/sec");
+            ("Algorithm                      DataSize Rounds Bytes/microsec");
 
     }
 
+    private static long getTimeInMicroseconds() {
+        return System.nanoTime() / 1000;
+    }
+
 }

From 2fbdbacad7ad45055a482c764f84da4568383020 Mon Sep 17 00:00:00 2001
From: Shaojin Wen <shaojin.wensj@alibaba-inc.com>
Date: Sat, 27 Jul 2024 22:54:47 +0000
Subject: [PATCH 233/401] 8337245: Fix wrong comment of StringConcatHelper

Reviewed-by: phh, redestad
---
 .../share/classes/java/lang/StringConcatHelper.java         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/StringConcatHelper.java b/src/java.base/share/classes/java/lang/StringConcatHelper.java
index 0b4a8992d6c83..486e115369ea6 100644
--- a/src/java.base/share/classes/java/lang/StringConcatHelper.java
+++ b/src/java.base/share/classes/java/lang/StringConcatHelper.java
@@ -185,7 +185,7 @@ static long prepend(long indexCoder, byte[] buf, boolean value, String prefix) {
      * @param indexCoder final char index in the buffer, along with coder packed
      *                   into higher bits.
      * @param buf        buffer to append to
-     * @param value      boolean value to encode
+     * @param value      char value to encode
      * @param prefix     a constant to prepend before value
      * @return           updated index (coder value retained)
      */
@@ -211,7 +211,7 @@ static long prepend(long indexCoder, byte[] buf, char value, String prefix) {
      * @param indexCoder final char index in the buffer, along with coder packed
      *                   into higher bits.
      * @param buf        buffer to append to
-     * @param value      boolean value to encode
+     * @param value      int value to encode
      * @param prefix     a constant to prepend before value
      * @return           updated index (coder value retained)
      */
@@ -237,7 +237,7 @@ static long prepend(long indexCoder, byte[] buf, int value, String prefix) {
      * @param indexCoder final char index in the buffer, along with coder packed
      *                   into higher bits.
      * @param buf        buffer to append to
-     * @param value      boolean value to encode
+     * @param value      long value to encode
      * @param prefix     a constant to prepend before value
      * @return           updated index (coder value retained)
      */

From 90641a601c9385b5e76e1abc5362ace3ab1fff3d Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <thartmann@openjdk.org>
Date: Mon, 29 Jul 2024 05:05:32 +0000
Subject: [PATCH 234/401] 8336095: Use-after-free in Superword leads to memory
 corruption

Reviewed-by: epeter, kvn, rrich
---
 src/hotspot/share/opto/loopnode.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index 7d78bf5021c22..6070acc4624b0 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -611,6 +611,7 @@ class IdealLoopTree : public ResourceObj {
       _head(head), _tail(tail),
       _phase(phase),
       _local_loop_unroll_limit(0), _local_loop_unroll_factor(0),
+      _body(Compile::current()->comp_arena()),
       _nest(0), _irreducible(0), _has_call(0), _has_sfpt(0), _rce_candidate(0),
       _has_range_checks(0), _has_range_checks_computed(0),
       _safepts(nullptr),

From 657c0bddf90b537ac653817571532705a6e3643a Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <thartmann@openjdk.org>
Date: Mon, 29 Jul 2024 05:31:10 +0000
Subject: [PATCH 235/401] 8336999: Verification for resource area allocated
 data structures in C2

Reviewed-by: chagedorn, kvn
---
 src/hotspot/share/ci/ciReplay.cpp       |  2 ++
 src/hotspot/share/libadt/vectset.cpp    |  4 ++++
 src/hotspot/share/libadt/vectset.hpp    | 10 +++-------
 src/hotspot/share/memory/allocation.cpp |  5 +++--
 src/hotspot/share/memory/allocation.hpp |  4 ++--
 src/hotspot/share/opto/block.cpp        |  8 ++++++--
 src/hotspot/share/opto/block.hpp        |  9 ++++++---
 src/hotspot/share/opto/domgraph.cpp     |  3 ---
 src/hotspot/share/opto/loopnode.cpp     |  1 +
 src/hotspot/share/opto/loopnode.hpp     |  4 ++++
 src/hotspot/share/opto/node.cpp         |  8 ++++++++
 src/hotspot/share/opto/node.hpp         |  7 +++++--
 src/hotspot/share/opto/phaseX.cpp       |  1 +
 src/hotspot/share/opto/vector.cpp       |  6 +++---
 14 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/src/hotspot/share/ci/ciReplay.cpp b/src/hotspot/share/ci/ciReplay.cpp
index 3ed71806b078b..fd29e0cf85741 100644
--- a/src/hotspot/share/ci/ciReplay.cpp
+++ b/src/hotspot/share/ci/ciReplay.cpp
@@ -132,6 +132,7 @@ class CompileReplay : public StackObj {
   char* _bufptr;
   char* _buffer;
   int   _buffer_length;
+  ReallocMark _nesting; // Safety checks for arena reallocation
 
   // "compile" data
   ciKlass* _iklass;
@@ -601,6 +602,7 @@ class CompileReplay : public StackObj {
     int buffer_pos = 0;
     while(c != EOF) {
       if (buffer_pos + 1 >= _buffer_length) {
+        _nesting.check(); // Check if a reallocation in the resource arena is safe
         int new_length = _buffer_length * 2;
         // Next call will throw error in case of OOM.
         _buffer = REALLOC_RESOURCE_ARRAY(char, _buffer, _buffer_length, new_length);
diff --git a/src/hotspot/share/libadt/vectset.cpp b/src/hotspot/share/libadt/vectset.cpp
index 9c711a7021b5a..b0d5d100400e7 100644
--- a/src/hotspot/share/libadt/vectset.cpp
+++ b/src/hotspot/share/libadt/vectset.cpp
@@ -48,6 +48,10 @@ void VectorSet::init(Arena* arena) {
 
 // Expand the existing set to a bigger size
 void VectorSet::grow(uint new_word_capacity) {
+  _nesting.check(_set_arena); // Check if a potential reallocation in the arena is safe
+  if (new_word_capacity < _size) {
+    return; // No need to grow
+  }
   assert(new_word_capacity < (1U << 30), "");
   uint x = next_power_of_2(new_word_capacity);
   if (x > _data_size) {
diff --git a/src/hotspot/share/libadt/vectset.hpp b/src/hotspot/share/libadt/vectset.hpp
index d55837c3b2b88..c6ea4490cbf43 100644
--- a/src/hotspot/share/libadt/vectset.hpp
+++ b/src/hotspot/share/libadt/vectset.hpp
@@ -46,6 +46,7 @@ class VectorSet : public AnyObj {
   // Allocated words
   uint       _data_size;
   Arena*     _set_arena;
+  ReallocMark _nesting; // Safety checks for arena reallocation
 
   void init(Arena* arena);
   // Grow vector to required word capacity
@@ -77,10 +78,7 @@ class VectorSet : public AnyObj {
   //
   bool test_set(uint elem) {
     uint32_t word = elem >> word_bits;
-    if (word >= _size) {
-      // Then grow
-      grow(word);
-    }
+    grow(word);
     uint32_t mask = 1U << (elem & bit_mask);
     uint32_t data = _data[word];
     _data[word] = data | mask;
@@ -109,9 +107,7 @@ class VectorSet : public AnyObj {
   // Fast inlined set
   void set(uint elem) {
     uint32_t word = elem >> word_bits;
-    if (word >= _size) {
-      grow(word);
-    }
+    grow(word);
     uint32_t mask = 1U << (elem & bit_mask);
     _data[word] |= mask;
   }
diff --git a/src/hotspot/share/memory/allocation.cpp b/src/hotspot/share/memory/allocation.cpp
index 0f05bdda461f4..0f2ff7840b8d2 100644
--- a/src/hotspot/share/memory/allocation.cpp
+++ b/src/hotspot/share/memory/allocation.cpp
@@ -237,9 +237,10 @@ ReallocMark::ReallocMark() {
 #endif
 }
 
-void ReallocMark::check() {
+void ReallocMark::check(Arena* arena) {
 #ifdef ASSERT
-  if (_nesting != Thread::current()->resource_area()->nesting()) {
+  if ((arena == nullptr || arena == Thread::current()->resource_area()) &&
+      _nesting != Thread::current()->resource_area()->nesting()) {
     fatal("allocation bug: array could grow within nested ResourceMark");
   }
 #endif
diff --git a/src/hotspot/share/memory/allocation.hpp b/src/hotspot/share/memory/allocation.hpp
index 495ca66d86785..da5f7b1983002 100644
--- a/src/hotspot/share/memory/allocation.hpp
+++ b/src/hotspot/share/memory/allocation.hpp
@@ -556,8 +556,8 @@ class ReallocMark: public StackObj {
   NOT_PRODUCT(int _nesting;)
 
 public:
-  ReallocMark()   PRODUCT_RETURN;
-  void check()    PRODUCT_RETURN;
+  ReallocMark() PRODUCT_RETURN;
+  void check(Arena* arena = nullptr) PRODUCT_RETURN;
 };
 
 // Uses mmapped memory for all allocations. All allocations are initially
diff --git a/src/hotspot/share/opto/block.cpp b/src/hotspot/share/opto/block.cpp
index 78774ff2fd1c3..1af085cd1282d 100644
--- a/src/hotspot/share/opto/block.cpp
+++ b/src/hotspot/share/opto/block.cpp
@@ -39,7 +39,10 @@
 #include "utilities/powerOfTwo.hpp"
 
 void Block_Array::grow( uint i ) {
-  assert(i >= Max(), "must be an overflow");
+  _nesting.check(_arena); // Check if a potential reallocation in the arena is safe
+  if (i < Max()) {
+    return; // No need to grow
+  }
   debug_only(_limit = i+1);
   if( i < _size )  return;
   if( !_size ) {
@@ -374,6 +377,7 @@ void Block::dump(const PhaseCFG* cfg) const {
 PhaseCFG::PhaseCFG(Arena* arena, RootNode* root, Matcher& matcher)
 : Phase(CFG)
 , _root(root)
+, _blocks(arena)
 , _block_arena(arena)
 , _regalloc(nullptr)
 , _scheduling_for_pressure(false)
@@ -1417,7 +1421,7 @@ UnionFind::UnionFind( uint max ) : _cnt(max), _max(max), _indices(NEW_RESOURCE_A
 }
 
 void UnionFind::extend( uint from_idx, uint to_idx ) {
-  _nesting.check();
+  _nesting.check(); // Check if a potential reallocation in the resource arena is safe
   if( from_idx >= _max ) {
     uint size = 16;
     while( size <= from_idx ) size <<=1;
diff --git a/src/hotspot/share/opto/block.hpp b/src/hotspot/share/opto/block.hpp
index e48b50b06ae8a..231c09949037d 100644
--- a/src/hotspot/share/opto/block.hpp
+++ b/src/hotspot/share/opto/block.hpp
@@ -51,6 +51,7 @@ class Block_Array : public ArenaObj {
   uint _size;                   // allocated size, as opposed to formal limit
   debug_only(uint _limit;)      // limit to formal domain
   Arena *_arena;                // Arena to allocate in
+  ReallocMark _nesting;         // Safety checks for arena reallocation
 protected:
   Block **_blocks;
   void grow( uint i );          // Grow array node to fit
@@ -68,7 +69,7 @@ class Block_Array : public ArenaObj {
   Block *operator[] ( uint i ) const // Lookup, or assert for not mapped
   { assert( i < Max(), "oob" ); return _blocks[i]; }
   // Extend the mapping: index i maps to Block *n.
-  void map( uint i, Block *n ) { if( i>=Max() ) grow(i); _blocks[i] = n; }
+  void map( uint i, Block *n ) { grow(i); _blocks[i] = n; }
   uint Max() const { debug_only(return _limit); return _size; }
 };
 
@@ -77,7 +78,9 @@ class Block_List : public Block_Array {
   friend class VMStructs;
 public:
   uint _cnt;
-  Block_List() : Block_Array(Thread::current()->resource_area()), _cnt(0) {}
+  Block_List() : Block_List(Thread::current()->resource_area()) { }
+  Block_List(Arena* a) : Block_Array(a), _cnt(0) { }
+
   void push( Block *b ) {  map(_cnt++,b); }
   Block *pop() { return _blocks[--_cnt]; }
   Block *rpop() { Block *b = _blocks[0]; _blocks[0]=_blocks[--_cnt]; return b;}
@@ -655,7 +658,7 @@ class PhaseCFG : public Phase {
 class UnionFind : public ResourceObj {
   uint _cnt, _max;
   uint* _indices;
-  ReallocMark _nesting;  // assertion check for reallocations
+  ReallocMark _nesting; // Safety checks for arena reallocation
 public:
   UnionFind( uint max );
   void reset( uint max );  // Reset to identity map for [0..max]
diff --git a/src/hotspot/share/opto/domgraph.cpp b/src/hotspot/share/opto/domgraph.cpp
index 46cf3316af51e..363005d1181c2 100644
--- a/src/hotspot/share/opto/domgraph.cpp
+++ b/src/hotspot/share/opto/domgraph.cpp
@@ -61,9 +61,6 @@ struct Tarjan {
 // Compute the dominator tree of the CFG.  The CFG must already have been
 // constructed.  This is the Lengauer & Tarjan O(E-alpha(E,V)) algorithm.
 void PhaseCFG::build_dominator_tree() {
-  // Pre-grow the blocks array, prior to the ResourceMark kicking in
-  _blocks.map(number_of_blocks(), nullptr);
-
   ResourceMark rm;
   // Setup mappings from my Graph to Tarjan's stuff and back
   // Note: Tarjan uses 1-based arrays
diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index 85e6f03d4280d..45e59f4e21680 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -5248,6 +5248,7 @@ bool IdealLoopTree::verify_tree(IdealLoopTree* loop_verify) const {
 
 //------------------------------set_idom---------------------------------------
 void PhaseIdealLoop::set_idom(Node* d, Node* n, uint dom_depth) {
+  _nesting.check(); // Check if a potential reallocation in the resource arena is safe
   uint idx = d->_idx;
   if (idx >= _idom_size) {
     uint newsize = next_power_of_2(idx);
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index 6070acc4624b0..24101ea07a002 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -841,6 +841,8 @@ class PhaseIdealLoop : public PhaseTransform {
   uint *_preorders;
   uint _max_preorder;
 
+  ReallocMark _nesting; // Safety checks for arena reallocation
+
   const PhaseIdealLoop* _verify_me;
   bool _verify_only;
 
@@ -853,6 +855,7 @@ class PhaseIdealLoop : public PhaseTransform {
 
   // Allocate _preorders[] array
   void reallocate_preorders() {
+    _nesting.check(); // Check if a potential re-allocation in the resource arena is safe
     if ( _max_preorder < C->unique() ) {
       _preorders = REALLOC_RESOURCE_ARRAY(uint, _preorders, _max_preorder, C->unique());
       _max_preorder = C->unique();
@@ -863,6 +866,7 @@ class PhaseIdealLoop : public PhaseTransform {
   // Check to grow _preorders[] array for the case when build_loop_tree_impl()
   // adds new nodes.
   void check_grow_preorders( ) {
+    _nesting.check(); // Check if a potential re-allocation in the resource arena is safe
     if ( _max_preorder < C->unique() ) {
       uint newsize = _max_preorder<<1;  // double size of array
       _preorders = REALLOC_RESOURCE_ARRAY(uint, _preorders, _max_preorder, newsize);
diff --git a/src/hotspot/share/opto/node.cpp b/src/hotspot/share/opto/node.cpp
index 6cf6ff2094e83..f36770e67ea6c 100644
--- a/src/hotspot/share/opto/node.cpp
+++ b/src/hotspot/share/opto/node.cpp
@@ -2766,6 +2766,10 @@ const RegMask &Node::in_RegMask(uint) const {
 }
 
 void Node_Array::grow(uint i) {
+  _nesting.check(_a); // Check if a potential reallocation in the arena is safe
+  if (i < _max) {
+    return; // No need to grow
+  }
   assert(_max > 0, "invariant");
   uint old = _max;
   _max = next_power_of_2(i);
@@ -2973,6 +2977,10 @@ void Unique_Node_List::remove_useless_nodes(VectorSet &useful) {
 
 //=============================================================================
 void Node_Stack::grow() {
+  _nesting.check(_a); // Check if a potential reallocation in the arena is safe
+  if (_inode_top < _inode_max) {
+    return; // No need to grow
+  }
   size_t old_top = pointer_delta(_inode_top,_inodes,sizeof(INode)); // save _top
   size_t old_max = pointer_delta(_inode_max,_inodes,sizeof(INode));
   size_t max = old_max << 1;             // max * 2
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index ae379c4833a56..10e1e7b100696 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -1596,6 +1596,8 @@ class Node_Array : public AnyObj {
   Arena* _a;                    // Arena to allocate in
   uint   _max;
   Node** _nodes;
+  ReallocMark _nesting;         // Safety checks for arena reallocation
+
   void   grow( uint i );        // Grow array node to fit
 public:
   Node_Array(Arena* a, uint max = OptoNodeListSize) : _a(a), _max(max) {
@@ -1614,7 +1616,7 @@ class Node_Array : public AnyObj {
   Node* at(uint i) const { assert(i<_max,"oob"); return _nodes[i]; }
   Node** adr() { return _nodes; }
   // Extend the mapping: index i maps to Node *n.
-  void map( uint i, Node *n ) { if( i>=_max ) grow(i); _nodes[i] = n; }
+  void map( uint i, Node *n ) { grow(i); _nodes[i] = n; }
   void insert( uint i, Node *n );
   void remove( uint i );        // Remove, preserving order
   // Clear all entries in _nodes to null but keep storage
@@ -1844,6 +1846,7 @@ class Node_Stack {
   INode *_inode_max; // End of _inodes == _inodes + _max
   INode *_inodes;    // Array storage for the stack
   Arena *_a;         // Arena to allocate in
+  ReallocMark _nesting; // Safety checks for arena reallocation
   void grow();
 public:
   Node_Stack(int size) {
@@ -1867,7 +1870,7 @@ class Node_Stack {
   }
   void push(Node *n, uint i) {
     ++_inode_top;
-    if (_inode_top >= _inode_max) grow();
+    grow();
     INode *top = _inode_top; // optimization
     top->node = n;
     top->indx = i;
diff --git a/src/hotspot/share/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp
index 96e9f10880841..dae4a5c68a36f 100644
--- a/src/hotspot/share/opto/phaseX.cpp
+++ b/src/hotspot/share/opto/phaseX.cpp
@@ -2351,6 +2351,7 @@ void Node::replace_by(Node *new_node) {
 //=============================================================================
 //-----------------------------------------------------------------------------
 void Type_Array::grow( uint i ) {
+  assert(_a == Compile::current()->comp_arena(), "Should be allocated in comp_arena");
   if( !_max ) {
     _max = 1;
     _types = (const Type**)_a->Amalloc( _max * sizeof(Type*) );
diff --git a/src/hotspot/share/opto/vector.cpp b/src/hotspot/share/opto/vector.cpp
index 1b4d64e20b174..9ab62c282d124 100644
--- a/src/hotspot/share/opto/vector.cpp
+++ b/src/hotspot/share/opto/vector.cpp
@@ -184,7 +184,7 @@ void PhaseVector::scalarize_vbox_node(VectorBoxNode* vec_box) {
   // Process merged VBAs
 
   if (EnableVectorAggressiveReboxing) {
-    Unique_Node_List calls(C->comp_arena());
+    Unique_Node_List calls;
     for (DUIterator_Fast imax, i = vec_box->fast_outs(imax); i < imax; i++) {
       Node* use = vec_box->fast_out(i);
       if (use->is_CallJava()) {
@@ -238,9 +238,9 @@ void PhaseVector::scalarize_vbox_node(VectorBoxNode* vec_box) {
   }
 
   // Process debug uses at safepoints
-  Unique_Node_List safepoints(C->comp_arena());
+  Unique_Node_List safepoints;
 
-  Unique_Node_List worklist(C->comp_arena());
+  Unique_Node_List worklist;
   worklist.push(vec_box);
   while (worklist.size() > 0) {
     Node* n = worklist.pop();

From dab2a0b5978cdd3fad693e4c120a84bb64a3ccde Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Mon, 29 Jul 2024 09:10:25 +0000
Subject: [PATCH 236/401] 8337222: gc/TestDisableExplicitGC.java fails due to
 unexpected CodeCache GC

Reviewed-by: iwalulya, shade
---
 test/hotspot/jtreg/gc/TestDisableExplicitGC.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/hotspot/jtreg/gc/TestDisableExplicitGC.java b/test/hotspot/jtreg/gc/TestDisableExplicitGC.java
index 9a0b61900dde7..08fda78baaa1b 100644
--- a/test/hotspot/jtreg/gc/TestDisableExplicitGC.java
+++ b/test/hotspot/jtreg/gc/TestDisableExplicitGC.java
@@ -26,6 +26,7 @@
 /*
  * @test TestDisableExplicitGC
  * @requires vm.opt.DisableExplicitGC == null
+ * @requires vm.compMode != "Xcomp"
  * @summary Verify GC behavior with DisableExplicitGC flag.
  * @library /test/lib
  * @modules java.base/jdk.internal.misc

From db168d9e10c4a302b743ee208e24ba7303fec582 Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jkratochvil@openjdk.org>
Date: Mon, 29 Jul 2024 09:18:56 +0000
Subject: [PATCH 237/401] 8336966: Alpine Linux x86_64 compilation error:
 sendfile64

Reviewed-by: bpb
---
 src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c    | 2 +-
 src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c b/src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c
index 02d3c57f1f34b..efbd0ca568478 100644
--- a/src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c
+++ b/src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c
@@ -114,7 +114,7 @@ Java_sun_nio_ch_FileDispatcherImpl_transferTo0(JNIEnv *env, jobject this,
             return n;
     }
 
-    n = sendfile64(dstFD, srcFD, &offset, (size_t)count);
+    n = sendfile(dstFD, srcFD, &offset, (size_t)count);
     if (n < 0) {
         if (errno == EAGAIN)
             return IOS_UNAVAILABLE;
diff --git a/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c b/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c
index 95f78ffa135b1..c90e99dda07b3 100644
--- a/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c
+++ b/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c
@@ -211,7 +211,7 @@ Java_sun_nio_fs_LinuxNativeDispatcher_directCopy0
     }
 
     do {
-        RESTARTABLE(sendfile64(dst, src, NULL, count), bytes_sent);
+        RESTARTABLE(sendfile(dst, src, NULL, count), bytes_sent);
         if (bytes_sent < 0) {
             if (errno == EAGAIN)
                 return IOS_UNAVAILABLE;

From 9124a94e383f5bc6a3376eecc97ee8bd22f9e420 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Mon, 29 Jul 2024 09:52:38 +0000
Subject: [PATCH 238/401] 8337165: Test
 jdk/jfr/event/gc/stacktrace/TestG1YoungAllocationPendingStackTrace.java
 failed: IndexOutOfBoundsException: Index 64 out of bounds for length 64

Reviewed-by: phh
---
 .../gc/stacktrace/TestDefNewAllocationPendingStackTrace.java | 4 +++-
 .../TestG1HumongousAllocationPendingStackTrace.java          | 4 +++-
 .../gc/stacktrace/TestG1OldAllocationPendingStackTrace.java  | 4 +++-
 .../stacktrace/TestG1YoungAllocationPendingStackTrace.java   | 4 +++-
 .../TestMarkSweepCompactAllocationPendingStackTrace.java     | 4 +++-
 .../TestMetaspaceG1GCAllocationPendingStackTrace.java        | 5 +++--
 .../TestMetaspaceParallelGCAllocationPendingStackTrace.java  | 4 +++-
 .../TestMetaspaceSerialGCAllocationPendingStackTrace.java    | 4 +++-
 .../TestParallelMarkSweepAllocationPendingStackTrace.java    | 4 +++-
 .../TestParallelScavengeAllocationPendingStackTrace.java     | 4 +++-
 10 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/test/jdk/jdk/jfr/event/gc/stacktrace/TestDefNewAllocationPendingStackTrace.java b/test/jdk/jdk/jfr/event/gc/stacktrace/TestDefNewAllocationPendingStackTrace.java
index 2f290a748c20d..fa91d77e2fbee 100644
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestDefNewAllocationPendingStackTrace.java
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestDefNewAllocationPendingStackTrace.java
@@ -29,7 +29,9 @@
  *
  * @requires vm.gc == "null" | vm.gc == "Serial"
  * @library /test/lib /test/jdk
- * @run main/othervm -XX:+UseSerialGC -Xlog:gc* jdk.jfr.event.gc.stacktrace.TestDefNewAllocationPendingStackTrace
+ * @run main/othervm -XX:+UseSerialGC -Xlog:gc*
+ *                   -XX:FlightRecorderOptions:stackdepth=256
+ *                   jdk.jfr.event.gc.stacktrace.TestDefNewAllocationPendingStackTrace
  */
 public class TestDefNewAllocationPendingStackTrace {
 
diff --git a/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1HumongousAllocationPendingStackTrace.java b/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1HumongousAllocationPendingStackTrace.java
index 2df5d95f5240e..ad633ea26de25 100644
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1HumongousAllocationPendingStackTrace.java
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1HumongousAllocationPendingStackTrace.java
@@ -29,7 +29,9 @@
  *
  * @requires vm.gc == "null" | vm.gc == "G1"
  * @library /test/lib /test/jdk
- * @run main/othervm -XX:+UseG1GC -Xlog:gc* -Xmx64M -XX:InitiatingHeapOccupancyPercent=100 jdk.jfr.event.gc.stacktrace.TestG1HumongousAllocationPendingStackTrace
+ * @run main/othervm -XX:+UseG1GC -Xlog:gc* -Xmx64M -XX:InitiatingHeapOccupancyPercent=100
+ *                   -XX:FlightRecorderOptions:stackdepth=256
+ *                   jdk.jfr.event.gc.stacktrace.TestG1HumongousAllocationPendingStackTrace
  */
 public class TestG1HumongousAllocationPendingStackTrace {
 
diff --git a/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1OldAllocationPendingStackTrace.java b/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1OldAllocationPendingStackTrace.java
index 3541f117e1e07..1cf75ff8fac1c 100644
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1OldAllocationPendingStackTrace.java
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1OldAllocationPendingStackTrace.java
@@ -29,7 +29,9 @@
  *
  * @requires vm.gc == "null" | vm.gc == "G1"
  * @library /test/lib /test/jdk
- * @run main/othervm -XX:MaxNewSize=10M -Xmx128M -XX:+UseG1GC -Xlog:gc* jdk.jfr.event.gc.stacktrace.TestG1OldAllocationPendingStackTrace
+ * @run main/othervm -XX:MaxNewSize=10M -Xmx128M -XX:+UseG1GC -Xlog:gc*
+ *                   -XX:FlightRecorderOptions:stackdepth=256
+ *                   jdk.jfr.event.gc.stacktrace.TestG1OldAllocationPendingStackTrace
  */
 public class TestG1OldAllocationPendingStackTrace {
 
diff --git a/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1YoungAllocationPendingStackTrace.java b/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1YoungAllocationPendingStackTrace.java
index e5b7f849173b3..7259ff5f4457a 100644
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1YoungAllocationPendingStackTrace.java
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1YoungAllocationPendingStackTrace.java
@@ -29,7 +29,9 @@
  *
  * @requires vm.gc == "null" | vm.gc == "G1"
  * @library /test/lib /test/jdk
- * @run main/othervm -XX:+UseG1GC -Xlog:gc* jdk.jfr.event.gc.stacktrace.TestG1YoungAllocationPendingStackTrace
+ * @run main/othervm -XX:+UseG1GC -Xlog:gc*
+ *                   -XX:FlightRecorderOptions:stackdepth=256
+ *                   jdk.jfr.event.gc.stacktrace.TestG1YoungAllocationPendingStackTrace
  */
 public class TestG1YoungAllocationPendingStackTrace {
 
diff --git a/test/jdk/jdk/jfr/event/gc/stacktrace/TestMarkSweepCompactAllocationPendingStackTrace.java b/test/jdk/jdk/jfr/event/gc/stacktrace/TestMarkSweepCompactAllocationPendingStackTrace.java
index e7f5e709d15b7..c06862ad2e6f9 100644
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestMarkSweepCompactAllocationPendingStackTrace.java
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestMarkSweepCompactAllocationPendingStackTrace.java
@@ -29,7 +29,9 @@
  *
  * @requires vm.gc == "null" | vm.gc == "Serial"
  * @library /test/lib /test/jdk
- * @run main/othervm -XX:MaxNewSize=10M -Xmx64M -XX:+UseSerialGC -Xlog:gc* jdk.jfr.event.gc.stacktrace.TestMarkSweepCompactAllocationPendingStackTrace
+ * @run main/othervm -XX:MaxNewSize=10M -Xmx64M -XX:+UseSerialGC -Xlog:gc*
+ *                   -XX:FlightRecorderOptions:stackdepth=256
+ *                   jdk.jfr.event.gc.stacktrace.TestMarkSweepCompactAllocationPendingStackTrace
  */
 public class TestMarkSweepCompactAllocationPendingStackTrace {
 
diff --git a/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceG1GCAllocationPendingStackTrace.java b/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceG1GCAllocationPendingStackTrace.java
index 81cf4191c6ed3..c74eeefa793f4 100644
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceG1GCAllocationPendingStackTrace.java
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceG1GCAllocationPendingStackTrace.java
@@ -28,9 +28,10 @@
  *
  * @requires vm.gc == "null" | vm.gc == "G1"
  * @library /test/lib /test/jdk
- * @run main/othervm -XX:+UseG1GC -Xlog:gc* -XX:MaxMetaspaceSize=64M jdk.jfr.event.gc.stacktrace.TestMetaspaceG1GCAllocationPendingStackTrace
+ * @run main/othervm -XX:+UseG1GC -Xlog:gc* -XX:MaxMetaspaceSize=64M
+ *                   -XX:FlightRecorderOptions:stackdepth=256
+ *                   jdk.jfr.event.gc.stacktrace.TestMetaspaceG1GCAllocationPendingStackTrace
  */
-
 public class TestMetaspaceG1GCAllocationPendingStackTrace {
 
     public static void main(String[] args) throws Exception {
diff --git a/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceParallelGCAllocationPendingStackTrace.java b/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceParallelGCAllocationPendingStackTrace.java
index ab31fe644bf75..cc66902401504 100644
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceParallelGCAllocationPendingStackTrace.java
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceParallelGCAllocationPendingStackTrace.java
@@ -29,7 +29,9 @@
  *
  * @requires vm.gc == "null" | vm.gc == "Parallel"
  * @library /test/lib /test/jdk
- * @run main/othervm -XX:+UseParallelGC -Xlog:gc* -XX:MaxMetaspaceSize=64M jdk.jfr.event.gc.stacktrace.TestMetaspaceParallelGCAllocationPendingStackTrace
+ * @run main/othervm -XX:+UseParallelGC -Xlog:gc* -XX:MaxMetaspaceSize=64M
+ *                   -XX:FlightRecorderOptions:stackdepth=256
+ *                   jdk.jfr.event.gc.stacktrace.TestMetaspaceParallelGCAllocationPendingStackTrace
  */
 public class TestMetaspaceParallelGCAllocationPendingStackTrace {
 
diff --git a/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceSerialGCAllocationPendingStackTrace.java b/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceSerialGCAllocationPendingStackTrace.java
index 83aa4fb522ef8..7f0ce364b6a88 100644
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceSerialGCAllocationPendingStackTrace.java
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceSerialGCAllocationPendingStackTrace.java
@@ -29,7 +29,9 @@
  *
  * @requires vm.gc == "null" | vm.gc == "Serial"
  * @library /test/lib /test/jdk
- * @run main/othervm -XX:+UseSerialGC -Xlog:gc* -XX:MaxMetaspaceSize=64M jdk.jfr.event.gc.stacktrace.TestMetaspaceSerialGCAllocationPendingStackTrace
+ * @run main/othervm -XX:+UseSerialGC -Xlog:gc* -XX:MaxMetaspaceSize=64M
+ *                   -XX:FlightRecorderOptions:stackdepth=256
+ *                   jdk.jfr.event.gc.stacktrace.TestMetaspaceSerialGCAllocationPendingStackTrace
  */
 public class TestMetaspaceSerialGCAllocationPendingStackTrace {
 
diff --git a/test/jdk/jdk/jfr/event/gc/stacktrace/TestParallelMarkSweepAllocationPendingStackTrace.java b/test/jdk/jdk/jfr/event/gc/stacktrace/TestParallelMarkSweepAllocationPendingStackTrace.java
index 5ab67d2561a6f..ebd1efccfeef9 100644
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestParallelMarkSweepAllocationPendingStackTrace.java
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestParallelMarkSweepAllocationPendingStackTrace.java
@@ -29,7 +29,9 @@
  *
  * @requires vm.gc == "null" | vm.gc == "Parallel"
  * @library /test/lib /test/jdk
- * @run main/othervm -XX:MaxNewSize=10M -Xmx64M -XX:+UseParallelGC -Xlog:gc* jdk.jfr.event.gc.stacktrace.TestParallelMarkSweepAllocationPendingStackTrace
+ * @run main/othervm -XX:MaxNewSize=10M -Xmx64M -XX:+UseParallelGC -Xlog:gc*
+ *                   -XX:FlightRecorderOptions:stackdepth=256
+ *                   jdk.jfr.event.gc.stacktrace.TestParallelMarkSweepAllocationPendingStackTrace
  */
 public class TestParallelMarkSweepAllocationPendingStackTrace {
 
diff --git a/test/jdk/jdk/jfr/event/gc/stacktrace/TestParallelScavengeAllocationPendingStackTrace.java b/test/jdk/jdk/jfr/event/gc/stacktrace/TestParallelScavengeAllocationPendingStackTrace.java
index 08ec7ffd05c89..6dbbc16e2836b 100644
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestParallelScavengeAllocationPendingStackTrace.java
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestParallelScavengeAllocationPendingStackTrace.java
@@ -29,7 +29,9 @@
  *
  * @requires vm.gc == "null" | vm.gc == "Parallel"
  * @library /test/lib /test/jdk
- * @run main/othervm -XX:+UseParallelGC -Xlog:gc* jdk.jfr.event.gc.stacktrace.TestParallelScavengeAllocationPendingStackTrace
+ * @run main/othervm -XX:+UseParallelGC -Xlog:gc*
+ *                   -XX:FlightRecorderOptions:stackdepth=256
+ *                   jdk.jfr.event.gc.stacktrace.TestParallelScavengeAllocationPendingStackTrace
  */
 public class TestParallelScavengeAllocationPendingStackTrace {
 

From cd52ad80a82c8165424722dcddd37d6584137031 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Mon, 29 Jul 2024 12:30:57 +0000
Subject: [PATCH 239/401] 8337267: [REDO] G1: Refactor G1RebuildRSAndScrubTask

Reviewed-by: gli, tschatzl
---
 .../gc/g1/g1ConcurrentRebuildAndScrub.cpp     | 156 +++++++-----------
 1 file changed, 56 insertions(+), 100 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp b/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp
index 1b6b1eed7b13b..f62d42069004f 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentRebuildAndScrub.cpp
@@ -87,14 +87,19 @@ class G1RebuildRSAndScrubTask : public WorkerTask {
       _processed_words += processed;
     }
 
-    // Yield if enough has been processed; returns if the concurrent marking cycle
-    // has been aborted for any reason.
-    bool yield_if_necessary() {
+    // Yield if enough has been processed. Return whether we should stop
+    // processing this region because either the concurrent marking cycle has been
+    // aborted or the region has been reclaimed.
+    bool yield_if_necessary(G1HeapRegion* hr) {
       if (_processed_words >= ProcessingYieldLimitInWords) {
         reset_processed_words();
-        _cm->do_yield_check();
+        // If a yield occurs (potential young-gc pause), must recheck for
+        // potential regions reclamation.
+        if (_cm->do_yield_check() && !should_rebuild_or_scrub(hr)) {
+          return true;
+        }
       }
-      return _cm->has_aborted();
+      return _cm->has_aborted() || !should_rebuild_or_scrub(hr);
     }
 
     // Returns whether the top at rebuild start value for the given region indicates
@@ -111,8 +116,7 @@ class G1RebuildRSAndScrubTask : public WorkerTask {
     // Helper used by both humongous objects and when chunking an object larger than the
     // G1RebuildRemSetChunkSize. The heap region is needed check whether the region has
     // been reclaimed during yielding.
-    // Returns true if marking has been aborted or false if completed.
-    bool scan_large_object(G1HeapRegion* hr, const oop obj, MemRegion scan_range) {
+    void scan_large_object(G1HeapRegion* hr, const oop obj, MemRegion scan_range) {
       HeapWord* start = scan_range.start();
       HeapWord* limit = scan_range.end();
       do {
@@ -122,20 +126,14 @@ class G1RebuildRSAndScrubTask : public WorkerTask {
         // Update processed words and yield, for humongous objects we will yield
         // after each chunk.
         add_processed_words(mr.word_size());
-        bool mark_aborted = yield_if_necessary();
-        if (mark_aborted) {
-          return true;
-        } else if (!should_rebuild_or_scrub(hr)) {
-          // We need to check should_rebuild_or_scrub() again because the region might
-          // have been reclaimed during above yield/safepoint.
-          log_trace(gc, marking)("Rebuild aborted for reclaimed region: %u", hr->hrm_index());
-          return false;
+
+        if (yield_if_necessary(hr)) {
+          return;
         }
 
         // Step to next chunk of the large object.
         start = mr.end();
       } while (start < limit);
-      return false;
     }
 
     // Scan for references into regions that need remembered set update for the given
@@ -165,102 +163,66 @@ class G1RebuildRSAndScrubTask : public WorkerTask {
       return obj_size;
     }
 
-    // Scrub a range of dead objects starting at scrub_start. Will never scrub past limit.
-    HeapWord* scrub_to_next_live(G1HeapRegion* hr, HeapWord* scrub_start, HeapWord* limit) {
-      assert(!_bitmap->is_marked(scrub_start), "Should not scrub live object");
-
-      HeapWord* scrub_end = _bitmap->get_next_marked_addr(scrub_start, limit);
-      hr->fill_range_with_dead_objects(scrub_start, scrub_end);
-
-      // Return the next object to handle.
-      return scrub_end;
-    }
-
-    // Scan the given region from bottom to parsable_bottom. Returns whether marking has
-    // been aborted.
-    bool scan_and_scrub_to_pb(G1HeapRegion* hr, HeapWord* start, HeapWord* const limit) {
-
-      while (start < limit) {
-        if (_bitmap->is_marked(start)) {
-          //  Live object, need to scan to rebuild remembered sets for this object.
-          start += scan_object(hr, start);
-        } else {
-          // Found dead object (which klass has potentially been unloaded). Scrub to next
-          // marked object and continue.
-          start = scrub_to_next_live(hr, start, limit);
-        }
-
-        bool mark_aborted = yield_if_necessary();
-        if (mark_aborted) {
-          return true;
-        } else if (!should_rebuild_or_scrub(hr)) {
-          // We need to check should_rebuild_or_scrub() again because the region might
-          // have been reclaimed during above yield/safepoint.
-          log_trace(gc, marking)("Scan and scrub aborted for reclaimed region: %u", hr->hrm_index());
-          return false;
-        }
-      }
-      return false;
-    }
-
-    // Scan the given region from parsable_bottom to tars. Returns whether marking has
-    // been aborted.
-    bool scan_from_pb_to_tars(G1HeapRegion* hr, HeapWord* start, HeapWord* const limit) {
-
-      while (start < limit) {
-        start += scan_object(hr, start);
-        // Avoid stalling safepoints and stop iteration if mark cycle has been aborted.
-        bool mark_aborted = yield_if_necessary();
-        if (mark_aborted) {
-          return true;
-        } else if (!should_rebuild_or_scrub(hr)) {
-          // We need to check should_rebuild_or_scrub() again because the region might
-          // have been reclaimed during above yield/safepoint.
-          log_trace(gc, marking)("Scan aborted for reclaimed region: %u", hr->hrm_index());
-          return false;
-        }
+    // Scan or scrub depending on if addr is marked.
+    HeapWord* scan_or_scrub(G1HeapRegion* hr, HeapWord* addr, HeapWord* limit) {
+      if (_bitmap->is_marked(addr)) {
+        //  Live object, need to scan to rebuild remembered sets for this object.
+        return addr + scan_object(hr, addr);
+      } else {
+        // Found dead object (which klass has potentially been unloaded). Scrub to next marked object.
+        HeapWord* scrub_end = _bitmap->get_next_marked_addr(addr, limit);
+        hr->fill_range_with_dead_objects(addr, scrub_end);
+        // Return the next object to handle.
+        return scrub_end;
       }
-      return false;
     }
 
-    // Scan and scrub the given region to tars. Returns whether marking has
-    // been aborted.
-    bool scan_and_scrub_region(G1HeapRegion* hr, HeapWord* const pb) {
+    // Scan and scrub the given region to tars.
+    void scan_and_scrub_region(G1HeapRegion* hr, HeapWord* const pb) {
       assert(should_rebuild_or_scrub(hr), "must be");
 
       log_trace(gc, marking)("Scrub and rebuild region: " HR_FORMAT " pb: " PTR_FORMAT " TARS: " PTR_FORMAT " TAMS: " PTR_FORMAT,
                              HR_FORMAT_PARAMS(hr), p2i(pb), p2i(_cm->top_at_rebuild_start(hr)), p2i(_cm->top_at_mark_start(hr)));
 
-      if (scan_and_scrub_to_pb(hr, hr->bottom(), pb)) {
-        log_trace(gc, marking)("Scan and scrub aborted for region: %u", hr->hrm_index());
-        return true;
-      }
+      {
+        // Step 1: Scan the given region from bottom to parsable_bottom.
+        HeapWord* start = hr->bottom();
+        HeapWord* limit = pb;
+        while (start < limit) {
+          start = scan_or_scrub(hr, start, limit);
 
-      // Yielding during scrubbing and scanning might have reclaimed the region, so need to
-      // re-check after above.
-      if (!should_rebuild_or_scrub(hr)) {
-        return false;
+          if (yield_if_necessary(hr)) {
+            return;
+          }
+        }
       }
+
       // Scrubbing completed for this region - notify that we are done with it, resetting
       // pb to bottom.
       hr->note_end_of_scrubbing();
 
-      // Rebuild from TAMS (= parsable_bottom) to TARS.
-      if (scan_from_pb_to_tars(hr, pb, _cm->top_at_rebuild_start(hr))) {
-        log_trace(gc, marking)("Rebuild aborted for region: %u (%s)", hr->hrm_index(), hr->get_short_type_str());
-        return true;
+      {
+        // Step 2: Rebuild from TAMS (= parsable_bottom) to TARS.
+        HeapWord* start = pb;
+        HeapWord* limit = _cm->top_at_rebuild_start(hr);
+        while (start < limit) {
+          start += scan_object(hr, start);
+
+          if (yield_if_necessary(hr)) {
+            return;
+          }
+        }
       }
-      return false;
     }
 
     // Scan a humongous region for remembered set updates. Scans in chunks to avoid
-    // stalling safepoints. Returns whether the concurrent marking phase has been aborted.
-    bool scan_humongous_region(G1HeapRegion* hr, HeapWord* const pb) {
+    // stalling safepoints.
+    void scan_humongous_region(G1HeapRegion* hr, HeapWord* const pb) {
       assert(should_rebuild_or_scrub(hr), "must be");
 
       if (!_should_rebuild_remset) {
         // When not rebuilding there is nothing to do for humongous objects.
-        return false;
+        return;
       }
 
       // At this point we should only have live humongous objects, that
@@ -278,12 +240,7 @@ class G1RebuildRSAndScrubTask : public WorkerTask {
       HeapWord* humongous_end = hr->humongous_start_region()->bottom() + humongous->size();
       MemRegion mr(hr->bottom(), MIN2(hr->top(), humongous_end));
 
-      bool mark_aborted = scan_large_object(hr, humongous, mr);
-      if (mark_aborted) {
-        log_trace(gc, marking)("Rebuild aborted for region: %u (%s)", hr->hrm_index(), hr->get_short_type_str());
-        return true;
-      }
-      return false;
+      scan_large_object(hr, humongous, mr);
     }
 
   public:
@@ -312,17 +269,16 @@ class G1RebuildRSAndScrubTask : public WorkerTask {
         return false;
       }
 
-      bool mark_aborted;
       if (hr->needs_scrubbing()) {
         // This is a region with potentially unparsable (dead) objects.
-        mark_aborted = scan_and_scrub_region(hr, pb);
+        scan_and_scrub_region(hr, pb);
       } else {
         assert(hr->is_humongous(), "must be, but %u is %s", hr->hrm_index(), hr->get_short_type_str());
         // No need to scrub humongous, but we should scan it to rebuild remsets.
-        mark_aborted = scan_humongous_region(hr, pb);
+        scan_humongous_region(hr, pb);
       }
 
-      return mark_aborted;
+      return _cm->has_aborted();
     }
   };
 

From ee365d75cca6f33e5781fe514e557caba2b67c32 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Mon, 29 Jul 2024 13:37:56 +0000
Subject: [PATCH 240/401] 8336342: Fix known X11 library locations in sysroot

Reviewed-by: jwaters, phh, prr
---
 make/autoconf/lib-x11.m4 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/autoconf/lib-x11.m4 b/make/autoconf/lib-x11.m4
index b1902a432a1e0..6849b4a26c776 100644
--- a/make/autoconf/lib-x11.m4
+++ b/make/autoconf/lib-x11.m4
@@ -71,9 +71,9 @@ AC_DEFUN_ONCE([LIB_SETUP_X11],
           elif test -f "$SYSROOT/usr/lib/libX11.so"; then
             x_libraries="$SYSROOT/usr/lib"
           elif test -f "$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI/libX11.so"; then
-            x_libraries="$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI/libX11.so"
+            x_libraries="$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI"
           elif test -f "$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU_AUTOCONF-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI/libX11.so"; then
-            x_libraries="$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU_AUTOCONF-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI/libX11.so"
+            x_libraries="$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU_AUTOCONF-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI"
           fi
         fi
       fi

From c23d37e10a429c0e7248593b07ef1ccdcd34bd1c Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Mon, 29 Jul 2024 16:43:25 +0000
Subject: [PATCH 241/401] 8337300: java/lang/Process/WaitForDuration.java
 leaves child process behind

Reviewed-by: alanb, iris, bpb
---
 test/jdk/java/lang/Process/WaitForDuration.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/test/jdk/java/lang/Process/WaitForDuration.java b/test/jdk/java/lang/Process/WaitForDuration.java
index d9172b305a0c0..76c69e36d1357 100644
--- a/test/jdk/java/lang/Process/WaitForDuration.java
+++ b/test/jdk/java/lang/Process/WaitForDuration.java
@@ -55,9 +55,14 @@ static Stream<Arguments> durations() {
     @MethodSource("durations")
     void testEdgeDurations(Duration d, int sleepMillis, boolean expected)
             throws IOException, InterruptedException {
-        var pb = ProcessTools.createTestJavaProcessBuilder(
-            WaitForDuration.class.getSimpleName(), Integer.toString(sleepMillis));
-        assertEquals(expected, pb.start().waitFor(d));
+        var child = ProcessTools.createTestJavaProcessBuilder(
+            WaitForDuration.class.getSimpleName(), Integer.toString(sleepMillis))
+                .start();
+        try {
+            assertEquals(expected, child.waitFor(d));
+        } finally {
+            child.destroy();
+        }
     }
 
     @Test

From c4e6255ac3ec5520c4cb6d0d4ad9013da177ba88 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Mon, 29 Jul 2024 16:55:38 +0000
Subject: [PATCH 242/401] 8332738: Debug agent can deadlock on callbackLock
 when using StackFrame.PopFrames

Reviewed-by: sspitsyn, amenkov
---
 .../share/native/libjdwp/eventHandler.c        | 18 +++++++++++++++---
 .../share/native/libjdwp/eventHandler.h        |  5 ++++-
 .../share/native/libjdwp/invoker.c             | 10 +++++++---
 .../share/native/libjdwp/stepControl.c         |  6 ++++--
 .../share/native/libjdwp/threadControl.c       | 17 +++++++++++------
 5 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.c b/src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.c
index f91f16104ca35..cf2de8061195b 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -93,8 +93,8 @@ static jrawMonitorID callbackBlock;
  *   not blocking might mean that a return would continue execution of
  *   some java thread in the middle of VM_DEATH, this seems troubled.
  *
- *   WARNING: No not 'return' or 'goto' out of the BEGIN_CALLBACK/END_CALLBACK
- *            block, this will mess up the count.
+ *   WARNING: Do not 'return' or 'goto' out of the BEGIN_CALLBACK/END_CALLBACK
+ *            block. This will mess up the active_callbacks count.
  */
 
 #define BEGIN_CALLBACK()                                                \
@@ -1709,6 +1709,18 @@ eventHandler_unlock(void)
     debugMonitorExit(handlerLock);
 }
 
+void
+callback_lock(void)
+{
+    debugMonitorEnter(callbackLock);
+}
+
+void
+callback_unlock(void)
+{
+    debugMonitorExit(callbackLock);
+}
+
 /***** handler creation *****/
 
 HandlerNode *
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.h b/src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.h
index c4a7aa0c4412b..096b1ed795ac6 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.h
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/eventHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -78,6 +78,9 @@ void eventHandler_waitForActiveCallbacks();
 void eventHandler_lock(void);
 void eventHandler_unlock(void);
 
+void callback_lock(void);
+void callback_unlock(void);
+
 jboolean eventHandler_synthesizeUnloadEvent(char *signature, JNIEnv *env);
 
 jclass getMethodClass(jvmtiEnv *jvmti_env, jmethodID method);
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/invoker.c b/src/jdk.jdwp.agent/share/native/libjdwp/invoker.c
index e1b4d2f3ab6d6..4b32430ad7be0 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/invoker.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/invoker.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -719,7 +719,9 @@ invoker_completeInvokeRequest(jthread thread)
     exc = NULL;
     id  = 0;
 
-    eventHandler_lock(); /* for proper lock order */
+    callback_lock();     /* for proper lock order in threadControl getLocks() */
+    eventHandler_lock(); /* for proper lock order in threadControl getLocks() */
+    stepControl_lock();  /* for proper lock order in threadControl getLocks() */
     debugMonitorEnter(invokerLock);
 
     request = threadControl_getInvokeRequest(thread);
@@ -772,7 +774,7 @@ invoker_completeInvokeRequest(jthread thread)
      * We cannot delete saved exception or return value references
      * since otherwise a deleted handle would escape when writing
      * the response to the stream. Instead, we clean those refs up
-     * after writing the respone.
+     * after writing the response.
      */
     deleteGlobalArgumentRefs(env, request);
 
@@ -790,7 +792,9 @@ invoker_completeInvokeRequest(jthread thread)
      * Give up the lock before I/O operation
      */
     debugMonitorExit(invokerLock);
+    stepControl_unlock();
     eventHandler_unlock();
+    callback_unlock();
 
     if (!detached) {
         outStream_initReply(&out, id);
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/stepControl.c b/src/jdk.jdwp.agent/share/native/libjdwp/stepControl.c
index 0611e8fc2138c..aeec8175b1738 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/stepControl.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/stepControl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -805,7 +805,8 @@ stepControl_beginStep(JNIEnv *env, jthread thread, jint size, jint depth,
     LOG_STEP(("stepControl_beginStep: thread=%p,size=%d,depth=%d",
               thread, size, depth));
 
-    eventHandler_lock(); /* for proper lock order */
+    callback_lock();     /* for proper lock order in threadControl getLocks() */
+    eventHandler_lock(); /* for proper lock order in threadControl getLocks() */
     stepControl_lock();
 
     step = threadControl_getStepRequest(thread);
@@ -852,6 +853,7 @@ stepControl_beginStep(JNIEnv *env, jthread thread, jint size, jint depth,
 
     stepControl_unlock();
     eventHandler_unlock();
+    callback_unlock();
 
     return error;
 }
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c b/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c
index 00c34844c986a..220e004097945 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/threadControl.c
@@ -642,26 +642,31 @@ getLocks(void)
      * thread) needs to be grabbed here. This allows thread control
      * code to safely suspend and resume the application threads
      * while ensuring they don't hold a critical lock.
+     *
+     * stepControl_beginStep() grabs the eventHandler lock and stepControl lock
+     * before eventually ending up here, so we need to maintain that order here.
+     * Similarly, invoker_completeInvokeRequest() grabs the eventHandler lock
+     * and invoker lock.
      */
-
+    callback_lock();
     eventHandler_lock();
+    stepControl_lock();
     invoker_lock();
     eventHelper_lock();
-    stepControl_lock();
-    commonRef_lock();
     debugMonitorEnter(threadLock);
-
+    commonRef_lock();
 }
 
 static void
 releaseLocks(void)
 {
-    debugMonitorExit(threadLock);
     commonRef_unlock();
-    stepControl_unlock();
+    debugMonitorExit(threadLock);
     eventHelper_unlock();
     invoker_unlock();
+    stepControl_unlock();
     eventHandler_unlock();
+    callback_unlock();
 }
 
 void

From a86244f83cc4e234bdf8dc2c8d87640b6aab8463 Mon Sep 17 00:00:00 2001
From: Archie Cobbs <acobbs@openjdk.org>
Date: Mon, 29 Jul 2024 19:16:39 +0000
Subject: [PATCH 243/401] 6381729: Javadoc for generic constructor doesn't
 document type parameter

Reviewed-by: jjg, liach
---
 .../html/AbstractExecutableMemberWriter.java  | 21 ++++++-
 .../formats/html/AbstractMemberWriter.java    | 12 +---
 .../doclets/formats/html/ClassUseWriter.java  |  2 +-
 .../formats/html/ConstructorWriter.java       | 59 ++++++++++++++-----
 .../doclets/formats/html/Signatures.java      |  6 +-
 .../doclet/testErasure/TestErasure.java       | 15 +++--
 .../testTypeParams/TestTypeParameters.java    | 24 +++++++-
 .../testTypeParams/pkg/CtorTypeParam.java     | 29 +++++++++
 8 files changed, 133 insertions(+), 35 deletions(-)
 create mode 100644 test/langtools/jdk/javadoc/doclet/testTypeParams/pkg/CtorTypeParam.java

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java
index 4e929130b667f..f6ad4cf05dfab 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.TypeParameterElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.ExecutableType;
@@ -130,6 +131,24 @@ protected void addInheritedSummaryLink(TypeElement te, Element member, Content t
         target.add(writer.getDocLink(PLAIN, te, member, name(member)));
     }
 
+    /**
+     * Adds the generic type parameters.
+     *
+     * @param member the member to add the generic type parameters for
+     * @param target the content to which the generic type parameters will be added
+     */
+    protected void addTypeParameters(ExecutableElement member, Content target) {
+        Content typeParameters = getTypeParameters(member);
+        target.add(typeParameters);
+        // Add explicit line break between method type parameters and
+        // return type in member summary table to avoid random wrapping.
+        if (typeParameters.charCount() > 10) {
+            target.add(new HtmlTree(TagName.BR));
+        } else {
+            target.add(Entity.NO_BREAK_SPACE);
+        }
+    }
+
     /**
      * Add the parameter for the executable member.
      *
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
index caeb6c35e6d66..af1f7ef1fe6cb 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
@@ -466,16 +466,8 @@ protected void addModifiersAndType(Element member, TypeMirror type,
                     ? ((ExecutableElement)member).getTypeParameters()
                     : null;
             if (list != null && !list.isEmpty()) {
-                Content typeParameters = ((AbstractExecutableMemberWriter) this)
-                        .getTypeParameters((ExecutableElement)member);
-                code.add(typeParameters);
-                // Add explicit line break between method type parameters and
-                // return type in member summary table to avoid random wrapping.
-                if (typeParameters.charCount() > 10) {
-                    code.add(new HtmlTree(TagName.BR));
-                } else {
-                    code.add(Entity.NO_BREAK_SPACE);
-                }
+                ((AbstractExecutableMemberWriter) this)
+                  .addTypeParameters((ExecutableElement)member, code);
             }
             code.add(
                     writer.getLink(new HtmlLinkInfo(configuration,
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java
index e949b4ddc6831..94e66f1eed610 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java
@@ -142,7 +142,7 @@ public ClassUseWriter(HtmlConfiguration configuration,
 
         methodSubWriter = new MethodWriter(this);
         constrSubWriter = new ConstructorWriter(this);
-        constrSubWriter.setFoundNonPubConstructor(true);
+        constrSubWriter.setShowConstructorModifiers(true);
         fieldSubWriter = new FieldWriter(this);
         classSubWriter = new NestedClassWriter(this);
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriter.java
index 1c4af2faf9782..c5fb332a0087b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriter.java
@@ -31,6 +31,7 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.TypeParameterElement;
 
 import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
 import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
@@ -53,7 +54,17 @@ public class ConstructorWriter extends AbstractExecutableMemberWriter {
      */
     private ExecutableElement currentConstructor;
 
-    private boolean foundNonPubConstructor = false;
+    /**
+     * If any constructors are non-public, then we want the modifiers shown in the summary.
+     * This implies we need a three-column summary.
+     */
+    private boolean showConstructorModifiers = false;
+
+    /**
+     * Whether any constructors have type parameters.
+     * This implies we need a three column summary.
+     */
+    private boolean hasTypeParamsConstructor = false;
 
     /**
      * Construct a new member writer for constructors.
@@ -65,11 +76,7 @@ public ConstructorWriter(ClassWriter writer) {
 
         // the following must be done before the summary table is generated
         var constructors = getVisibleMembers(VisibleMemberTable.Kind.CONSTRUCTORS);
-        for (Element constructor : constructors) {
-            if (utils.isProtected(constructor) || utils.isPrivate(constructor)) {
-                setFoundNonPubConstructor(true);
-            }
-        }
+        analyzeConstructors(constructors);
     }
 
     /**
@@ -94,11 +101,7 @@ public void buildDetails(Content target) {
     protected void buildConstructorDoc(Content target) {
         var constructors = getVisibleMembers(VisibleMemberTable.Kind.CONSTRUCTORS);
         if (!constructors.isEmpty()) {
-            for (Element constructor : constructors) {
-                if (utils.isProtected(constructor) || utils.isPrivate(constructor)) {
-                    setFoundNonPubConstructor(true);
-                }
-            }
+            analyzeConstructors(constructors);
 
             Content constructorDetailsHeader = getConstructorDetailsHeader(target);
             Content memberList = getMemberList();
@@ -126,6 +129,24 @@ protected void buildConstructorDoc(Content target) {
         }
     }
 
+    // Calculate "showConstructorModifiers" and "hasTypeParamsConstructor"
+    private void analyzeConstructors(List<? extends Element> constructors) {
+        for (Element constructor : constructors) {
+            if (utils.isProtected(constructor) || utils.isPrivate(constructor)) {
+                setShowConstructorModifiers(true);
+            }
+            List<? extends TypeParameterElement> list = ((ExecutableElement)constructor).getTypeParameters();
+            if (list != null && !list.isEmpty()) {
+                hasTypeParamsConstructor = true;
+            }
+        }
+    }
+
+    // Does the constructor summary need three columnns or just two?
+    protected boolean threeColumnSummary() {
+        return showConstructorModifiers || hasTypeParamsConstructor;
+    }
+
     @Override
     protected void buildSignature(Content target) {
         target.add(getSignature(currentConstructor));
@@ -201,6 +222,7 @@ protected Content getConstructorHeaderContent(ExecutableElement constructor) {
 
     protected Content getSignature(ExecutableElement constructor) {
         return new Signatures.MemberSignature(constructor, this)
+                .setTypeParameters(getTypeParameters(constructor))
                 .setParameters(getParameters(constructor, true))
                 .setExceptions(getExceptions(constructor))
                 .setAnnotations(writer.getAnnotationInfo(constructor, true))
@@ -231,8 +253,8 @@ protected Content getConstructorDetails(Content memberDetailsHeader, Content mem
                         .add(memberDetails));
     }
 
-    protected void setFoundNonPubConstructor(boolean foundNonPubConstructor) {
-        this.foundNonPubConstructor = foundNonPubConstructor;
+    protected void setShowConstructorModifiers(boolean showConstructorModifiers) {
+        this.showConstructorModifiers = showConstructorModifiers;
     }
 
     @Override
@@ -244,7 +266,7 @@ public void addSummaryLabel(Content content) {
 
     @Override
     public TableHeader getSummaryTableHeader(Element member) {
-        if (foundNonPubConstructor) {
+        if (threeColumnSummary()) {
             return new TableHeader(contents.modifierLabel, contents.constructorLabel,
                     contents.descriptionLabel);
         } else {
@@ -256,7 +278,7 @@ public TableHeader getSummaryTableHeader(Element member) {
     protected Table<Element> createSummaryTable() {
         List<HtmlStyle> bodyRowStyles;
 
-        if (foundNonPubConstructor) {
+        if (threeColumnSummary()) {
             bodyRowStyles = Arrays.asList(HtmlStyle.colFirst, HtmlStyle.colConstructorName,
                     HtmlStyle.colLast);
         } else {
@@ -276,7 +298,7 @@ public void addInheritedSummaryLabel(TypeElement typeElement, Content content) {
 
     @Override
     protected void addSummaryType(Element member, Content content) {
-        if (foundNonPubConstructor) {
+        if (threeColumnSummary()) {
             var code = new HtmlTree(TagName.CODE);
             if (utils.isProtected(member)) {
                 code.add("protected ");
@@ -288,6 +310,11 @@ protected void addSummaryType(Element member, Content content) {
                 code.add(
                         resources.getText("doclet.Package_private"));
             }
+            ExecutableElement constructor = (ExecutableElement)member;
+            List<? extends TypeParameterElement> list = constructor.getTypeParameters();
+            if (list != null && !list.isEmpty()) {
+                addTypeParameters(constructor, code);
+            }
             content.add(code);
         }
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java
index f4f472de9f99a..afc0648fa79c2 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -529,6 +529,7 @@ private void appendModifiers(Content target) {
         private int appendTypeParameters(Content target, int lastLineSeparator) {
             // Apply different wrapping strategies for type parameters
             // depending on the combined length of type parameters and return type.
+            // Note return type will be null if this is a constructor.
             int typeParamLength = typeParameters.charCount();
 
             if (typeParamLength >= TYPE_PARAMS_MAX_INLINE_LENGTH) {
@@ -539,9 +540,10 @@ private int appendTypeParameters(Content target, int lastLineSeparator) {
 
             int lineLength = target.charCount() - lastLineSeparator;
             int newLastLineSeparator = lastLineSeparator;
+            int returnTypeLength = returnType != null ? returnType.charCount() : 0;
 
             // sum below includes length of modifiers plus type params added above
-            if (lineLength + returnType.charCount() > RETURN_TYPE_MAX_LINE_LENGTH) {
+            if (lineLength + returnTypeLength > RETURN_TYPE_MAX_LINE_LENGTH) {
                 target.add(Text.NL);
                 newLastLineSeparator = target.charCount();
             } else {
diff --git a/test/langtools/jdk/javadoc/doclet/testErasure/TestErasure.java b/test/langtools/jdk/javadoc/doclet/testErasure/TestErasure.java
index 3c9f9b6fd9d3b..f80074c50e250 100644
--- a/test/langtools/jdk/javadoc/doclet/testErasure/TestErasure.java
+++ b/test/langtools/jdk/javadoc/doclet/testErasure/TestErasure.java
@@ -82,15 +82,19 @@ class Y { }
                 <section class="constructor-summary" id="constructor-summary">
                 <h2>Constructor Summary</h2>
                 <div class="caption"><span>Constructors</span></div>
-                <div class="summary-table two-column-summary">
-                <div class="table-header col-first">Constructor</div>
+                <div class="summary-table three-column-summary">
+                <div class="table-header col-first">Modifier</div>
+                <div class="table-header col-second">Constructor</div>
                 <div class="table-header col-last">Description</div>
+                <div class="col-first even-row-color"><code>&nbsp;</code></div>
                 <div class="col-constructor-name even-row-color"><code>\
                 <a href="#%3Cinit%3E(T)" class="member-name-link">Foo</a><wbr>(T&nbsp;arg)</code></div>
                 <div class="col-last even-row-color">&nbsp;</div>
+                <div class="col-first odd-row-color"><code>&nbsp;&lt;T extends X&gt;<br></code></div>
                 <div class="col-constructor-name odd-row-color"><code>\
                 <a href="#%3Cinit%3E(X)" class="member-name-link">Foo</a><wbr>(T&nbsp;arg)</code></div>
                 <div class="col-last odd-row-color">&nbsp;</div>
+                <div class="col-first even-row-color"><code>&nbsp;&lt;T extends Y&gt;<br></code></div>
                 <div class="col-constructor-name even-row-color"><code>\
                 <a href="#%3Cinit%3E(Y)" class="member-name-link">Foo</a><wbr>(T&nbsp;arg)</code></div>
                 <div class="col-last even-row-color">&nbsp;</div>
@@ -188,13 +192,16 @@ class X { }
                 <section class="constructor-summary" id="constructor-summary">
                 <h2>Constructor Summary</h2>
                 <div class="caption"><span>Constructors</span></div>
-                <div class="summary-table two-column-summary">
-                <div class="table-header col-first">Constructor</div>
+                <div class="summary-table three-column-summary">
+                <div class="table-header col-first">Modifier</div>
+                <div class="table-header col-second">Constructor</div>
                 <div class="table-header col-last">Description</div>
+                <div class="col-first even-row-color"><code>&nbsp;</code></div>
                 <div class="col-constructor-name even-row-color"><code>\
                 <a href="#%3Cinit%3E(T)" class="member-name-link">Foo</a>\
                 <wbr>(<a href="Foo.html" title="type parameter in Foo">T</a>&nbsp;arg)</code></div>
                 <div class="col-last even-row-color">&nbsp;</div>
+                <div class="col-first odd-row-color"><code>&nbsp;&lt;T extends X&gt;<br></code></div>
                 <div class="col-constructor-name odd-row-color"><code>\
                 <a href="#%3Cinit%3E(X)" class="member-name-link">Foo</a><wbr>(T&nbsp;arg)</code></div>
                 <div class="col-last odd-row-color">&nbsp;</div>
diff --git a/test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java b/test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java
index 7f586b3539d76..0d95ee38cdc94 100644
--- a/test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java
+++ b/test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java
@@ -23,12 +23,13 @@
 
 /*
  * @test
- * @bug      4927167 4974929 7010344 8025633 8081854 8182765 8187288 8261976
+ * @bug      4927167 4974929 6381729 7010344 8025633 8081854 8182765 8187288 8261976
  * @summary  When the type parameters are more than 10 characters in length,
  *           make sure there is a line break between type params and return type
  *           in member summary. Also, test for type parameter links in package-summary and
  *           class-use pages. The class/annotation pages should check for type
  *           parameter links in the class/annotation signature section when -linksource is set.
+ *           Verify that generic type parameters on constructors are documented.
  * @library  ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
  * @build    javadoc.tester.*
@@ -94,4 +95,25 @@ public class </span><span class="element-name"><a href="../src-html/pkg/ClassUse
                     le="class in pkg">ParamTest2</a>&lt;java.util.List&lt;? extends <a href="Foo4.ht\
                     ml" title="class in pkg">Foo4</a>&gt;&gt;&gt;""");
     }
+
+    @Test
+    public void test3() {
+        javadoc("-d", "out-3",
+                "-Xdoclint:none",
+                "--no-platform-links",
+                "-sourcepath", testSrc,
+                "pkg");
+        checkExit(Exit.OK);
+
+        checkOutput("pkg/CtorTypeParam.html", true,
+                """
+                    <div class="col-first even-row-color"><code>&nbsp;&lt;T extends java.lang.Runnable&gt;<br></code></div>
+                    <div class="col-constructor-name even-row-color"><code>\
+                    <a href="#%3Cinit%3E()" class="member-name-link">CtorTypeParam</a>()</code></div>
+                    <div class="col-last even-row-color">&nbsp;</div>""",
+                """
+                    <div class="member-signature"><span class="modifiers">public</span>\
+                    &nbsp;<span class="type-parameters">&lt;T extends java.lang.Runnable&gt;</span>\
+                    &nbsp;<span class="element-name">CtorTypeParam</span>()</div>""");
+    }
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testTypeParams/pkg/CtorTypeParam.java b/test/langtools/jdk/javadoc/doclet/testTypeParams/pkg/CtorTypeParam.java
new file mode 100644
index 0000000000000..a7f2309475d28
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testTypeParams/pkg/CtorTypeParam.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+package pkg;
+
+public class CtorTypeParam {
+    public <T extends Runnable> CtorTypeParam() {
+    }
+}

From bd36b6ae5d0d760670a0bd722878614a6cd553d6 Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Mon, 29 Jul 2024 19:28:14 +0000
Subject: [PATCH 244/401] 8337285: Examine java.text.DecimalFormat API for
 api/implXxx tag usage

Reviewed-by: naoto, liach
---
 .../classes/java/text/DecimalFormat.java      | 57 +++++++++----------
 1 file changed, 27 insertions(+), 30 deletions(-)

diff --git a/src/java.base/share/classes/java/text/DecimalFormat.java b/src/java.base/share/classes/java/text/DecimalFormat.java
index 07a1c6932e7e3..c04abbd042f57 100644
--- a/src/java.base/share/classes/java/text/DecimalFormat.java
+++ b/src/java.base/share/classes/java/text/DecimalFormat.java
@@ -430,16 +430,15 @@ public class DecimalFormat extends NumberFormat {
      * for the default {@link java.util.Locale.Category#FORMAT FORMAT} locale.
      * This is a convenient way to obtain a
      * DecimalFormat when internationalization is not the main concern.
-     * <p>
-     * To obtain standard formats for a given locale, use the factory methods
-     * on NumberFormat such as getNumberInstance. These factories will
-     * return the most appropriate sub-class of NumberFormat for a given
-     * locale.
      *
-     * @see java.text.NumberFormat#getInstance
-     * @see java.text.NumberFormat#getNumberInstance
-     * @see java.text.NumberFormat#getCurrencyInstance
-     * @see java.text.NumberFormat#getPercentInstance
+     * @apiNote To obtain standard formats for a given locale, use the
+     * {@code NumberFormat} factory methods such as {@link
+     * NumberFormat#getNumberInstance(Locale)}. These factories will return the most
+     * appropriate subclass of NumberFormat for a given locale.
+     * @see NumberFormat#getInstance(Locale)
+     * @see NumberFormat#getNumberInstance(Locale)
+     * @see NumberFormat#getCurrencyInstance(Locale)
+     * @see NumberFormat#getPercentInstance(Locale)
      */
     @SuppressWarnings("this-escape")
     public DecimalFormat() {
@@ -464,19 +463,18 @@ public DecimalFormat() {
      * DecimalFormat when internationalization is not the main concern.
      * The number of maximum integer digits is usually not derived from the pattern.
      * See the note in the {@link ##patterns Patterns} section for more detail.
-     * <p>
-     * To obtain standard formats for a given locale, use the factory methods
-     * on NumberFormat such as getNumberInstance. These factories will
-     * return the most appropriate sub-class of NumberFormat for a given
-     * locale.
      *
+     * @apiNote To obtain standard formats for a given locale, use the
+     * {@code NumberFormat} factory methods such as {@link
+     * NumberFormat#getNumberInstance(Locale)}. These factories will return the most
+     * appropriate subclass of NumberFormat for a given locale.
      * @param pattern a non-localized pattern string.
      * @throws    NullPointerException if {@code pattern} is null
      * @throws    IllegalArgumentException if the given pattern is invalid.
-     * @see java.text.NumberFormat#getInstance
-     * @see java.text.NumberFormat#getNumberInstance
-     * @see java.text.NumberFormat#getCurrencyInstance
-     * @see java.text.NumberFormat#getPercentInstance
+     * @see NumberFormat#getInstance(Locale)
+     * @see NumberFormat#getNumberInstance(Locale)
+     * @see NumberFormat#getCurrencyInstance(Locale)
+     * @see NumberFormat#getPercentInstance(Locale)
      */
     @SuppressWarnings("this-escape")
     public DecimalFormat(String pattern) {
@@ -492,21 +490,20 @@ public DecimalFormat(String pattern) {
      * behavior of the format.
      * The number of maximum integer digits is usually not derived from the pattern.
      * See the note in the {@link ##patterns Patterns} section for more detail.
-     * <p>
-     * To obtain standard formats for a given
-     * locale, use the factory methods on NumberFormat such as
-     * getInstance or getCurrencyInstance. If you need only minor adjustments
-     * to a standard format, you can modify the format returned by
-     * a NumberFormat factory method.
      *
+     * @apiNote To obtain standard formats for a given locale, use the
+     * {@code NumberFormat} factory methods such as {@link
+     * NumberFormat#getInstance(Locale)} or {@link NumberFormat#getCurrencyInstance(Locale)}.
+     * If you need only minor adjustments to a standard format, you can modify
+     * the format returned by a NumberFormat factory method.
      * @param pattern a non-localized pattern string
      * @param symbols the set of symbols to be used
      * @throws    NullPointerException if any of the given arguments is null
      * @throws    IllegalArgumentException if the given pattern is invalid
-     * @see java.text.NumberFormat#getInstance
-     * @see java.text.NumberFormat#getNumberInstance
-     * @see java.text.NumberFormat#getCurrencyInstance
-     * @see java.text.NumberFormat#getPercentInstance
+     * @see NumberFormat#getInstance(Locale)
+     * @see NumberFormat#getNumberInstance(Locale)
+     * @see NumberFormat#getCurrencyInstance(Locale)
+     * @see NumberFormat#getPercentInstance(Locale)
      * @see java.text.DecimalFormatSymbols
      */
     @SuppressWarnings("this-escape")
@@ -522,8 +519,8 @@ public DecimalFormat (String pattern, DecimalFormatSymbols symbols) {
      * Formats a number and appends the resulting text to the given string
      * buffer.
      * The number can be of any subclass of {@link java.lang.Number}.
-     * <p>
-     * This implementation uses the maximum precision permitted.
+     *
+     * @implSpec This implementation uses the maximum precision permitted.
      * @param number     the number to format
      * @param toAppendTo the {@code StringBuffer} to which the formatted
      *                   text is to be appended

From ab27090aa085283233851410827767785b3b7b1f Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Mon, 29 Jul 2024 21:58:08 +0000
Subject: [PATCH 245/401] 8337225: Demote maxStack and maxLocals from CodeModel
 to CodeAttribute

Reviewed-by: asotona
---
 .../java/lang/classfile/CodeModel.java        |  12 +-
 .../classfile/attribute/CodeAttribute.java    |  10 ++
 .../classfile/impl/AbstractUnboundModel.java  |   9 +-
 .../classfile/impl/BufferedCodeBuilder.java   |  40 ++----
 .../classfile/impl/BufferedFieldBuilder.java  |   9 +-
 .../classfile/impl/BufferedMethodBuilder.java |  13 +-
 .../jdk/internal/classfile/impl/CodeImpl.java |   2 +-
 .../classfile/impl/DirectCodeBuilder.java     |  11 +-
 .../classfile/impl/TerminalCodeBuilder.java   |  16 +++
 test/jdk/jdk/classfile/BuilderBlockTest.java  | 117 +++++++++++++++---
 test/jdk/jdk/classfile/CorpusTest.java        |   7 +-
 .../DiscontinuedInstructionsTest.java         |   3 +-
 test/jdk/jdk/classfile/StackMapsTest.java     |   3 +-
 13 files changed, 165 insertions(+), 87 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/classfile/CodeModel.java b/src/java.base/share/classes/java/lang/classfile/CodeModel.java
index 45488561c1ab3..ba816f2080581 100644
--- a/src/java.base/share/classes/java/lang/classfile/CodeModel.java
+++ b/src/java.base/share/classes/java/lang/classfile/CodeModel.java
@@ -43,17 +43,7 @@
 @PreviewFeature(feature = PreviewFeature.Feature.CLASSFILE_API)
 public sealed interface CodeModel
         extends CompoundElement<CodeElement>, AttributedElement, MethodElement
-        permits CodeAttribute, BufferedCodeBuilder.Model, CodeImpl {
-
-    /**
-     * {@return the maximum size of the local variable table}
-     */
-    int maxLocals();
-
-    /**
-     * {@return the maximum size of the operand stack}
-     */
-    int maxStack();
+        permits CodeAttribute, BufferedCodeBuilder.Model {
 
     /**
      * {@return the enclosing method, if known}
diff --git a/src/java.base/share/classes/java/lang/classfile/attribute/CodeAttribute.java b/src/java.base/share/classes/java/lang/classfile/attribute/CodeAttribute.java
index 02cbcee810f64..7a4f5886580cc 100644
--- a/src/java.base/share/classes/java/lang/classfile/attribute/CodeAttribute.java
+++ b/src/java.base/share/classes/java/lang/classfile/attribute/CodeAttribute.java
@@ -47,6 +47,16 @@
 public sealed interface CodeAttribute extends Attribute<CodeAttribute>, CodeModel
         permits BoundAttribute.BoundCodeAttribute {
 
+    /**
+     * {@return the maximum size of the local variable table}
+     */
+    int maxLocals();
+
+    /**
+     * {@return the maximum size of the operand stack}
+     */
+    int maxStack();
+
     /**
      * {@return The length of the code array in bytes}
      */
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractUnboundModel.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractUnboundModel.java
index 788bdffe1cd5b..2926be9dad7dc 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractUnboundModel.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractUnboundModel.java
@@ -35,7 +35,7 @@
 
 public abstract sealed class AbstractUnboundModel<E extends ClassFileElement>
         extends AbstractElement
-        implements CompoundElement<E>, AttributedElement, Util.Writable
+        implements CompoundElement<E>, AttributedElement
         permits BufferedCodeBuilder.Model, BufferedFieldBuilder.Model, BufferedMethodBuilder.Model {
     private final List<E> elements;
     private List<Attribute<?>> attributes;
@@ -63,8 +63,11 @@ public List<E> elementList() {
     public List<Attribute<?>> attributes() {
         if (attributes == null)
             attributes = elements.stream()
-                                 .filter(e -> e instanceof Attribute)
-                                 .<Attribute<?>>map(e -> (Attribute<?>) e)
+                                 .<Attribute<?>>mapMulti((e, sink) -> {
+                                     if (e instanceof Attribute<?> attr) {
+                                         sink.accept(attr);
+                                     }
+                                 })
                                  .toList();
         return attributes;
     }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedCodeBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedCodeBuilder.java
index 4743c58607c84..7f041633d8a20 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedCodeBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedCodeBuilder.java
@@ -32,9 +32,6 @@
 import java.lang.classfile.Label;
 import java.lang.classfile.MethodModel;
 import java.lang.classfile.instruction.ExceptionCatch;
-import java.lang.classfile.instruction.IncrementInstruction;
-import java.lang.classfile.instruction.LoadInstruction;
-import java.lang.classfile.instruction.StoreInstruction;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -47,7 +44,6 @@ public final class BufferedCodeBuilder
     private final ClassFileImpl context;
     private final List<CodeElement> elements = new ArrayList<>();
     private final LabelImpl startLabel, endLabel;
-    private final CodeModel original;
     private final MethodInfo methodInfo;
     private boolean finished;
     private int maxLocals;
@@ -60,12 +56,8 @@ public BufferedCodeBuilder(MethodInfo methodInfo,
         this.context = context;
         this.startLabel = new LabelImpl(this, -1);
         this.endLabel = new LabelImpl(this, -1);
-        this.original = original;
         this.methodInfo = methodInfo;
-        this.maxLocals = Util.maxLocals(methodInfo.methodFlags(), methodInfo.methodTypeSymbol());
-        if (original != null)
-            this.maxLocals = Math.max(this.maxLocals, original.maxLocals());
-
+        this.maxLocals = TerminalCodeBuilder.setupTopLocal(methodInfo, original);
         elements.add(startLabel);
     }
 
@@ -162,27 +154,16 @@ private Model() {
         @Override
         public List<ExceptionCatch> exceptionHandlers() {
             return elements.stream()
-                           .filter(x -> x instanceof ExceptionCatch)
-                           .map(x -> (ExceptionCatch) x)
+                           .<ExceptionCatch>mapMulti((x, sink) -> {
+                               if (x instanceof ExceptionCatch ec) {
+                                   sink.accept(ec);
+                               }
+                           })
                            .toList();
         }
 
-        @Override
-        public int maxLocals() {
-            for (CodeElement element : elements) {
-                if (element instanceof LoadInstruction i)
-                    maxLocals = Math.max(maxLocals, i.slot() + i.typeKind().slotSize());
-                else if (element instanceof StoreInstruction i)
-                    maxLocals = Math.max(maxLocals, i.slot() + i.typeKind().slotSize());
-                else if (element instanceof IncrementInstruction i)
-                    maxLocals = Math.max(maxLocals, i.slot() + 1);
-            }
-            return maxLocals;
-        }
-
-        @Override
-        public int maxStack() {
-            throw new UnsupportedOperationException("nyi");
+        int curTopLocal() {
+            return BufferedCodeBuilder.this.curTopLocal();
         }
 
         @Override
@@ -200,11 +181,6 @@ public void accept(CodeBuilder cb) {
             });
         }
 
-        @Override
-        public void writeTo(BufWriterImpl buf) {
-            DirectCodeBuilder.build(methodInfo, cb -> elements.forEach(cb), constantPool, context, null).writeTo(buf);
-        }
-
         @Override
         public String toString() {
             return String.format("CodeModel[id=%s]", Integer.toHexString(System.identityHashCode(this)));
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedFieldBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedFieldBuilder.java
index 660a999f2a3e5..66ecf10598afb 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedFieldBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedFieldBuilder.java
@@ -103,7 +103,7 @@ public Utf8Entry fieldType() {
 
         @Override
         public void writeTo(DirectClassBuilder builder) {
-            builder.withField(name, desc, new Consumer<FieldBuilder>() {
+            builder.withField(name, desc, new Consumer<>() {
                 @Override
                 public void accept(FieldBuilder fieldBuilder) {
                     elements.forEach(fieldBuilder);
@@ -111,13 +111,6 @@ public void accept(FieldBuilder fieldBuilder) {
             });
         }
 
-        @Override
-        public void writeTo(BufWriterImpl buf) {
-            DirectFieldBuilder fb = new DirectFieldBuilder(constantPool, context, name, desc, null);
-            elements.forEach(fb);
-            fb.writeTo(buf);
-        }
-
         @Override
         public String toString() {
             return String.format("FieldModel[fieldName=%s, fieldType=%s, flags=%d]", name.stringValue(), desc.stringValue(), flags.flagsMask());
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java
index 880c6717db87c..b93ad1185ab3b 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java
@@ -196,7 +196,11 @@ public int parameterSlot(int paramNo) {
 
         @Override
         public Optional<CodeModel> code() {
-            throw new UnsupportedOperationException("nyi");
+            return elements.stream().<CodeModel>mapMulti((e, sink) -> {
+                if (e instanceof CodeModel cm) {
+                    sink.accept(cm);
+                }
+            }).findFirst();
         }
 
         @Override
@@ -209,13 +213,6 @@ public void accept(MethodBuilder mb) {
             });
         }
 
-        @Override
-        public void writeTo(BufWriterImpl buf) {
-            DirectMethodBuilder mb = new DirectMethodBuilder(constantPool, context, name, desc, methodFlags(), null);
-            elements.forEach(mb);
-            mb.writeTo(buf);
-        }
-
         @Override
         public String toString() {
             return String.format("MethodModel[methodName=%s, methodType=%s, flags=%d]",
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java
index 7669cbfdd30ca..d4719fad0b1c2 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java
@@ -43,7 +43,7 @@
 
 public final class CodeImpl
         extends BoundAttribute.BoundCodeAttribute
-        implements CodeModel, LabelContext {
+        implements LabelContext {
 
     static final Instruction[] SINGLETON_INSTRUCTIONS = new Instruction[256];
 
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/DirectCodeBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/DirectCodeBuilder.java
index 536750ebd2f0e..a7652ac369b16 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/DirectCodeBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/DirectCodeBuilder.java
@@ -127,12 +127,10 @@ private DirectCodeBuilder(MethodInfo methodInfo,
         this.transformFwdJumps = transformFwdJumps;
         this.transformBackJumps = context.shortJumpsOption() == ClassFile.ShortJumpsOption.FIX_SHORT_JUMPS;
         bytecodesBufWriter = (original instanceof CodeImpl cai) ? new BufWriterImpl(constantPool, context, cai.codeLength())
-                                                               : new BufWriterImpl(constantPool, context);
+                : new BufWriterImpl(constantPool, context);
         this.startLabel = new LabelImpl(this, 0);
         this.endLabel = new LabelImpl(this, -1);
-        this.topLocal = Util.maxLocals(methodInfo.methodFlags(), methodInfo.methodTypeSymbol());
-        if (original != null)
-            this.topLocal = Math.max(this.topLocal, original.maxLocals());
+        this.topLocal = TerminalCodeBuilder.setupTopLocal(methodInfo, original);
     }
 
     @Override
@@ -312,8 +310,9 @@ public void writeBody(BufWriterImpl b) {
 
             private void writeCounters(boolean codeMatch, BufWriterImpl buf) {
                 if (codeMatch) {
-                    buf.writeU2(original.maxStack());
-                    buf.writeU2(original.maxLocals());
+                    var originalAttribute = (CodeImpl) original;
+                    buf.writeU2(originalAttribute.maxStack());
+                    buf.writeU2(originalAttribute.maxLocals());
                 } else {
                     StackCounter cntr = StackCounter.of(DirectCodeBuilder.this, buf);
                     buf.writeU2(cntr.maxStack());
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/TerminalCodeBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/TerminalCodeBuilder.java
index 6e3ca516bf480..054ea91992869 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/TerminalCodeBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/TerminalCodeBuilder.java
@@ -25,8 +25,24 @@
 package jdk.internal.classfile.impl;
 
 import java.lang.classfile.CodeBuilder;
+import java.lang.classfile.CodeModel;
+import java.lang.classfile.attribute.CodeAttribute;
 
 public sealed interface TerminalCodeBuilder extends CodeBuilder, LabelContext
         permits DirectCodeBuilder, BufferedCodeBuilder {
     int curTopLocal();
+
+    static int setupTopLocal(MethodInfo methodInfo, CodeModel original) {
+        int paramSlots = Util.maxLocals(methodInfo.methodFlags(), methodInfo.methodTypeSymbol());
+        if (original == null) {
+            return paramSlots;
+        }
+        if (original instanceof CodeAttribute attr) {
+            return Math.max(paramSlots, attr.maxLocals());
+        }
+        if (original instanceof BufferedCodeBuilder.Model buffered) {
+            return Math.max(paramSlots, buffered.curTopLocal());
+        }
+        throw new InternalError("Unknown code model " + original);
+    }
 }
diff --git a/test/jdk/jdk/classfile/BuilderBlockTest.java b/test/jdk/jdk/classfile/BuilderBlockTest.java
index c8e13b79f7280..a2fb361ca2c7a 100644
--- a/test/jdk/jdk/classfile/BuilderBlockTest.java
+++ b/test/jdk/jdk/classfile/BuilderBlockTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,36 +23,48 @@
 
 /*
  * @test
+ * @bug 8337225
  * @summary Testing ClassFile builder blocks.
  * @run junit BuilderBlockTest
  */
+import java.io.IOException;
+import java.lang.classfile.AccessFlags;
+import java.lang.classfile.Attributes;
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassTransform;
+import java.lang.classfile.CodeBuilder;
+import java.lang.classfile.CodeElement;
+import java.lang.classfile.CodeTransform;
+import java.lang.classfile.Label;
+import java.lang.classfile.MethodModel;
+import java.lang.classfile.MethodTransform;
+import java.lang.classfile.Opcode;
+import java.lang.classfile.TypeKind;
+import java.lang.classfile.constantpool.StringEntry;
+import java.lang.classfile.instruction.ConstantInstruction;
 import java.lang.constant.ClassDesc;
-
-import static java.lang.constant.ConstantDescs.*;
-
 import java.lang.constant.MethodTypeDesc;
+import java.lang.reflect.AccessFlag;
 import java.lang.reflect.Method;
+import java.net.URI;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 
 import helpers.ByteArrayClassLoader;
-import java.lang.classfile.AccessFlags;
-import java.lang.reflect.AccessFlag;
-import java.lang.classfile.ClassFile;
-import java.lang.classfile.Label;
-import java.lang.classfile.Opcode;
-import java.lang.classfile.TypeKind;
 import jdk.internal.classfile.impl.LabelImpl;
-import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
+import static java.lang.constant.ConstantDescs.CD_int;
+import static java.lang.constant.ConstantDescs.CD_void;
+
+import static org.junit.jupiter.api.Assertions.*;
+
 /**
  * BuilderBlockTest
  */
 class BuilderBlockTest {
 
-    static final String testClassName = "AdaptCodeTest$TestClass";
-    static final Path testClassPath = Paths.get("target/test-classes/" + testClassName + ".class");
+    static final String testClassName = "BuilderBlockTest$TestClass";
+    static final Path testClassPath = Path.of(URI.create(BuilderBlockTest.class.getResource(testClassName + ".class").toString()));
 
     @Test
     void testStartEnd() throws Exception {
@@ -305,4 +317,81 @@ void testAllocateLocalIfThen() {
                           }));
         });
     }
+
+    private static final CodeTransform ALLOCATE_LOCAL_EXAMINER = CodeTransform.ofStateful(() -> new CodeTransform() {
+        boolean foundItem = false;
+
+        @Override
+        public void atStart(CodeBuilder builder) {
+            foundItem = false;
+        }
+
+        @Override
+        public void accept(CodeBuilder cob, CodeElement coe) {
+            cob.with(coe);
+            if (coe instanceof ConstantInstruction.LoadConstantInstruction ldc
+                    && ldc.constantEntry() instanceof StringEntry se
+                    && se.utf8().equalsString("Output")) {
+                assertFalse(foundItem);
+                foundItem = true;
+                var i = cob.allocateLocal(TypeKind.IntType);
+                assertEquals(7, i, "Allocated new int slot");
+            }
+        }
+
+        @Override
+        public void atEnd(CodeBuilder builder) {
+            assertTrue(foundItem);
+        }
+    });
+
+    // Test updating local variable slot management from
+    // source code models in transformingCode;
+    // CodeBuilder.transform(CodeModel, CodeTransform) is
+    // not managed for now
+    @Test
+    void testAllocateLocalTransformingCodeAttribute() throws IOException {
+        var cf = ClassFile.of();
+        var code = cf.parse(testClassPath)
+                .methods()
+                .stream()
+                .filter(f -> f.methodName().equalsString("work"))
+                .findFirst()
+                .orElseThrow()
+                .findAttribute(Attributes.code())
+                .orElseThrow();
+        ClassFile.of().build(ClassDesc.of("Foo"), cb -> cb
+                .withMethod("foo", MethodTypeDesc.ofDescriptor("(IJI)V"), 0, mb -> mb
+                        .transformCode(code, ALLOCATE_LOCAL_EXAMINER)));
+    }
+
+    @Test
+    void testAllocateLocalTransformingBufferedCode() throws IOException {
+        var cf = ClassFile.of();
+        var testClass = cf.parse(testClassPath);
+        ClassTransform bufferingTransform = (clb, cle) -> {
+            if (cle instanceof MethodModel mm && mm.methodName().equalsString("work")) {
+                clb.withMethodBody(mm.methodName(), mm.methodType(), mm.flags().flagsMask(), cob -> {
+                    int d = cob.allocateLocal(TypeKind.IntType);
+                    int e = cob.allocateLocal(TypeKind.IntType);
+
+                    assertEquals(5, d);
+                    assertEquals(6, e);
+
+                    mm.code().ifPresent(code -> code.forEach(cob));
+                });
+            }
+        };
+        cf.transformClass(testClass, bufferingTransform.andThen(ClassTransform.transformingMethods(MethodTransform.transformingCode(ALLOCATE_LOCAL_EXAMINER))));
+    }
+
+    public static class TestClass {
+        public void work(int a, long b, int c) {
+            int d = Math.addExact(a, 25);
+            int e = Math.multiplyExact(d, c);
+            System.out.println("Output");
+            System.out.println(e + b);
+            throw new IllegalArgumentException("foo");
+        }
+    }
 }
diff --git a/test/jdk/jdk/classfile/CorpusTest.java b/test/jdk/jdk/classfile/CorpusTest.java
index a2af166797827..631e2f8afaa1b 100644
--- a/test/jdk/jdk/classfile/CorpusTest.java
+++ b/test/jdk/jdk/classfile/CorpusTest.java
@@ -39,6 +39,7 @@
 import org.junit.jupiter.api.parallel.ExecutionMode;
 
 import java.io.ByteArrayInputStream;
+import java.lang.classfile.attribute.CodeAttribute;
 import java.util.*;
 
 import static helpers.ClassRecord.assertEqualsDeep;
@@ -222,9 +223,11 @@ void testNullAdaptations(Path path) throws Exception {
             var m1 = itStack.next();
             var m2 = itNoStack.next();
             var text1 = m1.methodName().stringValue() + m1.methodType().stringValue() + ": "
-                      + m1.code().map(c -> c.maxLocals() + " / " + c.maxStack()).orElse("-");
+                      + m1.code().map(CodeAttribute.class::cast)
+                                 .map(c -> c.maxLocals() + " / " + c.maxStack()).orElse("-");
             var text2 = m2.methodName().stringValue() + m2.methodType().stringValue() + ": "
-                      + m2.code().map(c -> c.maxLocals() + " / " + c.maxStack()).orElse("-");
+                      + m2.code().map(CodeAttribute.class::cast)
+                                 .map(c -> c.maxLocals() + " / " + c.maxStack()).orElse("-");
             assertEquals(text1, text2);
         }
         assertFalse(itNoStack.hasNext());
diff --git a/test/jdk/jdk/classfile/DiscontinuedInstructionsTest.java b/test/jdk/jdk/classfile/DiscontinuedInstructionsTest.java
index 9070f0b1d4513..5e51e585634d0 100644
--- a/test/jdk/jdk/classfile/DiscontinuedInstructionsTest.java
+++ b/test/jdk/jdk/classfile/DiscontinuedInstructionsTest.java
@@ -26,6 +26,7 @@
  * @summary Testing ClassFile handling JSR and RET instructions.
  * @run junit DiscontinuedInstructionsTest
  */
+import java.lang.classfile.attribute.CodeAttribute;
 import java.lang.constant.ClassDesc;
 import java.lang.constant.MethodTypeDesc;
 import java.util.ArrayList;
@@ -63,7 +64,7 @@ void testJsrAndRetProcessing() throws Exception {
                         .pop()
                         .with(DiscontinuedInstruction.RetInstruction.of(355))));
 
-        var c = cc.parse(bytes).methods().get(0).code().get();
+        var c = (CodeAttribute) cc.parse(bytes).methods().get(0).code().get();
         assertEquals(356, c.maxLocals());
         assertEquals(6, c.maxStack());
 
diff --git a/test/jdk/jdk/classfile/StackMapsTest.java b/test/jdk/jdk/classfile/StackMapsTest.java
index 211490c3f8e75..a5109dd2a18a4 100644
--- a/test/jdk/jdk/classfile/StackMapsTest.java
+++ b/test/jdk/jdk/classfile/StackMapsTest.java
@@ -30,6 +30,7 @@
  */
 
 import java.lang.classfile.*;
+import java.lang.classfile.attribute.CodeAttribute;
 import java.lang.classfile.components.ClassPrinter;
 import java.net.URI;
 import java.nio.file.FileSystem;
@@ -329,7 +330,7 @@ void testEmptyCounters(ClassFile.StackMapsOption option) {
         var cm = ClassFile.of().parse(bytes);
         for (var method : cm.methods()) {
             var name = method.methodName();
-            var code = method.code().orElseThrow();
+            var code = (CodeAttribute) method.code().orElseThrow();
             if (name.equalsString("a")) {
                 assertEquals(0, code.maxLocals()); // static method
                 assertEquals(0, code.maxStack());

From 7e21d4c1916d6690b717911179314c26a0da5ed9 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Tue, 30 Jul 2024 03:03:43 +0000
Subject: [PATCH 246/401] 8337268: Redundant Math.ceil in
 StyleSheet.ListPainter#drawShape

Reviewed-by: prr, aivanov
---
 .../share/classes/javax/swing/text/html/StyleSheet.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java b/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java
index 0790060f5e8c8..9b8e33b4c6b03 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java
@@ -2391,7 +2391,7 @@ void drawShape(Graphics g, CSS.Value type, int ax, int ay, int aw,
             // Position shape to the middle of the html text.
             int gap = isLeftToRight ? - (bulletgap + size/3) : (aw + bulletgap);
             int x = ax + gap;
-            int y = Math.max(ay, ay + (int)Math.ceil(ah/2));
+            int y = Math.max(ay, ay + ah/2);
 
             if (type == CSS.Value.SQUARE) {
                 g.drawRect(x, y, size/3, size/3);

From bc7c255b156bf3bb3fd8c3f622b8127ab27e7c7a Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Tue, 30 Jul 2024 07:24:22 +0000
Subject: [PATCH 247/401] 8337416: Fix -Wzero-as-null-pointer-constant warnings
 in misc. runtime code

Reviewed-by: dholmes, jwaters
---
 src/hotspot/share/logging/logConfiguration.cpp       | 2 +-
 src/hotspot/share/memory/metaspace/metachunk.cpp     | 2 +-
 src/hotspot/share/memory/metaspace/rootChunkArea.cpp | 4 ++--
 src/hotspot/share/memory/virtualspace.cpp            | 2 +-
 src/hotspot/share/oops/constantPool.cpp              | 2 +-
 src/hotspot/share/oops/instanceKlass.cpp             | 4 ++--
 src/hotspot/share/oops/method.cpp                    | 4 ++--
 src/hotspot/share/runtime/arguments.cpp              | 6 +++---
 src/hotspot/share/runtime/javaThread.cpp             | 6 +++---
 src/hotspot/share/runtime/vframeArray.cpp            | 2 +-
 10 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/hotspot/share/logging/logConfiguration.cpp b/src/hotspot/share/logging/logConfiguration.cpp
index 3a54d1f4e6369..87b195f4fbfdd 100644
--- a/src/hotspot/share/logging/logConfiguration.cpp
+++ b/src/hotspot/share/logging/logConfiguration.cpp
@@ -370,7 +370,7 @@ bool LogConfiguration::parse_command_line_arguments(const char* opts) {
 
   // Split the option string to its colon separated components.
   char* str = copy;
-  char* substrings[4] = {0};
+  char* substrings[4] = {};
   for (int i = 0 ; i < 4; i++) {
     substrings[i] = str;
 
diff --git a/src/hotspot/share/memory/metaspace/metachunk.cpp b/src/hotspot/share/memory/metaspace/metachunk.cpp
index 3d67aac80160e..0bf7e98f13022 100644
--- a/src/hotspot/share/memory/metaspace/metachunk.cpp
+++ b/src/hotspot/share/memory/metaspace/metachunk.cpp
@@ -253,7 +253,7 @@ void Metachunk::verify_neighborhood() const {
   }
 }
 
-volatile MetaWord dummy = 0;
+volatile MetaWord dummy = nullptr;
 
 void Metachunk::verify() const {
   // Note. This should be called under CLD lock protection.
diff --git a/src/hotspot/share/memory/metaspace/rootChunkArea.cpp b/src/hotspot/share/memory/metaspace/rootChunkArea.cpp
index ee3af35a5b8b4..24377ec25ad12 100644
--- a/src/hotspot/share/memory/metaspace/rootChunkArea.cpp
+++ b/src/hotspot/share/memory/metaspace/rootChunkArea.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2022 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -59,7 +59,7 @@ RootChunkArea::~RootChunkArea() {
 // root chunk header. It will be partly initialized.
 // Note: this just allocates a memory-less header; memory itself is allocated inside VirtualSpaceNode.
 Metachunk* RootChunkArea::alloc_root_chunk_header(VirtualSpaceNode* node) {
-  assert(_first_chunk == 0, "already have a root");
+  assert(_first_chunk == nullptr, "already have a root");
   Metachunk* c = ChunkHeaderPool::pool()->allocate_chunk_header();
   c->initialize(node, const_cast<MetaWord*>(_base), chunklevel::ROOT_CHUNK_LEVEL);
   _first_chunk = c;
diff --git a/src/hotspot/share/memory/virtualspace.cpp b/src/hotspot/share/memory/virtualspace.cpp
index 7df35bbeec88e..c27e607353af1 100644
--- a/src/hotspot/share/memory/virtualspace.cpp
+++ b/src/hotspot/share/memory/virtualspace.cpp
@@ -159,7 +159,7 @@ static char* reserve_memory(char* requested_address, const size_t size,
   // If the memory was requested at a particular address, use
   // os::attempt_reserve_memory_at() to avoid mapping over something
   // important.  If the reservation fails, return null.
-  if (requested_address != 0) {
+  if (requested_address != nullptr) {
     assert(is_aligned(requested_address, alignment),
            "Requested address " PTR_FORMAT " must be aligned to " SIZE_FORMAT,
            p2i(requested_address), alignment);
diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp
index 35a1d95b6e647..1c295e10b21db 100644
--- a/src/hotspot/share/oops/constantPool.cpp
+++ b/src/hotspot/share/oops/constantPool.cpp
@@ -2065,7 +2065,7 @@ static void print_cpool_bytes(jint cnt, u1 *bytes) {
     size  += ent_size;
   }
   printf("Cpool size: %d\n", size);
-  fflush(0);
+  fflush(nullptr);
   return;
 } /* end print_cpool_bytes */
 
diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index 930f8cf177116..650279db1bee3 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -2779,9 +2779,9 @@ void InstanceKlass::release_C_heap_structures(bool release_sub_metadata) {
 
 #if INCLUDE_JVMTI
   // Deallocate breakpoint records
-  if (breakpoints() != 0x0) {
+  if (breakpoints() != nullptr) {
     methods_do(clear_all_breakpoints);
-    assert(breakpoints() == 0x0, "should have cleared breakpoints");
+    assert(breakpoints() == nullptr, "should have cleared breakpoints");
   }
 
   // deallocate the cached class file
diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
index e5ba0d610314b..f4dcd4f149302 100644
--- a/src/hotspot/share/oops/method.cpp
+++ b/src/hotspot/share/oops/method.cpp
@@ -322,7 +322,7 @@ void Method::mask_for(const methodHandle& this_mh, int bci, InterpreterOopMap* m
 }
 
 int Method::bci_from(address bcp) const {
-  if (is_native() && bcp == 0) {
+  if (is_native() && bcp == nullptr) {
     return 0;
   }
   // Do not have a ResourceMark here because AsyncGetCallTrace stack walking code
@@ -345,7 +345,7 @@ int Method::validate_bci(int bci) const {
 int Method::validate_bci_from_bcp(address bcp) const {
   // keep bci as -1 if not a valid bci
   int bci = -1;
-  if (bcp == 0 || bcp == code_base()) {
+  if (bcp == nullptr || bcp == code_base()) {
     // code_size() may return 0 and we allow 0 here
     // the method may be native
     bci = 0;
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 966f4855789e4..1bded2916504f 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -102,7 +102,7 @@ size_t Arguments::_default_SharedBaseAddress    = SharedBaseAddress;
 
 bool   Arguments::_enable_preview               = false;
 
-LegacyGCLogging Arguments::_legacyGCLogging     = { 0, 0 };
+LegacyGCLogging Arguments::_legacyGCLogging     = { nullptr, 0 };
 
 // These are not set by the JDK's built-in launchers, but they can be set by
 // programs that embed the JVM using JNI_CreateJavaVM. See comments around
@@ -1850,11 +1850,11 @@ bool Arguments::is_bad_option(const JavaVMOption* option, jboolean ignore,
 }
 
 static const char* user_assertion_options[] = {
-  "-da", "-ea", "-disableassertions", "-enableassertions", 0
+  "-da", "-ea", "-disableassertions", "-enableassertions", nullptr
 };
 
 static const char* system_assertion_options[] = {
-  "-dsa", "-esa", "-disablesystemassertions", "-enablesystemassertions", 0
+  "-dsa", "-esa", "-disablesystemassertions", "-enablesystemassertions", nullptr
 };
 
 bool Arguments::parse_uint(const char* value,
diff --git a/src/hotspot/share/runtime/javaThread.cpp b/src/hotspot/share/runtime/javaThread.cpp
index a3eef07ba0ac9..b69ab708afa52 100644
--- a/src/hotspot/share/runtime/javaThread.cpp
+++ b/src/hotspot/share/runtime/javaThread.cpp
@@ -470,8 +470,8 @@ JavaThread::JavaThread(MEMFLAGS flags) :
 #endif // INCLUDE_JVMCI
 
   _exception_oop(oop()),
-  _exception_pc(0),
-  _exception_handler_pc(0),
+  _exception_pc(nullptr),
+  _exception_handler_pc(nullptr),
   _is_method_handle_return(0),
 
   _jni_active_critical(0),
@@ -483,7 +483,7 @@ JavaThread::JavaThread(MEMFLAGS flags) :
   _frames_to_pop_failed_realloc(0),
 
   _cont_entry(nullptr),
-  _cont_fastpath(0),
+  _cont_fastpath(nullptr),
   _cont_fastpath_thread_state(1),
   _held_monitor_count(0),
   _jni_monitor_count(0),
diff --git a/src/hotspot/share/runtime/vframeArray.cpp b/src/hotspot/share/runtime/vframeArray.cpp
index d3bbbc283992a..1b26abf740287 100644
--- a/src/hotspot/share/runtime/vframeArray.cpp
+++ b/src/hotspot/share/runtime/vframeArray.cpp
@@ -321,7 +321,7 @@ void vframeArrayElement::unpack_on_stack(int caller_actual_parameters,
            "should be held, after move_to");
   }
   if (ProfileInterpreter) {
-    iframe()->interpreter_frame_set_mdp(0); // clear out the mdp.
+    iframe()->interpreter_frame_set_mdp(nullptr); // clear out the mdp.
   }
   iframe()->interpreter_frame_set_bcp(bcp);
   if (ProfileInterpreter) {

From 9e6e0a8f341389215f0db6b2260f2b16351f02be Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 30 Jul 2024 08:27:27 +0000
Subject: [PATCH 248/401] 8336343: Add more known sysroot library locations for
 ALSA

Reviewed-by: phh, prr, ihse
---
 make/autoconf/lib-alsa.m4 | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/make/autoconf/lib-alsa.m4 b/make/autoconf/lib-alsa.m4
index 19a91f94809f0..8d0fb324cd092 100644
--- a/make/autoconf/lib-alsa.m4
+++ b/make/autoconf/lib-alsa.m4
@@ -70,6 +70,25 @@ AC_DEFUN_ONCE([LIB_SETUP_ALSA],
         PKG_CHECK_MODULES(ALSA, alsa, [ALSA_FOUND=yes], [ALSA_FOUND=no])
       fi
     fi
+    if test "x$ALSA_FOUND" = xno; then
+      # If we have sysroot set, and no explicit library location is set,
+      # look at known locations in sysroot.
+      if test "x$SYSROOT" != "x" && test "x${with_alsa_lib}" == x; then
+        if test -f "$SYSROOT/usr/lib64/libasound.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+          ALSA_LIBS="-L$SYSROOT/usr/lib64 -lasound"
+          ALSA_FOUND=yes
+        elif test -f "$SYSROOT/usr/lib/libasound.so"; then
+          ALSA_LIBS="-L$SYSROOT/usr/lib -lasound"
+          ALSA_FOUND=yes
+        elif test -f "$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI/libasound.so"; then
+          ALSA_LIBS="-L$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI -lasound"
+          ALSA_FOUND=yes
+        elif test -f "$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU_AUTOCONF-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI/libasound.so"; then
+          ALSA_LIBS="-L$SYSROOT/usr/lib/$OPENJDK_TARGET_CPU_AUTOCONF-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI -lasound"
+          ALSA_FOUND=yes
+        fi
+      fi
+    fi
     if test "x$ALSA_FOUND" = xno; then
       AC_CHECK_HEADERS([alsa/asoundlib.h],
           [

From 156f0b4332bf076165898417cf6678d2fc32df5c Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 30 Jul 2024 08:29:23 +0000
Subject: [PATCH 249/401] 8337213: Shenandoah: Add verification for class
 mirrors

Reviewed-by: rkennke, wkemper
---
 .../share/gc/shenandoah/shenandoahAsserts.cpp | 19 +++++++++++++++++++
 .../gc/shenandoah/shenandoahVerifier.cpp      | 15 +++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahAsserts.cpp b/src/hotspot/share/gc/shenandoah/shenandoahAsserts.cpp
index beb4a1d289239..5215aa749aea1 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahAsserts.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahAsserts.cpp
@@ -250,6 +250,25 @@ void ShenandoahAsserts::assert_correct(void* interior_loc, oop obj, const char*
                     file, line);
     }
   }
+
+  // Do additional checks for special objects: their fields can hold metadata as well.
+  // We want to check class loading/unloading did not corrupt them.
+
+  if (java_lang_Class::is_instance(obj)) {
+    Metadata* klass = obj->metadata_field(java_lang_Class::klass_offset());
+    if (klass != nullptr && !Metaspace::contains(klass)) {
+      print_failure(_safe_all, obj, interior_loc, nullptr, "Shenandoah assert_correct failed",
+                    "Instance class mirror should point to Metaspace",
+                    file, line);
+    }
+
+    Metadata* array_klass = obj->metadata_field(java_lang_Class::array_klass_offset());
+    if (array_klass != nullptr && !Metaspace::contains(array_klass)) {
+      print_failure(_safe_all, obj, interior_loc, nullptr, "Shenandoah assert_correct failed",
+                    "Array class mirror should point to Metaspace",
+                    file, line);
+    }
+  }
 }
 
 void ShenandoahAsserts::assert_in_correct_region(void* interior_loc, oop obj, const char* file, int line) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
index f67cafdb8fe7c..694736cea426c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
@@ -212,6 +212,21 @@ class ShenandoahVerifyOopClosure : public BasicOopIterateClosure {
       fwd_reg = obj_reg;
     }
 
+    // Do additional checks for special objects: their fields can hold metadata as well.
+    // We want to check class loading/unloading did not corrupt them.
+
+    if (java_lang_Class::is_instance(obj)) {
+      Metadata* klass = obj->metadata_field(java_lang_Class::klass_offset());
+      check(ShenandoahAsserts::_safe_oop, obj,
+            klass == nullptr || Metaspace::contains(klass),
+            "Instance class mirror should point to Metaspace");
+
+      Metadata* array_klass = obj->metadata_field(java_lang_Class::array_klass_offset());
+      check(ShenandoahAsserts::_safe_oop, obj,
+            array_klass == nullptr || Metaspace::contains(array_klass),
+            "Array class mirror should point to Metaspace");
+    }
+
     // ------------ obj and fwd are safe at this point --------------
 
     switch (_options._verify_marked) {

From 7ac531181c25815577ba2f6f426e1da270e4f589 Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkumar@openjdk.org>
Date: Tue, 30 Jul 2024 09:32:27 +0000
Subject: [PATCH 250/401] 8331126: [s390x] secondary_super_cache does not scale
 well

Reviewed-by: lucy, aph, mdoerr
---
 src/hotspot/cpu/s390/macroAssembler_s390.cpp | 296 +++++++++++++++++++
 src/hotspot/cpu/s390/macroAssembler_s390.hpp |  25 ++
 src/hotspot/cpu/s390/s390.ad                 |  44 +++
 src/hotspot/cpu/s390/stubGenerator_s390.cpp  |  54 +++-
 src/hotspot/cpu/s390/vm_version_s390.cpp     |  11 +-
 src/hotspot/cpu/s390/vm_version_s390.hpp     |   2 +
 6 files changed, 429 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/cpu/s390/macroAssembler_s390.cpp b/src/hotspot/cpu/s390/macroAssembler_s390.cpp
index 66d6f25f0fd4a..72d10ee80aae1 100644
--- a/src/hotspot/cpu/s390/macroAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.cpp
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2024 SAP SE. All rights reserved.
+ * Copyright 2024 IBM Corporation. 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
@@ -3152,6 +3153,301 @@ void MacroAssembler::check_klass_subtype(Register sub_klass,
   BLOCK_COMMENT("} check_klass_subtype");
 }
 
+// scans r_count pointer sized words at [r_addr] for occurrence of r_value,
+// generic (r_count must be >0)
+// iff found: CC eq, r_result == 0
+void MacroAssembler::repne_scan(Register r_addr, Register r_value, Register r_count, Register r_result) {
+  NearLabel L_loop, L_exit;
+
+  BLOCK_COMMENT("repne_scan {");
+#ifdef ASSERT
+  z_chi(r_count, 0);
+  asm_assert(bcondHigh, "count must be positive", 11);
+#endif
+
+  clear_reg(r_result, true /* whole_reg */, false /* set_cc */);  // sets r_result=0, let's hope that search will be successful
+
+  bind(L_loop);
+  z_cg(r_value, Address(r_addr));
+  z_bre(L_exit); // branch on success
+  z_la(r_addr, wordSize, r_addr);
+  z_brct(r_count, L_loop);
+
+  // z_brct above doesn't change CC.
+  // If we reach here, then the value in r_value is not present. Set r_result to 1.
+  z_lghi(r_result, 1);
+
+  bind(L_exit);
+  BLOCK_COMMENT("} repne_scan");
+}
+
+// Ensure that the inline code and the stub are using the same registers.
+#define LOOKUP_SECONDARY_SUPERS_TABLE_REGISTERS                 \
+do {                                                            \
+  assert(r_super_klass  == Z_ARG1                            && \
+         r_array_base   == Z_ARG5                            && \
+         r_array_length == Z_ARG4                            && \
+        (r_array_index  == Z_ARG3 || r_array_index == noreg) && \
+        (r_sub_klass    == Z_ARG2 || r_sub_klass   == noreg) && \
+        (r_bitmap       == Z_R10  || r_bitmap      == noreg) && \
+        (r_result       == Z_R11  || r_result      == noreg), "registers must match s390.ad"); \
+} while(0)
+
+// Note: this method also kills Z_R1_scratch register on machines older than z15
+void MacroAssembler::lookup_secondary_supers_table(Register r_sub_klass,
+                                                   Register r_super_klass,
+                                                   Register r_temp1,
+                                                   Register r_temp2,
+                                                   Register r_temp3,
+                                                   Register r_temp4,
+                                                   Register r_result,
+                                                   u1 super_klass_slot) {
+  NearLabel L_done, L_failure;
+
+  BLOCK_COMMENT("lookup_secondary_supers_table {");
+
+  const Register
+    r_array_base   = r_temp1,
+    r_array_length = r_temp2,
+    r_array_index  = r_temp3,
+    r_bitmap       = r_temp4;
+
+  LOOKUP_SECONDARY_SUPERS_TABLE_REGISTERS;
+
+  z_lg(r_bitmap, Address(r_sub_klass, Klass::bitmap_offset()));
+
+  // First check the bitmap to see if super_klass might be present. If
+  // the bit is zero, we are certain that super_klass is not one of
+  // the secondary supers.
+  u1 bit = super_klass_slot;
+  int shift_count = Klass::SECONDARY_SUPERS_TABLE_MASK - bit;
+
+  z_sllg(r_array_index, r_bitmap, shift_count); // take the bit to 63rd location
+
+  // Initialize r_result with 0 (indicating success). If searching fails, r_result will be loaded
+  // with 1 (failure) at the end of this method.
+  clear_reg(r_result, true /* whole_reg */, false /* set_cc */); // r_result = 0
+
+  // We test the MSB of r_array_index, i.e., its sign bit
+  testbit(r_array_index, 63);
+  z_bfalse(L_failure); // if not set, then jump!!!
+
+  // We will consult the secondary-super array.
+  z_lg(r_array_base, Address(r_sub_klass, Klass::secondary_supers_offset()));
+
+  // The value i in r_array_index is >= 1, so even though r_array_base
+  // points to the length, we don't need to adjust it to point to the
+  // data.
+  assert(Array<Klass*>::base_offset_in_bytes() == wordSize, "Adjust this code");
+
+  // Get the first array index that can contain super_klass.
+  if (bit != 0) {
+    pop_count_long(r_array_index, r_array_index, Z_R1_scratch); // kills Z_R1_scratch on machines older than z15
+
+    // NB! r_array_index is off by 1. It is compensated by keeping r_array_base off by 1 word.
+    z_sllg(r_array_index, r_array_index, LogBytesPerWord); // scale
+  } else {
+    // Actually use index 0, but r_array_base and r_array_index are off by 1 word
+    // such that the sum is precise.
+    z_lghi(r_array_index, BytesPerWord); // for slow path (scaled)
+  }
+
+  z_cg(r_super_klass, Address(r_array_base, r_array_index));
+  branch_optimized(bcondEqual, L_done); // found a match; success
+
+  // Is there another entry to check? Consult the bitmap.
+  testbit(r_bitmap, (bit + 1) & Klass::SECONDARY_SUPERS_TABLE_MASK);
+  z_bfalse(L_failure);
+
+  // Linear probe. Rotate the bitmap so that the next bit to test is
+  // in Bit 2 for the look-ahead check in the slow path.
+  if (bit != 0) {
+    z_rllg(r_bitmap, r_bitmap, 64-bit); // rotate right
+  }
+
+  // Calls into the stub generated by lookup_secondary_supers_table_slow_path.
+  // Arguments: r_super_klass, r_array_base, r_array_index, r_bitmap.
+  // Kills: r_array_length.
+  // Returns: r_result
+
+  call_stub(StubRoutines::lookup_secondary_supers_table_slow_path_stub());
+
+  z_bru(L_done); // pass whatever result we got from a slow path
+
+  bind(L_failure);
+  // TODO: use load immediate on condition and z_bru above will not be required
+  z_lghi(r_result, 1);
+
+  bind(L_done);
+  BLOCK_COMMENT("} lookup_secondary_supers_table");
+
+  if (VerifySecondarySupers) {
+    verify_secondary_supers_table(r_sub_klass, r_super_klass, r_result,
+                                  r_temp1, r_temp2, r_temp3);
+  }
+}
+
+// Called by code generated by check_klass_subtype_slow_path
+// above. This is called when there is a collision in the hashed
+// lookup in the secondary supers array.
+void MacroAssembler::lookup_secondary_supers_table_slow_path(Register r_super_klass,
+                                                             Register r_array_base,
+                                                             Register r_array_index,
+                                                             Register r_bitmap,
+                                                             Register r_result,
+                                                             Register r_temp1) {
+  assert_different_registers(r_super_klass, r_array_base, r_array_index, r_bitmap, r_result, r_temp1);
+
+  const Register
+    r_array_length = r_temp1,
+    r_sub_klass    = noreg;
+
+  LOOKUP_SECONDARY_SUPERS_TABLE_REGISTERS;
+
+  BLOCK_COMMENT("lookup_secondary_supers_table_slow_path {");
+  NearLabel L_done, L_failure;
+
+  // Load the array length.
+  z_llgf(r_array_length, Address(r_array_base, Array<Klass*>::length_offset_in_bytes()));
+
+  // And adjust the array base to point to the data.
+  // NB!
+  // Effectively increments the current slot index by 1.
+  assert(Array<Klass*>::base_offset_in_bytes() == wordSize, "");
+  add2reg(r_array_base, Array<Klass*>::base_offset_in_bytes());
+
+  // Linear probe
+  NearLabel L_huge;
+
+  // The bitmap is full to bursting.
+  z_cghi(r_bitmap, Klass::SECONDARY_SUPERS_BITMAP_FULL);
+  z_bre(L_huge);
+
+  // NB! Our caller has checked bits 0 and 1 in the bitmap. The
+  // current slot (at secondary_supers[r_array_index]) has not yet
+  // been inspected, and r_array_index may be out of bounds if we
+  // wrapped around the end of the array.
+
+  { // This is conventional linear probing, but instead of terminating
+    // when a null entry is found in the table, we maintain a bitmap
+    // in which a 0 indicates missing entries.
+    // The check above guarantees there are 0s in the bitmap, so the loop
+    // eventually terminates.
+
+#ifdef ASSERT
+    // r_result is set to 0 by lookup_secondary_supers_table.
+    // clear_reg(r_result, true /* whole_reg */, false /* set_cc */);
+    z_cghi(r_result, 0);
+    asm_assert(bcondEqual, "r_result required to be 0, used by z_locgr", 44);
+
+    // We should only reach here after having found a bit in the bitmap.
+    z_ltgr(r_array_length, r_array_length);
+    asm_assert(bcondHigh, "array_length > 0, should hold", 22);
+#endif // ASSERT
+
+    // Compute limit in r_array_length
+    add2reg(r_array_length, -1);
+    z_sllg(r_array_length, r_array_length, LogBytesPerWord);
+
+    NearLabel L_loop;
+    bind(L_loop);
+
+    // Check for wraparound.
+    z_cgr(r_array_index, r_array_length);
+    z_locgr(r_array_index, r_result, bcondHigh); // r_result is containing 0
+
+    z_cg(r_super_klass, Address(r_array_base, r_array_index));
+    z_bre(L_done); // success
+
+    // look-ahead check: if Bit 2 is 0, we're done
+    testbit(r_bitmap, 2);
+    z_bfalse(L_failure);
+
+    z_rllg(r_bitmap, r_bitmap, 64-1); // rotate right
+    add2reg(r_array_index, BytesPerWord);
+
+    z_bru(L_loop);
+  }
+
+  { // Degenerate case: more than 64 secondary supers.
+    // FIXME: We could do something smarter here, maybe a vectorized
+    // comparison or a binary search, but is that worth any added
+    // complexity?
+
+    bind(L_huge);
+    repne_scan(r_array_base, r_super_klass, r_array_length, r_result);
+
+    z_bru(L_done); // forward the result we got from repne_scan
+  }
+
+  bind(L_failure);
+  z_lghi(r_result, 1);
+
+  bind(L_done);
+  BLOCK_COMMENT("} lookup_secondary_supers_table_slow_path");
+}
+
+// Make sure that the hashed lookup and a linear scan agree.
+void MacroAssembler::verify_secondary_supers_table(Register r_sub_klass,
+                                                   Register r_super_klass,
+                                                   Register r_result /* expected */,
+                                                   Register r_temp1,
+                                                   Register r_temp2,
+                                                   Register r_temp3) {
+  assert_different_registers(r_sub_klass, r_super_klass, r_result, r_temp1, r_temp2, r_temp3);
+
+  const Register
+    r_array_base   = r_temp1,
+    r_array_length = r_temp2,
+    r_array_index  = r_temp3,
+    r_bitmap       = noreg; // unused
+
+  const Register r_one = Z_R0_scratch;
+  z_lghi(r_one, 1); // for locgr down there, to a load result for failure
+
+  LOOKUP_SECONDARY_SUPERS_TABLE_REGISTERS;
+
+  BLOCK_COMMENT("verify_secondary_supers_table {");
+
+  Label L_passed, L_failure;
+
+  // We will consult the secondary-super array.
+  z_lg(r_array_base, Address(r_sub_klass, in_bytes(Klass::secondary_supers_offset())));
+
+  // Load the array length.
+  z_llgf(r_array_length, Address(r_array_base, Array<Klass*>::length_offset_in_bytes()));
+
+  // And adjust the array base to point to the data.
+  z_aghi(r_array_base, Array<Klass*>::base_offset_in_bytes());
+
+  const Register r_linear_result = r_array_index; // reuse
+  z_chi(r_array_length, 0);
+  z_locgr(r_linear_result, r_one, bcondNotHigh); // load failure if array_length <= 0
+  z_brc(bcondNotHigh, L_failure);
+  repne_scan(r_array_base, r_super_klass, r_array_length, r_linear_result);
+  bind(L_failure);
+
+  z_cr(r_result, r_linear_result);
+  z_bre(L_passed);
+
+  assert_different_registers(Z_ARG1, r_sub_klass, r_linear_result, r_result);
+  lgr_if_needed(Z_ARG1, r_super_klass);
+  assert_different_registers(Z_ARG2, r_linear_result, r_result);
+  lgr_if_needed(Z_ARG2, r_sub_klass);
+  assert_different_registers(Z_ARG3, r_result);
+  z_lgr(Z_ARG3, r_linear_result);
+  z_lgr(Z_ARG4, r_result);
+  const char* msg = "mismatch";
+  load_const_optimized(Z_ARG5, (address)msg);
+
+  call_VM_leaf(CAST_FROM_FN_PTR(address, Klass::on_secondary_supers_verification_failure));
+  should_not_reach_here();
+
+  bind(L_passed);
+
+  BLOCK_COMMENT("} verify_secondary_supers_table");
+}
+
 void MacroAssembler::clinit_barrier(Register klass, Register thread, Label* L_fast_path, Label* L_slow_path) {
   assert(L_fast_path != nullptr || L_slow_path != nullptr, "at least one is required");
 
diff --git a/src/hotspot/cpu/s390/macroAssembler_s390.hpp b/src/hotspot/cpu/s390/macroAssembler_s390.hpp
index 684741d79db2f..90210eb28c3ad 100644
--- a/src/hotspot/cpu/s390/macroAssembler_s390.hpp
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.hpp
@@ -708,6 +708,31 @@ class MacroAssembler: public Assembler {
                                      Label* L_success,
                                      Label* L_failure);
 
+  void repne_scan(Register r_addr, Register r_value, Register r_count, Register r_scratch);
+
+  void lookup_secondary_supers_table(Register r_sub_klass,
+                                     Register r_super_klass,
+                                     Register r_temp1,
+                                     Register r_temp2,
+                                     Register r_temp3,
+                                     Register r_temp4,
+                                     Register r_result,
+                                     u1 super_klass_slot);
+
+  void lookup_secondary_supers_table_slow_path(Register r_super_klass,
+                                               Register r_array_base,
+                                               Register r_array_index,
+                                               Register r_bitmap,
+                                               Register r_result,
+                                               Register r_temp1);
+
+  void verify_secondary_supers_table(Register r_sub_klass,
+                                     Register r_super_klass,
+                                     Register r_result /* expected */,
+                                     Register r_temp1,
+                                     Register r_temp2,
+                                     Register r_temp3);
+
   // Simplified, combined version, good for typical uses.
   // Falls through on failure.
   void check_klass_subtype(Register sub_klass,
diff --git a/src/hotspot/cpu/s390/s390.ad b/src/hotspot/cpu/s390/s390.ad
index 0fe3840b9b53c..e3dcfdb8759da 100644
--- a/src/hotspot/cpu/s390/s390.ad
+++ b/src/hotspot/cpu/s390/s390.ad
@@ -356,6 +356,8 @@ reg_class z_rarg3_ptr_reg(Z_R4_H,Z_R4);
 reg_class z_rarg4_ptr_reg(Z_R5_H,Z_R5);
 reg_class z_rarg5_ptr_reg(Z_R6_H,Z_R6);
 reg_class z_thread_ptr_reg(Z_R8_H,Z_R8);
+reg_class z_r10_ptr_reg(Z_R10_H, Z_R10);
+reg_class z_r11_ptr_reg(Z_R11_H, Z_R11);
 
 reg_class z_ptr_reg(
 /*Z_R0_H,Z_R0*/     // R0
@@ -2985,6 +2987,8 @@ operand iRegP() %{
   match(rarg5RegP);
   match(revenRegP);
   match(roddRegP);
+  match(r10TempRegP);
+  match(r11TempRegP);
   format %{ %}
   interface(REG_INTER);
 %}
@@ -2997,6 +3001,20 @@ operand threadRegP() %{
   interface(REG_INTER);
 %}
 
+operand r10TempRegP() %{
+  constraint(ALLOC_IN_RC(z_r10_ptr_reg));
+  match(iRegP);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
+operand r11TempRegP() %{
+  constraint(ALLOC_IN_RC(z_r11_ptr_reg));
+  match(iRegP);
+  format %{ %}
+  interface(REG_INTER);
+%}
+
 operand noArg_iRegP() %{
   constraint(ALLOC_IN_RC(z_no_arg_ptr_reg));
   match(iRegP);
@@ -9560,6 +9578,32 @@ instruct partialSubtypeCheck(rarg1RegP index, rarg2RegP sub, rarg3RegP super, fl
   ins_pipe(pipe_class_dummy);
 %}
 
+instruct partialSubtypeCheckConstSuper(rarg2RegP sub, rarg1RegP super, immP super_con,
+                                       r11TempRegP result, rarg5RegP temp1, rarg4RegP temp2,
+                                       rarg3RegP temp3, r10TempRegP temp4, flagsReg pcc) %{
+  match(Set result (PartialSubtypeCheck sub (Binary super super_con)));
+  predicate(UseSecondarySupersTable);
+  effect(KILL pcc, TEMP temp1, TEMP temp2, TEMP temp3, TEMP temp4);
+  ins_cost(7 * DEFAULT_COST); // needs to be less than competing nodes
+  format %{ "partialSubtypeCheck $result, $sub, $super, $super_con" %}
+
+  ins_encode %{
+    u1 super_klass_slot = ((Klass*)$super_con$$constant)->hash_slot();
+    if (InlineSecondarySupersTest) {
+      __ lookup_secondary_supers_table($sub$$Register, $super$$Register,
+                                                 $temp1$$Register, $temp2$$Register, $temp3$$Register,
+                                                 $temp4$$Register, $result$$Register, super_klass_slot);
+    } else {
+      AddressLiteral stub_address(StubRoutines::lookup_secondary_supers_table_stub(super_klass_slot));
+      __ load_const_optimized(Z_ARG4, stub_address);
+      __ z_basr(Z_R14, Z_ARG4);
+    }
+
+  %}
+
+  ins_pipe(pipe_class_dummy);
+%}
+
 instruct partialSubtypeCheck_vs_zero(flagsReg pcc, rarg2RegP sub, rarg3RegP super, immP0 zero,
                                      rarg1RegP index, rarg4RegP scratch1, rarg5RegP scratch2) %{
   match(Set pcc (CmpI (PartialSubtypeCheck sub super) zero));
diff --git a/src/hotspot/cpu/s390/stubGenerator_s390.cpp b/src/hotspot/cpu/s390/stubGenerator_s390.cpp
index dfd20730b8476..556c0d4703d54 100644
--- a/src/hotspot/cpu/s390/stubGenerator_s390.cpp
+++ b/src/hotspot/cpu/s390/stubGenerator_s390.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2016, 2023 SAP SE. All rights reserved.
+ * Copyright (c) 2016, 2024 SAP SE. 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
@@ -705,6 +705,50 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
+  address generate_lookup_secondary_supers_table_stub(u1 super_klass_index) {
+    StubCodeMark mark(this, "StubRoutines", "lookup_secondary_supers_table");
+
+    const Register
+        r_super_klass  = Z_ARG1,
+        r_sub_klass    = Z_ARG2,
+        r_array_index  = Z_ARG3,
+        r_array_length = Z_ARG4,
+        r_array_base   = Z_ARG5,
+        r_bitmap       = Z_R10,
+        r_result       = Z_R11;
+    address start = __ pc();
+
+    __ lookup_secondary_supers_table(r_sub_klass, r_super_klass,
+                                     r_array_base, r_array_length, r_array_index,
+                                     r_bitmap, r_result, super_klass_index);
+
+    __ z_br(Z_R14);
+
+    return start;
+  }
+
+  // Slow path implementation for UseSecondarySupersTable.
+  address generate_lookup_secondary_supers_table_slow_path_stub() {
+    StubCodeMark mark(this, "StubRoutines", "lookup_secondary_supers_table_slow_path");
+
+    address start = __ pc();
+
+    const Register
+        r_super_klass  = Z_ARG1,
+        r_array_base   = Z_ARG5,
+        r_temp1        = Z_ARG4,
+        r_array_index  = Z_ARG3,
+        r_bitmap       = Z_R10,
+        r_result       = Z_R11;
+
+    __ lookup_secondary_supers_table_slow_path(r_super_klass, r_array_base,
+                                               r_array_index, r_bitmap, r_result, r_temp1);
+
+    __ z_br(Z_R14);
+
+    return start;
+  }
+
 #if !defined(PRODUCT)
   // Wrapper which calls oopDesc::is_oop_or_null()
   // Only called by MacroAssembler::verify_oop
@@ -3247,6 +3291,14 @@ class StubGenerator: public StubCodeGenerator {
       StubRoutines::_montgomerySquare
         = CAST_FROM_FN_PTR(address, SharedRuntime::montgomery_square);
     }
+    if (UseSecondarySupersTable) {
+      StubRoutines::_lookup_secondary_supers_table_slow_path_stub = generate_lookup_secondary_supers_table_slow_path_stub();
+      if (!InlineSecondarySupersTest) {
+        for (int slot = 0; slot < Klass::SECONDARY_SUPERS_TABLE_SIZE; slot++) {
+          StubRoutines::_lookup_secondary_supers_table_stubs[slot] = generate_lookup_secondary_supers_table_stub(slot);
+        }
+      }
+    }
 #endif
 #endif // COMPILER2_OR_JVMCI
   }
diff --git a/src/hotspot/cpu/s390/vm_version_s390.cpp b/src/hotspot/cpu/s390/vm_version_s390.cpp
index af0903884fb4f..4b17ff4594ccf 100644
--- a/src/hotspot/cpu/s390/vm_version_s390.cpp
+++ b/src/hotspot/cpu/s390/vm_version_s390.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2016, 2023 SAP SE. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024 SAP SE. 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
@@ -272,6 +272,13 @@ void VM_Version::initialize() {
     FLAG_SET_DEFAULT(UseSHA, false);
   }
 
+  if (UseSecondarySupersTable && VM_Version::get_model_index() < 5 /* z196/z11 */) {
+    if (!FLAG_IS_DEFAULT(UseSecondarySupersTable)) {
+      warning("UseSecondarySupersTable requires z196 or later.");
+    }
+    FLAG_SET_DEFAULT(UseSecondarySupersTable, false);
+  }
+
 #ifdef COMPILER2
   if (FLAG_IS_DEFAULT(UseMultiplyToLenIntrinsic)) {
     FLAG_SET_DEFAULT(UseMultiplyToLenIntrinsic, true);
diff --git a/src/hotspot/cpu/s390/vm_version_s390.hpp b/src/hotspot/cpu/s390/vm_version_s390.hpp
index 4f963c4e4851a..31fdedc59f642 100644
--- a/src/hotspot/cpu/s390/vm_version_s390.hpp
+++ b/src/hotspot/cpu/s390/vm_version_s390.hpp
@@ -413,6 +413,8 @@ class VM_Version: public Abstract_VM_Version {
   // s390 supports fast class initialization checks
   static bool supports_fast_class_init_checks() { return true; }
 
+  constexpr static bool supports_secondary_supers_table() { return true; }
+
   constexpr static bool supports_recursive_lightweight_locking() { return true; }
 
   // CPU feature query functions

From 0325ab8d2353f29ac40ff4b028cbc29bff40c59b Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevinw@openjdk.org>
Date: Tue, 30 Jul 2024 10:44:31 +0000
Subject: [PATCH 251/401] 8335610: DiagnosticFramework:
 CmdLine::is_executable() correction

Reviewed-by: dholmes, jsjolen
---
 src/hotspot/share/services/diagnosticFramework.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/services/diagnosticFramework.hpp b/src/hotspot/share/services/diagnosticFramework.hpp
index e8881c2364611..357482ec5a14d 100644
--- a/src/hotspot/share/services/diagnosticFramework.hpp
+++ b/src/hotspot/share/services/diagnosticFramework.hpp
@@ -67,7 +67,7 @@ class CmdLine : public StackObj {
   const char* cmd_addr() const    { return _cmd; }
   size_t cmd_len() const          { return _cmd_len; }
   bool is_empty() const           { return _cmd_len == 0; }
-  bool is_executable() const      { return is_empty() || _cmd[0] != '#'; }
+  bool is_executable() const      { return !is_empty() && _cmd[0] != '#'; }
   bool is_stop() const            { return !is_empty() && strncmp("stop", _cmd, _cmd_len) == 0; }
 };
 

From 8162832832ac6e8c17f942e718e309a3489e0da6 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Tue, 30 Jul 2024 12:40:35 +0000
Subject: [PATCH 252/401] 8333354: ubsan: frame.inline.hpp:91:25: and
 src/hotspot/share/runtime/frame.inline.hpp:88:29: runtime error: member call
 on null pointer of type 'const struct SmallRegisterMap'

Co-authored-by: Kim Barrett <kbarrett@openjdk.org>
Reviewed-by: rrich, clanger
---
 .../smallRegisterMap_aarch64.inline.hpp       | 20 +++++++---------
 .../cpu/arm/smallRegisterMap_arm.inline.hpp   | 15 ++++++------
 .../cpu/ppc/smallRegisterMap_ppc.inline.hpp   | 24 +++++++------------
 .../riscv/smallRegisterMap_riscv.inline.hpp   | 20 +++++++---------
 .../cpu/s390/smallRegisterMap_s390.inline.hpp | 15 ++++++------
 .../cpu/x86/smallRegisterMap_x86.inline.hpp   | 21 +++++++---------
 .../cpu/zero/smallRegisterMap_zero.inline.hpp | 15 ++++++------
 src/hotspot/share/oops/stackChunkOop.cpp      |  2 +-
 .../share/oops/stackChunkOop.inline.hpp       |  2 +-
 .../share/runtime/continuationFreezeThaw.cpp  | 14 +++++------
 10 files changed, 67 insertions(+), 81 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/smallRegisterMap_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/smallRegisterMap_aarch64.inline.hpp
index db38b9cf5dfe3..dcba233c9dc75 100644
--- a/src/hotspot/cpu/aarch64/smallRegisterMap_aarch64.inline.hpp
+++ b/src/hotspot/cpu/aarch64/smallRegisterMap_aarch64.inline.hpp
@@ -30,8 +30,15 @@
 
 // Java frames don't have callee saved registers (except for rfp), so we can use a smaller RegisterMap
 class SmallRegisterMap {
+  constexpr SmallRegisterMap() = default;
+  ~SmallRegisterMap() = default;
+  NONCOPYABLE(SmallRegisterMap);
+
 public:
-  static constexpr SmallRegisterMap* instance = nullptr;
+  static const SmallRegisterMap* instance() {
+    static constexpr SmallRegisterMap the_instance{};
+    return &the_instance;
+  }
 private:
   static void assert_is_rfp(VMReg r) NOT_DEBUG_RETURN
                                      DEBUG_ONLY({ assert (r == rfp->as_VMReg() || r == rfp->as_VMReg()->next(), "Reg: %s", r->name()); })
@@ -48,17 +55,6 @@ class SmallRegisterMap {
     return map;
   }
 
-  SmallRegisterMap() {}
-
-  SmallRegisterMap(const RegisterMap* map) {
-  #ifdef ASSERT
-    for(int i = 0; i < RegisterMap::reg_count; i++) {
-      VMReg r = VMRegImpl::as_VMReg(i);
-      if (map->location(r, (intptr_t*)nullptr) != nullptr) assert_is_rfp(r);
-    }
-  #endif
-  }
-
   inline address location(VMReg reg, intptr_t* sp) const {
     assert_is_rfp(reg);
     return (address)(sp - frame::sender_sp_offset);
diff --git a/src/hotspot/cpu/arm/smallRegisterMap_arm.inline.hpp b/src/hotspot/cpu/arm/smallRegisterMap_arm.inline.hpp
index 4186eafd35f59..08adbbd89d892 100644
--- a/src/hotspot/cpu/arm/smallRegisterMap_arm.inline.hpp
+++ b/src/hotspot/cpu/arm/smallRegisterMap_arm.inline.hpp
@@ -30,8 +30,15 @@
 
 // Java frames don't have callee saved registers (except for rfp), so we can use a smaller RegisterMap
 class SmallRegisterMap {
+  constexpr SmallRegisterMap() = default;
+  ~SmallRegisterMap() = default;
+  NONCOPYABLE(SmallRegisterMap);
+
 public:
-  static constexpr SmallRegisterMap* instance = nullptr;
+  static const SmallRegisterMap* instance() {
+    static constexpr SmallRegisterMap the_instance{};
+    return &the_instance;
+  }
 private:
   static void assert_is_rfp(VMReg r) NOT_DEBUG_RETURN
                                      DEBUG_ONLY({ Unimplemented(); })
@@ -46,12 +53,6 @@ class SmallRegisterMap {
     return map;
   }
 
-  SmallRegisterMap() {}
-
-  SmallRegisterMap(const RegisterMap* map) {
-    Unimplemented();
-  }
-
   inline address location(VMReg reg, intptr_t* sp) const {
     Unimplemented();
     return nullptr;
diff --git a/src/hotspot/cpu/ppc/smallRegisterMap_ppc.inline.hpp b/src/hotspot/cpu/ppc/smallRegisterMap_ppc.inline.hpp
index 8c96f51fd88eb..a6246cd7e74fb 100644
--- a/src/hotspot/cpu/ppc/smallRegisterMap_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/smallRegisterMap_ppc.inline.hpp
@@ -30,9 +30,16 @@
 
 // Java frames don't have callee saved registers, so we can use a smaller RegisterMap
 class SmallRegisterMap {
+  constexpr SmallRegisterMap() = default;
+  ~SmallRegisterMap() = default;
+  NONCOPYABLE(SmallRegisterMap);
+
 public:
-  static constexpr SmallRegisterMap* instance = nullptr;
-public:
+  static const SmallRegisterMap* instance() {
+    static constexpr SmallRegisterMap the_instance{};
+    return &the_instance;
+  }
+
   // as_RegisterMap is used when we didn't want to templatize and abstract over RegisterMap type to support SmallRegisterMap
   // Consider enhancing SmallRegisterMap to support those cases
   const RegisterMap* as_RegisterMap() const { return nullptr; }
@@ -44,19 +51,6 @@ class SmallRegisterMap {
     return map;
   }
 
-  SmallRegisterMap() {}
-
-  SmallRegisterMap(const RegisterMap* map) {
-#ifdef ASSERT
-  for(int i = 0; i < RegisterMap::reg_count; i++) {
-    VMReg r = VMRegImpl::as_VMReg(i);
-    if (map->location(r, (intptr_t*)nullptr) != nullptr) {
-      assert(false, "Reg: %s", r->name()); // Should not reach here
-    }
-  }
-#endif
-  }
-
   inline address location(VMReg reg, intptr_t* sp) const {
     assert(false, "Reg: %s", reg->name());
     return nullptr;
diff --git a/src/hotspot/cpu/riscv/smallRegisterMap_riscv.inline.hpp b/src/hotspot/cpu/riscv/smallRegisterMap_riscv.inline.hpp
index 93adaadcef6b9..9fc4f1d7b0a70 100644
--- a/src/hotspot/cpu/riscv/smallRegisterMap_riscv.inline.hpp
+++ b/src/hotspot/cpu/riscv/smallRegisterMap_riscv.inline.hpp
@@ -30,8 +30,15 @@
 
 // Java frames don't have callee saved registers (except for fp), so we can use a smaller RegisterMap
 class SmallRegisterMap {
+  constexpr SmallRegisterMap() = default;
+  ~SmallRegisterMap() = default;
+  NONCOPYABLE(SmallRegisterMap);
+
 public:
-  static constexpr SmallRegisterMap* instance = nullptr;
+  static const SmallRegisterMap* instance() {
+    static constexpr SmallRegisterMap the_instance{};
+    return &the_instance;
+  }
 private:
   static void assert_is_fp(VMReg r) NOT_DEBUG_RETURN
                                     DEBUG_ONLY({ assert (r == fp->as_VMReg() || r == fp->as_VMReg()->next(), "Reg: %s", r->name()); })
@@ -48,17 +55,6 @@ class SmallRegisterMap {
     return map;
   }
 
-  SmallRegisterMap() {}
-
-  SmallRegisterMap(const RegisterMap* map) {
-  #ifdef ASSERT
-    for(int i = 0; i < RegisterMap::reg_count; i++) {
-      VMReg r = VMRegImpl::as_VMReg(i);
-      if (map->location(r, (intptr_t*)nullptr) != nullptr) assert_is_fp(r);
-    }
-  #endif
-  }
-
   inline address location(VMReg reg, intptr_t* sp) const {
     assert_is_fp(reg);
     return (address)(sp - 2);
diff --git a/src/hotspot/cpu/s390/smallRegisterMap_s390.inline.hpp b/src/hotspot/cpu/s390/smallRegisterMap_s390.inline.hpp
index 8c74eb7dd6dbf..625d17cf99233 100644
--- a/src/hotspot/cpu/s390/smallRegisterMap_s390.inline.hpp
+++ b/src/hotspot/cpu/s390/smallRegisterMap_s390.inline.hpp
@@ -30,8 +30,15 @@
 
 // Java frames don't have callee saved registers (except for rfp), so we can use a smaller RegisterMap
 class SmallRegisterMap {
+  constexpr SmallRegisterMap() = default;
+  ~SmallRegisterMap() = default;
+  NONCOPYABLE(SmallRegisterMap);
+
 public:
-  static constexpr SmallRegisterMap* instance = nullptr;
+  static const SmallRegisterMap* instance() {
+    static constexpr SmallRegisterMap the_instance{};
+    return &the_instance;
+  }
 private:
   static void assert_is_rfp(VMReg r) NOT_DEBUG_RETURN
                                      DEBUG_ONLY({ Unimplemented(); })
@@ -46,12 +53,6 @@ class SmallRegisterMap {
     return map;
   }
 
-  SmallRegisterMap() {}
-
-  SmallRegisterMap(const RegisterMap* map) {
-    Unimplemented();
-  }
-
   inline address location(VMReg reg, intptr_t* sp) const {
     Unimplemented();
     return nullptr;
diff --git a/src/hotspot/cpu/x86/smallRegisterMap_x86.inline.hpp b/src/hotspot/cpu/x86/smallRegisterMap_x86.inline.hpp
index 5f21939a3aa17..63212a686afc0 100644
--- a/src/hotspot/cpu/x86/smallRegisterMap_x86.inline.hpp
+++ b/src/hotspot/cpu/x86/smallRegisterMap_x86.inline.hpp
@@ -30,8 +30,16 @@
 
 // Java frames don't have callee saved registers (except for rbp), so we can use a smaller RegisterMap
 class SmallRegisterMap {
+  constexpr SmallRegisterMap() = default;
+  ~SmallRegisterMap() = default;
+  NONCOPYABLE(SmallRegisterMap);
+
 public:
-  static constexpr SmallRegisterMap* instance = nullptr;
+  static const SmallRegisterMap* instance() {
+    static constexpr SmallRegisterMap the_instance{};
+    return &the_instance;
+  }
+
 private:
   static void assert_is_rbp(VMReg r) NOT_DEBUG_RETURN
                                      DEBUG_ONLY({ assert(r == rbp->as_VMReg() || r == rbp->as_VMReg()->next(), "Reg: %s", r->name()); })
@@ -48,17 +56,6 @@ class SmallRegisterMap {
     return map;
   }
 
-  SmallRegisterMap() {}
-
-  SmallRegisterMap(const RegisterMap* map) {
-  #ifdef ASSERT
-    for(int i = 0; i < RegisterMap::reg_count; i++) {
-      VMReg r = VMRegImpl::as_VMReg(i);
-      if (map->location(r, (intptr_t*)nullptr) != nullptr) assert_is_rbp(r);
-    }
-  #endif
-  }
-
   inline address location(VMReg reg, intptr_t* sp) const {
     assert_is_rbp(reg);
     return (address)(sp - frame::sender_sp_offset);
diff --git a/src/hotspot/cpu/zero/smallRegisterMap_zero.inline.hpp b/src/hotspot/cpu/zero/smallRegisterMap_zero.inline.hpp
index b85ead32fd22e..51fb114f59585 100644
--- a/src/hotspot/cpu/zero/smallRegisterMap_zero.inline.hpp
+++ b/src/hotspot/cpu/zero/smallRegisterMap_zero.inline.hpp
@@ -30,8 +30,15 @@
 
 // Java frames don't have callee saved registers (except for rfp), so we can use a smaller RegisterMap
 class SmallRegisterMap {
+  constexpr SmallRegisterMap() = default;
+  ~SmallRegisterMap() = default;
+  NONCOPYABLE(SmallRegisterMap);
+
 public:
-  static constexpr SmallRegisterMap* instance = nullptr;
+  static const SmallRegisterMap* instance() {
+    static constexpr SmallRegisterMap the_instance{};
+    return &the_instance;
+  }
 private:
   static void assert_is_rfp(VMReg r) NOT_DEBUG_RETURN
                                      DEBUG_ONLY({ Unimplemented(); })
@@ -46,12 +53,6 @@ class SmallRegisterMap {
     return map;
   }
 
-  SmallRegisterMap() {}
-
-  SmallRegisterMap(const RegisterMap* map) {
-    Unimplemented();
-  }
-
   inline address location(VMReg reg, intptr_t* sp) const {
     Unimplemented();
     return nullptr;
diff --git a/src/hotspot/share/oops/stackChunkOop.cpp b/src/hotspot/share/oops/stackChunkOop.cpp
index 8d230b334c88f..344fef1530837 100644
--- a/src/hotspot/share/oops/stackChunkOop.cpp
+++ b/src/hotspot/share/oops/stackChunkOop.cpp
@@ -125,7 +125,7 @@ static int num_java_frames(const StackChunkFrameStream<ChunkFrames::Mixed>& f) {
 int stackChunkOopDesc::num_java_frames() const {
   int n = 0;
   for (StackChunkFrameStream<ChunkFrames::Mixed> f(const_cast<stackChunkOopDesc*>(this)); !f.is_done();
-       f.next(SmallRegisterMap::instance)) {
+       f.next(SmallRegisterMap::instance())) {
     if (!f.is_stub()) {
       n += ::num_java_frames(f);
     }
diff --git a/src/hotspot/share/oops/stackChunkOop.inline.hpp b/src/hotspot/share/oops/stackChunkOop.inline.hpp
index 54f1423fd1cd9..a54b8159e7ef5 100644
--- a/src/hotspot/share/oops/stackChunkOop.inline.hpp
+++ b/src/hotspot/share/oops/stackChunkOop.inline.hpp
@@ -201,7 +201,7 @@ inline void stackChunkOopDesc::iterate_stack(StackChunkFrameClosureType* closure
 
 template <ChunkFrames frame_kind, class StackChunkFrameClosureType>
 inline void stackChunkOopDesc::iterate_stack(StackChunkFrameClosureType* closure) {
-  const SmallRegisterMap* map = SmallRegisterMap::instance;
+  const SmallRegisterMap* map = SmallRegisterMap::instance();
   assert(!map->in_cont(), "");
 
   StackChunkFrameStream<frame_kind> f(this);
diff --git a/src/hotspot/share/runtime/continuationFreezeThaw.cpp b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
index ea0647fd518e0..0e4640b6a9f4d 100644
--- a/src/hotspot/share/runtime/continuationFreezeThaw.cpp
+++ b/src/hotspot/share/runtime/continuationFreezeThaw.cpp
@@ -1865,7 +1865,7 @@ int ThawBase::remove_top_compiled_frame_from_chunk(stackChunkOop chunk, int &arg
   const int frame_size = f.cb()->frame_size();
   argsize = f.stack_argsize();
 
-  f.next(SmallRegisterMap::instance, true /* stop */);
+  f.next(SmallRegisterMap::instance(), true /* stop */);
   empty = f.is_done();
   assert(!empty || argsize == chunk->argsize(), "");
 
@@ -2075,7 +2075,7 @@ bool ThawBase::recurse_thaw_java_frame(frame& caller, int num_frames) {
 
   int argsize = _stream.stack_argsize();
 
-  _stream.next(SmallRegisterMap::instance);
+  _stream.next(SmallRegisterMap::instance());
   assert(_stream.to_frame().is_empty() == _stream.is_done(), "");
 
   // we never leave a compiled caller of an interpreted frame as the top frame in the chunk
@@ -2183,7 +2183,7 @@ NOINLINE void ThawBase::recurse_thaw_interpreted_frame(const frame& hf, frame& c
   assert(hf.is_interpreted_frame(), "");
 
   if (UNLIKELY(seen_by_gc())) {
-    _cont.tail()->do_barriers<stackChunkOopDesc::BarrierType::Store>(_stream, SmallRegisterMap::instance);
+    _cont.tail()->do_barriers<stackChunkOopDesc::BarrierType::Store>(_stream, SmallRegisterMap::instance());
   }
 
   const bool is_bottom_frame = recurse_thaw_java_frame<ContinuationHelper::InterpretedFrame>(caller, num_frames);
@@ -2226,7 +2226,7 @@ NOINLINE void ThawBase::recurse_thaw_interpreted_frame(const frame& hf, frame& c
 
   if (!is_bottom_frame) {
     // can only fix caller once this frame is thawed (due to callee saved regs)
-    _cont.tail()->fix_thawed_frame(caller, SmallRegisterMap::instance);
+    _cont.tail()->fix_thawed_frame(caller, SmallRegisterMap::instance());
   } else if (_cont.tail()->has_bitmap() && locals > 0) {
     assert(hf.is_heap_frame(), "should be");
     address start = (address)(heap_frame_bottom - locals);
@@ -2243,7 +2243,7 @@ void ThawBase::recurse_thaw_compiled_frame(const frame& hf, frame& caller, int n
   assert(_cont.is_preempted() || !stub_caller, "stub caller not at preemption");
 
   if (!stub_caller && UNLIKELY(seen_by_gc())) { // recurse_thaw_stub_frame already invoked our barriers with a full regmap
-    _cont.tail()->do_barriers<stackChunkOopDesc::BarrierType::Store>(_stream, SmallRegisterMap::instance);
+    _cont.tail()->do_barriers<stackChunkOopDesc::BarrierType::Store>(_stream, SmallRegisterMap::instance());
   }
 
   const bool is_bottom_frame = recurse_thaw_java_frame<ContinuationHelper::CompiledFrame>(caller, num_frames);
@@ -2302,7 +2302,7 @@ void ThawBase::recurse_thaw_compiled_frame(const frame& hf, frame& caller, int n
 
   if (!is_bottom_frame) {
     // can only fix caller once this frame is thawed (due to callee saved regs); this happens on the stack
-    _cont.tail()->fix_thawed_frame(caller, SmallRegisterMap::instance);
+    _cont.tail()->fix_thawed_frame(caller, SmallRegisterMap::instance());
   } else if (_cont.tail()->has_bitmap() && added_argsize > 0) {
     address start = (address)(heap_frame_top + ContinuationHelper::CompiledFrame::size(hf) + frame::metadata_words_at_top);
     int stack_args_slots = f.cb()->as_nmethod()->num_stack_arg_slots(false /* rounded */);
@@ -2384,7 +2384,7 @@ void ThawBase::finish_thaw(frame& f) {
     f.set_sp(align_down(f.sp(), frame::frame_alignment));
   }
   push_return_frame(f);
-  chunk->fix_thawed_frame(f, SmallRegisterMap::instance); // can only fix caller after push_return_frame (due to callee saved regs)
+  chunk->fix_thawed_frame(f, SmallRegisterMap::instance()); // can only fix caller after push_return_frame (due to callee saved regs)
 
   assert(_cont.is_empty() == _cont.last_frame().is_empty(), "");
 

From 79bdd811876d75974536aac088bae1719387c97f Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Tue, 30 Jul 2024 13:38:11 +0000
Subject: [PATCH 253/401] 8336763: Parallel: Merge PCMarkAndPushClosure and
 PCIterateMarkAndPushClosure

Reviewed-by: gli, zgu
---
 .../share/gc/parallel/psCompactionManager.cpp | 15 +++++----
 .../share/gc/parallel/psCompactionManager.hpp | 20 +++++++++++-
 .../parallel/psCompactionManager.inline.hpp   | 32 ++++---------------
 .../share/gc/parallel/psParallelCompact.cpp   | 22 ++++++-------
 4 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.cpp b/src/hotspot/share/gc/parallel/psCompactionManager.cpp
index b95c7c619af7d..d9f2749230e4c 100644
--- a/src/hotspot/share/gc/parallel/psCompactionManager.cpp
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.cpp
@@ -54,7 +54,9 @@ Monitor*                ParCompactionManager::_shadow_region_monitor = nullptr;
 
 PreservedMarksSet* ParCompactionManager::_preserved_marks_set = nullptr;
 
-ParCompactionManager::ParCompactionManager(PreservedMarks* preserved_marks) {
+ParCompactionManager::ParCompactionManager(PreservedMarks* preserved_marks,
+                                           ReferenceProcessor* ref_processor)
+  : _mark_and_push_closure(this, ref_processor) {
 
   ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
 
@@ -66,8 +68,9 @@ ParCompactionManager::ParCompactionManager(PreservedMarks* preserved_marks) {
 }
 
 void ParCompactionManager::initialize(ParMarkBitMap* mbm) {
-  assert(ParallelScavengeHeap::heap() != nullptr,
-    "Needed for initialization");
+  assert(ParallelScavengeHeap::heap() != nullptr, "Needed for initialization");
+  assert(PSParallelCompact::ref_processor() != nullptr, "precondition");
+  assert(ParallelScavengeHeap::heap()->workers().max_workers() != 0, "Not initialized?");
 
   _mark_bitmap = mbm;
 
@@ -85,15 +88,13 @@ void ParCompactionManager::initialize(ParMarkBitMap* mbm) {
 
   // Create and register the ParCompactionManager(s) for the worker threads.
   for(uint i=0; i<parallel_gc_threads; i++) {
-    _manager_array[i] = new ParCompactionManager(_preserved_marks_set->get(i));
+    _manager_array[i] = new ParCompactionManager(_preserved_marks_set->get(i),
+                                                 PSParallelCompact::ref_processor());
     oop_task_queues()->register_queue(i, _manager_array[i]->oop_stack());
     _objarray_task_queues->register_queue(i, &_manager_array[i]->_objarray_stack);
     region_task_queues()->register_queue(i, _manager_array[i]->region_stack());
   }
 
-  assert(ParallelScavengeHeap::heap()->workers().max_workers() != 0,
-    "Not initialized?");
-
   _shadow_region_array = new (mtGC) GrowableArray<size_t >(10, mtGC);
 
   _shadow_region_monitor = new Monitor(Mutex::nosafepoint, "CompactionManager_lock");
diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.hpp b/src/hotspot/share/gc/parallel/psCompactionManager.hpp
index 0dd68d2e2f7c7..da1609a32d8eb 100644
--- a/src/hotspot/share/gc/parallel/psCompactionManager.hpp
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.hpp
@@ -25,6 +25,7 @@
 #ifndef SHARE_GC_PARALLEL_PSCOMPACTIONMANAGER_HPP
 #define SHARE_GC_PARALLEL_PSCOMPACTIONMANAGER_HPP
 
+#include "classfile/classLoaderData.hpp"
 #include "gc/parallel/psParallelCompact.hpp"
 #include "gc/shared/preservedMarks.hpp"
 #include "gc/shared/stringdedup/stringDedup.hpp"
@@ -40,6 +41,19 @@ class ObjectStartArray;
 class ParallelCompactData;
 class ParMarkBitMap;
 
+class PCMarkAndPushClosure: public ClaimMetadataVisitingOopIterateClosure {
+  ParCompactionManager* _compaction_manager;
+
+  template <typename T> void do_oop_work(T* p);
+public:
+  PCMarkAndPushClosure(ParCompactionManager* cm, ReferenceProcessor* rp) :
+    ClaimMetadataVisitingOopIterateClosure(ClassLoaderData::_claim_stw_fullgc_mark, rp),
+    _compaction_manager(cm) { }
+
+  virtual void do_oop(oop* p)                     { do_oop_work(p); }
+  virtual void do_oop(narrowOop* p)               { do_oop_work(p); }
+};
+
 class ParCompactionManager : public CHeapObj<mtGC> {
   friend class MarkFromRootsTask;
   friend class ParallelCompactRefProcProxyTask;
@@ -47,6 +61,7 @@ class ParCompactionManager : public CHeapObj<mtGC> {
   friend class ParMarkBitMap;
   friend class PSParallelCompact;
   friend class FillDensePrefixAndCompactionTask;
+  friend class PCAddThreadRootsMarkingTaskClosure;
 
  private:
   typedef OverflowTaskQueue<oop, mtGC>            OopTaskQueue;
@@ -71,6 +86,7 @@ class ParCompactionManager : public CHeapObj<mtGC> {
   ObjArrayTaskQueue             _objarray_stack;
   size_t                        _next_shadow_region;
 
+  PCMarkAndPushClosure _mark_and_push_closure;
   // Is there a way to reuse the _oop_stack for the
   // saving empty regions?  For now just create a different
   // type of TaskQueue.
@@ -104,7 +120,9 @@ class ParCompactionManager : public CHeapObj<mtGC> {
   // objArray stack, otherwise returns false and the task is invalid.
   bool publish_or_pop_objarray_tasks(ObjArrayTask& task);
 
-  ParCompactionManager(PreservedMarks* preserved_marks);
+  ParCompactionManager(PreservedMarks* preserved_marks,
+                       ReferenceProcessor* ref_processor);
+
   // Array of task queues.  Needed by the task terminator.
   static RegionTaskQueueSet* region_task_queues()      { return _region_task_queues; }
   OopTaskQueue*  oop_stack()       { return &_oop_stack; }
diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
index 22acc11beec3c..0b92862223826 100644
--- a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
@@ -41,29 +41,10 @@
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 
-class PCMarkAndPushClosure: public OopClosure {
-private:
-  ParCompactionManager* _compaction_manager;
-public:
-  PCMarkAndPushClosure(ParCompactionManager* cm) : _compaction_manager(cm) { }
-
-  template <typename T> void do_oop_work(T* p)      { _compaction_manager->mark_and_push(p); }
-  virtual void do_oop(oop* p)                     { do_oop_work(p); }
-  virtual void do_oop(narrowOop* p)               { do_oop_work(p); }
-};
-
-class PCIterateMarkAndPushClosure: public ClaimMetadataVisitingOopIterateClosure {
-private:
-  ParCompactionManager* _compaction_manager;
-public:
-  PCIterateMarkAndPushClosure(ParCompactionManager* cm, ReferenceProcessor* rp) :
-    ClaimMetadataVisitingOopIterateClosure(ClassLoaderData::_claim_stw_fullgc_mark, rp),
-    _compaction_manager(cm) { }
-
-  template <typename T> void do_oop_work(T* p)      { _compaction_manager->mark_and_push(p); }
-  virtual void do_oop(oop* p)                     { do_oop_work(p); }
-  virtual void do_oop(narrowOop* p)               { do_oop_work(p); }
-};
+template <typename T>
+inline void PCMarkAndPushClosure::do_oop_work(T* p) {
+  _compaction_manager->mark_and_push(p);
+}
 
 inline bool ParCompactionManager::steal(int queue_num, oop& t) {
   return oop_task_queues()->steal(queue_num, t);
@@ -161,13 +142,12 @@ inline void ParCompactionManager::follow_array(objArrayOop obj, int index) {
 
 inline void ParCompactionManager::follow_contents(oop obj) {
   assert(PSParallelCompact::mark_bitmap()->is_marked(obj), "should be marked");
-  PCIterateMarkAndPushClosure cl(this, PSParallelCompact::ref_processor());
 
   if (obj->is_objArray()) {
-    cl.do_klass(obj->klass());
+    _mark_and_push_closure.do_klass(obj->klass());
     follow_array(objArrayOop(obj), 0);
   } else {
-    obj->oop_iterate(&cl);
+    obj->oop_iterate(&_mark_and_push_closure);
   }
 }
 
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index f41108d1a597f..4d54f11805ac2 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -1188,10 +1188,11 @@ class PCAddThreadRootsMarkingTaskClosure : public ThreadClosure {
 
     ParCompactionManager* cm = ParCompactionManager::gc_thread_compaction_manager(_worker_id);
 
-    PCMarkAndPushClosure mark_and_push_closure(cm);
-    MarkingNMethodClosure mark_and_push_in_blobs(&mark_and_push_closure, !NMethodToOopClosure::FixRelocations, true /* keepalive nmethods */);
+    MarkingNMethodClosure mark_and_push_in_blobs(&cm->_mark_and_push_closure,
+                                                 !NMethodToOopClosure::FixRelocations,
+                                                 true /* keepalive nmethods */);
 
-    thread->oops_do(&mark_and_push_closure, &mark_and_push_in_blobs);
+    thread->oops_do(&cm->_mark_and_push_closure, &mark_and_push_in_blobs);
 
     // Do the real work
     cm->follow_marking_stacks();
@@ -1232,22 +1233,22 @@ class MarkFromRootsTask : public WorkerTask {
   virtual void work(uint worker_id) {
     ParCompactionManager* cm = ParCompactionManager::gc_thread_compaction_manager(worker_id);
     cm->create_marking_stats_cache();
-    PCMarkAndPushClosure mark_and_push_closure(cm);
-
     {
-      CLDToOopClosure cld_closure(&mark_and_push_closure, ClassLoaderData::_claim_stw_fullgc_mark);
+      CLDToOopClosure cld_closure(&cm->_mark_and_push_closure, ClassLoaderData::_claim_stw_fullgc_mark);
       ClassLoaderDataGraph::always_strong_cld_do(&cld_closure);
 
       // Do the real work
       cm->follow_marking_stacks();
     }
 
-    PCAddThreadRootsMarkingTaskClosure closure(worker_id);
-    Threads::possibly_parallel_threads_do(true /* is_par */, &closure);
+    {
+      PCAddThreadRootsMarkingTaskClosure closure(worker_id);
+      Threads::possibly_parallel_threads_do(_active_workers > 1 /* is_par */, &closure);
+    }
 
     // Mark from OopStorages
     {
-      _oop_storage_set_par_state.oops_do(&mark_and_push_closure);
+      _oop_storage_set_par_state.oops_do(&cm->_mark_and_push_closure);
       // Do the real work
       cm->follow_marking_stacks();
     }
@@ -1269,10 +1270,9 @@ class ParallelCompactRefProcProxyTask : public RefProcProxyTask {
   void work(uint worker_id) override {
     assert(worker_id < _max_workers, "sanity");
     ParCompactionManager* cm = (_tm == RefProcThreadModel::Single) ? ParCompactionManager::get_vmthread_cm() : ParCompactionManager::gc_thread_compaction_manager(worker_id);
-    PCMarkAndPushClosure keep_alive(cm);
     BarrierEnqueueDiscoveredFieldClosure enqueue;
     ParCompactionManager::FollowStackClosure complete_gc(cm, (_tm == RefProcThreadModel::Single) ? nullptr : &_terminator, worker_id);
-    _rp_task->rp_work(worker_id, PSParallelCompact::is_alive_closure(), &keep_alive, &enqueue, &complete_gc);
+    _rp_task->rp_work(worker_id, PSParallelCompact::is_alive_closure(), &cm->_mark_and_push_closure, &enqueue, &complete_gc);
   }
 
   void prepare_run_task_hook() override {

From 41486131481164a559aa534807fe1a77a7d29fc8 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Tue, 30 Jul 2024 13:47:58 +0000
Subject: [PATCH 254/401] 8335907: JFR: Make SettingControls more robust

Reviewed-by: mgronlun
---
 .../jdk/jfr/internal/EventControl.java        |   8 +-
 .../jfr/internal/settings/BooleanSetting.java |  83 +++++
 .../jfr/internal/settings/CutoffSetting.java  |  32 +-
 .../jfr/internal/settings/EnabledSetting.java |  28 +-
 .../jfr/internal/settings/LevelSetting.java   |  17 +-
 .../jfr/internal/settings/PeriodSetting.java  |  24 +-
 .../internal/settings/StackTraceSetting.java  |  31 +-
 .../internal/settings/ThresholdSetting.java   |  30 +-
 .../internal/settings/ThrottleSetting.java    | 102 +++---
 .../jfr/internal/settings/ThrottleUnit.java   |  82 -----
 .../BooleanValue.java => util/Rate.java}      |  66 ++--
 .../jdk/jfr/internal/util/TimespanUnit.java   |  53 +++
 .../classes/jdk/jfr/internal/util/Utils.java  |   8 +
 .../jdk/jfr/internal/util/ValueFormatter.java |  21 +-
 .../jdk/jfr/internal/util/ValueParser.java    |  11 +-
 .../jfr/api/settings/TestSettingControl.java  | 319 ++++++++++++++++++
 16 files changed, 610 insertions(+), 305 deletions(-)
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/settings/BooleanSetting.java
 delete mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottleUnit.java
 rename src/jdk.jfr/share/classes/jdk/jfr/internal/{settings/BooleanValue.java => util/Rate.java} (50%)
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/util/TimespanUnit.java
 create mode 100644 test/jdk/jdk/jfr/api/settings/TestSettingControl.java

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
index 71569c30273be..f086bbf884701 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventControl.java
@@ -299,7 +299,7 @@ private static Control defineEnabled(PlatformEventType type) {
     }
 
     private static Control defineThreshold(PlatformEventType type) {
-        String def = type.getAnnotationValue(Threshold.class, "0 ns");
+        String def = type.getAnnotationValue(Threshold.class, ThresholdSetting.DEFAULT_VALUE);
         type.add(PrivateAccess.getInstance().newSettingDescriptor(TYPE_THRESHOLD, Threshold.NAME, def, Collections.emptyList()));
         return new Control(new ThresholdSetting(type), def);
     }
@@ -311,13 +311,13 @@ private static Control defineStackTrace(PlatformEventType type) {
     }
 
     private static Control defineCutoff(PlatformEventType type) {
-        String def = type.getAnnotationValue(Cutoff.class, Cutoff.INFINITY);
+        String def = type.getAnnotationValue(Cutoff.class, CutoffSetting.DEFAULT_VALUE);
         type.add(PrivateAccess.getInstance().newSettingDescriptor(TYPE_CUTOFF, Cutoff.NAME, def, Collections.emptyList()));
         return new Control(new CutoffSetting(type), def);
     }
 
     private static Control defineThrottle(PlatformEventType type) {
-        String def = type.getAnnotationValue(Throttle.class, Throttle.DEFAULT);
+        String def = type.getAnnotationValue(Throttle.class, ThrottleSetting.DEFAULT_VALUE);
         type.add(PrivateAccess.getInstance().newSettingDescriptor(TYPE_THROTTLE, Throttle.NAME, def, Collections.emptyList()));
         return new Control(new ThrottleSetting(type), def);
     }
@@ -330,7 +330,7 @@ private static Control defineLevel(PlatformEventType type) {
     }
 
     private static Control definePeriod(PlatformEventType type) {
-        String def = type.getAnnotationValue(Period.class, "everyChunk");
+        String def = type.getAnnotationValue(Period.class, PeriodSetting.DEFAULT_VALUE);
         type.add(PrivateAccess.getInstance().newSettingDescriptor(TYPE_PERIOD, PeriodSetting.NAME, def, Collections.emptyList()));
         return new Control(new PeriodSetting(type), def);
     }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/BooleanSetting.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/BooleanSetting.java
new file mode 100644
index 0000000000000..72ffcac72c926
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/BooleanSetting.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package jdk.jfr.internal.settings;
+
+import java.util.Objects;
+import java.util.Set;
+
+import jdk.jfr.internal.PlatformEventType;
+
+abstract class BooleanSetting extends JDKSettingControl {
+    private final PlatformEventType eventType;
+    private final String defaultValue;
+    private String value;
+
+    public BooleanSetting(PlatformEventType eventType, String defaultValue) {
+        this.eventType = Objects.requireNonNull(eventType);
+        this.defaultValue = defaultValue;
+        this.value = defaultValue;
+        if (parse(defaultValue) == null) {
+            throw new InternalError("Only 'true' or 'false' is allowed with class BooleanSetting");
+        }
+    }
+
+    protected abstract void apply(PlatformEventType eventType, boolean value);
+
+    @Override
+    public String combine(Set<String> values) {
+        if (values.contains("true")) {
+            return "true";
+        }
+        if (values.contains("false")) {
+            return "false";
+        }
+        return defaultValue;
+    }
+
+    @Override
+    public void setValue(String value) {
+        Boolean b = parse(value);
+        if (b != null) {
+            apply(eventType, b.booleanValue());
+            this.value = value;
+        }
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+
+    private static Boolean parse(String value) {
+        if ("true".equals(value)) {
+            return Boolean.TRUE;
+        }
+        if ("false".equals(value)) {
+            return Boolean.FALSE;
+        }
+        return null;
+    }
+}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CutoffSetting.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CutoffSetting.java
index 553336b59e242..68950d71b63d7 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CutoffSetting.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CutoffSetting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 
 package jdk.jfr.internal.settings;
 
+import static jdk.jfr.internal.util.ValueParser.MISSING;
+
 import java.util.Objects;
 import java.util.Set;
 
@@ -43,8 +45,8 @@
 @Name(Type.SETTINGS_PREFIX + "Cutoff")
 @Timespan
 public final class CutoffSetting extends JDKSettingControl {
-
-    private String value = "0 ns";
+    public static final String DEFAULT_VALUE = ValueParser.INFINITY;
+    private String value = DEFAULT_VALUE;
     private final PlatformEventType eventType;
 
     public CutoffSetting(PlatformEventType eventType) {
@@ -54,22 +56,24 @@ public CutoffSetting(PlatformEventType eventType) {
     @Override
     public String combine(Set<String> values) {
         long max = 0;
-        String text = "0 ns";
+        String text = null;
         for (String value : values) {
-            long l =  ValueParser.parseTimespanWithInfinity(value);
-            if (l > max) {
+            long nanos = ValueParser.parseTimespanWithInfinity(value, MISSING);
+            if (nanos != MISSING && nanos > max) {
                 text = value;
-                max = l;
+                max = nanos;
             }
         }
-        return text;
+        return Objects.requireNonNullElse(text, DEFAULT_VALUE);
     }
 
     @Override
     public void setValue(String value) {
-        long l =  ValueParser.parseTimespanWithInfinity(value);
-        this.value = value;
-        eventType.setCutoff(l);
+        long nanos = ValueParser.parseTimespanWithInfinity(value, MISSING);
+        if (nanos != MISSING) {
+            eventType.setCutoff(nanos);
+            this.value = value;
+        }
     }
 
     @Override
@@ -81,10 +85,6 @@ public static long parseValueSafe(String value) {
         if (value == null) {
             return 0L;
         }
-        try {
-            return ValueParser.parseTimespanWithInfinity(value);
-        } catch (NumberFormatException nfe) {
-            return 0L;
-        }
+        return ValueParser.parseTimespanWithInfinity(value, 0L);
     }
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/EnabledSetting.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/EnabledSetting.java
index 77a57a9b75b0d..e81bce484f3ea 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/EnabledSetting.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/EnabledSetting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,6 @@
 
 package jdk.jfr.internal.settings;
 
-import java.util.Objects;
-import java.util.Set;
-
 import jdk.jfr.Description;
 import jdk.jfr.BooleanFlag;
 import jdk.jfr.Label;
@@ -41,33 +38,18 @@
 @Description("Record event")
 @Name(Type.SETTINGS_PREFIX + "Enabled")
 @BooleanFlag
-public final class EnabledSetting extends JDKSettingControl {
-    private final BooleanValue booleanValue;
-    private final PlatformEventType eventType;
-
+public final class EnabledSetting extends BooleanSetting {
     public EnabledSetting(PlatformEventType eventType, String defaultValue) {
-        this.booleanValue = BooleanValue.valueOf(defaultValue);
-        this.eventType = Objects.requireNonNull(eventType);
-    }
-
-    @Override
-    public String combine(Set<String> values) {
-        return booleanValue.union(values);
+        super(eventType, defaultValue);
     }
 
     @Override
-    public void setValue(String value) {
-        booleanValue.setValue(value);
-        eventType.setEnabled(booleanValue.getBoolean());
+    protected void apply(PlatformEventType eventType, boolean value) {
+        eventType.setEnabled(value);
         if (eventType.isEnabled() && !eventType.isJVM()) {
             if (!eventType.isInstrumented()) {
                 eventType.markForInstrumentation(true);
             }
         }
     }
-
-    @Override
-    public String getValue() {
-        return booleanValue.getValue();
-    }
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/LevelSetting.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/LevelSetting.java
index b6aa7500d4b68..9531f75c9257a 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/LevelSetting.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/LevelSetting.java
@@ -47,30 +47,29 @@ public final class LevelSetting extends JDKSettingControl {
     public LevelSetting(PlatformEventType eventType, String[] levels) {
         this.eventType = Objects.requireNonNull(eventType);
         this.levels = Arrays.asList(Objects.requireNonNull(levels));
+        this.value = levels[0];
     }
 
     @Override
     public String combine(Set<String> values) {
-        int maxIndex = 0;
+        int maxIndex = 0; // index 0 contains the default value
         for (String value : values) {
-            maxIndex = Math.max(maxIndex, indexOf(value));
+            maxIndex = Math.max(maxIndex, levels.indexOf(value));
         }
         return levels.get(maxIndex);
     }
 
     @Override
     public void setValue(String value) {
-        this.value = value;
-        this.eventType.setLevel(indexOf(value));
+        int index = levels.indexOf(value);
+        if (index != -1) {
+            this.eventType.setLevel(index);
+            this.value = value;
+        }
     }
 
     @Override
     public String getValue() {
         return value;
     }
-
-    private int indexOf(String value) {
-        int index = levels.indexOf(value);
-        return index < 0 ? 0 : index;
-    }
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/PeriodSetting.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/PeriodSetting.java
index 05b5a08a3bb71..22fef2691aa91 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/PeriodSetting.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/PeriodSetting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,7 @@
 import jdk.jfr.internal.PlatformEventType;
 import jdk.jfr.internal.Type;
 import jdk.jfr.internal.util.ValueParser;
+import static jdk.jfr.internal.util.ValueParser.MISSING;
 
 @MetadataDefinition
 @Label("Period")
@@ -46,6 +47,7 @@ public final class PeriodSetting extends JDKSettingControl {
     public static final String EVERY_CHUNK = "everyChunk";
     public static final String BEGIN_CHUNK = "beginChunk";
     public static final String END_CHUNK = "endChunk";
+    public static final String DEFAULT_VALUE = EVERY_CHUNK;
     public static final String NAME = "period";
     private final PlatformEventType eventType;
     private String value = EVERY_CHUNK;
@@ -56,7 +58,6 @@ public PeriodSetting(PlatformEventType eventType) {
 
     @Override
     public String combine(Set<String> values) {
-
         boolean beginChunk = false;
         boolean endChunk = false;
         Long min = null;
@@ -74,15 +75,11 @@ public String combine(Set<String> values) {
                 endChunk = true;
                 break;
             default:
-                long l = ValueParser.parseTimespanWithInfinity(value);
-                // Always accept first specified value
-                if (min == null) {
-                    text = value;
-                    min = l;
-                } else {
-                    if (l < min) {
+                long nanos = ValueParser.parseTimespanWithInfinity(value, MISSING);
+                if (nanos != MISSING) {
+                    if (min == null || nanos < min) {
                         text = value;
-                        min = l;
+                        min = nanos;
                     }
                 }
             }
@@ -97,7 +94,7 @@ public String combine(Set<String> values) {
         if (!beginChunk && endChunk) {
             return END_CHUNK;
         }
-        return EVERY_CHUNK; // also default
+        return DEFAULT_VALUE; // "everyChunk" is default
     }
 
     @Override
@@ -113,7 +110,10 @@ public void setValue(String value) {
             eventType.setPeriod(0, false, true);
             break;
         default:
-            long nanos = ValueParser.parseTimespanWithInfinity(value);
+            long nanos = ValueParser.parseTimespanWithInfinity(value, MISSING);
+            if (nanos == MISSING) {
+                return;
+            }
             if (nanos == 0 || nanos == Long.MAX_VALUE) {
                 eventType.setPeriod(nanos, false, false);
             } else {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/StackTraceSetting.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/StackTraceSetting.java
index cfd85a0f240ca..45489ebc691c8 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/StackTraceSetting.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/StackTraceSetting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,8 @@
 
 package jdk.jfr.internal.settings;
 
-import java.util.Objects;
-import java.util.Set;
-
-import jdk.jfr.Description;
 import jdk.jfr.BooleanFlag;
+import jdk.jfr.Description;
 import jdk.jfr.Label;
 import jdk.jfr.MetadataDefinition;
 import jdk.jfr.Name;
@@ -41,30 +38,16 @@
 @Name(Type.SETTINGS_PREFIX + "StackTrace")
 @Description("Record stack traces")
 @BooleanFlag
-public final class StackTraceSetting extends JDKSettingControl {
-    private static final long typeId =  Type.getTypeId(StackTraceSetting.class);
-    private final BooleanValue booleanValue;
-    private final PlatformEventType eventType;
+public final class StackTraceSetting extends BooleanSetting {
+    private static final long typeId = Type.getTypeId(StackTraceSetting.class);
 
     public StackTraceSetting(PlatformEventType eventType, String defaultValue) {
-        this.booleanValue = BooleanValue.valueOf(defaultValue);
-        this.eventType = Objects.requireNonNull(eventType);
-    }
-
-    @Override
-    public String combine(Set<String> values) {
-        return booleanValue.union(values);
-    }
-
-    @Override
-    public void setValue(String value) {
-        booleanValue.setValue(value);
-        eventType.setStackTraceEnabled(booleanValue.getBoolean());
+        super(eventType, defaultValue);
     }
 
     @Override
-    public String getValue() {
-        return booleanValue.getValue();
+    protected void apply(PlatformEventType eventType, boolean value) {
+        eventType.setStackTraceEnabled(value);
     }
 
     public static boolean isType(long typeId) {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThresholdSetting.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThresholdSetting.java
index 1a7138b11cd93..8870417f9dd35 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThresholdSetting.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThresholdSetting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 
 package jdk.jfr.internal.settings;
 
+import static jdk.jfr.internal.util.ValueParser.MISSING;
+
 import java.util.Objects;
 import java.util.Set;
 
@@ -36,14 +38,16 @@
 import jdk.jfr.internal.PlatformEventType;
 import jdk.jfr.internal.Type;
 import jdk.jfr.internal.util.ValueParser;
+
 @MetadataDefinition
 @Label("Threshold")
 @Name(Type.SETTINGS_PREFIX + "Threshold")
 @Description("Record event with duration above or equal to threshold")
 @Timespan
 public final class ThresholdSetting extends JDKSettingControl {
+    public static final String DEFAULT_VALUE = "0 ns";
     private static final long typeId = Type.getTypeId(ThresholdSetting.class);
-    private String value = "0 ns";
+    private String value = DEFAULT_VALUE;
     private final PlatformEventType eventType;
 
     public ThresholdSetting(PlatformEventType eventType) {
@@ -55,26 +59,24 @@ public String combine(Set<String> values) {
         Long min = null;
         String text = null;
         for (String value : values) {
-            long l = ValueParser.parseTimespanWithInfinity(value);
-            // always accept first value
-            if (min == null) {
-                min = l;
-                text = value;
-            } else {
-                if (l < min) {
+            long nanos = ValueParser.parseTimespanWithInfinity(value, MISSING);
+            if (nanos != MISSING) {
+                if (min == null || nanos < min) {
                     text = value;
-                    min = l;
+                    min = nanos;
                 }
             }
         }
-        return text == null ? "0 ns" : text;
+        return Objects.requireNonNullElse(text, DEFAULT_VALUE);
     }
 
     @Override
     public void setValue(String value) {
-        long l = ValueParser.parseTimespanWithInfinity(value);
-        this.value = value;
-        eventType.setThreshold(l);
+        long nanos = ValueParser.parseTimespanWithInfinity(value, MISSING);
+        if (nanos != MISSING) {
+            eventType.setThreshold(nanos);
+            this.value = value;
+        }
     }
 
     @Override
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottleSetting.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottleSetting.java
index 457502963891f..55757050b80fd 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottleSetting.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottleSetting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, Datadog, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -26,6 +26,9 @@
 
 package jdk.jfr.internal.settings;
 
+import static jdk.jfr.internal.util.TimespanUnit.SECONDS;
+import static jdk.jfr.internal.util.TimespanUnit.MILLISECONDS;
+
 import java.util.Objects;
 import java.util.Set;
 
@@ -34,17 +37,20 @@
 import jdk.jfr.MetadataDefinition;
 import jdk.jfr.Name;
 import jdk.jfr.internal.PlatformEventType;
+import jdk.jfr.internal.Throttle;
 import jdk.jfr.internal.Type;
+import jdk.jfr.internal.util.Rate;
+import jdk.jfr.internal.util.TimespanUnit;
+import jdk.jfr.internal.util.Utils;
 
 @MetadataDefinition
 @Label("Event Emission Throttle")
 @Description("Throttles the emission rate for an event")
 @Name(Type.SETTINGS_PREFIX + "Throttle")
 public final class ThrottleSetting extends JDKSettingControl {
-    static final String OFF_TEXT = "off";
-    private static final long OFF = -2;
-    private String value = "0/s";
+    public static final String DEFAULT_VALUE = Throttle.DEFAULT;
     private final PlatformEventType eventType;
+    private String value = DEFAULT_VALUE;
 
     public ThrottleSetting(PlatformEventType eventType) {
        this.eventType = Objects.requireNonNull(eventType);
@@ -52,75 +58,51 @@ public ThrottleSetting(PlatformEventType eventType) {
 
     @Override
     public String combine(Set<String> values) {
-        long max = OFF;
-        String text = "off";
+        Rate max = null;
+        String text = null;
         for (String value : values) {
-            long l = parseValueSafe(value);
-            if (l > max) {
-                text = value;
-                max = l;
+            Rate rate = Rate.of(value);
+            if (rate != null) {
+                if (max == null || rate.isHigher(max)) {
+                    text = value;
+                    max = rate;
+                }
             }
         }
-        return text;
+        // "off" is default
+        return Objects.requireNonNullElse(text, DEFAULT_VALUE);
     }
 
-    private static long parseValueSafe(String s) {
-        long value = 0L;
-        try {
-            value = parseThrottleValue(s);
-        } catch (NumberFormatException nfe) {
+    @Override
+    public void setValue(String value) {
+        if ("off".equals(value)) {
+            eventType.setThrottle(-2, 1000);
+            this.value = value;
+            return;
         }
-        return value;
-    }
 
-    @Override
-    public void setValue(String s) {
-        long size = 0;
-        long millis = 1000;
-        try {
-            size = parseThrottleValue(s);
-            millis = parseThrottleTimeUnit(s);
-            this.value = s;
-        } catch (NumberFormatException nfe) {
+        Rate rate = Rate.of(value);
+        if (rate != null) {
+            long millis = 1000;
+            long samples = rate.amount();
+            TimespanUnit unit = rate.unit();
+            // if unit is more than 1 s, set millis
+            if (unit.nanos > SECONDS.nanos) {
+                millis = unit.nanos / MILLISECONDS.nanos;
+            }
+            // if unit is less than 1 s, scale samples
+            if (unit.nanos < SECONDS.nanos) {
+                long perSecond = SECONDS.nanos / unit.nanos;
+                samples *= Utils.multiplyOverflow(samples, perSecond, Long.MAX_VALUE);
+            }
+            eventType.setThrottle(samples, millis);
+            this.value = value;
         }
-        eventType.setThrottle(size, millis);
     }
 
     @Override
     public String getValue() {
         return value;
     }
-
-    private static long parseThrottleValue(String s) {
-        if (s.equals(OFF_TEXT)) {
-            return OFF;
-        }
-        String parsedValue = parseThrottleString(s, true);
-        long normalizedValue = 0;
-        try {
-            normalizedValue = ThrottleUnit.normalizeValueAsMillis(Long.parseLong(parsedValue), s);
-        } catch (NumberFormatException nfe) {
-            throwThrottleNumberFormatException(s);
-        }
-        return normalizedValue;
-    }
-
-    private static long parseThrottleTimeUnit(String s) {
-        return ThrottleUnit.asMillis(s);
-    }
-
-    // Expected input format is "x/y" where x is a non-negative long
-    // and y is a time unit. Split the string at the delimiter.
-    static String parseThrottleString(String s, boolean value) {
-        String[] split = s.split("/");
-        if (split.length != 2) {
-            throwThrottleNumberFormatException(s);
-        }
-        return value ? split[0].trim() : split[1].trim();
-    }
-
-    private static void throwThrottleNumberFormatException(String s) {
-        throw new NumberFormatException("'" + s + "' is not valid. Should be a non-negative numeric value followed by a delimiter. i.e. '/', and then followed by a unit e.g. 100/s.");
-    }
 }
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottleUnit.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottleUnit.java
deleted file mode 100644
index ec2fafc7656ae..0000000000000
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottleUnit.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, Datadog, 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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-package jdk.jfr.internal.settings;
-
-import java.util.concurrent.TimeUnit;
-
-enum ThrottleUnit {
-        NANOSECONDS("ns", TimeUnit.SECONDS.toNanos(1), TimeUnit.SECONDS.toMillis(1)),
-        MICROSECONDS("us", TimeUnit.SECONDS.toNanos(1) / 1000, TimeUnit.SECONDS.toMillis(1)),
-        MILLISECONDS("ms", TimeUnit.SECONDS.toMillis(1), TimeUnit.SECONDS.toMillis(1)),
-        SECONDS("s", 1, TimeUnit.SECONDS.toMillis(1)),
-        MINUTES("m", 1, TimeUnit.MINUTES.toMillis(1)),
-        HOUR("h", 1, TimeUnit.HOURS.toMillis(1)),
-        DAY("d", 1, TimeUnit.DAYS.toMillis(1));
-
-        private final String text;
-        private final long factor;
-        private final long millis;
-
-        ThrottleUnit(String t, long factor, long millis) {
-            this.text = t;
-            this.factor = factor;
-            this.millis = millis;
-        }
-
-        private static ThrottleUnit parse(String s) {
-            if (s.equals(ThrottleSetting.OFF_TEXT)) {
-                return MILLISECONDS;
-            }
-            return unit(ThrottleSetting.parseThrottleString(s, false));
-        }
-
-        private static ThrottleUnit unit(String s) {
-            if (s.endsWith("ns") || s.endsWith("us") || s.endsWith("ms")) {
-                return value(s.substring(s.length() - 2));
-            }
-            if (s.endsWith("s") || s.endsWith("m") || s.endsWith("h") || s.endsWith("d")) {
-                return value(s.substring(s.length() - 1));
-            }
-            throw new NumberFormatException("'" + s + "' is not a valid time unit.");
-        }
-
-        private static ThrottleUnit value(String s) {
-            for (ThrottleUnit t : values()) {
-                if (t.text.equals(s)) {
-                    return t;
-                }
-            }
-            throw new NumberFormatException("'" + s + "' is not a valid time unit.");
-        }
-
-        static long asMillis(String s) {
-            return parse(s).millis;
-        }
-
-        static long normalizeValueAsMillis(long value, String s) {
-            return value * parse(s).factor;
-        }
-    }
\ No newline at end of file
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/BooleanValue.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Rate.java
similarity index 50%
rename from src/jdk.jfr/share/classes/jdk/jfr/internal/settings/BooleanValue.java
rename to src/jdk.jfr/share/classes/jdk/jfr/internal/util/Rate.java
index d8f46d76787cd..f32436a5e0feb 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/BooleanValue.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Rate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,53 +22,37 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+package jdk.jfr.internal.util;
 
-package jdk.jfr.internal.settings;
+public record Rate(long amount, TimespanUnit unit) {
 
-import java.util.Set;
-
-/**
- * Helper class for settings that use boolean numbers
- *
- */
-final class BooleanValue  {
-    private String value = "false";
-    private boolean booleanValue;
-
-    private BooleanValue(boolean b) {
-        booleanValue = b;
-        value = b ? "true" : "false";
-    }
-
-    public String union(Set<String> values) {
-        for (String v : values) {
-            if ("true".equals(v)) {
-                return "true";
+    public static Rate of(String text) {
+        String[] splitted = text.split("/");
+        if (splitted.length != 2) {
+            return null;
+        }
+        String value = splitted[0].strip();
+        String unit = splitted[1].strip();
+        TimespanUnit tu = TimespanUnit.fromText(unit);
+        if (unit == null) {
+            return null;
+        }
+        try {
+            long v = Long.parseLong(value);
+            if (v >= 0) {
+                return new Rate(v, tu);
             }
+        } catch (NumberFormatException nfe) {
+            // Ignore
         }
-        return "false";
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-        this.booleanValue = Boolean.valueOf(value);
+        return null;
     }
 
-    public final String getValue() {
-        return this.value;
+    public boolean isHigher(Rate that) {
+        return this.inNanos() > that.inNanos();
     }
 
-    public boolean getBoolean() {
-        return booleanValue;
-    }
-
-    public static BooleanValue valueOf(String defaultValue) {
-        if ("true".equals(defaultValue)) {
-            return new BooleanValue(true);
-        }
-        if ("false".equals(defaultValue)) {
-            return new BooleanValue(false);
-        }
-        throw new InternalError("Unknown default value for settings '" + defaultValue + "'");
+    private double inNanos() {
+        return (double) amount / unit.nanos;
     }
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/TimespanUnit.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/TimespanUnit.java
new file mode 100644
index 0000000000000..9026f59b68b88
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/TimespanUnit.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package jdk.jfr.internal.util;
+
+public enum TimespanUnit {
+    NANOSECONDS ("ns",                           1L, 1000),
+    MICROSECONDS("us",                        1000L, 1000),
+    MILLISECONDS("ms",                   1_000_000L, 1000),
+    SECONDS     ("s",                1_000_000_000L,   60),
+    MINUTES     ("m",           60 * 1_000_000_000L,   60),
+    HOURS       ("h",      60 * 60 * 1_000_000_000L,   24),
+    DAYS        ("d", 24 * 60 * 60 * 1_000_000_000L,    7);
+    public final String text;
+    public final long nanos;
+    public final int size;
+    TimespanUnit(String text, long nanos, int size) {
+        this.text = text;
+        this.nanos = nanos;
+        this.size = size;
+    }
+
+    public static TimespanUnit fromText(String text) {
+        for (TimespanUnit tu : values()) {
+            // Case-sensitive by design
+            if (tu.text.equals(text)) {
+                return tu;
+            }
+        }
+        return null;
+    }
+}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java
index ae83727096a2a..b5ae906c71cb1 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/Utils.java
@@ -430,4 +430,12 @@ public static boolean isJDKClass(Class<?> type) {
         // but only if it is safe and there is a mechanism to register event
         // classes in other modules besides jdk.jfr and java.base.
     }
+
+    public static long multiplyOverflow(long a, long b, long defaultValue) {
+        try {
+            return Math.multiplyExact(a, b);
+        } catch (ArithmeticException ae) {
+            return defaultValue;
+        }
+    }
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ValueFormatter.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ValueFormatter.java
index 8fd47dbf5b3c7..53a11101944fa 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ValueFormatter.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ValueFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,23 +40,6 @@
 import jdk.jfr.consumer.RecordedMethod;
 
 public final class ValueFormatter {
-    private static enum TimespanUnit {
-        NANOSECONDS("ns", 1000),
-        MICROSECONDS("us", 1000),
-        MILLISECONDS("ms", 1000),
-        SECONDS("s", 60), MINUTES("m", 60),
-        HOURS("h", 24),
-        DAYS("d", 7);
-
-        private final String text;
-        private final long amount;
-
-        TimespanUnit(String unit, long amount) {
-            this.text = unit;
-            this.amount = amount;
-        }
-    }
-
     private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("HH:mm:ss");
     private static final Duration MICRO_SECOND = Duration.ofNanos(1_000);
     private static final Duration SECOND = Duration.ofSeconds(1);
@@ -82,7 +65,7 @@ public static String formatTimespan(Duration dValue, String separation) {
         TimespanUnit result = TimespanUnit.NANOSECONDS;
         for (TimespanUnit unit : TimespanUnit.values()) {
             result = unit;
-            long amount = unit.amount;
+            long amount = unit.size;
             if (result == TimespanUnit.DAYS || value < amount || value % amount != 0) {
                 break;
             }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ValueParser.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ValueParser.java
index 730c83daaae67..e4482c9236887 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ValueParser.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ValueParser.java
@@ -32,7 +32,16 @@
 import static java.util.concurrent.TimeUnit.SECONDS;
 
 public final class ValueParser {
-    private static final String INFINITY = "infinity";
+    public static final String INFINITY = "infinity";
+    public static final long MISSING = Long.MIN_VALUE;
+
+    public static long parseTimespanWithInfinity(String s, long defaultValue) {
+        try {
+            return parseTimespanWithInfinity(s);
+        } catch (NumberFormatException nfe) {
+            return defaultValue;
+        }
+    }
 
     public static long parseTimespanWithInfinity(String s) {
         if (INFINITY.equals(s)) {
diff --git a/test/jdk/jdk/jfr/api/settings/TestSettingControl.java b/test/jdk/jdk/jfr/api/settings/TestSettingControl.java
new file mode 100644
index 0000000000000..5543953482d63
--- /dev/null
+++ b/test/jdk/jdk/jfr/api/settings/TestSettingControl.java
@@ -0,0 +1,319 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+package jdk.jfr.api.settings;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+import jdk.jfr.EventType;
+import jdk.jfr.FlightRecorder;
+import jdk.jfr.Recording;
+import jdk.jfr.SettingDescriptor;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordingFile;
+
+/**
+ * @test
+ * @summary Tests that methods on all SettingControls have expected behavior.
+ * @key jfr
+ * @requires vm.hasJFR
+ * @library /test/lib /test/jdk
+ * @run main/othervm jdk.jfr.api.settings.TestSettingControl
+ */
+public class TestSettingControl {
+    record SettingTest(String setting, String defaultValue, String event, List<String> exampleValues) {
+        public String eventSettingName() {
+            return event + "#" + setting;
+        }
+    }
+
+    // Example values should be listed in precedence order with the lowest precedence first.
+    static List<SettingTest> SETTING_TESTS = List.of(
+        new SettingTest("enabled", "false", "jdk.JavaMonitorWait",List.of("false", "true")),
+        new SettingTest("stackTrace", "true", "jdk.JavaMonitorWait", List.of("false", "true")),
+        new SettingTest("threshold", "0 ns", "jdk.JavaMonitorWait", List.of("infinity", "10 ms", "0 ns")),
+        new SettingTest("level", "forRemoval", "jdk.DeprecatedInvocation", List.of("off", "forRemoval")),
+        new SettingTest("period", "everyChunk", "jdk.ExceptionStatistics", List.of("everyChunk", "60 s", "1 s")),
+        new SettingTest("cutoff", "infinity", "jdk.OldObjectSample", List.of("0 ms", "1 s", "infinity")),
+        new SettingTest("throttle", "off", "jdk.ObjectAllocationSample", List.of("off", "100/s", "10/ms"))
+    );
+
+    public static void main(String... args) throws Exception {
+        testTesting();
+        testDefault();
+        testDefaultWithInvalid();
+        testPrecedence();
+        testPrecedenceWithInvalid();
+    }
+
+    // Ensure that all known SettingControl/types are tested at least once
+    private static void testTesting() throws Exception {
+        Set<String> foundSettings = new HashSet<>();
+        for (EventType eventType : allEventTypes()) {
+            for (SettingDescriptor s : eventType.getSettingDescriptors()) {
+                foundSettings.add(s.getName());
+            }
+        }
+        for (SettingTest st : SETTING_TESTS) {
+            foundSettings.remove(st.setting());
+        }
+        if (!foundSettings.isEmpty()) {
+            throw new Exception("All event SettingControls should be tested. Missing test for " + foundSettings);
+        }
+    }
+
+    // Ensure that the default values for all SettingControls are correct
+    private static void testDefault() throws Exception {
+        for (SettingTest settingTest : SETTING_TESTS) {
+            SettingDescriptor s = findSettingDescriptor(settingTest);
+            if (!settingTest.defaultValue().equals(s.getDefaultValue())) {
+                String message = "Incorrect default value " + quote(s.getDefaultValue());
+                message += " for setting " + settingTest.eventSettingName() + ". ";
+                message += "Expected " + quote(settingTest.defaultValue());
+                throw new Exception(message);
+            }
+        }
+    }
+
+    // Ensure that default settings are used if an invalid setting is specified.
+    private static void testDefaultWithInvalid() throws Exception {
+        Map<String, String> settings = createEnabledMap();
+        for (SettingTest settingTest : SETTING_TESTS) {
+            settings.put(settingTest.eventSettingName(), "%#&2672g");
+        }
+        Map<String, String> result = check("testDefaultWithInvalid", List.of(settings));
+        for (var entry : new ArrayList<>(result.entrySet())) {
+            String key = entry.getKey();
+            String removed = result.remove(key);
+            if (removed == null) {
+                throw new Exception("Expected setting " + quote(key) + " to exist");
+            }
+            String setting = key.substring(key.indexOf("#") + 1);
+            SettingTest st = findSettingTest(setting);
+            if (st == null) {
+                throw new Exception("Found unexpected setting " + quote(key));
+            }
+            if (!removed.equals(st.defaultValue())) {
+                String message = "Expected default value " + quote(st.defaultValue());
+                message += " for setting " + quote(setting) + " when";
+                message += " an invalid settings value was specified";
+                throw new Exception(message);
+            }
+        }
+        if (!result.isEmpty()) {
+            throw new Exception("Found unexpected setting when testing preserved default");
+        }
+    }
+
+    // Only enabled events will use settings
+    private static Map<String, String> createEnabledMap() {
+        Map<String, String> settings = new TreeMap<>();
+        for (SettingTest settingTest : SETTING_TESTS) {
+            settings.put(settingTest.event + "#enabled", "true");
+        }
+        return settings;
+    }
+
+    // Ensure that precedence are respected when multiple settings are specified
+    private static void testPrecedence() throws Exception {
+        testPrecedence("testPrecedence");
+    }
+
+    // Ensure that precedence are respected when an incorrect setting is used
+    private static void testPrecedenceWithInvalid() throws Exception {
+        testPrecedence("testPrecedenceWithInvalid");
+    }
+
+    // * * * HELPER METHODS * * *
+
+    private static void testPrecedence(String testName) throws Exception {
+        List<Map<String, String>> settingsList = new ArrayList<>();
+        int maxExamples = 0;
+        for (SettingTest t : SETTING_TESTS) {
+            maxExamples = Math.max(t.exampleValues().size(), maxExamples);
+        }
+        for (int i = 0; i < maxExamples; i++) {
+            Map<String, String> settings = createEnabledMap();
+            for (SettingTest settingTest : SETTING_TESTS) {
+                List<String> examples = settingTest.exampleValues();
+                String name = settingTest.eventSettingName();
+                if (i < examples.size()) {
+                    settings.put(name, examples.get(i));
+                }
+                // Insert the invalid setting first
+                if (testName.contains("Invalid") && i == 0) {
+                    settings.put(name, "%#&2672g");
+                }
+            }
+            settingsList.add(settings);
+        }
+        Map<String, String> results = check(testName, settingsList);
+        Map<String, String> reversed = check(testName + "-reversed", settingsList.reversed());
+        if (!reversed.equals(results)) {
+            throw new Exception("Active settings should not depend on the order event settings are applied");
+        }
+        for (SettingTest t : SETTING_TESTS) {
+            String expected = t.exampleValues().get(t.exampleValues().size() - 1);
+            String found = results.get(t.eventSettingName());
+            if (!expected.equals(found)) {
+                throw new Exception("Expected " + expected + " to be used with setting " + quote(t.setting()) + ", not " + quote(found));
+            }
+        }
+    }
+
+    private static Map<String, String> check(String testName, List<Map<String, String>> settingsList) throws Exception {
+        System.out.println("*** Check for " + testName + " ****");
+        System.out.println("Input:");
+        int index = 0;
+        for (var settings : settingsList) {
+            System.out.println("Setting[" + index + "] = {");
+            for (var e : settings.entrySet()) {
+                System.out.println("  " + e.getKey() + "=" + e.getValue());
+            }
+            System.out.println("}");
+            index++;
+        }
+        int settingsCount = settingsList.size();
+
+        // Start a recording for each settings
+        List<Recording> recordings = new ArrayList<>();
+        for (int i = 0; i < settingsCount; i++) {
+            Recording r = new Recording();
+            Map<String, String> settings = settingsList.get(i);
+            settings.put("jdk.ActiveSetting#enabled", "true");
+            r.setSettings(settings);
+            r.start();
+            recordings.add(r);
+        }
+
+        // Stop all recordings
+        for (Recording r : recordings) {
+            r.stop();
+        }
+
+        // Dump the innermost recording
+        Path p = Path.of("recording.jfr");
+        Recording inner = recordings.get(settingsCount - 1);
+        inner.dump(p);
+
+        // Close all recordings
+        for (Recording r : recordings) {
+            r.close();
+        }
+        System.out.println("Result:");
+        Map<String, String> r = lastSettings(p);
+        for (var e : r.entrySet()) {
+            System.out.println(e.getKey() + "=" + e.getValue());
+        }
+        System.out.println("*************");
+        System.out.println();
+        Files.delete(p);
+        return r;
+    }
+
+    private static SettingTest findSettingTest(String name) throws Exception {
+        for (SettingTest settingTest : SETTING_TESTS) {
+            if (name.equals(settingTest.setting())) {
+                return settingTest;
+            }
+        }
+        return null;
+    }
+
+    private static Map<String, String> lastSettings(Path p) throws Exception {
+        List<RecordedEvent> events = RecordingFile.readAllEvents(p);
+        Instant timestamp = findLastActiveSetting(events);
+        Map<String, String> lastInnerMostSettings = new HashMap<>();
+        for (SettingTest t : SETTING_TESTS) {
+            long id = eventTypeNameToId(t.event());
+            for (RecordedEvent event : events) {
+                if (event.getEventType().getName().equals("jdk.ActiveSetting")) {
+                    if (event.getStartTime().equals(timestamp) && id == event.getLong("id")) {
+                        String name = event.getString("name");
+                        String value = event.getString("value");
+                        if (t.setting.equals(name)) {
+                            String fullName = t.event() + "#" + name;
+                            String previous = lastInnerMostSettings.put(fullName, value);
+                            if (previous != null) {
+                                throw new Exception("Expected only one ActiveSetting event per event setting");
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return lastInnerMostSettings;
+    }
+
+    private static Instant findLastActiveSetting(List<RecordedEvent> events) {
+        Instant lastTimestamp = null;
+        for (RecordedEvent event : events) {
+            if (event.getEventType().getName().equals("jdk.ActiveSetting")) {
+                Instant t = event.getStartTime();
+                if (lastTimestamp == null || t.isBefore(lastTimestamp)) {
+                    lastTimestamp = t;
+                }
+            }
+        }
+        return lastTimestamp;
+    }
+
+    private static long eventTypeNameToId(String name) throws Exception {
+        for (EventType eventType : allEventTypes()) {
+            if (eventType.getName().equals(name)) {
+                return eventType.getId();
+            }
+        }
+        throw new Exception("Could not find event type with name " + name);
+    }
+
+    private static SettingDescriptor findSettingDescriptor(SettingTest settingTest) throws Exception {
+        for (EventType eventType : allEventTypes()) {
+            if (eventType.getName().equals(settingTest.event())) {
+                for (SettingDescriptor s : eventType.getSettingDescriptors()) {
+                    if (settingTest.setting().equals(s.getName())) {
+                        return s;
+                    }
+                }
+            }
+        }
+        throw new Exception("Could not find setting with name " + settingTest.event() + "#" + settingTest.setting());
+    }
+
+    private static List<EventType> allEventTypes() {
+        return FlightRecorder.getFlightRecorder().getEventTypes();
+    }
+
+    private static String quote(String text) {
+        return "'" + text + "'";
+    }
+}

From 1cb27f7e2355ccb911bb274fc004e5bc57fd5dc9 Mon Sep 17 00:00:00 2001
From: Neethu Prasad <nprasad@openjdk.org>
Date: Tue, 30 Jul 2024 14:08:17 +0000
Subject: [PATCH 255/401] 8334230: Optimize C2 classes layout

Reviewed-by: shade, kvn, thartmann
---
 src/hotspot/share/gc/shared/c2/barrierSetC2.hpp | 4 ++--
 src/hotspot/share/libadt/vectset.hpp            | 2 +-
 src/hotspot/share/opto/callnode.hpp             | 4 ++--
 src/hotspot/share/opto/memnode.cpp              | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp b/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp
index d03f416ff689b..c1485c069c83c 100644
--- a/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp
+++ b/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp
@@ -102,10 +102,10 @@ class C2AccessValuePtr: public C2AccessValue {
 class C2Access: public StackObj {
 protected:
   DecoratorSet      _decorators;
-  BasicType         _type;
   Node*             _base;
   C2AccessValuePtr& _addr;
   Node*             _raw_access;
+  BasicType         _type;
   uint8_t           _barrier_data;
 
   void fixup_decorators();
@@ -114,10 +114,10 @@ class C2Access: public StackObj {
   C2Access(DecoratorSet decorators,
            BasicType type, Node* base, C2AccessValuePtr& addr) :
     _decorators(decorators),
-    _type(type),
     _base(base),
     _addr(addr),
     _raw_access(nullptr),
+    _type(type),
     _barrier_data(0)
   {}
 
diff --git a/src/hotspot/share/libadt/vectset.hpp b/src/hotspot/share/libadt/vectset.hpp
index c6ea4490cbf43..eafa60db1fee2 100644
--- a/src/hotspot/share/libadt/vectset.hpp
+++ b/src/hotspot/share/libadt/vectset.hpp
@@ -42,9 +42,9 @@ class VectorSet : public AnyObj {
 
   // Used 32-bit words
   uint       _size;
-  uint32_t*  _data;
   // Allocated words
   uint       _data_size;
+  uint32_t*  _data;
   Arena*     _set_arena;
   ReallocMark _nesting; // Safety checks for arena reallocation
 
diff --git a/src/hotspot/share/opto/callnode.hpp b/src/hotspot/share/opto/callnode.hpp
index 818640a6f6575..120bb112ec56b 100644
--- a/src/hotspot/share/opto/callnode.hpp
+++ b/src/hotspot/share/opto/callnode.hpp
@@ -754,18 +754,18 @@ class CallJavaNode : public CallNode {
   virtual bool cmp( const Node &n ) const;
   virtual uint size_of() const; // Size is bigger
 
+  ciMethod* _method;               // Method being direct called
   bool    _optimized_virtual;
   bool    _method_handle_invoke;
   bool    _override_symbolic_info; // Override symbolic call site info from bytecode
-  ciMethod* _method;               // Method being direct called
   bool    _arg_escape;             // ArgEscape in parameter list
 public:
   CallJavaNode(const TypeFunc* tf , address addr, ciMethod* method)
     : CallNode(tf, addr, TypePtr::BOTTOM),
+      _method(method),
       _optimized_virtual(false),
       _method_handle_invoke(false),
       _override_symbolic_info(false),
-      _method(method),
       _arg_escape(false)
   {
     init_class_id(Class_CallJava);
diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp
index 438dc5c1f64e6..c7f0fb9fc3202 100644
--- a/src/hotspot/share/opto/memnode.cpp
+++ b/src/hotspot/share/opto/memnode.cpp
@@ -2723,13 +2723,13 @@ uint StoreNode::hash() const {
 //
 class ArrayPointer {
 private:
-  const bool _is_valid;          // The parsing succeeded
   const Node* _pointer;          // The final pointer to the position in the array
   const Node* _base;             // Base address of the array
   const jlong _constant_offset;  // Sum of collected constant offsets
   const Node* _int_offset;       // (optional) Offset behind LShiftL and ConvI2L
-  const jint  _int_offset_shift; // (optional) Shift value for int_offset
   const GrowableArray<Node*>* _other_offsets; // List of other AddP offsets
+  const jint _int_offset_shift; // (optional) Shift value for int_offset
+  const bool _is_valid;          // The parsing succeeded
 
   ArrayPointer(const bool is_valid,
                const Node* pointer,
@@ -2738,13 +2738,13 @@ class ArrayPointer {
                const Node* int_offset,
                const jint int_offset_shift,
                const GrowableArray<Node*>* other_offsets) :
-      _is_valid(is_valid),
       _pointer(pointer),
       _base(base),
       _constant_offset(constant_offset),
       _int_offset(int_offset),
+      _other_offsets(other_offsets),
       _int_offset_shift(int_offset_shift),
-      _other_offsets(other_offsets)
+      _is_valid(is_valid)
   {
     assert(_pointer != nullptr, "must always have pointer");
     assert(is_valid == (_base != nullptr), "have base exactly if valid");

From 2c9fd9016f4675448a62380ff2b86533020e690f Mon Sep 17 00:00:00 2001
From: Vanitha B P <Vanitha.b.p@oracle.com>
Date: Tue, 30 Jul 2024 15:04:57 +0000
Subject: [PATCH 256/401] 8336315:
 tools/jpackage/windows/WinChildProcessTest.java Failed: Check is calculator
 process is alive

Reviewed-by: asemenyuk, almatvee
---
 .../jpackage/apps/ChildProcessAppLauncher.java  | 17 +++++++++++------
 .../jpackage/windows/WinChildProcessTest.java   | 17 ++++++++---------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/test/jdk/tools/jpackage/apps/ChildProcessAppLauncher.java b/test/jdk/tools/jpackage/apps/ChildProcessAppLauncher.java
index 11be90bc45622..b599488b563f1 100644
--- a/test/jdk/tools/jpackage/apps/ChildProcessAppLauncher.java
+++ b/test/jdk/tools/jpackage/apps/ChildProcessAppLauncher.java
@@ -26,12 +26,17 @@
 import java.nio.file.Path;
 
 public class ChildProcessAppLauncher {
-
-    public static void main(String[] args) throws IOException {
-            String calcPath = Path.of(System.getenv("SystemRoot"), "system32", "calc.exe").toString();
-            ProcessBuilder processBuilder = new ProcessBuilder(calcPath);
+    public static void main(String[] args) throws IOException, InterruptedException {
+        if (args.length == 1 && "noexit".equals(args[0])) {
+            var lock = new Object();
+            synchronized (lock) {
+                lock.wait();
+            }
+        } else {
+            var childPath = System.getProperty("jpackage.app-path"); // get the path to the current jpackage app launcher
+            ProcessBuilder processBuilder = new ProcessBuilder(childPath, "noexit"); //ChildProcessAppLauncher acts as third party app
             Process process = processBuilder.start();
-            System.out.println("Calc id=" + process.pid());
-            System.exit(0);
+            System.out.println("Child id=" + process.pid());
+        }
     }
 }
diff --git a/test/jdk/tools/jpackage/windows/WinChildProcessTest.java b/test/jdk/tools/jpackage/windows/WinChildProcessTest.java
index 2928f7f1c5ffe..4fa7581d2b5c9 100644
--- a/test/jdk/tools/jpackage/windows/WinChildProcessTest.java
+++ b/test/jdk/tools/jpackage/windows/WinChildProcessTest.java
@@ -53,7 +53,7 @@ public class WinChildProcessTest {
 
     @Test
     public static void test() throws Throwable {
-        long calcPid = 0;
+        long childPid = 0;
         try {
             JPackageCommand cmd = JPackageCommand
                     .helloAppImage(TEST_APP_JAVA + "*Hello");
@@ -68,21 +68,20 @@ public static void test() throws Throwable {
                     .execute(0).getOutput();
             String pidStr = output.get(0);
 
-            // parse calculator PID
-            calcPid = Long.parseLong(pidStr.split("=", 2)[1]);
+            // parse child PID
+            childPid = Long.parseLong(pidStr.split("=", 2)[1]);
 
             // Check whether the termination of third party application launcher
             // also terminating the launched third party application
             // If third party application is not terminated the test is
             // successful else failure
-            Optional<ProcessHandle> processHandle = ProcessHandle.of(calcPid);
+            Optional<ProcessHandle> processHandle = ProcessHandle.of(childPid);
             boolean isAlive = processHandle.isPresent()
                     && processHandle.get().isAlive();
-            System.out.println("Is Alive " + isAlive);
-            TKit.assertTrue(isAlive, "Check is calculator process is alive");
+            TKit.assertTrue(isAlive, "Check is child process is alive");
         } finally {
-            // Kill only a specific calculator instance
-            Runtime.getRuntime().exec("taskkill /F /PID " + calcPid);
+            // Kill only a specific child instance
+            Runtime.getRuntime().exec("taskkill /F /PID " + childPid);
         }
     }
-}
\ No newline at end of file
+}

From a91f9ba84906dae10b050e15307ba0f0f05af3e4 Mon Sep 17 00:00:00 2001
From: Gerard Ziemski <gziemski@openjdk.org>
Date: Tue, 30 Jul 2024 15:22:25 +0000
Subject: [PATCH 257/401] 8301403: Eliminate memory allocations in
 JVMFlag::printFlags during signal handling

Reviewed-by: stuefe, jsjolen, dholmes
---
 src/hotspot/share/runtime/flags/jvmFlag.cpp   | 37 ++++++++++---------
 src/hotspot/share/utilities/bitMap.cpp        |  5 ---
 src/hotspot/share/utilities/bitMap.hpp        | 18 ++++++---
 .../share/utilities/globalDefinitions.hpp     | 10 ++---
 4 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/src/hotspot/share/runtime/flags/jvmFlag.cpp b/src/hotspot/share/runtime/flags/jvmFlag.cpp
index 1917cd4b1980d..c465a942e5c68 100644
--- a/src/hotspot/share/runtime/flags/jvmFlag.cpp
+++ b/src/hotspot/share/runtime/flags/jvmFlag.cpp
@@ -31,6 +31,7 @@
 #include "runtime/flags/jvmFlagAccess.hpp"
 #include "runtime/flags/jvmFlagLookup.hpp"
 #include "runtime/globals_extension.hpp"
+#include "utilities/bitMap.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/stringUtils.hpp"
 
@@ -692,7 +693,7 @@ void JVMFlag::printFlags(outputStream* out, bool withComments, bool printRanges,
   //       called as part of error reporting, so handle native OOMs gracefully.
 
   // The last entry is the null entry.
-  const size_t length = JVMFlag::numFlags - 1;
+  constexpr size_t length = (sizeof(flagTable) / sizeof(JVMFlag)) - 1;
 
   // Print
   if (!printRanges) {
@@ -701,26 +702,26 @@ void JVMFlag::printFlags(outputStream* out, bool withComments, bool printRanges,
     out->print_cr("[Global flags ranges]");
   }
 
-  // Sort
-  JVMFlag** array = NEW_C_HEAP_ARRAY_RETURN_NULL(JVMFlag*, length, mtArguments);
-  if (array != nullptr) {
-    for (size_t i = 0; i < length; i++) {
-      array[i] = &flagTable[i];
-    }
-    qsort(array, length, sizeof(JVMFlag*), compare_flags);
-
+  BitMap::bm_word_t iteratorArray[BitMap::calc_size_in_words(length)];
+  BitMapView iteratorMarkers(iteratorArray, length);
+  iteratorMarkers.clear_range(0, length);
+  // Print the flag with best sort value, then mark it.
+  for (size_t j = 0; j < length; j++) {
+    JVMFlag* bestFlag = nullptr;
+    size_t bestFlagIndex = 0;
     for (size_t i = 0; i < length; i++) {
-      if (array[i]->is_unlocked() && !(skipDefaults && array[i]->is_default())) {
-        array[i]->print_on(out, withComments, printRanges);
+      const bool skip = (skipDefaults && flagTable[i].is_default());
+      const bool visited = iteratorMarkers.at(i);
+      if (!visited && flagTable[i].is_unlocked() && !skip) {
+        if ((bestFlag == nullptr) || (strcmp(bestFlag->name(), flagTable[i].name()) > 0)) {
+          bestFlag = &flagTable[i];
+          bestFlagIndex = i;
+        }
       }
     }
-    FREE_C_HEAP_ARRAY(JVMFlag*, array);
-  } else {
-    // OOM? Print unsorted.
-    for (size_t i = 0; i < length; i++) {
-      if (flagTable[i].is_unlocked() && !(skipDefaults && flagTable[i].is_default())) {
-        flagTable[i].print_on(out, withComments, printRanges);
-      }
+    if (bestFlag != nullptr) {
+      bestFlag->print_on(out, withComments, printRanges);
+      iteratorMarkers.at_put(bestFlagIndex, true);
     }
   }
 }
diff --git a/src/hotspot/share/utilities/bitMap.cpp b/src/hotspot/share/utilities/bitMap.cpp
index 9bd5c8e000643..a07807070918f 100644
--- a/src/hotspot/share/utilities/bitMap.cpp
+++ b/src/hotspot/share/utilities/bitMap.cpp
@@ -197,11 +197,6 @@ bm_word_t* CHeapBitMap::reallocate(bm_word_t* map, size_t old_size_in_words, siz
 }
 
 #ifdef ASSERT
-void BitMap::verify_size(idx_t size_in_bits) {
-  assert(size_in_bits <= max_size_in_bits(),
-         "out of bounds: " SIZE_FORMAT, size_in_bits);
-}
-
 void BitMap::verify_index(idx_t bit) const {
   assert(bit < _size,
          "BitMap index out of bounds: " SIZE_FORMAT " >= " SIZE_FORMAT,
diff --git a/src/hotspot/share/utilities/bitMap.hpp b/src/hotspot/share/utilities/bitMap.hpp
index 0d592de7cd077..5db12badbc95e 100644
--- a/src/hotspot/share/utilities/bitMap.hpp
+++ b/src/hotspot/share/utilities/bitMap.hpp
@@ -67,16 +67,16 @@ class BitMap {
  protected:
   // The maximum allowable size of a bitmap, in words or bits.
   // Limit max_size_in_bits so aligning up to a word boundary never overflows.
-  static idx_t max_size_in_words() { return raw_to_words_align_down(~idx_t(0)); }
-  static idx_t max_size_in_bits() { return max_size_in_words() * BitsPerWord; }
+  constexpr static idx_t max_size_in_words() { return raw_to_words_align_down(~idx_t(0)); }
+  constexpr static idx_t max_size_in_bits() { return max_size_in_words() * BitsPerWord; }
 
   // Assumes relevant validity checking for bit has already been done.
-  static idx_t raw_to_words_align_up(idx_t bit) {
+  constexpr static idx_t raw_to_words_align_up(idx_t bit) {
     return raw_to_words_align_down(bit + (BitsPerWord - 1));
   }
 
   // Assumes relevant validity checking for bit has already been done.
-  static idx_t raw_to_words_align_down(idx_t bit) {
+  constexpr static idx_t raw_to_words_align_down(idx_t bit) {
     return bit >> LogBitsPerWord;
   }
 
@@ -195,7 +195,7 @@ class BitMap {
   void pretouch();
 
   // Accessing
-  static idx_t calc_size_in_words(size_t size_in_bits) {
+  constexpr static idx_t calc_size_in_words(size_t size_in_bits) {
     verify_size(size_in_bits);
     return raw_to_words_align_up(size_in_bits);
   }
@@ -257,7 +257,13 @@ class BitMap {
   // Verification.
 
   // Verify size_in_bits does not exceed max_size_in_bits().
-  static void verify_size(idx_t size_in_bits) NOT_DEBUG_RETURN;
+  constexpr static void verify_size(idx_t size_in_bits) {
+#ifdef ASSERT
+    assert(size_in_bits <= max_size_in_bits(),
+           "out of bounds: " SIZE_FORMAT, size_in_bits);
+#endif
+  }
+
   // Verify bit is less than size().
   void verify_index(idx_t bit) const NOT_DEBUG_RETURN;
   // Verify bit is not greater than size().
diff --git a/src/hotspot/share/utilities/globalDefinitions.hpp b/src/hotspot/share/utilities/globalDefinitions.hpp
index 74817a35e7706..b7be6dc04bfa5 100644
--- a/src/hotspot/share/utilities/globalDefinitions.hpp
+++ b/src/hotspot/share/utilities/globalDefinitions.hpp
@@ -222,9 +222,9 @@ FORBID_C_FUNCTION(void* reallocf(void *ptr, size_t size), "don't use");
 const int LogBytesPerShort   = 1;
 const int LogBytesPerInt     = 2;
 #ifdef _LP64
-const int LogBytesPerWord    = 3;
+constexpr int LogBytesPerWord    = 3;
 #else
-const int LogBytesPerWord    = 2;
+constexpr int LogBytesPerWord    = 2;
 #endif
 const int LogBytesPerLong    = 3;
 
@@ -233,16 +233,16 @@ const int BytesPerInt        = 1 << LogBytesPerInt;
 const int BytesPerWord       = 1 << LogBytesPerWord;
 const int BytesPerLong       = 1 << LogBytesPerLong;
 
-const int LogBitsPerByte     = 3;
+constexpr int LogBitsPerByte     = 3;
 const int LogBitsPerShort    = LogBitsPerByte + LogBytesPerShort;
 const int LogBitsPerInt      = LogBitsPerByte + LogBytesPerInt;
-const int LogBitsPerWord     = LogBitsPerByte + LogBytesPerWord;
+constexpr int LogBitsPerWord     = LogBitsPerByte + LogBytesPerWord;
 const int LogBitsPerLong     = LogBitsPerByte + LogBytesPerLong;
 
 const int BitsPerByte        = 1 << LogBitsPerByte;
 const int BitsPerShort       = 1 << LogBitsPerShort;
 const int BitsPerInt         = 1 << LogBitsPerInt;
-const int BitsPerWord        = 1 << LogBitsPerWord;
+constexpr int BitsPerWord        = 1 << LogBitsPerWord;
 const int BitsPerLong        = 1 << LogBitsPerLong;
 
 const int WordAlignmentMask  = (1 << LogBytesPerWord) - 1;

From 6154a2129ba505b7163a1998792296827a056750 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Tue, 30 Jul 2024 17:41:38 +0000
Subject: [PATCH 258/401] 8336032: Enforce immutability of Lists used by
 ClassFile API

Reviewed-by: asotona
---
 .../classes/java/lang/classfile/AttributedElement.java |  5 +++--
 .../classes/java/lang/classfile/ClassSignature.java    |  2 +-
 .../classes/java/lang/classfile/CompoundElement.java   |  3 ++-
 .../internal/classfile/impl/AbstractUnboundModel.java  |  5 +++--
 .../jdk/internal/classfile/impl/BoundAttribute.java    |  4 ++--
 .../internal/classfile/impl/BufferedCodeBuilder.java   |  2 +-
 .../internal/classfile/impl/BufferedFieldBuilder.java  |  2 +-
 .../internal/classfile/impl/BufferedMethodBuilder.java |  2 +-
 .../jdk/internal/classfile/impl/StackMapDecoder.java   |  4 ++++
 .../jdk/internal/classfile/impl/UnboundAttribute.java  | 10 +++++++++-
 .../internal/classfile/impl/verifier/VerifierImpl.java |  3 ++-
 11 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/classfile/AttributedElement.java b/src/java.base/share/classes/java/lang/classfile/AttributedElement.java
index 63b2f1e03a939..d66806ca93b43 100644
--- a/src/java.base/share/classes/java/lang/classfile/AttributedElement.java
+++ b/src/java.base/share/classes/java/lang/classfile/AttributedElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 package java.lang.classfile;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -83,6 +84,6 @@ default <T extends Attribute<T>> List<T> findAttributes(AttributeMapper<T> attr)
                 list.add(t);
             }
         }
-        return list;
+        return Collections.unmodifiableList(list);
     }
 }
diff --git a/src/java.base/share/classes/java/lang/classfile/ClassSignature.java b/src/java.base/share/classes/java/lang/classfile/ClassSignature.java
index 852d5f9baf4f1..5c55950547eb6 100644
--- a/src/java.base/share/classes/java/lang/classfile/ClassSignature.java
+++ b/src/java.base/share/classes/java/lang/classfile/ClassSignature.java
@@ -76,7 +76,7 @@ public static ClassSignature of(List<Signature.TypeParam> typeParameters,
                                     Signature.ClassTypeSig superclassSignature,
                                     Signature.ClassTypeSig... superinterfaceSignatures) {
         return new SignaturesImpl.ClassSignatureImpl(
-                requireNonNull(typeParameters),
+                List.copyOf(requireNonNull(typeParameters)),
                 requireNonNull(superclassSignature),
                 List.of(superinterfaceSignatures));
     }
diff --git a/src/java.base/share/classes/java/lang/classfile/CompoundElement.java b/src/java.base/share/classes/java/lang/classfile/CompoundElement.java
index 12904c9dd596e..9fcf02204cb13 100644
--- a/src/java.base/share/classes/java/lang/classfile/CompoundElement.java
+++ b/src/java.base/share/classes/java/lang/classfile/CompoundElement.java
@@ -25,6 +25,7 @@
 package java.lang.classfile;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Spliterator;
@@ -90,7 +91,7 @@ public void accept(E e) {
                 list.add(e);
             }
         });
-        return list;
+        return Collections.unmodifiableList(list);
     }
 
 }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractUnboundModel.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractUnboundModel.java
index 2926be9dad7dc..9502ff7b246c9 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractUnboundModel.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractUnboundModel.java
@@ -24,6 +24,7 @@
  */
 package jdk.internal.classfile.impl;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
@@ -37,11 +38,11 @@ public abstract sealed class AbstractUnboundModel<E extends ClassFileElement>
         extends AbstractElement
         implements CompoundElement<E>, AttributedElement
         permits BufferedCodeBuilder.Model, BufferedFieldBuilder.Model, BufferedMethodBuilder.Model {
-    private final List<E> elements;
+    final List<E> elements;
     private List<Attribute<?>> attributes;
 
     public AbstractUnboundModel(List<E> elements) {
-        this.elements = elements;
+        this.elements = Collections.unmodifiableList(elements);
     }
 
     @Override
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java
index a0428d9d09d37..d5ed0c14bcef4 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java
@@ -39,6 +39,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Function;
 
@@ -134,7 +135,6 @@ public static List<Attribute<?>> readAttributes(AttributedElement enclosing, Cla
         var filled = new ArrayList<Attribute<?>>(size);
         int p = pos + 2;
         int cfLen = reader.classfileLength();
-        var apo = ((ClassReaderImpl)reader).context().attributesProcessingOption();
         for (int i = 0; i < size; ++i) {
             Utf8Entry name = reader.readEntry(p, Utf8Entry.class);
             int len = reader.readInt(p + 2);
@@ -148,7 +148,7 @@ public static List<Attribute<?>> readAttributes(AttributedElement enclosing, Cla
                 mapper = customAttributes.apply(name);
             }
             if (mapper != null) {
-                filled.add((Attribute)mapper.readAttribute(enclosing, reader, p));
+                filled.add((Attribute<?>) Objects.requireNonNull(mapper.readAttribute(enclosing, reader, p)));
             } else {
                 AttributeMapper<UnknownAttribute> fakeMapper = new AttributeMapper<>() {
                     @Override
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedCodeBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedCodeBuilder.java
index 7f041633d8a20..b690f8dbfe70a 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedCodeBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedCodeBuilder.java
@@ -148,7 +148,7 @@ public final class Model
             implements CodeModel {
 
         private Model() {
-            super(elements);
+            super(BufferedCodeBuilder.this.elements);
         }
 
         @Override
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedFieldBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedFieldBuilder.java
index 66ecf10598afb..d9732a0a14d1d 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedFieldBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedFieldBuilder.java
@@ -78,7 +78,7 @@ public final class Model
             extends AbstractUnboundModel<FieldElement>
             implements FieldModel {
         public Model() {
-            super(elements);
+            super(BufferedFieldBuilder.this.elements);
         }
 
         @Override
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java
index b93ad1185ab3b..d8c4ba5f95112 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java
@@ -156,7 +156,7 @@ public final class Model
             extends AbstractUnboundModel<MethodElement>
             implements MethodModel, MethodInfo {
         public Model() {
-            super(elements);
+            super(BufferedMethodBuilder.this.elements);
         }
 
         @Override
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/StackMapDecoder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/StackMapDecoder.java
index 2ea8922d3267c..d0bf91171acfe 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/StackMapDecoder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/StackMapDecoder.java
@@ -285,5 +285,9 @@ public static record StackMapFrameImpl(int frameType,
                                            List<VerificationTypeInfo> locals,
                                            List<VerificationTypeInfo> stack)
             implements StackMapFrameInfo {
+        public StackMapFrameImpl {
+            locals = List.copyOf(locals);
+            stack = List.copyOf(stack);
+        }
     }
 }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/UnboundAttribute.java b/src/java.base/share/classes/jdk/internal/classfile/impl/UnboundAttribute.java
index 6d71497f693ed..6b64511fd5a13 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/UnboundAttribute.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/UnboundAttribute.java
@@ -92,6 +92,8 @@
 import java.lang.classfile.constantpool.PackageEntry;
 import java.lang.classfile.constantpool.Utf8Entry;
 
+import jdk.internal.access.SharedSecrets;
+
 public abstract sealed class UnboundAttribute<T extends Attribute<T>>
         extends AbstractElement
         implements Attribute<T>, Util.Writable {
@@ -627,7 +629,13 @@ public static final class UnboundRuntimeInvisibleParameterAnnotationsAttribute
 
         public UnboundRuntimeInvisibleParameterAnnotationsAttribute(List<List<Annotation>> elements) {
             super(Attributes.runtimeInvisibleParameterAnnotations());
-            this.elements = List.copyOf(elements);
+            // deep copy
+            var array = elements.toArray().clone();
+            for (int i = 0; i < array.length; i++) {
+                array[i] = List.copyOf((List<?>) array[i]);
+            }
+
+            this.elements = SharedSecrets.getJavaUtilCollectionAccess().listFromTrustedArray(array);
         }
 
         @Override
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerifierImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerifierImpl.java
index 33733c5572a73..74cdb881a744a 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerifierImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/verifier/VerifierImpl.java
@@ -26,6 +26,7 @@
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
 import java.lang.classfile.ClassHierarchyResolver;
@@ -133,7 +134,7 @@ public static List<VerifyError> verify(ClassModel classModel, ClassHierarchyReso
                     errors.addAll(inference_verify(klass));
                 }
             }
-            return errors;
+            return Collections.unmodifiableList(errors);
         } finally {
             log_info(logger, "End class verification for: %s", clsName);
         }

From 93c19ac73c2feb8d6191bc5da98b4a9c8e2b5590 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Tue, 30 Jul 2024 17:41:49 +0000
Subject: [PATCH 259/401] 8337219: AccessFlags factories do not require
 necessary arguments

Reviewed-by: asotona
---
 .../java/lang/classfile/AccessFlags.java      | 50 +----------------
 .../java/lang/classfile/ClassBuilder.java     |  6 ++-
 .../java/lang/classfile/FieldBuilder.java     |  6 ++-
 .../java/lang/classfile/MethodBuilder.java    |  6 ++-
 .../classfile/impl/BufferedFieldBuilder.java  |  3 +-
 .../classfile/impl/BufferedMethodBuilder.java |  2 +-
 .../internal/classfile/impl/ClassImpl.java    |  2 +-
 .../internal/classfile/impl/FieldImpl.java    |  3 +-
 .../internal/classfile/impl/MethodImpl.java   |  3 +-
 .../com/sun/tools/javap/ClassWriter.java      | 35 ++++++------
 test/jdk/jdk/classfile/AccessFlagsTest.java   | 54 ++++++++++++++-----
 test/jdk/jdk/classfile/BuilderBlockTest.java  | 17 +++---
 .../jdk/classfile/BuilderTryCatchTest.java    | 13 ++---
 test/jdk/jdk/classfile/LDCTest.java           |  8 +--
 test/jdk/jdk/classfile/LowAdaptTest.java      |  6 ++-
 test/jdk/jdk/classfile/LvtTest.java           | 12 ++---
 test/jdk/jdk/classfile/OneToOneTest.java      |  9 ++--
 test/jdk/jdk/classfile/SwapTest.java          | 11 ++--
 test/jdk/jdk/classfile/WriteTest.java         | 14 ++---
 .../classfile/examples/ExampleGallery.java    |  2 +-
 .../openjdk/bench/jdk/classfile/Write.java    |  9 ++--
 21 files changed, 131 insertions(+), 140 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/classfile/AccessFlags.java b/src/java.base/share/classes/java/lang/classfile/AccessFlags.java
index 283094b81d629..6c6ac75e64896 100644
--- a/src/java.base/share/classes/java/lang/classfile/AccessFlags.java
+++ b/src/java.base/share/classes/java/lang/classfile/AccessFlags.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,52 +64,4 @@ public sealed interface AccessFlags
      * method, or field}
      */
     AccessFlag.Location location();
-
-    /**
-     * {@return an {@linkplain AccessFlags} for a class}
-     * @param mask the flags to be set, as a bit mask
-     */
-    static AccessFlags ofClass(int mask) {
-        return new AccessFlagsImpl(AccessFlag.Location.CLASS, mask);
-    }
-
-    /**
-     * {@return an {@linkplain AccessFlags} for a class}
-     * @param flags the flags to be set
-     */
-    static AccessFlags ofClass(AccessFlag... flags) {
-        return new AccessFlagsImpl(AccessFlag.Location.CLASS, flags);
-    }
-
-    /**
-     * {@return an {@linkplain AccessFlags} for a field}
-     * @param mask the flags to be set, as a bit mask
-     */
-    static AccessFlags ofField(int mask) {
-        return new AccessFlagsImpl(AccessFlag.Location.FIELD, mask);
-    }
-
-    /**
-     * {@return an {@linkplain AccessFlags} for a field}
-     * @param flags the flags to be set
-     */
-    static AccessFlags ofField(AccessFlag... flags) {
-        return new AccessFlagsImpl(AccessFlag.Location.FIELD, flags);
-    }
-
-    /**
-     * {@return an {@linkplain AccessFlags} for a method}
-     * @param mask the flags to be set, as a bit mask
-     */
-    static AccessFlags ofMethod(int mask) {
-        return new AccessFlagsImpl(AccessFlag.Location.METHOD, mask);
-    }
-
-    /**
-     * {@return an {@linkplain AccessFlags} for a method}
-     * @param flags the flags to be set
-     */
-    static AccessFlags ofMethod(AccessFlag... flags) {
-        return new AccessFlagsImpl(AccessFlag.Location.METHOD, flags);
-    }
 }
diff --git a/src/java.base/share/classes/java/lang/classfile/ClassBuilder.java b/src/java.base/share/classes/java/lang/classfile/ClassBuilder.java
index a55b93e7c07f4..7ad6e94df3fce 100644
--- a/src/java.base/share/classes/java/lang/classfile/ClassBuilder.java
+++ b/src/java.base/share/classes/java/lang/classfile/ClassBuilder.java
@@ -34,6 +34,8 @@
 
 import java.lang.classfile.constantpool.ClassEntry;
 import java.lang.classfile.constantpool.Utf8Entry;
+
+import jdk.internal.classfile.impl.AccessFlagsImpl;
 import jdk.internal.classfile.impl.ChainedClassBuilder;
 import jdk.internal.classfile.impl.DirectClassBuilder;
 import jdk.internal.classfile.impl.Util;
@@ -73,7 +75,7 @@ default ClassBuilder withVersion(int major, int minor) {
      * @return this builder
      */
     default ClassBuilder withFlags(int flags) {
-        return with(AccessFlags.ofClass(flags));
+        return with(new AccessFlagsImpl(AccessFlag.Location.CLASS, flags));
     }
 
     /**
@@ -82,7 +84,7 @@ default ClassBuilder withFlags(int flags) {
      * @return this builder
      */
     default ClassBuilder withFlags(AccessFlag... flags) {
-        return with(AccessFlags.ofClass(flags));
+        return with(new AccessFlagsImpl(AccessFlag.Location.CLASS, flags));
     }
 
     /**
diff --git a/src/java.base/share/classes/java/lang/classfile/FieldBuilder.java b/src/java.base/share/classes/java/lang/classfile/FieldBuilder.java
index c0e733676f77c..d9a8f6b2fc325 100644
--- a/src/java.base/share/classes/java/lang/classfile/FieldBuilder.java
+++ b/src/java.base/share/classes/java/lang/classfile/FieldBuilder.java
@@ -26,6 +26,8 @@
 package java.lang.classfile;
 
 import java.lang.classfile.constantpool.Utf8Entry;
+
+import jdk.internal.classfile.impl.AccessFlagsImpl;
 import jdk.internal.classfile.impl.ChainedFieldBuilder;
 import jdk.internal.classfile.impl.TerminalFieldBuilder;
 import java.lang.reflect.AccessFlag;
@@ -55,7 +57,7 @@ public sealed interface FieldBuilder
      * @return this builder
      */
     default FieldBuilder withFlags(int flags) {
-        return with(AccessFlags.ofField(flags));
+        return with(new AccessFlagsImpl(AccessFlag.Location.FIELD, flags));
     }
 
     /**
@@ -64,7 +66,7 @@ default FieldBuilder withFlags(int flags) {
      * @return this builder
      */
     default FieldBuilder withFlags(AccessFlag... flags) {
-        return with(AccessFlags.ofField(flags));
+        return with(new AccessFlagsImpl(AccessFlag.Location.FIELD, flags));
     }
 
 }
diff --git a/src/java.base/share/classes/java/lang/classfile/MethodBuilder.java b/src/java.base/share/classes/java/lang/classfile/MethodBuilder.java
index 4cf34c95ed079..7c230760f6934 100644
--- a/src/java.base/share/classes/java/lang/classfile/MethodBuilder.java
+++ b/src/java.base/share/classes/java/lang/classfile/MethodBuilder.java
@@ -28,6 +28,8 @@
 import java.util.function.Consumer;
 
 import java.lang.classfile.constantpool.Utf8Entry;
+
+import jdk.internal.classfile.impl.AccessFlagsImpl;
 import jdk.internal.classfile.impl.ChainedMethodBuilder;
 import jdk.internal.classfile.impl.TerminalMethodBuilder;
 import java.lang.reflect.AccessFlag;
@@ -55,7 +57,7 @@ public sealed interface MethodBuilder
      * @return this builder
      */
     default MethodBuilder withFlags(int flags) {
-        return with(AccessFlags.ofMethod(flags));
+        return with(new AccessFlagsImpl(AccessFlag.Location.METHOD, flags));
     }
 
     /**
@@ -64,7 +66,7 @@ default MethodBuilder withFlags(int flags) {
      * @return this builder
      */
     default MethodBuilder withFlags(AccessFlag... flags) {
-        return with(AccessFlags.ofMethod(flags));
+        return with(new AccessFlagsImpl(AccessFlag.Location.METHOD, flags));
     }
 
     /**
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedFieldBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedFieldBuilder.java
index d9732a0a14d1d..d165ddd3928fd 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedFieldBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedFieldBuilder.java
@@ -24,6 +24,7 @@
  */
 package jdk.internal.classfile.impl;
 
+import java.lang.reflect.AccessFlag;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -50,7 +51,7 @@ public BufferedFieldBuilder(SplitConstantPool constantPool,
         this.context = context;
         this.name = name;
         this.desc = type;
-        this.flags = AccessFlags.ofField();
+        this.flags = new AccessFlagsImpl(AccessFlag.Location.FIELD);
     }
 
     @Override
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java
index d8c4ba5f95112..4a9e9b111ce08 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/BufferedMethodBuilder.java
@@ -66,7 +66,7 @@ public BufferedMethodBuilder(SplitConstantPool constantPool,
         this.context = context;
         this.name = nameInfo;
         this.desc = typeInfo;
-        this.flags = AccessFlags.ofMethod(flags);
+        this.flags = new AccessFlagsImpl(AccessFlag.Location.METHOD, flags);
         this.original = original;
     }
 
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassImpl.java
index eab283a8c6030..c6b9be5c76a99 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassImpl.java
@@ -101,7 +101,7 @@ public int classfileLength() {
 
     @Override
     public AccessFlags flags() {
-        return AccessFlags.ofClass(reader.flags());
+        return new AccessFlagsImpl(AccessFlag.Location.CLASS, reader.flags());
     }
 
     @Override
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/FieldImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/FieldImpl.java
index ab42b96084a0f..a71593a57120e 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/FieldImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/FieldImpl.java
@@ -24,6 +24,7 @@
  */
 package jdk.internal.classfile.impl;
 
+import java.lang.reflect.AccessFlag;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Consumer;
@@ -48,7 +49,7 @@ public FieldImpl(ClassReader reader, int startPos, int endPos, int attributesPos
 
     @Override
     public AccessFlags flags() {
-        return AccessFlags.ofField(reader.readU2(startPos));
+        return new AccessFlagsImpl(AccessFlag.Location.FIELD, reader.readU2(startPos));
     }
 
     @Override
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/MethodImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/MethodImpl.java
index 40223d58d6b1c..032b18600a897 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/MethodImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/MethodImpl.java
@@ -28,6 +28,7 @@
 import java.lang.classfile.*;
 import java.lang.classfile.constantpool.Utf8Entry;
 
+import java.lang.reflect.AccessFlag;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Consumer;
@@ -51,7 +52,7 @@ public MethodImpl(ClassReader reader, int startPos, int endPos, int attrStart) {
 
     @Override
     public AccessFlags flags() {
-        return AccessFlags.ofMethod(reader.readU2(startPos));
+        return new AccessFlagsImpl(AccessFlag.Location.METHOD, reader.readU2(startPos));
     }
 
     @Override
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java b/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java
index 2483e99e49ad9..764f93bd54aeb 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,12 @@
 
 package com.sun.tools.javap;
 
+import java.lang.reflect.AccessFlag;
 import java.net.URI;
 import java.text.DateFormat;
 import java.util.Collection;
 import java.util.Date;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.Set;
 
@@ -149,7 +151,7 @@ public boolean write(ClassModel cm) {
             indent(-1);
         }
 
-        writeModifiers(getClassModifiers(cm.flags().flagsMask()));
+        writeModifiers(getClassModifiers(cm.flags()));
 
         if ((classModel.flags().flagsMask() & ACC_MODULE) != 0) {
             var attr = classModel.findAttribute(Attributes.module());
@@ -210,7 +212,7 @@ public boolean write(ClassModel cm) {
             println("minor version: " + classModel.minorVersion());
             println("major version: " + classModel.majorVersion());
             writeList(String.format("flags: (0x%04x) ", cm.flags().flagsMask()),
-                    getClassFlags(cm.flags().flagsMask()), "\n");
+                    getClassFlags(cm.flags()), "\n");
             print("this_class: #");print(() -> classModel.thisClass().index());
             tab();
             print(() -> "// " + classModel.thisClass().asInternalName());
@@ -416,7 +418,7 @@ protected void writeField(FieldModel f) {
         if (!options.checkAccess(f.flags().flagsMask()))
             return;
 
-        var flags = AccessFlags.ofField(f.flags().flagsMask());
+        var flags = f.flags();
         writeModifiers(flagsReportUnknown(flags).stream().filter(fl -> fl.sourceModifier())
                 .map(fl -> Modifier.toString(fl.mask())).toList());
         print(() -> sigPrinter.print(
@@ -794,9 +796,16 @@ else switch (c) {
         }
     }
 
-    private Set<String> getClassModifiers(int mask) {
-        return getModifiers(flagsReportUnknown(AccessFlags.ofClass((mask & ACC_INTERFACE) != 0
-                ? mask & ~ACC_ABSTRACT : mask)));
+    private Set<String> getClassModifiers(AccessFlags flags) {
+        var flagSet = flagsReportUnknown(flags);
+        Set<AccessFlag> set;
+        if (flagSet.contains(AccessFlag.INTERFACE)) {
+            set = EnumSet.copyOf(flagSet);
+            set.remove(AccessFlag.ABSTRACT);
+        } else {
+            set = flagSet;
+        }
+        return getModifiers(set);
     }
 
     private static Set<String> getModifiers(Set<java.lang.reflect.AccessFlag> flags) {
@@ -806,16 +815,8 @@ private static Set<String> getModifiers(Set<java.lang.reflect.AccessFlag> flags)
         return s;
     }
 
-    private Set<String> getClassFlags(int mask) {
-        return getFlags(mask, flagsReportUnknown(AccessFlags.ofClass(mask)));
-    }
-
-    private Set<String> getMethodFlags(int mask) {
-        return getFlags(mask, flagsReportUnknown(AccessFlags.ofMethod(mask)));
-    }
-
-    private Set<String> getFieldFlags(int mask) {
-        return getFlags(mask, flagsReportUnknown(AccessFlags.ofField(mask)));
+    private Set<String> getClassFlags(AccessFlags flags) {
+        return getFlags(flags.flagsMask(), flagsReportUnknown(flags));
     }
 
     private static Set<String> getFlags(int mask, Set<java.lang.reflect.AccessFlag> flags) {
diff --git a/test/jdk/jdk/classfile/AccessFlagsTest.java b/test/jdk/jdk/classfile/AccessFlagsTest.java
index 97c0d97f8f9f1..379dcddb9c86c 100644
--- a/test/jdk/jdk/classfile/AccessFlagsTest.java
+++ b/test/jdk/jdk/classfile/AccessFlagsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @summary Testing ClassFile AccessFlags.
  * @run junit AccessFlagsTest
  */
+import java.lang.classfile.ClassFile;
+import java.lang.constant.ClassDesc;
+import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.Random;
 import java.util.Set;
@@ -34,6 +37,10 @@
 import java.util.function.IntFunction;
 import java.lang.reflect.AccessFlag;
 import java.lang.classfile.AccessFlags;
+
+import static java.lang.classfile.ClassFile.ACC_STATIC;
+import static java.lang.constant.ConstantDescs.CD_int;
+import static java.lang.constant.ConstantDescs.MTD_void;
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.provider.EnumSource;
@@ -45,15 +52,38 @@ class AccessFlagsTest {
     @EnumSource(names = { "CLASS", "METHOD", "FIELD" })
     void testRandomAccessFlagsConverions(AccessFlag.Location ctx) {
         IntFunction<AccessFlags> intFactory = switch (ctx) {
-            case CLASS -> AccessFlags::ofClass;
-            case METHOD -> AccessFlags::ofMethod;
-            case FIELD -> AccessFlags::ofField;
+            case CLASS -> v -> {
+                var bytes = ClassFile.of().build(ClassDesc.of("Test"), clb -> clb.withFlags(v));
+                return ClassFile.of().parse(bytes).flags();
+            };
+            case METHOD -> v -> {
+                var bytes = ClassFile.of().build(ClassDesc.of("Test"), clb ->
+                        clb.withMethod("test", MTD_void, v & ACC_STATIC, mb -> mb.withFlags(v)));
+                return ClassFile.of().parse(bytes).methods().getFirst().flags();
+            };
+            case FIELD -> v -> {
+                var bytes = ClassFile.of().build(ClassDesc.of("Test"), clb ->
+                        clb.withField("test", CD_int, fb -> fb.withFlags(v)));
+                return ClassFile.of().parse(bytes).fields().getFirst().flags();
+            };
             default -> null;
         };
         Function<AccessFlag[], AccessFlags> flagsFactory = switch (ctx) {
-            case CLASS -> AccessFlags::ofClass;
-            case METHOD -> AccessFlags::ofMethod;
-            case FIELD -> AccessFlags::ofField;
+            case CLASS -> v -> {
+                var bytes = ClassFile.of().build(ClassDesc.of("Test"), clb -> clb.withFlags(v));
+                return ClassFile.of().parse(bytes).flags();
+            };
+            case METHOD -> v -> {
+                boolean hasStatic = Arrays.stream(v).anyMatch(f -> f == AccessFlag.STATIC);
+                var bytes = ClassFile.of().build(ClassDesc.of("Test"), clb ->
+                        clb.withMethod("test", MTD_void, hasStatic ? ACC_STATIC : 0, mb -> mb.withFlags(v)));
+                return ClassFile.of().parse(bytes).methods().getFirst().flags();
+            };
+            case FIELD -> v -> {
+                var bytes = ClassFile.of().build(ClassDesc.of("Test"), clb ->
+                        clb.withField("test", CD_int, fb -> fb.withFlags(v)));
+                return ClassFile.of().parse(bytes).fields().getFirst().flags();
+            };
             default -> null;
         };
 
@@ -72,11 +102,11 @@ void testRandomAccessFlagsConverions(AccessFlag.Location ctx) {
 
     @Test
     void testInvalidFlagsUse() {
-        assertAll(
-            () -> assertThrowsForInvalidFlagsUse(AccessFlags::ofClass),
-            () -> assertThrowsForInvalidFlagsUse(AccessFlags::ofField),
-            () -> assertThrowsForInvalidFlagsUse(AccessFlags::ofMethod)
-        );
+        ClassFile.of().build(ClassDesc.of("Test"), clb -> {
+            assertThrowsForInvalidFlagsUse(clb::withFlags);
+            clb.withMethod("test", MTD_void, ACC_STATIC, mb -> assertThrowsForInvalidFlagsUse(mb::withFlags));
+            clb.withField("test", CD_int, fb -> assertThrowsForInvalidFlagsUse(fb::withFlags));
+        });
     }
 
     void assertThrowsForInvalidFlagsUse(Consumer<AccessFlag[]> factory) {
diff --git a/test/jdk/jdk/classfile/BuilderBlockTest.java b/test/jdk/jdk/classfile/BuilderBlockTest.java
index a2fb361ca2c7a..30a44491e6cea 100644
--- a/test/jdk/jdk/classfile/BuilderBlockTest.java
+++ b/test/jdk/jdk/classfile/BuilderBlockTest.java
@@ -28,7 +28,6 @@
  * @run junit BuilderBlockTest
  */
 import java.io.IOException;
-import java.lang.classfile.AccessFlags;
 import java.lang.classfile.Attributes;
 import java.lang.classfile.ClassFile;
 import java.lang.classfile.ClassTransform;
@@ -53,6 +52,8 @@
 import jdk.internal.classfile.impl.LabelImpl;
 import org.junit.jupiter.api.Test;
 
+import static java.lang.classfile.ClassFile.ACC_PUBLIC;
+import static java.lang.classfile.ClassFile.ACC_STATIC;
 import static java.lang.constant.ConstantDescs.CD_int;
 import static java.lang.constant.ConstantDescs.CD_void;
 
@@ -116,7 +117,7 @@ void testIfThenReturn() throws Exception {
         byte[] bytes = ClassFile.of().build(ClassDesc.of("Foo"), cb -> {
             cb.withFlags(AccessFlag.PUBLIC);
             cb.withMethod("foo", MethodTypeDesc.of(CD_int, CD_int),
-                          AccessFlags.ofMethod(AccessFlag.PUBLIC, AccessFlag.STATIC).flagsMask(),
+                          ACC_PUBLIC | ACC_STATIC,
                           mb -> mb.withCode(xb -> xb.iload(0)
                                                     .ifThen(xxb -> xxb.iconst_1().ireturn())
                                                     .iconst_2()
@@ -135,7 +136,7 @@ void testIfThenElseReturn() throws Exception {
         byte[] bytes = ClassFile.of().build(ClassDesc.of("Foo"), cb -> {
             cb.withFlags(AccessFlag.PUBLIC);
             cb.withMethod("foo", MethodTypeDesc.of(CD_int, CD_int),
-                          AccessFlags.ofMethod(AccessFlag.PUBLIC, AccessFlag.STATIC).flagsMask(),
+                          ACC_PUBLIC | ACC_STATIC,
                           mb -> mb.withCode(xb -> xb.iload(0)
                                                     .ifThenElse(xxb -> xxb.iconst_1().ireturn(),
                                                                 xxb -> xxb.iconst_2().ireturn())));
@@ -153,7 +154,7 @@ void testIfThenBadOpcode()  {
         ClassFile.of().build(ClassDesc.of("Foo"), cb -> {
             cb.withFlags(AccessFlag.PUBLIC);
             cb.withMethod("foo", MethodTypeDesc.of(CD_int, CD_int, CD_int),
-                    AccessFlags.ofMethod(AccessFlag.PUBLIC, AccessFlag.STATIC).flagsMask(),
+                    ACC_PUBLIC | ACC_STATIC,
                     mb -> mb.withCode(xb -> {
                         xb.iload(0);
                         xb.iload(1);
@@ -173,7 +174,7 @@ void testIfThenElseImplicitBreak() throws Exception {
         byte[] bytes = ClassFile.of().build(ClassDesc.of("Foo"), cb -> {
             cb.withFlags(AccessFlag.PUBLIC);
             cb.withMethod("foo", MethodTypeDesc.of(CD_int, CD_int),
-                          AccessFlags.ofMethod(AccessFlag.PUBLIC, AccessFlag.STATIC).flagsMask(),
+                          ACC_PUBLIC | ACC_STATIC,
                           mb -> mb.withCode(xb -> xb.iload(0)
                                                     .ifThenElse(xxb -> xxb.iconst_1().istore(2),
                                                                 xxb -> xxb.iconst_2().istore(2))
@@ -193,7 +194,7 @@ void testIfThenElseExplicitBreak() throws Exception {
         byte[] bytes = ClassFile.of().build(ClassDesc.of("Foo"), cb -> {
             cb.withFlags(AccessFlag.PUBLIC);
             cb.withMethod("foo", MethodTypeDesc.of(CD_int, CD_int),
-                    AccessFlags.ofMethod(AccessFlag.PUBLIC, AccessFlag.STATIC).flagsMask(),
+                    ACC_PUBLIC | ACC_STATIC,
                     mb -> mb.withCode(xb -> xb.iload(0)
                             .ifThenElse(xxb -> xxb.iconst_1().istore(2).goto_(xxb.breakLabel()),
                                     xxb -> xxb.iconst_2().istore(2).goto_(xxb.breakLabel()))
@@ -212,7 +213,7 @@ void testIfThenElseOpcode() throws Exception {
         byte[] bytes = ClassFile.of().build(ClassDesc.of("Foo"), cb -> {
             cb.withFlags(AccessFlag.PUBLIC);
             cb.withMethod("foo", MethodTypeDesc.of(CD_int, CD_int, CD_int),
-                    AccessFlags.ofMethod(AccessFlag.PUBLIC, AccessFlag.STATIC).flagsMask(),
+                    ACC_PUBLIC | ACC_STATIC,
                     mb -> mb.withCode(xb ->
                             xb.iload(0)
                             .iload(1)
@@ -237,7 +238,7 @@ void testIfThenElseBadOpcode()  {
         ClassFile.of().build(ClassDesc.of("Foo"), cb -> {
             cb.withFlags(AccessFlag.PUBLIC);
             cb.withMethod("foo", MethodTypeDesc.of(CD_int, CD_int, CD_int),
-                    AccessFlags.ofMethod(AccessFlag.PUBLIC, AccessFlag.STATIC).flagsMask(),
+                    ACC_PUBLIC | ACC_STATIC,
                     mb -> mb.withCode(xb -> {
                         xb.iload(0);
                         xb.iload(1);
diff --git a/test/jdk/jdk/classfile/BuilderTryCatchTest.java b/test/jdk/jdk/classfile/BuilderTryCatchTest.java
index 666b36e11a796..192125c4bb6f2 100644
--- a/test/jdk/jdk/classfile/BuilderTryCatchTest.java
+++ b/test/jdk/jdk/classfile/BuilderTryCatchTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
  * @run junit BuilderTryCatchTest
  */
 
-import java.lang.classfile.AccessFlags;
 import java.lang.classfile.ClassFile;
 import java.lang.classfile.CodeBuilder;
 import java.lang.classfile.CompoundElement;
@@ -35,6 +34,9 @@
 import java.lang.classfile.TypeKind;
 import java.lang.classfile.instruction.BranchInstruction;
 import java.lang.classfile.instruction.ExceptionCatch;
+
+import static java.lang.classfile.ClassFile.ACC_PUBLIC;
+import static java.lang.classfile.ClassFile.ACC_STATIC;
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
@@ -43,7 +45,6 @@
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
-import java.lang.reflect.AccessFlag;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
@@ -184,7 +185,7 @@ void testTryEmptyCatch() {
     void testEmptyTry() {
         byte[] bytes = ClassFile.of().build(ClassDesc.of("C"), cb -> {
             cb.withMethod("main", MethodTypeDesc.of(CD_String, CD_String.arrayType()),
-                    AccessFlags.ofMethod(AccessFlag.PUBLIC, AccessFlag.STATIC).flagsMask(), mb -> {
+                    ACC_PUBLIC | ACC_STATIC, mb -> {
                         mb.withCode(xb -> {
                             int stringSlot = xb.allocateLocal(TypeKind.ReferenceType);
                             xb.loadConstant("S");
@@ -215,7 +216,7 @@ void testEmptyTry() {
     void testLocalAllocation() throws Throwable {
         byte[] bytes = ClassFile.of().build(ClassDesc.of("C"), cb -> {
             cb.withMethod("main", MethodTypeDesc.of(CD_String, CD_String.arrayType()),
-                    AccessFlags.ofMethod(AccessFlag.PUBLIC, AccessFlag.STATIC).flagsMask(), mb -> {
+                    ACC_PUBLIC | ACC_STATIC, mb -> {
                         mb.withCode(xb -> {
                             int stringSlot = xb.allocateLocal(TypeKind.ReferenceType);
                             xb.loadConstant("S");
@@ -278,7 +279,7 @@ void testLocalAllocation() throws Throwable {
     static byte[] generateTryCatchMethod(Consumer<CodeBuilder.CatchBuilder> c) {
         byte[] bytes = ClassFile.of().build(ClassDesc.of("C"), cb -> {
             cb.withMethod("main", MethodTypeDesc.of(CD_String, CD_String.arrayType()),
-                    AccessFlags.ofMethod(AccessFlag.PUBLIC, AccessFlag.STATIC).flagsMask(), mb -> {
+                    ACC_PUBLIC | ACC_STATIC, mb -> {
                         mb.withCode(xb -> {
                             int stringSlot = xb.allocateLocal(TypeKind.ReferenceType);
                             xb.loadConstant("S");
diff --git a/test/jdk/jdk/classfile/LDCTest.java b/test/jdk/jdk/classfile/LDCTest.java
index 1e7639de4bb99..7379218840e30 100644
--- a/test/jdk/jdk/classfile/LDCTest.java
+++ b/test/jdk/jdk/classfile/LDCTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,9 @@
  * @run junit LDCTest
  */
 import java.lang.constant.ClassDesc;
+
+import static java.lang.classfile.ClassFile.ACC_PUBLIC;
+import static java.lang.classfile.ClassFile.ACC_STATIC;
 import static java.lang.constant.ConstantDescs.*;
 import java.lang.constant.MethodTypeDesc;
 
@@ -38,7 +41,6 @@
 import org.junit.jupiter.api.Test;
 import static helpers.TestConstants.MTD_VOID;
 import static java.lang.classfile.Opcode.*;
-import static java.lang.classfile.TypeKind.VoidType;
 import java.lang.classfile.instruction.ConstantInstruction;
 
 class LDCTest {
@@ -56,7 +58,7 @@ void testLDCisConvertedToLDCW() throws Exception {
               )
 
               .withMethod("main", MethodTypeDesc.of(CD_void, CD_String.arrayType()),
-                          AccessFlags.ofMethod(AccessFlag.PUBLIC, AccessFlag.STATIC).flagsMask(),
+                          ACC_PUBLIC | ACC_STATIC,
                           mb -> mb.withCode(c0 -> {
                                   ConstantPoolBuilder cpb = cb.constantPool();
                                   for (int i = 0; i <= 256/2 + 2; i++) { // two entries per String
diff --git a/test/jdk/jdk/classfile/LowAdaptTest.java b/test/jdk/jdk/classfile/LowAdaptTest.java
index 9fa2620913b16..d47141a885a26 100644
--- a/test/jdk/jdk/classfile/LowAdaptTest.java
+++ b/test/jdk/jdk/classfile/LowAdaptTest.java
@@ -27,6 +27,9 @@
  * @run junit LowAdaptTest
  */
 import java.lang.constant.ClassDesc;
+
+import static java.lang.classfile.ClassFile.ACC_PUBLIC;
+import static java.lang.classfile.ClassFile.ACC_STATIC;
 import static java.lang.constant.ConstantDescs.*;
 import java.lang.constant.DirectMethodHandleDesc;
 import java.lang.constant.DynamicCallSiteDesc;
@@ -35,7 +38,6 @@
 import java.net.URI;
 import java.nio.file.Paths;
 
-import java.lang.classfile.AccessFlags;
 import java.lang.reflect.AccessFlag;
 import java.lang.classfile.ClassModel;
 import java.lang.classfile.ClassFile;
@@ -75,7 +77,7 @@ void testAdapt() throws Exception {
             cl.methods().forEach(cb::with);
 
             cb.withMethod("doit", MethodTypeDesc.of(CD_int, CD_int),
-                          AccessFlags.ofMethod(AccessFlag.PUBLIC, AccessFlag.STATIC).flagsMask(),
+                          ACC_PUBLIC | ACC_STATIC,
                           mb -> mb.withCode(xb -> {
                               xb.invokedynamic(indy);
                               xb.astore(1);
diff --git a/test/jdk/jdk/classfile/LvtTest.java b/test/jdk/jdk/classfile/LvtTest.java
index 3d7898097980f..d95a4fb7b29ac 100644
--- a/test/jdk/jdk/classfile/LvtTest.java
+++ b/test/jdk/jdk/classfile/LvtTest.java
@@ -35,13 +35,10 @@
 import java.lang.constant.ClassDesc;
 import java.net.URI;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
-import java.lang.classfile.AccessFlags;
 import java.lang.classfile.Attributes;
 import java.lang.classfile.attribute.SourceFileAttribute;
 import java.lang.classfile.constantpool.ConstantPoolBuilder;
@@ -58,11 +55,10 @@
 import static helpers.TestConstants.MTD_VOID;
 import static helpers.TestUtil.ExpectedLvRecord;
 import static helpers.TestUtil.ExpectedLvtRecord;
+import static java.lang.classfile.ClassFile.ACC_PUBLIC;
+import static java.lang.classfile.ClassFile.ACC_STATIC;
 import static java.lang.constant.ConstantDescs.*;
 import java.lang.constant.MethodTypeDesc;
-import static java.lang.classfile.Opcode.*;
-import static java.lang.classfile.Opcode.INVOKEVIRTUAL;
-import static java.lang.classfile.TypeKind.VoidType;
 import static org.junit.jupiter.api.Assertions.*;
 
 class LvtTest {
@@ -128,7 +124,7 @@ void testCreateLoadLVT() throws Exception {
                       )
               )
               .withMethod("main", MethodTypeDesc.of(CD_void, CD_String.arrayType()),
-                          AccessFlags.ofMethod(AccessFlag.PUBLIC, AccessFlag.STATIC).flagsMask(),
+                          ACC_PUBLIC | ACC_STATIC,
                           mb -> mb
                               .withCode(c0 -> {
                                   ConstantPoolBuilder cpb = cb.constantPool();
@@ -243,7 +239,7 @@ void testCreateLoadLVTT() throws Exception {
               )
 
               .withMethod("m", MethodTypeDesc.of(CD_Object, CD_Object.arrayType()),
-                          ClassFile.ACC_PUBLIC,
+                          ACC_PUBLIC,
                           mb -> mb.withFlags(AccessFlag.PUBLIC)
                                   .withCode(c0 -> {
                                       ConstantPoolBuilder cpb = cb.constantPool();
diff --git a/test/jdk/jdk/classfile/OneToOneTest.java b/test/jdk/jdk/classfile/OneToOneTest.java
index b20d07025e620..4e21cbebbe331 100644
--- a/test/jdk/jdk/classfile/OneToOneTest.java
+++ b/test/jdk/jdk/classfile/OneToOneTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,18 +27,19 @@
  * @run junit OneToOneTest
  */
 import java.lang.constant.ClassDesc;
+
+import static java.lang.classfile.ClassFile.ACC_PUBLIC;
+import static java.lang.classfile.ClassFile.ACC_STATIC;
 import static java.lang.constant.ConstantDescs.*;
 import java.lang.constant.MethodTypeDesc;
 import java.util.List;
 
-import java.lang.classfile.AccessFlags;
 import java.lang.reflect.AccessFlag;
 import java.lang.classfile.ClassModel;
 import java.lang.classfile.ClassFile;
 import java.lang.classfile.Instruction;
 import java.lang.classfile.Label;
 import java.lang.classfile.MethodModel;
-import java.lang.classfile.TypeKind;
 import java.lang.classfile.attribute.SourceFileAttribute;
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
@@ -74,7 +75,7 @@ void testClassWriteRead() {
                                   )
               )
               .withMethod("main", MethodTypeDesc.of(CD_void, CD_String.arrayType()),
-                          AccessFlags.ofMethod(AccessFlag.STATIC, AccessFlag.PUBLIC).flagsMask(),
+                          ACC_PUBLIC | ACC_STATIC,
                           mb -> mb.withCode(c0 -> {
                                                 Label loopTop = c0.newLabel();
                                                 Label loopEnd = c0.newLabel();
diff --git a/test/jdk/jdk/classfile/SwapTest.java b/test/jdk/jdk/classfile/SwapTest.java
index 10c0d66d5131c..71ea6189aa61e 100644
--- a/test/jdk/jdk/classfile/SwapTest.java
+++ b/test/jdk/jdk/classfile/SwapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,10 @@
  * @run junit SwapTest
  */
 
-import java.lang.classfile.AccessFlags;
 import java.lang.classfile.ClassFile;
+
+import static java.lang.classfile.ClassFile.ACC_PUBLIC;
+import static java.lang.classfile.ClassFile.ACC_STATIC;
 import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.Test;
 
@@ -38,9 +40,6 @@
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 
-import static java.lang.reflect.AccessFlag.PUBLIC;
-import static java.lang.reflect.AccessFlag.STATIC;
-
 class SwapTest {
     @Test
     void testTryCatchCatchAll() throws Throwable {
@@ -48,7 +47,7 @@ void testTryCatchCatchAll() throws Throwable {
         MethodTypeDesc mtd = mt.describeConstable().get();
 
         byte[] bytes = ClassFile.of().build(ClassDesc.of("C"), cb -> {
-            cb.withMethodBody("m", mtd, AccessFlags.ofMethod(PUBLIC, STATIC).flagsMask(), xb -> {
+            cb.withMethodBody("m", mtd, ACC_PUBLIC | ACC_STATIC, xb -> {
                         xb.aload(0); // 0
                         xb.aload(1); // 1, 0
                         xb.swap();   // 0, 1
diff --git a/test/jdk/jdk/classfile/WriteTest.java b/test/jdk/jdk/classfile/WriteTest.java
index b4af9135d12bd..72d847c474c4b 100644
--- a/test/jdk/jdk/classfile/WriteTest.java
+++ b/test/jdk/jdk/classfile/WriteTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,20 +30,16 @@
 import java.lang.constant.MethodTypeDesc;
 
 import helpers.TestConstants;
-import java.lang.classfile.AccessFlags;
 import java.lang.reflect.AccessFlag;
 import java.lang.classfile.ClassFile;
-import java.lang.classfile.TypeKind;
 import java.lang.classfile.Label;
 import java.lang.classfile.attribute.SourceFileAttribute;
 import org.junit.jupiter.api.Test;
 
 import static helpers.TestConstants.MTD_VOID;
+import static java.lang.classfile.ClassFile.ACC_PUBLIC;
+import static java.lang.classfile.ClassFile.ACC_STATIC;
 import static java.lang.constant.ConstantDescs.*;
-import static java.lang.classfile.Opcode.*;
-import static java.lang.classfile.TypeKind.IntType;
-import static java.lang.classfile.TypeKind.ReferenceType;
-import static java.lang.classfile.TypeKind.VoidType;
 
 class WriteTest {
 
@@ -61,7 +57,7 @@ void testJavapWrite() {
                       )
               )
               .withMethod("main", MethodTypeDesc.of(CD_void, CD_String.arrayType()),
-                          AccessFlags.ofMethod(AccessFlag.PUBLIC, AccessFlag.STATIC).flagsMask(),
+                          ACC_PUBLIC | ACC_STATIC,
                           mb -> mb.withCode(c0 -> {
                                   Label loopTop = c0.newLabel();
                                   Label loopEnd = c0.newLabel();
@@ -102,7 +98,7 @@ void testPrimitiveWrite() {
                       )
               )
               .withMethod("main", MethodTypeDesc.of(CD_void, CD_String.arrayType()),
-                          AccessFlags.ofMethod(AccessFlag.PUBLIC, AccessFlag.STATIC).flagsMask(),
+                          ACC_PUBLIC | ACC_STATIC,
                           mb -> mb.withCode(c0 -> {
                                   Label loopTop = c0.newLabel();
                                   Label loopEnd = c0.newLabel();
diff --git a/test/jdk/jdk/classfile/examples/ExampleGallery.java b/test/jdk/jdk/classfile/examples/ExampleGallery.java
index 7de4a78ffbf86..f37f6b1b74da7 100644
--- a/test/jdk/jdk/classfile/examples/ExampleGallery.java
+++ b/test/jdk/jdk/classfile/examples/ExampleGallery.java
@@ -207,7 +207,7 @@ public byte[] changeFieldSig(ClassModel cm) {
     public byte[] changeFieldFlags(ClassModel cm) {
         return ClassFile.of().transformClass(cm, ClassTransform.transformingFields((fb, fe) -> {
             switch (fe) {
-                case AccessFlags a -> fb.with(AccessFlags.ofField(a.flagsMask() & ~ClassFile.ACC_PUBLIC & ~ClassFile.ACC_PROTECTED));
+                case AccessFlags a -> fb.withFlags(a.flagsMask() & ~ClassFile.ACC_PUBLIC & ~ClassFile.ACC_PROTECTED);
                 default -> fb.with(fe);
             }
         }));
diff --git a/test/micro/org/openjdk/bench/jdk/classfile/Write.java b/test/micro/org/openjdk/bench/jdk/classfile/Write.java
index 59d07b05927b7..e5304f0e51c77 100644
--- a/test/micro/org/openjdk/bench/jdk/classfile/Write.java
+++ b/test/micro/org/openjdk/bench/jdk/classfile/Write.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
  */
 package org.openjdk.bench.jdk.classfile;
 
-import java.lang.classfile.AccessFlags;
 import java.lang.reflect.AccessFlag;
 import java.lang.classfile.ClassFile;
 import java.lang.classfile.TypeKind;
@@ -30,6 +29,8 @@
 import jdk.internal.org.objectweb.asm.*;
 import org.openjdk.jmh.annotations.*;
 import java.io.FileOutputStream;
+import static java.lang.classfile.ClassFile.ACC_PUBLIC;
+import static java.lang.classfile.ClassFile.ACC_STATIC;
 import static java.lang.constant.ConstantDescs.*;
 
 import java.nio.file.Files;
@@ -148,7 +149,7 @@ public byte[] jdkTree() {
               );
             for (int xi = 0; xi < 40; ++xi) {
                 cb.withMethod("main" + ((xi == 0) ? "" : "" + xi), MTD_void_StringArray,
-                              AccessFlags.ofMethod(AccessFlag.STATIC, AccessFlag.PUBLIC).flagsMask(),
+                              ACC_PUBLIC | ACC_STATIC,
                               mb -> mb.withCode(c0 -> {
                                   java.lang.classfile.Label loopTop = c0.newLabel();
                                   java.lang.classfile.Label loopEnd = c0.newLabel();
@@ -196,7 +197,7 @@ public byte[] jdkTreePrimitive() {
               );
             for (int xi = 0; xi < 40; ++xi) {
                 cb.withMethod("main" + ((xi == 0) ? "" : "" + xi), MTD_void_StringArray,
-                              AccessFlags.ofMethod(AccessFlag.STATIC, AccessFlag.PUBLIC).flagsMask(),
+                              ACC_PUBLIC | ACC_STATIC,
                               mb -> mb.withCode(c0 -> {
                                   java.lang.classfile.Label loopTop = c0.newLabel();
                                   java.lang.classfile.Label loopEnd = c0.newLabel();

From f5c9e8f1229f3aa00743119a2dee3e15d57048d8 Mon Sep 17 00:00:00 2001
From: Sonia Zaldana Calles <szaldana@openjdk.org>
Date: Tue, 30 Jul 2024 18:40:37 +0000
Subject: [PATCH 260/401] 8334492: DiagnosticCommands (jcmd) should accept %p
 in output filenames and substitute PID

Reviewed-by: kevinw, stuefe, lmesnik
---
 src/hotspot/share/code/codeCache.cpp          | 14 ++--
 src/hotspot/share/code/codeCache.hpp          |  4 ++
 .../share/prims/wbtestmethods/parserTests.cpp | 10 ++-
 .../share/services/diagnosticArgument.cpp     | 17 +++--
 .../share/services/diagnosticArgument.hpp     |  3 +-
 .../share/services/diagnosticCommand.cpp      | 32 +++------
 .../cds/appcds/jcmd/JCmdTestDumpBase.java     |  6 +-
 .../cds/appcds/jcmd/JCmdTestStaticDump.java   |  9 ++-
 .../jtreg/serviceability/ParserTest.java      | 31 ++++++++-
 .../tools/jcmd/TestJcmdPIDSubstitution.java   | 66 +++++++++++++++++++
 .../whitebox/parser/DiagnosticCommand.java    |  4 +-
 11 files changed, 157 insertions(+), 39 deletions(-)
 create mode 100644 test/jdk/sun/tools/jcmd/TestJcmdPIDSubstitution.java

diff --git a/src/hotspot/share/code/codeCache.cpp b/src/hotspot/share/code/codeCache.cpp
index ea01dd759587a..a491dd62f070e 100644
--- a/src/hotspot/share/code/codeCache.cpp
+++ b/src/hotspot/share/code/codeCache.cpp
@@ -1790,15 +1790,17 @@ void CodeCache::log_state(outputStream* st) {
 #ifdef LINUX
 void CodeCache::write_perf_map(const char* filename, outputStream* st) {
   MutexLocker mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
-
-  // Perf expects to find the map file at /tmp/perf-<pid>.map
-  // if the file name is not specified.
-  char fname[32];
+  char fname[JVM_MAXPATHLEN];
   if (filename == nullptr) {
-    jio_snprintf(fname, sizeof(fname), "/tmp/perf-%d.map", os::current_process_id());
+    // Invocation outside of jcmd requires pid substitution.
+    if (!Arguments::copy_expand_pid(DEFAULT_PERFMAP_FILENAME,
+                                    strlen(DEFAULT_PERFMAP_FILENAME),
+                                    fname, JVM_MAXPATHLEN)) {
+      st->print_cr("Warning: Not writing perf map as pid substitution failed.");
+      return;
+    }
     filename = fname;
   }
-
   fileStream fs(filename, "w");
   if (!fs.is_open()) {
     st->print_cr("Warning: Failed to create %s for perf map", filename);
diff --git a/src/hotspot/share/code/codeCache.hpp b/src/hotspot/share/code/codeCache.hpp
index 565f600453e69..b724268b65000 100644
--- a/src/hotspot/share/code/codeCache.hpp
+++ b/src/hotspot/share/code/codeCache.hpp
@@ -80,6 +80,10 @@ class ShenandoahParallelCodeHeapIterator;
 class NativePostCallNop;
 class DeoptimizationScope;
 
+#ifdef LINUX
+#define DEFAULT_PERFMAP_FILENAME "/tmp/perf-%p.map"
+#endif
+
 class CodeCache : AllStatic {
   friend class VMStructs;
   friend class JVMCIVMStructs;
diff --git a/src/hotspot/share/prims/wbtestmethods/parserTests.cpp b/src/hotspot/share/prims/wbtestmethods/parserTests.cpp
index 2845aa9aa104e..efcf2b070d03b 100644
--- a/src/hotspot/share/prims/wbtestmethods/parserTests.cpp
+++ b/src/hotspot/share/prims/wbtestmethods/parserTests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -127,6 +127,14 @@ static void fill_in_parser(DCmdParser* parser, oop argument)
      } else {
       parser->add_dcmd_option(argument);
      }
+   } else if (strcmp(type, "FILE") == 0) {
+      DCmdArgument<char*>* argument =
+          new DCmdArgument<char*>(name, desc, "FILE", mandatory);
+      if (isarg) {
+        parser->add_dcmd_argument(argument);
+      } else {
+        parser->add_dcmd_option(argument);
+      }
    }
 }
 
diff --git a/src/hotspot/share/services/diagnosticArgument.cpp b/src/hotspot/share/services/diagnosticArgument.cpp
index 94f2d3e1eb124..5fd565a605a44 100644
--- a/src/hotspot/share/services/diagnosticArgument.cpp
+++ b/src/hotspot/share/services/diagnosticArgument.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -189,9 +189,18 @@ template <> void DCmdArgument<char*>::parse_value(const char* str,
     destroy_value();
   } else {
     // Use realloc as we may have a default set.
-    _value = REALLOC_C_HEAP_ARRAY(char, _value, len + 1, mtInternal);
-    int n = os::snprintf(_value, len + 1, "%.*s", (int)len, str);
-    assert((size_t)n <= len, "Unexpected number of characters in string");
+    if (strcmp(type(), "FILE") == 0) {
+      _value = REALLOC_C_HEAP_ARRAY(char, _value, JVM_MAXPATHLEN, mtInternal);
+      if (!Arguments::copy_expand_pid(str, len, _value, JVM_MAXPATHLEN)) {
+        stringStream error_msg;
+        error_msg.print("File path invalid or too long: %s", str);
+        THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), error_msg.base());
+      }
+    } else {
+      _value = REALLOC_C_HEAP_ARRAY(char, _value, len + 1, mtInternal);
+      int n = os::snprintf(_value, len + 1, "%.*s", (int)len, str);
+      assert((size_t)n <= len, "Unexpected number of characters in string");
+    }
   }
 }
 
diff --git a/src/hotspot/share/services/diagnosticArgument.hpp b/src/hotspot/share/services/diagnosticArgument.hpp
index c9683ce4a2196..1451ea34f86ca 100644
--- a/src/hotspot/share/services/diagnosticArgument.hpp
+++ b/src/hotspot/share/services/diagnosticArgument.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 
 #include "classfile/vmSymbols.hpp"
 #include "memory/allocation.hpp"
+#include "runtime/arguments.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/os.hpp"
 #include "utilities/exceptions.hpp"
diff --git a/src/hotspot/share/services/diagnosticCommand.cpp b/src/hotspot/share/services/diagnosticCommand.cpp
index e6328e95abd9e..7a2c083814614 100644
--- a/src/hotspot/share/services/diagnosticCommand.cpp
+++ b/src/hotspot/share/services/diagnosticCommand.cpp
@@ -473,7 +473,7 @@ void FinalizerInfoDCmd::execute(DCmdSource source, TRAPS) {
 #if INCLUDE_SERVICES // Heap dumping/inspection supported
 HeapDumpDCmd::HeapDumpDCmd(outputStream* output, bool heap) :
                            DCmdWithParser(output, heap),
-  _filename("filename","Name of the dump file", "STRING",true),
+  _filename("filename","Name of the dump file", "FILE",true),
   _all("-all", "Dump all objects, including unreachable objects",
        "BOOLEAN", false, "false"),
   _gzip("-gz", "If specified, the heap dump is written in gzipped format "
@@ -852,20 +852,15 @@ void CodeCacheDCmd::execute(DCmdSource source, TRAPS) {
 }
 
 #ifdef LINUX
-#define DEFAULT_PERFMAP_FILENAME "/tmp/perf-<pid>.map"
-
 PerfMapDCmd::PerfMapDCmd(outputStream* output, bool heap) :
              DCmdWithParser(output, heap),
-  _filename("filename", "Name of the map file", "STRING", false, DEFAULT_PERFMAP_FILENAME)
+  _filename("filename", "Name of the map file", "FILE", false, DEFAULT_PERFMAP_FILENAME)
 {
   _dcmdparser.add_dcmd_argument(&_filename);
 }
 
 void PerfMapDCmd::execute(DCmdSource source, TRAPS) {
-  // The check for _filename.is_set() is because we don't want to use
-  // DEFAULT_PERFMAP_FILENAME, since it is meant as a description
-  // of the default, not the actual default.
-  CodeCache::write_perf_map(_filename.is_set() ? _filename.value() : nullptr, output());
+  CodeCache::write_perf_map(_filename.value(), output());
 }
 #endif // LINUX
 
@@ -997,12 +992,12 @@ void ClassesDCmd::execute(DCmdSource source, TRAPS) {
 }
 
 #if INCLUDE_CDS
-#define DEFAULT_CDS_ARCHIVE_FILENAME "java_pid<pid>_<subcmd>.jsa"
+#define DEFAULT_CDS_ARCHIVE_FILENAME "java_pid%p_<subcmd>.jsa"
 
 DumpSharedArchiveDCmd::DumpSharedArchiveDCmd(outputStream* output, bool heap) :
                                      DCmdWithParser(output, heap),
   _suboption("subcmd", "static_dump | dynamic_dump", "STRING", true),
-  _filename("filename", "Name of shared archive to be dumped", "STRING", false,
+  _filename("filename", "Name of shared archive to be dumped", "FILE", false,
             DEFAULT_CDS_ARCHIVE_FILENAME)
 {
   _dcmdparser.add_dcmd_argument(&_suboption);
@@ -1040,7 +1035,7 @@ void DumpSharedArchiveDCmd::execute(DCmdSource source, TRAPS) {
   // call CDS.dumpSharedArchive
   Handle fileh;
   if (file != nullptr) {
-    fileh =  java_lang_String::create_from_str(_filename.value(), CHECK);
+    fileh = java_lang_String::create_from_str(file, CHECK);
   }
   Symbol* cds_name  = vmSymbols::jdk_internal_misc_CDS();
   Klass*  cds_klass = SystemDictionary::resolve_or_fail(cds_name, true /*throw error*/,  CHECK);
@@ -1105,7 +1100,7 @@ ThreadDumpToFileDCmd::ThreadDumpToFileDCmd(outputStream* output, bool heap) :
                                            DCmdWithParser(output, heap),
   _overwrite("-overwrite", "May overwrite existing file", "BOOLEAN", false, "false"),
   _format("-format", "Output format (\"plain\" or \"json\")", "STRING", false, "plain"),
-  _filepath("filepath", "The file path to the output file", "STRING", true) {
+  _filepath("filepath", "The file path to the output file", "FILE", true) {
   _dcmdparser.add_dcmd_option(&_overwrite);
   _dcmdparser.add_dcmd_option(&_format);
   _dcmdparser.add_dcmd_argument(&_filepath);
@@ -1186,23 +1181,16 @@ void SystemMapDCmd::execute(DCmdSource source, TRAPS) {
   MemMapPrinter::print_all_mappings(output());
 }
 
-static constexpr char default_filename[] = "vm_memory_map_<pid>.txt";
+static constexpr char default_filename[] = "vm_memory_map_%p.txt";
 
 SystemDumpMapDCmd::SystemDumpMapDCmd(outputStream* output, bool heap) :
   DCmdWithParser(output, heap),
-  _filename("-F", "file path", "STRING", false, default_filename) {
+  _filename("-F", "file path", "FILE", false, default_filename) {
   _dcmdparser.add_dcmd_option(&_filename);
 }
 
 void SystemDumpMapDCmd::execute(DCmdSource source, TRAPS) {
-  stringStream defaultname;
-  const char* name = nullptr;
-  if (_filename.is_set()) {
-    name = _filename.value();
-  } else {
-    defaultname.print("vm_memory_map_%d.txt", os::current_process_id());
-    name = defaultname.base();
-  }
+  const char* name = _filename.value();
   fileStream fs(name);
   if (fs.is_open()) {
     if (!MemTracker::enabled()) {
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jcmd/JCmdTestDumpBase.java b/test/hotspot/jtreg/runtime/cds/appcds/jcmd/JCmdTestDumpBase.java
index ad7b8e97b81a2..eedefaa1ba16f 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jcmd/JCmdTestDumpBase.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jcmd/JCmdTestDumpBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -190,6 +190,10 @@ protected static OutputAnalyzer test(String fileName, long pid,
         PidJcmdExecutor cmdExecutor = new PidJcmdExecutor(String.valueOf(pid));
         OutputAnalyzer output = cmdExecutor.execute(jcmd, true/*silent*/);
 
+        if (archiveFileName.contains("%p")) {
+            archiveFileName = archiveFileName.replace("%p", "%d").formatted(pid);
+        }
+
         if (expectOK) {
             output.shouldHaveExitValue(0);
             checkFileExistence(archiveFileName, true);
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jcmd/JCmdTestStaticDump.java b/test/hotspot/jtreg/runtime/cds/appcds/jcmd/JCmdTestStaticDump.java
index a95eaf672c1dc..08ccf9b7f2af5 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jcmd/JCmdTestStaticDump.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jcmd/JCmdTestStaticDump.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -87,6 +87,13 @@ static void test() throws Exception {
         }
         app.stopApp();
 
+        // Test static dump with file name containing %p
+        print2ln(test_count++ + " Test static dump with given file name containing %p.");
+        app = createLingeredApp("-cp", allJars);
+        pid = app.getPid();
+        test("%p.jsa", pid, noBoot, EXPECT_PASS, STATIC_MESSAGES);
+        app.stopApp();
+
         //  Test static dump with flags with which dumping should fail
         //  This test will result classes.jsa in default server dir if -XX:SharedArchiveFile= not set.
         print2ln(test_count++ + " Test static dump with flags with which dumping should fail.");
diff --git a/test/hotspot/jtreg/serviceability/ParserTest.java b/test/hotspot/jtreg/serviceability/ParserTest.java
index 70d666d2ed0ab..7c304af243c2e 100644
--- a/test/hotspot/jtreg/serviceability/ParserTest.java
+++ b/test/hotspot/jtreg/serviceability/ParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
 
 import java.math.BigInteger;
 
+import jdk.test.lib.process.ProcessTools;
 import jdk.test.whitebox.parser.DiagnosticCommand;
 import jdk.test.whitebox.parser.DiagnosticCommand.DiagnosticArgumentType;
 import jdk.test.whitebox.WhiteBox;
@@ -49,6 +50,7 @@ public ParserTest() throws Exception {
         testQuotes();
         testMemorySize();
         testSingleLetterArg();
+        testFileName();
     }
 
     public static void main(String... args) throws Exception  {
@@ -159,6 +161,33 @@ public void testSingleLetterArg() throws Exception {
         parse("value", "v", "flag v", ' ', args);
     }
 
+    public void testFileName() throws Exception {
+        // --- Testing options
+        long pid = ProcessTools.getProcessId();
+
+        // Test pid gets injected into %p
+        String name = "name";
+        DiagnosticCommand arg = new DiagnosticCommand(name,
+                "desc", DiagnosticArgumentType.FILE,
+                false, null);
+        DiagnosticCommand[] args = {arg};
+        parse(name, "file%d.txt".formatted(pid), name + "=file%p.txt", args);
+
+        // Test custom file name with no %p
+        parse(name, "myFile.txt", name + "=myFile.txt", args);
+
+        // --- Testing arguments
+
+        // Test pid gets injected into %p
+        arg = new DiagnosticCommand(name, "desc", DiagnosticArgumentType.FILE, true,
+                false, null);
+        args = new DiagnosticCommand[]{arg};
+        parse(name, "file%d.txt".formatted(pid), "file%p.txt", args);
+
+        // Test custom file name with no %p
+        parse(name, "myFile.txt", "myFile.txt", args);
+    }
+
     public void testMemorySize() throws Exception {
         String name = "name";
         String defaultValue = "1024";
diff --git a/test/jdk/sun/tools/jcmd/TestJcmdPIDSubstitution.java b/test/jdk/sun/tools/jcmd/TestJcmdPIDSubstitution.java
new file mode 100644
index 0000000000000..f462ea1a52b0d
--- /dev/null
+++ b/test/jdk/sun/tools/jcmd/TestJcmdPIDSubstitution.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, Red Hat Inc.
+ * 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 8334492
+ * @summary Test to verify jcmd accepts %p in output filenames and substitutes for PID
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @run driver TestJcmdPIDSubstitution
+ *
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class TestJcmdPIDSubstitution {
+
+    private static final String FILENAME = "myfile%p";
+
+    public static void main(String[] args) throws Exception {
+        verifyOutputFilenames("Thread.dump_to_file", FILENAME);
+        verifyOutputFilenames("GC.heap_dump", FILENAME);
+        verifyOutputFilenames("Compiler.perfmap", FILENAME);
+        verifyOutputFilenames("System.dump_map", "-F=%s".formatted(FILENAME));
+    }
+
+    private static void verifyOutputFilenames(String... args) throws Exception {
+        long pid = ProcessTools.getProcessId();
+        String test_dir = System.getProperty("test.dir", ".");
+        Path path = Paths.get("%s/myfile%d".formatted(test_dir, pid));
+        OutputAnalyzer output = JcmdBase.jcmd(args);
+        output.shouldHaveExitValue(0);
+        if (Files.exists(path)) {
+            Files.delete(path);
+        } else {
+            throw new Exception("File %s was not created as expected for diagnostic cmd %s".formatted(path, args[0]));
+        }
+    }
+}
diff --git a/test/lib/jdk/test/whitebox/parser/DiagnosticCommand.java b/test/lib/jdk/test/whitebox/parser/DiagnosticCommand.java
index adb699bac6a41..6b7efa2dc8752 100644
--- a/test/lib/jdk/test/whitebox/parser/DiagnosticCommand.java
+++ b/test/lib/jdk/test/whitebox/parser/DiagnosticCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 public class DiagnosticCommand {
 
     public enum DiagnosticArgumentType {
-        JLONG, BOOLEAN, STRING, NANOTIME, STRINGARRAY, MEMORYSIZE
+        JLONG, BOOLEAN, STRING, NANOTIME, STRINGARRAY, MEMORYSIZE, FILE
     }
 
     private String name;

From 6c3ba5a6c47d29908ddaf58582ee8d26bb8779f9 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Tue, 30 Jul 2024 21:19:50 +0000
Subject: [PATCH 261/401] 8337415: Remove inappropriate Atomic access in
 FreeListAllocator

Reviewed-by: tschatzl, shade
---
 src/hotspot/share/gc/shared/freeListAllocator.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/gc/shared/freeListAllocator.cpp b/src/hotspot/share/gc/shared/freeListAllocator.cpp
index f33c6fcb14b6e..ef7d12ab0242f 100644
--- a/src/hotspot/share/gc/shared/freeListAllocator.cpp
+++ b/src/hotspot/share/gc/shared/freeListAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -88,7 +88,7 @@ void FreeListAllocator::delete_list(FreeNode* list) {
 FreeListAllocator::~FreeListAllocator() {
   uint index = Atomic::load(&_active_pending_list);
   NodeList pending_list = _pending_lists[index].take_all();
-  delete_list(Atomic::load(&pending_list._head));
+  delete_list(pending_list._head);
   delete_list(_free_list.pop_all());
 }
 
@@ -106,7 +106,7 @@ size_t FreeListAllocator::free_count() const {
 
 size_t FreeListAllocator::pending_count() const {
   uint index = Atomic::load(&_active_pending_list);
-  return _pending_lists[index].count();;
+  return _pending_lists[index].count();
 }
 
 // To solve the ABA problem, popping a node from the _free_list is performed within

From d39e7af2e5d28df43c0b2dad770f41adede5cc29 Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Tue, 30 Jul 2024 22:35:14 +0000
Subject: [PATCH 262/401] 8320561: Inconsistency in monitorinflation logging

Reviewed-by: stefank, shade
---
 src/hotspot/share/runtime/synchronizer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/runtime/synchronizer.cpp b/src/hotspot/share/runtime/synchronizer.cpp
index 047f6703b545c..2d45163d0f4a2 100644
--- a/src/hotspot/share/runtime/synchronizer.cpp
+++ b/src/hotspot/share/runtime/synchronizer.cpp
@@ -2074,7 +2074,7 @@ void ObjectSynchronizer::chk_in_use_entry(ObjectMonitor* n, outputStream* out,
 void ObjectSynchronizer::log_in_use_monitor_details(outputStream* out, bool log_all) {
   if (_in_use_list.count() > 0) {
     stringStream ss;
-    out->print_cr("In-use monitor info:");
+    out->print_cr("In-use monitor info%s:", log_all ? "" : " (eliding idle monitors)");
     out->print_cr("(B -> is_busy, H -> has hash code, L -> lock status)");
     out->print_cr("%18s  %s  %18s  %18s",
                   "monitor", "BHL", "object", "object type");

From 5b7bb40d1f5a8e1261cc252db2a09b5e4f07e5f0 Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Tue, 30 Jul 2024 22:35:28 +0000
Subject: [PATCH 263/401] 8325002: Exceptions::fthrow needs to ensure it
 truncates to a valid utf8 string

Reviewed-by: djelinski, stuefe
---
 src/hotspot/share/utilities/exceptions.cpp |  27 +++++-
 src/hotspot/share/utilities/utf8.cpp       |  63 +++++++++++++
 src/hotspot/share/utilities/utf8.hpp       |   3 +-
 test/hotspot/gtest/utilities/test_utf8.cpp | 104 ++++++++++++++++++++-
 4 files changed, 194 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/utilities/exceptions.cpp b/src/hotspot/share/utilities/exceptions.cpp
index c8f458dfa31ad..034444839ab50 100644
--- a/src/hotspot/share/utilities/exceptions.cpp
+++ b/src/hotspot/share/utilities/exceptions.cpp
@@ -43,6 +43,7 @@
 #include "runtime/atomic.hpp"
 #include "utilities/events.hpp"
 #include "utilities/exceptions.hpp"
+#include "utilities/utf8.hpp"
 
 // Limit exception message components to 64K (the same max as Symbols)
 #define MAX_LEN 65535
@@ -262,8 +263,32 @@ void Exceptions::fthrow(JavaThread* thread, const char* file, int line, Symbol*
   va_list ap;
   va_start(ap, format);
   char msg[max_msg_size];
-  os::vsnprintf(msg, max_msg_size, format, ap);
+  int ret = os::vsnprintf(msg, max_msg_size, format, ap);
   va_end(ap);
+
+  // If ret == -1 then either there was a format conversion error, or the required buffer size
+  // exceeds INT_MAX and so couldn't be returned (undocumented behaviour of vsnprintf). Depending
+  // on the platform the buffer may be filled to its capacity (Linux), filled to the conversion
+  // that encountered the overflow (macOS), or is empty (Windows), so it is possible we
+  // have a truncated UTF-8 sequence. Similarly, if the buffer was too small and ret >= max_msg_size
+  // we may also have a truncated UTF-8 sequence. In such cases we need to fix the buffer so the UTF-8
+  // sequence is valid.
+  if (ret == -1 || ret >= max_msg_size) {
+    int len = (int) strlen(msg);
+    if (len > 0) {
+      // Truncation will only happen if the buffer was filled by vsnprintf,
+      // otherwise vsnprintf already terminated filling it at a well-defined point.
+      // But as this is not a clearly specified area we will perform our own UTF8
+      // truncation anyway - though for those well-defined termination points it
+      // will be a no-op.
+      UTF8::truncate_to_legal_utf8((unsigned char*)msg, len + 1);
+    }
+  }
+  // UTF8::is_legal_utf8 should actually be called is_legal_utf8_class_name as the final
+  // parameter controls a check for a specific character appearing in the "name", which is only
+  // allowed for classfile versions <= 47. We pass `true` so that we allow such strings as this code
+  // know nothing about the actual string content.
+  assert(UTF8::is_legal_utf8((const unsigned char*)msg, (int)strlen(msg), true), "must be");
   _throw_msg(thread, file, line, h_name, msg);
 }
 
diff --git a/src/hotspot/share/utilities/utf8.cpp b/src/hotspot/share/utilities/utf8.cpp
index 6fd877120df40..47cbb04da4b2c 100644
--- a/src/hotspot/share/utilities/utf8.cpp
+++ b/src/hotspot/share/utilities/utf8.cpp
@@ -392,6 +392,69 @@ bool UTF8::is_legal_utf8(const unsigned char* buffer, int length,
   return true;
 }
 
+// Return true if `b` could be the starting byte of an encoded 2,3 or 6
+// byte sequence.
+static bool is_starting_byte(unsigned char b) {
+  return b >= 0xC0 && b <= 0xEF;
+}
+
+// Takes an incoming buffer that was valid UTF-8, but which has been truncated such that
+// the last encoding may be partial, and returns the same buffer with a NUL-terminator
+// inserted such that any partial encoding has gone.
+// Note: if the incoming buffer is already valid then we may still drop the last encoding.
+// To avoid that the caller can choose to check for validity first.
+// The incoming buffer is still expected to be NUL-terminated.
+// The incoming buffer is expected to be a realistic size - we assert if it is too small.
+void UTF8::truncate_to_legal_utf8(unsigned char* buffer, int length) {
+  assert(length > 5, "invalid length");
+  assert(buffer[length - 1] == '\0', "Buffer should be NUL-terminated");
+
+  if (buffer[length - 2] < 128) {  // valid "ascii" - common case
+    return;
+  }
+
+  // Modified UTF-8 encodes characters in sequences of 1, 2, 3 or 6 bytes.
+  // The last byte is invalid if it is:
+  // - the 1st byte of a 2, 3 or 6 byte sequence
+  //     0b110xxxxx
+  //     0b1110xxxx
+  //     0b11101101
+  // - the 2nd byte of a 3 or 6 byte sequence
+  //     0b10xxxxxx
+  //     0b1010xxxx
+  // - the 3rd, 4th or 5th byte of a 6 byte sequence
+  //     0b10xxxxxx
+  //     0b11101101
+  //     0b1011xxxx
+  //
+  // Rather than checking all possible situations we simplify things noting that as we have already
+  // got a truncated string, then dropping one more character is not significant. So we work from the
+  // end of the buffer looking for the first byte that can be the starting byte of a UTF-8 encoded sequence,
+  // then we insert NUL at that location to terminate the buffer. There is an added complexity with 6 byte
+  // encodings as the first and fourth bytes are the same and overlap with the 3 byte encoding.
+
+  for (int index = length - 2; index > 0; index--) {
+    if (is_starting_byte(buffer[index])) {
+      if (buffer[index] == 0xED) {
+        // Could be first byte of 3 or 6, or fourth byte of 6.
+        // If fourth the previous three bytes will encode a high
+        // surrogate value in the range EDA080 to EDAFBF. We only
+        // need to check for EDA to establish this as the "missing"
+        // values in EDAxxx would not be valid 3 byte encodings.
+        if ((index - 3) >= 0 &&
+            (buffer[index - 3] == 0xED) &&
+            ((buffer[index - 2] & 0xF0) == 0xA0)) {
+          assert(buffer[index - 1] >= 0x80 && buffer[index - 1] <= 0xBF, "sanity check");
+          // It was fourth byte so truncate 3 bytes earlier
+          index -= 3;
+        }
+      }
+      buffer[index] = '\0';
+      break;
+    }
+  }
+}
+
 //-------------------------------------------------------------------------------------
 
 bool UNICODE::is_latin1(jchar c) {
diff --git a/src/hotspot/share/utilities/utf8.hpp b/src/hotspot/share/utilities/utf8.hpp
index 80346f7da7ddb..9a18dd0ff93b7 100644
--- a/src/hotspot/share/utilities/utf8.hpp
+++ b/src/hotspot/share/utilities/utf8.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -88,6 +88,7 @@ class UTF8 : AllStatic {
 
   static bool   is_legal_utf8(const unsigned char* buffer, int length,
                               bool version_leq_47);
+  static void   truncate_to_legal_utf8(unsigned char* buffer, int length);
 };
 
 
diff --git a/test/hotspot/gtest/utilities/test_utf8.cpp b/test/hotspot/gtest/utilities/test_utf8.cpp
index ffd8121075be8..80f6671207bbd 100644
--- a/test/hotspot/gtest/utilities/test_utf8.cpp
+++ b/test/hotspot/gtest/utilities/test_utf8.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,8 @@
  */
 
 #include "precompiled.hpp"
+#include "nmt/memflags.hpp"
+#include "runtime/os.hpp"
 #include "utilities/utf8.hpp"
 #include "unittest.hpp"
 
@@ -101,5 +103,105 @@ TEST_VM(utf8, jbyte_length) {
     UNICODE::as_utf8(str, 19, res, i);
     EXPECT_TRUE(test_stamp(res + i, sizeof(res) - i));
   }
+}
+
+TEST_VM(utf8, truncation) {
+
+  // Test that truncation removes partial encodings as expected.
+
+  const char orig_bytes[] = { 'A', 'B', 'C', 'D', 'E', '\0' };
+  const int orig_length = sizeof(orig_bytes)/sizeof(char);
+  ASSERT_TRUE(UTF8::is_legal_utf8((const unsigned char*)orig_bytes, orig_length - 1, false));
+  const char* orig_str = &orig_bytes[0];
+  ASSERT_EQ((int)strlen(orig_str), orig_length - 1);
+
+  unsigned char* temp_bytes;
+  const char* temp_str;
+  char* utf8;
+  int n_utf8; // Number of bytes in the encoding
+
+  // Test 1: a valid UTF8 "ascii" ending string should be returned as-is
+
+  temp_bytes = (unsigned char*) os::malloc(sizeof(unsigned char) * orig_length, mtTest);
+  strcpy((char*)temp_bytes, orig_str);
+  temp_str = (const char*) temp_bytes;
+  UTF8::truncate_to_legal_utf8(temp_bytes, orig_length);
+  ASSERT_EQ((int)strlen(temp_str), orig_length - 1) << "bytes should be unchanged";
+  ASSERT_EQ(strcmp(orig_str, temp_str), 0) << "bytes should be unchanged";
+  os::free(temp_bytes);
+
+  // Test 2: a UTF8 sequence that "ends" with a 2-byte encoding
+  //         drops the 2-byte encoding
+
+  jchar two_byte_char[] = { 0x00D1 }; // N with tilde
+  n_utf8 = 2;
+  utf8 = (char*) os::malloc(sizeof(char) * (n_utf8 + 1), mtTest); // plus NUL
+  UNICODE::convert_to_utf8(two_byte_char, 1, utf8);
+  int utf8_len = (int)strlen(utf8);
+  ASSERT_EQ(utf8_len, n_utf8) << "setup error";
+
+  // Now drop zero or one byte from the end and check it truncates as expected
+  for (int drop = 0; drop < n_utf8; drop++) {
+    int temp_len = orig_length + utf8_len - drop;
+    temp_bytes = (unsigned char*) os::malloc(sizeof(unsigned char) * temp_len, mtTest);
+    temp_str = (const char*) temp_bytes;
+    strcpy((char*)temp_bytes, orig_str);
+    strncat((char*)temp_bytes, utf8, utf8_len - drop);
+    ASSERT_EQ((int)strlen(temp_str), temp_len - 1) << "setup error";
+    UTF8::truncate_to_legal_utf8(temp_bytes, temp_len);
+    ASSERT_EQ((int)strlen(temp_str), orig_length - 1) << "bytes should be truncated to original length";
+    ASSERT_EQ(strcmp(orig_str, temp_str), 0) << "bytes should be truncated to original";
+    os::free(temp_bytes);
+  }
+  os::free(utf8);
+
+  // Test 3: a UTF8 sequence that "ends" with a 3-byte encoding
+  //         drops the 3-byte encoding
+  n_utf8 = 3;
+  jchar three_byte_char[] = { 0x0800 };
+  utf8 = (char*) os::malloc(sizeof(char) * (n_utf8 + 1), mtTest); // plus NUL
+  UNICODE::convert_to_utf8(three_byte_char, 1, utf8);
+  utf8_len = (int)strlen(utf8);
+  ASSERT_EQ(utf8_len, n_utf8) << "setup error";
+
+  // Now drop zero, to two bytes from the end and check it truncates as expected
+  for (int drop = 0; drop < n_utf8; drop++) {
+    int temp_len = orig_length + utf8_len - drop;
+    temp_bytes = (unsigned char*) os::malloc(sizeof(unsigned char) * temp_len, mtTest);
+    temp_str = (const char*) temp_bytes;
+    strcpy((char*)temp_bytes, orig_str);
+    strncat((char*)temp_bytes, utf8, utf8_len - drop);
+    ASSERT_EQ((int)strlen(temp_str), temp_len - 1) << "setup error";
+    UTF8::truncate_to_legal_utf8(temp_bytes, temp_len);
+    ASSERT_EQ((int)strlen(temp_str), orig_length - 1) << "bytes should be truncated to original length";
+    ASSERT_EQ(strcmp(orig_str, temp_str), 0) << "bytes should be truncated to original";
+    os::free(temp_bytes);
+  }
+  os::free(utf8);
+
+  // Test 4: a UTF8 sequence that "ends" with a 6-byte encoding
+  //         drops the 6-byte encoding
+  n_utf8 = 6;
+  jchar six_byte_char[] = { 0xD801, 0xDC37 }; // U+10437 as its UTF-16 surrogate pairs
+  utf8 = (char*) os::malloc(sizeof(char) * (n_utf8 + 1), mtTest); // plus NUL
+  UNICODE::convert_to_utf8(six_byte_char, 2, utf8);
+  utf8_len = (int)strlen(utf8);
+  ASSERT_EQ(utf8_len, n_utf8) << "setup error";
+
+  // Now drop zero to five bytes from the end and check it truncates as expected
+  for (int drop = 0; drop < n_utf8; drop++) {
+    int temp_len = orig_length + utf8_len - drop;
+    temp_bytes = (unsigned char*) os::malloc(sizeof(unsigned char) * temp_len, mtTest);
+    temp_str = (const char*) temp_bytes;
+    strcpy((char*)temp_bytes, orig_str);
+    strncat((char*)temp_bytes, utf8, utf8_len - drop);
+    ASSERT_EQ((int)strlen(temp_str), temp_len - 1) << "setup error";
+    UTF8::truncate_to_legal_utf8(temp_bytes, temp_len);
+    ASSERT_EQ((int)strlen(temp_str), orig_length - 1) << "bytes should be truncated to original length";
+    ASSERT_EQ(strcmp(orig_str, temp_str), 0) << "bytes should be truncated to original";
+    os::free(temp_bytes);
+  }
+  os::free(utf8);
+
 
 }

From 1c6fef8f1cd12b26de9d31799a6516ce4399313f Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Wed, 31 Jul 2024 00:58:52 +0000
Subject: [PATCH 264/401] 8337515: JVM_DumpAllStacks is dead code

Reviewed-by: kvn
---
 src/hotspot/share/include/jvm.h | 3 ---
 src/hotspot/share/prims/jvm.cpp | 8 --------
 2 files changed, 11 deletions(-)

diff --git a/src/hotspot/share/include/jvm.h b/src/hotspot/share/include/jvm.h
index a18e9bffc85df..6082af55487e2 100644
--- a/src/hotspot/share/include/jvm.h
+++ b/src/hotspot/share/include/jvm.h
@@ -295,9 +295,6 @@ JVM_HoldsLock(JNIEnv *env, jclass threadClass, jobject obj);
 JNIEXPORT jobject JNICALL
 JVM_GetStackTrace(JNIEnv *env, jobject thread);
 
-JNIEXPORT void JNICALL
-JVM_DumpAllStacks(JNIEnv *env, jclass unused);
-
 JNIEXPORT jobjectArray JNICALL
 JVM_GetAllThreads(JNIEnv *env, jclass dummy);
 
diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
index 7a8c07477dcb7..6aabb65ca4023 100644
--- a/src/hotspot/share/prims/jvm.cpp
+++ b/src/hotspot/share/prims/jvm.cpp
@@ -3119,14 +3119,6 @@ JVM_ENTRY(jobject, JVM_GetStackTrace(JNIEnv *env, jobject jthread))
   return JNIHandles::make_local(THREAD, trace);
 JVM_END
 
-JVM_ENTRY(void, JVM_DumpAllStacks(JNIEnv* env, jclass))
-  VM_PrintThreads op;
-  VMThread::execute(&op);
-  if (JvmtiExport::should_post_data_dump()) {
-    JvmtiExport::post_data_dump();
-  }
-JVM_END
-
 JVM_ENTRY(void, JVM_SetNativeThreadName(JNIEnv* env, jobject jthread, jstring name))
   // We don't use a ThreadsListHandle here because the current thread
   // must be alive.

From e63d01654e0b702b3a8c0c4de97a6bb6893fbd1f Mon Sep 17 00:00:00 2001
From: Ashutosh Mehra <asmehra@openjdk.org>
Date: Wed, 31 Jul 2024 01:36:37 +0000
Subject: [PATCH 265/401] 8337031: Improvements to CompilationMemoryStatistic

Reviewed-by: kvn, stuefe
---
 .../compiler/compilationMemoryStatistic.cpp   | 145 ++++++++++--------
 .../compiler/compilationMemoryStatistic.hpp   |  54 +++++--
 src/hotspot/share/memory/arena.cpp            |  13 ++
 src/hotspot/share/memory/arena.hpp            |  24 ++-
 .../print/CompileCommandPrintMemStat.java     |  11 +-
 .../compiler/CompilerMemoryStatisticTest.java |   6 +-
 6 files changed, 155 insertions(+), 98 deletions(-)

diff --git a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
index 07d8ec41598d9..4cc2043656efa 100644
--- a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
+++ b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
@@ -51,29 +51,36 @@
 #include "utilities/quickSort.hpp"
 #include "utilities/resourceHash.hpp"
 
-ArenaStatCounter::ArenaStatCounter() :
-  _current(0), _start(0), _peak(0),
-  _na(0), _ra(0),
-  _limit(0), _hit_limit(false), _limit_in_process(false),
-  _na_at_peak(0), _ra_at_peak(0), _live_nodes_at_peak(0)
-{}
-
-size_t ArenaStatCounter::peak_since_start() const {
-  return _peak > _start ? _peak - _start : 0;
+ArenaStatCounter::ArenaStatCounter() {
+  reset();
+}
+
+void ArenaStatCounter::reset() {
+  _current = 0;
+  _peak = 0;
+  _current_by_tag.clear();
+  _peak_by_tag.clear();
+  _limit = 0;
+  _hit_limit = false;
+  _limit_in_process = false;
+  _live_nodes_at_peak = 0;
+  _active = false;
 }
 
 void ArenaStatCounter::start(size_t limit) {
-  _peak = _start = _current;
+  reset();
+  _active = true;
   _limit = limit;
-  _hit_limit = false;
 }
 
-void ArenaStatCounter::end(){
+void ArenaStatCounter::end() {
   _limit = 0;
   _hit_limit = false;
+  _active = false;
 }
 
 void ArenaStatCounter::update_c2_node_count() {
+  assert(_active, "compilaton has not yet started");
 #ifdef COMPILER2
   CompilerThread* const th = Thread::current()->as_Compiler_thread();
   const CompileTask* const task = th->task();
@@ -90,33 +97,27 @@ void ArenaStatCounter::update_c2_node_count() {
 
 // Account an arena allocation or de-allocation.
 bool ArenaStatCounter::account(ssize_t delta, int tag) {
+  assert(_active, "compilaton has not yet started");
   bool rc = false;
 #ifdef ASSERT
   // Note: if this fires, we free more arena memory under the scope of the
   // CompilationMemoryHistoryMark than we allocate. This cannot be since we
   // assume arena allocations in CompilerThread to be stack bound and symmetric.
   assert(delta >= 0 || ((ssize_t)_current + delta) >= 0,
-         "Negative overflow (d=%zd %zu %zu %zu)", delta, _current, _start, _peak);
+         "Negative overflow (d=%zd %zu %zu)", delta, _current, _peak);
 #endif
   // Update totals
   _current += delta;
-  // Update detail counter
-  switch ((Arena::Tag)tag) {
-    case Arena::Tag::tag_ra: _ra += delta; break;
-    case Arena::Tag::tag_node: _na += delta; break;
-    default: // ignore
-      break;
-  };
+  _current_by_tag.add(tag, delta);
   // Did we reach a peak?
   if (_current > _peak) {
     _peak = _current;
-    assert(delta > 0, "Sanity (%zu %zu %zu)", _current, _start, _peak);
-    _na_at_peak = _na;
-    _ra_at_peak = _ra;
+    assert(delta > 0, "Sanity (%zu %zu)", _current, _peak);
     update_c2_node_count();
+    _peak_by_tag = _current_by_tag;
     rc = true;
     // Did we hit the memory limit?
-    if (!_hit_limit && _limit > 0 && peak_since_start() > _limit) {
+    if (!_hit_limit && _limit > 0 && _peak > _limit) {
       _hit_limit = true;
     }
   }
@@ -124,9 +125,15 @@ bool ArenaStatCounter::account(ssize_t delta, int tag) {
 }
 
 void ArenaStatCounter::print_on(outputStream* st) const {
-  st->print("%zu [na %zu ra %zu]", peak_since_start(), _na_at_peak, _ra_at_peak);
+  st->print("%zu [", _peak);
+  for (int tag = 0; tag < _peak_by_tag.element_count(); tag++) {
+    if (_peak_by_tag.counter(tag) > 0) {
+      st->print("%s %zu ", _peak_by_tag.tag_name(tag), _peak_by_tag.counter(tag));
+    }
+  }
+  st->print("]");
 #ifdef ASSERT
-  st->print(" (%zu->%zu->%zu)", _start, _peak, _current);
+  st->print(" (%zu->%zu)", _peak, _current);
 #endif
 }
 
@@ -186,10 +193,8 @@ class MemStatEntry : public CHeapObj<mtInternal> {
 
   // peak usage, bytes, over all arenas
   size_t _total;
-  // usage in node arena when total peaked
-  size_t _na_at_peak;
-  // usage in resource area when total peaked
-  size_t _ra_at_peak;
+  // usage per arena tag when total peaked
+  ArenaCountersByTag _peak_by_tag;
   // number of nodes (c2 only) when total peaked
   unsigned _live_nodes_at_peak;
   const char* _result;
@@ -199,8 +204,9 @@ class MemStatEntry : public CHeapObj<mtInternal> {
   MemStatEntry(FullMethodName method)
     : _method(method), _comptype(compiler_c1),
       _time(0), _num_recomp(0), _thread(nullptr), _limit(0),
-      _total(0), _na_at_peak(0), _ra_at_peak(0), _live_nodes_at_peak(0),
+      _total(0), _live_nodes_at_peak(0),
       _result(nullptr) {
+    _peak_by_tag.clear();
   }
 
   void set_comptype(CompilerType comptype) { _comptype = comptype; }
@@ -210,8 +216,7 @@ class MemStatEntry : public CHeapObj<mtInternal> {
   void inc_recompilation() { _num_recomp++; }
 
   void set_total(size_t n) { _total = n; }
-  void set_na_at_peak(size_t n) { _na_at_peak = n; }
-  void set_ra_at_peak(size_t n) { _ra_at_peak = n; }
+  void set_peak_by_tag(ArenaCountersByTag peak_by_tag) { _peak_by_tag = peak_by_tag; }
   void set_live_nodes_at_peak(unsigned n) { _live_nodes_at_peak = n; }
 
   void set_result(const char* s) { _result = s; }
@@ -219,21 +224,34 @@ class MemStatEntry : public CHeapObj<mtInternal> {
   size_t total() const { return _total; }
 
   static void print_legend(outputStream* st) {
+#define LEGEND_KEY_FMT "%11s"
     st->print_cr("Legend:");
-    st->print_cr("  total  : memory allocated via arenas while compiling");
-    st->print_cr("  NA     : ...how much in node arenas (if c2)");
-    st->print_cr("  RA     : ...how much in resource areas");
-    st->print_cr("  result : Result: 'ok' finished successfully, 'oom' hit memory limit, 'err' compilation failed");
-    st->print_cr("  #nodes : ...how many nodes (c2 only)");
-    st->print_cr("  limit  : memory limit, if set");
-    st->print_cr("  time   : time of last compilation (sec)");
-    st->print_cr("  type   : compiler type");
-    st->print_cr("  #rc    : how often recompiled");
-    st->print_cr("  thread : compiler thread");
+    st->print_cr("  " LEGEND_KEY_FMT ": %s", "total", "memory allocated via arenas while compiling");
+    for (int tag = 0; tag < Arena::tag_count(); tag++) {
+      st->print_cr("  " LEGEND_KEY_FMT ": %s", Arena::tag_name[tag], Arena::tag_desc[tag]);
+    }
+    st->print_cr("  " LEGEND_KEY_FMT ": %s", "result", "Result: 'ok' finished successfully, 'oom' hit memory limit, 'err' compilation failed");
+    st->print_cr("  " LEGEND_KEY_FMT ": %s", "#nodes", "...how many nodes (c2 only)");
+    st->print_cr("  " LEGEND_KEY_FMT ": %s", "limit", "memory limit, if set");
+    st->print_cr("  " LEGEND_KEY_FMT ": %s", "time", "time taken for last compilation (sec)");
+    st->print_cr("  " LEGEND_KEY_FMT ": %s", "type", "compiler type");
+    st->print_cr("  " LEGEND_KEY_FMT ": %s", "#rc", "how often recompiled");
+    st->print_cr("  " LEGEND_KEY_FMT ": %s", "thread", "compiler thread");
+#undef LEGEND_KEY_FMT
   }
 
   static void print_header(outputStream* st) {
-    st->print_cr("total     NA        RA        result  #nodes  limit   time    type  #rc thread              method");
+#define SIZE_FMT "%-10s"
+    st->print(SIZE_FMT, "total");
+    for (int tag = 0; tag < Arena::tag_count(); tag++) {
+      st->print(SIZE_FMT, Arena::tag_name[tag]);
+    }
+#define HDR_FMT1 "%-8s%-8s%-8s%-8s"
+#define HDR_FMT2 "%-6s%-4s%-19s%s"
+
+    st->print(HDR_FMT1, "result", "#nodes", "limit", "time");
+    st->print(HDR_FMT2, "type", "#rc", "thread", "method");
+    st->print_cr("");
   }
 
   void print_on(outputStream* st, bool human_readable) const {
@@ -247,21 +265,14 @@ class MemStatEntry : public CHeapObj<mtInternal> {
     }
     col += 10; st->fill_to(col);
 
-    // NA
-    if (human_readable) {
-      st->print(PROPERFMT " ", PROPERFMTARGS(_na_at_peak));
-    } else {
-      st->print("%zu ", _na_at_peak);
-    }
-    col += 10; st->fill_to(col);
-
-    // RA
-    if (human_readable) {
-      st->print(PROPERFMT " ", PROPERFMTARGS(_ra_at_peak));
-    } else {
-      st->print("%zu ", _ra_at_peak);
+    for (int tag = 0; tag < Arena::tag_count(); tag++) {
+      if (human_readable) {
+        st->print(PROPERFMT " ", PROPERFMTARGS(_peak_by_tag.counter(tag)));
+      } else {
+        st->print("%zu ", _peak_by_tag.counter(tag));
+      }
+      col += 10; st->fill_to(col);
     }
-    col += 10; st->fill_to(col);
 
     // result?
     st->print("%s ", _result ? _result : "");
@@ -296,7 +307,7 @@ class MemStatEntry : public CHeapObj<mtInternal> {
     col += 4; st->fill_to(col);
 
     // Thread
-    st->print(PTR_FORMAT "  ", p2i(_thread));
+    st->print(PTR_FORMAT " ", p2i(_thread));
 
     // MethodName
     char buf[1024];
@@ -341,7 +352,7 @@ class MemStatTable :
 public:
 
   void add(const FullMethodName& fmn, CompilerType comptype,
-           size_t total, size_t na_at_peak, size_t ra_at_peak,
+           size_t total, ArenaCountersByTag peak_by_tag,
            unsigned live_nodes_at_peak, size_t limit, const char* result) {
     assert_lock_strong(NMTCompilationCostHistory_lock);
     MemStatTableKey key(fmn, comptype);
@@ -360,8 +371,7 @@ class MemStatTable :
     e->set_comptype(comptype);
     e->inc_recompilation();
     e->set_total(total);
-    e->set_na_at_peak(na_at_peak);
-    e->set_ra_at_peak(ra_at_peak);
+    e->set_peak_by_tag(peak_by_tag);
     e->set_live_nodes_at_peak(live_nodes_at_peak);
     e->set_limit(limit);
     e->set_result(result);
@@ -427,7 +437,7 @@ void CompilationMemoryStatistic::on_end_compilation() {
   const bool print = directive->should_print_memstat();
 
   // Store memory used in task, for later processing by JFR
-  task->set_arena_bytes(arena_stat->peak_since_start());
+  task->set_arena_bytes(arena_stat->peak());
 
   // Store result
   // For this to work, we must call on_end_compilation() at a point where
@@ -447,9 +457,8 @@ void CompilationMemoryStatistic::on_end_compilation() {
     assert(_the_table != nullptr, "not initialized");
 
     _the_table->add(fmn, ct,
-                    arena_stat->peak_since_start(), // total
-                    arena_stat->na_at_peak(),
-                    arena_stat->ra_at_peak(),
+                    arena_stat->peak(), // total
+                    arena_stat->peak_by_tag(),
                     arena_stat->live_nodes_at_peak(),
                     arena_stat->limit(),
                     result);
@@ -511,7 +520,7 @@ void CompilationMemoryStatistic::on_arena_change(ssize_t diff, const Arena* aren
 
   bool hit_limit_before = arena_stat->hit_limit();
 
-  if (arena_stat->account(diff, (int)arena->get_tag())) { // new peak?
+  if (arena_stat->is_active() && arena_stat->account(diff, (int)arena->get_tag())) { // new peak?
 
     // Limit handling
     if (arena_stat->hit_limit()) {
@@ -545,7 +554,7 @@ void CompilationMemoryStatistic::on_arena_change(ssize_t diff, const Arena* aren
         }
         ss.print("Hit MemLimit %s(limit: %zu now: %zu)",
                  (hit_limit_before ? "again " : ""),
-                 arena_stat->limit(), arena_stat->peak_since_start());
+                 arena_stat->limit(), arena_stat->peak());
       }
 
       // log if needed
diff --git a/src/hotspot/share/compiler/compilationMemoryStatistic.hpp b/src/hotspot/share/compiler/compilationMemoryStatistic.hpp
index d7cccad17fda8..d669cc1472295 100644
--- a/src/hotspot/share/compiler/compilationMemoryStatistic.hpp
+++ b/src/hotspot/share/compiler/compilationMemoryStatistic.hpp
@@ -29,48 +29,70 @@
 #include "compiler/compilerDefinitions.hpp"
 #include "memory/allocation.hpp"
 #include "memory/allStatic.hpp"
+#include "memory/arena.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 class outputStream;
 class Symbol;
 class DirectiveSet;
 
-// Counters for allocations from one arena
+// Helper class to wrap the array of arena tags for easier processing
+class ArenaCountersByTag {
+private:
+  size_t _counter[Arena::tag_count()];
+
+public:
+  int element_count() const { return Arena::tag_count(); }
+  const char* tag_name(int tag) const { return Arena::tag_name[tag]; }
+
+  size_t  counter(int tag) const {
+    assert(tag < element_count(), "invalid tag %d", tag);
+    return _counter[tag];
+  }
+
+  void add(int tag, size_t value) {
+    assert(tag < element_count(), "invalid tag %d", tag);
+    _counter[tag] += value;
+  }
+
+  void clear() {
+    memset(_counter, 0, sizeof(size_t) * element_count());
+  }
+};
+
+// Counters for allocations from arenas during compilation
 class ArenaStatCounter : public CHeapObj<mtCompiler> {
   // Current bytes, total
   size_t _current;
-  // bytes when compilation started
-  size_t _start;
   // bytes at last peak, total
   size_t _peak;
-  // Current bytes used for node arenas, total
-  size_t _na;
-  // Current bytes used for resource areas
-  size_t _ra;
+  // Current bytes used by arenas per tag
+  ArenaCountersByTag _current_by_tag;
+  // Peak composition:
+  ArenaCountersByTag _peak_by_tag;
   // MemLimit handling
   size_t _limit;
   bool _hit_limit;
   bool _limit_in_process;
 
-  // Peak composition:
-  // Size of node arena when total peaked (c2 only)
-  size_t _na_at_peak;
-  // Size of resource area when total peaked
-  size_t _ra_at_peak;
+  // When to start accounting
+  bool _active;
+
   // Number of live nodes when total peaked (c2 only)
   unsigned _live_nodes_at_peak;
 
   void update_c2_node_count();
 
+  void reset();
+
 public:
   ArenaStatCounter();
 
   // Size of peak since last compilation
-  size_t peak_since_start() const;
+  size_t peak() const { return _peak; }
 
   // Peak details
-  size_t na_at_peak() const { return _na_at_peak; }
-  size_t ra_at_peak() const { return _ra_at_peak; }
+  ArenaCountersByTag peak_by_tag() const { return _peak_by_tag; }
   unsigned live_nodes_at_peak() const { return _live_nodes_at_peak; }
 
   // Mark the start and end of a compilation.
@@ -89,7 +111,7 @@ class ArenaStatCounter : public CHeapObj<mtCompiler> {
   bool   hit_limit() const          { return _hit_limit; }
   bool   limit_in_process() const     { return _limit_in_process; }
   void   set_limit_in_process(bool v) { _limit_in_process = v; }
-
+  bool   is_active() const          { return _active; }
 };
 
 class CompilationMemoryStatistic : public AllStatic {
diff --git a/src/hotspot/share/memory/arena.cpp b/src/hotspot/share/memory/arena.cpp
index 0399c6922e38d..435a8cfdd584f 100644
--- a/src/hotspot/share/memory/arena.cpp
+++ b/src/hotspot/share/memory/arena.cpp
@@ -44,6 +44,19 @@ STATIC_ASSERT(is_aligned((int)Chunk::init_size, ARENA_AMALLOC_ALIGNMENT));
 STATIC_ASSERT(is_aligned((int)Chunk::medium_size, ARENA_AMALLOC_ALIGNMENT));
 STATIC_ASSERT(is_aligned((int)Chunk::size, ARENA_AMALLOC_ALIGNMENT));
 
+
+const char* Arena::tag_name[] = {
+#define ARENA_TAG_STRING(name, str, desc) XSTR(name),
+  DO_ARENA_TAG(ARENA_TAG_STRING)
+#undef ARENA_TAG_STRING
+};
+
+const char* Arena::tag_desc[] = {
+#define ARENA_TAG_DESC(name, str, desc) XSTR(desc),
+  DO_ARENA_TAG(ARENA_TAG_DESC)
+#undef ARENA_TAG_DESC
+};
+
 // MT-safe pool of same-sized chunks to reduce malloc/free thrashing
 // NB: not using Mutex because pools are used before Threads are initialized
 class ChunkPool {
diff --git a/src/hotspot/share/memory/arena.hpp b/src/hotspot/share/memory/arena.hpp
index 1ca8a78782541..1f3c5eb4e8bac 100644
--- a/src/hotspot/share/memory/arena.hpp
+++ b/src/hotspot/share/memory/arena.hpp
@@ -83,17 +83,29 @@ class Chunk {
   bool contains(char* p) const  { return bottom() <= p && p <= top(); }
 };
 
+#define DO_ARENA_TAG(FN) \
+  FN(other, Others, Other arenas) \
+  FN(ra, RA, Resource areas) \
+  FN(ha, HA, Handle area) \
+  FN(node, NA, Node arena) \
+
 // Fast allocation of memory
 class Arena : public CHeapObjBase {
 public:
-
-  enum class Tag : uint8_t {
-    tag_other = 0,
-    tag_ra,   // resource area
-    tag_ha,   // handle area
-    tag_node  // C2 Node arena
+  enum class Tag: uint8_t {
+#define ARENA_TAG_ENUM(name, str, desc) tag_##name,
+    DO_ARENA_TAG(ARENA_TAG_ENUM)
+#undef ARENA_TAG_ENUM
+    tag_count
   };
 
+  constexpr static int tag_count() {
+    return static_cast<int>(Tag::tag_count);
+  }
+
+  static const char* tag_name[static_cast<int>(Arena::Tag::tag_count)];
+  static const char* tag_desc[static_cast<int>(Arena::Tag::tag_count)];
+
 private:
   const MEMFLAGS _flags;        // Memory tracking flags
   const Tag _tag;
diff --git a/test/hotspot/jtreg/compiler/print/CompileCommandPrintMemStat.java b/test/hotspot/jtreg/compiler/print/CompileCommandPrintMemStat.java
index c2689d883721b..2dbf46fd04025 100644
--- a/test/hotspot/jtreg/compiler/print/CompileCommandPrintMemStat.java
+++ b/test/hotspot/jtreg/compiler/print/CompileCommandPrintMemStat.java
@@ -77,16 +77,17 @@ private static void test(String include, String exclude) throws Exception {
 
         // Should see final report
         // Looks like this:
-        // total     NA        RA        result  #nodes  limit   time    type  #rc thread              method
-        // 2149912   0         1986272   ok      -       -       0.101   c1    1   0x000000015180a600  jdk/internal/org/objectweb/asm/Frame::execute((IILjdk/internal/org/objectweb/asm/Symbol;Ljdk/internal/org/objectweb/asm/SymbolTable;)V)        oa.shouldMatch("total.*method");
+        // total     Others    RA        HA        NA        result  #nodes  limit   time    type  #rc thread             method
+        // 523648    32728     490920    0         0         ok      -       -       0.250   c1    1   0x00007f4ec00d4ac0 java/lang/Class::descriptorString(()Ljava/lang/String;)
         // or
-        // 537784    98184     208536    ok      267     -       0.096   c2    1   0x0000000153019c00  jdk/internal/classfile/impl/BufWriterImpl::writeU1((I)V) 4521912   0         1986272   ok      -       -       0.101   c1    1   0x000000015180a600  jdk/internal/org/objectweb/asm/Frame::execute((IILjdk/internal/org/objectweb/asm/Symbol;Ljdk/internal/org/objectweb/asm/SymbolTable;)V)        oa.shouldMatch("total.*method");
-        oa.shouldMatch("\\d+ +\\d+ +\\d+ +ok +(\\d+|-) +.*" + expectedNameIncl + ".*");
+        // 1898600   853176    750872    0         294552    ok      934     -       1.501   c2    1   0x00007f4ec00d3330 java/lang/String::replace((CC)Ljava/lang/String;)
+        oa.shouldMatch("total.*method");
+        oa.shouldMatch("\\d+ +(\\d+ +){4}ok +(\\d+|-) +.*" + expectedNameIncl + ".*");
 
         // In debug builds, we have a default memory limit enabled. That implies MemStat. Therefore we
         // expect to see all methods, not just the one we specified on the command line.
         if (Platform.isDebugBuild()) {
-            oa.shouldMatch("\\d+ +\\d+ +\\d+ +ok +(\\d+|-) +.*" + expectedNameExcl + ".*");
+            oa.shouldMatch("\\d+ +(\\d+ +){4}ok +(\\d+|-) +.*" + expectedNameExcl + ".*");
         } else {
             oa.shouldNotMatch(".*" + expectedNameExcl + ".*");
         }
diff --git a/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerMemoryStatisticTest.java b/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerMemoryStatisticTest.java
index 7d4a38db47b48..02bc77263d805 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerMemoryStatisticTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/compiler/CompilerMemoryStatisticTest.java
@@ -47,9 +47,9 @@ public static void main(String args[]) throws Exception {
         out.shouldHaveExitValue(0);
 
         // Looks like this:
-        // total     NA        RA        result  #nodes  time    type  #rc thread              method
-        // 211488    66440     77624     ok      13      0.057   c2    2   0x00007fb49428db70  compiler/print/CompileCommandPrintMemStat$TestMain::method1(()V)
+        // total     Others    RA        HA        NA        result  #nodes  limit   time    type  #rc thread             method
+        // 1898600   853176    750872    0         294552    ok      934     -       1.501   c2    1   0x00007f4ec00d3330 java/lang/String::replace((CC)Ljava/lang/String;)
         out.shouldMatch("total.*method");
-        out.shouldMatch("\\d+ +\\d+ +\\d+ +\\S+ +\\d+.*java.*\\(.*\\)");
+        out.shouldMatch("\\d+ +(\\d+ +){4}\\S+ +\\d+.*java.*\\(.*\\)");
     }
 }

From de0b50400a4155554c83d5c3346ab1ec5353df61 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Wed, 31 Jul 2024 08:08:15 +0000
Subject: [PATCH 266/401] 8336912: G1: Undefined behavior for
 G1ConfidencePercent=0

Reviewed-by: ayang, sangheki
---
 src/hotspot/share/gc/g1/g1_globals.hpp                 |  2 +-
 .../jtreg/gc/arguments/TestG1PercentageOptions.java    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1_globals.hpp b/src/hotspot/share/gc/g1/g1_globals.hpp
index af1ac1f70c64b..c8016ddc0ddf5 100644
--- a/src/hotspot/share/gc/g1/g1_globals.hpp
+++ b/src/hotspot/share/gc/g1/g1_globals.hpp
@@ -112,7 +112,7 @@
                                                                             \
   product(uint, G1ConfidencePercent, 50,                                    \
           "Confidence level for MMU/pause predictions")                     \
-          range(0, 100)                                                     \
+          range(1, 100)                                                     \
                                                                             \
   product(uintx, G1SummarizeRSetStatsPeriod, 0, DIAGNOSTIC,                 \
           "The period (in number of GCs) at which we will generate "        \
diff --git a/test/hotspot/jtreg/gc/arguments/TestG1PercentageOptions.java b/test/hotspot/jtreg/gc/arguments/TestG1PercentageOptions.java
index e8ee2598c9ad2..48345da250a8e 100644
--- a/test/hotspot/jtreg/gc/arguments/TestG1PercentageOptions.java
+++ b/test/hotspot/jtreg/gc/arguments/TestG1PercentageOptions.java
@@ -51,14 +51,14 @@ private static final class OptionDescription {
         }
     }
 
-    private static final String[] defaultValid = new String[] {
-        "0", "1", "50", "95", "100" };
-    private static final String[] defaultInvalid = new String[] {
-        "-10", "110", "bad" };
+    private static final String[] rangeOneToHundredValid = new String[] {
+        "1", "50", "95", "100" };
+    private static final String[] rangeOneToHundredInvalid = new String[] {
+        "0", "-10", "110", "bad" };
 
     // All of the G1 product arguments that are percentages.
     private static final OptionDescription[] percentOptions = new OptionDescription[] {
-        new OptionDescription("G1ConfidencePercent", defaultValid, defaultInvalid)
+        new OptionDescription("G1ConfidencePercent", rangeOneToHundredValid, rangeOneToHundredInvalid)
         // Other percentage options are not yet validated by argument processing.
     };
 

From 9b428dda8fb86ed595b05f3c930b3ce9c341db9b Mon Sep 17 00:00:00 2001
From: David Leopoldseder <davleopo@openjdk.org>
Date: Wed, 31 Jul 2024 09:40:47 +0000
Subject: [PATCH 267/401] 8336242:
 compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java
 failed assert(oopDesc::is_oop_or_null(val)) failed: bad oop found (again)

Reviewed-by: dnsimon, never
---
 .../vm/ci/code/test/SimpleDebugInfoTest.java  | 80 -------------------
 1 file changed, 80 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java
index c7d8d2cf83064..e77ac8dc4f998 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java
@@ -200,84 +200,4 @@ public void testStackLong() {
         testLongOnStack(compiler);
         testLongInLocal(compiler);
     }
-
-    public static Class<?> objectOnStack() {
-        return SimpleDebugInfoTest.class;
-    }
-
-    private void testObjectOnStack(DebugInfoCompiler compiler) {
-        test(compiler, getMethod("objectOnStack"), 2, JavaKind.Object);
-    }
-
-    public static Class<?> objectInLocal() {
-        Class<?> local = SimpleDebugInfoTest.class;
-        return local;
-    }
-
-    private void testObjectInLocal(DebugInfoCompiler compiler) {
-        test(compiler, getMethod("objectInLocal"), 3, JavaKind.Object);
-    }
-
-    @Test
-    public void testConstObject() {
-        ResolvedJavaType type = metaAccess.lookupJavaType(objectOnStack());
-        DebugInfoCompiler compiler = (asm, values) -> {
-            values[0] = constantReflection.asJavaClass(type);
-            return null;
-        };
-        testObjectOnStack(compiler);
-        testObjectInLocal(compiler);
-    }
-
-    @Test
-    public void testRegObject() {
-        ResolvedJavaType type = metaAccess.lookupJavaType(objectOnStack());
-        DebugInfoCompiler compiler = (asm, values) -> {
-            Register reg = asm.emitLoadPointer((HotSpotConstant) constantReflection.asJavaClass(type));
-            values[0] = reg.asValue(asm.getValueKind(JavaKind.Object));
-            return null;
-        };
-        testObjectOnStack(compiler);
-        testObjectInLocal(compiler);
-    }
-
-    @Test
-    public void testStackObject() {
-        ResolvedJavaType type = metaAccess.lookupJavaType(objectOnStack());
-        DebugInfoCompiler compiler = (asm, values) -> {
-            Register reg = asm.emitLoadPointer((HotSpotConstant) constantReflection.asJavaClass(type));
-            values[0] = asm.emitPointerToStack(reg);
-            return null;
-        };
-        testObjectOnStack(compiler);
-        testObjectInLocal(compiler);
-    }
-
-    @Test
-    public void testRegNarrowObject() {
-        Assume.assumeTrue(config.useCompressedOops);
-        ResolvedJavaType type = metaAccess.lookupJavaType(objectOnStack());
-        DebugInfoCompiler compiler = (asm, values) -> {
-            HotSpotConstant wide = (HotSpotConstant) constantReflection.asJavaClass(type);
-            Register reg = asm.emitLoadPointer((HotSpotConstant) wide.compress());
-            values[0] = reg.asValue(asm.narrowOopKind);
-            return null;
-        };
-        testObjectOnStack(compiler);
-        testObjectInLocal(compiler);
-    }
-
-    @Test
-    public void testStackNarrowObject() {
-        Assume.assumeTrue(config.useCompressedOops);
-        ResolvedJavaType type = metaAccess.lookupJavaType(objectOnStack());
-        DebugInfoCompiler compiler = (asm, values) -> {
-            HotSpotConstant wide = (HotSpotConstant) constantReflection.asJavaClass(type);
-            Register reg = asm.emitLoadPointer((HotSpotConstant) wide.compress());
-            values[0] = asm.emitNarrowPointerToStack(reg);
-            return null;
-        };
-        testObjectOnStack(compiler);
-        testObjectInLocal(compiler);
-    }
 }

From c73b3cb5996723c5a15c833a9da059b79c99cf9c Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 31 Jul 2024 12:56:43 +0000
Subject: [PATCH 268/401] 8336635: Add IR test for Reference.refersTo intrinsic

Reviewed-by: thartmann, kvn
---
 .../c2/irTests/gc/ReferenceRefersToTests.java | 156 ++++++++++++++++++
 1 file changed, 156 insertions(+)
 create mode 100644 test/hotspot/jtreg/compiler/c2/irTests/gc/ReferenceRefersToTests.java

diff --git a/test/hotspot/jtreg/compiler/c2/irTests/gc/ReferenceRefersToTests.java b/test/hotspot/jtreg/compiler/c2/irTests/gc/ReferenceRefersToTests.java
new file mode 100644
index 0000000000000..7cf7c72c8fd89
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/irTests/gc/ReferenceRefersToTests.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright Amazon.com Inc. 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.
+ */
+package compiler.c2.irTests.gc;
+
+import jdk.test.lib.Asserts;
+import compiler.lib.ir_framework.*;
+import jdk.test.whitebox.gc.GC;
+
+import java.lang.ref.*;
+import java.util.*;
+
+/*
+ * @test
+ * @bug 8256999
+ * @summary Test that Reference.refersTo intrinsics are properly handled
+ * @library /test/lib /
+ * @build jdk.test.whitebox.WhiteBox
+ * @requires vm.compiler2.enabled
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI compiler.c2.irTests.gc.ReferenceRefersToTests
+ */
+public class ReferenceRefersToTests {
+
+    private static String[] args(String... add) {
+        List<String> args = new ArrayList<>();
+
+         // Use PerMethodTrapLimit=0 to compile all branches in the intrinsics.
+        args.add("-XX:PerMethodTrapLimit=0");
+
+        // Forcefully inline all methods to reach the intrinsic code.
+        args.add("-XX:CompileCommand=inline,compiler.c2.irTests.gc.ReferenceRefersToTests::*");
+        args.add("-XX:CompileCommand=inline,java.lang.ref.Reference::*");
+        args.add("-XX:CompileCommand=inline,java.lang.ref.PhantomReference::*");
+
+        // Mix in test config code.
+        args.addAll(Arrays.asList(add));
+
+        return args.toArray(new String[0]);
+    }
+
+    public static void main(String[] args) {
+        TestFramework framework = new TestFramework();
+
+        int idx = 0;
+        if (GC.isSelectedErgonomically() && GC.Serial.isSupported()) {
+            // Serial does not have any barriers in refersTo.
+            framework.addScenarios(new Scenario(idx++, args(
+                "-XX:+UseSerialGC"
+            )));
+        }
+        if (GC.isSelectedErgonomically() && GC.Parallel.isSupported()) {
+            // Parallel does not have any barriers in refersTo.
+            framework.addScenarios(new Scenario(idx++, args(
+                "-XX:+UseParallelGC"
+            )));
+        }
+        if (GC.isSelectedErgonomically() && GC.G1.isSupported()) {
+            // G1 nominally needs keep-alive barriers for Reference loads,
+            // but should not have them for refersTo.
+            framework.addScenarios(new Scenario(idx++, args(
+                "-XX:+UseG1GC"
+            )));
+        }
+        if (GC.isSelectedErgonomically() && GC.Shenandoah.isSupported()) {
+            // Shenandoah nominally needs keep-alive barriers for Reference loads,
+            // but should not have them for refersTo. We only care to check that
+            // SATB barrier is not emitted. Shenandoah would also emit LRB barrier,
+            // which would false-negative the test.
+            framework.addScenarios(new Scenario(idx++, args(
+                "-XX:+UnlockDiagnosticVMOptions",
+                "-XX:ShenandoahGCMode=passive",
+                "-XX:+ShenandoahSATBBarrier",
+                "-XX:+UseShenandoahGC"
+            )));
+        }
+        if (GC.isSelectedErgonomically() && GC.Z.isSupported()) {
+            // ZGC does not emit barriers in IR.
+            framework.addScenarios(new Scenario(idx++, args(
+                "-XX:+UseZGC"
+            )));
+        }
+        framework.start();
+    }
+
+    static final Object REF = new Object();
+
+    static final SoftReference<Object> SR = new SoftReference<>(REF);
+    static final WeakReference<Object> WR = new WeakReference<>(REF);
+    static final PhantomReference<Object> PR = new PhantomReference<>(REF, null);
+
+    // Verify that we are left with a single load of Reference.referent and no stores.
+    // This serves as a signal that no GC barriers are emitted in IR.
+
+    @Test
+    @IR(counts = { IRNode.LOAD, "1" })
+    @IR(failOn = { IRNode.STORE })
+    public boolean soft_null() {
+        return SR.refersTo(null);
+    }
+
+    @Test
+    @IR(counts = { IRNode.LOAD, "1" })
+    @IR(failOn = { IRNode.STORE })
+    public boolean soft_ref() {
+        return SR.refersTo(REF);
+    }
+
+    @Test
+    @IR(counts = { IRNode.LOAD, "1" })
+    @IR(failOn = { IRNode.STORE })
+    public boolean weak_null() {
+        return WR.refersTo(null);
+    }
+
+    @Test
+    @IR(counts = { IRNode.LOAD, "1" })
+    @IR(failOn = { IRNode.STORE })
+    public boolean weak_ref() {
+        return WR.refersTo(REF);
+    }
+
+    @Test
+    @IR(counts = { IRNode.LOAD, "1" })
+    @IR(failOn = { IRNode.STORE })
+    public boolean phantom_null() {
+        return PR.refersTo(null);
+    }
+
+    @Test
+    @IR(counts = { IRNode.LOAD, "1" })
+    @IR(failOn = { IRNode.STORE })
+    public boolean phantom_ref() {
+        return PR.refersTo(REF);
+    }
+
+}

From 07dd725025a54035436a76ac4c0a8bb2b12e264a Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Wed, 31 Jul 2024 13:15:52 +0000
Subject: [PATCH 269/401] 8337418: Fix -Wzero-as-null-pointer-constant warnings
 in prims code

Reviewed-by: dholmes, shade, jwaters, sspitsyn
---
 src/hotspot/share/prims/jni.cpp           | 22 +++++++++++-----------
 src/hotspot/share/prims/jvm.cpp           |  6 +++---
 src/hotspot/share/prims/jvmtiExport.cpp   |  6 +++---
 src/hotspot/share/prims/jvmtiTrace.cpp    |  2 +-
 src/hotspot/share/prims/methodHandles.cpp |  3 ---
 src/hotspot/share/prims/perf.cpp          |  6 +++---
 src/hotspot/share/prims/unsafe.cpp        |  4 ++--
 7 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp
index ae040d661380e..a91d7375761e2 100644
--- a/src/hotspot/share/prims/jni.cpp
+++ b/src/hotspot/share/prims/jni.cpp
@@ -1148,7 +1148,7 @@ JNI_ENTRY(ResultType, \
           jni_Call##Result##Method(JNIEnv *env, jobject obj, jmethodID methodID, ...)) \
 \
   EntryProbe; \
-  ResultType ret = 0;\
+  ResultType ret{}; \
   DT_RETURN_MARK_FOR(Result, Call##Result##Method, ResultType, \
                      (const ResultType&)ret);\
 \
@@ -1203,7 +1203,7 @@ JNI_ENTRY(ResultType, \
           jni_Call##Result##MethodV(JNIEnv *env, jobject obj, jmethodID methodID, va_list args)) \
 \
   EntryProbe;\
-  ResultType ret = 0;\
+  ResultType ret{}; \
   DT_RETURN_MARK_FOR(Result, Call##Result##MethodV, ResultType, \
                      (const ResultType&)ret);\
 \
@@ -1254,7 +1254,7 @@ DEFINE_CALLMETHODV(jdouble,  Double,  T_DOUBLE
 JNI_ENTRY(ResultType, \
           jni_Call##Result##MethodA(JNIEnv *env, jobject obj, jmethodID methodID, const jvalue *args)) \
   EntryProbe; \
-  ResultType ret = 0;\
+  ResultType ret{}; \
   DT_RETURN_MARK_FOR(Result, Call##Result##MethodA, ResultType, \
                      (const ResultType&)ret);\
 \
@@ -1546,7 +1546,7 @@ JNI_ENTRY(ResultType, \
           jni_CallStatic##Result##Method(JNIEnv *env, jclass cls, jmethodID methodID, ...)) \
 \
   EntryProbe; \
-  ResultType ret = 0;\
+  ResultType ret{}; \
   DT_RETURN_MARK_FOR(Result, CallStatic##Result##Method, ResultType, \
                      (const ResultType&)ret);\
 \
@@ -1601,7 +1601,7 @@ JNI_ENTRY(ResultType, \
           jni_CallStatic##Result##MethodV(JNIEnv *env, jclass cls, jmethodID methodID, va_list args)) \
 \
   EntryProbe; \
-  ResultType ret = 0;\
+  ResultType ret{}; \
   DT_RETURN_MARK_FOR(Result, CallStatic##Result##MethodV, ResultType, \
                      (const ResultType&)ret);\
 \
@@ -1657,7 +1657,7 @@ JNI_ENTRY(ResultType, \
           jni_CallStatic##Result##MethodA(JNIEnv *env, jclass cls, jmethodID methodID, const jvalue *args)) \
 \
   EntryProbe; \
-  ResultType ret = 0;\
+  ResultType ret{}; \
   DT_RETURN_MARK_FOR(Result, CallStatic##Result##MethodA, ResultType, \
                      (const ResultType&)ret);\
 \
@@ -1750,7 +1750,7 @@ DT_RETURN_MARK_DECL(GetFieldID, jfieldID
 JNI_ENTRY(jfieldID, jni_GetFieldID(JNIEnv *env, jclass clazz,
           const char *name, const char *sig))
   HOTSPOT_JNI_GETFIELDID_ENTRY(env, clazz, (char *) name, (char *) sig);
-  jfieldID ret = 0;
+  jfieldID ret = nullptr;
   DT_RETURN_MARK(GetFieldID, jfieldID, (const jfieldID&)ret);
 
   Klass* k = java_lang_Class::as_Klass(JNIHandles::resolve_non_null(clazz));
@@ -3035,12 +3035,12 @@ extern "C" void* JNICALL jni_GetDirectBufferAddress(JNIEnv *env, jobject buf)
 
   if (!directBufferSupportInitializeEnded) {
     if (!initializeDirectBufferSupport(env, thread)) {
-      return 0;
+      return nullptr;
     }
   }
 
   if ((buf != nullptr) && (!env->IsInstanceOf(buf, directBufferClass))) {
-    return 0;
+    return nullptr;
   }
 
   ret = (void*)(intptr_t)env->GetLongField(buf, directBufferAddressField);
@@ -3647,8 +3647,8 @@ static jint JNI_CreateJavaVM_inner(JavaVM **vm, void **penv, void *args) {
     }
 
     // Creation failed. We must reset vm_created
-    *vm = 0;
-    *(JNIEnv**)penv = 0;
+    *vm = nullptr;
+    *(JNIEnv**)penv = nullptr;
     // reset vm_created last to avoid race condition. Use OrderAccess to
     // control both compiler and architectural-based reordering.
     assert(vm_created == IN_PROGRESS, "must be");
diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
index 6aabb65ca4023..4f63ebdf9d518 100644
--- a/src/hotspot/share/prims/jvm.cpp
+++ b/src/hotspot/share/prims/jvm.cpp
@@ -3747,7 +3747,7 @@ JVM_ENTRY(jobjectArray, JVM_DumpThreads(JNIEnv *env, jclass threadClass, jobject
 
   // Check if threads is null
   if (threads == nullptr) {
-    THROW_(vmSymbols::java_lang_NullPointerException(), 0);
+    THROW_NULL(vmSymbols::java_lang_NullPointerException());
   }
 
   objArrayOop a = objArrayOop(JNIHandles::resolve_non_null(threads));
@@ -3755,13 +3755,13 @@ JVM_ENTRY(jobjectArray, JVM_DumpThreads(JNIEnv *env, jclass threadClass, jobject
   int num_threads = ah->length();
   // check if threads is non-empty array
   if (num_threads == 0) {
-    THROW_(vmSymbols::java_lang_IllegalArgumentException(), 0);
+    THROW_NULL(vmSymbols::java_lang_IllegalArgumentException());
   }
 
   // check if threads is not an array of objects of Thread class
   Klass* k = ObjArrayKlass::cast(ah->klass())->element_klass();
   if (k != vmClasses::Thread_klass()) {
-    THROW_(vmSymbols::java_lang_IllegalArgumentException(), 0);
+    THROW_NULL(vmSymbols::java_lang_IllegalArgumentException());
   }
 
   ResourceMark rm(THREAD);
diff --git a/src/hotspot/share/prims/jvmtiExport.cpp b/src/hotspot/share/prims/jvmtiExport.cpp
index c2b6d27986b94..f79116f5ebeb0 100644
--- a/src/hotspot/share/prims/jvmtiExport.cpp
+++ b/src/hotspot/share/prims/jvmtiExport.cpp
@@ -2068,7 +2068,7 @@ void JvmtiExport::post_exception_throw(JavaThread *thread, Method* method, addre
 
         jmethodID catch_jmethodID;
         if (current_bci < 0) {
-          catch_jmethodID = 0;
+          catch_jmethodID = nullptr;
           current_bci = 0;
         } else {
           catch_jmethodID = jem.to_jmethodID(current_mh);
@@ -2105,8 +2105,8 @@ void JvmtiExport::notice_unwind_due_to_exception(JavaThread *thread, Method* met
                      JvmtiTrace::safe_get_thread_name(thread),
                      (mh() == nullptr) ? "null" : mh()->klass_name()->as_C_string(),
                      (mh() == nullptr) ? "null" : mh()->name()->as_C_string(),
-                     location==0? "no location:" : "",
-                     location==0? 0 : location - mh()->code_base(),
+                     location == nullptr ? "no location:" : "",
+                     location == nullptr ? 0 : location - mh()->code_base(),
                      in_handler_frame? "in handler frame" : "not handler frame" ));
 
   if (state->is_exception_detected()) {
diff --git a/src/hotspot/share/prims/jvmtiTrace.cpp b/src/hotspot/share/prims/jvmtiTrace.cpp
index 002f59957eab7..c5fb95c931b93 100644
--- a/src/hotspot/share/prims/jvmtiTrace.cpp
+++ b/src/hotspot/share/prims/jvmtiTrace.cpp
@@ -261,7 +261,7 @@ void JvmtiTrace::shutdown() {
 
 
 const char* JvmtiTrace::enum_name(const char** names, const jint* values, jint value) {
-  for (int index = 0; names[index] != 0; ++index) {
+  for (int index = 0; names[index] != nullptr; ++index) {
     if (values[index] == value) {
       return names[index];
     }
diff --git a/src/hotspot/share/prims/methodHandles.cpp b/src/hotspot/share/prims/methodHandles.cpp
index fd10f0723bff0..473ac396997bd 100644
--- a/src/hotspot/share/prims/methodHandles.cpp
+++ b/src/hotspot/share/prims/methodHandles.cpp
@@ -436,7 +436,6 @@ Symbol* MethodHandles::signature_polymorphic_intrinsic_name(vmIntrinsics::ID iid
   case vmIntrinsics::_linkToNative:     return vmSymbols::linkToNative_name();
   default:
     fatal("unexpected intrinsic id: %d %s", vmIntrinsics::as_int(iid), vmIntrinsics::name_at(iid));
-    return 0;
   }
 }
 
@@ -449,7 +448,6 @@ Bytecodes::Code MethodHandles::signature_polymorphic_intrinsic_bytecode(vmIntrin
     case vmIntrinsics::_invokeBasic:     return Bytecodes::_invokehandle;
     default:
       fatal("unexpected id: (%d) %s", (uint)id, vmIntrinsics::name_at(id));
-      return Bytecodes::_illegal;
   }
 }
 
@@ -463,7 +461,6 @@ int MethodHandles::signature_polymorphic_intrinsic_ref_kind(vmIntrinsics::ID iid
   case vmIntrinsics::_linkToInterface:  return JVM_REF_invokeInterface;
   default:
     fatal("unexpected intrinsic id: %d %s", vmIntrinsics::as_int(iid), vmIntrinsics::name_at(iid));
-    return 0;
   }
 }
 
diff --git a/src/hotspot/share/prims/perf.cpp b/src/hotspot/share/prims/perf.cpp
index f10854b529459..9ff831dded9fa 100644
--- a/src/hotspot/share/prims/perf.cpp
+++ b/src/hotspot/share/prims/perf.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ PERF_ENTRY(jobject, Perf_Attach(JNIEnv *env, jobject unused, int vmid))
 
   PerfWrapper("Perf_Attach");
 
-  char* address = 0;
+  char* address = nullptr;
   size_t capacity = 0;
 
   // attach to the PerfData memory region for the specified VM
@@ -90,7 +90,7 @@ PERF_ENTRY(void, Perf_Detach(JNIEnv *env, jobject unused, jobject buffer))
     return;
   }
 
-  void* address = 0;
+  void* address = nullptr;
   jlong capacity = 0;
 
   // get buffer address and capacity
diff --git a/src/hotspot/share/prims/unsafe.cpp b/src/hotspot/share/prims/unsafe.cpp
index 942d9100c29ea..1be157b2e44eb 100644
--- a/src/hotspot/share/prims/unsafe.cpp
+++ b/src/hotspot/share/prims/unsafe.cpp
@@ -652,7 +652,7 @@ static jclass Unsafe_DefineClass_impl(JNIEnv *env, jstring name, jbyteArray data
 
   jbyte *body;
   char *utfName = nullptr;
-  jclass result = 0;
+  jclass result = nullptr;
   char buf[128];
 
   assert(data != nullptr, "Class bytes must not be null");
@@ -665,7 +665,7 @@ static jclass Unsafe_DefineClass_impl(JNIEnv *env, jstring name, jbyteArray data
   body = NEW_C_HEAP_ARRAY_RETURN_NULL(jbyte, length, mtInternal);
   if (body == nullptr) {
     throw_new(env, "java/lang/OutOfMemoryError");
-    return 0;
+    return nullptr;
   }
 
   env->GetByteArrayRegion(data, offset, length, body);

From 61386c199a3b29457c002ad31a23990b7f6f88fd Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Wed, 31 Jul 2024 13:17:30 +0000
Subject: [PATCH 270/401] 8337523: Fix -Wzero-as-null-pointer-constant warnings
 in jvmci code

Reviewed-by: chagedorn, shade
---
 src/hotspot/share/jvmci/jvmciCodeInstaller.cpp    | 4 ++--
 src/hotspot/share/jvmci/jvmciCompilerToVM.cpp     | 4 ++--
 src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp | 2 +-
 src/hotspot/share/jvmci/jvmciRuntime.cpp          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
index c62257bd23b1c..79bc97f53ac6b 100644
--- a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
+++ b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -664,7 +664,7 @@ JVMCI::CodeInstallResult CodeInstaller::install_runtime_stub(CodeBlob*& cb,
   GrowableArray<RuntimeStub*> *stubs_to_free = nullptr;
 #ifdef ASSERT
   const char* val = Arguments::PropertyList_get_value(Arguments::system_properties(), "test.jvmci.forceRuntimeStubAllocFail");
-  if (val != nullptr && strstr(name , val) != 0) {
+  if (val != nullptr && strstr(name , val) != nullptr) {
     stubs_to_free = new GrowableArray<RuntimeStub*>();
     JVMCI_event_1("forcing allocation of %s in code cache to fail", name);
   }
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
index fb49e9baca2b9..5a9b18fc4d3db 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
@@ -424,7 +424,7 @@ C2V_VMENTRY_NULL(jobject, getResolvedJavaMethod, (JNIEnv* env, jobject, jobject
 
 C2V_VMENTRY_NULL(jobject, getConstantPool, (JNIEnv* env, jobject, ARGUMENT_PAIR(klass_or_method), jboolean is_klass))
   ConstantPool* cp = nullptr;
-  if (UNPACK_PAIR(address, klass_or_method) == 0) {
+  if (UNPACK_PAIR(address, klass_or_method) == nullptr) {
     JVMCI_THROW_NULL(NullPointerException);
   }
   if (!is_klass) {
@@ -1098,7 +1098,7 @@ C2V_END
 
 C2V_VMENTRY_0(jlong, getMaxCallTargetOffset, (JNIEnv* env, jobject, jlong addr))
   address target_addr = (address) addr;
-  if (target_addr != 0x0) {
+  if (target_addr != nullptr) {
     int64_t off_low = (int64_t)target_addr - ((int64_t)CodeCache::low_bound() + sizeof(int));
     int64_t off_high = (int64_t)target_addr - ((int64_t)CodeCache::high_bound() + sizeof(int));
     return MAX2(ABS(off_low), ABS(off_high));
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
index f1028b4b2bb7e..2116133e56e97 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
@@ -240,7 +240,7 @@ void CompilerToVM::Data::initialize(JVMCI_TRAPS) {
     cardtable_shift = CardTable::card_shift();
   } else {
     // No card mark barriers
-    cardtable_start_address = 0;
+    cardtable_start_address = nullptr;
     cardtable_shift = 0;
   }
 
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.cpp b/src/hotspot/share/jvmci/jvmciRuntime.cpp
index 371a6540898b3..ad0430787aa13 100644
--- a/src/hotspot/share/jvmci/jvmciRuntime.cpp
+++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp
@@ -628,7 +628,7 @@ JRT_LEAF(oopDesc*, JVMCIRuntime::load_and_clear_exception(JavaThread* thread))
   oop exception = thread->exception_oop();
   assert(exception != nullptr, "npe");
   thread->set_exception_oop(nullptr);
-  thread->set_exception_pc(0);
+  thread->set_exception_pc(nullptr);
   return exception;
 JRT_END
 

From 7121d71b516b415c7c11e3643731cd32d4057aa6 Mon Sep 17 00:00:00 2001
From: Gui Cao <gcao@openjdk.org>
Date: Wed, 31 Jul 2024 14:43:35 +0000
Subject: [PATCH 271/401] 8337421: RISC-V: client VM build failure after
 JDK-8335191

Reviewed-by: fyang, mli
---
 src/hotspot/cpu/riscv/stubGenerator_riscv.cpp |  12 +-
 src/hotspot/cpu/riscv/vm_version_riscv.cpp    | 197 +++++++++---------
 src/hotspot/cpu/riscv/vm_version_riscv.hpp    |   2 +
 3 files changed, 107 insertions(+), 104 deletions(-)

diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
index 2a9faee7e2fdf..f78d7261e40a5 100644
--- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
@@ -5936,7 +5936,6 @@ static const int64_t right_3_bits = right_n_bits(3);
   }
 
   void generate_compiler_stubs() {
-#if COMPILER2_OR_JVMCI
 #ifdef COMPILER2
     if (UseMulAddIntrinsic) {
       StubRoutines::_mulAdd = generate_mulAdd();
@@ -5970,7 +5969,6 @@ static const int64_t right_3_bits = right_n_bits(3);
       StubRoutines::_bigIntegerLeftShiftWorker = generate_bigIntegerLeftShift();
       StubRoutines::_bigIntegerRightShiftWorker = generate_bigIntegerRightShift();
     }
-#endif // COMPILER2
 
     if (UseSHA256Intrinsics) {
       Sha2Generator sha2(_masm, this);
@@ -5984,10 +5982,6 @@ static const int64_t right_3_bits = right_n_bits(3);
       StubRoutines::_sha512_implCompressMB = sha2.generate_sha512_implCompress(true);
     }
 
-    generate_compare_long_strings();
-
-    generate_string_indexof_stubs();
-
     if (UseMD5Intrinsics) {
       StubRoutines::_md5_implCompress   = generate_md5_implCompress(false, "md5_implCompress");
       StubRoutines::_md5_implCompressMB = generate_md5_implCompress(true,  "md5_implCompressMB");
@@ -6006,7 +6000,11 @@ static const int64_t right_3_bits = right_n_bits(3);
       StubRoutines::_updateBytesAdler32 = generate_updateBytesAdler32();
     }
 
-#endif // COMPILER2_OR_JVMCI
+    generate_compare_long_strings();
+
+    generate_string_indexof_stubs();
+
+#endif // COMPILER2
   }
 
  public:
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.cpp b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
index d5a74d186062f..ac2d6cde1a227 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.cpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
@@ -58,6 +58,13 @@ void VM_Version::useRVA23U64Profile() {
 }
 
 void VM_Version::initialize() {
+  common_initialize();
+#ifdef COMPILER2
+  c2_initialize();
+#endif // COMPILER2
+}
+
+void VM_Version::common_initialize() {
   _supports_atomic_getset4 = true;
   _supports_atomic_getadd4 = true;
   _supports_atomic_getset8 = true;
@@ -152,10 +159,6 @@ void VM_Version::initialize() {
     FLAG_SET_DEFAULT(UseVectorizedMismatchIntrinsic, false);
   }
 
-  if (FLAG_IS_DEFAULT(UseMD5Intrinsics)) {
-    FLAG_SET_DEFAULT(UseMD5Intrinsics, true);
-  }
-
   if (FLAG_IS_DEFAULT(UsePoly1305Intrinsics)) {
     FLAG_SET_DEFAULT(UsePoly1305Intrinsics, true);
   }
@@ -230,15 +233,105 @@ void VM_Version::initialize() {
       _initial_vector_length = cpu_vector_length();
     }
   }
+}
 
 #ifdef COMPILER2
-  c2_initialize();
-#endif // COMPILER2
+void VM_Version::c2_initialize() {
+  if (UseCMoveUnconditionally) {
+    FLAG_SET_DEFAULT(UseCMoveUnconditionally, false);
+  }
+
+  if (ConditionalMoveLimit > 0) {
+    FLAG_SET_DEFAULT(ConditionalMoveLimit, 0);
+  }
 
-  // NOTE: Make sure codes dependent on UseRVV are put after c2_initialize(),
+  if (!UseRVV) {
+    FLAG_SET_DEFAULT(MaxVectorSize, 0);
+    FLAG_SET_DEFAULT(UseRVVForBigIntegerShiftIntrinsics, false);
+  } else {
+    if (!FLAG_IS_DEFAULT(MaxVectorSize) && MaxVectorSize != _initial_vector_length) {
+      warning("Current system does not support RVV vector length for MaxVectorSize %d. Set MaxVectorSize to %d",
+               (int)MaxVectorSize, _initial_vector_length);
+    }
+    MaxVectorSize = _initial_vector_length;
+    if (MaxVectorSize < 16) {
+      warning("RVV does not support vector length less than 16 bytes. Disabling RVV.");
+      UseRVV = false;
+      FLAG_SET_DEFAULT(MaxVectorSize, 0);
+    }
+  }
+
+  // NOTE: Make sure codes dependent on UseRVV are put after MaxVectorSize initialize,
   //       as there are extra checks inside it which could disable UseRVV
   //       in some situations.
 
+  if (FLAG_IS_DEFAULT(UseVectorizedHashCodeIntrinsic)) {
+    FLAG_SET_DEFAULT(UseVectorizedHashCodeIntrinsic, true);
+  }
+
+  if (!UseZicbop) {
+    if (!FLAG_IS_DEFAULT(AllocatePrefetchStyle)) {
+      warning("Zicbop is not available on this CPU");
+    }
+    FLAG_SET_DEFAULT(AllocatePrefetchStyle, 0);
+  } else {
+    // Limit AllocatePrefetchDistance so that it does not exceed the
+    // static constraint of 512 defined in runtime/globals.hpp.
+    if (FLAG_IS_DEFAULT(AllocatePrefetchDistance)) {
+      FLAG_SET_DEFAULT(AllocatePrefetchDistance, MIN2(512, 3 * (int)CacheLineSize));
+    }
+    if (FLAG_IS_DEFAULT(AllocatePrefetchStepSize)) {
+      FLAG_SET_DEFAULT(AllocatePrefetchStepSize, (int)CacheLineSize);
+    }
+    if (FLAG_IS_DEFAULT(PrefetchScanIntervalInBytes)) {
+      FLAG_SET_DEFAULT(PrefetchScanIntervalInBytes, 3 * (int)CacheLineSize);
+    }
+    if (FLAG_IS_DEFAULT(PrefetchCopyIntervalInBytes)) {
+      FLAG_SET_DEFAULT(PrefetchCopyIntervalInBytes, 3 * (int)CacheLineSize);
+    }
+
+    if (PrefetchCopyIntervalInBytes != -1 &&
+        ((PrefetchCopyIntervalInBytes & 7) || (PrefetchCopyIntervalInBytes >= 32768))) {
+      warning("PrefetchCopyIntervalInBytes must be -1, or a multiple of 8 and < 32768");
+      PrefetchCopyIntervalInBytes &= ~7;
+      if (PrefetchCopyIntervalInBytes >= 32768) {
+        PrefetchCopyIntervalInBytes = 32760;
+      }
+    }
+    if (AllocatePrefetchDistance !=-1 && (AllocatePrefetchDistance & 7)) {
+      warning("AllocatePrefetchDistance must be multiple of 8");
+      AllocatePrefetchDistance &= ~7;
+    }
+    if (AllocatePrefetchStepSize & 7) {
+      warning("AllocatePrefetchStepSize must be multiple of 8");
+      AllocatePrefetchStepSize &= ~7;
+    }
+  }
+
+  if (FLAG_IS_DEFAULT(UseMulAddIntrinsic)) {
+    FLAG_SET_DEFAULT(UseMulAddIntrinsic, true);
+  }
+
+  if (FLAG_IS_DEFAULT(UseMultiplyToLenIntrinsic)) {
+    FLAG_SET_DEFAULT(UseMultiplyToLenIntrinsic, true);
+  }
+
+  if (FLAG_IS_DEFAULT(UseSquareToLenIntrinsic)) {
+    FLAG_SET_DEFAULT(UseSquareToLenIntrinsic, true);
+  }
+
+  if (FLAG_IS_DEFAULT(UseMontgomeryMultiplyIntrinsic)) {
+    FLAG_SET_DEFAULT(UseMontgomeryMultiplyIntrinsic, true);
+  }
+
+  if (FLAG_IS_DEFAULT(UseMontgomerySquareIntrinsic)) {
+    FLAG_SET_DEFAULT(UseMontgomerySquareIntrinsic, true);
+  }
+
+  if (FLAG_IS_DEFAULT(UseMD5Intrinsics)) {
+    FLAG_SET_DEFAULT(UseMD5Intrinsics, true);
+  }
+
   // Adler32
   if (UseRVV) {
     if (FLAG_IS_DEFAULT(UseAdler32Intrinsics)) {
@@ -332,96 +425,6 @@ void VM_Version::initialize() {
     FLAG_SET_DEFAULT(UseSHA, false);
   }
 }
-
-#ifdef COMPILER2
-void VM_Version::c2_initialize() {
-  if (UseCMoveUnconditionally) {
-    FLAG_SET_DEFAULT(UseCMoveUnconditionally, false);
-  }
-
-  if (ConditionalMoveLimit > 0) {
-    FLAG_SET_DEFAULT(ConditionalMoveLimit, 0);
-  }
-
-  if (!UseRVV) {
-    FLAG_SET_DEFAULT(MaxVectorSize, 0);
-    FLAG_SET_DEFAULT(UseRVVForBigIntegerShiftIntrinsics, false);
-  } else {
-    if (!FLAG_IS_DEFAULT(MaxVectorSize) && MaxVectorSize != _initial_vector_length) {
-      warning("Current system does not support RVV vector length for MaxVectorSize %d. Set MaxVectorSize to %d",
-               (int)MaxVectorSize, _initial_vector_length);
-    }
-    MaxVectorSize = _initial_vector_length;
-    if (MaxVectorSize < 16) {
-      warning("RVV does not support vector length less than 16 bytes. Disabling RVV.");
-      UseRVV = false;
-      FLAG_SET_DEFAULT(MaxVectorSize, 0);
-    }
-  }
-
-  if (FLAG_IS_DEFAULT(UseVectorizedHashCodeIntrinsic)) {
-    FLAG_SET_DEFAULT(UseVectorizedHashCodeIntrinsic, true);
-  }
-
-  if (!UseZicbop) {
-    if (!FLAG_IS_DEFAULT(AllocatePrefetchStyle)) {
-      warning("Zicbop is not available on this CPU");
-    }
-    FLAG_SET_DEFAULT(AllocatePrefetchStyle, 0);
-  } else {
-    // Limit AllocatePrefetchDistance so that it does not exceed the
-    // static constraint of 512 defined in runtime/globals.hpp.
-    if (FLAG_IS_DEFAULT(AllocatePrefetchDistance)) {
-      FLAG_SET_DEFAULT(AllocatePrefetchDistance, MIN2(512, 3 * (int)CacheLineSize));
-    }
-    if (FLAG_IS_DEFAULT(AllocatePrefetchStepSize)) {
-      FLAG_SET_DEFAULT(AllocatePrefetchStepSize, (int)CacheLineSize);
-    }
-    if (FLAG_IS_DEFAULT(PrefetchScanIntervalInBytes)) {
-      FLAG_SET_DEFAULT(PrefetchScanIntervalInBytes, 3 * (int)CacheLineSize);
-    }
-    if (FLAG_IS_DEFAULT(PrefetchCopyIntervalInBytes)) {
-      FLAG_SET_DEFAULT(PrefetchCopyIntervalInBytes, 3 * (int)CacheLineSize);
-    }
-
-    if (PrefetchCopyIntervalInBytes != -1 &&
-        ((PrefetchCopyIntervalInBytes & 7) || (PrefetchCopyIntervalInBytes >= 32768))) {
-      warning("PrefetchCopyIntervalInBytes must be -1, or a multiple of 8 and < 32768");
-      PrefetchCopyIntervalInBytes &= ~7;
-      if (PrefetchCopyIntervalInBytes >= 32768) {
-        PrefetchCopyIntervalInBytes = 32760;
-      }
-    }
-    if (AllocatePrefetchDistance !=-1 && (AllocatePrefetchDistance & 7)) {
-      warning("AllocatePrefetchDistance must be multiple of 8");
-      AllocatePrefetchDistance &= ~7;
-    }
-    if (AllocatePrefetchStepSize & 7) {
-      warning("AllocatePrefetchStepSize must be multiple of 8");
-      AllocatePrefetchStepSize &= ~7;
-    }
-  }
-
-  if (FLAG_IS_DEFAULT(UseMulAddIntrinsic)) {
-    FLAG_SET_DEFAULT(UseMulAddIntrinsic, true);
-  }
-
-  if (FLAG_IS_DEFAULT(UseMultiplyToLenIntrinsic)) {
-    FLAG_SET_DEFAULT(UseMultiplyToLenIntrinsic, true);
-  }
-
-  if (FLAG_IS_DEFAULT(UseSquareToLenIntrinsic)) {
-    FLAG_SET_DEFAULT(UseSquareToLenIntrinsic, true);
-  }
-
-  if (FLAG_IS_DEFAULT(UseMontgomeryMultiplyIntrinsic)) {
-    FLAG_SET_DEFAULT(UseMontgomeryMultiplyIntrinsic, true);
-  }
-
-  if (FLAG_IS_DEFAULT(UseMontgomerySquareIntrinsic)) {
-    FLAG_SET_DEFAULT(UseMontgomerySquareIntrinsic, true);
-  }
-}
 #endif // COMPILER2
 
 void VM_Version::initialize_cpu_information(void) {
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.hpp b/src/hotspot/cpu/riscv/vm_version_riscv.hpp
index 9556e2dc9ad5d..bd4bfe86d9bf7 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.hpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.hpp
@@ -264,6 +264,8 @@ class VM_Version : public Abstract_VM_Version {
   static uint32_t cpu_vector_length();
   static uint32_t _initial_vector_length;
 
+  static void common_initialize();
+
 #ifdef COMPILER2
   static void c2_initialize();
 #endif // COMPILER2

From f2ba2ebbcaba2784b24e7fe94c235ca652f7c9a2 Mon Sep 17 00:00:00 2001
From: Jasmine Karthikeyan <jkarthikeyan@openjdk.org>
Date: Wed, 31 Jul 2024 15:16:21 +0000
Subject: [PATCH 272/401] 8331090: Run Ideal_minmax before de-canonicalizing
 CMoves

Reviewed-by: thartmann, epeter
---
 src/hotspot/share/opto/movenode.cpp           | 13 +++++---
 .../compiler/c2/irTests/TestIfMinMax.java     | 32 +++++++++++++++++--
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/share/opto/movenode.cpp b/src/hotspot/share/opto/movenode.cpp
index eb0a914b99433..dc65afff26f0f 100644
--- a/src/hotspot/share/opto/movenode.cpp
+++ b/src/hotspot/share/opto/movenode.cpp
@@ -91,17 +91,20 @@ Node *CMoveNode::Ideal(PhaseGVN *phase, bool can_reshape) {
       phase->type(in(IfTrue))    == Type::TOP) {
     return nullptr;
   }
-  // Canonicalize the node by moving constants to the right input.
-  if (in(Condition)->is_Bool() && phase->type(in(IfFalse))->singleton() && !phase->type(in(IfTrue))->singleton()) {
-    BoolNode* b = in(Condition)->as_Bool()->negate(phase);
-    return make(in(Control), phase->transform(b), in(IfTrue), in(IfFalse), _type);
-  }
 
+  // Check for Min/Max patterns. This is called before constants are pushed to the right input, as that transform can
+  // make BoolTests non-canonical.
   Node* minmax = Ideal_minmax(phase, this);
   if (minmax != nullptr) {
     return minmax;
   }
 
+  // Canonicalize the node by moving constants to the right input.
+  if (in(Condition)->is_Bool() && phase->type(in(IfFalse))->singleton() && !phase->type(in(IfTrue))->singleton()) {
+    BoolNode* b = in(Condition)->as_Bool()->negate(phase);
+    return make(in(Control), phase->transform(b), in(IfTrue), in(IfFalse), _type);
+  }
+
   return nullptr;
 }
 
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestIfMinMax.java b/test/hotspot/jtreg/compiler/c2/irTests/TestIfMinMax.java
index 41402036aea0e..e232895257a48 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestIfMinMax.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestIfMinMax.java
@@ -30,7 +30,7 @@
 
 /*
  * @test
- * @bug 8324655 8329797
+ * @bug 8324655 8329797 8331090
  * @key randomness
  * @summary Test that if expressions are properly folded into min/max nodes
  * @requires os.arch != "riscv64"
@@ -505,7 +505,27 @@ public void checkTestMinLongVector(Object[] vals) {
         }
     }
 
-    @Run(test = { "testMinI1", "testMinI2", "testMaxI1", "testMaxI2", "testMinI1E", "testMinI2E", "testMaxI1E", "testMaxI2E" })
+    @Test
+    @IR(failOn = { IRNode.IF }, counts = { IRNode.MIN_I, "1" })
+    public int testMinIConst(int a) {
+        if (a > 65535) {
+            a = 65535;
+        }
+
+        return a;
+    }
+
+    @Test
+    @IR(phase = { CompilePhase.BEFORE_MACRO_EXPANSION }, failOn = { IRNode.IF }, counts = { IRNode.MIN_L, "1" })
+    public long testMinLConst(long a) {
+        if (a > 65535) {
+            a = 65535;
+        }
+
+        return a;
+    }
+
+    @Run(test = { "testMinI1", "testMinI2", "testMaxI1", "testMaxI2", "testMinI1E", "testMinI2E", "testMaxI1E", "testMaxI2E", "testMinIConst" })
     public void runTestIntegers() {
         testIntegers(10, 20);
         testIntegers(20, 10);
@@ -526,9 +546,12 @@ public void testIntegers(int a, int b) {
         Asserts.assertEQ(a >= b ? b : a, testMinI2E(a, b));
         Asserts.assertEQ(a >= b ? a : b, testMaxI1E(a, b));
         Asserts.assertEQ(a <= b ? b : a, testMaxI2E(a, b));
+
+        Asserts.assertEQ(a > 65535 ? 65535 : a, testMinIConst(a));
+        Asserts.assertEQ(b > 65535 ? 65535 : b, testMinIConst(b));
     }
 
-    @Run(test = { "testMinL1", "testMinL2", "testMaxL1", "testMaxL2", "testMinL1E", "testMinL2E", "testMaxL1E", "testMaxL2E" })
+    @Run(test = { "testMinL1", "testMinL2", "testMaxL1", "testMaxL2", "testMinL1E", "testMinL2E", "testMaxL1E", "testMaxL2E", "testMinLConst" })
     public void runTestLongs() {
         testLongs(10, 20);
         testLongs(20, 10);
@@ -551,5 +574,8 @@ public void testLongs(long a, long b) {
         Asserts.assertEQ(a >= b ? b : a, testMinL2E(a, b));
         Asserts.assertEQ(a >= b ? a : b, testMaxL1E(a, b));
         Asserts.assertEQ(a <= b ? b : a, testMaxL2E(a, b));
+
+        Asserts.assertEQ(a > 65535L ? 65535L : a, testMinLConst(a));
+        Asserts.assertEQ(b > 65535L ? 65535L : b, testMinLConst(b));
     }
 }

From fdb4350fcecef1915cdbc27ece24153a1b6c884d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Lund=C3=A9n?= <dlunden@openjdk.org>
Date: Wed, 31 Jul 2024 16:05:42 +0000
Subject: [PATCH 273/401] 8324345: Stack overflow during C2 compilation when
 splitting memory phi

Reviewed-by: thartmann, kvn
---
 src/hotspot/share/opto/escape.cpp             | 15 ++++--
 src/hotspot/share/opto/escape.hpp             |  6 +--
 .../TestFindInstMemRecursion.java             | 49 +++++++++++++++++++
 .../VectorReplicateLongSpecialImmTest.java    |  2 +-
 4 files changed, 63 insertions(+), 9 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/escapeAnalysis/TestFindInstMemRecursion.java

diff --git a/src/hotspot/share/opto/escape.cpp b/src/hotspot/share/opto/escape.cpp
index 2ca722148b61e..eb6887f11baf6 100644
--- a/src/hotspot/share/opto/escape.cpp
+++ b/src/hotspot/share/opto/escape.cpp
@@ -3879,7 +3879,7 @@ PhiNode *ConnectionGraph::create_split_phi(PhiNode *orig_phi, int alias_idx, Gro
 // Return a new version of Memory Phi "orig_phi" with the inputs having the
 // specified alias index.
 //
-PhiNode *ConnectionGraph::split_memory_phi(PhiNode *orig_phi, int alias_idx, GrowableArray<PhiNode *>  &orig_phi_worklist) {
+PhiNode *ConnectionGraph::split_memory_phi(PhiNode *orig_phi, int alias_idx, GrowableArray<PhiNode *> &orig_phi_worklist, uint rec_depth) {
   assert(alias_idx != Compile::AliasIdxBot, "can't split out bottom memory");
   Compile *C = _compile;
   PhaseGVN* igvn = _igvn;
@@ -3895,7 +3895,7 @@ PhiNode *ConnectionGraph::split_memory_phi(PhiNode *orig_phi, int alias_idx, Gro
   bool finished = false;
   while(!finished) {
     while (idx < phi->req()) {
-      Node *mem = find_inst_mem(phi->in(idx), alias_idx, orig_phi_worklist);
+      Node *mem = find_inst_mem(phi->in(idx), alias_idx, orig_phi_worklist, rec_depth + 1);
       if (mem != nullptr && mem->is_Phi()) {
         PhiNode *newphi = create_split_phi(mem->as_Phi(), alias_idx, orig_phi_worklist, new_phi_created);
         if (new_phi_created) {
@@ -4037,7 +4037,12 @@ void ConnectionGraph::move_inst_mem(Node* n, GrowableArray<PhiNode *>  &orig_phi
 // Search memory chain of "mem" to find a MemNode whose address
 // is the specified alias index.
 //
-Node* ConnectionGraph::find_inst_mem(Node *orig_mem, int alias_idx, GrowableArray<PhiNode *>  &orig_phis) {
+#define FIND_INST_MEM_RECURSION_DEPTH_LIMIT 1000
+Node* ConnectionGraph::find_inst_mem(Node *orig_mem, int alias_idx, GrowableArray<PhiNode *>  &orig_phis, uint rec_depth) {
+  if (rec_depth > FIND_INST_MEM_RECURSION_DEPTH_LIMIT) {
+    _compile->record_failure(_invocation > 0 ? C2Compiler::retry_no_iterative_escape_analysis() : C2Compiler::retry_no_escape_analysis());
+    return nullptr;
+  }
   if (orig_mem == nullptr) {
     return orig_mem;
   }
@@ -4111,7 +4116,7 @@ Node* ConnectionGraph::find_inst_mem(Node *orig_mem, int alias_idx, GrowableArra
       if (result == mmem->base_memory()) {
         // Didn't find instance memory, search through general slice recursively.
         result = mmem->memory_at(C->get_general_index(alias_idx));
-        result = find_inst_mem(result, alias_idx, orig_phis);
+        result = find_inst_mem(result, alias_idx, orig_phis, rec_depth + 1);
         if (C->failing()) {
           return nullptr;
         }
@@ -4179,7 +4184,7 @@ Node* ConnectionGraph::find_inst_mem(Node *orig_mem, int alias_idx, GrowableArra
       orig_phis.append_if_missing(mphi);
     } else if (C->get_alias_index(t) != alias_idx) {
       // Create a new Phi with the specified alias index type.
-      result = split_memory_phi(mphi, alias_idx, orig_phis);
+      result = split_memory_phi(mphi, alias_idx, orig_phis, rec_depth + 1);
     }
   }
   // the result is either MemNode, PhiNode, InitializeNode.
diff --git a/src/hotspot/share/opto/escape.hpp b/src/hotspot/share/opto/escape.hpp
index 658c8f6e8feca..32e70be219ab0 100644
--- a/src/hotspot/share/opto/escape.hpp
+++ b/src/hotspot/share/opto/escape.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -549,10 +549,10 @@ class ConnectionGraph: public ArenaObj {
   bool split_AddP(Node *addp, Node *base);
 
   PhiNode *create_split_phi(PhiNode *orig_phi, int alias_idx, GrowableArray<PhiNode *>  &orig_phi_worklist, bool &new_created);
-  PhiNode *split_memory_phi(PhiNode *orig_phi, int alias_idx, GrowableArray<PhiNode *>  &orig_phi_worklist);
+  PhiNode *split_memory_phi(PhiNode *orig_phi, int alias_idx, GrowableArray<PhiNode *>  &orig_phi_worklist, uint rec_depth);
 
   void  move_inst_mem(Node* n, GrowableArray<PhiNode *>  &orig_phis);
-  Node* find_inst_mem(Node* mem, int alias_idx,GrowableArray<PhiNode *>  &orig_phi_worklist);
+  Node* find_inst_mem(Node* mem, int alias_idx,GrowableArray<PhiNode *>  &orig_phi_worklist, uint rec_depth = 0);
   Node* step_through_mergemem(MergeMemNode *mmem, int alias_idx, const TypeOopPtr *toop);
 
   Node_Array _node_map; // used for bookkeeping during type splitting
diff --git a/test/hotspot/jtreg/compiler/escapeAnalysis/TestFindInstMemRecursion.java b/test/hotspot/jtreg/compiler/escapeAnalysis/TestFindInstMemRecursion.java
new file mode 100644
index 0000000000000..90a5ff92cd3ac
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/escapeAnalysis/TestFindInstMemRecursion.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 8324345
+ * @summary Ensure that ConnectionGraph::find_inst_mem does not cause a stack
+ *          overflow.
+ *
+ * @run main/othervm -Xcomp -XX:CompileThreshold=10 -XX:-TieredCompilation
+ *                   -XX:CompileCommand=CompileOnly,javax.swing.plaf.basic.BasicLookAndFeel::initComponentDefaults
+ *                   -XX:CompileCommand=MemLimit,*.*,0
+ *                   compiler.escapeAnalysis.TestFindInstMemRecursion
+ *
+ */
+
+package compiler.escapeAnalysis;
+
+import javax.swing.*;
+import javax.swing.plaf.metal.*;
+
+public class TestFindInstMemRecursion {
+    public static void main(String[] args) throws Exception {
+        LookAndFeel lookAndFeel = new MetalLookAndFeel();
+        for (int i = 0; i < 20; ++i) {
+            UIManager.setLookAndFeel(lookAndFeel);
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorReplicateLongSpecialImmTest.java b/test/hotspot/jtreg/compiler/vectorapi/VectorReplicateLongSpecialImmTest.java
index e2ad716d1fa95..b885abb632a44 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/VectorReplicateLongSpecialImmTest.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorReplicateLongSpecialImmTest.java
@@ -36,7 +36,7 @@
  * @library /test/lib
  * @requires os.arch == "aarch64"
  * @modules jdk.incubator.vector
- * @run testng/othervm -XX:UseSVE=0 -XX:-TieredCompilation -XX:CompileThreshold=100 compiler.vectorapi.VectorReplicateLongSpecialImmTest
+ * @run testng/othervm -XX:UseSVE=0 -XX:-TieredCompilation -XX:CompileThreshold=100 -XX:+IgnoreUnrecognizedVMOptions -XX:CompileCommand=MemLimit,*.*,0 compiler.vectorapi.VectorReplicateLongSpecialImmTest
  */
 public class VectorReplicateLongSpecialImmTest {
 

From e4c7850c177899a5da6f5050cb0647a6e1a75d31 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Wed, 31 Jul 2024 16:24:07 +0000
Subject: [PATCH 274/401] 8337027: Parallel: Obsolete BaseFootPrintEstimate

Reviewed-by: tschatzl, kbarrett
---
 src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp | 10 +++-------
 src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp |  5 ++---
 .../share/gc/parallel/psGCAdaptivePolicyCounters.cpp   |  7 +------
 .../share/gc/parallel/psGCAdaptivePolicyCounters.hpp   |  8 +-------
 src/hotspot/share/gc/shared/gc_globals.hpp             |  4 ----
 src/hotspot/share/runtime/arguments.cpp                |  5 ++---
 .../classes/sun/jvmstat/perfdata/resources/aliasmap    |  2 --
 7 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp
index cfdb7e9eb29dd..288a21fd35d05 100644
--- a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp
+++ b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -205,8 +205,6 @@ void PSAdaptiveSizePolicy::compute_eden_space_size(
                                            bool   is_full_gc) {
 
   // Update statistics
-  // Time statistics are updated as we go, update footprint stats here
-  _avg_base_footprint->sample(BaseFootPrintEstimate);
   avg_young_live()->sample(young_live);
   avg_eden_live()->sample(eden_live);
 
@@ -363,8 +361,7 @@ void PSAdaptiveSizePolicy::compute_eden_space_size(
   log_debug(gc, ergo)("Live_space: " SIZE_FORMAT " free_space: " SIZE_FORMAT,
                       live_space(), free_space());
 
-  log_trace(gc, ergo)("Base_footprint: " SIZE_FORMAT " avg_young_live: " SIZE_FORMAT " avg_old_live: " SIZE_FORMAT,
-                      (size_t)_avg_base_footprint->average(),
+  log_trace(gc, ergo)("avg_young_live: " SIZE_FORMAT " avg_old_live: " SIZE_FORMAT,
                       (size_t)avg_young_live()->average(),
                       (size_t)avg_old_live()->average());
 
@@ -535,8 +532,7 @@ void PSAdaptiveSizePolicy::compute_old_gen_free_space(
   log_debug(gc, ergo)("Live_space: " SIZE_FORMAT " free_space: " SIZE_FORMAT,
                       live_space(), free_space());
 
-  log_trace(gc, ergo)("Base_footprint: " SIZE_FORMAT " avg_young_live: " SIZE_FORMAT " avg_old_live: " SIZE_FORMAT,
-                      (size_t)_avg_base_footprint->average(),
+  log_trace(gc, ergo)("avg_young_live: " SIZE_FORMAT " avg_old_live: " SIZE_FORMAT,
                       (size_t)avg_young_live()->average(),
                       (size_t)avg_old_live()->average());
 
diff --git a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp
index 90e1e60db9495..4fab160dcb4fb 100644
--- a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp
+++ b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -145,8 +145,7 @@ class PSAdaptiveSizePolicy : public AdaptiveSizePolicy {
 
   // Footprint accessors
   size_t live_space() const {
-    return (size_t)(avg_base_footprint()->average() +
-                    avg_young_live()->average() +
+    return (size_t)(avg_young_live()->average() +
                     avg_old_live()->average());
   }
   size_t free_space() const {
diff --git a/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.cpp b/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.cpp
index 20e14b73ac390..ed96c5c418157 100644
--- a/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.cpp
+++ b/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -107,10 +107,6 @@ PSGCAdaptivePolicyCounters::PSGCAdaptivePolicyCounters(const char* name_arg,
     _free_space = PerfDataManager::create_variable(SUN_GC, cname,
       PerfData::U_Bytes, ps_size_policy()->free_space(), CHECK);
 
-    cname = PerfDataManager::counter_name(name_space(), "avgBaseFootprint");
-    _avg_base_footprint = PerfDataManager::create_variable(SUN_GC, cname,
-      PerfData::U_Bytes, (jlong) ps_size_policy()->avg_base_footprint()->average(), CHECK);
-
     cname = PerfDataManager::counter_name(name_space(), "liveAtLastFullGc");
     _live_at_last_full_gc_counter =
       PerfDataManager::create_variable(SUN_GC, cname,
@@ -157,7 +153,6 @@ void PSGCAdaptivePolicyCounters::update_counters_from_policy() {
     update_decrement_tenuring_threshold_for_survivor_limit();
     update_live_space();
     update_free_space();
-    update_avg_base_footprint();
 
     update_change_old_gen_for_maj_pauses();
     update_change_young_gen_for_maj_pauses();
diff --git a/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp b/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp
index 620c761004ecd..ad84eb4368b80 100644
--- a/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp
+++ b/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,6 @@ class PSGCAdaptivePolicyCounters : public GCAdaptivePolicyCounters {
   PerfVariable* _avg_major_interval;
   PerfVariable* _live_space;
   PerfVariable* _free_space;
-  PerfVariable* _avg_base_footprint;
   PerfVariable* _live_at_last_full_gc_counter;
   PerfVariable* _old_capacity;
 
@@ -142,11 +141,6 @@ class PSGCAdaptivePolicyCounters : public GCAdaptivePolicyCounters {
     _free_space->set_value(ps_size_policy()->free_space());
   }
 
-  inline void update_avg_base_footprint() {
-    _avg_base_footprint->set_value(
-      (jlong)(ps_size_policy()->avg_base_footprint()->average())
-    );
-  }
   inline void update_avg_old_live() {
     _avg_old_live_counter->set_value(
       (jlong)(ps_size_policy()->avg_old_live()->average())
diff --git a/src/hotspot/share/gc/shared/gc_globals.hpp b/src/hotspot/share/gc/shared/gc_globals.hpp
index 66496544b9627..34bc638c9baca 100644
--- a/src/hotspot/share/gc/shared/gc_globals.hpp
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp
@@ -422,10 +422,6 @@
           "Initial ratio of young generation/survivor space size")          \
           range(0, max_uintx)                                               \
                                                                             \
-  product(size_t, BaseFootPrintEstimate, 256*M,                             \
-          "Estimate of footprint other than Java Heap")                     \
-          range(0, max_uintx)                                               \
-                                                                            \
   product(bool, UseGCOverheadLimit, true,                                   \
           "Use policy to limit of proportion of time spent in GC "          \
           "before an OutOfMemory error is thrown")                          \
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 1bded2916504f..23b5330044148 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -521,6 +521,8 @@ static SpecialFlag const special_jvm_flags[] = {
   { "RTMRetryCount",                JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
 #endif // X86
 
+
+  { "BaseFootPrintEstimate",           JDK_Version::undefined(), JDK_Version::jdk(24), JDK_Version::jdk(25) },
   { "HeapFirstMaximumCompactionCount", JDK_Version::undefined(), JDK_Version::jdk(24), JDK_Version::jdk(25) },
   { "UseVtableBasedCHA",               JDK_Version::undefined(), JDK_Version::jdk(24), JDK_Version::jdk(25) },
 #ifdef ASSERT
@@ -1653,9 +1655,6 @@ jint Arguments::set_aggressive_heap_flags() {
 #endif
 
   // Increase some data structure sizes for efficiency
-  if (FLAG_SET_CMDLINE(BaseFootPrintEstimate, MaxHeapSize) != JVMFlag::SUCCESS) {
-    return JNI_EINVAL;
-  }
   if (FLAG_SET_CMDLINE(ResizeTLAB, false) != JVMFlag::SUCCESS) {
     return JNI_EINVAL;
   }
diff --git a/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap
index 5993acf701f51..001ce5b5cac4d 100644
--- a/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap
+++ b/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/resources/aliasmap
@@ -404,8 +404,6 @@ alias sun.gc.lastCause                            // 1.5.0 b39
         hotspot.gc.last_cause                     // 1.4.2_02
 
 // sun.gc.policy
-alias sun.gc.policy.avgBaseFootprint              // 1.5.0 b39
-	hotspot.gc.policy.avg_base_footprint      // 1.5.0 b21
 alias sun.gc.policy.avgMajorIntervalTime          // 1.5.0 b39
 	hotspot.gc.policy.avg_major_interval      // 1.5.0 b21
 alias sun.gc.policy.avgMajorPauseTime             // 1.5.0 b39

From 8f039b56294604271c8ee896aca49d325b5472e5 Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Wed, 31 Jul 2024 17:55:01 +0000
Subject: [PATCH 275/401] 8336919: Cleanup and rename tags in placeholders code

Co-authored-by: Frederic Parain <fparain@openjdk.org>
Reviewed-by: iklam, fparain, dholmes
---
 .../share/classfile/classFileParser.cpp       | 14 ++-
 src/hotspot/share/classfile/placeholders.cpp  | 49 +++++------
 src/hotspot/share/classfile/placeholders.hpp  | 36 ++++----
 .../share/classfile/systemDictionary.cpp      | 86 ++++++++++---------
 .../share/classfile/systemDictionary.hpp      | 20 +++--
 .../gtest/classfile/test_placeholders.cpp     |  8 +-
 6 files changed, 111 insertions(+), 102 deletions(-)

diff --git a/src/hotspot/share/classfile/classFileParser.cpp b/src/hotspot/share/classfile/classFileParser.cpp
index ddde58e5d20b3..407078d64fc57 100644
--- a/src/hotspot/share/classfile/classFileParser.cpp
+++ b/src/hotspot/share/classfile/classFileParser.cpp
@@ -835,14 +835,12 @@ void ClassFileParser::parse_interfaces(const ClassFileStream* const stream,
         guarantee_property(unresolved_klass->char_at(0) != JVM_SIGNATURE_ARRAY,
                            "Bad interface name in class file %s", CHECK);
 
-        // Call resolve_super so class circularity is checked
-        interf = SystemDictionary::resolve_super_or_fail(
-                                                  _class_name,
-                                                  unresolved_klass,
-                                                  Handle(THREAD, _loader_data->class_loader()),
-                                                  _protection_domain,
-                                                  false,
-                                                  CHECK);
+        // Call resolve on the interface class name with class circularity checking
+        interf = SystemDictionary::resolve_super_or_fail(_class_name,
+                                                         unresolved_klass,
+                                                         Handle(THREAD, _loader_data->class_loader()),
+                                                         _protection_domain,
+                                                         false, CHECK);
       }
 
       if (!interf->is_interface()) {
diff --git a/src/hotspot/share/classfile/placeholders.cpp b/src/hotspot/share/classfile/placeholders.cpp
index a6a86473ea794..38d359efcc245 100644
--- a/src/hotspot/share/classfile/placeholders.cpp
+++ b/src/hotspot/share/classfile/placeholders.cpp
@@ -95,8 +95,8 @@ SeenThread* PlaceholderEntry::actionToQueue(PlaceholderTable::classloadAction ac
     case PlaceholderTable::LOAD_INSTANCE:
        queuehead = _loadInstanceThreadQ;
        break;
-    case PlaceholderTable::LOAD_SUPER:
-       queuehead = _superThreadQ;
+    case PlaceholderTable::DETECT_CIRCULARITY:
+       queuehead = _circularityThreadQ;
        break;
     case PlaceholderTable::DEFINE_CLASS:
        queuehead = _defineThreadQ;
@@ -111,8 +111,8 @@ void PlaceholderEntry::set_threadQ(SeenThread* seenthread, PlaceholderTable::cla
     case PlaceholderTable::LOAD_INSTANCE:
        _loadInstanceThreadQ = seenthread;
        break;
-    case PlaceholderTable::LOAD_SUPER:
-       _superThreadQ = seenthread;
+    case PlaceholderTable::DETECT_CIRCULARITY:
+       _circularityThreadQ = seenthread;
        break;
     case PlaceholderTable::DEFINE_CLASS:
        _defineThreadQ = seenthread;
@@ -188,10 +188,10 @@ bool PlaceholderEntry::remove_seen_thread(JavaThread* thread, PlaceholderTable::
 }
 
 
-void PlaceholderEntry::set_supername(Symbol* supername) {
+void PlaceholderEntry::set_next_klass_name(Symbol* next_klass_name) {
   assert_locked_or_safepoint(SystemDictionary_lock);
-  assert(_supername == nullptr || _supername->refcount() > 1, "must be referenced also by the loader");
-  _supername = supername;
+  assert(_next_klass_name == nullptr || _next_klass_name->refcount() > 1, "must be referenced also by the loader");
+  _next_klass_name = next_klass_name;
 }
 
 // Placeholder objects represent classes currently being loaded.
@@ -199,12 +199,12 @@ void PlaceholderEntry::set_supername(Symbol* supername) {
 // SystemDictionary_lock, so we don't need special precautions
 // on store ordering here.
 static PlaceholderEntry* add_entry(Symbol* class_name, ClassLoaderData* loader_data,
-                                   Symbol* supername){
+                                   Symbol* next_klass_name){
   assert_locked_or_safepoint(SystemDictionary_lock);
   assert(class_name != nullptr, "adding nullptr obj");
 
   PlaceholderEntry entry;
-  entry.set_supername(supername);
+  entry.set_next_klass_name(next_klass_name);
   PlaceholderKey key(class_name, loader_data);
   bool created;
   PlaceholderEntry* table_copy = _placeholders->put_if_absent(key, entry, &created);
@@ -230,7 +230,7 @@ PlaceholderEntry* PlaceholderTable::get_entry(Symbol* class_name, ClassLoaderDat
 static const char* action_to_string(PlaceholderTable::classloadAction action) {
   switch (action) {
   case PlaceholderTable::LOAD_INSTANCE: return "LOAD_INSTANCE";
-  case PlaceholderTable::LOAD_SUPER:    return "LOAD_SUPER";
+  case PlaceholderTable::DETECT_CIRCULARITY:    return "DETECT_CIRCULARITY";
   case PlaceholderTable::DEFINE_CLASS:  return "DEFINE_CLASS";
  }
  return "";
@@ -250,20 +250,21 @@ inline void log(Symbol* name, PlaceholderEntry* entry, const char* function, Pla
 // If no entry exists, add a placeholder entry
 // If entry exists, reuse entry
 // For both, push SeenThread for classloadAction
-// If LOAD_SUPER, this is used for circularity detection for instanceklass loading.
+// If DETECT_CIRCULARITY, this is used for circularity detection for instanceklass loading.
 PlaceholderEntry* PlaceholderTable::find_and_add(Symbol* name,
                                                  ClassLoaderData* loader_data,
                                                  classloadAction action,
-                                                 Symbol* supername,
+                                                 Symbol* next_klass_name,
                                                  JavaThread* thread) {
-  assert(action != LOAD_SUPER || supername != nullptr, "must have a super class name");
+  assert(action != DETECT_CIRCULARITY || next_klass_name != nullptr,
+         "must have a class name for the next step in the class resolution recursion");
   PlaceholderEntry* probe = get_entry(name, loader_data);
   if (probe == nullptr) {
     // Nothing found, add place holder
-    probe = add_entry(name, loader_data, supername);
+    probe = add_entry(name, loader_data, next_klass_name);
   } else {
-    if (action == LOAD_SUPER) {
-      probe->set_supername(supername);
+    if (action == DETECT_CIRCULARITY) {
+      probe->set_next_klass_name(next_klass_name);
     }
   }
   probe->add_seen_thread(thread, action);
@@ -295,11 +296,11 @@ void PlaceholderTable::find_and_remove(Symbol* name, ClassLoaderData* loader_dat
   assert(probe != nullptr, "must find an entry");
   log(name, probe, "find_and_remove", action);
   probe->remove_seen_thread(thread, action);
-  if (probe->superThreadQ() == nullptr) {
-    probe->set_supername(nullptr);
+  if (probe->circularityThreadQ() == nullptr) {
+    probe->set_next_klass_name(nullptr);
   }
   // If no other threads using this entry, and this thread is not using this entry for other states
-  if ((probe->superThreadQ() == nullptr) && (probe->loadInstanceThreadQ() == nullptr)
+  if ((probe->circularityThreadQ() == nullptr) && (probe->loadInstanceThreadQ() == nullptr)
       && (probe->defineThreadQ() == nullptr) && (probe->definer() == nullptr)) {
     remove_entry(name, loader_data);
   }
@@ -312,9 +313,9 @@ void PlaceholderKey::print_on(outputStream* st) const {
 }
 
 void PlaceholderEntry::print_on(outputStream* st) const {
-  if (supername() != nullptr) {
-    st->print(", supername ");
-    supername()->print_value_on(st);
+  if (next_klass_name() != nullptr) {
+    st->print(", next_klass_name ");
+    next_klass_name()->print_value_on(st);
   }
   if (definer() != nullptr) {
     st->print(", definer ");
@@ -328,8 +329,8 @@ void PlaceholderEntry::print_on(outputStream* st) const {
   st->print("loadInstanceThreadQ threads:");
   SeenThread::print_action_queue(loadInstanceThreadQ(), st);
   st->cr();
-  st->print("superThreadQ threads:");
-  SeenThread::print_action_queue(superThreadQ(), st);
+  st->print("circularityThreadQ threads:");
+  SeenThread::print_action_queue(circularityThreadQ(), st);
   st->cr();
   st->print("defineThreadQ threads:");
   SeenThread::print_action_queue(defineThreadQ(), st);
diff --git a/src/hotspot/share/classfile/placeholders.hpp b/src/hotspot/share/classfile/placeholders.hpp
index 7f83cf5d058b9..6348f76a14eea 100644
--- a/src/hotspot/share/classfile/placeholders.hpp
+++ b/src/hotspot/share/classfile/placeholders.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,15 +41,15 @@ class PlaceholderTable : public AllStatic {
   // caller claims ownership of that action
   // For parallel classloading:
   // multiple LOAD_INSTANCE threads can proceed in parallel
-  // multiple LOAD_SUPER threads can proceed in parallel
-  // LOAD_SUPER needed to check for class circularity
+  // multiple DETECT_CIRCULARITY threads can proceed in parallel
+  // DETECT_CIRCULARITY needed to check for class circularity
   // DEFINE_CLASS: ultimately define class must be single threaded
   // on a class/classloader basis
   // so the head of that queue owns the token
   // and the rest of the threads return the result the first thread gets
   enum classloadAction {
     LOAD_INSTANCE = 1,             // calling load_instance_class
-    LOAD_SUPER = 2,                // loading superclass for this class
+    DETECT_CIRCULARITY = 2,        // loading while detecting class circularity
     DEFINE_CLASS = 3               // find_or_define class
   };
   static void initialize();
@@ -81,13 +81,13 @@ class SeenThread;
 class PlaceholderEntry {
   friend class PlaceholderTable;
  private:
-  SymbolHandle      _supername;
-  JavaThread*       _definer;       // owner of define token
-  InstanceKlass*    _instanceKlass; // InstanceKlass from successful define
-  SeenThread*       _superThreadQ;  // doubly-linked queue of Threads loading a superclass for this class
-  SeenThread*       _loadInstanceThreadQ;  // loadInstance thread
-                                    // This can't be multiple threads since class loading waits for
-                                    // this token to be removed.
+  SymbolHandle      _next_klass_name;     // next step in the recursive process of class loading
+  JavaThread*       _definer;             // owner of define token
+  InstanceKlass*    _instanceKlass;       // InstanceKlass from successful define
+  SeenThread*       _circularityThreadQ;  // doubly-linked queue of Threads loading with circularity detection
+  SeenThread*       _loadInstanceThreadQ; // loadInstance thread
+                                          // This can't be multiple threads since class loading
+                                          // waits for this token to be removed.
 
   SeenThread*       _defineThreadQ; // queue of Threads trying to define this class
                                     // including _definer
@@ -99,8 +99,8 @@ class PlaceholderEntry {
   void add_seen_thread(JavaThread* thread, PlaceholderTable::classloadAction action);
   bool remove_seen_thread(JavaThread* thread, PlaceholderTable::classloadAction action);
 
-  SeenThread*        superThreadQ()        const { return _superThreadQ; }
-  void               set_superThreadQ(SeenThread* SeenThread) { _superThreadQ = SeenThread; }
+  SeenThread*        circularityThreadQ()  const { return _circularityThreadQ; }
+  void               set_circularityThreadQ(SeenThread* SeenThread) { _circularityThreadQ = SeenThread; }
 
   SeenThread*        loadInstanceThreadQ() const { return _loadInstanceThreadQ; }
   void               set_loadInstanceThreadQ(SeenThread* SeenThread) { _loadInstanceThreadQ = SeenThread; }
@@ -110,10 +110,10 @@ class PlaceholderEntry {
  public:
   PlaceholderEntry() :
      _definer(nullptr), _instanceKlass(nullptr),
-     _superThreadQ(nullptr), _loadInstanceThreadQ(nullptr), _defineThreadQ(nullptr) { }
+     _circularityThreadQ(nullptr), _loadInstanceThreadQ(nullptr), _defineThreadQ(nullptr) { }
 
-  Symbol*            supername()           const { return _supername; }
-  void               set_supername(Symbol* supername);
+  Symbol*            next_klass_name()     const { return _next_klass_name; }
+  void               set_next_klass_name(Symbol* next_klass_name);
 
   JavaThread*        definer()             const {return _definer; }
   void               set_definer(JavaThread* definer) { _definer = definer; }
@@ -121,8 +121,8 @@ class PlaceholderEntry {
   InstanceKlass*     instance_klass()      const {return _instanceKlass; }
   void               set_instance_klass(InstanceKlass* ik) { _instanceKlass = ik; }
 
-  bool super_load_in_progress() {
-     return (_superThreadQ != nullptr);
+  bool circularity_detection_in_progress() {
+     return (_circularityThreadQ != nullptr);
   }
 
   bool instance_load_in_progress() {
diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
index 852416e30f5d2..3016d41b28923 100644
--- a/src/hotspot/share/classfile/systemDictionary.cpp
+++ b/src/hotspot/share/classfile/systemDictionary.cpp
@@ -399,32 +399,32 @@ static inline void log_circularity_error(Symbol* name, PlaceholderEntry* probe)
 //      superclass checks on its own thread to catch class circularity and
 //      to avoid deadlock.
 //
-// resolve_super_or_fail adds a LOAD_SUPER placeholder to the placeholder table before calling
-// resolve_instance_class_or_null. ClassCircularityError is detected when a LOAD_SUPER or LOAD_INSTANCE
+// resolve_with_circularity_detection adds a DETECT_CIRCULARITY placeholder to the placeholder table before calling
+// resolve_instance_class_or_null. ClassCircularityError is detected when a DETECT_CIRCULARITY or LOAD_INSTANCE
 // placeholder for the same thread, class, classloader is found.
 // This can be seen with logging option: -Xlog:class+load+placeholders=debug.
 //
-InstanceKlass* SystemDictionary::resolve_super_or_fail(Symbol* class_name,
-                                                       Symbol* super_name,
-                                                       Handle class_loader,
-                                                       Handle protection_domain,
-                                                       bool is_superclass,
-                                                       TRAPS) {
-
-  assert(super_name != nullptr, "null superclass for resolving");
-  assert(!Signature::is_array(super_name), "invalid superclass name");
+InstanceKlass* SystemDictionary::resolve_with_circularity_detection(Symbol* class_name,
+                                                                    Symbol* next_name,
+                                                                    Handle class_loader,
+                                                                    Handle protection_domain,
+                                                                    bool is_superclass,
+                                                                    TRAPS) {
+
+  assert(next_name != nullptr, "null superclass for resolving");
+  assert(!Signature::is_array(next_name), "invalid superclass name");
 #if INCLUDE_CDS
   if (CDSConfig::is_dumping_static_archive()) {
     // Special processing for handling UNREGISTERED shared classes.
     InstanceKlass* k = SystemDictionaryShared::lookup_super_for_unregistered_class(class_name,
-                           super_name, is_superclass);
+                           next_name, is_superclass);
     if (k) {
       return k;
     }
   }
 #endif // INCLUDE_CDS
 
-  // If klass is already loaded, just return the superclass or superinterface.
+  // If class_name is already loaded, just return the superclass or superinterface.
   // Make sure there's a placeholder for the class_name before resolving.
   // This is used as a claim that this thread is currently loading superclass/classloader
   // and for ClassCircularity checks.
@@ -439,28 +439,27 @@ InstanceKlass* SystemDictionary::resolve_super_or_fail(Symbol* class_name,
     InstanceKlass* klassk = dictionary->find_class(THREAD, class_name);
     InstanceKlass* quicksuperk;
     // To support parallel loading: if class is done loading, just return the superclass
-    // if the super_name matches class->super()->name() and if the class loaders match.
-    // Otherwise, a LinkageError will be thrown later.
+    // if the next_name matches class->super()->name() and if the class loaders match.
     if (klassk != nullptr && is_superclass &&
-        ((quicksuperk = klassk->java_super()) != nullptr) &&
-         ((quicksuperk->name() == super_name) &&
-            (quicksuperk->class_loader() == class_loader()))) {
-           return quicksuperk;
+       ((quicksuperk = klassk->java_super()) != nullptr) &&
+       ((quicksuperk->name() == next_name) &&
+         (quicksuperk->class_loader() == class_loader()))) {
+      return quicksuperk;
     } else {
       // Must check ClassCircularity before checking if superclass is already loaded.
       PlaceholderEntry* probe = PlaceholderTable::get_entry(class_name, loader_data);
-      if (probe && probe->check_seen_thread(THREAD, PlaceholderTable::LOAD_SUPER)) {
+      if (probe && probe->check_seen_thread(THREAD, PlaceholderTable::DETECT_CIRCULARITY)) {
           log_circularity_error(class_name, probe);
           throw_circularity_error = true;
       }
     }
 
     if (!throw_circularity_error) {
-      // Be careful not to exit resolve_super without removing this placeholder.
+      // Be careful not to exit resolve_with_circularity_detection without removing this placeholder.
       PlaceholderEntry* newprobe = PlaceholderTable::find_and_add(class_name,
                                                                   loader_data,
-                                                                  PlaceholderTable::LOAD_SUPER,
-                                                                  super_name, THREAD);
+                                                                  PlaceholderTable::DETECT_CIRCULARITY,
+                                                                  next_name, THREAD);
     }
   }
 
@@ -471,7 +470,7 @@ InstanceKlass* SystemDictionary::resolve_super_or_fail(Symbol* class_name,
 
   // Resolve the superclass or superinterface, check results on return
   InstanceKlass* superk =
-    SystemDictionary::resolve_instance_class_or_null(super_name,
+    SystemDictionary::resolve_instance_class_or_null(next_name,
                                                      class_loader,
                                                      protection_domain,
                                                      THREAD);
@@ -479,13 +478,13 @@ InstanceKlass* SystemDictionary::resolve_super_or_fail(Symbol* class_name,
   // Clean up placeholder entry.
   {
     MutexLocker mu(THREAD, SystemDictionary_lock);
-    PlaceholderTable::find_and_remove(class_name, loader_data, PlaceholderTable::LOAD_SUPER, THREAD);
+    PlaceholderTable::find_and_remove(class_name, loader_data, PlaceholderTable::DETECT_CIRCULARITY, THREAD);
     SystemDictionary_lock->notify_all();
   }
 
   // Check for pending exception or null superk, and throw exception
   if (HAS_PENDING_EXCEPTION || superk == nullptr) {
-    handle_resolution_exception(super_name, true, CHECK_NULL);
+    handle_resolution_exception(next_name, true, CHECK_NULL);
   }
 
   return superk;
@@ -502,13 +501,15 @@ static void handle_parallel_super_load(Symbol* name,
                                        Handle class_loader,
                                        Handle protection_domain, TRAPS) {
 
-  // superk is not used; resolve_super_or_fail is called for circularity check only.
-  Klass* superk = SystemDictionary::resolve_super_or_fail(name,
-                                                          superclassname,
-                                                          class_loader,
-                                                          protection_domain,
-                                                          true,
-                                                          CHECK);
+  // The result superk is not used; resolve_with_circularity_detection is called for circularity check only.
+  // This passes true to is_superclass even though it might not be the super class in order to perform the
+  // optimization anyway.
+  Klass* superk = SystemDictionary::resolve_with_circularity_detection(name,
+                                                                       superclassname,
+                                                                       class_loader,
+                                                                       protection_domain,
+                                                                       true,
+                                                                       CHECK);
 }
 
 // Bootstrap and non-parallel capable class loaders use the LOAD_INSTANCE placeholder to
@@ -536,7 +537,7 @@ static InstanceKlass* handle_parallel_loading(JavaThread* current,
       // Wait until the first thread has finished loading this class. Also wait until all the
       // threads trying to load its superclass have removed their placeholders.
       while (oldprobe != nullptr &&
-             (oldprobe->instance_load_in_progress() || oldprobe->super_load_in_progress())) {
+             (oldprobe->instance_load_in_progress() || oldprobe->circularity_detection_in_progress())) {
 
         // LOAD_INSTANCE placeholders are used to implement parallel capable class loading
         // for the bootclass loader.
@@ -575,8 +576,9 @@ InstanceKlass* SystemDictionary::resolve_instance_class_or_null(Symbol* name,
                                                                 Handle protection_domain,
                                                                 TRAPS) {
   // name must be in the form of "java/lang/Object" -- cannot be "Ljava/lang/Object;"
+  DEBUG_ONLY(ResourceMark rm(THREAD));
   assert(name != nullptr && !Signature::is_array(name) &&
-         !Signature::has_envelope(name), "invalid class name");
+         !Signature::has_envelope(name), "invalid class name: %s", name == nullptr ? "nullptr" : name->as_C_string());
 
   EventClassLoad class_load_start_event;
 
@@ -607,7 +609,7 @@ InstanceKlass* SystemDictionary::resolve_instance_class_or_null(Symbol* name,
   Handle lockObject = get_loader_lock_or_null(class_loader);
   ObjectLocker ol(lockObject, THREAD);
 
-  bool super_load_in_progress  = false;
+  bool circularity_detection_in_progress  = false;
   InstanceKlass* loaded_class = nullptr;
   SymbolHandle superclassname; // Keep alive while loading in parallel thread.
 
@@ -625,9 +627,9 @@ InstanceKlass* SystemDictionary::resolve_instance_class_or_null(Symbol* name,
       loaded_class = check;
     } else {
       PlaceholderEntry* placeholder = PlaceholderTable::get_entry(name, loader_data);
-      if (placeholder != nullptr && placeholder->super_load_in_progress()) {
-         super_load_in_progress = true;
-         superclassname = placeholder->supername();
+      if (placeholder != nullptr && placeholder->circularity_detection_in_progress()) {
+         circularity_detection_in_progress = true;
+         superclassname = placeholder->next_klass_name();
          assert(superclassname != nullptr, "superclass has to have a name");
       }
     }
@@ -635,7 +637,7 @@ InstanceKlass* SystemDictionary::resolve_instance_class_or_null(Symbol* name,
 
   // If the class is in the placeholder table with super_class set,
   // handle superclass loading in progress.
-  if (super_load_in_progress) {
+  if (circularity_detection_in_progress) {
     handle_parallel_super_load(name, superclassname,
                                class_loader,
                                protection_domain,
@@ -1052,8 +1054,8 @@ bool SystemDictionary::check_shared_class_super_type(InstanceKlass* klass, Insta
     }
   }
 
-  Klass *found = resolve_super_or_fail(klass->name(), super_type->name(),
-                                       class_loader, protection_domain, is_superclass, CHECK_0);
+  Klass *found = resolve_with_circularity_detection(klass->name(), super_type->name(),
+                                                    class_loader, protection_domain, is_superclass, CHECK_0);
   if (found == super_type) {
     return true;
   } else {
diff --git a/src/hotspot/share/classfile/systemDictionary.hpp b/src/hotspot/share/classfile/systemDictionary.hpp
index 6355de9c4ceb5..ee50aa38dd0cf 100644
--- a/src/hotspot/share/classfile/systemDictionary.hpp
+++ b/src/hotspot/share/classfile/systemDictionary.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -102,15 +102,23 @@ class SystemDictionary : AllStatic {
     return resolve_or_null(class_name, Handle(), Handle(), THREAD);
   }
 
+  static InstanceKlass* resolve_with_circularity_detection(Symbol* class_name,
+                                                           Symbol* next_name,
+                                                           Handle class_loader,
+                                                           Handle protection_domain,
+                                                           bool is_superclass,
+                                                           TRAPS);
+
   // Resolve a superclass or superinterface. Called from ClassFileParser,
   // parse_interfaces, resolve_instance_class_or_null, load_shared_class
   // "class_name" is the class whose super class or interface is being resolved.
-  static InstanceKlass* resolve_super_or_fail(Symbol* class_name,
-                                              Symbol* super_name,
+  static InstanceKlass* resolve_super_or_fail(Symbol* class_name, Symbol* super_name,
                                               Handle class_loader,
-                                              Handle protection_domain,
-                                              bool is_superclass,
-                                              TRAPS);
+                                              Handle protection_domain, bool is_superclass, TRAPS) {
+    return resolve_with_circularity_detection(class_name, super_name, class_loader, protection_domain,
+                                              is_superclass, THREAD);
+  }
+
  private:
   // Parse the stream to create a hidden class.
   // Used by jvm_lookup_define_class.
diff --git a/test/hotspot/gtest/classfile/test_placeholders.cpp b/test/hotspot/gtest/classfile/test_placeholders.cpp
index 4179a1fc695da..8cd9536271e23 100644
--- a/test/hotspot/gtest/classfile/test_placeholders.cpp
+++ b/test/hotspot/gtest/classfile/test_placeholders.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@ TEST_VM(PlaceholderTable, supername) {
   {
     MutexLocker ml(THREAD, SystemDictionary_lock);
 
-    PlaceholderTable::classloadAction super_action = PlaceholderTable::LOAD_SUPER;
+    PlaceholderTable::classloadAction super_action = PlaceholderTable::DETECT_CIRCULARITY;
     PlaceholderTable::classloadAction define_action = PlaceholderTable::DEFINE_CLASS;
 
     // DefineClass A and D
@@ -71,7 +71,7 @@ TEST_VM(PlaceholderTable, supername) {
 
     // Another thread comes in and finds A loading Super
     PlaceholderEntry* placeholder = PlaceholderTable::get_entry(A, loader_data);
-    SymbolHandle supername = placeholder->supername();
+    SymbolHandle supername = placeholder->next_klass_name();
 
     // Other thread is done before handle_parallel_super_load
     PlaceholderTable::find_and_remove(A, loader_data, super_action, THREAD);
@@ -86,7 +86,7 @@ TEST_VM(PlaceholderTable, supername) {
     // Refcount should be 3: one in table for class A, one in table for class D
     // and one locally with SymbolHandle keeping it alive
     placeholder = PlaceholderTable::get_entry(A, loader_data);
-    supername = placeholder->supername();
+    supername = placeholder->next_klass_name();
     EXPECT_EQ(super->refcount(), 3) << "super class name refcount should be 3";
 
     // Second thread's done too

From a45bb55ddb6abfa520a2e4d7a5cd4d638a526efd Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Wed, 31 Jul 2024 17:58:52 +0000
Subject: [PATCH 276/401] 8337501: JFR: Use TimespanUnit

Reviewed-by: mgronlun
---
 .../jdk/jfr/internal/dcmd/ArgumentParser.java | 18 +++++--------
 .../jdk/jfr/internal/jfc/model/Utilities.java | 12 ++++-----
 .../jdk/jfr/internal/util/TimespanUnit.java   | 26 ++++++++++++-------
 .../jdk/jfr/internal/util/ValueParser.java    | 26 +++++--------------
 4 files changed, 35 insertions(+), 47 deletions(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/ArgumentParser.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/ArgumentParser.java
index a614516d295bc..c14ce6025ce9b 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/ArgumentParser.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/ArgumentParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
 import java.util.Set;
 import java.util.StringJoiner;
 import jdk.jfr.internal.util.SpellChecker;
+import jdk.jfr.internal.util.TimespanUnit;
 
 final class ArgumentParser {
     private final Map<String, Object> options = new HashMap<>();
@@ -302,16 +303,11 @@ private Object parseNanotime(String name, String text) {
             }
             throw new IllegalArgumentException("Integer parsing error nanotime value: unit required");
         }
-        return switch(unit) {
-            case "ns" -> time;
-            case "us" -> time * 1000;
-            case "ms" -> time * 1000 * 1000;
-            case "s" -> time * 1000 * 1000 * 1000;
-            case "m" -> time * 60 * 1000 * 1000 * 1000;
-            case "h" -> time * 60 * 60* 1000 * 1000 * 1000;
-            case "d" -> time * 24 * 60 * 60 * 1000 * 1000 * 1000;
-            default -> throw new IllegalArgumentException("Integer parsing error nanotime value: illegal unit");
-        };
+        TimespanUnit tu = TimespanUnit.fromText(unit);
+        if (tu == null) {
+            throw new IllegalArgumentException("Integer parsing error nanotime value: illegal unit");
+        }
+        return tu.toNanos(time);
     }
 
     int indexOfUnit(String text) {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/Utilities.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/Utilities.java
index 76e834fe6eb3c..281a0c5794967 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/Utilities.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/Utilities.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,9 @@
 package jdk.jfr.internal.jfc.model;
 
 import java.util.StringJoiner;
+import jdk.jfr.internal.util.TimespanUnit;
 
 public final class Utilities {
-    private static final String[] UNITS = new String[] {
-        "ns", "us", "ns", "ms", "s", "m", "h", "d" // order matters
-    };
 
     static XmlElement instantiate(Class<? extends XmlElement> type) {
         try {
@@ -104,9 +102,9 @@ static void checkValid(String value, Object... valid) {
     static String parseTimespan(String s) {
         StringBuilder sb = new StringBuilder();
         try {
-            for (String unit : UNITS) {
-                if (s.endsWith(unit)) {
-                    return parseForUnit(s, unit);
+            for (TimespanUnit timespan : TimespanUnit.values()) {
+                if (s.endsWith(timespan.text)) {
+                    return parseForUnit(s, timespan.text);
                 }
             }
             Long.parseLong(s);
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/TimespanUnit.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/TimespanUnit.java
index 9026f59b68b88..0fdde833bebd3 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/TimespanUnit.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/TimespanUnit.java
@@ -24,21 +24,29 @@
  */
 package jdk.jfr.internal.util;
 
+import java.util.concurrent.TimeUnit;
+
 public enum TimespanUnit {
-    NANOSECONDS ("ns",                           1L, 1000),
-    MICROSECONDS("us",                        1000L, 1000),
-    MILLISECONDS("ms",                   1_000_000L, 1000),
-    SECONDS     ("s",                1_000_000_000L,   60),
-    MINUTES     ("m",           60 * 1_000_000_000L,   60),
-    HOURS       ("h",      60 * 60 * 1_000_000_000L,   24),
-    DAYS        ("d", 24 * 60 * 60 * 1_000_000_000L,    7);
+    NANOSECONDS ("ns",  TimeUnit.NANOSECONDS, 1000),
+    MICROSECONDS("us", TimeUnit.MICROSECONDS, 1000),
+    MILLISECONDS("ms", TimeUnit.MILLISECONDS, 1000),
+    SECONDS     ("s",       TimeUnit.SECONDS,   60),
+    MINUTES     ("m",       TimeUnit.MINUTES,   60),
+    HOURS       ("h",         TimeUnit.HOURS,   24),
+    DAYS        ("d",          TimeUnit.DAYS,    7);
     public final String text;
     public final long nanos;
     public final int size;
-    TimespanUnit(String text, long nanos, int size) {
+    private final TimeUnit timeUnit;
+    TimespanUnit(String text, TimeUnit tu, int size) {
         this.text = text;
-        this.nanos = nanos;
+        this.nanos = tu.toNanos(1);
         this.size = size;
+        this.timeUnit = tu;
+    }
+
+    public long toNanos(long value) {
+        return timeUnit.toNanos(value);
     }
 
     public static TimespanUnit fromText(String text) {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ValueParser.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ValueParser.java
index e4482c9236887..cf112d3beb543 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ValueParser.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/util/ValueParser.java
@@ -51,26 +51,12 @@ public static long parseTimespanWithInfinity(String s) {
     }
 
     public static long parseTimespan(String s) {
-        if (s.endsWith("ns")) {
-            return Long.parseLong(s.substring(0, s.length() - 2).trim());
-        }
-        if (s.endsWith("us")) {
-            return MICROSECONDS.toNanos(Long.parseLong(s.substring(0, s.length() - 2).trim()));
-        }
-        if (s.endsWith("ms")) {
-            return MILLISECONDS.toNanos(Long.parseLong(s.substring(0, s.length() - 2).trim()));
-        }
-        if (s.endsWith("s")) {
-            return SECONDS.toNanos(Long.parseLong(s.substring(0, s.length() - 1).trim()));
-        }
-        if (s.endsWith("m")) {
-            return MINUTES.toNanos(Long.parseLong(s.substring(0, s.length() - 1).trim()));
-        }
-        if (s.endsWith("h")) {
-            return HOURS.toNanos(Long.parseLong(s.substring(0, s.length() - 1).trim()));
-        }
-        if (s.endsWith("d")) {
-            return DAYS.toNanos(Long.parseLong(s.substring(0, s.length() - 1).trim()));
+        for (TimespanUnit unit : TimespanUnit.values()) {
+            String text = unit.text;
+            if (s.endsWith(text)) {
+                long value = Long.parseLong(s.substring(0, s.length() - text.length()).strip());
+                return unit.toNanos(value);
+            }
         }
 
         try {

From 97f7c03dd0ff389abefed7ea2a7257bcb42e0754 Mon Sep 17 00:00:00 2001
From: Sonia Zaldana Calles <szaldana@openjdk.org>
Date: Wed, 31 Jul 2024 18:05:49 +0000
Subject: [PATCH 277/401] 8336495: Remove unnecessary casts in output.cpp

Reviewed-by: chagedorn, kvn
---
 src/hotspot/share/opto/output.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/opto/output.cpp b/src/hotspot/share/opto/output.cpp
index 42374a0bcd4f8..b3f251bb361ba 100644
--- a/src/hotspot/share/opto/output.cpp
+++ b/src/hotspot/share/opto/output.cpp
@@ -716,7 +716,7 @@ ObjectValue*
 PhaseOutput::sv_for_node_id(GrowableArray<ScopeValue*> *objs, int id) {
   for (int i = 0; i < objs->length(); i++) {
     assert(objs->at(i)->is_object(), "corrupt object cache");
-    ObjectValue* sv = (ObjectValue*) objs->at(i);
+    ObjectValue* sv = objs->at(i)->as_ObjectValue();
     if (sv->id() == id) {
       return sv;
     }
@@ -755,7 +755,7 @@ void PhaseOutput::FillLocArray( int idx, MachSafePointNode* sfpt, Node *local,
   if (local->is_SafePointScalarObject()) {
     SafePointScalarObjectNode* spobj = local->as_SafePointScalarObject();
 
-    ObjectValue* sv = (ObjectValue*) sv_for_node_id(objs, spobj->_idx);
+    ObjectValue* sv = sv_for_node_id(objs, spobj->_idx);
     if (sv == nullptr) {
       ciKlass* cik = t->is_oopptr()->exact_klass();
       assert(cik->is_instance_klass() ||
@@ -987,7 +987,7 @@ bool PhaseOutput::contains_as_scalarized_obj(JVMState* jvms, MachSafePointNode*
       continue;
     }
 
-    ObjectValue* other = (ObjectValue*) sv_for_node_id(objs, n->_idx);
+    ObjectValue* other = sv_for_node_id(objs, n->_idx);
     if (ov == other) {
       return true;
     }

From 8af2ef35b6f9399b6d25ff7a4a72ad283df63f03 Mon Sep 17 00:00:00 2001
From: Alex Menkov <amenkov@openjdk.org>
Date: Wed, 31 Jul 2024 20:02:25 +0000
Subject: [PATCH 278/401] 8331015: Obsolete -XX:+UseNotificationThread

Reviewed-by: dholmes, kevinw, sspitsyn, coleenp
---
 .../recorder/repository/jfrEmergencyDump.cpp  |  4 ++--
 src/hotspot/share/runtime/arguments.cpp       |  2 +-
 src/hotspot/share/runtime/globals.hpp         |  3 ---
 src/hotspot/share/runtime/mutexLocker.cpp     |  9 ++------
 src/hotspot/share/runtime/serviceThread.cpp   | 22 +------------------
 .../share/services/lowMemoryDetector.hpp      |  5 ++---
 src/hotspot/share/services/management.cpp     |  5 ++---
 7 files changed, 10 insertions(+), 40 deletions(-)

diff --git a/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp b/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp
index e0bbd8a6ddc28..0759d02cb7c23 100644
--- a/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp
+++ b/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -497,7 +497,7 @@ static bool prepare_for_emergency_dump(Thread* thread) {
     Service_lock->unlock();
   }
 
-  if (UseNotificationThread && Notification_lock->owned_by_self()) {
+  if (Notification_lock->owned_by_self()) {
     Notification_lock->unlock();
   }
 
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 23b5330044148..9086a5f6c7121 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -503,7 +503,6 @@ static SpecialFlag const special_jvm_flags[] = {
   { "RequireSharedSpaces",          JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() },
   { "UseSharedSpaces",              JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() },
   { "DontYieldALot",                JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
-  { "UseNotificationThread",        JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
   { "LockingMode",                  JDK_Version::jdk(24), JDK_Version::jdk(26), JDK_Version::jdk(27) },
   // --- Deprecated alias flags (see also aliased_jvm_flags) - sorted by obsolete_in then expired_in:
   { "CreateMinidumpOnCrash",        JDK_Version::jdk(9),  JDK_Version::undefined(), JDK_Version::undefined() },
@@ -512,6 +511,7 @@ static SpecialFlag const special_jvm_flags[] = {
 
   { "MetaspaceReclaimPolicy",       JDK_Version::undefined(), JDK_Version::jdk(21), JDK_Version::undefined() },
 
+  { "UseNotificationThread",        JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
   { "PreserveAllAnnotations",       JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
   { "UseEmptySlotsInSupers",        JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
   { "OldSize",                      JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::jdk(25) },
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 562549f247efd..61efc0b93764d 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -952,9 +952,6 @@ const int ObjectAlignmentInBytes = 8;
   product(bool, EnableThreadSMRStatistics, trueInDebug, DIAGNOSTIC,         \
              "Enable Thread SMR Statistics")                                \
                                                                             \
-  product(bool, UseNotificationThread, true,                                \
-          "(Deprecated) Use Notification Thread")                           \
-                                                                            \
   product(bool, Inline, true,                                               \
           "Enable inlining")                                                \
                                                                             \
diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp
index add47738db0bc..a63014d78a171 100644
--- a/src/hotspot/share/runtime/mutexLocker.cpp
+++ b/src/hotspot/share/runtime/mutexLocker.cpp
@@ -235,13 +235,8 @@ void mutex_init() {
 
   MUTEX_DEFN(Patching_lock                   , PaddedMutex  , nosafepoint);      // used for safepointing and code patching.
   MUTEX_DEFN(MonitorDeflation_lock           , PaddedMonitor, nosafepoint);      // used for monitor deflation thread operations
-  MUTEX_DEFN(Service_lock                    , PaddedMonitor, service);      // used for service thread operations
-
-  if (UseNotificationThread) {
-    MUTEX_DEFN(Notification_lock             , PaddedMonitor, service);  // used for notification thread operations
-  } else {
-    Notification_lock = Service_lock;
-  }
+  MUTEX_DEFN(Service_lock                    , PaddedMonitor, service);          // used for service thread operations
+  MUTEX_DEFN(Notification_lock               , PaddedMonitor, service);          // used for notification thread operations
 
   MUTEX_DEFN(JmethodIdCreation_lock          , PaddedMutex  , nosafepoint-2); // used for creating jmethodIDs.
   MUTEX_DEFN(InvokeMethodTypeTable_lock      , PaddedMutex  , safepoint);
diff --git a/src/hotspot/share/runtime/serviceThread.cpp b/src/hotspot/share/runtime/serviceThread.cpp
index f02e5062e672e..a81285ac97c0b 100644
--- a/src/hotspot/share/runtime/serviceThread.cpp
+++ b/src/hotspot/share/runtime/serviceThread.cpp
@@ -81,10 +81,7 @@ static void cleanup_oopstorages() {
 
 void ServiceThread::service_thread_entry(JavaThread* jt, TRAPS) {
   while (true) {
-    bool sensors_changed = false;
     bool has_jvmti_events = false;
-    bool has_gc_notification_event = false;
-    bool has_dcmd_notification_event = false;
     bool stringtable_work = false;
     bool symboltable_work = false;
     bool finalizerservice_work = false;
@@ -113,10 +110,7 @@ void ServiceThread::service_thread_entry(JavaThread* jt, TRAPS) {
       // only the first recognized bit of work, to avoid frequently true early
       // tests from potentially starving later work.  Hence the use of
       // arithmetic-or to combine results; we don't want short-circuiting.
-      while (((sensors_changed = (!UseNotificationThread && LowMemoryDetector::has_pending_requests())) |
-              (has_jvmti_events = _jvmti_service_queue.has_events()) |
-              (has_gc_notification_event = (!UseNotificationThread && GCNotifier::has_event())) |
-              (has_dcmd_notification_event = (!UseNotificationThread && DCmdFactory::has_pending_jmx_notification())) |
+      while (((has_jvmti_events = _jvmti_service_queue.has_events()) |
               (stringtable_work = StringTable::has_work()) |
               (symboltable_work = SymbolTable::has_work()) |
               (finalizerservice_work = FinalizerService::has_work()) |
@@ -158,20 +152,6 @@ void ServiceThread::service_thread_entry(JavaThread* jt, TRAPS) {
       _jvmti_event = nullptr;  // reset
     }
 
-    if (!UseNotificationThread) {
-      if (sensors_changed) {
-        LowMemoryDetector::process_sensor_changes(jt);
-      }
-
-      if(has_gc_notification_event) {
-        GCNotifier::sendNotification(CHECK);
-      }
-
-      if(has_dcmd_notification_event) {
-        DCmdFactory::send_notification(CHECK);
-      }
-    }
-
     if (resolved_method_table_work) {
       ResolvedMethodTable::do_concurrent_work(jt);
     }
diff --git a/src/hotspot/share/services/lowMemoryDetector.hpp b/src/hotspot/share/services/lowMemoryDetector.hpp
index 5c1201b4641a8..73491ea8412de 100644
--- a/src/hotspot/share/services/lowMemoryDetector.hpp
+++ b/src/hotspot/share/services/lowMemoryDetector.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,8 +61,7 @@
 //
 // May need to deal with hysteresis effect.
 //
-// Memory detection code runs in the Notification thread or
-// ServiceThread depending on UseNotificationThread flag.
+// Memory detection code runs in the Notification thread.
 
 class OopClosure;
 class MemoryPool;
diff --git a/src/hotspot/share/services/management.cpp b/src/hotspot/share/services/management.cpp
index a9bb72a481a57..2c9f36c098d07 100644
--- a/src/hotspot/share/services/management.cpp
+++ b/src/hotspot/share/services/management.cpp
@@ -149,9 +149,8 @@ void Management::init() {
 }
 
 void Management::initialize(TRAPS) {
-  if (UseNotificationThread) {
-    NotificationThread::initialize();
-  }
+  NotificationThread::initialize();
+
   if (ManagementServer) {
     ResourceMark rm(THREAD);
     HandleMark hm(THREAD);

From 65646b5f81279a7fcef3ea04ef9894cf66f77a5a Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Thu, 1 Aug 2024 03:35:43 +0000
Subject: [PATCH 279/401] 8337457: Redundant Math.round call in
 AquaProgressBarUI#getStringPlacement

Reviewed-by: azvegint
---
 .../macosx/classes/com/apple/laf/AquaProgressBarUI.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaProgressBarUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaProgressBarUI.java
index bf66a1b4b0878..71500f3a95c92 100644
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaProgressBarUI.java
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaProgressBarUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -256,7 +256,7 @@ protected Point getStringPlacement(final Graphics g, final String progressString
             y = oldX;
         }
 
-        return new Point(x + Math.round(width / 2 - stringWidth / 2), y + ((height + fontSizer.getAscent() - fontSizer.getLeading() - fontSizer.getDescent()) / 2) - 1);
+        return new Point(x + (width / 2 - stringWidth / 2), y + ((height + fontSizer.getAscent() - fontSizer.getLeading() - fontSizer.getDescent()) / 2) - 1);
     }
 
     static Dimension getCircularPreferredSize() {

From cf1230a5f7e5ae4c72ec6243fff1d0b0eb27779a Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Thu, 1 Aug 2024 07:28:29 +0000
Subject: [PATCH 280/401] 8337546: Remove unused GCCause::_adaptive_size_policy

Reviewed-by: tschatzl, kbarrett
---
 src/hotspot/share/gc/shared/gcCause.cpp                   | 3 ---
 src/hotspot/share/gc/shared/gcCause.hpp                   | 8 +-------
 .../share/classes/sun/jvm/hotspot/gc/shared/GCCause.java  | 2 --
 .../event/gc/collection/TestGCCauseWithParallelOld.java   | 2 +-
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/hotspot/share/gc/shared/gcCause.cpp b/src/hotspot/share/gc/shared/gcCause.cpp
index 426154fdca3e7..2be7ef7be076a 100644
--- a/src/hotspot/share/gc/shared/gcCause.cpp
+++ b/src/hotspot/share/gc/shared/gcCause.cpp
@@ -78,9 +78,6 @@ const char* GCCause::to_string(GCCause::Cause cause) {
     case _metadata_GC_clear_soft_refs:
       return "Metadata GC Clear Soft References";
 
-    case _adaptive_size_policy:
-      return "Ergonomics";
-
     case _g1_inc_collection_pause:
       return "G1 Evacuation Pause";
 
diff --git a/src/hotspot/share/gc/shared/gcCause.hpp b/src/hotspot/share/gc/shared/gcCause.hpp
index 152ca787fc2f7..f244d17c1ab92 100644
--- a/src/hotspot/share/gc/shared/gcCause.hpp
+++ b/src/hotspot/share/gc/shared/gcCause.hpp
@@ -66,8 +66,6 @@ class GCCause : public AllStatic {
     _metadata_GC_threshold,
     _metadata_GC_clear_soft_refs,
 
-    _adaptive_size_policy,
-
     _g1_inc_collection_pause,
     _g1_compaction_pause,
     _g1_humongous_allocation,
@@ -110,20 +108,16 @@ class GCCause : public AllStatic {
 
   // Causes for collection of the tenured gernation
   inline static bool is_tenured_allocation_failure_gc(GCCause::Cause cause) {
-    // _adaptive_size_policy for a full collection after a young GC
     // _allocation_failure is the generic cause a collection which could result
     // in the collection of the tenured generation if there is not enough space
     // in the tenured generation to support a young GC.
-    return (cause == GCCause::_adaptive_size_policy ||
-            cause == GCCause::_allocation_failure);
+    return cause == GCCause::_allocation_failure;
   }
 
   // Causes for collection of the young generation
   inline static bool is_allocation_failure_gc(GCCause::Cause cause) {
     // _allocation_failure is the generic cause a collection for allocation failure
-    // _adaptive_size_policy is for a collection done before a full GC
     return (cause == GCCause::_allocation_failure ||
-            cause == GCCause::_adaptive_size_policy ||
             cause == GCCause::_shenandoah_allocation_failure_evac);
   }
 
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java
index 4320f61bf36a9..b301f77439067 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java
@@ -48,8 +48,6 @@ public enum GCCause {
   _metadata_GC_threshold ("Metadata GC Threshold"),
   _metadata_GC_clear_soft_refs ("Metadata GC Clear Soft References"),
 
-  _adaptive_size_policy ("Ergonomics"),
-
   _g1_inc_collection_pause ("G1 Evacuation Pause"),
   _g1_compaction_pause ("G1 Compaction Pause"),
   _g1_humongous_allocation ("G1 Humongous Allocation"),
diff --git a/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithParallelOld.java b/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithParallelOld.java
index 0715d3c5c2deb..4d8f697d83719 100644
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithParallelOld.java
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithParallelOld.java
@@ -39,7 +39,7 @@ public static void main(String[] args) throws Exception {
         String testID = "ParallelOld";
         String[] vmFlags = {"-XX:+UseParallelGC"};
         String[] gcNames = {GCHelper.gcParallelScavenge, GCHelper.gcParallelOld};
-        String[] gcCauses = {"Allocation Failure", "Ergonomics", "System.gc()", "GCLocker Initiated GC"};
+        String[] gcCauses = {"Allocation Failure", "System.gc()", "GCLocker Initiated GC"};
         GCGarbageCollectionUtil.test(testID, vmFlags, gcNames, gcCauses);
     }
 }

From 8eb56845e46e8e4867915c8c079adfe1196dcbbc Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Thu, 1 Aug 2024 07:28:39 +0000
Subject: [PATCH 281/401] 8337550: Add documentation to
 TestOutOfMemoryDuringInit.java

Reviewed-by: dholmes
---
 .../runtime/ClassInitErrors/TestOutOfMemoryDuringInit.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/hotspot/jtreg/runtime/ClassInitErrors/TestOutOfMemoryDuringInit.java b/test/hotspot/jtreg/runtime/ClassInitErrors/TestOutOfMemoryDuringInit.java
index 1001ede544741..2f8d0fee72171 100644
--- a/test/hotspot/jtreg/runtime/ClassInitErrors/TestOutOfMemoryDuringInit.java
+++ b/test/hotspot/jtreg/runtime/ClassInitErrors/TestOutOfMemoryDuringInit.java
@@ -44,6 +44,10 @@ static class Nested {
         static void forceInit() { }
         static {
             while (theList != null) {
+                // Use the minimal allocation size to push heap occupation to
+                // the limit, ensuring there is not enough memory to create the
+                // ExceptionInInitializerError that the VM tries to create when
+                // the clinit throws the OOM.
                 theList.add(new Object());
             }
         }

From f174bbd3baf351ae9248b70454b3bc5a89acd7c6 Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevinw@openjdk.org>
Date: Thu, 1 Aug 2024 08:14:17 +0000
Subject: [PATCH 282/401] 8337473: Remove sun/management/jdp tests from
 ProblemList on Linux-aarch64, MacOSX

Reviewed-by: dcubed
---
 test/jdk/ProblemList.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 8e627e27d7a8e..9fed8bb0c22df 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -515,9 +515,9 @@ java/lang/management/MemoryMXBean/Pending.java                  8158837 generic-
 java/lang/management/MemoryMXBean/PendingAllGC.sh               8158837 generic-all
 java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java    8247426 generic-all
 
-sun/management/jdp/JdpDefaultsTest.java                         8241865,8308807 linux-aarch64,macosx-all,aix-ppc64
-sun/management/jdp/JdpJmxRemoteDynamicPortTest.java             8241865,8308807 macosx-all,aix-ppc64
-sun/management/jdp/JdpSpecificAddressTest.java                  8241865,8308807 macosx-all,aix-ppc64
+sun/management/jdp/JdpDefaultsTest.java                         8308807 aix-ppc64
+sun/management/jdp/JdpJmxRemoteDynamicPortTest.java             8308807 aix-ppc64
+sun/management/jdp/JdpSpecificAddressTest.java                  8308807 aix-ppc64
 sun/management/jdp/JdpOffTest.java                              8308807 aix-ppc64
 
 ############################################################################

From c6f0a35e9e3eeaab1e238e8712051a626b337e0b Mon Sep 17 00:00:00 2001
From: Matthew Donovan <mdonovan@openjdk.org>
Date: Thu, 1 Aug 2024 11:40:44 +0000
Subject: [PATCH 283/401] 8333317: Test
 sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java failed with: Invalid
 ECDH ServerKeyExchange signature

Reviewed-by: rhalade
---
 test/jdk/ProblemList.txt                               |  2 +-
 test/jdk/sun/security/pkcs11/PKCS11Test.java           |  2 +-
 .../security/pkcs11/Signature/TestDSAKeyLength.java    | 10 +++++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 9fed8bb0c22df..f8bdfd26e8f79 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -613,7 +613,7 @@ com/sun/security/sasl/gsskerb/NoSecurityLayer.java              8039280 generic-
 sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.java 8039280 generic-all
 sun/security/provider/PolicyParser/PrincipalExpansionError.java 8039280 generic-all
 
-sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java            8316183,8333317 generic-all
+sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java            8316183 linux-ppc64le
 
 ############################################################################
 
diff --git a/test/jdk/sun/security/pkcs11/PKCS11Test.java b/test/jdk/sun/security/pkcs11/PKCS11Test.java
index 2810040e376a6..9cb29eb8507a1 100644
--- a/test/jdk/sun/security/pkcs11/PKCS11Test.java
+++ b/test/jdk/sun/security/pkcs11/PKCS11Test.java
@@ -82,7 +82,7 @@ public abstract class PKCS11Test {
 
     // Version of the NSS artifact. This coincides with the version of
     // the NSS version
-    private static final String NSS_BUNDLE_VERSION = "3.96";
+    private static final String NSS_BUNDLE_VERSION = "3.101";
     private static final String NSSLIB = "jpg.tests.jdk.nsslib";
 
     static double nss_version = -1;
diff --git a/test/jdk/sun/security/pkcs11/Signature/TestDSAKeyLength.java b/test/jdk/sun/security/pkcs11/Signature/TestDSAKeyLength.java
index a2d7f67fa32cc..b2ab96c90c62a 100644
--- a/test/jdk/sun/security/pkcs11/Signature/TestDSAKeyLength.java
+++ b/test/jdk/sun/security/pkcs11/Signature/TestDSAKeyLength.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,8 +48,12 @@ public static void main(String[] args) throws Exception {
 
     @Override
     protected boolean skipTest(Provider provider) {
-        if (isNSS(provider) && (getNSSVersion() == 0.0 || getNSSVersion() >= 3.14)) {
-            System.out.println("Skip testing NSS " + getNSSVersion());
+        double version = getNSSVersion();
+        String[] versionStrs = Double.toString(version).split("\\.");
+        int major = Integer.parseInt(versionStrs[0]);
+        int minor = Integer.parseInt(versionStrs[1]);
+        if (isNSS(provider) && (version == 0.0 || (major >= 3 && minor >= 14))) {
+            System.out.println("Skip testing NSS " + version);
             return true;
         }
 

From 022899a7eb0100bd6d738471f52e5028e3e5f18e Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Thu, 1 Aug 2024 13:39:49 +0000
Subject: [PATCH 284/401] 8337641: G1: Remove unused
 G1CollectedHeap::alloc_highest_free_region

Reviewed-by: tschatzl
---
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp   | 14 ------------
 src/hotspot/share/gc/g1/g1CollectedHeap.hpp   |  4 ----
 .../share/gc/g1/g1HeapRegionManager.cpp       | 22 -------------------
 .../share/gc/g1/g1HeapRegionManager.hpp       |  5 -----
 4 files changed, 45 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index afd7b8948598e..3b8fb145f1692 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -2941,20 +2941,6 @@ void G1CollectedHeap::retire_gc_alloc_region(G1HeapRegion* alloc_region,
   G1HeapRegionPrinter::retire(alloc_region);
 }
 
-G1HeapRegion* G1CollectedHeap::alloc_highest_free_region() {
-  bool expanded = false;
-  uint index = _hrm.find_highest_free(&expanded);
-
-  if (index != G1_NO_HRM_INDEX) {
-    if (expanded) {
-      log_debug(gc, ergo, heap)("Attempt heap expansion (requested address range outside heap bounds). region size: " SIZE_FORMAT "B",
-                                G1HeapRegion::GrainWords * HeapWordSize);
-    }
-    return _hrm.allocate_free_regions_starting_at(index, 1);
-  }
-  return nullptr;
-}
-
 void G1CollectedHeap::mark_evac_failure_object(uint worker_id, const oop obj, size_t obj_size) const {
   assert(!_cm->is_marked_in_bitmap(obj), "must be");
 
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
index ec3cf8eafe3a0..59ade93967872 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -669,10 +669,6 @@ class G1CollectedHeap : public CollectedHeap {
   // Allocates a new heap region instance.
   G1HeapRegion* new_heap_region(uint hrs_index, MemRegion mr);
 
-  // Allocate the highest free region in the reserved heap. This will commit
-  // regions as necessary.
-  G1HeapRegion* alloc_highest_free_region();
-
   // Frees a region by resetting its metadata and adding it to the free list
   // passed as a parameter (this is usually a local list which will be appended
   // to the master free list later or null if free list management is handled
diff --git a/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp b/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp
index b37e65f8b868a..2369a0f7812ea 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegionManager.cpp
@@ -529,28 +529,6 @@ void G1HeapRegionManager::iterate(G1HeapRegionIndexClosure* blk) const {
   }
 }
 
-uint G1HeapRegionManager::find_highest_free(bool* expanded) {
-  // Loop downwards from the highest region index, looking for an
-  // entry which is either free or not yet committed.  If not yet
-  // committed, expand at that index.
-  for (uint curr = reserved_length(); curr-- > 0;) {
-    G1HeapRegion* hr = _regions.get_by_index(curr);
-    if (hr == nullptr || !is_available(curr)) {
-      // Found uncommitted and free region, expand to make it available for use.
-      expand_exact(curr, 1, nullptr);
-      assert(at(curr)->is_free(), "Region (%u) must be available and free after expand", curr);
-
-      *expanded = true;
-      return curr;
-    }
-    if (hr->is_free()) {
-      *expanded = false;
-      return curr;
-    }
-  }
-  return G1_NO_HRM_INDEX;
-}
-
 bool G1HeapRegionManager::allocate_containing_regions(MemRegion range, size_t* commit_count, WorkerThreads* pretouch_workers) {
   size_t commits = 0;
   uint start_index = (uint)_regions.get_index_by_address(range.start());
diff --git a/src/hotspot/share/gc/g1/g1HeapRegionManager.hpp b/src/hotspot/share/gc/g1/g1HeapRegionManager.hpp
index d3f1843f07dbf..81bca4ce6381c 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegionManager.hpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegionManager.hpp
@@ -256,11 +256,6 @@ class G1HeapRegionManager: public CHeapObj<mtGC> {
 
   G1HeapRegion* next_region_in_heap(const G1HeapRegion* r) const;
 
-  // Find the highest free or uncommitted region in the reserved heap,
-  // and if uncommitted, commit it. If none are available, return G1_NO_HRM_INDEX.
-  // Set the 'expanded' boolean true if a new region was committed.
-  uint find_highest_free(bool* expanded);
-
   // Allocate the regions that contain the address range specified, committing the
   // regions if necessary. Return false if any of the regions is already committed
   // and not free, and return the number of regions newly committed in commit_count.

From 27af80ef9e676aaf9016279ff0c7990e2cdfe9ed Mon Sep 17 00:00:00 2001
From: Jorn Vernee <jvernee@openjdk.org>
Date: Thu, 1 Aug 2024 14:36:03 +0000
Subject: [PATCH 285/401] 8324260: java/foreign/TestStubAllocFailure.java run
 timeout with -Xcomp

Reviewed-by: alanb, jpai, shade
---
 test/jdk/java/foreign/TestStubAllocFailure.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/jdk/java/foreign/TestStubAllocFailure.java b/test/jdk/java/foreign/TestStubAllocFailure.java
index b20b3e88ea221..154b455e3f286 100644
--- a/test/jdk/java/foreign/TestStubAllocFailure.java
+++ b/test/jdk/java/foreign/TestStubAllocFailure.java
@@ -25,6 +25,7 @@
  * @test
  * @library ../ /test/lib
  * @requires jdk.foreign.linker != "FALLBACK"
+ * @requires vm.compMode != "Xcomp"
  * @run testng/othervm/native
  *   --enable-native-access=ALL-UNNAMED
  *   TestStubAllocFailure

From 9fe6e2316aef8fd125a7905cff2a2d9ae5d26109 Mon Sep 17 00:00:00 2001
From: Hannes Greule <hgreule@openjdk.org>
Date: Thu, 1 Aug 2024 14:41:25 +0000
Subject: [PATCH 286/401] 8335638: Calling VarHandle.{access-mode} methods
 reflectively throws wrong exception

Reviewed-by: liach
---
 src/hotspot/share/prims/methodHandles.cpp     | 57 ++++++++++++++++++-
 .../VarHandles/VarHandleTestReflection.java   | 25 +++++++-
 2 files changed, 77 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/share/prims/methodHandles.cpp b/src/hotspot/share/prims/methodHandles.cpp
index 473ac396997bd..4f33055d6a3fe 100644
--- a/src/hotspot/share/prims/methodHandles.cpp
+++ b/src/hotspot/share/prims/methodHandles.cpp
@@ -1360,6 +1360,18 @@ JVM_ENTRY(jobject, MH_invokeExact_UOE(JNIEnv* env, jobject mh, jobjectArray args
 }
 JVM_END
 
+/**
+ * Throws a java/lang/UnsupportedOperationException unconditionally.
+ * This is required by the specification of VarHandle.{access-mode} if
+ * invoked directly.
+ */
+JVM_ENTRY(jobject, VH_UOE(JNIEnv* env, jobject vh, jobjectArray args)) {
+  THROW_MSG_NULL(vmSymbols::java_lang_UnsupportedOperationException(), "VarHandle access mode methods cannot be invoked reflectively");
+  return nullptr;
+}
+JVM_END
+
+
 /// JVM_RegisterMethodHandleMethods
 
 #define LANG "Ljava/lang/"
@@ -1399,6 +1411,40 @@ static JNINativeMethod MH_methods[] = {
   {CC "invoke",                    CC "([" OBJ ")" OBJ,                       FN_PTR(MH_invoke_UOE)},
   {CC "invokeExact",               CC "([" OBJ ")" OBJ,                       FN_PTR(MH_invokeExact_UOE)}
 };
+static JNINativeMethod VH_methods[] = {
+  // UnsupportedOperationException throwers
+  {CC "get",                        CC "([" OBJ ")" OBJ,    FN_PTR(VH_UOE)},
+  {CC "set",                        CC "([" OBJ ")V",       FN_PTR(VH_UOE)},
+  {CC "getVolatile",                CC "([" OBJ ")" OBJ,    FN_PTR(VH_UOE)},
+  {CC "setVolatile",                CC "([" OBJ ")V",       FN_PTR(VH_UOE)},
+  {CC "getAcquire",                 CC "([" OBJ ")" OBJ,    FN_PTR(VH_UOE)},
+  {CC "setRelease",                 CC "([" OBJ ")V",       FN_PTR(VH_UOE)},
+  {CC "getOpaque",                  CC "([" OBJ ")" OBJ,    FN_PTR(VH_UOE)},
+  {CC "setOpaque",                  CC "([" OBJ ")V",       FN_PTR(VH_UOE)},
+  {CC "compareAndSet",              CC "([" OBJ ")Z",       FN_PTR(VH_UOE)},
+  {CC "compareAndExchange",         CC "([" OBJ ")" OBJ,    FN_PTR(VH_UOE)},
+  {CC "compareAndExchangeAcquire",  CC "([" OBJ ")" OBJ,    FN_PTR(VH_UOE)},
+  {CC "compareAndExchangeRelease",  CC "([" OBJ ")" OBJ,    FN_PTR(VH_UOE)},
+  {CC "weakCompareAndSetPlain",     CC "([" OBJ ")Z",       FN_PTR(VH_UOE)},
+  {CC "weakCompareAndSet",          CC "([" OBJ ")Z",       FN_PTR(VH_UOE)},
+  {CC "weakCompareAndSetAcquire",   CC "([" OBJ ")Z",       FN_PTR(VH_UOE)},
+  {CC "weakCompareAndSetRelease",   CC "([" OBJ ")Z",       FN_PTR(VH_UOE)},
+  {CC "getAndSet",                  CC "([" OBJ ")" OBJ,    FN_PTR(VH_UOE)},
+  {CC "getAndSetAcquire",           CC "([" OBJ ")" OBJ,    FN_PTR(VH_UOE)},
+  {CC "getAndSetRelease",           CC "([" OBJ ")" OBJ,    FN_PTR(VH_UOE)},
+  {CC "getAndAdd",                  CC "([" OBJ ")" OBJ,    FN_PTR(VH_UOE)},
+  {CC "getAndAddAcquire",           CC "([" OBJ ")" OBJ,    FN_PTR(VH_UOE)},
+  {CC "getAndAddRelease",           CC "([" OBJ ")" OBJ,    FN_PTR(VH_UOE)},
+  {CC "getAndBitwiseOr",            CC "([" OBJ ")" OBJ,    FN_PTR(VH_UOE)},
+  {CC "getAndBitwiseOrAcquire",     CC "([" OBJ ")" OBJ,    FN_PTR(VH_UOE)},
+  {CC "getAndBitwiseOrRelease",     CC "([" OBJ ")" OBJ,    FN_PTR(VH_UOE)},
+  {CC "getAndBitwiseAnd",           CC "([" OBJ ")" OBJ,    FN_PTR(VH_UOE)},
+  {CC "getAndBitwiseAndAcquire",    CC "([" OBJ ")" OBJ,    FN_PTR(VH_UOE)},
+  {CC "getAndBitwiseAndRelease",    CC "([" OBJ ")" OBJ,    FN_PTR(VH_UOE)},
+  {CC "getAndBitwiseXor",           CC "([" OBJ ")" OBJ,    FN_PTR(VH_UOE)},
+  {CC "getAndBitwiseXorAcquire",    CC "([" OBJ ")" OBJ,    FN_PTR(VH_UOE)},
+  {CC "getAndBitwiseXorRelease",    CC "([" OBJ ")" OBJ,    FN_PTR(VH_UOE)}
+};
 
 /**
  * This one function is exported, used by NativeLookup.
@@ -1406,9 +1452,12 @@ static JNINativeMethod MH_methods[] = {
 JVM_ENTRY(void, JVM_RegisterMethodHandleMethods(JNIEnv *env, jclass MHN_class)) {
   assert(!MethodHandles::enabled(), "must not be enabled");
   assert(vmClasses::MethodHandle_klass() != nullptr, "should be present");
+  assert(vmClasses::VarHandle_klass() != nullptr, "should be present");
 
-  oop mirror = vmClasses::MethodHandle_klass()->java_mirror();
-  jclass MH_class = (jclass) JNIHandles::make_local(THREAD, mirror);
+  oop mh_mirror = vmClasses::MethodHandle_klass()->java_mirror();
+  oop vh_mirror = vmClasses::VarHandle_klass()->java_mirror();
+  jclass MH_class = (jclass) JNIHandles::make_local(THREAD, mh_mirror);
+  jclass VH_class = (jclass) JNIHandles::make_local(THREAD, vh_mirror);
 
   {
     ThreadToNativeFromVM ttnfv(thread);
@@ -1420,6 +1469,10 @@ JVM_ENTRY(void, JVM_RegisterMethodHandleMethods(JNIEnv *env, jclass MHN_class))
     status = env->RegisterNatives(MH_class, MH_methods, sizeof(MH_methods)/sizeof(JNINativeMethod));
     guarantee(status == JNI_OK && !env->ExceptionOccurred(),
               "register java.lang.invoke.MethodHandle natives");
+
+    status = env->RegisterNatives(VH_class, VH_methods, sizeof(VH_methods)/sizeof(JNINativeMethod));
+    guarantee(status == JNI_OK && !env->ExceptionOccurred(),
+              "register java.lang.invoke.VarHandle natives");
   }
 
   log_debug(methodhandles, indy)("MethodHandle support loaded (using LambdaForms)");
diff --git a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestReflection.java b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestReflection.java
index 652272ca8a8f4..b20e18d263edd 100644
--- a/test/jdk/java/lang/invoke/VarHandles/VarHandleTestReflection.java
+++ b/test/jdk/java/lang/invoke/VarHandles/VarHandleTestReflection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
 import java.lang.invoke.MethodHandleInfo;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.stream.Stream;
 
@@ -52,15 +53,33 @@ static VarHandle handle() throws Exception {
     }
 
     @Test(dataProvider = "accessModesProvider", expectedExceptions = IllegalArgumentException.class)
-    public void methodInvocation(VarHandle.AccessMode accessMode) throws Exception {
+    public void methodInvocationArgumentMismatch(VarHandle.AccessMode accessMode) throws Exception {
         VarHandle v = handle();
 
-        // Try a reflective invoke using a Method
+        // Try a reflective invoke using a Method, with no arguments
 
         Method vhm = VarHandle.class.getMethod(accessMode.methodName(), Object[].class);
         vhm.invoke(v, new Object[]{});
     }
 
+    @Test(dataProvider = "accessModesProvider")
+    public void methodInvocationMatchingArguments(VarHandle.AccessMode accessMode) throws Exception {
+        VarHandle v = handle();
+
+        // Try a reflective invoke using a Method, with the minimal required arguments
+
+        Method vhm = VarHandle.class.getMethod(accessMode.methodName(), Object[].class);
+        Object arg = new Object[0];
+        try {
+            vhm.invoke(v, arg);
+        } catch (InvocationTargetException e) {
+            if (!(e.getCause() instanceof UnsupportedOperationException)) {
+                throw new RuntimeException("expected UnsupportedOperationException but got: "
+                                           + e.getCause().getClass().getName(), e);
+            }
+        }
+    }
+
     @Test(dataProvider = "accessModesProvider", expectedExceptions = UnsupportedOperationException.class)
     public void methodHandleInvoke(VarHandle.AccessMode accessMode) throws Throwable {
         VarHandle v = handle();

From f1fa64b6b67f2eef916b8d92eb522ccb19035e12 Mon Sep 17 00:00:00 2001
From: Mark Powers <mpowers@openjdk.org>
Date: Thu, 1 Aug 2024 16:37:20 +0000
Subject: [PATCH 287/401] 4966250: SSLSessionContext.setSessionTimeout()
 documentation could be updated

Reviewed-by: mullan
---
 .../javax/net/ssl/SSLSessionContext.java      | 48 ++++++++++---------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/java.base/share/classes/javax/net/ssl/SSLSessionContext.java b/src/java.base/share/classes/javax/net/ssl/SSLSessionContext.java
index e4b2560415fc2..fd5ef0bcc5868 100644
--- a/src/java.base/share/classes/javax/net/ssl/SSLSessionContext.java
+++ b/src/java.base/share/classes/javax/net/ssl/SSLSessionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,8 +30,8 @@
 
 
 /**
- * A <code>SSLSessionContext</code> represents a set of
- * <code>SSLSession</code>s associated with a single entity. For example,
+ * A {@code SSLSessionContext} represents a set of
+ * {@code SSLSession}s associated with a single entity. For example,
  * it could be associated with a server or client who participates in many
  * sessions concurrently.
  * <p>
@@ -41,7 +41,7 @@
  * Session contexts may not contain all sessions. For example, stateless
  * sessions are not stored in the session context.
  * <p>
- * There are <code>SSLSessionContext</code> parameters that affect how
+ * There are {@code SSLSessionContext} parameters that affect how
  * sessions are stored:
  * <UL>
  *      <LI>Sessions can be set to expire after a specified
@@ -50,7 +50,7 @@
  *      can be limited.
  * </UL>
  * A session can be retrieved based on its session id, and all session id's
- * in a <code>SSLSessionContext</code> can be listed.
+ * in a {@code SSLSessionContext} can be listed.
  *
  * @see SSLSession
  *
@@ -61,19 +61,19 @@
 public interface SSLSessionContext {
 
     /**
-     * Returns the <code>SSLSession</code> bound to the specified session id.
+     * Returns the {@code SSLSession} bound to the specified session id.
      *
      * @param sessionId the Session identifier
-     * @return the <code>SSLSession</code> or null if
+     * @return the {@code SSLSession} or null if
      * the specified session id does not refer to a valid SSLSession.
      *
-     * @throws NullPointerException if <code>sessionId</code> is null.
+     * @throws NullPointerException if {@code sessionId} is null.
      */
     SSLSession getSession(byte[] sessionId);
 
     /**
      * Returns an Enumeration of all known session id's grouped under this
-     * <code>SSLSessionContext</code>.
+     * {@code SSLSessionContext}.
      * <p>Session contexts may not contain all sessions. For example,
      * stateless sessions are not stored in the session context.
      *
@@ -82,16 +82,17 @@ public interface SSLSessionContext {
     Enumeration<byte[]> getIds();
 
     /**
-     * Sets the timeout limit for <code>SSLSession</code> objects grouped
-     * under this <code>SSLSessionContext</code>.
+     * Sets the timeout limit for {@code SSLSession} objects grouped
+     * under this {@code SSLSessionContext}.
      * <p>
      * If the timeout limit is set to 't' seconds, a session exceeds the
      * timeout limit 't' seconds after its creation time.
      * When the timeout limit is exceeded for a session, the
-     * <code>SSLSession</code> object is invalidated and future connections
-     * cannot resume or rejoin the session.
+     * {@code SSLSession} object is marked so that future connections
+     * cannot resume or rejoin the session. Active sessions can continue
+     * to be used so long as resume and rejoin operations are not attempted.
      * A check for sessions exceeding the timeout is made immediately whenever
-     * the timeout limit is changed for this <code>SSLSessionContext</code>.
+     * the timeout limit is changed for this {@code SSLSessionContext}.
      *
      * @apiNote Note that the JDK Implementation uses default values for both
      *          the session cache size and timeout.  See
@@ -109,17 +110,18 @@ public interface SSLSessionContext {
     void setSessionTimeout(int seconds);
 
     /**
-     * Returns the timeout limit of <code>SSLSession</code> objects grouped
-     * under this <code>SSLSessionContext</code>.
+     * Returns the timeout limit of {@code SSLSession} objects grouped
+     * under this {@code SSLSessionContext}.
      * <p>
      * If the timeout limit is set to 't' seconds, a session exceeds the
      * timeout limit 't' seconds after its creation time.
      * When the timeout limit is exceeded for a session, the
-     * <code>SSLSession</code> object is invalidated and future connections
-     * cannot resume or rejoin the session.
+     * {@code SSLSession} object is marked so that future connections
+     * cannot resume or rejoin the session. Active sessions can continue
+     * to be used so long as resume and rejoin operations are not attempted.
      * A check for sessions exceeding the timeout limit is made immediately
      * whenever the timeout limit is changed for this
-     * <code>SSLSessionContext</code>.
+     * {@code SSLSessionContext}.
      *
      * @implNote The JDK implementation returns the session timeout as set by
      *           the {@code setSessionTimeout} method, or if not set, a default
@@ -133,8 +135,8 @@ public interface SSLSessionContext {
     int getSessionTimeout();
 
     /**
-     * Sets the size of the cache used for storing <code>SSLSession</code>
-     * objects grouped under this <code>SSLSessionContext</code>.
+     * Sets the size of the cache used for storing {@code SSLSession}
+     * objects grouped under this {@code SSLSessionContext}.
      *
      * @apiNote Note that the JDK Implementation uses default values for both
      *          the session cache size and timeout.  See
@@ -152,8 +154,8 @@ public interface SSLSessionContext {
     void setSessionCacheSize(int size);
 
     /**
-     * Returns the size of the cache used for storing <code>SSLSession</code>
-     * objects grouped under this <code>SSLSessionContext</code>.
+     * Returns the size of the cache used for storing {@code SSLSession}
+     * objects grouped under this {@code SSLSessionContext}.
      *
      * @implNote The JDK implementation returns the cache size as set by
      *           the {@code setSessionCacheSize} method, or if not set, the

From 21e86d10a726fe707febb0111f5b80d8d1d29f03 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Thu, 1 Aug 2024 19:02:33 +0000
Subject: [PATCH 288/401] 8334405:
 java/nio/channels/Selector/SelectWithConsumer.java#id0 failed in
 testWakeupDuringSelect

Reviewed-by: dfuchs, alanb, vtewari
---
 .../channels/Selector/SelectWithConsumer.java | 51 ++++++++++++++-----
 1 file changed, 37 insertions(+), 14 deletions(-)

diff --git a/test/jdk/java/nio/channels/Selector/SelectWithConsumer.java b/test/jdk/java/nio/channels/Selector/SelectWithConsumer.java
index de8b48ec22d98..41edb207239e3 100644
--- a/test/jdk/java/nio/channels/Selector/SelectWithConsumer.java
+++ b/test/jdk/java/nio/channels/Selector/SelectWithConsumer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -308,11 +308,10 @@ public void testTimeout() throws Exception {
             Pipe.SinkChannel sink = p.sink();
             source.configureBlocking(false);
             source.register(sel, SelectionKey.OP_READ);
-            long start = System.currentTimeMillis();
+            long start = millisTime();
             int n = sel.select(k -> assertTrue(false), 1000L);
-            long duration = System.currentTimeMillis() - start;
+            expectDuration(start, 500, Long.MAX_VALUE);
             assertTrue(n == 0);
-            assertTrue(duration > 500, "select took " + duration + " ms");
         } finally {
             closePipe(p);
         }
@@ -332,11 +331,10 @@ public void testWakeupBeforeSelect() throws Exception {
         // select(Consumer, timeout)
         try (Selector sel = Selector.open()) {
             sel.wakeup();
-            long start = System.currentTimeMillis();
+            long start = millisTime();
             int n = sel.select(k -> assertTrue(false), 60*1000);
-            long duration = System.currentTimeMillis() - start;
+            expectDuration(start, 0, 20_000);
             assertTrue(n == 0);
-            assertTrue(duration < 5000, "select took " + duration + " ms");
         }
     }
 
@@ -354,12 +352,10 @@ public void testWakeupDuringSelect() throws Exception {
         // select(Consumer, timeout)
         try (Selector sel = Selector.open()) {
             scheduleWakeup(sel, 1, SECONDS);
-            long start = System.currentTimeMillis();
+            long start = millisTime();
             int n = sel.select(k -> assertTrue(false), 60*1000);
-            long duration = System.currentTimeMillis() - start;
+            expectDuration(start, 0, 20_000);
             assertTrue(n == 0);
-            assertTrue(duration > 500 && duration < 10*1000,
-                    "select took " + duration + " ms");
         }
     }
 
@@ -381,11 +377,10 @@ public void testInterruptBeforeSelect() throws Exception {
         // select(Consumer, timeout)
         try (Selector sel = Selector.open()) {
             Thread.currentThread().interrupt();
-            long start = System.currentTimeMillis();
+            long start = millisTime();
             int n = sel.select(k -> assertTrue(false), 60*1000);
-            long duration = System.currentTimeMillis() - start;
+            expectDuration(start, 0, 20_000);
             assertTrue(n == 0);
-            assertTrue(duration < 5000, "select took " + duration + " ms");
             assertTrue(Thread.currentThread().isInterrupted());
             assertTrue(sel.isOpen());
         } finally {
@@ -762,4 +757,32 @@ static ByteBuffer messageBuffer() {
             throw new RuntimeException(e);
         }
     }
+
+    /**
+     * Returns the current time in milliseconds.
+     */
+    private static long millisTime() {
+        long now = System.nanoTime();
+        return TimeUnit.MILLISECONDS.convert(now, TimeUnit.NANOSECONDS);
+    }
+
+    /**
+     * Check the duration of a task. The method will fail with an
+     * AssertionError if the millisecond duration does not satisfy:
+     *
+     *     duration >= min && duration <= max
+     *
+     * Note that the inequalities are not strict, i.e., are inclusive.
+     *
+     * @param start start time, in milliseconds
+     * @param min minimum expected duration, in milliseconds
+     * @param max maximum expected duration, in milliseconds
+     */
+    private static void expectDuration(long start, long min, long max) {
+        long duration = millisTime() - start;
+        assertTrue(duration >= min,
+                "Duration " + duration + "ms, expected >= " + min + "ms");
+        assertTrue(duration <= max,
+                "Duration " + duration + "ms, expected <= " + max + "ms");
+    }
 }

From dc35f3e8a84c8f622a4cabb8aee0f96de2e2ea30 Mon Sep 17 00:00:00 2001
From: Sandhya Viswanathan <sviswanathan@openjdk.org>
Date: Thu, 1 Aug 2024 23:02:23 +0000
Subject: [PATCH 289/401] 8337062: x86_64: Unordered add/mul reduction support
 for vector api

Reviewed-by: jbhateja, sgibbons
---
 src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp | 119 ++++++++++++++++
 src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp |  18 +++
 src/hotspot/cpu/x86/x86.ad                    | 132 +++++++++++++++++-
 .../vector/Double128VectorTests.java          |  25 ++--
 .../vector/Double256VectorTests.java          |  25 ++--
 .../vector/Double512VectorTests.java          |  25 ++--
 .../incubator/vector/Double64VectorTests.java |  25 ++--
 .../vector/DoubleMaxVectorTests.java          |  25 ++--
 .../incubator/vector/Float128VectorTests.java |  25 ++--
 .../incubator/vector/Float256VectorTests.java |  25 ++--
 .../incubator/vector/Float512VectorTests.java |  25 ++--
 .../incubator/vector/Float64VectorTests.java  |  25 ++--
 .../incubator/vector/FloatMaxVectorTests.java |  25 ++--
 test/jdk/jdk/incubator/vector/gen-template.sh |   3 +-
 .../Unit-Reduction-Masked-op.template         |   2 +-
 .../templates/Unit-Reduction-op.template      |   2 +-
 .../vector/templates/Unit-header.template     |  17 ++-
 17 files changed, 416 insertions(+), 127 deletions(-)

diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
index 66a782ba9c622..faab09b7c17b4 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
@@ -1786,6 +1786,16 @@ void C2_MacroAssembler::reduce_operation_128(BasicType typ, int opcode, XMMRegis
   }
 }
 
+void C2_MacroAssembler::unordered_reduce_operation_128(BasicType typ, int opcode, XMMRegister dst, XMMRegister src) {
+  switch (opcode) {
+    case Op_AddReductionVF: addps(dst, src); break;
+    case Op_AddReductionVD: addpd(dst, src); break;
+    case Op_MulReductionVF: mulps(dst, src); break;
+    case Op_MulReductionVD: mulpd(dst, src); break;
+    default:                assert(false, "%s", NodeClassNames[opcode]);
+  }
+}
+
 void C2_MacroAssembler::reduce_operation_256(BasicType typ, int opcode, XMMRegister dst,  XMMRegister src1, XMMRegister src2) {
   int vector_len = Assembler::AVX_256bit;
 
@@ -1834,6 +1844,18 @@ void C2_MacroAssembler::reduce_operation_256(BasicType typ, int opcode, XMMRegis
   }
 }
 
+void C2_MacroAssembler::unordered_reduce_operation_256(BasicType typ, int opcode, XMMRegister dst,  XMMRegister src1, XMMRegister src2) {
+  int vector_len = Assembler::AVX_256bit;
+
+  switch (opcode) {
+    case Op_AddReductionVF: vaddps(dst, src1, src2, vector_len); break;
+    case Op_AddReductionVD: vaddpd(dst, src1, src2, vector_len); break;
+    case Op_MulReductionVF: vmulps(dst, src1, src2, vector_len); break;
+    case Op_MulReductionVD: vmulpd(dst, src1, src2, vector_len); break;
+    default:                assert(false, "%s", NodeClassNames[opcode]);
+  }
+}
+
 void C2_MacroAssembler::reduce_fp(int opcode, int vlen,
                                   XMMRegister dst, XMMRegister src,
                                   XMMRegister vtmp1, XMMRegister vtmp2) {
@@ -1852,6 +1874,24 @@ void C2_MacroAssembler::reduce_fp(int opcode, int vlen,
   }
 }
 
+void C2_MacroAssembler::unordered_reduce_fp(int opcode, int vlen,
+                                            XMMRegister dst, XMMRegister src,
+                                            XMMRegister vtmp1, XMMRegister vtmp2) {
+  switch (opcode) {
+    case Op_AddReductionVF:
+    case Op_MulReductionVF:
+      unorderedReduceF(opcode, vlen, dst, src, vtmp1, vtmp2);
+      break;
+
+    case Op_AddReductionVD:
+    case Op_MulReductionVD:
+      unorderedReduceD(opcode, vlen, dst, src, vtmp1, vtmp2);
+      break;
+
+    default: assert(false, "%s", NodeClassNames[opcode]);
+  }
+}
+
 void C2_MacroAssembler::reduceB(int opcode, int vlen,
                              Register dst, Register src1, XMMRegister src2,
                              XMMRegister vtmp1, XMMRegister vtmp2) {
@@ -1954,6 +1994,45 @@ void C2_MacroAssembler::reduceD(int opcode, int vlen, XMMRegister dst, XMMRegist
   }
 }
 
+void C2_MacroAssembler::unorderedReduceF(int opcode, int vlen, XMMRegister dst, XMMRegister src, XMMRegister vtmp1, XMMRegister vtmp2) {
+  switch (vlen) {
+    case 2:
+      assert(vtmp1 == xnoreg, "");
+      assert(vtmp2 == xnoreg, "");
+      unorderedReduce2F(opcode, dst, src);
+      break;
+    case 4:
+      assert(vtmp2 == xnoreg, "");
+      unorderedReduce4F(opcode, dst, src, vtmp1);
+      break;
+    case 8:
+      unorderedReduce8F(opcode, dst, src, vtmp1, vtmp2);
+      break;
+    case 16:
+      unorderedReduce16F(opcode, dst, src, vtmp1, vtmp2);
+      break;
+    default: assert(false, "wrong vector length");
+  }
+}
+
+void C2_MacroAssembler::unorderedReduceD(int opcode, int vlen, XMMRegister dst, XMMRegister src, XMMRegister vtmp1, XMMRegister vtmp2) {
+  switch (vlen) {
+    case 2:
+      assert(vtmp1 == xnoreg, "");
+      assert(vtmp2 == xnoreg, "");
+      unorderedReduce2D(opcode, dst, src);
+      break;
+    case 4:
+      assert(vtmp2 == xnoreg, "");
+      unorderedReduce4D(opcode, dst, src, vtmp1);
+      break;
+    case 8:
+      unorderedReduce8D(opcode, dst, src, vtmp1, vtmp2);
+      break;
+    default: assert(false, "wrong vector length");
+  }
+}
+
 void C2_MacroAssembler::reduce2I(int opcode, Register dst, Register src1, XMMRegister src2, XMMRegister vtmp1, XMMRegister vtmp2) {
   if (opcode == Op_AddReductionVI) {
     if (vtmp1 != src2) {
@@ -2181,6 +2260,29 @@ void C2_MacroAssembler::reduce16F(int opcode, XMMRegister dst, XMMRegister src,
   reduce8F(opcode, dst, vtmp1, vtmp1, vtmp2);
 }
 
+void C2_MacroAssembler::unorderedReduce2F(int opcode, XMMRegister dst, XMMRegister src) {
+  pshufd(dst, src, 0x1);
+  reduce_operation_128(T_FLOAT, opcode, dst, src);
+}
+
+void C2_MacroAssembler::unorderedReduce4F(int opcode, XMMRegister dst, XMMRegister src, XMMRegister vtmp) {
+  pshufd(vtmp, src, 0xE);
+  unordered_reduce_operation_128(T_FLOAT, opcode, vtmp, src);
+  unorderedReduce2F(opcode, dst, vtmp);
+}
+
+void C2_MacroAssembler::unorderedReduce8F(int opcode, XMMRegister dst, XMMRegister src, XMMRegister vtmp1, XMMRegister vtmp2) {
+  vextractf128_high(vtmp1, src);
+  unordered_reduce_operation_128(T_FLOAT, opcode, vtmp1, src);
+  unorderedReduce4F(opcode, dst, vtmp1, vtmp2);
+}
+
+void C2_MacroAssembler::unorderedReduce16F(int opcode, XMMRegister dst, XMMRegister src, XMMRegister vtmp1, XMMRegister vtmp2) {
+  vextractf64x4_high(vtmp2, src);
+  unordered_reduce_operation_256(T_FLOAT, opcode, vtmp2, vtmp2, src);
+  unorderedReduce8F(opcode, dst, vtmp2, vtmp1, vtmp2);
+}
+
 void C2_MacroAssembler::reduce2D(int opcode, XMMRegister dst, XMMRegister src, XMMRegister vtmp) {
   reduce_operation_128(T_DOUBLE, opcode, dst, src);
   pshufd(vtmp, src, 0xE);
@@ -2199,6 +2301,23 @@ void C2_MacroAssembler::reduce8D(int opcode, XMMRegister dst, XMMRegister src, X
   reduce4D(opcode, dst, vtmp1, vtmp1, vtmp2);
 }
 
+void C2_MacroAssembler::unorderedReduce2D(int opcode, XMMRegister dst, XMMRegister src) {
+  pshufd(dst, src, 0xE);
+  reduce_operation_128(T_DOUBLE, opcode, dst, src);
+}
+
+void C2_MacroAssembler::unorderedReduce4D(int opcode, XMMRegister dst, XMMRegister src, XMMRegister vtmp) {
+  vextractf128_high(vtmp, src);
+  unordered_reduce_operation_128(T_DOUBLE, opcode, vtmp, src);
+  unorderedReduce2D(opcode, dst, vtmp);
+}
+
+void C2_MacroAssembler::unorderedReduce8D(int opcode, XMMRegister dst, XMMRegister src, XMMRegister vtmp1, XMMRegister vtmp2) {
+  vextractf64x4_high(vtmp2, src);
+  unordered_reduce_operation_256(T_DOUBLE, opcode, vtmp2, vtmp2, src);
+  unorderedReduce4D(opcode, dst, vtmp2, vtmp1);
+}
+
 void C2_MacroAssembler::evmovdqu(BasicType type, KRegister kmask, XMMRegister dst, Address src, bool merge, int vector_len) {
   MacroAssembler::evmovdqu(type, kmask, dst, src, merge, vector_len);
 }
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
index e268ed3dd7a46..af57546b3d143 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
@@ -149,6 +149,9 @@
   void reduce_fp(int opcode, int vlen,
                  XMMRegister dst, XMMRegister src,
                  XMMRegister vtmp1, XMMRegister vtmp2 = xnoreg);
+  void unordered_reduce_fp(int opcode, int vlen,
+                           XMMRegister dst, XMMRegister src,
+                           XMMRegister vtmp1 = xnoreg, XMMRegister vtmp2 = xnoreg);
   void reduceB(int opcode, int vlen, Register dst, Register src1, XMMRegister src2, XMMRegister vtmp1, XMMRegister vtmp2);
   void mulreduceB(int opcode, int vlen, Register dst, Register src1, XMMRegister src2, XMMRegister vtmp1, XMMRegister vtmp2);
   void reduceS(int opcode, int vlen, Register dst, Register src1, XMMRegister src2, XMMRegister vtmp1, XMMRegister vtmp2);
@@ -161,6 +164,8 @@
  private:
   void reduceF(int opcode, int vlen, XMMRegister dst, XMMRegister src, XMMRegister vtmp1, XMMRegister vtmp2);
   void reduceD(int opcode, int vlen, XMMRegister dst, XMMRegister src, XMMRegister vtmp1, XMMRegister vtmp2);
+  void unorderedReduceF(int opcode, int vlen, XMMRegister dst, XMMRegister src, XMMRegister vtmp1, XMMRegister vtmp2);
+  void unorderedReduceD(int opcode, int vlen, XMMRegister dst, XMMRegister src, XMMRegister vtmp1, XMMRegister vtmp2);
 
   // Int Reduction
   void reduce2I (int opcode, Register dst, Register src1, XMMRegister src2, XMMRegister vtmp1, XMMRegister vtmp2);
@@ -197,14 +202,27 @@
   void reduce8F (int opcode, XMMRegister dst, XMMRegister src, XMMRegister vtmp1, XMMRegister vtmp2);
   void reduce16F(int opcode, XMMRegister dst, XMMRegister src, XMMRegister vtmp1, XMMRegister vtmp2);
 
+  // Unordered Float Reduction
+  void unorderedReduce2F(int opcode, XMMRegister dst, XMMRegister src);
+  void unorderedReduce4F(int opcode, XMMRegister dst, XMMRegister src, XMMRegister vtmp);
+  void unorderedReduce8F(int opcode, XMMRegister dst, XMMRegister src, XMMRegister vtmp1, XMMRegister vtmp2);
+  void unorderedReduce16F(int opcode, XMMRegister dst, XMMRegister src, XMMRegister vtmp1, XMMRegister vtmp2);
+
   // Double Reduction
   void reduce2D(int opcode, XMMRegister dst, XMMRegister src, XMMRegister vtmp);
   void reduce4D(int opcode, XMMRegister dst, XMMRegister src, XMMRegister vtmp1, XMMRegister vtmp2);
   void reduce8D(int opcode, XMMRegister dst, XMMRegister src, XMMRegister vtmp1, XMMRegister vtmp2);
 
+  // Unordered Double Reduction
+  void unorderedReduce2D(int opcode, XMMRegister dst, XMMRegister src);
+  void unorderedReduce4D(int opcode, XMMRegister dst, XMMRegister src, XMMRegister vtmp);
+  void unorderedReduce8D(int opcode, XMMRegister dst, XMMRegister src, XMMRegister vtmp1, XMMRegister vtmp2);
+
   // Base reduction instruction
   void reduce_operation_128(BasicType typ, int opcode, XMMRegister dst, XMMRegister src);
   void reduce_operation_256(BasicType typ, int opcode, XMMRegister dst, XMMRegister src1, XMMRegister src2);
+  void unordered_reduce_operation_128(BasicType typ, int opcode, XMMRegister dst, XMMRegister src);
+  void unordered_reduce_operation_256(BasicType typ, int opcode, XMMRegister dst, XMMRegister src1, XMMRegister src2);
 
  public:
 #ifdef _LP64
diff --git a/src/hotspot/cpu/x86/x86.ad b/src/hotspot/cpu/x86/x86.ad
index d90ba901ac0a8..2b29dd14e4b27 100644
--- a/src/hotspot/cpu/x86/x86.ad
+++ b/src/hotspot/cpu/x86/x86.ad
@@ -5109,7 +5109,7 @@ instruct reductionL_avx512dq(rRegL dst, rRegL src1, vec src2, vec vtmp1, vec vtm
 // =======================Float Reduction==========================================
 
 instruct reductionF128(regF dst, vec src, vec vtmp) %{
-  predicate(Matcher::vector_length(n->in(2)) <= 4); // src
+  predicate(n->as_Reduction()->requires_strict_order() && Matcher::vector_length(n->in(2)) <= 4); // src
   match(Set dst (AddReductionVF dst src));
   match(Set dst (MulReductionVF dst src));
   effect(TEMP dst, TEMP vtmp);
@@ -5123,7 +5123,7 @@ instruct reductionF128(regF dst, vec src, vec vtmp) %{
 %}
 
 instruct reduction8F(regF dst, vec src, vec vtmp1, vec vtmp2) %{
-  predicate(Matcher::vector_length(n->in(2)) == 8); // src
+  predicate(n->as_Reduction()->requires_strict_order() && Matcher::vector_length(n->in(2)) == 8); // src
   match(Set dst (AddReductionVF dst src));
   match(Set dst (MulReductionVF dst src));
   effect(TEMP dst, TEMP vtmp1, TEMP vtmp2);
@@ -5137,7 +5137,7 @@ instruct reduction8F(regF dst, vec src, vec vtmp1, vec vtmp2) %{
 %}
 
 instruct reduction16F(regF dst, legVec src, legVec vtmp1, legVec vtmp2) %{
-  predicate(Matcher::vector_length(n->in(2)) == 16); // src
+  predicate(n->as_Reduction()->requires_strict_order() && Matcher::vector_length(n->in(2)) == 16); // src
   match(Set dst (AddReductionVF dst src));
   match(Set dst (MulReductionVF dst src));
   effect(TEMP dst, TEMP vtmp1, TEMP vtmp2);
@@ -5150,10 +5150,79 @@ instruct reduction16F(regF dst, legVec src, legVec vtmp1, legVec vtmp2) %{
   ins_pipe( pipe_slow );
 %}
 
+
+instruct unordered_reduction2F(regF dst, regF src1, vec src2) %{
+  // Non-strictly ordered floating-point add/mul reduction for floats. This rule is
+  // intended for the VectorAPI (which allows for non-strictly ordered add/mul reduction).
+  // src1 contains reduction identity
+  predicate(!n->as_Reduction()->requires_strict_order() && Matcher::vector_length(n->in(2)) == 2); // src2
+  match(Set dst (AddReductionVF src1 src2));
+  match(Set dst (MulReductionVF src1 src2));
+  effect(TEMP dst);
+  format %{ "vector_reduction_float  $dst,$src1,$src2 ;" %}
+  ins_encode %{
+    int opcode = this->ideal_Opcode();
+    int vlen = Matcher::vector_length(this, $src2);
+    __ unordered_reduce_fp(opcode, vlen, $dst$$XMMRegister, $src2$$XMMRegister);
+  %}
+  ins_pipe( pipe_slow );
+%}
+
+instruct unordered_reduction4F(regF dst, regF src1, vec src2, vec vtmp) %{
+  // Non-strictly ordered floating-point add/mul reduction for floats. This rule is
+  // intended for the VectorAPI (which allows for non-strictly ordered add/mul reduction).
+  // src1 contains reduction identity
+  predicate(!n->as_Reduction()->requires_strict_order() && Matcher::vector_length(n->in(2)) == 4); // src2
+  match(Set dst (AddReductionVF src1 src2));
+  match(Set dst (MulReductionVF src1 src2));
+  effect(TEMP dst, TEMP vtmp);
+  format %{ "vector_reduction_float  $dst,$src1,$src2 ; using $vtmp as TEMP" %}
+  ins_encode %{
+    int opcode = this->ideal_Opcode();
+    int vlen = Matcher::vector_length(this, $src2);
+    __ unordered_reduce_fp(opcode, vlen, $dst$$XMMRegister, $src2$$XMMRegister, $vtmp$$XMMRegister);
+  %}
+  ins_pipe( pipe_slow );
+%}
+
+instruct unordered_reduction8F(regF dst, regF src1, vec src2, vec vtmp1, vec vtmp2) %{
+  // Non-strictly ordered floating-point add/mul reduction for floats. This rule is
+  // intended for the VectorAPI (which allows for non-strictly ordered add/mul reduction).
+  // src1 contains reduction identity
+  predicate(!n->as_Reduction()->requires_strict_order() && Matcher::vector_length(n->in(2)) == 8); // src2
+  match(Set dst (AddReductionVF src1 src2));
+  match(Set dst (MulReductionVF src1 src2));
+  effect(TEMP dst, TEMP vtmp1, TEMP vtmp2);
+  format %{ "vector_reduction_float $dst,$src1,$src2 ; using $vtmp1, $vtmp2 as TEMP" %}
+  ins_encode %{
+    int opcode = this->ideal_Opcode();
+    int vlen = Matcher::vector_length(this, $src2);
+    __ unordered_reduce_fp(opcode, vlen, $dst$$XMMRegister, $src2$$XMMRegister, $vtmp1$$XMMRegister, $vtmp2$$XMMRegister);
+  %}
+  ins_pipe( pipe_slow );
+%}
+
+instruct unordered_reduction16F(regF dst, regF src1, legVec src2, legVec vtmp1, legVec vtmp2) %{
+  // Non-strictly ordered floating-point add/mul reduction for floats. This rule is
+  // intended for the VectorAPI (which allows for non-strictly ordered add/mul reduction).
+  // src1 contains reduction identity
+  predicate(!n->as_Reduction()->requires_strict_order() && Matcher::vector_length(n->in(2)) == 16); // src2
+  match(Set dst (AddReductionVF src1 src2));
+  match(Set dst (MulReductionVF src1 src2));
+  effect(TEMP dst, TEMP vtmp1, TEMP vtmp2);
+  format %{ "vector_reduction_float $dst,$src1,$src2 ; using $vtmp1, $vtmp2 as TEMP" %}
+  ins_encode %{
+    int opcode = this->ideal_Opcode();
+    int vlen = Matcher::vector_length(this, $src2);
+    __ unordered_reduce_fp(opcode, vlen, $dst$$XMMRegister, $src2$$XMMRegister, $vtmp1$$XMMRegister, $vtmp2$$XMMRegister);
+  %}
+  ins_pipe( pipe_slow );
+%}
+
 // =======================Double Reduction==========================================
 
 instruct reduction2D(regD dst, vec src, vec vtmp) %{
-  predicate(Matcher::vector_length(n->in(2)) == 2); // src
+  predicate(n->as_Reduction()->requires_strict_order() && Matcher::vector_length(n->in(2)) == 2); // src
   match(Set dst (AddReductionVD dst src));
   match(Set dst (MulReductionVD dst src));
   effect(TEMP dst, TEMP vtmp);
@@ -5167,7 +5236,7 @@ instruct reduction2D(regD dst, vec src, vec vtmp) %{
 %}
 
 instruct reduction4D(regD dst, vec src, vec vtmp1, vec vtmp2) %{
-  predicate(Matcher::vector_length(n->in(2)) == 4); // src
+  predicate(n->as_Reduction()->requires_strict_order() && Matcher::vector_length(n->in(2)) == 4); // src
   match(Set dst (AddReductionVD dst src));
   match(Set dst (MulReductionVD dst src));
   effect(TEMP dst, TEMP vtmp1, TEMP vtmp2);
@@ -5181,7 +5250,7 @@ instruct reduction4D(regD dst, vec src, vec vtmp1, vec vtmp2) %{
 %}
 
 instruct reduction8D(regD dst, legVec src, legVec vtmp1, legVec vtmp2) %{
-  predicate(Matcher::vector_length(n->in(2)) == 8); // src
+  predicate(n->as_Reduction()->requires_strict_order() && Matcher::vector_length(n->in(2)) == 8); // src
   match(Set dst (AddReductionVD dst src));
   match(Set dst (MulReductionVD dst src));
   effect(TEMP dst, TEMP vtmp1, TEMP vtmp2);
@@ -5194,6 +5263,57 @@ instruct reduction8D(regD dst, legVec src, legVec vtmp1, legVec vtmp2) %{
   ins_pipe( pipe_slow );
 %}
 
+instruct unordered_reduction2D(regD dst, regD src1, vec src2) %{
+  // Non-strictly ordered floating-point add/mul reduction for doubles. This rule is
+  // intended for the VectorAPI (which allows for non-strictly ordered add/mul reduction).
+  // src1 contains reduction identity
+  predicate(!n->as_Reduction()->requires_strict_order() && Matcher::vector_length(n->in(2)) == 2); // src2
+  match(Set dst (AddReductionVD src1 src2));
+  match(Set dst (MulReductionVD src1 src2));
+  effect(TEMP dst);
+  format %{ "vector_reduction_double $dst,$src1,$src2 ;" %}
+  ins_encode %{
+    int opcode = this->ideal_Opcode();
+    int vlen = Matcher::vector_length(this, $src2);
+    __ unordered_reduce_fp(opcode, vlen, $dst$$XMMRegister, $src2$$XMMRegister);
+%}
+  ins_pipe( pipe_slow );
+%}
+
+instruct unordered_reduction4D(regD dst, regD src1, vec src2, vec vtmp) %{
+  // Non-strictly ordered floating-point add/mul reduction for doubles. This rule is
+  // intended for the VectorAPI (which allows for non-strictly ordered add/mul reduction).
+  // src1 contains reduction identity
+  predicate(!n->as_Reduction()->requires_strict_order() && Matcher::vector_length(n->in(2)) == 4); // src2
+  match(Set dst (AddReductionVD src1 src2));
+  match(Set dst (MulReductionVD src1 src2));
+  effect(TEMP dst, TEMP vtmp);
+  format %{ "vector_reduction_double $dst,$src1,$src2 ; using $vtmp as TEMP" %}
+  ins_encode %{
+    int opcode = this->ideal_Opcode();
+    int vlen = Matcher::vector_length(this, $src2);
+    __ unordered_reduce_fp(opcode, vlen, $dst$$XMMRegister, $src2$$XMMRegister, $vtmp$$XMMRegister);
+  %}
+  ins_pipe( pipe_slow );
+%}
+
+instruct unordered_reduction8D(regD dst, regD src1, legVec src2, legVec vtmp1, legVec vtmp2) %{
+  // Non-strictly ordered floating-point add/mul reduction for doubles. This rule is
+  // intended for the VectorAPI (which allows for non-strictly ordered add/mul reduction).
+  // src1 contains reduction identity
+  predicate(!n->as_Reduction()->requires_strict_order() && Matcher::vector_length(n->in(2)) == 8); // src2
+  match(Set dst (AddReductionVD src1 src2));
+  match(Set dst (MulReductionVD src1 src2));
+  effect(TEMP dst, TEMP vtmp1, TEMP vtmp2);
+  format %{ "vector_reduction_double $dst,$src1,$src2 ; using $vtmp1, $vtmp2 as TEMP" %}
+  ins_encode %{
+    int opcode = this->ideal_Opcode();
+    int vlen = Matcher::vector_length(this, $src2);
+    __ unordered_reduce_fp(opcode, vlen, $dst$$XMMRegister, $src2$$XMMRegister, $vtmp1$$XMMRegister, $vtmp2$$XMMRegister);
+  %}
+  ins_pipe( pipe_slow );
+%}
+
 // =======================Byte Reduction==========================================
 
 #ifdef _LP64
diff --git a/test/jdk/jdk/incubator/vector/Double128VectorTests.java b/test/jdk/jdk/incubator/vector/Double128VectorTests.java
index 577b1f2691201..81c915ba7cf85 100644
--- a/test/jdk/jdk/incubator/vector/Double128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Double128VectorTests.java
@@ -63,8 +63,11 @@ public class Double128VectorTests extends AbstractVectorTest {
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
 
 
-    // for floating point reduction ops that may introduce rounding errors
-    private static final double RELATIVE_ROUNDING_ERROR = (double)0.000001;
+    // for floating point addition reduction ops that may introduce rounding errors
+    private static final double RELATIVE_ROUNDING_ERROR_FACTOR_ADD = (double)10.0;
+
+    // for floating point multiplication reduction ops that may introduce rounding errors
+    private static final double RELATIVE_ROUNDING_ERROR_FACTOR_MUL = (double)50.0;
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 128);
 
@@ -129,16 +132,16 @@ static void assertReductionArraysEquals(double[] r, double rc, double[] a,
 
     static void assertReductionArraysEquals(double[] r, double rc, double[] a,
                                             FReductionOp f, FReductionAllOp fa,
-                                            double relativeError) {
+                                            double relativeErrorFactor) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a), Math.abs(rc * relativeError));
+            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i), Math.abs(r[i] * relativeError));
+                Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), Math.abs(rc * relativeError), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), Math.abs(r[i] * relativeError), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
         }
     }
 
@@ -2194,7 +2197,7 @@ static void ADDReduceDouble128VectorTests(IntFunction<double[]> fa) {
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double128VectorTests::ADDReduce, Double128VectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR);
+                Double128VectorTests::ADDReduce, Double128VectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static double ADDReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2240,7 +2243,7 @@ static void ADDReduceDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFun
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double128VectorTests::ADDReduceMasked, Double128VectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR);
+                Double128VectorTests::ADDReduceMasked, Double128VectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static double MULReduce(double[] a, int idx) {
@@ -2283,7 +2286,7 @@ static void MULReduceDouble128VectorTests(IntFunction<double[]> fa) {
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double128VectorTests::MULReduce, Double128VectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR);
+                Double128VectorTests::MULReduce, Double128VectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static double MULReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2329,7 +2332,7 @@ static void MULReduceDouble128VectorTestsMasked(IntFunction<double[]> fa, IntFun
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double128VectorTests::MULReduceMasked, Double128VectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR);
+                Double128VectorTests::MULReduceMasked, Double128VectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static double MINReduce(double[] a, int idx) {
diff --git a/test/jdk/jdk/incubator/vector/Double256VectorTests.java b/test/jdk/jdk/incubator/vector/Double256VectorTests.java
index b8ecc5e6e691c..5824941d80618 100644
--- a/test/jdk/jdk/incubator/vector/Double256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Double256VectorTests.java
@@ -63,8 +63,11 @@ public class Double256VectorTests extends AbstractVectorTest {
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
 
 
-    // for floating point reduction ops that may introduce rounding errors
-    private static final double RELATIVE_ROUNDING_ERROR = (double)0.000001;
+    // for floating point addition reduction ops that may introduce rounding errors
+    private static final double RELATIVE_ROUNDING_ERROR_FACTOR_ADD = (double)10.0;
+
+    // for floating point multiplication reduction ops that may introduce rounding errors
+    private static final double RELATIVE_ROUNDING_ERROR_FACTOR_MUL = (double)50.0;
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 256);
 
@@ -129,16 +132,16 @@ static void assertReductionArraysEquals(double[] r, double rc, double[] a,
 
     static void assertReductionArraysEquals(double[] r, double rc, double[] a,
                                             FReductionOp f, FReductionAllOp fa,
-                                            double relativeError) {
+                                            double relativeErrorFactor) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a), Math.abs(rc * relativeError));
+            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i), Math.abs(r[i] * relativeError));
+                Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), Math.abs(rc * relativeError), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), Math.abs(r[i] * relativeError), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
         }
     }
 
@@ -2194,7 +2197,7 @@ static void ADDReduceDouble256VectorTests(IntFunction<double[]> fa) {
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double256VectorTests::ADDReduce, Double256VectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR);
+                Double256VectorTests::ADDReduce, Double256VectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static double ADDReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2240,7 +2243,7 @@ static void ADDReduceDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFun
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double256VectorTests::ADDReduceMasked, Double256VectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR);
+                Double256VectorTests::ADDReduceMasked, Double256VectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static double MULReduce(double[] a, int idx) {
@@ -2283,7 +2286,7 @@ static void MULReduceDouble256VectorTests(IntFunction<double[]> fa) {
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double256VectorTests::MULReduce, Double256VectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR);
+                Double256VectorTests::MULReduce, Double256VectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static double MULReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2329,7 +2332,7 @@ static void MULReduceDouble256VectorTestsMasked(IntFunction<double[]> fa, IntFun
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double256VectorTests::MULReduceMasked, Double256VectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR);
+                Double256VectorTests::MULReduceMasked, Double256VectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static double MINReduce(double[] a, int idx) {
diff --git a/test/jdk/jdk/incubator/vector/Double512VectorTests.java b/test/jdk/jdk/incubator/vector/Double512VectorTests.java
index 57e68cb207602..895cf243eb7e3 100644
--- a/test/jdk/jdk/incubator/vector/Double512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Double512VectorTests.java
@@ -63,8 +63,11 @@ public class Double512VectorTests extends AbstractVectorTest {
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
 
 
-    // for floating point reduction ops that may introduce rounding errors
-    private static final double RELATIVE_ROUNDING_ERROR = (double)0.000001;
+    // for floating point addition reduction ops that may introduce rounding errors
+    private static final double RELATIVE_ROUNDING_ERROR_FACTOR_ADD = (double)10.0;
+
+    // for floating point multiplication reduction ops that may introduce rounding errors
+    private static final double RELATIVE_ROUNDING_ERROR_FACTOR_MUL = (double)50.0;
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 512);
 
@@ -129,16 +132,16 @@ static void assertReductionArraysEquals(double[] r, double rc, double[] a,
 
     static void assertReductionArraysEquals(double[] r, double rc, double[] a,
                                             FReductionOp f, FReductionAllOp fa,
-                                            double relativeError) {
+                                            double relativeErrorFactor) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a), Math.abs(rc * relativeError));
+            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i), Math.abs(r[i] * relativeError));
+                Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), Math.abs(rc * relativeError), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), Math.abs(r[i] * relativeError), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
         }
     }
 
@@ -2194,7 +2197,7 @@ static void ADDReduceDouble512VectorTests(IntFunction<double[]> fa) {
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double512VectorTests::ADDReduce, Double512VectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR);
+                Double512VectorTests::ADDReduce, Double512VectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static double ADDReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2240,7 +2243,7 @@ static void ADDReduceDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFun
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double512VectorTests::ADDReduceMasked, Double512VectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR);
+                Double512VectorTests::ADDReduceMasked, Double512VectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static double MULReduce(double[] a, int idx) {
@@ -2283,7 +2286,7 @@ static void MULReduceDouble512VectorTests(IntFunction<double[]> fa) {
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double512VectorTests::MULReduce, Double512VectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR);
+                Double512VectorTests::MULReduce, Double512VectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static double MULReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2329,7 +2332,7 @@ static void MULReduceDouble512VectorTestsMasked(IntFunction<double[]> fa, IntFun
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double512VectorTests::MULReduceMasked, Double512VectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR);
+                Double512VectorTests::MULReduceMasked, Double512VectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static double MINReduce(double[] a, int idx) {
diff --git a/test/jdk/jdk/incubator/vector/Double64VectorTests.java b/test/jdk/jdk/incubator/vector/Double64VectorTests.java
index 04ba2729398cd..4414e36b0deb6 100644
--- a/test/jdk/jdk/incubator/vector/Double64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Double64VectorTests.java
@@ -63,8 +63,11 @@ public class Double64VectorTests extends AbstractVectorTest {
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
 
 
-    // for floating point reduction ops that may introduce rounding errors
-    private static final double RELATIVE_ROUNDING_ERROR = (double)0.000001;
+    // for floating point addition reduction ops that may introduce rounding errors
+    private static final double RELATIVE_ROUNDING_ERROR_FACTOR_ADD = (double)10.0;
+
+    // for floating point multiplication reduction ops that may introduce rounding errors
+    private static final double RELATIVE_ROUNDING_ERROR_FACTOR_MUL = (double)50.0;
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 64);
 
@@ -129,16 +132,16 @@ static void assertReductionArraysEquals(double[] r, double rc, double[] a,
 
     static void assertReductionArraysEquals(double[] r, double rc, double[] a,
                                             FReductionOp f, FReductionAllOp fa,
-                                            double relativeError) {
+                                            double relativeErrorFactor) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a), Math.abs(rc * relativeError));
+            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i), Math.abs(r[i] * relativeError));
+                Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), Math.abs(rc * relativeError), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), Math.abs(r[i] * relativeError), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
         }
     }
 
@@ -2194,7 +2197,7 @@ static void ADDReduceDouble64VectorTests(IntFunction<double[]> fa) {
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double64VectorTests::ADDReduce, Double64VectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR);
+                Double64VectorTests::ADDReduce, Double64VectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static double ADDReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2240,7 +2243,7 @@ static void ADDReduceDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunc
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double64VectorTests::ADDReduceMasked, Double64VectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR);
+                Double64VectorTests::ADDReduceMasked, Double64VectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static double MULReduce(double[] a, int idx) {
@@ -2283,7 +2286,7 @@ static void MULReduceDouble64VectorTests(IntFunction<double[]> fa) {
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Double64VectorTests::MULReduce, Double64VectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR);
+                Double64VectorTests::MULReduce, Double64VectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static double MULReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2329,7 +2332,7 @@ static void MULReduceDouble64VectorTestsMasked(IntFunction<double[]> fa, IntFunc
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Double64VectorTests::MULReduceMasked, Double64VectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR);
+                Double64VectorTests::MULReduceMasked, Double64VectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static double MINReduce(double[] a, int idx) {
diff --git a/test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java b/test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java
index 474ef0043c9eb..271d1f12aba56 100644
--- a/test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/DoubleMaxVectorTests.java
@@ -68,8 +68,11 @@ static VectorShape getMaxBit() {
 
     private static final int Max = 256;  // juts so we can do N/Max
 
-    // for floating point reduction ops that may introduce rounding errors
-    private static final double RELATIVE_ROUNDING_ERROR = (double)0.000001;
+    // for floating point addition reduction ops that may introduce rounding errors
+    private static final double RELATIVE_ROUNDING_ERROR_FACTOR_ADD = (double)10.0;
+
+    // for floating point multiplication reduction ops that may introduce rounding errors
+    private static final double RELATIVE_ROUNDING_ERROR_FACTOR_MUL = (double)50.0;
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / Max);
 
@@ -134,16 +137,16 @@ static void assertReductionArraysEquals(double[] r, double rc, double[] a,
 
     static void assertReductionArraysEquals(double[] r, double rc, double[] a,
                                             FReductionOp f, FReductionAllOp fa,
-                                            double relativeError) {
+                                            double relativeErrorFactor) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a), Math.abs(rc * relativeError));
+            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i), Math.abs(r[i] * relativeError));
+                Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), Math.abs(rc * relativeError), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), Math.abs(r[i] * relativeError), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
         }
     }
 
@@ -2199,7 +2202,7 @@ static void ADDReduceDoubleMaxVectorTests(IntFunction<double[]> fa) {
         }
 
         assertReductionArraysEquals(r, ra, a,
-                DoubleMaxVectorTests::ADDReduce, DoubleMaxVectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR);
+                DoubleMaxVectorTests::ADDReduce, DoubleMaxVectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static double ADDReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2245,7 +2248,7 @@ static void ADDReduceDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFun
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                DoubleMaxVectorTests::ADDReduceMasked, DoubleMaxVectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR);
+                DoubleMaxVectorTests::ADDReduceMasked, DoubleMaxVectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static double MULReduce(double[] a, int idx) {
@@ -2288,7 +2291,7 @@ static void MULReduceDoubleMaxVectorTests(IntFunction<double[]> fa) {
         }
 
         assertReductionArraysEquals(r, ra, a,
-                DoubleMaxVectorTests::MULReduce, DoubleMaxVectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR);
+                DoubleMaxVectorTests::MULReduce, DoubleMaxVectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static double MULReduceMasked(double[] a, int idx, boolean[] mask) {
@@ -2334,7 +2337,7 @@ static void MULReduceDoubleMaxVectorTestsMasked(IntFunction<double[]> fa, IntFun
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                DoubleMaxVectorTests::MULReduceMasked, DoubleMaxVectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR);
+                DoubleMaxVectorTests::MULReduceMasked, DoubleMaxVectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static double MINReduce(double[] a, int idx) {
diff --git a/test/jdk/jdk/incubator/vector/Float128VectorTests.java b/test/jdk/jdk/incubator/vector/Float128VectorTests.java
index 5d503860ee94b..a634aeffe5431 100644
--- a/test/jdk/jdk/incubator/vector/Float128VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Float128VectorTests.java
@@ -63,8 +63,11 @@ public class Float128VectorTests extends AbstractVectorTest {
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
 
 
-    // for floating point reduction ops that may introduce rounding errors
-    private static final float RELATIVE_ROUNDING_ERROR = (float)0.000001;
+    // for floating point addition reduction ops that may introduce rounding errors
+    private static final float RELATIVE_ROUNDING_ERROR_FACTOR_ADD = (float)10.0;
+
+    // for floating point multiplication reduction ops that may introduce rounding errors
+    private static final float RELATIVE_ROUNDING_ERROR_FACTOR_MUL = (float)50.0;
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 128);
 
@@ -129,16 +132,16 @@ static void assertReductionArraysEquals(float[] r, float rc, float[] a,
 
     static void assertReductionArraysEquals(float[] r, float rc, float[] a,
                                             FReductionOp f, FReductionAllOp fa,
-                                            float relativeError) {
+                                            float relativeErrorFactor) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a), Math.abs(rc * relativeError));
+            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i), Math.abs(r[i] * relativeError));
+                Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), Math.abs(rc * relativeError), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), Math.abs(r[i] * relativeError), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
         }
     }
 
@@ -2205,7 +2208,7 @@ static void ADDReduceFloat128VectorTests(IntFunction<float[]> fa) {
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float128VectorTests::ADDReduce, Float128VectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR);
+                Float128VectorTests::ADDReduce, Float128VectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static float ADDReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2251,7 +2254,7 @@ static void ADDReduceFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunct
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float128VectorTests::ADDReduceMasked, Float128VectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR);
+                Float128VectorTests::ADDReduceMasked, Float128VectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static float MULReduce(float[] a, int idx) {
@@ -2294,7 +2297,7 @@ static void MULReduceFloat128VectorTests(IntFunction<float[]> fa) {
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float128VectorTests::MULReduce, Float128VectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR);
+                Float128VectorTests::MULReduce, Float128VectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static float MULReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2340,7 +2343,7 @@ static void MULReduceFloat128VectorTestsMasked(IntFunction<float[]> fa, IntFunct
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float128VectorTests::MULReduceMasked, Float128VectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR);
+                Float128VectorTests::MULReduceMasked, Float128VectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static float MINReduce(float[] a, int idx) {
diff --git a/test/jdk/jdk/incubator/vector/Float256VectorTests.java b/test/jdk/jdk/incubator/vector/Float256VectorTests.java
index 7c38b370b12a4..d9509ff3152b7 100644
--- a/test/jdk/jdk/incubator/vector/Float256VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Float256VectorTests.java
@@ -63,8 +63,11 @@ public class Float256VectorTests extends AbstractVectorTest {
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
 
 
-    // for floating point reduction ops that may introduce rounding errors
-    private static final float RELATIVE_ROUNDING_ERROR = (float)0.000001;
+    // for floating point addition reduction ops that may introduce rounding errors
+    private static final float RELATIVE_ROUNDING_ERROR_FACTOR_ADD = (float)10.0;
+
+    // for floating point multiplication reduction ops that may introduce rounding errors
+    private static final float RELATIVE_ROUNDING_ERROR_FACTOR_MUL = (float)50.0;
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 256);
 
@@ -129,16 +132,16 @@ static void assertReductionArraysEquals(float[] r, float rc, float[] a,
 
     static void assertReductionArraysEquals(float[] r, float rc, float[] a,
                                             FReductionOp f, FReductionAllOp fa,
-                                            float relativeError) {
+                                            float relativeErrorFactor) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a), Math.abs(rc * relativeError));
+            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i), Math.abs(r[i] * relativeError));
+                Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), Math.abs(rc * relativeError), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), Math.abs(r[i] * relativeError), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
         }
     }
 
@@ -2205,7 +2208,7 @@ static void ADDReduceFloat256VectorTests(IntFunction<float[]> fa) {
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float256VectorTests::ADDReduce, Float256VectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR);
+                Float256VectorTests::ADDReduce, Float256VectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static float ADDReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2251,7 +2254,7 @@ static void ADDReduceFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunct
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float256VectorTests::ADDReduceMasked, Float256VectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR);
+                Float256VectorTests::ADDReduceMasked, Float256VectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static float MULReduce(float[] a, int idx) {
@@ -2294,7 +2297,7 @@ static void MULReduceFloat256VectorTests(IntFunction<float[]> fa) {
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float256VectorTests::MULReduce, Float256VectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR);
+                Float256VectorTests::MULReduce, Float256VectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static float MULReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2340,7 +2343,7 @@ static void MULReduceFloat256VectorTestsMasked(IntFunction<float[]> fa, IntFunct
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float256VectorTests::MULReduceMasked, Float256VectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR);
+                Float256VectorTests::MULReduceMasked, Float256VectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static float MINReduce(float[] a, int idx) {
diff --git a/test/jdk/jdk/incubator/vector/Float512VectorTests.java b/test/jdk/jdk/incubator/vector/Float512VectorTests.java
index 70e4e1ea24f6f..83326abe54e0f 100644
--- a/test/jdk/jdk/incubator/vector/Float512VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Float512VectorTests.java
@@ -63,8 +63,11 @@ public class Float512VectorTests extends AbstractVectorTest {
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
 
 
-    // for floating point reduction ops that may introduce rounding errors
-    private static final float RELATIVE_ROUNDING_ERROR = (float)0.000001;
+    // for floating point addition reduction ops that may introduce rounding errors
+    private static final float RELATIVE_ROUNDING_ERROR_FACTOR_ADD = (float)10.0;
+
+    // for floating point multiplication reduction ops that may introduce rounding errors
+    private static final float RELATIVE_ROUNDING_ERROR_FACTOR_MUL = (float)50.0;
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 512);
 
@@ -129,16 +132,16 @@ static void assertReductionArraysEquals(float[] r, float rc, float[] a,
 
     static void assertReductionArraysEquals(float[] r, float rc, float[] a,
                                             FReductionOp f, FReductionAllOp fa,
-                                            float relativeError) {
+                                            float relativeErrorFactor) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a), Math.abs(rc * relativeError));
+            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i), Math.abs(r[i] * relativeError));
+                Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), Math.abs(rc * relativeError), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), Math.abs(r[i] * relativeError), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
         }
     }
 
@@ -2205,7 +2208,7 @@ static void ADDReduceFloat512VectorTests(IntFunction<float[]> fa) {
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float512VectorTests::ADDReduce, Float512VectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR);
+                Float512VectorTests::ADDReduce, Float512VectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static float ADDReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2251,7 +2254,7 @@ static void ADDReduceFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunct
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float512VectorTests::ADDReduceMasked, Float512VectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR);
+                Float512VectorTests::ADDReduceMasked, Float512VectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static float MULReduce(float[] a, int idx) {
@@ -2294,7 +2297,7 @@ static void MULReduceFloat512VectorTests(IntFunction<float[]> fa) {
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float512VectorTests::MULReduce, Float512VectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR);
+                Float512VectorTests::MULReduce, Float512VectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static float MULReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2340,7 +2343,7 @@ static void MULReduceFloat512VectorTestsMasked(IntFunction<float[]> fa, IntFunct
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float512VectorTests::MULReduceMasked, Float512VectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR);
+                Float512VectorTests::MULReduceMasked, Float512VectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static float MINReduce(float[] a, int idx) {
diff --git a/test/jdk/jdk/incubator/vector/Float64VectorTests.java b/test/jdk/jdk/incubator/vector/Float64VectorTests.java
index 65a71504561ed..efae7f1fc3c97 100644
--- a/test/jdk/jdk/incubator/vector/Float64VectorTests.java
+++ b/test/jdk/jdk/incubator/vector/Float64VectorTests.java
@@ -63,8 +63,11 @@ public class Float64VectorTests extends AbstractVectorTest {
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);
 
 
-    // for floating point reduction ops that may introduce rounding errors
-    private static final float RELATIVE_ROUNDING_ERROR = (float)0.000001;
+    // for floating point addition reduction ops that may introduce rounding errors
+    private static final float RELATIVE_ROUNDING_ERROR_FACTOR_ADD = (float)10.0;
+
+    // for floating point multiplication reduction ops that may introduce rounding errors
+    private static final float RELATIVE_ROUNDING_ERROR_FACTOR_MUL = (float)50.0;
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / 64);
 
@@ -129,16 +132,16 @@ static void assertReductionArraysEquals(float[] r, float rc, float[] a,
 
     static void assertReductionArraysEquals(float[] r, float rc, float[] a,
                                             FReductionOp f, FReductionAllOp fa,
-                                            float relativeError) {
+                                            float relativeErrorFactor) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a), Math.abs(rc * relativeError));
+            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i), Math.abs(r[i] * relativeError));
+                Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), Math.abs(rc * relativeError), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), Math.abs(r[i] * relativeError), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
         }
     }
 
@@ -2205,7 +2208,7 @@ static void ADDReduceFloat64VectorTests(IntFunction<float[]> fa) {
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float64VectorTests::ADDReduce, Float64VectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR);
+                Float64VectorTests::ADDReduce, Float64VectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static float ADDReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2251,7 +2254,7 @@ static void ADDReduceFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFuncti
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float64VectorTests::ADDReduceMasked, Float64VectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR);
+                Float64VectorTests::ADDReduceMasked, Float64VectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static float MULReduce(float[] a, int idx) {
@@ -2294,7 +2297,7 @@ static void MULReduceFloat64VectorTests(IntFunction<float[]> fa) {
         }
 
         assertReductionArraysEquals(r, ra, a,
-                Float64VectorTests::MULReduce, Float64VectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR);
+                Float64VectorTests::MULReduce, Float64VectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static float MULReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2340,7 +2343,7 @@ static void MULReduceFloat64VectorTestsMasked(IntFunction<float[]> fa, IntFuncti
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                Float64VectorTests::MULReduceMasked, Float64VectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR);
+                Float64VectorTests::MULReduceMasked, Float64VectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static float MINReduce(float[] a, int idx) {
diff --git a/test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java b/test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java
index f6b05fb6bc7ec..fdd3e042f77f2 100644
--- a/test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java
+++ b/test/jdk/jdk/incubator/vector/FloatMaxVectorTests.java
@@ -68,8 +68,11 @@ static VectorShape getMaxBit() {
 
     private static final int Max = 256;  // juts so we can do N/Max
 
-    // for floating point reduction ops that may introduce rounding errors
-    private static final float RELATIVE_ROUNDING_ERROR = (float)0.000001;
+    // for floating point addition reduction ops that may introduce rounding errors
+    private static final float RELATIVE_ROUNDING_ERROR_FACTOR_ADD = (float)10.0;
+
+    // for floating point multiplication reduction ops that may introduce rounding errors
+    private static final float RELATIVE_ROUNDING_ERROR_FACTOR_MUL = (float)50.0;
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / Max);
 
@@ -134,16 +137,16 @@ static void assertReductionArraysEquals(float[] r, float rc, float[] a,
 
     static void assertReductionArraysEquals(float[] r, float rc, float[] a,
                                             FReductionOp f, FReductionAllOp fa,
-                                            float relativeError) {
+                                            float relativeErrorFactor) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a), Math.abs(rc * relativeError));
+            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i), Math.abs(r[i] * relativeError));
+                Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), Math.abs(rc * relativeError), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), Math.abs(r[i] * relativeError), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
         }
     }
 
@@ -2210,7 +2213,7 @@ static void ADDReduceFloatMaxVectorTests(IntFunction<float[]> fa) {
         }
 
         assertReductionArraysEquals(r, ra, a,
-                FloatMaxVectorTests::ADDReduce, FloatMaxVectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR);
+                FloatMaxVectorTests::ADDReduce, FloatMaxVectorTests::ADDReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static float ADDReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2256,7 +2259,7 @@ static void ADDReduceFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunct
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                FloatMaxVectorTests::ADDReduceMasked, FloatMaxVectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR);
+                FloatMaxVectorTests::ADDReduceMasked, FloatMaxVectorTests::ADDReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_ADD);
     }
 
     static float MULReduce(float[] a, int idx) {
@@ -2299,7 +2302,7 @@ static void MULReduceFloatMaxVectorTests(IntFunction<float[]> fa) {
         }
 
         assertReductionArraysEquals(r, ra, a,
-                FloatMaxVectorTests::MULReduce, FloatMaxVectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR);
+                FloatMaxVectorTests::MULReduce, FloatMaxVectorTests::MULReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static float MULReduceMasked(float[] a, int idx, boolean[] mask) {
@@ -2345,7 +2348,7 @@ static void MULReduceFloatMaxVectorTestsMasked(IntFunction<float[]> fa, IntFunct
         }
 
         assertReductionArraysEqualsMasked(r, ra, a, mask,
-                FloatMaxVectorTests::MULReduceMasked, FloatMaxVectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR);
+                FloatMaxVectorTests::MULReduceMasked, FloatMaxVectorTests::MULReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_MUL);
     }
 
     static float MINReduce(float[] a, int idx) {
diff --git a/test/jdk/jdk/incubator/vector/gen-template.sh b/test/jdk/jdk/incubator/vector/gen-template.sh
index 5a7167c0b31cf..375287bef2d44 100644
--- a/test/jdk/jdk/incubator/vector/gen-template.sh
+++ b/test/jdk/jdk/incubator/vector/gen-template.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -221,7 +221,6 @@ function gen_op_tmpl {
   replace_variables $unit_filename $unit_output "$kernel" "$test" "$op" "$init" "$guard" "$masked" "$op_name" "$kernel_smoke"
 
   local gen_perf_tests=$generate_perf_tests
-  gen_perf_tests=true
   if [[ $template == *"-Broadcast-"* ]] || [[ $template == "Miscellaneous" ]] ||
      [[ $template == *"Compare-Masked"* ]] || [[ $template == *"Compare-Broadcast"* ]]; then
     gen_perf_tests=false
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-Masked-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-Masked-op.template
index 3b306ce387aac..3c68b72215dda 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-Masked-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-Masked-op.template
@@ -4,7 +4,7 @@
 [[KERNEL]]
         assertReductionArraysEqualsMasked(r, ra, a, mask,
 #if[FP]
-                $vectorteststype$::[[TEST]]ReduceMasked, $vectorteststype$::[[TEST]]ReduceAllMasked, RELATIVE_ROUNDING_ERROR);
+                $vectorteststype$::[[TEST]]ReduceMasked, $vectorteststype$::[[TEST]]ReduceAllMasked, RELATIVE_ROUNDING_ERROR_FACTOR_[[TEST]]);
 #else[FP]
                 $vectorteststype$::[[TEST]]ReduceMasked, $vectorteststype$::[[TEST]]ReduceAllMasked);
 #end[FP]
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-op.template b/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-op.template
index 5c68968870840..5638940045dc6 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-op.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-Reduction-op.template
@@ -4,7 +4,7 @@
 [[KERNEL]]
         assertReductionArraysEquals(r, ra, a,
 #if[FP]
-                $vectorteststype$::[[TEST]]Reduce, $vectorteststype$::[[TEST]]ReduceAll, RELATIVE_ROUNDING_ERROR);
+                $vectorteststype$::[[TEST]]Reduce, $vectorteststype$::[[TEST]]ReduceAll, RELATIVE_ROUNDING_ERROR_FACTOR_[[TEST]]);
 #else[FP]
                 $vectorteststype$::[[TEST]]Reduce, $vectorteststype$::[[TEST]]ReduceAll);
 #end[FP]
diff --git a/test/jdk/jdk/incubator/vector/templates/Unit-header.template b/test/jdk/jdk/incubator/vector/templates/Unit-header.template
index bc1ee75a5c665..38ab617824437 100644
--- a/test/jdk/jdk/incubator/vector/templates/Unit-header.template
+++ b/test/jdk/jdk/incubator/vector/templates/Unit-header.template
@@ -96,8 +96,11 @@ public class $vectorteststype$ extends AbstractVectorTest {
     private static final $type$ CONST_SHIFT = $Boxtype$.SIZE / 2;
 #end[BITWISE]
 #if[FP]
-    // for floating point reduction ops that may introduce rounding errors
-    private static final $type$ RELATIVE_ROUNDING_ERROR = ($type$)0.000001;
+    // for floating point addition reduction ops that may introduce rounding errors
+    private static final $type$ RELATIVE_ROUNDING_ERROR_FACTOR_ADD = ($type$)10.0;
+
+    // for floating point multiplication reduction ops that may introduce rounding errors
+    private static final $type$ RELATIVE_ROUNDING_ERROR_FACTOR_MUL = ($type$)50.0;
 #end[FP]
 
     static final int BUFFER_REPS = Integer.getInteger("jdk.incubator.vector.test.buffer-vectors", 25000 / $bits$);
@@ -177,16 +180,16 @@ public class $vectorteststype$ extends AbstractVectorTest {
 
     static void assertReductionArraysEquals($type$[] r, $type$ rc, $type$[] a,
                                             FReductionOp f, FReductionAllOp fa,
-                                            $type$ relativeError) {
+                                            $type$ relativeErrorFactor) {
         int i = 0;
         try {
-            Assert.assertEquals(rc, fa.apply(a), Math.abs(rc * relativeError));
+            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor);
             for (; i < a.length; i += SPECIES.length()) {
-                Assert.assertEquals(r[i], f.apply(a, i), Math.abs(r[i] * relativeError));
+                Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor);
             }
         } catch (AssertionError e) {
-            Assert.assertEquals(rc, fa.apply(a), Math.abs(rc * relativeError), "Final result is incorrect!");
-            Assert.assertEquals(r[i], f.apply(a, i), Math.abs(r[i] * relativeError), "at index #" + i);
+            Assert.assertEquals(rc, fa.apply(a), Math.ulp(rc) * relativeErrorFactor, "Final result is incorrect!");
+            Assert.assertEquals(r[i], f.apply(a, i), Math.ulp(r[i]) * relativeErrorFactor, "at index #" + i);
         }
     }
 #end[FP]

From a89b525189fbc0559be9edc0de9f4288ca676139 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Fri, 2 Aug 2024 10:51:25 +0000
Subject: [PATCH 290/401] 8337721: G1: Remove unused
 G1CollectedHeap::young_collection_verify_type

Reviewed-by: tschatzl
---
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp | 10 ----------
 src/hotspot/share/gc/g1/g1CollectedHeap.hpp |  1 -
 2 files changed, 11 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 3b8fb145f1692..aa99fbecbee54 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -2336,16 +2336,6 @@ void G1CollectedHeap::start_new_collection_set() {
   _cm->verify_no_collection_set_oops();
 }
 
-G1HeapVerifier::G1VerifyType G1CollectedHeap::young_collection_verify_type() const {
-  if (collector_state()->in_concurrent_start_gc()) {
-    return G1HeapVerifier::G1VerifyConcurrentStart;
-  } else if (collector_state()->in_young_only_phase()) {
-    return G1HeapVerifier::G1VerifyYoungNormal;
-  } else {
-    return G1HeapVerifier::G1VerifyMixed;
-  }
-}
-
 void G1CollectedHeap::verify_before_young_collection(G1HeapVerifier::G1VerifyType type) {
   if (!VerifyBeforeGC) {
     return;
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
index 59ade93967872..ea087aae6621f 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -752,7 +752,6 @@ class G1CollectedHeap : public CollectedHeap {
   // of the incremental collection pause, executed by the vm thread.
   void do_collection_pause_at_safepoint_helper();
 
-  G1HeapVerifier::G1VerifyType young_collection_verify_type() const;
   void verify_before_young_collection(G1HeapVerifier::G1VerifyType type);
   void verify_after_young_collection(G1HeapVerifier::G1VerifyType type);
 

From 328a0533b2ee6793130dfb68d931e0ebd60c6b5d Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Fri, 2 Aug 2024 11:47:26 +0000
Subject: [PATCH 291/401] 8335059: Consider renaming
 ClassLoaderData::keep_alive

Reviewed-by: dholmes, stefank
---
 .../gc/shared/barrierSetAssembler_aarch64.cpp |  4 +--
 .../ppc/gc/shared/barrierSetAssembler_ppc.cpp |  4 +--
 .../gc/shared/barrierSetAssembler_riscv.cpp   |  4 +--
 .../x86/gc/shared/barrierSetAssembler_x86.cpp |  4 +--
 .../share/classfile/classLoaderData.cpp       | 26 +++++++++----------
 .../share/classfile/classLoaderData.hpp       | 25 ++++++++++--------
 .../share/classfile/classLoaderDataGraph.cpp  | 10 +++----
 src/hotspot/share/classfile/javaClasses.cpp   |  2 +-
 src/hotspot/share/classfile/moduleEntry.cpp   |  2 +-
 src/hotspot/share/prims/jvm.cpp               |  2 +-
 10 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp
index 073d992235517..0161843036bc5 100644
--- a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -375,7 +375,7 @@ void BarrierSetAssembler::c2i_entry_barrier(MacroAssembler* masm) {
   __ load_method_holder_cld(rscratch1, rmethod);
 
   // Is it a strong CLD?
-  __ ldrw(rscratch2, Address(rscratch1, ClassLoaderData::keep_alive_offset()));
+  __ ldrw(rscratch2, Address(rscratch1, ClassLoaderData::keep_alive_ref_count_offset()));
   __ cbnz(rscratch2, method_live);
 
   // Is it a weak but alive CLD?
diff --git a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp
index 16de0b6a7ddd5..956b082d194b4 100644
--- a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, 2022 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -238,7 +238,7 @@ void BarrierSetAssembler::c2i_entry_barrier(MacroAssembler *masm, Register tmp1,
   __ ld(tmp1_class_loader_data, in_bytes(InstanceKlass::class_loader_data_offset()), tmp1);
 
   // Fast path: If class loader is strong, the holder cannot be unloaded.
-  __ lwz(tmp2, in_bytes(ClassLoaderData::keep_alive_offset()), tmp1_class_loader_data);
+  __ lwz(tmp2, in_bytes(ClassLoaderData::keep_alive_ref_count_offset()), tmp1_class_loader_data);
   __ cmpdi(CCR0, tmp2, 0);
   __ bne(CCR0, skip_barrier);
 
diff --git a/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp
index 0f3850809775c..efdf3765965f7 100644
--- a/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -326,7 +326,7 @@ void BarrierSetAssembler::c2i_entry_barrier(MacroAssembler* masm) {
   __ load_method_holder_cld(t0, xmethod);
 
   // Is it a strong CLD?
-  __ lwu(t1, Address(t0, ClassLoaderData::keep_alive_offset()));
+  __ lwu(t1, Address(t0, ClassLoaderData::keep_alive_ref_count_offset()));
   __ bnez(t1, method_live);
 
   // Is it a weak but alive CLD?
diff --git a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp
index 64ad743067476..cd0e43b68bf9e 100644
--- a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -423,7 +423,7 @@ void BarrierSetAssembler::c2i_entry_barrier(MacroAssembler* masm) {
   __ load_method_holder_cld(tmp1, rbx);
 
    // Is it a strong CLD?
-  __ cmpl(Address(tmp1, ClassLoaderData::keep_alive_offset()), 0);
+  __ cmpl(Address(tmp1, ClassLoaderData::keep_alive_ref_count_offset()), 0);
   __ jcc(Assembler::greater, method_live);
 
    // Is it a weak but alive CLD?
diff --git a/src/hotspot/share/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp
index de4490e73f326..fab012456d922 100644
--- a/src/hotspot/share/classfile/classLoaderData.cpp
+++ b/src/hotspot/share/classfile/classLoaderData.cpp
@@ -141,7 +141,7 @@ ClassLoaderData::ClassLoaderData(Handle h_class_loader, bool has_class_mirror_ho
   // A non-strong hidden class loader data doesn't have anything to keep
   // it from being unloaded during parsing of the non-strong hidden class.
   // The null-class-loader should always be kept alive.
-  _keep_alive((has_class_mirror_holder || h_class_loader.is_null()) ? 1 : 0),
+  _keep_alive_ref_count((has_class_mirror_holder || h_class_loader.is_null()) ? 1 : 0),
   _claim(0),
   _handles(),
   _klasses(nullptr), _packages(nullptr), _modules(nullptr), _unnamed_module(nullptr), _dictionary(nullptr),
@@ -345,26 +345,26 @@ void ClassLoaderData::demote_strong_roots() {
 // while the class is being parsed, and if the class appears on the module fixup list.
 // Due to the uniqueness that no other class shares the hidden class' name or
 // ClassLoaderData, no other non-GC thread has knowledge of the hidden class while
-// it is being defined, therefore _keep_alive is not volatile or atomic.
-void ClassLoaderData::inc_keep_alive() {
+// it is being defined, therefore _keep_alive_ref_count is not volatile or atomic.
+void ClassLoaderData::inc_keep_alive_ref_count() {
   if (has_class_mirror_holder()) {
-    assert(_keep_alive > 0, "Invalid keep alive increment count");
-    _keep_alive++;
+    assert(_keep_alive_ref_count > 0, "Invalid keep alive increment count");
+    _keep_alive_ref_count++;
   }
 }
 
-void ClassLoaderData::dec_keep_alive() {
+void ClassLoaderData::dec_keep_alive_ref_count() {
   if (has_class_mirror_holder()) {
-    assert(_keep_alive > 0, "Invalid keep alive decrement count");
-    if (_keep_alive == 1) {
-      // When the keep_alive counter is 1, the oop handle area is a strong root,
+    assert(_keep_alive_ref_count > 0, "Invalid keep alive decrement count");
+    if (_keep_alive_ref_count == 1) {
+      // When the keep_alive_ref_count counter is 1, the oop handle area is a strong root,
       // acting as input to the GC tracing. Such strong roots are part of the
       // snapshot-at-the-beginning, and can not just be pulled out from the
       // system when concurrent GCs are running at the same time, without
       // invoking the right barriers.
       demote_strong_roots();
     }
-    _keep_alive--;
+    _keep_alive_ref_count--;
   }
 }
 
@@ -680,8 +680,8 @@ oop ClassLoaderData::holder_no_keepalive() const {
 
 // Unloading support
 bool ClassLoaderData::is_alive() const {
-  bool alive = keep_alive()         // null class loader and incomplete non-strong hidden class.
-      || (_holder.peek() != nullptr);  // and not cleaned by the GC weak handle processing.
+  bool alive = (_keep_alive_ref_count > 0) // null class loader and incomplete non-strong hidden class.
+      || (_holder.peek() != nullptr);      // and not cleaned by the GC weak handle processing.
 
   return alive;
 }
@@ -1009,7 +1009,7 @@ void ClassLoaderData::print_on(outputStream* out) const {
   out->print_cr(" - unloading           %s", _unloading ? "true" : "false");
   out->print_cr(" - class mirror holder %s", _has_class_mirror_holder ? "true" : "false");
   out->print_cr(" - modified oops       %s", _modified_oops ? "true" : "false");
-  out->print_cr(" - keep alive          %d", _keep_alive);
+  out->print_cr(" - _keep_alive_ref_count %d", _keep_alive_ref_count);
   out->print   (" - claim               ");
   switch(_claim) {
     case _claim_none:                       out->print_cr("none"); break;
diff --git a/src/hotspot/share/classfile/classLoaderData.hpp b/src/hotspot/share/classfile/classLoaderData.hpp
index c9d025aded141..19dbb0b1b3650 100644
--- a/src/hotspot/share/classfile/classLoaderData.hpp
+++ b/src/hotspot/share/classfile/classLoaderData.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -125,10 +125,10 @@ class ClassLoaderData : public CHeapObj<mtClass> {
   // Remembered sets support for the oops in the class loader data.
   bool _modified_oops;     // Card Table Equivalent
 
-  int _keep_alive;         // if this CLD is kept alive.
-                           // Used for non-strong hidden classes and the
-                           // boot class loader. _keep_alive does not need to be volatile or
-                           // atomic since there is one unique CLD per non-strong hidden class.
+  int _keep_alive_ref_count; // if this CLD should not be considered eligible for unloading.
+                             // Used for non-strong hidden classes and the
+                             // boot class loader. _keep_alive_ref_count does not need to be volatile or
+                             // atomic since there is one unique CLD per non-strong hidden class.
 
   volatile int _claim; // non-zero if claimed, for example during GC traces.
                        // To avoid applying oop closure more than once.
@@ -205,12 +205,14 @@ class ClassLoaderData : public CHeapObj<mtClass> {
   bool has_modified_oops()               { return _modified_oops; }
 
   oop holder_no_keepalive() const;
+  // Resolving the holder keeps this CLD alive for the current GC cycle.
   oop holder() const;
+  void keep_alive() const { (void)holder(); }
 
   void classes_do(void f(Klass* const));
 
  private:
-  bool keep_alive() const       { return _keep_alive > 0; }
+  int keep_alive_ref_count() const { return _keep_alive_ref_count; }
 
   void loaded_classes_do(KlassClosure* klass_closure);
   void classes_do(void f(InstanceKlass*));
@@ -302,9 +304,10 @@ class ClassLoaderData : public CHeapObj<mtClass> {
     return _unloading;
   }
 
-  // Used to refcount a non-strong hidden class's s CLD in order to indicate their aliveness.
-  void inc_keep_alive();
-  void dec_keep_alive();
+  // Used to refcount a non-strong hidden class's CLD in order to force its aliveness during
+  // loading, when gc tracing may not find this CLD alive through the holder.
+  void inc_keep_alive_ref_count();
+  void dec_keep_alive_ref_count();
 
   void initialize_holder(Handle holder);
 
@@ -335,8 +338,8 @@ class ClassLoaderData : public CHeapObj<mtClass> {
   bool modules_defined() { return (_modules != nullptr); }
 
   // Offsets
-  static ByteSize holder_offset()     { return byte_offset_of(ClassLoaderData, _holder); }
-  static ByteSize keep_alive_offset() { return byte_offset_of(ClassLoaderData, _keep_alive); }
+  static ByteSize holder_offset() { return byte_offset_of(ClassLoaderData, _holder); }
+  static ByteSize keep_alive_ref_count_offset() { return byte_offset_of(ClassLoaderData, _keep_alive_ref_count); }
 
   // Loaded class dictionary
   Dictionary* dictionary() const { return _dictionary; }
diff --git a/src/hotspot/share/classfile/classLoaderDataGraph.cpp b/src/hotspot/share/classfile/classLoaderDataGraph.cpp
index adec6dbdeeeaa..c7051cd58e7d6 100644
--- a/src/hotspot/share/classfile/classLoaderDataGraph.cpp
+++ b/src/hotspot/share/classfile/classLoaderDataGraph.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -201,7 +201,7 @@ void ClassLoaderDataGraph::cld_do(CLDClosure* cl) {
 void ClassLoaderDataGraph::roots_cld_do(CLDClosure* strong, CLDClosure* weak) {
   assert_is_safepoint_or_gc();
   for (ClassLoaderData* cld = Atomic::load_acquire(&_head);  cld != nullptr; cld = cld->next()) {
-    CLDClosure* closure = cld->keep_alive() ? strong : weak;
+    CLDClosure* closure = (cld->keep_alive_ref_count() > 0) ? strong : weak;
     if (closure != nullptr) {
       closure->do_cld(cld);
     }
@@ -309,8 +309,7 @@ void ClassLoaderDataGraph::modules_do_keepalive(void f(ModuleEntry*)) {
   assert_locked_or_safepoint(Module_lock);
   ClassLoaderDataGraphIterator iter;
   while (ClassLoaderData* cld = iter.get_next()) {
-    // Keep the holder alive.
-    (void)cld->holder();
+    cld->keep_alive();
     cld->modules_do(f);
   }
 }
@@ -334,8 +333,7 @@ void ClassLoaderDataGraph::packages_do(void f(PackageEntry*)) {
 void ClassLoaderDataGraph::loaded_classes_do_keepalive(KlassClosure* klass_closure) {
   ClassLoaderDataGraphIterator iter;
   while (ClassLoaderData* cld = iter.get_next()) {
-    // Keep the holder alive.
-    (void)cld->holder();
+    cld->keep_alive();
     cld->loaded_classes_do(klass_closure);
   }
 }
diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index a0b5b73c6d449..b1b74bbba05cf 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -963,7 +963,7 @@ void java_lang_Class::set_mirror_module_field(JavaThread* current, Klass* k, Han
       // Keep list of classes needing java.base module fixup
       if (!ModuleEntryTable::javabase_defined()) {
         assert(k->java_mirror() != nullptr, "Class's mirror is null");
-        k->class_loader_data()->inc_keep_alive();
+        k->class_loader_data()->inc_keep_alive_ref_count();
         assert(fixup_module_field_list() != nullptr, "fixup_module_field_list not initialized");
         fixup_module_field_list()->push(k);
       } else {
diff --git a/src/hotspot/share/classfile/moduleEntry.cpp b/src/hotspot/share/classfile/moduleEntry.cpp
index 6c60d60d21192..af4332ca6912e 100644
--- a/src/hotspot/share/classfile/moduleEntry.cpp
+++ b/src/hotspot/share/classfile/moduleEntry.cpp
@@ -705,7 +705,7 @@ void ModuleEntryTable::patch_javabase_entries(JavaThread* current, Handle module
     {
       java_lang_Class::fixup_module_field(k, module_handle);
     }
-    k->class_loader_data()->dec_keep_alive();
+    k->class_loader_data()->dec_keep_alive_ref_count();
   }
 
   delete java_lang_Class::fixup_module_field_list();
diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
index 4f63ebdf9d518..1e3806474b540 100644
--- a/src/hotspot/share/prims/jvm.cpp
+++ b/src/hotspot/share/prims/jvm.cpp
@@ -1032,7 +1032,7 @@ static jclass jvm_lookup_define_class(jclass lookup, const char *name,
     // The hidden class loader data has been artificially been kept alive to
     // this point. The mirror and any instances of this class have to keep
     // it alive afterwards.
-    ik->class_loader_data()->dec_keep_alive();
+    ik->class_loader_data()->dec_keep_alive_ref_count();
 
     if (is_nestmate && log_is_enabled(Debug, class, nestmates)) {
       ModuleEntry* module = ik->module();

From 066db6eb21e9c9202857f9f6adfcd537a0b82160 Mon Sep 17 00:00:00 2001
From: Alexey Ivanov <aivanov@openjdk.org>
Date: Fri, 2 Aug 2024 13:06:22 +0000
Subject: [PATCH 292/401] 8337274: Remove repeated 'the' in
 StyleSheet.create{Small,Large}AttributeSet

Reviewed-by: achung, honkar, prr
---
 .../share/classes/javax/swing/text/html/StyleSheet.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java b/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java
index 9b8e33b4c6b03..64d2e0e3bbf8a 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java
@@ -724,7 +724,7 @@ public AttributeSet removeAttributes(AttributeSet old, AttributeSet attrs) {
      * to return an AttributeSet that provides some sort of
      * attribute conversion.
      *
-     * @param a The set of attributes to be represented in the
+     * @param a The set of attributes to be represented in
      *  the compact form.
      */
     protected SmallAttributeSet createSmallAttributeSet(AttributeSet a) {
@@ -740,7 +740,7 @@ protected SmallAttributeSet createSmallAttributeSet(AttributeSet a) {
      * to return a MutableAttributeSet that provides some sort of
      * attribute conversion.
      *
-     * @param a The set of attributes to be represented in the
+     * @param a The set of attributes to be represented in
      *  the larger form.
      */
     protected MutableAttributeSet createLargeAttributeSet(AttributeSet a) {
@@ -2173,7 +2173,7 @@ public static final class ListPainter implements Serializable {
         /**
          * Returns a string that represents the value
          * of the HTML.Attribute.TYPE attribute.
-         * If this attributes is not defined, then
+         * If this attributes is not defined,
          * then the type defaults to "disc" unless
          * the tag is on Ordered list.  In the case
          * of the latter, the default type is "decimal".

From f2e1205abf915c7f036c58292c6f4d8602cb0e64 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Fri, 2 Aug 2024 15:51:26 +0000
Subject: [PATCH 293/401] 8337676: JFR: Change the label of the throttle
 setting

Reviewed-by: mgronlun
---
 .../classes/jdk/jfr/internal/settings/ThrottleSetting.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottleSetting.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottleSetting.java
index 55757050b80fd..c18031d514f98 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottleSetting.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottleSetting.java
@@ -44,7 +44,7 @@
 import jdk.jfr.internal.util.Utils;
 
 @MetadataDefinition
-@Label("Event Emission Throttle")
+@Label("Throttle")
 @Description("Throttles the emission rate for an event")
 @Name(Type.SETTINGS_PREFIX + "Throttle")
 public final class ThrottleSetting extends JDKSettingControl {

From 7deee745254e5f32b75a09d84ac5078a122c8b8d Mon Sep 17 00:00:00 2001
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Fri, 2 Aug 2024 17:53:23 +0000
Subject: [PATCH 294/401] 8335122: Reorganize internal low-level support for
 HTML in jdk.javadoc

Reviewed-by: hannesw
---
 .../html/AbstractExecutableMemberWriter.java  |  21 +-
 .../formats/html/AbstractMemberWriter.java    |  23 +-
 .../html/AbstractOverviewIndexWriter.java     |  15 +-
 .../formats/html/AbstractTreeWriter.java      |  26 +-
 .../formats/html/AllClassesIndexWriter.java   |  18 +-
 .../formats/html/AllPackagesIndexWriter.java  |  17 +-
 .../html/AnnotationTypeMemberWriter.java      |  27 +-
 .../doclets/formats/html/ClassUseWriter.java  |  29 +-
 .../doclets/formats/html/ClassWriter.java     |  49 +--
 .../formats/html/ConstantsSummaryWriter.java  |  33 ++-
 .../formats/html/ConstructorWriter.java       |  33 ++-
 .../doclets/formats/html/Contents.java        |   7 +-
 .../formats/html/DeprecatedListWriter.java    |  14 +-
 .../doclets/formats/html/DocFilesHandler.java |  33 ++-
 .../formats/html/EnumConstantWriter.java      |  23 +-
 .../formats/html/ExternalSpecsWriter.java     |  17 +-
 .../doclets/formats/html/FieldWriter.java     |  28 +-
 .../doclets/formats/html/Headings.java        |  30 +-
 .../doclets/formats/html/HelpWriter.java      |  41 +--
 .../formats/html/HtmlDocletWriter.java        |  86 +++---
 .../doclets/formats/html/HtmlIds.java         |   3 +-
 .../formats/html/HtmlIndexBuilder.java        |   3 +-
 .../doclets/formats/html/HtmlLinkFactory.java |  15 +-
 .../doclets/formats/html/HtmlLinkInfo.java    |   8 +-
 .../formats/html/IndexRedirectWriter.java     |  18 +-
 .../doclets/formats/html/IndexWriter.java     |  41 ++-
 .../doclets/formats/html/MarkerComments.java  |   2 +-
 .../doclets/formats/html/MethodWriter.java    |  28 +-
 .../formats/html/ModuleIndexWriter.java       |  11 +-
 .../doclets/formats/html/ModuleWriter.java    |  71 ++---
 .../doclets/formats/html/Navigation.java      |  48 +--
 .../formats/html/NestedClassWriter.java       |  22 +-
 .../formats/html/NewAPIListWriter.java        |  16 +-
 .../formats/html/PackageIndexWriter.java      |  11 +-
 .../formats/html/PackageTreeWriter.java       |  20 +-
 .../formats/html/PackageUseWriter.java        |  36 ++-
 .../doclets/formats/html/PackageWriter.java   |  43 +--
 .../formats/html/PreviewListWriter.java       |  16 +-
 .../doclets/formats/html/PropertyWriter.java  |  29 +-
 .../formats/html/RestrictedListWriter.java    |   1 +
 .../doclets/formats/html/SearchWriter.java    |  31 +-
 .../formats/html/SerialFieldWriter.java       |  21 +-
 .../formats/html/SerialMethodWriter.java      |  17 +-
 .../formats/html/SerializedFormWriter.java    |  29 +-
 .../doclets/formats/html/Signatures.java      |  78 ++---
 .../formats/html/SourceToHTMLConverter.java   |  22 +-
 .../formats/html/SubWriterHolderWriter.java   |  31 +-
 .../formats/html/SummaryListWriter.java       |  28 +-
 .../formats/html/SystemPropertiesWriter.java  |  17 +-
 .../internal/doclets/formats/html/Table.java  |  38 +--
 .../doclets/formats/html/TableHeader.java     |  18 +-
 .../doclets/formats/html/TableOfContents.java |  33 ++-
 .../doclets/formats/html/TreeWriter.java      |  17 +-
 .../formats/html/markup/BodyContents.java     |   9 +-
 .../doclets/formats/html/markup/Head.java     |  11 +-
 .../doclets/formats/html/markup/HtmlAttr.java | 123 --------
 .../formats/html/markup/HtmlDocument.java     |   6 +-
 .../{HtmlStyle.java => HtmlStyles.java}       |   8 +-
 .../doclets/formats/html/markup/Links.java    |  11 +-
 .../doclets/formats/html/markup/TagName.java  | 118 --------
 .../formats/html/markup/package-info.java     |   2 +-
 .../formats/html/taglets/BaseTaglet.java      |   2 +-
 .../html/taglets/DeprecatedTaglet.java        |  16 +-
 .../formats/html/taglets/DocRootTaglet.java   |   4 +-
 .../formats/html/taglets/IndexTaglet.java     |   2 +-
 .../html/taglets/InheritDocTaglet.java        |   2 +-
 .../formats/html/taglets/LinkTaglet.java      |   6 +-
 .../formats/html/taglets/LiteralTaglet.java   |   6 +-
 .../formats/html/taglets/ParamTaglet.java     |   8 +-
 .../formats/html/taglets/ReturnTaglet.java    |   6 +-
 .../formats/html/taglets/SeeTaglet.java       |   8 +-
 .../formats/html/taglets/SimpleTaglet.java    |   8 +-
 .../formats/html/taglets/SnippetTaglet.java   |  26 +-
 .../formats/html/taglets/SpecTaglet.java      |  15 +-
 .../formats/html/taglets/SummaryTaglet.java   |   2 +-
 .../html/taglets/SystemPropertyTaglet.java    |   4 +-
 .../doclets/formats/html/taglets/Taglet.java  |   6 +-
 .../formats/html/taglets/TagletWriter.java    |  20 +-
 .../formats/html/taglets/ThrowsTaglet.java    |   6 +-
 .../formats/html/taglets/UserTaglet.java      |   4 +-
 .../formats/html/taglets/ValueTaglet.java     |   4 +-
 .../jdk/javadoc/internal/doclint/Checker.java |  37 ++-
 .../formats/html/markup => html}/Comment.java |   4 +-
 .../{doclets/formats => }/html/Content.java   |   2 +-
 .../html/markup => html}/ContentBuilder.java  |   4 +-
 .../formats/html/markup => html}/DocType.java |   2 +-
 .../formats/html/markup => html}/Entity.java  |   4 +-
 .../jdk/javadoc/internal/html/HtmlAttr.java   | 275 +++++++++++++++++
 .../formats/html/markup => html}/HtmlId.java  |   2 +-
 .../jdk/javadoc/internal/html/HtmlStyle.java  |  42 +++
 .../internal/{doclint => html}/HtmlTag.java   | 279 +++++-------------
 .../html/markup => html}/HtmlTree.java        | 149 +++++-----
 .../html/markup => html}/ListBuilder.java     |   4 +-
 .../formats/html/markup => html}/RawHtml.java |   8 +-
 .../formats/html/markup => html}/Script.java  |   6 +-
 .../formats/html/markup => html}/Text.java    |   4 +-
 .../html/markup => html}/TextBuilder.java     |   4 +-
 .../jdk/javadoc/internal/package-info.java    |   4 +-
 .../CheckStylesheetClasses.java               |  12 +-
 .../testHtmlDocument/TestHtmlDocument.java    |  36 +--
 .../TestHtmlTableStyles.java                  |   2 +-
 .../TestVoidHtmlElements.java                 |  14 +-
 .../tools/doclint/CoverageExtras.java         |   8 +-
 .../html/HtmlVersionTagsAttrsTest.java        |   8 +-
 .../doclint/html/HtmlVersionTagsAttrsTest.out |  20 +-
 .../tools/doclint/html/OtherTagsTest.java     |   2 +-
 .../tools/doclint/html/OtherTagsTest.out      |   5 +-
 107 files changed, 1377 insertions(+), 1395 deletions(-)
 delete mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlAttr.java
 rename src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/{HtmlStyle.java => HtmlStyles.java} (99%)
 delete mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TagName.java
 rename src/jdk.javadoc/share/classes/jdk/javadoc/internal/{doclets/formats/html/markup => html}/Comment.java (94%)
 rename src/jdk.javadoc/share/classes/jdk/javadoc/internal/{doclets/formats => }/html/Content.java (99%)
 rename src/jdk.javadoc/share/classes/jdk/javadoc/internal/{doclets/formats/html/markup => html}/ContentBuilder.java (96%)
 rename src/jdk.javadoc/share/classes/jdk/javadoc/internal/{doclets/formats/html/markup => html}/DocType.java (96%)
 rename src/jdk.javadoc/share/classes/jdk/javadoc/internal/{doclets/formats/html/markup => html}/Entity.java (97%)
 create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlAttr.java
 rename src/jdk.javadoc/share/classes/jdk/javadoc/internal/{doclets/formats/html/markup => html}/HtmlId.java (96%)
 create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlStyle.java
 rename src/jdk.javadoc/share/classes/jdk/javadoc/internal/{doclint => html}/HtmlTag.java (72%)
 rename src/jdk.javadoc/share/classes/jdk/javadoc/internal/{doclets/formats/html/markup => html}/HtmlTree.java (90%)
 rename src/jdk.javadoc/share/classes/jdk/javadoc/internal/{doclets/formats/html/markup => html}/ListBuilder.java (97%)
 rename src/jdk.javadoc/share/classes/jdk/javadoc/internal/{doclets/formats/html/markup => html}/RawHtml.java (96%)
 rename src/jdk.javadoc/share/classes/jdk/javadoc/internal/{doclets/formats/html/markup => html}/Script.java (97%)
 rename src/jdk.javadoc/share/classes/jdk/javadoc/internal/{doclets/formats/html/markup => html}/Text.java (97%)
 rename src/jdk.javadoc/share/classes/jdk/javadoc/internal/{doclets/formats/html/markup => html}/TextBuilder.java (96%)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java
index f6ad4cf05dfab..84672926cf81a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java
@@ -38,13 +38,14 @@
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.SimpleTypeVisitor14;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.Entity;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 import static jdk.javadoc.internal.doclets.formats.html.HtmlLinkInfo.Kind.LINK_TYPE_PARAMS;
 import static jdk.javadoc.internal.doclets.formats.html.HtmlLinkInfo.Kind.LINK_TYPE_PARAMS_AND_BOUNDS;
@@ -108,7 +109,7 @@ protected Content getSummaryLink(Element member) {
         }
         String signature = utils.flatSignature((ExecutableElement) member, typeElement);
         if (signature.length() > 2) {
-            content.add(new HtmlTree(TagName.WBR));
+            content.add(new HtmlTree(HtmlTag.WBR));
         }
         content.add(signature);
 
@@ -120,7 +121,7 @@ protected Content getSummaryLink(Element member) {
     protected void addSummaryLink(HtmlLinkInfo.Kind context, TypeElement te, Element member,
                                   Content target) {
         ExecutableElement ee = (ExecutableElement)member;
-        Content memberLink = writer.getDocLink(context, te, ee, name(ee), HtmlStyle.memberNameLink);
+        Content memberLink = writer.getDocLink(context, te, ee, name(ee), HtmlStyles.memberNameLink);
         var code = HtmlTree.CODE(memberLink);
         addParameters(ee, code);
         target.add(code);
@@ -143,7 +144,7 @@ protected void addTypeParameters(ExecutableElement member, Content target) {
         // Add explicit line break between method type parameters and
         // return type in member summary table to avoid random wrapping.
         if (typeParameters.charCount() > 10) {
-            target.add(new HtmlTree(TagName.BR));
+            target.add(new HtmlTree(HtmlTag.BR));
         } else {
             target.add(Entity.NO_BREAK_SPACE);
         }
@@ -232,7 +233,7 @@ protected void addParameters(ExecutableElement member, Content target) {
         Content params = getParameters(member, false);
         if (params.charCount() > 2) {
             // only add <wbr> for non-empty parameters
-            target.add(new HtmlTree(TagName.WBR));
+            target.add(new HtmlTree(HtmlTag.WBR));
         }
         target.add(params);
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
index af1f7ef1fe6cb..e2b81bb39822d 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
@@ -44,15 +44,16 @@
 
 import com.sun.source.doctree.DocTree;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.Resources;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFinder;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
 import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.Entity;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
 
 import static jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable.Kind.ANNOTATION_TYPE_MEMBER;
 import static jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable.Kind.ANNOTATION_TYPE_MEMBER_OPTIONAL;
@@ -450,7 +451,7 @@ protected abstract void addInheritedSummaryLink(TypeElement typeElement,
      */
     protected void addModifiersAndType(Element member, TypeMirror type,
             Content target) {
-        var code = new HtmlTree(TagName.CODE);
+        var code = new HtmlTree(HtmlTag.CODE);
         addModifiers(member, code);
         if (type == null) {
             code.add(switch (member.getKind()) {
@@ -518,7 +519,7 @@ protected void addDeprecatedInfo(Element member, Content target) {
         var t = configuration.tagletManager.getTaglet(DocTree.Kind.DEPRECATED);
         Content output = t.getAllBlockTagOutput(member, writer.getTagletWriterInstance(false));
         if (!output.isEmpty()) {
-            target.add(HtmlTree.DIV(HtmlStyle.deprecationBlock, output));
+            target.add(HtmlTree.DIV(HtmlStyles.deprecationBlock, output));
         }
     }
 
@@ -570,9 +571,9 @@ protected void addUseInfo(List<? extends Element> members, Content heading, Cont
             return;
         }
         boolean printedUseTableHeader = false;
-        var useTable = new Table<Void>(HtmlStyle.summaryTable)
+        var useTable = new Table<Void>(HtmlStyles.summaryTable)
                 .setCaption(heading)
-                .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colSecond, HtmlStyle.colLast);
+                .setColumnStyles(HtmlStyles.colFirst, HtmlStyles.colSecond, HtmlStyles.colLast);
         for (Element element : members) {
             TypeElement te = (typeElement == null)
                     ? utils.getEnclosingTypeElement(element)
@@ -588,7 +589,7 @@ protected void addUseInfo(List<? extends Element> members, Content heading, Cont
                     && !utils.isConstructor(element)
                     && !utils.isTypeElement(element)) {
 
-                var name = HtmlTree.SPAN(HtmlStyle.typeNameLabel);
+                var name = HtmlTree.SPAN(HtmlStyles.typeNameLabel);
                 name.add(name(te) + ".");
                 typeContent.add(name);
             }
@@ -669,7 +670,7 @@ public Content getInheritedSummaryHeader(TypeElement tElement) {
      * @return the inherited summary links
      */
     public Content getInheritedSummaryLinks() {
-        return new HtmlTree(TagName.CODE);
+        return new HtmlTree(HtmlTag.CODE);
     }
 
     /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractOverviewIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractOverviewIndexWriter.java
index 2d7fb6e9b11a9..c466a2fcb5aa7 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractOverviewIndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractOverviewIndexWriter.java
@@ -25,14 +25,15 @@
 
 package jdk.javadoc.internal.doclets.formats.html;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
-import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
+import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.RawHtml;
 
 /**
  * Abstract class to generate the top-level "overview" files.
@@ -135,8 +136,8 @@ protected void addConfigurationTitle(Content target) {
         if (!doctitle.isEmpty()) {
             var title = RawHtml.of(doctitle);
             var heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING,
-                    HtmlStyle.title, title);
-            var div = HtmlTree.DIV(HtmlStyle.header, heading);
+                    HtmlStyles.title, title);
+            var div = HtmlTree.DIV(HtmlStyles.header, heading);
             target.add(div);
         }
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java
index d0483d5d33c16..594132743eb0f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractTreeWriter.java
@@ -25,18 +25,20 @@
 
 package jdk.javadoc.internal.doclets.formats.html;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
-import jdk.javadoc.internal.doclets.toolkit.util.ClassTree;
-import jdk.javadoc.internal.doclets.toolkit.util.ClassTree.Hierarchy;
-import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
-
-import javax.lang.model.element.TypeElement;
 import java.util.Collection;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
+import javax.lang.model.element.TypeElement;
+
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
+import jdk.javadoc.internal.doclets.toolkit.util.ClassTree;
+import jdk.javadoc.internal.doclets.toolkit.util.ClassTree.Hierarchy;
+import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
+
 
 /**
  * Abstract class to print the class hierarchy page for all the Classes. This
@@ -77,10 +79,10 @@ protected AbstractTreeWriter(HtmlConfiguration configuration,
     protected void addLevelInfo(TypeElement parent, Collection<TypeElement> collection,
                                 Hierarchy hierarchy, Content content) {
         if (!collection.isEmpty()) {
-            var ul = new HtmlTree(TagName.UL);
+            var ul = new HtmlTree(HtmlTag.UL);
             for (TypeElement local : collection) {
-                var li = new HtmlTree(TagName.LI);
-                li.setStyle(HtmlStyle.circle);
+                var li = new HtmlTree(HtmlTag.LI);
+                li.setStyle(HtmlStyles.circle);
                 addPartialInfo(local, li);
                 addExtendsImplements(parent, local, li);
                 addLevelInfo(local, hierarchy.subtypes(local), hierarchy, li);   // Recurse
@@ -104,7 +106,7 @@ protected void addTree(Hierarchy hierarchy, String heading, Content content) {
             Content headingContent = contents.getContent(heading);
             var sectionHeading = HtmlTree.HEADING_TITLE(Headings.CONTENT_HEADING,
                     headingContent);
-            var section = HtmlTree.SECTION(HtmlStyle.hierarchy, sectionHeading);
+            var section = HtmlTree.SECTION(HtmlStyles.hierarchy, sectionHeading);
             addLevelInfo(!utils.isPlainInterface(firstTypeElement) ? firstTypeElement : null,
                     roots, hierarchy, section);
             content.add(section);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java
index 5aa9f349a5137..68ee6d98857e5 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java
@@ -33,14 +33,16 @@
 import javax.lang.model.element.TypeElement;
 
 import com.sun.source.doctree.DeprecatedTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
+import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils.ElementFlag;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlTree;
 
 /**
  * Generate the file with list of all the classes in this run.
@@ -79,9 +81,9 @@ public void buildPage() throws DocFileIOException {
      * @param target the content to which the links will be added
      */
     protected void addContents(Content target) {
-        var table = new Table<TypeElement>(HtmlStyle.summaryTable)
+        var table = new Table<TypeElement>(HtmlStyles.summaryTable)
                 .setHeader(new TableHeader(contents.classLabel, contents.descriptionLabel))
-                .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast)
+                .setColumnStyles(HtmlStyles.colFirst, HtmlStyles.colLast)
                 .setId(HtmlIds.ALL_CLASSES_TABLE)
                 .setDefaultTab(contents.allClassesAndInterfacesLabel)
                 .addTab(contents.interfaces, utils::isPlainInterface)
@@ -96,8 +98,8 @@ protected void addContents(Content target) {
         }
         Content titleContent = contents.allClassesAndInterfacesLabel;
         var pHeading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
-                HtmlStyle.title, titleContent);
-        var headerDiv = HtmlTree.DIV(HtmlStyle.header, pHeading);
+                HtmlStyles.title, titleContent);
+        var headerDiv = HtmlTree.DIV(HtmlStyles.header, pHeading);
         target.add(headerDiv);
         if (!table.isEmpty()) {
             target.add(table);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllPackagesIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllPackagesIndexWriter.java
index 5581ec03e2a23..2c9539d3c30dc 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllPackagesIndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllPackagesIndexWriter.java
@@ -29,12 +29,13 @@
 
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
 import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * Generate the file with list of all the packages in this run.
@@ -60,8 +61,8 @@ public void buildPage() throws DocFileIOException {
         addPackages(mainContent);
         Content titleContent = contents.allPackagesLabel;
         var pHeading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
-                HtmlStyle.title, titleContent);
-        var headerDiv = HtmlTree.DIV(HtmlStyle.header, pHeading);
+                HtmlStyles.title, titleContent);
+        var headerDiv = HtmlTree.DIV(HtmlStyles.header, pHeading);
         HtmlTree body = getBody(getWindowTitle(label));
         body.add(new BodyContents()
                 .setHeader(getHeader(PageMode.ALL_PACKAGES))
@@ -77,10 +78,10 @@ public void buildPage() throws DocFileIOException {
      * @param target the content to which the links will be added
      */
     protected void addPackages(Content target) {
-        var table = new Table<PackageElement>(HtmlStyle.summaryTable)
+        var table = new Table<PackageElement>(HtmlStyles.summaryTable)
                 .setCaption(Text.of(contents.packageSummaryLabel.toString()))
                 .setHeader(new TableHeader(contents.packageLabel, contents.descriptionLabel))
-                .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast);
+                .setColumnStyles(HtmlStyles.colFirst, HtmlStyles.colLast);
         for (PackageElement pkg : configuration.packages) {
             if (!(options.noDeprecated() && utils.isDeprecated(pkg))) {
                 Content packageLinkContent = getPackageLink(pkg, getLocalizedPackageName(pkg));
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeMemberWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeMemberWriter.java
index 8f8585ecc6205..f1f6311023115 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeMemberWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeMemberWriter.java
@@ -32,13 +32,14 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeMirror;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.Comment;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.BaseOptions;
 import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable;
+import jdk.javadoc.internal.html.Comment;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 
 /**
@@ -96,7 +97,7 @@ protected void buildAnnotationTypeMember(Content target) {
             for (Element member : members) {
                 currentMember = member;
                 Content annotationContent = getAnnotationHeaderContent(currentMember);
-                Content div = HtmlTree.DIV(HtmlStyle.horizontalScroll);
+                Content div = HtmlTree.DIV(HtmlStyles.horizontalScroll);
                 buildAnnotationTypeMemberChildren(div);
                 annotationContent.add(div);
                 memberList.add(writer.getMemberListItem(annotationContent));
@@ -181,7 +182,7 @@ public Content getMemberSummaryHeader(Content content) {
 
     @Override
     public void buildSummary(Content summariesList, Content content) {
-        writer.addSummary(HtmlStyle.memberSummary,
+        writer.addSummary(HtmlStyles.memberSummary,
                 switch (kind) {
                     case ANNOTATION_TYPE_MEMBER_REQUIRED -> HtmlIds.ANNOTATION_TYPE_REQUIRED_ELEMENT_SUMMARY;
                     case ANNOTATION_TYPE_MEMBER_OPTIONAL -> HtmlIds.ANNOTATION_TYPE_OPTIONAL_ELEMENT_SUMMARY;
@@ -209,7 +210,7 @@ protected Content getAnnotationHeaderContent(Element member) {
         var heading = HtmlTree.HEADING(Headings.TypeDeclaration.MEMBER_HEADING,
                 Text.of(name(member)));
         content.add(heading);
-        return HtmlTree.SECTION(HtmlStyle.detail, content)
+        return HtmlTree.SECTION(HtmlStyles.detail, content)
                 .setId(htmlIds.forMember((ExecutableElement) member).getFirst());
     }
 
@@ -238,7 +239,7 @@ protected void addTags(Element member, Content annotationContent) {
 
     protected Content getAnnotationDetails(Content annotationDetailsHeader, Content annotationDetails) {
         Content c = new ContentBuilder(annotationDetailsHeader, annotationDetails);
-        return getMember(HtmlTree.SECTION(HtmlStyle.memberDetails, c));
+        return getMember(HtmlTree.SECTION(HtmlStyles.memberDetails, c));
     }
 
     @Override
@@ -278,10 +279,10 @@ public TableHeader getSummaryTableHeader(Element member) {
 
     @Override
     protected Table<Element> createSummaryTable() {
-        return new Table<Element>(HtmlStyle.summaryTable)
+        return new Table<Element>(HtmlStyles.summaryTable)
                 .setCaption(getCaption())
                 .setHeader(getSummaryTableHeader(typeElement))
-                .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colSecond, HtmlStyle.colLast);
+                .setColumnStyles(HtmlStyles.colFirst, HtmlStyles.colSecond, HtmlStyles.colLast);
     }
 
     @Override
@@ -292,7 +293,7 @@ public void addInheritedSummaryLabel(TypeElement typeElement, Content content) {
     protected void addSummaryLink(HtmlLinkInfo.Kind context, TypeElement typeElement, Element member,
                                   Content content) {
         Content memberLink = writer.getDocLink(context, utils.getEnclosingTypeElement(member), member,
-                name(member), HtmlStyle.memberNameLink);
+                name(member), HtmlStyles.memberNameLink);
         var code = HtmlTree.CODE(memberLink);
         content.add(code);
     }
@@ -331,7 +332,7 @@ protected void addDefaultValueInfo(Element member, Content annotationContent) {
             ExecutableElement ee = (ExecutableElement) member;
             AnnotationValue value = ee.getDefaultValue();
             if (value != null) {
-                var dl = HtmlTree.DL(HtmlStyle.notes);
+                var dl = HtmlTree.DL(HtmlStyles.notes);
                 dl.add(HtmlTree.DT(contents.default_));
                 dl.add(HtmlTree.DD(HtmlTree.CODE(Text.of(value.toString()))));
                 annotationContent.add(dl);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java
index 94e66f1eed610..ac953dccb55df 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java
@@ -38,11 +38,8 @@
 import javax.lang.model.element.TypeElement;
 import javax.tools.Diagnostic;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.DocletException;
 import jdk.javadoc.internal.doclets.toolkit.util.ClassTree;
 import jdk.javadoc.internal.doclets.toolkit.util.ClassUseMapper;
@@ -50,6 +47,10 @@
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
 
 
 /**
@@ -244,10 +245,10 @@ protected void addPackageList(Content content) {
                 "doclet.ClassUse_Packages.that.use.0",
                 getLink(new HtmlLinkInfo(configuration,
                         HtmlLinkInfo.Kind.PLAIN, typeElement)));
-        var table = new Table<Void>(HtmlStyle.summaryTable)
+        var table = new Table<Void>(HtmlStyles.summaryTable)
                 .setCaption(caption)
                 .setHeader(getPackageTableHeader())
-                .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast);
+                .setColumnStyles(HtmlStyles.colFirst, HtmlStyles.colLast);
         for (PackageElement pkg : pkgSet) {
             addPackageUse(pkg, table);
         }
@@ -270,10 +271,10 @@ protected void addPackageAnnotationList(Content content) {
                 getLink(new HtmlLinkInfo(configuration,
                         HtmlLinkInfo.Kind.PLAIN, typeElement)));
 
-        var table = new Table<Void>(HtmlStyle.summaryTable)
+        var table = new Table<Void>(HtmlStyles.summaryTable)
                 .setCaption(caption)
                 .setHeader(getPackageTableHeader())
-                .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast);
+                .setColumnStyles(HtmlStyles.colFirst, HtmlStyles.colLast);
         for (PackageElement pkg : pkgToPackageAnnotations) {
             Content summary = new ContentBuilder();
             addSummaryComment(pkg, summary);
@@ -288,9 +289,9 @@ protected void addPackageAnnotationList(Content content) {
      * @param content the content to which the class elements will be added
      */
     protected void addClassList(Content content) {
-        var ul = HtmlTree.UL(HtmlStyle.blockList);
+        var ul = HtmlTree.UL(HtmlStyles.blockList);
         for (PackageElement pkg : pkgSet) {
-            var section = HtmlTree.SECTION(HtmlStyle.detail)
+            var section = HtmlTree.SECTION(HtmlStyles.detail)
                     .setId(htmlIds.forPackage(pkg));
             Content link = contents.getContent("doclet.ClassUse_Uses.of.0.in.1",
                     getLink(new HtmlLinkInfo(configuration, HtmlLinkInfo.Kind.PLAIN,
@@ -301,7 +302,7 @@ protected void addClassList(Content content) {
             addClassUse(pkg, section);
             ul.add(HtmlTree.LI(section));
         }
-        var li = HtmlTree.SECTION(HtmlStyle.classUses, ul);
+        var li = HtmlTree.SECTION(HtmlStyles.classUses, ul);
         content.add(li);
     }
 
@@ -422,11 +423,11 @@ protected HtmlTree getClassUseHeader() {
         HtmlTree body = getBody(getWindowTitle(title));
         ContentBuilder headingContent = new ContentBuilder();
         headingContent.add(contents.getContent("doclet.ClassUse_Title", cltype));
-        headingContent.add(new HtmlTree(TagName.BR));
+        headingContent.add(new HtmlTree(HtmlTag.BR));
         headingContent.add(clname);
         var heading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
-                HtmlStyle.title, headingContent);
-        var div = HtmlTree.DIV(HtmlStyle.header, heading);
+                HtmlStyles.title, headingContent);
+        var div = HtmlTree.DIV(HtmlStyles.header, heading);
         bodyContents.setHeader(getHeader(PageMode.USE, typeElement)).addMainContent(div);
         return body;
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java
index 7e0cf74c4f331..a1fd27fefdd58 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java
@@ -45,12 +45,7 @@
 import com.sun.source.doctree.DocTree;
 
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.CommentUtils;
 import jdk.javadoc.internal.doclets.toolkit.DocletException;
 import jdk.javadoc.internal.doclets.toolkit.PropertyUtils;
@@ -58,6 +53,12 @@
 import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlAttr;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * Generate the Class Information Page.
@@ -154,7 +155,7 @@ protected void buildClassTree(Content classContent) {
      * @param target the content to which the documentation will be added
      */
     protected void buildClassInfo(Content target) {
-        Content c = HtmlTree.DIV(HtmlStyle.horizontalScroll);
+        Content c = HtmlTree.DIV(HtmlStyles.horizontalScroll);
         buildParamInfo(c);
         buildSuperInterfacesInfo(c);
         buildImplementedInterfacesInfo(c);
@@ -430,12 +431,12 @@ private void setRecordDocumentation(TypeElement elem) {
 
     protected Content getHeader(String header) {
         HtmlTree body = getBody(getWindowTitle(utils.getSimpleName(typeElement)));
-        var div = HtmlTree.DIV(HtmlStyle.header);
+        var div = HtmlTree.DIV(HtmlStyles.header);
         HtmlLinkInfo linkInfo = new HtmlLinkInfo(configuration,
                 HtmlLinkInfo.Kind.SHOW_TYPE_PARAMS_AND_BOUNDS, typeElement)
                 .linkToSelf(false);  // Let's not link to ourselves in the header
         var heading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
-                HtmlStyle.title, Text.of(header));
+                HtmlStyles.title, Text.of(header));
         heading.add(getTypeParameterLinks(linkInfo));
         div.add(heading);
         bodyContents.setHeader(getHeader(PageMode.CLASS, typeElement))
@@ -463,7 +464,7 @@ protected void printDocument(Content content) throws DocFileIOException {
     }
 
     protected Content getClassInfo(Content classInfo) {
-        return getMember(HtmlIds.CLASS_DESCRIPTION, HtmlStyle.classDescription, classInfo);
+        return getMember(HtmlIds.CLASS_DESCRIPTION, HtmlStyles.classDescription, classInfo);
     }
 
     @Override
@@ -472,7 +473,7 @@ public TypeElement getCurrentPageElement() {
     }
 
     protected void addClassSignature(Content classInfo) {
-        classInfo.add(new HtmlTree(TagName.HR));
+        classInfo.add(new HtmlTree(HtmlTag.HR));
         classInfo.add(new Signatures.TypeSignature(typeElement, this)
                 .toContent());
     }
@@ -514,7 +515,7 @@ private Content getClassInheritanceTreeContent(TypeMirror type) {
         HtmlTree classTree = null;
         do {
             sup = utils.getFirstVisibleSuperClass(type);
-            var entry = HtmlTree.DIV(HtmlStyle.inheritance, getClassHelperContent(type));
+            var entry = HtmlTree.DIV(HtmlStyles.inheritance, getClassHelperContent(type));
             if (classTree != null)
                 entry.add(classTree);
             classTree = entry;
@@ -564,7 +565,7 @@ protected void addParamInfo(Content target) {
             var t = configuration.tagletManager.getTaglet(DocTree.Kind.PARAM);
             Content paramInfo = t.getAllBlockTagOutput(typeElement, getTagletWriterInstance(false));
             if (!paramInfo.isEmpty()) {
-                target.add(HtmlTree.DL(HtmlStyle.notes, paramInfo));
+                target.add(HtmlTree.DL(HtmlStyles.notes, paramInfo));
             }
         }
     }
@@ -578,7 +579,7 @@ protected void addSubClassInfo(Content target) {
             }
             Set<TypeElement> subclasses = classTree.hierarchy(typeElement).subtypes(typeElement);
             if (!subclasses.isEmpty()) {
-                var dl = HtmlTree.DL(HtmlStyle.notes);
+                var dl = HtmlTree.DL(HtmlStyles.notes);
                 dl.add(HtmlTree.DT(contents.subclassesLabel));
                 dl.add(HtmlTree.DD(getClassLinks(HtmlLinkInfo.Kind.PLAIN, subclasses)));
                 target.add(dl);
@@ -590,7 +591,7 @@ protected void addSubInterfacesInfo(Content target) {
         if (utils.isPlainInterface(typeElement)) {
             Set<TypeElement> subInterfaces = classTree.hierarchy(typeElement).allSubtypes(typeElement);
             if (!subInterfaces.isEmpty()) {
-                var dl = HtmlTree.DL(HtmlStyle.notes);
+                var dl = HtmlTree.DL(HtmlStyles.notes);
                 dl.add(HtmlTree.DT(contents.subinterfacesLabel));
                 dl.add(HtmlTree.DD(getClassLinks(HtmlLinkInfo.Kind.SHOW_TYPE_PARAMS, subInterfaces)));
                 target.add(dl);
@@ -609,7 +610,7 @@ protected void addInterfaceUsageInfo(Content target) {
         }
         Set<TypeElement> implcl = classTree.implementingClasses(typeElement);
         if (!implcl.isEmpty()) {
-            var dl = HtmlTree.DL(HtmlStyle.notes);
+            var dl = HtmlTree.DL(HtmlStyles.notes);
             dl.add(HtmlTree.DT(contents.implementingClassesLabel));
             dl.add(HtmlTree.DD(getClassLinks(HtmlLinkInfo.Kind.PLAIN, implcl)));
             target.add(dl);
@@ -620,7 +621,7 @@ protected void addImplementedInterfacesInfo(Content target) {
         SortedSet<TypeMirror> interfaces = new TreeSet<>(comparators.typeMirrorClassUseComparator());
         interfaces.addAll(utils.getAllInterfaces(typeElement));
         if (utils.isClass(typeElement) && !interfaces.isEmpty()) {
-            var dl = HtmlTree.DL(HtmlStyle.notes);
+            var dl = HtmlTree.DL(HtmlStyles.notes);
             dl.add(HtmlTree.DT(contents.allImplementedInterfacesLabel));
             dl.add(HtmlTree.DD(getClassLinks(HtmlLinkInfo.Kind.SHOW_TYPE_PARAMS, interfaces)));
             target.add(dl);
@@ -633,7 +634,7 @@ protected void addSuperInterfacesInfo(Content target) {
         interfaces.addAll(utils.getAllInterfaces(typeElement));
 
         if (utils.isPlainInterface(typeElement) && !interfaces.isEmpty()) {
-            var dl = HtmlTree.DL(HtmlStyle.notes);
+            var dl = HtmlTree.DL(HtmlStyles.notes);
             dl.add(HtmlTree.DT(contents.allSuperinterfacesLabel));
             dl.add(HtmlTree.DD(getClassLinks(HtmlLinkInfo.Kind.SHOW_TYPE_PARAMS, interfaces)));
             target.add(dl);
@@ -647,7 +648,7 @@ protected void addNestedClassInfo(final Content target) {
         new SimpleElementVisitor8<Void, Void>() {
             @Override
             public Void visitType(TypeElement e, Void p) {
-                var dl = HtmlTree.DL(HtmlStyle.notes);
+                var dl = HtmlTree.DL(HtmlStyles.notes);
                 dl.add(HtmlTree.DT(utils.isPlainInterface(e)
                         ? contents.enclosingInterfaceLabel
                         : contents.enclosingClassLabel));
@@ -660,9 +661,9 @@ public Void visitType(TypeElement e, Void p) {
 
     protected void addFunctionalInterfaceInfo (Content target) {
         if (utils.isFunctionalInterface(typeElement)) {
-            var dl = HtmlTree.DL(HtmlStyle.notes);
+            var dl = HtmlTree.DL(HtmlStyles.notes);
             dl.add(HtmlTree.DT(contents.functionalInterface));
-            var dd = new HtmlTree(TagName.DD);
+            var dd = new HtmlTree(HtmlTag.DD);
             dd.add(contents.functionalInterfaceMessage);
             dl.add(dd);
             target.add(dl);
@@ -672,8 +673,8 @@ protected void addFunctionalInterfaceInfo (Content target) {
     protected void addClassDeprecationInfo(Content classInfo) {
         List<? extends DeprecatedTree> deprs = utils.getDeprecatedTrees(typeElement);
         if (utils.isDeprecated(typeElement)) {
-            var deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(typeElement));
-            var div = HtmlTree.DIV(HtmlStyle.deprecationBlock, deprLabel);
+            var deprLabel = HtmlTree.SPAN(HtmlStyles.deprecatedLabel, getDeprecatedPhrase(typeElement));
+            var div = HtmlTree.DIV(HtmlStyles.deprecationBlock, deprLabel);
             if (!deprs.isEmpty()) {
                 CommentHelper ch = utils.getCommentHelper(typeElement);
                 DocTree dt = deprs.get(0);
@@ -726,7 +727,7 @@ public TypeElement getTypeElement() {
     }
 
     protected Content getMemberDetails(Content content) {
-        var section = HtmlTree.SECTION(HtmlStyle.details, content);
+        var section = HtmlTree.SECTION(HtmlStyles.details, content);
         // The following id is required by the Navigation bar
         if (utils.isAnnotationInterface(typeElement)) {
             section.setId(HtmlIds.ANNOTATION_TYPE_ELEMENT_DETAIL);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriter.java
index 5bddac0622c4f..cdae0e8d9115e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriter.java
@@ -39,20 +39,21 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlId;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.DocletException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.IndexItem;
 import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.Entity;
+import jdk.javadoc.internal.html.HtmlId;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 
 /**
@@ -328,14 +329,14 @@ Content getHeader() {
          bodyContents.setHeader(getHeader(PageMode.CONSTANT_VALUES));
          Content titleContent = contents.constantsSummaryTitle;
          var pHeading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
-                 HtmlStyle.title, titleContent);
-         var div = HtmlTree.DIV(HtmlStyle.header, pHeading);
+                 HtmlStyles.title, titleContent);
+         var div = HtmlTree.DIV(HtmlStyles.header, pHeading);
          bodyContents.addMainContent(div);
          return body;
     }
 
     Content getContentsHeader() {
-        return HtmlTree.UL(HtmlStyle.contentsList);
+        return HtmlTree.UL(HtmlStyles.contentsList);
     }
 
     void addLinkToTableOfContents(String abbrevPackageName) {
@@ -361,14 +362,14 @@ void addPackageGroup(String abbrevPackageName, Content toContent) {
         var heading = HtmlTree.HEADING_TITLE(
                 Headings.ConstantsSummary.PACKAGE_HEADING,
                 headingContent);
-        summarySection = HtmlTree.SECTION(HtmlStyle.constantsSummary, heading)
+        summarySection = HtmlTree.SECTION(HtmlStyles.constantsSummary, heading)
                 .setId(anchorName);
 
         toContent.add(summarySection);
     }
 
      Content getClassConstantHeader() {
-        return HtmlTree.UL(HtmlStyle.blockList);
+        return HtmlTree.UL(HtmlStyles.blockList);
     }
 
      void addClassConstant(Content fromClassConstant) {
@@ -394,10 +395,10 @@ void addConstantMembers(TypeElement typeElement, Collection<VariableElement> fie
         }
         caption.add(classLink);
 
-        var table = new Table<Void>(HtmlStyle.summaryTable)
+        var table = new Table<Void>(HtmlStyles.summaryTable)
                 .setCaption(caption)
                 .setHeader(constantsTableHeader)
-                .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colSecond, HtmlStyle.colLast);
+                .setColumnStyles(HtmlStyles.colFirst, HtmlStyles.colSecond, HtmlStyles.colLast);
 
         for (VariableElement field : fields) {
             table.addRow(getTypeColumn(field), getNameColumn(field), getValue(field));
@@ -413,7 +414,7 @@ void addConstantMembers(TypeElement typeElement, Collection<VariableElement> fie
      */
     private Content getTypeColumn(VariableElement member) {
         Content typeContent = new ContentBuilder();
-        var code = new HtmlTree(TagName.CODE)
+        var code = new HtmlTree(HtmlTag.CODE)
                 .setId(htmlIds.forMember(currentTypeElement, member));
         for (Modifier mod : member.getModifiers()) {
             code.add(Text.of(mod.toString()))
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriter.java
index c5fb332a0087b..11975404a5564 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriter.java
@@ -33,15 +33,16 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.TypeParameterElement;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlId;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.BaseOptions;
 import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.Entity;
+import jdk.javadoc.internal.html.HtmlStyle;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 
 /**
@@ -111,7 +112,7 @@ protected void buildConstructorDoc(Content target) {
             for (Element constructor : constructors) {
                 currentConstructor = (ExecutableElement)constructor;
                 Content constructorContent = getConstructorHeaderContent(currentConstructor);
-                Content div = HtmlTree.DIV(HtmlStyle.horizontalScroll);
+                Content div = HtmlTree.DIV(HtmlStyles.horizontalScroll);
                 buildSignature(div);
                 buildDeprecationInfo(div);
                 buildPreviewInfo(div);
@@ -193,7 +194,7 @@ public Content getMemberSummaryHeader(Content content) {
 
     @Override
     public void buildSummary(Content summariesList, Content content) {
-        writer.addSummary(HtmlStyle.constructorSummary,
+        writer.addSummary(HtmlStyles.constructorSummary,
                 HtmlIds.CONSTRUCTOR_SUMMARY, summariesList, content);
     }
 
@@ -216,7 +217,7 @@ protected Content getConstructorHeaderContent(ExecutableElement constructor) {
             heading.setId(anchors.getLast());
         }
         content.add(heading);
-        return HtmlTree.SECTION(HtmlStyle.detail, content)
+        return HtmlTree.SECTION(HtmlStyles.detail, content)
                 .setId(anchors.getFirst());
     }
 
@@ -247,7 +248,7 @@ protected void addTags(ExecutableElement constructor, Content constructorContent
 
     protected Content getConstructorDetails(Content memberDetailsHeader, Content memberDetails) {
         return writer.getDetailsListItem(
-                HtmlTree.SECTION(HtmlStyle.constructorDetails)
+                HtmlTree.SECTION(HtmlStyles.constructorDetails)
                         .setId(HtmlIds.CONSTRUCTOR_DETAIL)
                         .add(memberDetailsHeader)
                         .add(memberDetails));
@@ -279,14 +280,14 @@ protected Table<Element> createSummaryTable() {
         List<HtmlStyle> bodyRowStyles;
 
         if (threeColumnSummary()) {
-            bodyRowStyles = Arrays.asList(HtmlStyle.colFirst, HtmlStyle.colConstructorName,
-                    HtmlStyle.colLast);
+            bodyRowStyles = Arrays.asList(HtmlStyles.colFirst, HtmlStyles.colConstructorName,
+                    HtmlStyles.colLast);
         } else {
-            bodyRowStyles = Arrays.asList(HtmlStyle.colConstructorName, HtmlStyle.colLast);
+            bodyRowStyles = Arrays.asList(HtmlStyles.colConstructorName, HtmlStyles.colLast);
         }
 
         return new Table<Element>(
-                HtmlStyle.summaryTable)
+                HtmlStyles.summaryTable)
                 .setCaption(contents.constructors)
                 .setHeader(getSummaryTableHeader(typeElement))
                 .setColumnStyles(bodyRowStyles);
@@ -299,7 +300,7 @@ public void addInheritedSummaryLabel(TypeElement typeElement, Content content) {
     @Override
     protected void addSummaryType(Element member, Content content) {
         if (threeColumnSummary()) {
-            var code = new HtmlTree(TagName.CODE);
+            var code = new HtmlTree(HtmlTag.CODE);
             if (utils.isProtected(member)) {
                 code.add("protected ");
             } else if (utils.isPrivate(member)) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java
index 3afccd55ba1a4..f098a8dc8f3a2 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java
@@ -31,11 +31,12 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
 import jdk.javadoc.internal.doclets.toolkit.Resources;
 import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.Entity;
+import jdk.javadoc.internal.html.Text;
 
 
 /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java
index 684e198ef1b75..3f58ef90ad50a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java
@@ -32,11 +32,13 @@
 import com.sun.source.doctree.DeprecatedTree;
 
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.util.DeprecatedAPIListBuilder;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.HtmlStyle;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * Generate File to list all the deprecated classes and class members with the
@@ -79,7 +81,7 @@ protected String getTitleKey() {
     protected void addContentSelectors(Content target) {
         List<String> releases = builder.releases;
         if (releases.size() > 1) {
-            Content tabs = HtmlTree.DIV(HtmlStyle.checkboxes, contents.getContent(
+            Content tabs = HtmlTree.DIV(HtmlStyles.checkboxes, contents.getContent(
                     "doclet.Deprecated_API_Checkbox_Label"));
             // Table column ids are 1-based
             int index = 1;
@@ -125,7 +127,7 @@ protected void addComments(Element e, Content desc) {
     protected void addTableTabs(Table<Element> table, String headingKey) {
         List<String> releases = builder.releases;
         if (!releases.isEmpty()) {
-            table.setGridStyle(HtmlStyle.threeColumnReleaseSummary);
+            table.setGridStyle(HtmlStyles.threeColumnReleaseSummary);
         }
         if (releases.size() > 1) {
             table.setDefaultTab(getTableCaption(headingKey))
@@ -170,7 +172,7 @@ protected HtmlStyle[] getColumnStyles() {
         if (releases.isEmpty()) {
             return super.getColumnStyles();
         }
-        return new HtmlStyle[]{ HtmlStyle.colSummaryItemName, HtmlStyle.colSecond, HtmlStyle.colLast };
+        return new HtmlStyle[]{ HtmlStyles.colSummaryItemName, HtmlStyles.colSecond, HtmlStyles.colLast };
     }
 
     @Override
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandler.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandler.java
index cd2633d004d91..5b39b08c22b9f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandler.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandler.java
@@ -25,12 +25,23 @@
 
 package jdk.javadoc.internal.doclets.formats.html;
 
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ModuleElement;
+import javax.lang.model.element.PackageElement;
+import javax.tools.JavaFileManager.Location;
+
 import com.sun.source.doctree.DocTree;
 import com.sun.source.doctree.EndElementTree;
 import com.sun.source.doctree.StartElementTree;
 import com.sun.source.util.DocTreeFactory;
+
+import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
 import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
 import jdk.javadoc.internal.doclets.toolkit.DocFileElement;
 import jdk.javadoc.internal.doclets.toolkit.DocletException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
@@ -38,19 +49,9 @@
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
-import jdk.javadoc.internal.doclint.HtmlTag;
-
-import javax.lang.model.element.Element;
-import javax.lang.model.element.ModuleElement;
-import javax.lang.model.element.PackageElement;
-import javax.tools.JavaFileManager.Location;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.List;
-
-import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
 
 /**
  * A class to handle any files, including HTML files, found in the {@code doc-files}
@@ -249,7 +250,7 @@ private List<? extends DocTree> getLocalHeaderTags(List<? extends DocTree> dtree
                 switch (dt.getKind()) {
                     case START_ELEMENT:
                         StartElementTree startElem = (StartElementTree)dt;
-                        switch (HtmlTag.get(startElem.getName())) {
+                        switch (HtmlTag.of(startElem.getName())) {
                             case HEAD:
                                 inHead = true;
                                 break;
@@ -267,7 +268,7 @@ private List<? extends DocTree> getLocalHeaderTags(List<? extends DocTree> dtree
                         break;
                     case END_ELEMENT:
                         EndElementTree endElem = (EndElementTree)dt;
-                        switch (HtmlTag.get(endElem.getName())) {
+                        switch (HtmlTag.of(endElem.getName())) {
                             case HEAD:
                                 inHead = false;
                                 break loop;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriter.java
index d60fd355027cb..ff82b95fe4d8a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriter.java
@@ -29,12 +29,13 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.BaseOptions;
 import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * Writes enum constant documentation in HTML format.
@@ -75,7 +76,7 @@ protected void buildEnumConstant(Content target) {
             for (Element enumConstant : enumConstants) {
                 currentElement = (VariableElement)enumConstant;
                 Content enumConstantContent = getEnumConstantsHeader(currentElement);
-                Content div = HtmlTree.DIV(HtmlStyle.horizontalScroll);
+                Content div = HtmlTree.DIV(HtmlStyles.horizontalScroll);
                 buildSignature(div);
                 buildDeprecationInfo(div);
                 buildPreviewInfo(div);
@@ -138,7 +139,7 @@ public Content getMemberSummaryHeader(Content content) {
 
     @Override
     public void buildSummary(Content summariesList, Content content) {
-        writer.addSummary(HtmlStyle.constantsSummary,
+        writer.addSummary(HtmlStyles.constantsSummary,
                 HtmlIds.ENUM_CONSTANT_SUMMARY, summariesList, content);
     }
 
@@ -156,7 +157,7 @@ protected Content getEnumConstantsHeader(VariableElement enumConstant) {
         var heading = HtmlTree.HEADING(Headings.TypeDeclaration.MEMBER_HEADING,
                 Text.of(name(enumConstant)));
         enumConstantsContent.add(heading);
-        return HtmlTree.SECTION(HtmlStyle.detail, enumConstantsContent)
+        return HtmlTree.SECTION(HtmlStyles.detail, enumConstantsContent)
                 .setId(htmlIds.forMember(enumConstant));
     }
 
@@ -186,7 +187,7 @@ protected void addTags(VariableElement enumConstant, Content content) {
     protected Content getEnumConstantsDetails(Content memberDetailsHeader,
             Content content) {
         return writer.getDetailsListItem(
-                HtmlTree.SECTION(HtmlStyle.constantDetails)
+                HtmlTree.SECTION(HtmlStyles.constantDetails)
                         .setId(HtmlIds.ENUM_CONSTANT_DETAIL)
                         .add(memberDetailsHeader)
                         .add(content));
@@ -206,10 +207,10 @@ public TableHeader getSummaryTableHeader(Element member) {
 
     @Override
     protected Table<Element> createSummaryTable() {
-        return new Table<Element>(HtmlStyle.summaryTable)
+        return new Table<Element>(HtmlStyles.summaryTable)
                 .setCaption(contents.getContent("doclet.Enum_Constants"))
                 .setHeader(getSummaryTableHeader(typeElement))
-                .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast);
+                .setColumnStyles(HtmlStyles.colFirst, HtmlStyles.colLast);
     }
 
     @Override
@@ -220,7 +221,7 @@ public void addInheritedSummaryLabel(TypeElement typeElement, Content content) {
     protected void addSummaryLink(HtmlLinkInfo.Kind context, TypeElement typeElement, Element member,
                                   Content content) {
         Content memberLink = writer.getDocLink(context, utils.getEnclosingTypeElement(member), member,
-                name(member), HtmlStyle.memberNameLink);
+                name(member), HtmlStyles.memberNameLink);
         var code = HtmlTree.CODE(memberLink);
         content.add(code);
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ExternalSpecsWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ExternalSpecsWriter.java
index cd66876997cd9..0115de5558fba 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ExternalSpecsWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ExternalSpecsWriter.java
@@ -49,15 +49,16 @@
 
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
 import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.DocFileElement;
 import jdk.javadoc.internal.doclets.toolkit.OverviewElement;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.IndexItem;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.toList;
@@ -103,7 +104,7 @@ public void buildPage() throws DocFileIOException {
         addExternalSpecs(mainContent);
         body.add(new BodyContents()
                 .setHeader(getHeader(PageMode.EXTERNAL_SPECS))
-                .addMainContent(HtmlTree.DIV(HtmlStyle.header,
+                .addMainContent(HtmlTree.DIV(HtmlStyles.header,
                         HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING,
                                 contents.getContent("doclet.External_Specifications"))))
                 .addMainContent(mainContent)
@@ -192,10 +193,10 @@ protected void addExternalSpecs(Content content) {
         }
         var hostNamesList = new ArrayList<>(hostNamesSet);
 
-        var table = new Table<URI>(HtmlStyle.summaryTable)
+        var table = new Table<URI>(HtmlStyles.summaryTable)
                 .setCaption(contents.externalSpecifications)
                 .setHeader(new TableHeader(contents.specificationLabel, contents.referencedIn))
-                .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast)
+                .setColumnStyles(HtmlStyles.colFirst, HtmlStyles.colLast)
                 .setId(HtmlIds.EXTERNAL_SPECS);
         if ((hostNamesList.size() + (noHost ? 1 : 0)) > 1) {
             for (var host : hostNamesList) {
@@ -211,7 +212,7 @@ protected void addExternalSpecs(Content content) {
         for (List<IndexItem> searchIndexItems : searchIndexMap.values()) {
             IndexItem ii = searchIndexItems.get(0);
             Content specName = createSpecLink(ii);
-            Content referencesList = HtmlTree.UL(HtmlStyle.refList, searchIndexItems,
+            Content referencesList = HtmlTree.UL(HtmlStyles.refList, searchIndexItems,
                     item -> HtmlTree.LI(createLink(item)));
             Content references = searchIndexItems.size() < USE_DETAILS_THRESHHOLD
                     ? referencesList
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriter.java
index c72521b73b288..213078712ebf0 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriter.java
@@ -32,13 +32,15 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.BaseOptions;
 import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.Entity;
+import jdk.javadoc.internal.html.HtmlStyle;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * Writes field documentation in HTML format.
@@ -85,7 +87,7 @@ protected void buildFieldDoc(Content target) {
             for (Element element : fields) {
                 currentElement = (VariableElement)element;
                 Content fieldContent = getFieldHeaderContent(currentElement);
-                Content div = HtmlTree.DIV(HtmlStyle.horizontalScroll);
+                Content div = HtmlTree.DIV(HtmlStyles.horizontalScroll);
                 buildSignature(div);
                 buildDeprecationInfo(div);
                 buildPreviewInfo(div);
@@ -147,7 +149,7 @@ public Content getMemberSummaryHeader(Content content) {
 
     @Override
     public void buildSummary(Content summariesList, Content content) {
-        writer.addSummary(HtmlStyle.fieldSummary,
+        writer.addSummary(HtmlStyles.fieldSummary,
                 HtmlIds.FIELD_SUMMARY, summariesList, content);
     }
 
@@ -165,7 +167,7 @@ protected Content getFieldHeaderContent(VariableElement field) {
         var heading = HtmlTree.HEADING(Headings.TypeDeclaration.MEMBER_HEADING,
                 Text.of(name(field)));
         content.add(heading);
-        return HtmlTree.SECTION(HtmlStyle.detail, content)
+        return HtmlTree.SECTION(HtmlStyles.detail, content)
                 .setId(htmlIds.forMember(field));
     }
 
@@ -196,7 +198,7 @@ protected void addTags(VariableElement field, Content fieldContent) {
 
     protected Content getFieldDetails(Content memberDetailsHeaderContent, Content memberContent) {
         return writer.getDetailsListItem(
-                HtmlTree.SECTION(HtmlStyle.fieldDetails)
+                HtmlTree.SECTION(HtmlStyles.fieldDetails)
                         .setId(HtmlIds.FIELD_DETAIL)
                         .add(memberDetailsHeaderContent)
                         .add(memberContent));
@@ -217,10 +219,10 @@ public TableHeader getSummaryTableHeader(Element member) {
 
     @Override
     protected Table<Element> createSummaryTable() {
-        List<HtmlStyle> bodyRowStyles = Arrays.asList(HtmlStyle.colFirst, HtmlStyle.colSecond,
-                HtmlStyle.colLast);
+        List<HtmlStyle> bodyRowStyles = Arrays.asList(HtmlStyles.colFirst, HtmlStyles.colSecond,
+                HtmlStyles.colLast);
 
-        return new Table<Element>(HtmlStyle.summaryTable)
+        return new Table<Element>(HtmlStyles.summaryTable)
                 .setCaption(contents.fields)
                 .setHeader(getSummaryTableHeader(typeElement))
                 .setColumnStyles(bodyRowStyles);
@@ -252,7 +254,7 @@ public void addInheritedSummaryLabel(TypeElement typeElement, Content content) {
     protected void addSummaryLink(HtmlLinkInfo.Kind context, TypeElement typeElement, Element member,
                                   Content content) {
         Content memberLink = writer.getDocLink(context, typeElement , member, name(member),
-                HtmlStyle.memberNameLink);
+                HtmlStyles.memberNameLink);
         var code = HtmlTree.CODE(memberLink);
         content.add(code);
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Headings.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Headings.java
index 84b2fda4da413..2dadfe3cfa67a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Headings.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Headings.java
@@ -25,7 +25,7 @@
 
 package jdk.javadoc.internal.doclets.formats.html;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
+import jdk.javadoc.internal.html.HtmlTag;
 
 /**
  * Aliases for HTML heading tags (H1..H6) for different kinds of pages.
@@ -34,25 +34,25 @@ class Headings {
     /**
      * Standard top-level heading for the page title for all pages.
      */
-    static final TagName PAGE_TITLE_HEADING = TagName.H1;
+    static final HtmlTag PAGE_TITLE_HEADING = HtmlTag.H1;
 
     /**
      * Standard second-level heading for sundry pages that do
      * not have their own page group.
      */
-    static final TagName CONTENT_HEADING = TagName.H2;
+    static final HtmlTag CONTENT_HEADING = HtmlTag.H2;
 
     /**
      * Standard third-level heading for sundry pages that do
      * not have their own page group.
      */
-    static final TagName SUB_HEADING = TagName.H3;
+    static final HtmlTag SUB_HEADING = HtmlTag.H3;
 
     /**
      * Headings for the page for a module declaration.
      */
     static class ModuleDeclaration {
-        static final TagName SUMMARY_HEADING = TagName.H2;
+        static final HtmlTag SUMMARY_HEADING = HtmlTag.H2;
     }
 
     /**
@@ -64,31 +64,31 @@ static class TypeDeclaration {
          * Heading for the different summary lists:
          * Field Summary, Constructor Summary, Method Summary, etc.
          */
-        static final TagName SUMMARY_HEADING = TagName.H2;
+        static final HtmlTag SUMMARY_HEADING = HtmlTag.H2;
 
         /**
          * Subheading within a summary for the inherited elements:
          * inherited methods, etc
          */
-        static final TagName INHERITED_SUMMARY_HEADING = TagName.H3;
+        static final HtmlTag INHERITED_SUMMARY_HEADING = HtmlTag.H3;
 
         /**
          * Heading for the different detail lists:
          * Field Details, Constructor Details, Method Details, etc.
          */
-        static final TagName DETAILS_HEADING = TagName.H2;
+        static final HtmlTag DETAILS_HEADING = HtmlTag.H2;
 
         /**
          * Subheading with a Details list for an individual element.
          */
-        static final TagName MEMBER_HEADING = TagName.H3;
+        static final HtmlTag MEMBER_HEADING = HtmlTag.H3;
     }
 
     /**
      * Headings for the Constants Summary page.
      */
     static class ConstantsSummary {
-        static final TagName PACKAGE_HEADING = TagName.H2;
+        static final HtmlTag PACKAGE_HEADING = HtmlTag.H2;
     }
 
     /**
@@ -98,28 +98,28 @@ static class SerializedForm {
         /**
          * Heading for the package name, preceding a list of types.
          */
-        static final TagName PACKAGE_HEADING = TagName.H2;
+        static final HtmlTag PACKAGE_HEADING = HtmlTag.H2;
 
         /**
          * Heading for a type name within a package.
          */
-        static final TagName CLASS_HEADING = TagName.H3;
+        static final HtmlTag CLASS_HEADING = HtmlTag.H3;
 
         /**
          * Subheading for info within a type.
          */
-        static final TagName CLASS_SUBHEADING = TagName.H4;
+        static final HtmlTag CLASS_SUBHEADING = HtmlTag.H4;
 
         /**
          * Heading for an individual member element within a type.
          */
-        static final TagName MEMBER_HEADING = TagName.H5;
+        static final HtmlTag MEMBER_HEADING = HtmlTag.H5;
     }
 
     /**
      * Headings for a type Use page.
      */
     static class TypeUse {
-        static final TagName SUMMARY_HEADING = TagName.H2;
+        static final HtmlTag SUMMARY_HEADING = HtmlTag.H2;
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java
index 1f396d49eeda0..22e778d39868f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java
@@ -27,17 +27,18 @@
 
 import java.util.List;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlId;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlId;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 
 /**
@@ -103,13 +104,13 @@ protected void addHelpFileContents(Content content) {
         var mainHeading = getContent("doclet.help.main_heading");
         tableOfContents.addLink(HtmlIds.TOP_OF_PAGE, mainHeading);
         tableOfContents.pushNestedList();
-        content.add(HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, HtmlStyle.title, mainHeading))
-                .add(new HtmlTree(TagName.HR))
+        content.add(HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, HtmlStyles.title, mainHeading))
+                .add(new HtmlTree(HtmlTag.HR))
                 .add(getNavigationSection())
-                .add(new HtmlTree(TagName.HR))
+                .add(new HtmlTree(HtmlTag.HR))
                 .add(getPageKindSection())
-                .add(new HtmlTree(TagName.HR))
-                .add(HtmlTree.SPAN(HtmlStyle.helpFootnote,
+                .add(new HtmlTree(HtmlTag.HR))
+                .add(HtmlTree.SPAN(HtmlStyles.helpFootnote,
                         getContent("doclet.help.footnote")));
         tableOfContents.popNestedList();
     }
@@ -129,7 +130,7 @@ private Content getNavigationSection() {
         Content content = new ContentBuilder();
 
         Content navHeading = contents.getContent("doclet.help.navigation.head");
-        var navSection = HtmlTree.DIV(HtmlStyle.subTitle)
+        var navSection = HtmlTree.DIV(HtmlStyles.subTitle)
                 .add(HtmlTree.HEADING(Headings.CONTENT_HEADING, navHeading).setId(HtmlIds.HELP_NAVIGATION))
                 .add(contents.getContent("doclet.help.navigation.intro", overviewLink));
         if (options.createIndex()) {
@@ -153,7 +154,7 @@ private Content getNavigationSection() {
         if (options.createIndex()) {
             section = newHelpSection(getContent("doclet.help.search.head"), PageMode.SEARCH);
             var searchIntro = HtmlTree.P(getContent("doclet.help.search.intro"));
-            var searchExamples = HtmlTree.OL(HtmlStyle.tocList);
+            var searchExamples = HtmlTree.OL(HtmlStyles.tocList);
             for (String[] example : SEARCH_EXAMPLES) {
                 searchExamples.add(HtmlTree.LI(
                         getContent("doclet.help.search.example",
@@ -190,7 +191,7 @@ private Content getNavigationSection() {
      */
     private Content getPageKindSection() {
         Content pageKindsHeading = contents.getContent("doclet.help.page_kinds.head");
-        var pageKindsSection = HtmlTree.DIV(HtmlStyle.subTitle)
+        var pageKindsSection = HtmlTree.DIV(HtmlStyles.subTitle)
                 .add(HtmlTree.HEADING(Headings.CONTENT_HEADING, pageKindsHeading).setId(HtmlIds.HELP_PAGES))
                 .add(contents.getContent("doclet.help.page_kinds.intro"));
 
@@ -235,7 +236,7 @@ private Content getPageKindSection() {
 
         // Class/interface
         Content notes = new ContentBuilder(
-                HtmlTree.SPAN(HtmlStyle.helpNote, getContent("doclet.help.class_interface.note")),
+                HtmlTree.SPAN(HtmlStyles.helpNote, getContent("doclet.help.class_interface.note")),
                 Text.of(" "),
                 getContent("doclet.help.class_interface.anno"),
                 Text.of(" "),
@@ -254,7 +255,7 @@ private Content getPageKindSection() {
                         getContent("doclet.help.class_interface.implementations"),
                         getContent("doclet.help.class_interface.declaration"),
                         getContent("doclet.help.class_interface.description")))
-                .add(new HtmlTree(TagName.BR))
+                .add(new HtmlTree(HtmlTag.BR))
                 .add(newHelpSectionList(
                         contents.nestedClassSummary,
                         contents.enumConstantSummary,
@@ -264,7 +265,7 @@ private Content getPageKindSection() {
                         contents.methodSummary,
                         contents.annotateTypeRequiredMemberSummaryLabel,
                         contents.annotateTypeOptionalMemberSummaryLabel))
-                .add(new HtmlTree(TagName.BR))
+                .add(new HtmlTree(HtmlTag.BR))
                 .add(newHelpSectionList(
                         contents.enumConstantDetailLabel,
                         contents.fieldDetailsLabel,
@@ -412,7 +413,7 @@ private Content getContent(String key, Object arg1, Object arg2) {
     private HtmlTree newHelpSection(Content headingContent, HtmlId id) {
         tableOfContents.addLink(id, headingContent);
 
-        return HtmlTree.SECTION(HtmlStyle.helpSection,
+        return HtmlTree.SECTION(HtmlStyles.helpSection,
                 HtmlTree.HEADING(Headings.SUB_HEADING, headingContent))
                 .setId(id);
     }
@@ -422,7 +423,7 @@ private HtmlTree newHelpSection(Content headingContent, Navigation.PageMode pm)
     }
 
     private HtmlTree newHelpSectionList(Content first, Content... rest) {
-        var list = HtmlTree.UL(HtmlStyle.helpSectionList, HtmlTree.LI(first));
+        var list = HtmlTree.UL(HtmlStyles.helpSectionList, HtmlTree.LI(first));
         List.of(rest).forEach(i -> list.add(HtmlTree.LI(i)));
         return list;
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
index 2b8b6cfe058d4..235a0361b9233 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
@@ -94,20 +94,10 @@
 import jdk.internal.org.commonmark.renderer.html.HtmlNodeRendererFactory;
 import jdk.internal.org.commonmark.renderer.html.HtmlRenderer;
 import jdk.internal.org.commonmark.renderer.html.HtmlWriter;
-
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
 import jdk.javadoc.internal.doclets.formats.html.markup.Head;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlDocument;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlId;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.formats.html.markup.Links;
-import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
-import jdk.javadoc.internal.doclets.formats.html.markup.Script;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
-import jdk.javadoc.internal.doclets.formats.html.markup.TextBuilder;
 import jdk.javadoc.internal.doclets.formats.html.taglets.Taglet;
 import jdk.javadoc.internal.doclets.formats.html.taglets.TagletWriter;
 import jdk.javadoc.internal.doclets.toolkit.DocFileElement;
@@ -126,7 +116,17 @@
 import jdk.javadoc.internal.doclets.toolkit.util.Utils.DeclarationPreviewLanguageFeatures;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils.ElementFlag;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils.PreviewSummary;
-import jdk.javadoc.internal.doclint.HtmlTag;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.Entity;
+import jdk.javadoc.internal.html.HtmlId;
+import jdk.javadoc.internal.html.HtmlStyle;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.RawHtml;
+import jdk.javadoc.internal.html.Script;
+import jdk.javadoc.internal.html.Text;
+import jdk.javadoc.internal.html.TextBuilder;
 
 import static com.sun.source.doctree.DocTree.Kind.COMMENT;
 import static com.sun.source.doctree.DocTree.Kind.START_ELEMENT;
@@ -361,7 +361,7 @@ protected void addTagsInfo(Element e, Content content) {
         if (options.noComment()) {
             return;
         }
-        var dl = HtmlTree.DL(HtmlStyle.notes);
+        var dl = HtmlTree.DL(HtmlStyles.notes);
         if (utils.isMethod(e)) {
             addMethodInfo((ExecutableElement)e, dl);
         }
@@ -610,7 +610,7 @@ private String getHeadingText(Content c) {
             var contents = cb.getContents();
             if (!contents.isEmpty()) {
                 var first = contents.get(0);
-                if (first instanceof HtmlTree htmlTree && htmlTree.tagName.equals(TagName.H1)) {
+                if (first instanceof HtmlTree htmlTree && htmlTree.tag.equals(HtmlTag.H1)) {
                     for (var c2 : htmlTree.getContents()) {
                         if (c2 instanceof Text t) {
                             sb.append(t.toString());
@@ -685,8 +685,8 @@ public HtmlTree getFooter() {
         return (bottom == null || bottom.isEmpty())
                 ? null
                 : HtmlTree.FOOTER()
-                    .add(new HtmlTree(TagName.HR))
-                    .add(HtmlTree.P(HtmlStyle.legalCopy,
+                    .add(new HtmlTree(HtmlTag.HR))
+                    .add(HtmlTree.P(HtmlStyles.legalCopy,
                             HtmlTree.SMALL(
                                     RawHtml.of(replaceDocRootDir(bottom)))));
     }
@@ -917,7 +917,7 @@ public Content getTypeParameterLinks(HtmlLinkInfo linkInfo) {
      * @return the link
      */
     public Content getCrossClassLink(TypeElement classElement, String refMemName,
-                                    Content label, HtmlStyle style, boolean code) {
+                                     Content label, HtmlStyle style, boolean code) {
         if (classElement != null) {
             String className = utils.getSimpleName(classElement);
             PackageElement packageElement = utils.containingPackage(classElement);
@@ -1047,7 +1047,7 @@ public TypeElement getCurrentPageElement() {
      * @param content the content to which the link with be added
      */
     public void addPreQualifiedStrongClassLink(HtmlLinkInfo.Kind context, TypeElement typeElement, Content content) {
-        addPreQualifiedClassLink(context, typeElement, HtmlStyle.typeNameLink, content);
+        addPreQualifiedClassLink(context, typeElement, HtmlStyles.typeNameLink, content);
     }
 
     /**
@@ -1255,10 +1255,10 @@ private void addCommentTags(Element element, List<? extends DocTree> tags, boole
         Content result = commentTagsToContent(element, tags, first, inSummary);
         if (!result.isEmpty()) {
             if (depr) {
-                div = HtmlTree.DIV(HtmlStyle.deprecationComment, result);
+                div = HtmlTree.DIV(HtmlStyles.deprecationComment, result);
                 target.add(div);
             } else {
-                div = HtmlTree.DIV(HtmlStyle.block, result);
+                div = HtmlTree.DIV(HtmlStyles.block, result);
                 target.add(div);
             }
         }
@@ -1277,7 +1277,7 @@ boolean ignoreNonInlineTag(DocTree dtree, List<Name> openTags) {
         }
 
         if (name != null) {
-            HtmlTag htmlTag = HtmlTag.get(name);
+            HtmlTag htmlTag = HtmlTag.of(name);
             if (htmlTag != null) {
                 if (htmlTag.blockType != HtmlTag.BlockType.INLINE) {
                     return true;
@@ -1944,9 +1944,9 @@ private boolean shouldRedirectRelativeLinks(Element element) {
     public Content invalidTagOutput(String summary, Optional<Content> detail) {
         messages.setContainsDiagnosticMarkers();
         if (detail.isEmpty() || detail.get().isEmpty()) {
-            return HtmlTree.SPAN(HtmlStyle.invalidTag, Text.of(summary));
+            return HtmlTree.SPAN(HtmlStyles.invalidTag, Text.of(summary));
         }
-        return HtmlTree.DETAILS(HtmlStyle.invalidTag)
+        return HtmlTree.DETAILS(HtmlStyles.invalidTag)
                 .add(HtmlTree.SUMMARY(Text.of(summary)))
                 .add(HtmlTree.PRE(detail.get()));
     }
@@ -2405,7 +2405,7 @@ static String getGenerator(Class<?> clazz) {
      * @return an HtmlTree for the BODY tag
      */
     public HtmlTree getBody(String title) {
-        var body = new HtmlTree(TagName.BODY).setStyle(getBodyStyle());
+        var body = new HtmlTree(HtmlTag.BODY).setStyle(getBodyStyle());
 
         this.winTitle = title;
         // Don't print windowtitle script for overview-frame, allclasses-frame
@@ -2423,7 +2423,7 @@ public HtmlStyle getBodyStyle() {
                 .replaceAll("^(Module|Package|Class)$", "$1Declaration")
                 .replace("API", "Api");
         String page = kind.substring(0, 1).toLowerCase(Locale.US) + kind.substring(1) + "Page";
-        return HtmlStyle.valueOf(page);
+        return HtmlStyles.valueOf(page);
     }
 
     /**
@@ -2473,16 +2473,16 @@ private List<DocPath> getStylesheets(Element element) throws DocFileIOException
 
     public void addPreviewSummary(Element forWhat, Content target) {
         if (utils.isPreviewAPI(forWhat)) {
-            var div = HtmlTree.DIV(HtmlStyle.block);
-            div.add(HtmlTree.SPAN(HtmlStyle.previewLabel, contents.previewPhrase));
+            var div = HtmlTree.DIV(HtmlStyles.block);
+            div.add(HtmlTree.SPAN(HtmlStyles.previewLabel, contents.previewPhrase));
             target.add(div);
         }
     }
 
     public void addRestrictedSummary(Element forWhat, Content target) {
         if (utils.isRestrictedAPI(forWhat)) {
-            var div = HtmlTree.DIV(HtmlStyle.block);
-            div.add(HtmlTree.SPAN(HtmlStyle.restrictedLabel, contents.restrictedPhrase));
+            var div = HtmlTree.DIV(HtmlStyles.block);
+            div.add(HtmlTree.SPAN(HtmlStyles.restrictedLabel, contents.restrictedPhrase));
             target.add(div);
         }
     }
@@ -2490,7 +2490,7 @@ public void addRestrictedSummary(Element forWhat, Content target) {
     public void addPreviewInfo(Element forWhat, Content target) {
         if (utils.isPreviewAPI(forWhat)) {
             //in Java platform:
-            var previewDiv = HtmlTree.DIV(HtmlStyle.previewBlock);
+            var previewDiv = HtmlTree.DIV(HtmlStyles.previewBlock);
             previewDiv.setId(htmlIds.forPreviewSection(forWhat));
             String name = (switch (forWhat.getKind()) {
                 case PACKAGE, MODULE ->
@@ -2506,14 +2506,14 @@ public void addPreviewInfo(Element forWhat, Content target) {
                                          : "doclet.ReflectivePreviewPlatformLeadingNote";
             Content leadingNote =
                     contents.getContent(leadingNoteKey, nameCode);
-            previewDiv.add(HtmlTree.SPAN(HtmlStyle.previewLabel,
+            previewDiv.add(HtmlTree.SPAN(HtmlStyles.previewLabel,
                                          leadingNote));
             if (!isReflectivePreview) {
                 Content note1 = contents.getContent("doclet.PreviewTrailingNote1", nameCode);
-                previewDiv.add(HtmlTree.DIV(HtmlStyle.previewComment, note1));
+                previewDiv.add(HtmlTree.DIV(HtmlStyles.previewComment, note1));
             }
             Content note2 = contents.getContent("doclet.PreviewTrailingNote2", nameCode);
-            previewDiv.add(HtmlTree.DIV(HtmlStyle.previewComment, note2));
+            previewDiv.add(HtmlTree.DIV(HtmlStyles.previewComment, note2));
             target.add(previewDiv);
         } else if (forWhat.getKind().isClass() || forWhat.getKind().isInterface()) {
             //in custom code:
@@ -2521,12 +2521,12 @@ public void addPreviewInfo(Element forWhat, Content target) {
             if (!previewNotes.isEmpty()) {
                 Name name = forWhat.getSimpleName();
                 var nameCode = HtmlTree.CODE(Text.of(name));
-                var previewDiv = HtmlTree.DIV(HtmlStyle.previewBlock);
+                var previewDiv = HtmlTree.DIV(HtmlStyles.previewBlock);
                 previewDiv.setId(htmlIds.forPreviewSection(forWhat));
                 Content leadingNote = contents.getContent("doclet.PreviewLeadingNote", nameCode);
-                previewDiv.add(HtmlTree.SPAN(HtmlStyle.previewLabel,
+                previewDiv.add(HtmlTree.SPAN(HtmlStyles.previewLabel,
                                              leadingNote));
-                var ul = HtmlTree.UL(HtmlStyle.previewComment);
+                var ul = HtmlTree.UL(HtmlStyles.previewComment);
                 for (Content note : previewNotes) {
                     ul.add(HtmlTree.LI(note));
                 }
@@ -2534,11 +2534,11 @@ public void addPreviewInfo(Element forWhat, Content target) {
                 Content note1 =
                         contents.getContent("doclet.PreviewTrailingNote1",
                                             nameCode);
-                previewDiv.add(HtmlTree.DIV(HtmlStyle.previewComment, note1));
+                previewDiv.add(HtmlTree.DIV(HtmlStyles.previewComment, note1));
                 Content note2 =
                         contents.getContent("doclet.PreviewTrailingNote2",
                                             name);
-                previewDiv.add(HtmlTree.DIV(HtmlStyle.previewComment, note2));
+                previewDiv.add(HtmlTree.DIV(HtmlStyles.previewComment, note2));
                 target.add(previewDiv);
             }
         }
@@ -2601,7 +2601,7 @@ private Content withPreviewFeatures(String key, String className, String feature
                 });
         return contents.getContent(key,
                                    HtmlTree.CODE(Text.of(className)),
-                                   new HtmlTree(TagName.EM).add(featureName),
+                                   new HtmlTree(HtmlTag.EM).add(featureName),
                                    featureCodes);
     }
 
@@ -2640,19 +2640,19 @@ public URI resolveExternalSpecURI(URI specURI) {
     public void addRestrictedInfo(ExecutableElement forWhat, Content target) {
         if (utils.isRestrictedAPI(forWhat)) {
             //in Java platform:
-            var restrictedDiv = HtmlTree.DIV(HtmlStyle.restrictedBlock);
+            var restrictedDiv = HtmlTree.DIV(HtmlStyles.restrictedBlock);
             restrictedDiv.setId(htmlIds.forRestrictedSection(forWhat));
             String name = forWhat.getSimpleName().toString();
             var nameCode = HtmlTree.CODE(Text.of(name));
             String leadingNoteKey = "doclet.RestrictedLeadingNote";
             Content leadingNote =
                     contents.getContent(leadingNoteKey, nameCode);
-            restrictedDiv.add(HtmlTree.SPAN(HtmlStyle.restrictedLabel,
+            restrictedDiv.add(HtmlTree.SPAN(HtmlStyles.restrictedLabel,
                     leadingNote));
             Content note1 = contents.getContent("doclet.RestrictedTrailingNote1", nameCode);
-            restrictedDiv.add(HtmlTree.DIV(HtmlStyle.restrictedComment, note1));
+            restrictedDiv.add(HtmlTree.DIV(HtmlStyles.restrictedComment, note1));
             Content note2 = contents.getContent("doclet.RestrictedTrailingNote2", nameCode);
-            restrictedDiv.add(HtmlTree.DIV(HtmlStyle.restrictedComment, note2));
+            restrictedDiv.add(HtmlTree.DIV(HtmlStyles.restrictedComment, note2));
             target.add(restrictedDiv);
         }
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlIds.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlIds.java
index 48edce573d3c7..1b9896fafa006 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlIds.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlIds.java
@@ -33,6 +33,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
@@ -46,10 +47,10 @@
 import javax.lang.model.type.TypeVariable;
 import javax.lang.model.util.SimpleTypeVisitor9;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlId;
 import jdk.javadoc.internal.doclets.toolkit.util.SummaryAPIListBuilder;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
 import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable;
+import jdk.javadoc.internal.html.HtmlId;
 
 /**
  * Centralized constants and factory methods for HTML ids.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlIndexBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlIndexBuilder.java
index 51831b233361b..fcc9640126a57 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlIndexBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlIndexBuilder.java
@@ -30,11 +30,11 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.SortedSet;
+
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
 import jdk.javadoc.internal.doclets.toolkit.Resources;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
@@ -42,6 +42,7 @@
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.IndexBuilder;
 import jdk.javadoc.internal.doclets.toolkit.util.IndexItem;
+import jdk.javadoc.internal.html.HtmlTree;
 
 /**
  * Extensions to {@code IndexBuilder} to fill in remaining fields
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkFactory.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkFactory.java
index 87a842890a4e9..22af1e4a0244c 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkFactory.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkFactory.java
@@ -43,17 +43,18 @@
 import javax.lang.model.type.WildcardType;
 import javax.lang.model.util.SimpleTypeVisitor14;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
 import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
 import jdk.javadoc.internal.doclets.toolkit.Resources;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils.ElementFlag;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.Entity;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * A factory that returns a link given the information about it.
@@ -377,14 +378,14 @@ protected Content getTypeParameterLinks(HtmlLinkInfo linkInfo) {
         }
         if (!vars.isEmpty()) {
             if (linkInfo.addLineBreakOpportunitiesInTypeParameters()) {
-                links.add(new HtmlTree(TagName.WBR));
+                links.add(new HtmlTree(HtmlTag.WBR));
             }
             links.add("<");
             boolean many = false;
             for (TypeMirror t : vars) {
                 if (many) {
                     links.add(",");
-                    links.add(new HtmlTree(TagName.WBR));
+                    links.add(new HtmlTree(HtmlTag.WBR));
                     if (linkInfo.addLineBreaksInTypeParameters()) {
                         links.add(Text.NL);
                     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkInfo.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkInfo.java
index c2c79e850b846..0b7be8fe6562a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkInfo.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkInfo.java
@@ -31,11 +31,13 @@
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlStyle;
+import jdk.javadoc.internal.html.Text;
 
 
 /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java
index e4543471a69bc..e449ecebf40a2 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java
@@ -29,18 +29,18 @@
 import java.util.Objects;
 
 import jdk.javadoc.internal.doclets.formats.html.markup.Head;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlDocument;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Script;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlAttr;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Script;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * Writes a file that tries to redirect to an alternate page.
@@ -92,7 +92,7 @@ public void buildPage() throws DocFileIOException {
         Script script = new Script("window.location.replace(")
                 .appendStringLiteral(targetPath, '\'')
                 .append(")");
-        var metaRefresh = new HtmlTree(TagName.META)
+        var metaRefresh = new HtmlTree(HtmlTag.META)
                 .put(HtmlAttr.HTTP_EQUIV, "Refresh")
                 .put(HtmlAttr.CONTENT, "0;" + targetPath);
         head.addContent(script.asContent(), HtmlTree.NOSCRIPT(metaRefresh));
@@ -103,7 +103,7 @@ public void buildPage() throws DocFileIOException {
 
         bodyContent.add(HtmlTree.P(HtmlTree.A(targetPath, Text.of(targetPath))));
 
-        var body = new HtmlTree(TagName.BODY).setStyle(HtmlStyle.indexRedirectPage);
+        var body = new HtmlTree(HtmlTag.BODY).setStyle(HtmlStyles.indexRedirectPage);
         var main = HtmlTree.MAIN(bodyContent);
         body.add(main);
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexWriter.java
index ff2761b8ecb9f..ecf1114364217 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexWriter.java
@@ -36,22 +36,21 @@
 import javax.lang.model.element.PackageElement;
 import javax.lang.model.element.TypeElement;
 
-import com.sun.source.doctree.DeprecatedTree;
-
-import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.DocletException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.IndexBuilder;
 import jdk.javadoc.internal.doclets.toolkit.util.IndexItem;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.Entity;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * Generator for either a single index or split index for all
@@ -129,7 +128,7 @@ public void buildPage() throws DocFileIOException {
         addLinksForIndexes(allFirstCharacters, mainContent);
         body.add(new BodyContents()
                 .setHeader(getHeader(PageMode.INDEX))
-                .addMainContent(HtmlTree.DIV(HtmlStyle.header,
+                .addMainContent(HtmlTree.DIV(HtmlStyles.header,
                         HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING,
                                 contents.getContent("doclet.Index"))))
                 .addMainContent(mainContent)
@@ -149,7 +148,7 @@ public void buildPage() throws DocFileIOException {
     protected void addContents(char ch, SortedSet<IndexItem> items, Content content) {
         addHeading(ch, content);
 
-        var dl = HtmlTree.DL(HtmlStyle.index);
+        var dl = HtmlTree.DL(HtmlStyles.index);
         for (IndexItem item : items) {
             addDescription(item, dl);
         }
@@ -164,7 +163,7 @@ protected void addContents(char ch, SortedSet<IndexItem> items, Content content)
      */
     protected void addHeading(char ch, Content content) {
         Content headContent = Text.of(String.valueOf(ch));
-        var heading = HtmlTree.HEADING(Headings.CONTENT_HEADING, HtmlStyle.title, headContent)
+        var heading = HtmlTree.HEADING(Headings.CONTENT_HEADING, HtmlStyles.title, headContent)
                 .setId(HtmlIds.forIndexChar(ch));
         content.add(heading);
     }
@@ -209,7 +208,7 @@ protected void addElementDescription(IndexItem item, Content target) {
 
             case CLASS, ENUM, RECORD, ANNOTATION_TYPE, INTERFACE -> {
                 dt = HtmlTree.DT(getLink(new HtmlLinkInfo(configuration,
-                        HtmlLinkInfo.Kind.SHOW_TYPE_PARAMS_IN_LABEL, (TypeElement) element).style(HtmlStyle.typeNameLink)));
+                        HtmlLinkInfo.Kind.SHOW_TYPE_PARAMS_IN_LABEL, (TypeElement) element).style(HtmlStyles.typeNameLink)));
                 dt.add(" - ");
                 addClassInfo((TypeElement) element, dt);
             }
@@ -217,7 +216,7 @@ protected void addElementDescription(IndexItem item, Content target) {
             case CONSTRUCTOR, METHOD, FIELD, ENUM_CONSTANT -> {
                 TypeElement containingType = item.getContainingTypeElement();
                 dt = HtmlTree.DT(getDocLink(HtmlLinkInfo.Kind.PLAIN, containingType, element,
-                        label, HtmlStyle.memberNameLink));
+                        label, HtmlStyles.memberNameLink));
                 dt.add(" - ");
                 addMemberDesc(element, containingType, dt);
             }
@@ -225,7 +224,7 @@ protected void addElementDescription(IndexItem item, Content target) {
             default -> throw new Error();
         }
         target.add(dt);
-        var dd = new HtmlTree(TagName.DD);
+        var dd = new HtmlTree(HtmlTag.DD);
         if (element.getKind() == ElementKind.MODULE || element.getKind() == ElementKind.PACKAGE) {
             addSummaryComment(element, dd);
         } else {
@@ -258,11 +257,11 @@ protected void addTagDescription(IndexItem item, Content target) {
         String itemPath = pathToRoot.isEmpty() ? "" : pathToRoot.getPath() + "/";
         itemPath += item.getUrl();
         var labelLink = HtmlTree.A(itemPath, Text.of(item.getLabel()));
-        var dt = HtmlTree.DT(labelLink.setStyle(HtmlStyle.searchTagLink));
+        var dt = HtmlTree.DT(labelLink.setStyle(HtmlStyles.searchTagLink));
         dt.add(" - ");
         dt.add(contents.getContent("doclet.Search_tag_in", item.getHolder()));
         target.add(dt);
-        var dd = new HtmlTree(TagName.DD);
+        var dd = new HtmlTree(HtmlTag.DD);
         if (item.getDescription().isEmpty()) {
             dd.add(Entity.NO_BREAK_SPACE);
         } else {
@@ -281,8 +280,8 @@ protected void addTagDescription(IndexItem item, Content target) {
      * @param content the content to which the comment will be added
      */
     protected void addComment(Element element, Content content) {
-        var span = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(element));
-        var div = HtmlTree.DIV(HtmlStyle.deprecationBlock);
+        var span = HtmlTree.SPAN(HtmlStyles.deprecatedLabel, getDeprecatedPhrase(element));
+        var div = HtmlTree.DIV(HtmlStyles.deprecationBlock);
         if (utils.isDeprecated(element)) {
             div.add(span);
             var tags = utils.getDeprecatedTrees(element);
@@ -349,7 +348,7 @@ protected void addLinksForIndexes(List<Character> allFirstCharacters, Content co
             content.add(Entity.NO_BREAK_SPACE);
         }
 
-        content.add(new HtmlTree(TagName.BR));
+        content.add(new HtmlTree(HtmlTag.BR));
         var pageLinks = Stream.of(IndexItem.Category.values())
                 .flatMap(c -> mainIndex.getItems(c).stream())
                 .filter(i -> !(i.isElementItem() || i.isTagItem()))
@@ -361,6 +360,6 @@ protected void addLinksForIndexes(List<Character> allFirstCharacters, Content co
     }
 
     private Content getVerticalSeparator() {
-        return HtmlTree.SPAN(HtmlStyle.verticalSeparator, Text.of("|"));
+        return HtmlTree.SPAN(HtmlStyles.verticalSeparator, Text.of("|"));
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MarkerComments.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MarkerComments.java
index 04888d7cc2f0f..78696cc320ea2 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MarkerComments.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MarkerComments.java
@@ -25,7 +25,7 @@
 
 package jdk.javadoc.internal.doclets.formats.html;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.Comment;
+import jdk.javadoc.internal.html.Comment;
 
 /**
  * Marker comments to identify regions in the generated files.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriter.java
index 521616f982b52..9325bc07a6d99 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriter.java
@@ -35,16 +35,16 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeMirror;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlId;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.BaseOptions;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFinder;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
 import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.Entity;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * Writes method documentation in HTML format.
@@ -107,7 +107,7 @@ protected void buildMethodDoc(Content detailsList) {
             for (Element method : methods) {
                 currentMethod = (ExecutableElement)method;
                 Content methodContent = getMethodHeader(currentMethod);
-                Content div = HtmlTree.DIV(HtmlStyle.horizontalScroll);
+                Content div = HtmlTree.DIV(HtmlStyles.horizontalScroll);
                 buildSignature(div);
                 buildDeprecationInfo(div);
                 buildPreviewInfo(div);
@@ -187,7 +187,7 @@ public Content getMemberSummaryHeader(Content target) {
 
     @Override
     public void buildSummary(Content summariesList, Content content) {
-        writer.addSummary(HtmlStyle.methodSummary,
+        writer.addSummary(HtmlStyles.methodSummary,
                 HtmlIds.METHOD_SUMMARY, summariesList, content);
     }
 
@@ -209,7 +209,7 @@ protected Content getMethodHeader(ExecutableElement method) {
             heading.setId(anchors.getLast());
         }
         content.add(heading);
-        return HtmlTree.SECTION(HtmlStyle.detail, content)
+        return HtmlTree.SECTION(HtmlStyles.detail, content)
                 .setId(anchors.getFirst());
     }
 
@@ -251,13 +251,13 @@ protected void addComments(TypeMirror holderType, ExecutableElement method, Cont
                                             ? utils.getSimpleName(holder)
                                             : utils.getFullyQualifiedName(holder));
                     var codeLink = HtmlTree.CODE(link);
-                    var descriptionFromTypeLabel = HtmlTree.SPAN(HtmlStyle.descriptionFromTypeLabel,
+                    var descriptionFromTypeLabel = HtmlTree.SPAN(HtmlStyles.descriptionFromTypeLabel,
                             utils.isClass(holder)
                                     ? contents.descriptionFromClassLabel
                                     : contents.descriptionFromInterfaceLabel);
                     descriptionFromTypeLabel.add(Entity.NO_BREAK_SPACE);
                     descriptionFromTypeLabel.add(codeLink);
-                    methodContent.add(HtmlTree.DIV(HtmlStyle.block, descriptionFromTypeLabel));
+                    methodContent.add(HtmlTree.DIV(HtmlStyles.block, descriptionFromTypeLabel));
                 }
                 writer.addInlineComment(method, methodContent);
             }
@@ -270,7 +270,7 @@ protected void addTags(ExecutableElement method, Content methodContent) {
 
     protected Content getMethodDetails(Content methodDetailsHeader, Content methodDetails) {
         Content c = new ContentBuilder(methodDetailsHeader, methodDetails);
-        return getMember(HtmlTree.SECTION(HtmlStyle.methodDetails, c)
+        return getMember(HtmlTree.SECTION(HtmlStyles.methodDetails, c)
                 .setId(HtmlIds.METHOD_DETAIL));
     }
 
@@ -289,9 +289,9 @@ public TableHeader getSummaryTableHeader(Element member) {
 
     @Override
     protected Table<Element> createSummaryTable() {
-        return new Table<Element>(HtmlStyle.summaryTable)
+        return new Table<Element>(HtmlStyles.summaryTable)
                 .setHeader(getSummaryTableHeader(typeElement))
-                .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colSecond, HtmlStyle.colLast)
+                .setColumnStyles(HtmlStyles.colFirst, HtmlStyles.colSecond, HtmlStyles.colLast)
                 .setId(HtmlIds.METHOD_SUMMARY_TABLE)
                 .setDefaultTab(contents.getContent("doclet.All_Methods"))
                 .addTab(contents.getContent("doclet.Static_Methods"), utils::isStatic)
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java
index abe6159d1af8e..86e81b77ddd76 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexWriter.java
@@ -31,10 +31,11 @@
 
 import javax.lang.model.element.ModuleElement;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * Generate the module index page "index.html".
@@ -78,9 +79,9 @@ protected void addIndex(Content target) {
 
         if (!groupModuleMap.keySet().isEmpty()) {
             TableHeader tableHeader = new TableHeader(contents.moduleLabel, contents.descriptionLabel);
-            var table = new Table<ModuleElement>(HtmlStyle.summaryTable)
+            var table = new Table<ModuleElement>(HtmlStyles.summaryTable)
                     .setHeader(tableHeader)
-                    .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast)
+                    .setColumnStyles(HtmlStyles.colFirst, HtmlStyles.colLast)
                     .setId(HtmlIds.ALL_MODULES_TABLE)
                     .setDefaultTab(contents.getContent("doclet.All_Modules"));
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriter.java
index d2f2206d27fd7..bd0ab2958d4e0 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriter.java
@@ -41,18 +41,21 @@
 
 import com.sun.source.doctree.DeprecatedTree;
 import com.sun.source.doctree.DocTree;
+
 import jdk.javadoc.doclet.DocletEnvironment.ModuleMode;
-import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.DocletException;
 import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.Entity;
+import jdk.javadoc.internal.html.HtmlStyle;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * Class to generate file for each module contents in the right-hand frame. This will list all the
@@ -191,8 +194,8 @@ protected void buildModuleDoc() throws DocletException {
      */
     protected void buildContent() {
         Content moduleContent = getContentHeader();
-        moduleContent.add(new HtmlTree(TagName.HR));
-        Content div = HtmlTree.DIV(HtmlStyle.horizontalScroll);
+        moduleContent.add(new HtmlTree(HtmlTag.HR));
+        Content div = HtmlTree.DIV(HtmlStyles.horizontalScroll);
         addModuleSignature(div);
         buildModuleDescription(div);
         moduleContent.add(div);
@@ -261,13 +264,13 @@ protected void buildModuleDescription(Content moduleContent) {
 
     protected Content getModuleHeader(String heading) {
         HtmlTree body = getBody(getWindowTitle(mdle.getQualifiedName().toString()));
-        var div = HtmlTree.DIV(HtmlStyle.header);
+        var div = HtmlTree.DIV(HtmlStyles.header);
         Content moduleHead = new ContentBuilder();
         moduleHead.add(mdle.isOpen() && (configuration.docEnv.getModuleMode() == ModuleMode.ALL)
                 ? contents.openModuleLabel : contents.moduleLabel);
         moduleHead.add(" ").add(heading);
         var tHeading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
-                HtmlStyle.title, moduleHead);
+                HtmlStyles.title, moduleHead);
         div.add(tHeading);
         bodyContents.setHeader(getHeader(PageMode.MODULE, mdle))
                 .addMainContent(div);
@@ -279,11 +282,11 @@ protected Content getContentHeader() {
     }
 
     protected Content getSummariesList() {
-        return HtmlTree.UL(HtmlStyle.summaryList);
+        return HtmlTree.UL(HtmlStyles.summaryList);
     }
 
     protected Content getSummary(Content source) {
-        return HtmlTree.SECTION(HtmlStyle.summary, source);
+        return HtmlTree.SECTION(HtmlStyles.summary, source);
     }
 
     /**
@@ -502,10 +505,10 @@ public void addSummaryHeader(Content startMarker, Content heading,
      * @return a content object
      */
     private Table<?> getTable2(Content caption, TableHeader tableHeader) {
-        return new Table<Void>(HtmlStyle.detailsTable)
+        return new Table<Void>(HtmlStyles.detailsTable)
                 .setCaption(caption)
                 .setHeader(tableHeader)
-                .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast);
+                .setColumnStyles(HtmlStyles.colFirst, HtmlStyles.colLast);
     }
 
     /**
@@ -516,10 +519,10 @@ private Table<?> getTable2(Content caption, TableHeader tableHeader) {
      * @return a content object
      */
     private Table<?> getTable3(Content caption, TableHeader tableHeader) {
-        return new Table<Void>(HtmlStyle.detailsTable)
+        return new Table<Void>(HtmlStyles.detailsTable)
                 .setCaption(caption)
                 .setHeader(tableHeader)
-                .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colSecond, HtmlStyle.colLast);
+                .setColumnStyles(HtmlStyles.colFirst, HtmlStyles.colSecond, HtmlStyles.colLast);
     }
 
     protected void addModulesSummary(Content summariesList) {
@@ -528,7 +531,7 @@ protected void addModulesSummary(Content summariesList) {
             TableHeader requiresTableHeader =
                     new TableHeader(contents.modifierLabel, contents.moduleLabel,
                             contents.descriptionLabel);
-            var section = HtmlTree.SECTION(HtmlStyle.modulesSummary)
+            var section = HtmlTree.SECTION(HtmlStyles.modulesSummary)
                     .setId(HtmlIds.MODULES);
             addSummaryHeader(MarkerComments.START_OF_MODULES_SUMMARY, contents.navModules, section);
             if (display(requires)) {
@@ -570,7 +573,7 @@ protected void addPackagesSummary(Content summariesList) {
         if (display(packages)
                 || display(indirectPackages) || display(indirectOpenPackages)) {
             tableOfContents.addLink(HtmlIds.PACKAGES, contents.navPackages);
-            var section = HtmlTree.SECTION(HtmlStyle.packagesSummary)
+            var section = HtmlTree.SECTION(HtmlStyles.packagesSummary)
                     .setId(HtmlIds.PACKAGES);
             addSummaryHeader(MarkerComments.START_OF_PACKAGES_SUMMARY, contents.navPackages, section);
             if (display(packages)) {
@@ -600,7 +603,7 @@ protected void addPackagesSummary(Content summariesList) {
      * @param li the tree to which the summary will be added
      */
     public void addPackageSummary(HtmlTree li) {
-        var table = new Table<PackageElement>(HtmlStyle.summaryTable)
+        var table = new Table<PackageElement>(HtmlStyles.summaryTable)
                 .setId(HtmlIds.PACKAGE_SUMMARY_TABLE)
                 .setDefaultTab(contents.getContent("doclet.All_Packages"))
                 .addTab(contents.getContent("doclet.Exported_Packages_Summary"), this::isExported)
@@ -636,20 +639,20 @@ public void addPackageSummary(HtmlTree li) {
         List<Content> colHeaders = new ArrayList<>();
         List<HtmlStyle> colStyles = new ArrayList<>();
         colHeaders.add(contents.packageLabel);
-        colStyles.add(HtmlStyle.colFirst);
+        colStyles.add(HtmlStyles.colFirst);
 
         if (showExportedTo) {
             colHeaders.add(contents.exportedTo);
-            colStyles.add(HtmlStyle.colSecond);
+            colStyles.add(HtmlStyles.colSecond);
         }
 
         if (showOpenedTo) {
             colHeaders.add(contents.openedTo);
-            colStyles.add(HtmlStyle.colSecond);
+            colStyles.add(HtmlStyles.colSecond);
         }
 
         colHeaders.add(contents.descriptionLabel);
-        colStyles.add(HtmlStyle.colLast);
+        colStyles.add(HtmlStyles.colLast);
 
         table.setHeader(new TableHeader(colHeaders).styles(colStyles))
                 .setColumnStyles(colStyles);
@@ -741,7 +744,7 @@ protected void addServicesSummary(Content summariesList) {
 
         if (haveProvides || haveUses) {
             tableOfContents.addLink(HtmlIds.SERVICES, contents.navServices);
-            var section = HtmlTree.SECTION(HtmlStyle.servicesSummary)
+            var section = HtmlTree.SECTION(HtmlStyles.servicesSummary)
                     .setId(HtmlIds.SERVICES);
             addSummaryHeader(MarkerComments.START_OF_SERVICES_SUMMARY, contents.navServices, section);
             TableHeader usesProvidesTableHeader =
@@ -783,7 +786,7 @@ public void addUsesList(Table<?> table) {
             if (display(usesTrees)) {
                 description = usesTrees.get(t);
                 if (description != null && !description.isEmpty()) {
-                    summary.add(HtmlTree.DIV(HtmlStyle.block, description));
+                    summary.add(HtmlTree.DIV(HtmlStyles.block, description));
                 } else {
                     addSummaryComment(t, summary);
                 }
@@ -813,7 +816,7 @@ public void addProvidesList(Table<?> table) {
             if (display(providesTrees)) {
                 description = providesTrees.get(srv);
                 if (description != null && !description.isEmpty()) {
-                    desc.add(HtmlTree.DIV(HtmlStyle.block, description));
+                    desc.add(HtmlTree.DIV(HtmlStyles.block, description));
                 } else {
                     addSummaryComment(srv, desc);
                 }
@@ -822,9 +825,9 @@ public void addProvidesList(Table<?> table) {
             }
             // Only display the implementation details in the "all" mode.
             if (moduleMode == ModuleMode.ALL && !implSet.isEmpty()) {
-                desc.add(new HtmlTree(TagName.BR));
+                desc.add(new HtmlTree(HtmlTag.BR));
                 desc.add("(");
-                var implSpan = HtmlTree.SPAN(HtmlStyle.implementationLabel, contents.implementation);
+                var implSpan = HtmlTree.SPAN(HtmlStyles.implementationLabel, contents.implementation);
                 desc.add(implSpan);
                 desc.add(Entity.NO_BREAK_SPACE);
                 String sep = "";
@@ -848,8 +851,8 @@ public void addDeprecationInfo(Content div) {
         List<? extends DeprecatedTree> deprs = utils.getDeprecatedTrees(mdle);
         if (utils.isDeprecated(mdle)) {
             CommentHelper ch = utils.getCommentHelper(mdle);
-            var deprDiv = HtmlTree.DIV(HtmlStyle.deprecationBlock);
-            var deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(mdle));
+            var deprDiv = HtmlTree.DIV(HtmlStyles.deprecationBlock);
+            var deprPhrase = HtmlTree.SPAN(HtmlStyles.deprecatedLabel, getDeprecatedPhrase(mdle));
             deprDiv.add(deprPhrase);
             if (!deprs.isEmpty()) {
                 List<? extends DocTree> commentTags = ch.getDescription(deprs.get(0));
@@ -864,7 +867,7 @@ public void addDeprecationInfo(Content div) {
     protected void addModuleDescription(Content moduleContent) {
         addPreviewInfo(mdle, moduleContent);
         if (!utils.getFullBody(mdle).isEmpty()) {
-            var tree = HtmlTree.SECTION(HtmlStyle.moduleDescription)
+            var tree = HtmlTree.SECTION(HtmlStyles.moduleDescription)
                     .setId(HtmlIds.MODULE_DESCRIPTION);
             addDeprecationInfo(tree);
             tree.add(MarkerComments.START_OF_MODULE_DESCRIPTION);
@@ -902,8 +905,8 @@ protected void printDocument(Content content) throws DocFileIOException {
     public void addPackageDeprecationInfo(Content li, PackageElement pkg) {
         if (utils.isDeprecated(pkg)) {
             List<? extends DeprecatedTree> deprs = utils.getDeprecatedTrees(pkg);
-            var deprDiv = HtmlTree.DIV(HtmlStyle.deprecationBlock);
-            var deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(pkg));
+            var deprDiv = HtmlTree.DIV(HtmlStyles.deprecationBlock);
+            var deprPhrase = HtmlTree.SPAN(HtmlStyles.deprecatedLabel, getDeprecatedPhrase(pkg));
             deprDiv.add(deprPhrase);
             if (!deprs.isEmpty()) {
                 CommentHelper ch = utils.getCommentHelper(pkg);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java
index 63c18084c1077..293a6453925f6 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java
@@ -35,19 +35,19 @@
 import javax.lang.model.element.PackageElement;
 import javax.lang.model.element.TypeElement;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.formats.html.markup.Links;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
 import jdk.javadoc.internal.doclets.toolkit.util.DocLink;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
-import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.Entity;
+import jdk.javadoc.internal.html.HtmlAttr;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * Factory for navigation bar.
@@ -326,7 +326,7 @@ private void addItemToList(Content list, Content item) {
 
     private void addActivePageLink(Content target, Content label, boolean display) {
         if (display) {
-            target.add(HtmlTree.LI(HtmlStyle.navBarCell1Rev, label));
+            target.add(HtmlTree.LI(HtmlStyles.navBarCell1Rev, label));
         }
     }
 
@@ -409,7 +409,7 @@ protected void addBreadcrumbLinks(Element elem, List<Content> contents, boolean
             default -> throw new IllegalArgumentException(Objects.toString(elem));
         };
         if (selected) {
-            link.setStyle(HtmlStyle.currentSelection);
+            link.setStyle(HtmlStyles.currentSelection);
         }
         contents.add(link);
     }
@@ -499,7 +499,7 @@ private void addSearch(Content target) {
                 .put(HtmlAttr.AUTOCOMPLETE, "off");
         var inputReset = HtmlTree.INPUT(HtmlAttr.InputType.RESET, HtmlIds.RESET_SEARCH)
                 .put(HtmlAttr.VALUE, resources.getText("doclet.search_reset"));
-        var searchDiv = HtmlTree.DIV(HtmlStyle.navListSearch)
+        var searchDiv = HtmlTree.DIV(HtmlStyles.navListSearch)
                 .add(inputText)
                 .add(inputReset);
         target.add(searchDiv);
@@ -516,36 +516,36 @@ public Content getContent() {
         }
         var navigationBar = HtmlTree.NAV();
 
-        var navContent = new HtmlTree(TagName.DIV);
+        var navContent = new HtmlTree(HtmlTag.DIV);
         Content skipNavLinks = contents.getContent("doclet.Skip_navigation_links");
         String toggleNavLinks = configuration.getDocResources().getText("doclet.Toggle_navigation_links");
         navigationBar.add(MarkerComments.START_OF_TOP_NAVBAR);
         // The mobile menu button uses three empty spans to produce its animated icon
-        HtmlTree iconSpan = HtmlTree.SPAN(HtmlStyle.navBarToggleIcon).add(Entity.NO_BREAK_SPACE);
-        navContent.setStyle(HtmlStyle.navContent).add(HtmlTree.DIV(HtmlStyle.navMenuButton,
-                        new HtmlTree(TagName.BUTTON).setId(HtmlIds.NAVBAR_TOGGLE_BUTTON)
+        HtmlTree iconSpan = HtmlTree.SPAN(HtmlStyles.navBarToggleIcon).add(Entity.NO_BREAK_SPACE);
+        navContent.setStyle(HtmlStyles.navContent).add(HtmlTree.DIV(HtmlStyles.navMenuButton,
+                        new HtmlTree(HtmlTag.BUTTON).setId(HtmlIds.NAVBAR_TOGGLE_BUTTON)
                                 .put(HtmlAttr.ARIA_CONTROLS, HtmlIds.NAVBAR_TOP.name())
                                 .put(HtmlAttr.ARIA_EXPANDED, String.valueOf(false))
                                 .put(HtmlAttr.ARIA_LABEL, toggleNavLinks)
                                 .add(iconSpan)
                                 .add(iconSpan)
                                 .add(iconSpan)))
-                .add(HtmlTree.DIV(HtmlStyle.skipNav,
+                .add(HtmlTree.DIV(HtmlStyles.skipNav,
                         links.createLink(HtmlIds.SKIP_NAVBAR_TOP, skipNavLinks,
                                 skipNavLinks.toString())));
         Content aboutContent = userHeader;
 
-        var navList = new HtmlTree(TagName.UL)
+        var navList = new HtmlTree(HtmlTag.UL)
                 .setId(HtmlIds.NAVBAR_TOP_FIRSTROW)
-                .setStyle(HtmlStyle.navList)
+                .setStyle(HtmlStyles.navList)
                 .put(HtmlAttr.TITLE, rowListTitle);
         addMainNavLinks(navList);
         navContent.add(navList);
-        var aboutDiv = HtmlTree.DIV(HtmlStyle.aboutLanguage, aboutContent);
+        var aboutDiv = HtmlTree.DIV(HtmlStyles.aboutLanguage, aboutContent);
         navContent.add(aboutDiv);
-        navigationBar.add(HtmlTree.DIV(HtmlStyle.topNav, navContent).setId(HtmlIds.NAVBAR_TOP));
+        navigationBar.add(HtmlTree.DIV(HtmlStyles.topNav, navContent).setId(HtmlIds.NAVBAR_TOP));
 
-        var subNavContent = HtmlTree.DIV(HtmlStyle.navContent);
+        var subNavContent = HtmlTree.DIV(HtmlStyles.navContent);
         List<Content> subNavLinks = new ArrayList<>();
         switch (documentedPage) {
             case MODULE, PACKAGE, CLASS, USE, DOC_FILE, TREE -> {
@@ -553,17 +553,17 @@ public Content getContent() {
             }
         }
         // Add the breadcrumb navigation links if present.
-        var breadcrumbNav = HtmlTree.OL(HtmlStyle.subNavList);
+        var breadcrumbNav = HtmlTree.OL(HtmlStyles.subNavList);
         breadcrumbNav.addAll(subNavLinks, HtmlTree::LI);
         subNavContent.addUnchecked(breadcrumbNav);
 
         if (options.createIndex() && documentedPage != PageMode.SEARCH) {
             addSearch(subNavContent);
         }
-        navigationBar.add(HtmlTree.DIV(HtmlStyle.subNav, subNavContent));
+        navigationBar.add(HtmlTree.DIV(HtmlStyles.subNav, subNavContent));
 
         navigationBar.add(MarkerComments.END_OF_TOP_NAVBAR);
-        navigationBar.add(HtmlTree.SPAN(HtmlStyle.skipNav)
+        navigationBar.add(HtmlTree.SPAN(HtmlStyles.skipNav)
                 .addUnchecked(Text.EMPTY)
                 .setId(HtmlIds.SKIP_NAVBAR_TOP));
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriter.java
index 4534f707c38b7..12d4dcbd6638d 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NestedClassWriter.java
@@ -31,12 +31,14 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.Entity;
+import jdk.javadoc.internal.html.HtmlStyle;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * Writes nested class documentation in HTML format.
@@ -71,7 +73,7 @@ public Content getMemberSummaryHeader(Content content) {
 
     @Override
     public void buildSummary(Content summariesList, Content content) {
-        writer.addSummary(HtmlStyle.nestedClassSummary,
+        writer.addSummary(HtmlStyles.nestedClassSummary,
                 HtmlIds.NESTED_CLASS_SUMMARY, summariesList, content);
     }
 
@@ -92,10 +94,10 @@ public TableHeader getSummaryTableHeader(Element member) {
 
     @Override
     protected Table<Element> createSummaryTable() {
-        List<HtmlStyle> bodyRowStyles = Arrays.asList(HtmlStyle.colFirst, HtmlStyle.colSecond,
-                HtmlStyle.colLast);
+        List<HtmlStyle> bodyRowStyles = Arrays.asList(HtmlStyles.colFirst, HtmlStyles.colSecond,
+                HtmlStyles.colLast);
 
-        return new Table<Element>(HtmlStyle.summaryTable)
+        return new Table<Element>(HtmlStyles.summaryTable)
                 .setCaption(contents.getContent("doclet.Nested_Classes"))
                 .setHeader(getSummaryTableHeader(typeElement))
                 .setColumnStyles(bodyRowStyles);
@@ -125,7 +127,7 @@ public void addInheritedSummaryLabel(TypeElement typeElement, Content content) {
     protected void addSummaryLink(HtmlLinkInfo.Kind context, TypeElement typeElement, Element member,
                                   Content content) {
         Content memberLink = writer.getLink(new HtmlLinkInfo(configuration, context, (TypeElement)member)
-                .style(HtmlStyle.typeNameLink));
+                .style(HtmlStyles.typeNameLink));
         var code = HtmlTree.CODE(memberLink);
         content.add(code);
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NewAPIListWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NewAPIListWriter.java
index f46765933cfdb..68066b0c92be5 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NewAPIListWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/NewAPIListWriter.java
@@ -32,14 +32,14 @@
 import com.sun.source.doctree.SinceTree;
 
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlId;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.NewAPIBuilder;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.HtmlStyle;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 import static com.sun.source.doctree.DocTree.Kind.SINCE;
 
@@ -81,7 +81,7 @@ protected String getTitleKey() {
     protected void addContentSelectors(Content content) {
         List<String> releases = builder.releases;
         if (releases.size() > 1) {
-            Content tabs = HtmlTree.DIV(HtmlStyle.checkboxes,
+            Content tabs = HtmlTree.DIV(HtmlStyles.checkboxes,
                     contents.getContent("doclet.New_API_Checkbox_Label"));
             // Table column ids are 1-based
             int index = 1;
@@ -96,7 +96,7 @@ protected void addContentSelectors(Content content) {
 
     @Override
     protected void addTableTabs(Table<Element> table, String headingKey) {
-        table.setGridStyle(HtmlStyle.threeColumnReleaseSummary);
+        table.setGridStyle(HtmlStyles.threeColumnReleaseSummary);
         List<String> releases = builder.releases;
         if (releases.size() > 1) {
             table.setDefaultTab(getTableCaption(headingKey))
@@ -149,7 +149,7 @@ protected TableHeader getTableHeader(String headerKey) {
 
     @Override
     protected HtmlStyle[] getColumnStyles() {
-        return new HtmlStyle[]{ HtmlStyle.colSummaryItemName, HtmlStyle.colSecond, HtmlStyle.colLast };
+        return new HtmlStyle[]{ HtmlStyles.colSummaryItemName, HtmlStyles.colSecond, HtmlStyles.colLast };
     }
 
     private static String getHeading(HtmlConfiguration configuration) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java
index ef7f25e7388d4..fd257fc06f48e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexWriter.java
@@ -31,11 +31,12 @@
 
 import javax.lang.model.element.PackageElement;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.Group;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * Generate the package index page "index.html".
@@ -81,9 +82,9 @@ protected void addIndex(Content target) {
                 = configuration.group.groupPackages(packages);
 
         if (!groupPackageMap.keySet().isEmpty()) {
-            var table = new Table<PackageElement>(HtmlStyle.summaryTable)
+            var table = new Table<PackageElement>(HtmlStyles.summaryTable)
                     .setHeader(getPackageTableHeader())
-                    .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast)
+                    .setColumnStyles(HtmlStyles.colFirst, HtmlStyles.colLast)
                     .setId(HtmlIds.ALL_PACKAGES_TABLE)
                     .setDefaultTab(contents.getContent("doclet.All_Packages"));
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java
index cba27fd64faa3..8ff3cf9779717 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java
@@ -25,21 +25,17 @@
 
 package jdk.javadoc.internal.doclets.formats.html;
 
-import javax.lang.model.element.Element;
 import javax.lang.model.element.PackageElement;
 
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
 import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.util.ClassTree;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
-
-import java.util.ArrayList;
-import java.util.List;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlTree;
 
 
 /**
@@ -100,8 +96,8 @@ public void buildPage() throws DocFileIOException {
                 : contents.getContent("doclet.Hierarchy_For_Package",
                 getLocalizedPackageName(packageElement));
         var heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING,
-                HtmlStyle.title, headContent);
-        var div = HtmlTree.DIV(HtmlStyle.header, heading);
+                HtmlStyles.title, headContent);
+        var div = HtmlTree.DIV(HtmlStyles.header, heading);
         mainContent.add(div);
         if (configuration.packages.size() > 1) {
             addLinkToAllPackages(mainContent);
@@ -136,10 +132,10 @@ protected HtmlTree getPackageTreeHeader() {
      * @param target the content to which the link will be added
      */
     protected void addLinkToAllPackages(Content target) {
-        var span = HtmlTree.SPAN(HtmlStyle.packageHierarchyLabel,
+        var span = HtmlTree.SPAN(HtmlStyles.packageHierarchyLabel,
                 contents.packageHierarchies);
         target.add(span);
-        var ul = HtmlTree.UL(HtmlStyle.horizontal).addStyle(HtmlStyle.contentsList);
+        var ul = HtmlTree.UL(HtmlStyles.horizontal).addStyle(HtmlStyles.contentsList);
         // TODO the link should be more specific:
         //  it should point to the "all packages" section of the overview tree
         ul.add(getNavLinkToOverviewTree(resources.getText("doclet.All_Packages")));
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java
index 848e7069d66d7..b28b44d4cd3a6 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java
@@ -25,28 +25,26 @@
 
 package jdk.javadoc.internal.doclets.formats.html;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import javax.lang.model.element.Element;
 import javax.lang.model.element.PackageElement;
 import javax.lang.model.element.TypeElement;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.util.ClassUseMapper;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.Entity;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * Generate package usage information.
@@ -138,10 +136,10 @@ protected void addPackageList(Content content) {
         Content caption = contents.getContent(
                 "doclet.ClassUse_Packages.that.use.0",
                 getPackageLink(packageElement, getLocalizedPackageName(packageElement)));
-        var table = new Table<Void>(HtmlStyle.summaryTable)
+        var table = new Table<Void>(HtmlStyles.summaryTable)
                 .setCaption(caption)
                 .setHeader(getPackageTableHeader())
-                .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast);
+                .setColumnStyles(HtmlStyles.colFirst, HtmlStyles.colLast);
         for (String pkgname: usingPackageToUsedClasses.keySet()) {
             PackageElement pkg = utils.elementUtils.getPackageElement(pkgname);
             Content packageLink = links.createLink(htmlIds.forPackage(pkg),
@@ -165,19 +163,19 @@ protected void addPackageList(Content content) {
     protected void addClassList(Content content) {
         TableHeader classTableHeader = new TableHeader(
                 contents.classLabel, contents.descriptionLabel);
-        var ul = HtmlTree.UL(HtmlStyle.blockList);
+        var ul = HtmlTree.UL(HtmlStyles.blockList);
         for (String packageName : usingPackageToUsedClasses.keySet()) {
             PackageElement usingPackage = utils.elementUtils.getPackageElement(packageName);
-            var section = HtmlTree.SECTION(HtmlStyle.detail)
+            var section = HtmlTree.SECTION(HtmlStyles.detail)
                     .setId(htmlIds.forPackage(usingPackage));
             Content caption = contents.getContent(
                     "doclet.ClassUse_Classes.in.0.used.by.1",
                     getPackageLink(packageElement, getLocalizedPackageName(packageElement)),
                     getPackageLink(usingPackage, getLocalizedPackageName(usingPackage)));
-            var table = new Table<Void>(HtmlStyle.summaryTable)
+            var table = new Table<Void>(HtmlStyles.summaryTable)
                     .setCaption(caption)
                     .setHeader(classTableHeader)
-                    .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast);
+                    .setColumnStyles(HtmlStyles.colFirst, HtmlStyles.colLast);
             for (TypeElement te : usingPackageToUsedClasses.get(packageName)) {
                 DocPath dp = pathString(te,
                         DocPaths.CLASS_USE.resolve(docPaths.forName(te)));
@@ -192,7 +190,7 @@ protected void addClassList(Content content) {
             section.add(table);
             ul.add(HtmlTree.LI(section));
         }
-        var li = HtmlTree.SECTION(HtmlStyle.packageUses, ul);
+        var li = HtmlTree.SECTION(HtmlStyles.packageUses, ul);
         content.add(li);
     }
 
@@ -206,11 +204,11 @@ private HtmlTree getBody() {
         HtmlTree body = getBody(getWindowTitle(title));
         ContentBuilder headingContent = new ContentBuilder();
         headingContent.add(contents.getContent("doclet.ClassUse_Title", packageText));
-        headingContent.add(new HtmlTree(TagName.BR));
+        headingContent.add(new HtmlTree(HtmlTag.BR));
         headingContent.add(name);
         var heading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
-                HtmlStyle.title, headingContent);
-        var div = HtmlTree.DIV(HtmlStyle.header, heading);
+                HtmlStyles.title, headingContent);
+        var div = HtmlTree.DIV(HtmlStyles.header, heading);
         bodyContents.setHeader(getHeader(PageMode.USE, packageElement))
                 .addMainContent(div);
         return body;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriter.java
index c70386c6b3666..ee022144fea57 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriter.java
@@ -33,25 +33,26 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import javax.lang.model.element.Element;
 import javax.lang.model.element.ModuleElement;
 import javax.lang.model.element.PackageElement;
 import javax.lang.model.element.TypeElement;
 
 import com.sun.source.doctree.DeprecatedTree;
 import com.sun.source.doctree.DocTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.DocletException;
 import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * Class to generate file for each package contents in the right-hand
@@ -71,7 +72,7 @@ public class PackageWriter extends HtmlDocletWriter {
     /**
      * The HTML element for the section tag being written.
      */
-    private final HtmlTree section = HtmlTree.SECTION(HtmlStyle.packageDescription, new ContentBuilder());
+    private final HtmlTree section = HtmlTree.SECTION(HtmlStyles.packageDescription, new ContentBuilder());
 
     private final BodyContents bodyContents = new BodyContents();
 
@@ -127,8 +128,8 @@ protected void buildPackageDoc() throws DocletException {
      */
     protected void buildContent() {
         Content packageContent = getContentHeader();
-        packageContent.add(new HtmlTree(TagName.HR));
-        Content div = HtmlTree.DIV(HtmlStyle.horizontalScroll);
+        packageContent.add(new HtmlTree(HtmlTag.HR));
+        Content div = HtmlTree.DIV(HtmlStyles.horizontalScroll);
         addPackageSignature(div);
         buildPackageDescription(div);
         buildPackageTags(div);
@@ -202,14 +203,14 @@ protected void buildPackageTags(Content packageContent) {
     protected Content getPackageHeader() {
         String packageName = getLocalizedPackageName(packageElement).toString();
         HtmlTree body = getBody(getWindowTitle(packageName));
-        var div = HtmlTree.DIV(HtmlStyle.header);
+        var div = HtmlTree.DIV(HtmlStyles.header);
         Content packageHead = new ContentBuilder();
         if (!packageElement.isUnnamed()) {
             packageHead.add(contents.packageLabel).add(" ");
         }
         packageHead.add(packageName);
         var tHeading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
-                HtmlStyle.title, packageHead);
+                HtmlStyles.title, packageHead);
         div.add(tHeading);
         bodyContents.setHeader(getHeader(PageMode.PACKAGE, packageElement))
                 .addMainContent(div);
@@ -277,8 +278,8 @@ public void addDeprecationInfo(Content div) {
         List<? extends DeprecatedTree> deprs = utils.getDeprecatedTrees(packageElement);
         if (utils.isDeprecated(packageElement)) {
             CommentHelper ch = utils.getCommentHelper(packageElement);
-            var deprDiv = HtmlTree.DIV(HtmlStyle.deprecationBlock);
-            var deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(packageElement));
+            var deprDiv = HtmlTree.DIV(HtmlStyles.deprecationBlock);
+            var deprPhrase = HtmlTree.SPAN(HtmlStyles.deprecatedLabel, getDeprecatedPhrase(packageElement));
             deprDiv.add(deprPhrase);
             if (!deprs.isEmpty()) {
                 List<? extends DocTree> commentTags = ch.getDescription(deprs.get(0));
@@ -291,7 +292,7 @@ public void addDeprecationInfo(Content div) {
     }
 
     protected Content getSummariesList() {
-        return HtmlTree.UL(HtmlStyle.summaryList);
+        return HtmlTree.UL(HtmlStyles.summaryList);
     }
 
     protected void addRelatedPackagesSummary(Content summaryContent) {
@@ -308,9 +309,9 @@ protected void addRelatedPackagesSummary(Content summaryContent) {
      * @param target the content to which the links will be added
      */
     public void addAllClassesAndInterfacesSummary(Content target) {
-        var table = new Table<TypeElement>(HtmlStyle.summaryTable)
+        var table = new Table<TypeElement>(HtmlStyles.summaryTable)
                 .setHeader(new TableHeader(contents.classLabel, contents.descriptionLabel))
-                .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast)
+                .setColumnStyles(HtmlStyles.colFirst, HtmlStyles.colLast)
                 .setId(HtmlIds.CLASS_SUMMARY)
                 .setDefaultTab(contents.allClassesAndInterfacesLabel)
                 .addTab(contents.interfaces, utils::isPlainInterface)
@@ -347,14 +348,14 @@ protected void addRelatedPackageSummary(TableHeader tableHeader, Content summary
                                      boolean showModules) {
         if (!relatedPackages.isEmpty()) {
             tableOfContents.addLink(HtmlIds.RELATED_PACKAGE_SUMMARY, contents.relatedPackages);
-            var table = new Table<Void>(HtmlStyle.summaryTable)
+            var table = new Table<Void>(HtmlStyles.summaryTable)
                     .setId(HtmlIds.RELATED_PACKAGE_SUMMARY)
                     .setCaption(contents.relatedPackages)
                     .setHeader(tableHeader);
             if (showModules) {
-                table.setColumnStyles(HtmlStyle.colPlain, HtmlStyle.colFirst, HtmlStyle.colLast);
+                table.setColumnStyles(HtmlStyles.colPlain, HtmlStyles.colFirst, HtmlStyles.colLast);
             } else {
-                table.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast);
+                table.setColumnStyles(HtmlStyles.colFirst, HtmlStyles.colLast);
             }
 
             for (PackageElement pkg : relatedPackages) {
@@ -423,7 +424,7 @@ protected void printDocument(Content content) throws DocFileIOException {
     }
 
     protected Content getPackageSummary(Content summaryContent) {
-        return HtmlTree.SECTION(HtmlStyle.summary, summaryContent);
+        return HtmlTree.SECTION(HtmlStyles.summary, summaryContent);
     }
 
     private boolean hasRelatedPackagesInOtherModules(List<PackageElement> relatedPackages) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PreviewListWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PreviewListWriter.java
index 2141f1e7be734..4fb0d427ff965 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PreviewListWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PreviewListWriter.java
@@ -33,12 +33,14 @@
 import com.sun.source.doctree.DocTree;
 
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.PreviewAPIListBuilder;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlStyle;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * Generate File to list all the preview elements with the
@@ -81,7 +83,7 @@ protected void addContentSelectors(Content target) {
         if (!jeps.isEmpty()) {
             int index = 1;
             target.add(HtmlTree.P(contents.getContent("doclet.Preview_API_Checkbox_Label")));
-            Content list = HtmlTree.UL(HtmlStyle.previewFeatureList).addStyle(HtmlStyle.checkboxes);
+            Content list = HtmlTree.UL(HtmlStyles.previewFeatureList).addStyle(HtmlStyles.checkboxes);
             for (var jep : jeps) {
                 String jepUrl = resources.getText("doclet.Preview_JEP_URL", String.valueOf(jep.number()));
                 Content label = new ContentBuilder(Text.of(jep.number() + ": "))
@@ -106,7 +108,7 @@ protected void addComments(Element e, Content desc) {
 
     @Override
     protected void addTableTabs(Table<Element> table, String headingKey) {
-        table.setGridStyle(HtmlStyle.threeColumnSummary)
+        table.setGridStyle(HtmlStyles.threeColumnSummary)
                 .setDefaultTab(getTableCaption(headingKey))
                 .setRenderTabs(false);
         for (PreviewAPIListBuilder.JEP jep : builder.getJEPs()) {
@@ -131,6 +133,6 @@ protected TableHeader getTableHeader(String headerKey) {
 
     @Override
     protected HtmlStyle[] getColumnStyles() {
-        return new HtmlStyle[]{ HtmlStyle.colSummaryItemName, HtmlStyle.colSecond, HtmlStyle.colLast };
+        return new HtmlStyle[]{ HtmlStyles.colSummaryItemName, HtmlStyles.colSecond, HtmlStyles.colLast };
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriter.java
index 41a59c8a30c5c..7365b9b3b8f9a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriter.java
@@ -35,14 +35,15 @@
 import com.sun.source.doctree.DocCommentTree;
 import com.sun.source.doctree.DocTree;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.BaseOptions;
 import jdk.javadoc.internal.doclets.toolkit.CommentUtils;
 import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.Entity;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * Writes property documentation in HTML format.
@@ -80,7 +81,7 @@ protected void buildPropertyDoc(Content detailsList) {
             for (Element property : properties) {
                 currentProperty = (ExecutableElement)property;
                 Content propertyContent = getPropertyHeaderContent(currentProperty);
-                Content div = HtmlTree.DIV(HtmlStyle.horizontalScroll);
+                Content div = HtmlTree.DIV(HtmlStyles.horizontalScroll);
                 buildSignature(div);
                 buildDeprecationInfo(div);
                 buildPreviewInfo(div);
@@ -161,7 +162,7 @@ public Content getMemberSummaryHeader(Content content) {
 
     @Override
     public void buildSummary(Content summariesList, Content content) {
-        writer.addSummary(HtmlStyle.propertySummary,
+        writer.addSummary(HtmlStyles.propertySummary,
                 HtmlIds.PROPERTY_SUMMARY, summariesList, content);
     }
 
@@ -179,7 +180,7 @@ protected Content getPropertyHeaderContent(ExecutableElement property) {
         var heading = HtmlTree.HEADING(Headings.TypeDeclaration.MEMBER_HEADING,
                 Text.of(utils.getPropertyLabel(name(property))));
         content.add(heading);
-        return HtmlTree.SECTION(HtmlStyle.detail, content)
+        return HtmlTree.SECTION(HtmlStyles.detail, content)
                 .setId(htmlIds.forProperty(property));
     }
 
@@ -210,13 +211,13 @@ protected void addComments(ExecutableElement property, Content propertyContent)
                                     utils.isIncluded(holder)
                                             ? holder.getSimpleName() : holder.getQualifiedName());
                     var codeLink = HtmlTree.CODE(link);
-                    var descriptionFromLabel = HtmlTree.SPAN(HtmlStyle.descriptionFromTypeLabel,
+                    var descriptionFromLabel = HtmlTree.SPAN(HtmlStyles.descriptionFromTypeLabel,
                             utils.isClass(holder)
                                     ? contents.descriptionFromClassLabel
                                     : contents.descriptionFromInterfaceLabel);
                     descriptionFromLabel.add(Entity.NO_BREAK_SPACE);
                     descriptionFromLabel.add(codeLink);
-                    propertyContent.add(HtmlTree.DIV(HtmlStyle.block, descriptionFromLabel));
+                    propertyContent.add(HtmlTree.DIV(HtmlStyles.block, descriptionFromLabel));
                 }
                 writer.addInlineComment(property, propertyContent);
             }
@@ -229,7 +230,7 @@ protected void addTags(ExecutableElement property, Content propertyContent) {
 
     protected Content getPropertyDetails(Content memberDetailsHeader, Content memberDetails) {
         return writer.getDetailsListItem(
-                HtmlTree.SECTION(HtmlStyle.propertyDetails)
+                HtmlTree.SECTION(HtmlStyles.propertyDetails)
                         .setId(HtmlIds.PROPERTY_DETAIL)
                         .add(memberDetailsHeader)
                         .add(memberDetails));
@@ -250,10 +251,10 @@ public TableHeader getSummaryTableHeader(Element member) {
 
     @Override
     protected Table<Element> createSummaryTable() {
-        return new Table<Element>(HtmlStyle.summaryTable)
+        return new Table<Element>(HtmlStyles.summaryTable)
                 .setCaption(contents.properties)
                 .setHeader(getSummaryTableHeader(typeElement))
-                .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colSecond, HtmlStyle.colLast);
+                .setColumnStyles(HtmlStyles.colFirst, HtmlStyles.colSecond, HtmlStyles.colLast);
     }
 
     @Override
@@ -284,7 +285,7 @@ protected void addSummaryLink(HtmlLinkInfo.Kind context, TypeElement typeElement
         Content memberLink = writer.getDocLink(context, typeElement,
                 member,
                 Text.of(utils.getPropertyLabel(name(member))),
-                HtmlStyle.memberNameLink,
+                HtmlStyles.memberNameLink,
                 true);
 
         var code = HtmlTree.CODE(memberLink);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/RestrictedListWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/RestrictedListWriter.java
index bfd062706a98f..ec629a227a328 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/RestrictedListWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/RestrictedListWriter.java
@@ -31,6 +31,7 @@
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.IndexItem;
 import jdk.javadoc.internal.doclets.toolkit.util.RestrictedAPIListBuilder;
+import jdk.javadoc.internal.html.Content;
 
 /**
  * Generate File to list all the restricted methods with the
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SearchWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SearchWriter.java
index 8a2f0e2910939..0bd173df3d5f0 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SearchWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SearchWriter.java
@@ -27,15 +27,16 @@
 
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
 import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlId;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlAttr;
+import jdk.javadoc.internal.html.HtmlId;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * Generates the search landing page for the generated API documentation.
@@ -79,7 +80,7 @@ protected void addSearchFileContents(Content contentTree) {
             helpSection = HtmlTree.P(contents.getContent("doclet.search.help_page_info", helpLink));
         }
 
-        contentTree.add(HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, HtmlStyle.title,
+        contentTree.add(HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, HtmlStyles.title,
                         contents.getContent("doclet.search.main_heading")))
                 .add(HtmlTree.DIV(HtmlTree.INPUT(HtmlAttr.InputType.TEXT, HtmlId.of("page-search-input"))
                                 .put(HtmlAttr.PLACEHOLDER, resources.getText("doclet.search_placeholder"))
@@ -88,31 +89,31 @@ protected void addSearchFileContents(Content contentTree) {
                         .add(HtmlTree.INPUT(HtmlAttr.InputType.RESET, HtmlId.of("page-search-reset"))
                                 .put(HtmlAttr.VALUE, resources.getText("doclet.search_reset"))
                                 .put(HtmlAttr.STYLE, "margin: 6px;"))
-                        .add(HtmlTree.DETAILS(HtmlStyle.pageSearchDetails)
+                        .add(HtmlTree.DETAILS(HtmlStyles.pageSearchDetails)
                                 .add(HtmlTree.SUMMARY(contents.getContent("doclet.search.show_more"))
                                         .setId(HtmlId.of("page-search-expand")))))
-                .add(HtmlTree.DIV(HtmlStyle.pageSearchInfo, helpSection)
+                .add(HtmlTree.DIV(HtmlStyles.pageSearchInfo, helpSection)
                         .add(HtmlTree.P(contents.getContent("doclet.search.keyboard_info")))
                         .add(HtmlTree.P(contents.getContent("doclet.search.browser_info")))
                         .add(HtmlTree.SPAN(Text.of("link"))
                                 .setId(HtmlId.of("page-search-link")))
-                        .add(new HtmlTree(TagName.BUTTON)
-                                .add(new HtmlTree(TagName.IMG)
+                        .add(new HtmlTree(HtmlTag.BUTTON)
+                                .add(new HtmlTree(HtmlTag.IMG)
                                         .put(HtmlAttr.SRC, pathToRoot.resolve(DocPaths.RESOURCE_FILES)
                                                                      .resolve(DocPaths.CLIPBOARD_SVG).getPath())
                                         .put(HtmlAttr.ALT, copyUrlText))
                                 .add(HtmlTree.SPAN(Text.of(copyText))
                                         .put(HtmlAttr.DATA_COPIED, copiedText))
-                                .addStyle(HtmlStyle.copy)
+                                .addStyle(HtmlStyles.copy)
                                 .put(HtmlAttr.ARIA_LABEL, copyUrlText)
                                 .setId(HtmlId.of("page-search-copy")))
                         .add(HtmlTree.P(HtmlTree.INPUT(HtmlAttr.InputType.CHECKBOX, HtmlId.of("search-redirect")))
                                 .add(HtmlTree.LABEL("search-redirect",
                                         contents.getContent("doclet.search.redirect")))))
-                .add(new HtmlTree(TagName.P)
+                .add(new HtmlTree(HtmlTag.P)
                         .setId(HtmlId.of("page-search-notify"))
                         .add(contents.getContent("doclet.search.loading")))
-                .add(HtmlTree.DIV(new HtmlTree(TagName.DIV)
+                .add(HtmlTree.DIV(new HtmlTree(HtmlTag.DIV)
                                 .setId(HtmlId.of("result-container"))
                                 .addUnchecked(Text.EMPTY))
                         .setId(HtmlId.of("result-section"))
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerialFieldWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerialFieldWriter.java
index 758e0ee521491..c3d1cc582f36a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerialFieldWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerialFieldWriter.java
@@ -35,11 +35,12 @@
 import com.sun.source.doctree.SerialFieldTree;
 import com.sun.source.doctree.SerialTree;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.formats.html.taglets.TagletWriter;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * Generate serialized form for serializable fields.
@@ -53,15 +54,15 @@ public SerialFieldWriter(SubWriterHolderWriter writer, TypeElement typeElement)
     }
 
     protected Content getSerializableFieldsHeader() {
-        return HtmlTree.UL(HtmlStyle.blockList);
+        return HtmlTree.UL(HtmlStyles.blockList);
     }
 
     protected Content getFieldsContentHeader() {
-        return new HtmlTree(TagName.LI).setStyle(HtmlStyle.blockList);
+        return new HtmlTree(HtmlTag.LI).setStyle(HtmlStyles.blockList);
     }
 
     protected Content getSerializableFields(String heading, Content source) {
-        var section = HtmlTree.SECTION(HtmlStyle.detail);
+        var section = HtmlTree.SECTION(HtmlStyles.detail);
         if (!source.isEmpty()) {
             Content headingContent = Text.of(heading);
             var serialHeading = HtmlTree.HEADING(Headings.SerializedForm.CLASS_SUBHEADING, headingContent);
@@ -75,7 +76,7 @@ protected void addMemberHeader(TypeMirror fieldType, String fieldName, Content c
         Content nameContent = Text.of(fieldName);
         var heading = HtmlTree.HEADING(Headings.SerializedForm.MEMBER_HEADING, nameContent);
         content.add(heading);
-        var pre = new HtmlTree(TagName.PRE);
+        var pre = new HtmlTree(HtmlTag.PRE);
         Content fieldContent = writer.getLink(new HtmlLinkInfo(
                 configuration, HtmlLinkInfo.Kind.LINK_TYPE_PARAMS_AND_BOUNDS, fieldType));
         pre.add(fieldContent);
@@ -122,7 +123,7 @@ protected void addMemberDescription(VariableElement field, SerialFieldTree seria
             Content serialFieldContent = writer.commentTagsToContent(field,
                     description,
                     new TagletWriter.Context(false, false));
-            var div = HtmlTree.DIV(HtmlStyle.block, serialFieldContent);
+            var div = HtmlTree.DIV(HtmlStyles.block, serialFieldContent);
             content.add(div);
         }
     }
@@ -136,7 +137,7 @@ protected void addMemberDescription(VariableElement field, SerialFieldTree seria
     protected void addMemberTags(VariableElement field, Content content) {
         Content tagContent = writer.getBlockTagOutput(field);
         if (!tagContent.isEmpty()) {
-            var dl = HtmlTree.DL(HtmlStyle.notes);
+            var dl = HtmlTree.DL(HtmlStyles.notes);
             dl.add(tagContent);
             content.add(dl);
         }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerialMethodWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerialMethodWriter.java
index 4af46f3ea0180..d9b888f2ee1b8 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerialMethodWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerialMethodWriter.java
@@ -28,11 +28,12 @@
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.formats.html.taglets.TagletManager;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 
 /**
@@ -46,11 +47,11 @@ public SerialMethodWriter(SubWriterHolderWriter writer, TypeElement typeElement)
     }
 
     protected Content getSerializableMethodsHeader() {
-        return HtmlTree.UL(HtmlStyle.blockList);
+        return HtmlTree.UL(HtmlStyles.blockList);
     }
 
     protected Content getMethodsContentHeader() {
-        return new HtmlTree(TagName.LI);
+        return new HtmlTree(HtmlTag.LI);
     }
 
     /**
@@ -64,7 +65,7 @@ protected Content getMethodsContentHeader() {
     protected Content getSerializableMethods(String heading, Content source) {
         Content headingContent = Text.of(heading);
         var serialHeading = HtmlTree.HEADING(Headings.SerializedForm.CLASS_SUBHEADING, headingContent);
-        var section = HtmlTree.SECTION(HtmlStyle.detail, serialHeading);
+        var section = HtmlTree.SECTION(HtmlStyles.detail, serialHeading);
         section.add(source);
         return HtmlTree.LI(section);
     }
@@ -121,7 +122,7 @@ protected void addMemberDescription(ExecutableElement member, Content methodsCon
     protected void addMemberTags(ExecutableElement member, Content methodsContent) {
         TagletManager tagletManager = configuration.tagletManager;
         Content tagContent = writer.getBlockTagOutput(member, tagletManager.getSerializedFormTaglets());
-        var dl = HtmlTree.DL(HtmlStyle.notes);
+        var dl = HtmlTree.DL(HtmlStyles.notes);
         dl.add(tagContent);
         methodsContent.add(dl);
         if (name(member).equals("writeExternal")
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriter.java
index ffd654023d113..09fa5ed347c42 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriter.java
@@ -41,18 +41,19 @@
 import com.sun.source.doctree.SerialFieldTree;
 import com.sun.source.doctree.SerialTree;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.DocletException;
 import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.IndexItem;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.Entity;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * Generates the Serialized Form Information Page, <i>serialized-form.html</i>.
@@ -562,8 +563,8 @@ Content getHeader(String header) {
         HtmlTree body = getBody(getWindowTitle(header));
         Content h1Content = Text.of(header);
         var heading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
-                HtmlStyle.title, h1Content);
-        var div = HtmlTree.DIV(HtmlStyle.header, heading);
+                HtmlStyles.title, h1Content);
+        var div = HtmlTree.DIV(HtmlStyles.header, heading);
         bodyContents.setHeader(getHeader(PageMode.SERIALIZED_FORM))
                 .addMainContent(div);
         return body;
@@ -575,7 +576,7 @@ Content getHeader(String header) {
      * @return the serialized form summaries header
      */
      Content getSerializedSummariesHeader() {
-        return HtmlTree.UL(HtmlStyle.blockList);
+        return HtmlTree.UL(HtmlStyles.blockList);
     }
 
     /**
@@ -584,7 +585,7 @@ Content getSerializedSummariesHeader() {
      * @return the package serialized form header tree
      */
      Content getPackageSerializedHeader() {
-        return HtmlTree.SECTION(HtmlStyle.serializedPackageContainer);
+        return HtmlTree.SECTION(HtmlStyles.serializedPackageContainer);
     }
 
      Content getPackageHeader(PackageElement packageElement) {
@@ -596,7 +597,7 @@ Content getPackageHeader(PackageElement packageElement) {
     }
 
      Content getClassSerializedHeader() {
-        return HtmlTree.UL(HtmlStyle.blockList);
+        return HtmlTree.UL(HtmlStyles.blockList);
     }
 
     /**
@@ -615,7 +616,7 @@ Content getClassHeader(TypeElement typeElement) {
                 ? getLink(new HtmlLinkInfo(configuration, HtmlLinkInfo.Kind.PLAIN, typeElement)
                         .label(configuration.getClassName(typeElement)))
                 : Text.of(utils.getFullyQualifiedName(typeElement));
-        var section = HtmlTree.SECTION(HtmlStyle.serializedClassDetails)
+        var section = HtmlTree.SECTION(HtmlStyles.serializedClassDetails)
                 .setId(htmlIds.forClass(typeElement));
         Content superClassLink = typeElement.getSuperclass() != null
                 ? getLink(new HtmlLinkInfo(configuration, HtmlLinkInfo.Kind.LINK_TYPE_PARAMS_AND_BOUNDS,
@@ -640,12 +641,12 @@ Content getClassHeader(TypeElement typeElement) {
         signature.add(superClassLink);
         signature.add(" implements ");
         signature.add(interfaceLink);
-        section.add(HtmlTree.DIV(HtmlStyle.typeSignature, signature));
+        section.add(HtmlTree.DIV(HtmlStyles.typeSignature, signature));
         return section;
     }
 
      Content getSerialUIDInfoHeader() {
-        return HtmlTree.DL(HtmlStyle.nameValue);
+        return HtmlTree.DL(HtmlStyles.nameValue);
     }
 
     /**
@@ -667,7 +668,7 @@ void addSerialUIDInfo(String header,
     }
 
      Content getClassContentHeader() {
-        return HtmlTree.UL(HtmlStyle.blockList);
+        return HtmlTree.UL(HtmlStyles.blockList);
     }
 
     /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java
index afc0648fa79c2..9059efcf81438 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Signatures.java
@@ -25,14 +25,12 @@
 
 package jdk.javadoc.internal.doclets.formats.html;
 
-import jdk.javadoc.doclet.DocletEnvironment;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
-import jdk.javadoc.internal.doclets.toolkit.util.Utils;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
 
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
@@ -43,12 +41,16 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.ElementKindVisitor14;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.stream.Collectors;
+
+import jdk.javadoc.doclet.DocletEnvironment;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
+import jdk.javadoc.internal.doclets.toolkit.util.Utils;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.Entity;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 import static javax.lang.model.element.Modifier.ABSTRACT;
 import static javax.lang.model.element.Modifier.FINAL;
@@ -63,17 +65,17 @@
 public class Signatures {
 
     public static Content getModuleSignature(ModuleElement mdle, ModuleWriter moduleWriter) {
-        var signature = HtmlTree.DIV(HtmlStyle.moduleSignature);
+        var signature = HtmlTree.DIV(HtmlStyles.moduleSignature);
         Content annotations = moduleWriter.getAnnotationInfo(mdle, true);
         if (!annotations.isEmpty()) {
-            signature.add(HtmlTree.SPAN(HtmlStyle.annotations, annotations));
+            signature.add(HtmlTree.SPAN(HtmlStyles.annotations, annotations));
         }
         DocletEnvironment docEnv = moduleWriter.configuration.docEnv;
         String label = mdle.isOpen() && (docEnv.getModuleMode() == DocletEnvironment.ModuleMode.ALL)
                 ? "open module" : "module";
         signature.add(label);
         signature.add(" ");
-        var nameSpan = HtmlTree.SPAN(HtmlStyle.elementName);
+        var nameSpan = HtmlTree.SPAN(HtmlStyles.elementName);
         nameSpan.add(mdle.getQualifiedName().toString());
         signature.add(nameSpan);
         return signature;
@@ -83,13 +85,13 @@ public static Content getPackageSignature(PackageElement pkg, PackageWriter pkgW
         if (pkg.isUnnamed()) {
             return Text.EMPTY;
         }
-        var signature = HtmlTree.DIV(HtmlStyle.packageSignature);
+        var signature = HtmlTree.DIV(HtmlStyles.packageSignature);
         Content annotations = pkgWriter.getAnnotationInfo(pkg, true);
         if (!annotations.isEmpty()) {
-            signature.add(HtmlTree.SPAN(HtmlStyle.annotations, annotations));
+            signature.add(HtmlTree.SPAN(HtmlStyles.annotations, annotations));
         }
         signature.add("package ");
-        var nameSpan = HtmlTree.SPAN(HtmlStyle.elementName);
+        var nameSpan = HtmlTree.SPAN(HtmlStyles.elementName);
         nameSpan.add(pkg.getQualifiedName().toString());
         signature.add(nameSpan);
         return signature;
@@ -122,16 +124,16 @@ public Content toContent() {
             Content content = new ContentBuilder();
             Content annotationInfo = writer.getAnnotationInfo(typeElement, true);
             if (!annotationInfo.isEmpty()) {
-                content.add(HtmlTree.SPAN(HtmlStyle.annotations, annotationInfo));
+                content.add(HtmlTree.SPAN(HtmlStyles.annotations, annotationInfo));
             }
-            content.add(HtmlTree.SPAN(HtmlStyle.modifiers, modifiers));
+            content.add(HtmlTree.SPAN(HtmlStyles.modifiers, modifiers));
 
-            var nameSpan = HtmlTree.SPAN(HtmlStyle.elementName);
+            var nameSpan = HtmlTree.SPAN(HtmlStyles.elementName);
             Content className = Text.of(utils.getSimpleName(typeElement));
             if (configuration.getOptions().linkSource()) {
                 writer.addSrcLink(typeElement, className, nameSpan);
             } else {
-                nameSpan.addStyle(HtmlStyle.typeNameLabel).add(className);
+                nameSpan.addStyle(HtmlStyles.typeNameLabel).add(className);
             }
             HtmlLinkInfo linkInfo = new HtmlLinkInfo(configuration,
                     HtmlLinkInfo.Kind.SHOW_TYPE_PARAMS_AND_BOUNDS, typeElement)
@@ -144,7 +146,7 @@ public Content toContent() {
                 content.add(getRecordComponents());
             }
             if (!utils.isAnnotationInterface(typeElement)) {
-                var extendsImplements = HtmlTree.SPAN(HtmlStyle.extendsImplements);
+                var extendsImplements = HtmlTree.SPAN(HtmlStyles.extendsImplements);
                 if (!utils.isPlainInterface(typeElement)) {
                     TypeMirror superclass = utils.getFirstVisibleSuperClass(typeElement);
                     if (superclass != null) {
@@ -186,7 +188,7 @@ public Content toContent() {
                     .filter(t -> utils.isLinkable(utils.asTypeElement(t)))
                     .toList();
             if (!linkablePermits.isEmpty()) {
-                var permitsSpan = HtmlTree.SPAN(HtmlStyle.permits);
+                var permitsSpan = HtmlTree.SPAN(HtmlStyles.permits);
                 boolean isFirst = true;
                 for (TypeMirror type : linkablePermits) {
                     if (isFirst) {
@@ -205,11 +207,11 @@ public Content toContent() {
                 if (linkablePermits.size() < permits.size()) {
                     Content c = Text.of(configuration.getDocResources().getText("doclet.not.exhaustive"));
                     permitsSpan.add(" ");
-                    permitsSpan.add(HtmlTree.SPAN(HtmlStyle.permitsNote, c));
+                    permitsSpan.add(HtmlTree.SPAN(HtmlStyles.permitsNote, c));
                 }
                 content.add(permitsSpan);
             }
-            return HtmlTree.DIV(HtmlStyle.typeSignature, content);
+            return HtmlTree.DIV(HtmlStyles.typeSignature, content);
         }
 
         private Content getRecordComponents() {
@@ -450,7 +452,7 @@ Content toContent() {
 
             // Annotations
             if (annotations != null && !annotations.isEmpty()) {
-                content.add(HtmlTree.SPAN(HtmlStyle.annotations, annotations));
+                content.add(HtmlTree.SPAN(HtmlStyles.annotations, annotations));
                 lastLineSeparator = content.charCount();
             }
 
@@ -464,12 +466,12 @@ Content toContent() {
 
             // Return type
             if (returnType != null) {
-                content.add(HtmlTree.SPAN(HtmlStyle.returnType, returnType));
+                content.add(HtmlTree.SPAN(HtmlStyles.returnType, returnType));
                 content.add(Entity.NO_BREAK_SPACE);
             }
 
             // Name
-            var nameSpan = HtmlTree.SPAN(HtmlStyle.elementName);
+            var nameSpan = HtmlTree.SPAN(HtmlStyles.elementName);
             if (memberWriter.options.linkSource()) {
                 Content name = Text.of(memberWriter.name(element));
                 memberWriter.writer.addSrcLink(element, name, nameSpan);
@@ -483,7 +485,7 @@ Content toContent() {
                 appendParametersAndExceptions(content, lastLineSeparator);
             }
 
-            return HtmlTree.DIV(HtmlStyle.memberSignature, content);
+            return HtmlTree.DIV(HtmlStyles.memberSignature, content);
         }
 
         /**
@@ -514,7 +516,7 @@ private void appendModifiers(Content target) {
             }
             if (!set.isEmpty()) {
                 String mods = set.stream().map(Modifier::toString).collect(Collectors.joining(" "));
-                target.add(HtmlTree.SPAN(HtmlStyle.modifiers, Text.of(mods)))
+                target.add(HtmlTree.SPAN(HtmlStyles.modifiers, Text.of(mods)))
                         .add(Entity.NO_BREAK_SPACE);
             }
         }
@@ -533,9 +535,9 @@ private int appendTypeParameters(Content target, int lastLineSeparator) {
             int typeParamLength = typeParameters.charCount();
 
             if (typeParamLength >= TYPE_PARAMS_MAX_INLINE_LENGTH) {
-                target.add(HtmlTree.SPAN(HtmlStyle.typeParametersLong, typeParameters));
+                target.add(HtmlTree.SPAN(HtmlStyles.typeParametersLong, typeParameters));
             } else {
-                target.add(HtmlTree.SPAN(HtmlStyle.typeParameters, typeParameters));
+                target.add(HtmlTree.SPAN(HtmlStyles.typeParameters, typeParameters));
             }
 
             int lineLength = target.charCount() - lastLineSeparator;
@@ -567,8 +569,8 @@ private void appendParametersAndExceptions(Content target, int lastLineSeparator
                 // empty parameters are added without packing
                 target.add(parameters);
             } else {
-                target.add(new HtmlTree(TagName.WBR))
-                        .add(HtmlTree.SPAN(HtmlStyle.parameters, parameters));
+                target.add(new HtmlTree(HtmlTag.WBR))
+                        .add(HtmlTree.SPAN(HtmlStyles.parameters, parameters));
             }
 
             // Exceptions
@@ -577,7 +579,7 @@ private void appendParametersAndExceptions(Content target, int lastLineSeparator
                 target.add(Text.NL)
                         .add(indent)
                         .add("throws ")
-                        .add(HtmlTree.SPAN(HtmlStyle.exceptions, exceptions));
+                        .add(HtmlTree.SPAN(HtmlStyles.exceptions, exceptions));
             }
         }
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java
index 6f1381a70ca4a..070b38421225b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java
@@ -25,8 +25,6 @@
 
 package jdk.javadoc.internal.doclets.formats.html;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.Head;
-
 import java.io.IOException;
 import java.io.LineNumberReader;
 import java.io.Reader;
@@ -38,12 +36,9 @@
 import javax.lang.model.element.TypeElement;
 import javax.tools.FileObject;
 
+import jdk.javadoc.internal.doclets.formats.html.markup.Head;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlDocument;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlId;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.Messages;
 import jdk.javadoc.internal.doclets.toolkit.Resources;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
@@ -52,6 +47,11 @@
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.SimpleDocletException;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.HtmlId;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * Converts Java Source Code to HTML.
@@ -201,7 +201,7 @@ public void convertClass(TypeElement te, DocPath outputdir)
                     .resolve(configuration.docPaths.forPackage(te))
                     .invert();
             Content body = getHeader();
-            var pre = new HtmlTree(TagName.PRE);
+            var pre = new HtmlTree(HtmlTag.PRE);
             try (var reader = new LineNumberReader(r)) {
                 while ((line = reader.readLine()) != null) {
                     addLineNo(pre, lineno);
@@ -210,7 +210,7 @@ public void convertClass(TypeElement te, DocPath outputdir)
                 }
             }
             addBlankLines(pre);
-            var div = HtmlTree.DIV(HtmlStyle.sourceContainer, pre);
+            var div = HtmlTree.DIV(HtmlStyles.sourceContainer, pre);
             body.add(HtmlTree.MAIN(div));
             writeToFile(body, outputdir.resolve(configuration.docPaths.forClass(te)), te);
         } catch (IOException e) {
@@ -246,7 +246,7 @@ private void writeToFile(Content body, DocPath path, TypeElement te) throws DocF
      * @return the header content for the HTML file
      */
     private static Content getHeader() {
-        return new HtmlTree(TagName.BODY).setStyle(HtmlStyle.sourcePage);
+        return new HtmlTree(HtmlTag.BODY).setStyle(HtmlStyles.sourcePage);
     }
 
     /**
@@ -256,7 +256,7 @@ private static Content getHeader() {
      * @param lineno The line number
      */
     private static void addLineNo(Content pre, int lineno) {
-        var span = HtmlTree.SPAN(HtmlStyle.sourceLineNo);
+        var span = HtmlTree.SPAN(HtmlStyles.sourceLineNo);
         if (lineno < 10) {
             span.add("00" + lineno);
         } else if (lineno < 100) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java
index 3926d4e9a4c13..0876a1611cdb6 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java
@@ -25,20 +25,23 @@
 
 package jdk.javadoc.internal.doclets.formats.html;
 
-import java.util.*;
+import java.util.List;
 
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
 import com.sun.source.doctree.DeprecatedTree;
 import com.sun.source.doctree.DocTree;
+
 import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlId;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.PropertyUtils;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlId;
+import jdk.javadoc.internal.html.HtmlStyle;
+import jdk.javadoc.internal.html.HtmlTree;
 
 /**
  * This abstract class exists to provide functionality needed in the
@@ -117,8 +120,8 @@ protected void addIndexComment(Element member, List<? extends DocTree> firstSent
         List<? extends DeprecatedTree> deprs = utils.getDeprecatedTrees(member);
         Content div;
         if (utils.isDeprecated(member)) {
-            var deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(member));
-            div = HtmlTree.DIV(HtmlStyle.block, deprLabel);
+            var deprLabel = HtmlTree.SPAN(HtmlStyles.deprecatedLabel, getDeprecatedPhrase(member));
+            div = HtmlTree.DIV(HtmlStyles.block, deprLabel);
             if (!deprs.isEmpty()) {
                 addSummaryDeprecatedComment(member, deprs.get(0), div);
             }
@@ -127,8 +130,8 @@ protected void addIndexComment(Element member, List<? extends DocTree> firstSent
         } else {
             Element te = member.getEnclosingElement();
             if (te != null &&  utils.isTypeElement(te) && utils.isDeprecated(te)) {
-                var deprLabel = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(te));
-                div = HtmlTree.DIV(HtmlStyle.block, deprLabel);
+                var deprLabel = HtmlTree.SPAN(HtmlStyles.deprecatedLabel, getDeprecatedPhrase(te));
+                div = HtmlTree.DIV(HtmlStyles.block, deprLabel);
                 tdSummaryContent.add(div);
             }
         }
@@ -200,7 +203,7 @@ public void addClassContent(Content classContent) {
      * @return a list to be used for the list of summaries for members of a given kind
      */
     public Content getSummariesList() {
-        return HtmlTree.UL(HtmlStyle.summaryList);
+        return HtmlTree.UL(HtmlStyles.summaryList);
     }
 
     /**
@@ -219,7 +222,7 @@ public Content getSummariesListItem(Content content) {
      * @return a list to be used for the list of details for members of a given kind
      */
     public Content getDetailsList() {
-        return HtmlTree.UL(HtmlStyle.detailsList);
+        return HtmlTree.UL(HtmlStyles.detailsList);
     }
 
     /**
@@ -236,7 +239,7 @@ public Content getDetailsListItem(Content content) {
      * {@return a list to add member items to}
      */
     public Content getMemberList() {
-        return HtmlTree.UL(HtmlStyle.memberList);
+        return HtmlTree.UL(HtmlStyles.memberList);
     }
 
     /**
@@ -249,7 +252,7 @@ public Content getMemberListItem(Content member) {
     }
 
     public Content getMemberInherited() {
-        return HtmlTree.DIV(HtmlStyle.inheritedList);
+        return HtmlTree.DIV(HtmlStyles.inheritedList);
     }
 
     /**
@@ -281,7 +284,7 @@ public Content getMember(Content content) {
      * @param memberContent the content used to generate the member summary
      */
     public Content getMemberSummary(Content memberContent) {
-        return HtmlTree.SECTION(HtmlStyle.summary, memberContent);
+        return HtmlTree.SECTION(HtmlStyles.summary, memberContent);
     }
 
     /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SummaryListWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SummaryListWriter.java
index ffe0350678de3..8d2f621e5d455 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SummaryListWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SummaryListWriter.java
@@ -31,18 +31,20 @@
 import javax.lang.model.element.ModuleElement;
 import javax.lang.model.element.PackageElement;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlId;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.Script;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.SummaryAPIListBuilder;
 import jdk.javadoc.internal.doclets.toolkit.util.SummaryAPIListBuilder.SummaryElementKind;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlAttr;
+import jdk.javadoc.internal.html.HtmlId;
+import jdk.javadoc.internal.html.HtmlStyle;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Script;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * Base class for generating a summary page that lists elements with a common characteristic,
@@ -139,8 +141,8 @@ public void buildPage() throws DocFileIOException {
         HtmlTree body = getHeader(getPageMode(), getTitleKey());
         Content content = new ContentBuilder();
         var heading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
-                HtmlStyle.title, getHeadContent());
-        content.add(HtmlTree.DIV(HtmlStyle.header, heading));
+                HtmlStyles.title, getHeadContent());
+        content.add(HtmlTree.DIV(HtmlStyles.header, heading));
         addContentSelectors(content);
         if (showContentsList()) {
             content.add(HtmlTree.HEADING_TITLE(Headings.CONTENT_HEADING, contents.contentsHeading));
@@ -201,7 +203,7 @@ protected boolean showContentsList() {
      * @return the contents list
      */
     public Content getContentsList() {
-        var ul= HtmlTree.UL(HtmlStyle.contentsList);
+        var ul= HtmlTree.UL(HtmlStyles.contentsList);
         addExtraIndexLink(ul);
         for (SummaryElementKind kind : SummaryElementKind.values()) {
             if (builder.hasDocumentation(kind)) {
@@ -238,7 +240,7 @@ protected void addSummaryAPI(SortedSet<Element> apiList, HtmlId id,
         if (apiList.size() > 0) {
             TableHeader tableHeader = getTableHeader(headerKey);
 
-            var table = new Table<Element>(HtmlStyle.summaryTable)
+            var table = new Table<Element>(HtmlStyles.summaryTable)
                     .setCaption(getTableCaption(headingKey))
                     .setHeader(tableHeader)
                     .setId(id)
@@ -267,7 +269,7 @@ protected void addSummaryAPI(SortedSet<Element> apiList, HtmlId id,
                 }
             }
             // note: singleton list
-            content.add(HtmlTree.UL(HtmlStyle.blockList, HtmlTree.LI(table)));
+            content.add(HtmlTree.UL(HtmlStyles.blockList, HtmlTree.LI(table)));
         }
     }
 
@@ -370,7 +372,7 @@ protected TableHeader getTableHeader(String headerKey) {
      * @return the styles to use for table columns
      */
     protected HtmlStyle[] getColumnStyles() {
-        return new HtmlStyle[]{ HtmlStyle.colSummaryItemName, HtmlStyle.colLast };
+        return new HtmlStyle[]{ HtmlStyles.colSummaryItemName, HtmlStyles.colLast };
     }
 
     /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SystemPropertiesWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SystemPropertiesWriter.java
index 45985532ad6fb..d7aacd3ab0ff5 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SystemPropertiesWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SystemPropertiesWriter.java
@@ -38,15 +38,16 @@
 
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
 import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.DocFileElement;
 import jdk.javadoc.internal.doclets.toolkit.OverviewElement;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.IndexItem;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 import static java.util.stream.Collectors.groupingBy;
 
@@ -86,7 +87,7 @@ public void buildPage() throws DocFileIOException {
         addSystemProperties(mainContent);
         body.add(new BodyContents()
                 .setHeader(getHeader(PageMode.SYSTEM_PROPERTIES))
-                .addMainContent(HtmlTree.DIV(HtmlStyle.header,
+                .addMainContent(HtmlTree.DIV(HtmlStyles.header,
                         HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING,
                                 contents.getContent("doclet.systemProperties"))))
                 .addMainContent(mainContent)
@@ -106,10 +107,10 @@ public void buildPage() throws DocFileIOException {
     protected void addSystemProperties(Content target) {
         Map<String, List<IndexItem>> searchIndexMap = groupSystemProperties();
         Content separator = Text.of(", ");
-        var table = new Table<Void>(HtmlStyle.summaryTable)
+        var table = new Table<Void>(HtmlStyles.summaryTable)
                 .setCaption(contents.systemPropertiesSummaryLabel)
                 .setHeader(new TableHeader(contents.propertyLabel, contents.referencedIn))
-                .setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast);
+                .setColumnStyles(HtmlStyles.colFirst, HtmlStyles.colLast);
         for (Entry<String, List<IndexItem>> entry : searchIndexMap.entrySet()) {
             Content propertyName = Text.of(entry.getKey());
             List<IndexItem> searchIndexItems = entry.getValue();
@@ -119,7 +120,7 @@ protected void addSystemProperties(Content target) {
                 separatedReferenceLinks.add(separator);
                 separatedReferenceLinks.add(createLink(searchIndexItems.get(i)));
             }
-            table.addRow(propertyName, HtmlTree.DIV(HtmlStyle.block, separatedReferenceLinks));
+            table.addRow(propertyName, HtmlTree.DIV(HtmlStyles.block, separatedReferenceLinks));
         }
         target.add(table);
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Table.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Table.java
index 339cfbf6f727f..5d09682d4920b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Table.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Table.java
@@ -34,13 +34,15 @@
 import java.util.Set;
 import java.util.function.Predicate;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlId;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlAttr;
+import jdk.javadoc.internal.html.HtmlId;
+import jdk.javadoc.internal.html.HtmlStyle;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * An HTML container used to display summary tables for various kinds of elements
@@ -303,7 +305,7 @@ public void addRow(T item, List<Content> contents) {
         Content row = new ContentBuilder();
 
         int rowIndex = bodyRows.size();
-        HtmlStyle rowStyle = rowIndex % 2 == 0 ? HtmlStyle.evenRowColor : HtmlStyle.oddRowColor;
+        HtmlStyle rowStyle = rowIndex % 2 == 0 ? HtmlStyles.evenRowColor : HtmlStyles.oddRowColor;
 
         List<String> tabClasses = new ArrayList<>();
         if (tabs != null) {
@@ -359,16 +361,16 @@ public boolean write(Writer out, String newline, boolean atNewline) throws IOExc
     private Content toContent() {
         Content main;
         if (id != null) {
-            main = new HtmlTree(TagName.DIV).setId(id);
+            main = new HtmlTree(HtmlTag.DIV).setId(id);
         } else {
             main = new ContentBuilder();
         }
         // If no grid style is set use on of the default styles
         if (gridStyle == null) {
             gridStyle = switch (columnStyles.size()) {
-                case 2 -> HtmlStyle.twoColumnSummary;
-                case 3 -> HtmlStyle.threeColumnSummary;
-                case 4 -> HtmlStyle.fourColumnSummary;
+                case 2 -> HtmlStyles.twoColumnSummary;
+                case 3 -> HtmlStyles.threeColumnSummary;
+                case 4 -> HtmlStyles.fourColumnSummary;
                 default -> throw new IllegalStateException();
             };
         }
@@ -383,16 +385,16 @@ private Content toContent() {
             table.add(getTableBody());
             main.add(table);
         } else {
-            var tablist = HtmlTree.DIV(HtmlStyle.tableTabs)
+            var tablist = HtmlTree.DIV(HtmlStyles.tableTabs)
                     .put(HtmlAttr.ROLE, "tablist")
                     .put(HtmlAttr.ARIA_ORIENTATION, "horizontal");
 
             HtmlId defaultTabId = HtmlIds.forTab(id, 0);
             if (renderTabs) {
-                tablist.add(createTab(defaultTabId, HtmlStyle.activeTableTab, true, defaultTab));
+                tablist.add(createTab(defaultTabId, HtmlStyles.activeTableTab, true, defaultTab));
                 for (var tab : tabs) {
                     if (occurringTabs.contains(tab)) {
-                        tablist.add(createTab(HtmlIds.forTab(id, tab.index()), HtmlStyle.tableTab, false, tab.label()));
+                        tablist.add(createTab(HtmlIds.forTab(id, tab.index()), HtmlStyles.tableTab, false, tab.label()));
                     }
                 }
             } else {
@@ -401,7 +403,7 @@ private Content toContent() {
             if (id == null) {
                 throw new IllegalStateException("no id set for table");
             }
-            var tabpanel = new HtmlTree(TagName.DIV)
+            var tabpanel = new HtmlTree(HtmlTag.DIV)
                     .setId(HtmlIds.forTabPanel(id))
                     .put(HtmlAttr.ROLE, "tabpanel")
                     .put(HtmlAttr.ARIA_LABELLEDBY, defaultTabId.name());
@@ -414,7 +416,7 @@ private Content toContent() {
     }
 
     private HtmlTree createTab(HtmlId tabId, HtmlStyle style, boolean defaultTab, Content tabLabel) {
-        var tab = new HtmlTree(TagName.BUTTON)
+        var tab = new HtmlTree(HtmlTag.BUTTON)
                 .setId(tabId)
                 .put(HtmlAttr.ROLE, "tab")
                 .put(HtmlAttr.ARIA_SELECTED, defaultTab ? "true" : "false")
@@ -436,6 +438,6 @@ private Content getTableBody() {
     }
 
     private HtmlTree getCaption(Content title) {
-        return HtmlTree.DIV(HtmlStyle.caption, HtmlTree.SPAN(title));
+        return HtmlTree.DIV(HtmlStyles.caption, HtmlTree.SPAN(title));
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableHeader.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableHeader.java
index a505797764e33..e1c42062c2190 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableHeader.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableHeader.java
@@ -30,10 +30,12 @@
 import java.util.Arrays;
 import java.util.List;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlAttr;
+import jdk.javadoc.internal.html.HtmlStyle;
+import jdk.javadoc.internal.html.HtmlTree;
 
 /**
  * A row of header cells for an HTML table.
@@ -152,10 +154,10 @@ private Content toContent() {
         int i = 0;
         for (Content cellContent : cellContents) {
             HtmlStyle style = (styles != null) ? styles.get(i)
-                    : (i == 0) ? HtmlStyle.colFirst
-                    : (i == (cellContents.size() - 1)) ? HtmlStyle.colLast
-                    : (i == 1) ? HtmlStyle.colSecond : null;
-            var cell = HtmlTree.DIV(HtmlStyle.tableHeader, cellContent);
+                    : (i == 0) ? HtmlStyles.colFirst
+                    : (i == (cellContents.size() - 1)) ? HtmlStyles.colLast
+                    : (i == 1) ? HtmlStyles.colSecond : null;
+            var cell = HtmlTree.DIV(HtmlStyles.tableHeader, cellContent);
             if (style != null) {
                 cell.addStyle(style);
             }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableOfContents.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableOfContents.java
index 7cfbffb6cee02..a9036d7dcd856 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableOfContents.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableOfContents.java
@@ -24,14 +24,15 @@
  */
 package jdk.javadoc.internal.doclets.formats.html;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlId;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.ListBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.Entity;
+import jdk.javadoc.internal.html.HtmlAttr;
+import jdk.javadoc.internal.html.HtmlId;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.ListBuilder;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * A class used by various {@link HtmlDocletWriter} subclasses to build tables of contents.
@@ -46,7 +47,7 @@ public class TableOfContents {
      */
     public TableOfContents(HtmlDocletWriter writer) {
         this.writer = writer;
-        listBuilder = new ListBuilder(HtmlTree.OL(HtmlStyle.tocList));
+        listBuilder = new ListBuilder(HtmlTree.OL(HtmlStyles.tocList));
     }
 
     /**
@@ -64,7 +65,7 @@ public TableOfContents addLink(HtmlId id, Content label) {
      * Adds a new nested list to add new items to.
      */
     public void pushNestedList() {
-        listBuilder.pushNestedList(HtmlTree.OL(HtmlStyle.tocList));
+        listBuilder.pushNestedList(HtmlTree.OL(HtmlStyles.tocList));
     }
 
     /**
@@ -87,23 +88,23 @@ protected Content toContent(boolean hasFilterInput) {
             return Text.EMPTY;
         }
         var content = HtmlTree.NAV()
-                .setStyle(HtmlStyle.toc)
+                .setStyle(HtmlStyles.toc)
                 .put(HtmlAttr.ARIA_LABEL, writer.resources.getText("doclet.table_of_contents"));
-        var header = HtmlTree.DIV(HtmlStyle.tocHeader, writer.contents.contentsHeading);
+        var header = HtmlTree.DIV(HtmlStyles.tocHeader, writer.contents.contentsHeading);
         if (hasFilterInput) {
             header.add(Entity.NO_BREAK_SPACE)
-                    .add(HtmlTree.INPUT(HtmlAttr.InputType.TEXT, HtmlStyle.filterInput)
+                    .add(HtmlTree.INPUT(HtmlAttr.InputType.TEXT, HtmlStyles.filterInput)
                             .put(HtmlAttr.PLACEHOLDER, writer.resources.getText("doclet.filter_label"))
                             .put(HtmlAttr.ARIA_LABEL, writer.resources.getText("doclet.filter_table_of_contents"))
                             .put(HtmlAttr.AUTOCOMPLETE, "off"))
-                    .add(HtmlTree.INPUT(HtmlAttr.InputType.RESET, HtmlStyle.resetFilter)
+                    .add(HtmlTree.INPUT(HtmlAttr.InputType.RESET, HtmlStyles.resetFilter)
                             .put(HtmlAttr.VALUE, writer.resources.getText("doclet.filter_reset")));
         }
         content.add(header);
-        content.add(new HtmlTree(TagName.BUTTON).addStyle(HtmlStyle.hideSidebar)
+        content.add(new HtmlTree(HtmlTag.BUTTON).addStyle(HtmlStyles.hideSidebar)
                 .add(HtmlTree.SPAN(writer.contents.hideSidebar).add(Entity.NO_BREAK_SPACE))
                 .add(Entity.LEFT_POINTING_ANGLE));
-        content.add(new HtmlTree(TagName.BUTTON).addStyle(HtmlStyle.showSidebar)
+        content.add(new HtmlTree(HtmlTag.BUTTON).addStyle(HtmlStyles.showSidebar)
                 .add(Entity.RIGHT_POINTING_ANGLE)
                 .add(HtmlTree.SPAN(Entity.NO_BREAK_SPACE).add(writer.contents.showSidebar)));
         return content.add(listBuilder);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java
index c5e0329e9e684..8af3b7016cecb 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java
@@ -29,15 +29,16 @@
 
 import javax.lang.model.element.PackageElement;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
+import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.util.ClassTree;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlTree;
 
 /**
  * Generate Class Hierarchy page for all the Classes in this run.  Use
@@ -78,8 +79,8 @@ public void buildPage() throws DocFileIOException {
         HtmlTree body = getBody();
         Content headContent = contents.hierarchyForAllPackages;
         var heading = HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING,
-                HtmlStyle.title, headContent);
-        var div = HtmlTree.DIV(HtmlStyle.header, heading);
+                HtmlStyles.title, headContent);
+        var div = HtmlTree.DIV(HtmlStyles.header, heading);
         Content mainContent = new ContentBuilder();
         mainContent.add(div);
         addPackageTreeLinks(mainContent);
@@ -105,10 +106,10 @@ protected void addPackageTreeLinks(Content content) {
             return;
         }
         if (!classesOnly) {
-            var span = HtmlTree.SPAN(HtmlStyle.packageHierarchyLabel,
+            var span = HtmlTree.SPAN(HtmlStyles.packageHierarchyLabel,
                     contents.packageHierarchies);
             content.add(span);
-            var ul = HtmlTree.UL(HtmlStyle.horizontal).addStyle(HtmlStyle.contentsList);
+            var ul = HtmlTree.UL(HtmlStyles.horizontal).addStyle(HtmlStyles.contentsList);
             int i = 0;
             for (PackageElement pkg : packages) {
                 // If the package name length is 0 or if -nodeprecated option
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/BodyContents.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/BodyContents.java
index 71bf1f265cfb2..d7c865b8350fd 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/BodyContents.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/BodyContents.java
@@ -25,14 +25,17 @@
 
 package jdk.javadoc.internal.doclets.formats.html.markup;
 
-import jdk.javadoc.internal.doclets.formats.html.Content;
-
 import java.io.IOException;
 import java.io.Writer;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
+
 /**
  * Content for the {@code <body>} element.
  *
@@ -96,7 +99,7 @@ private Content toContent() {
 
         return new ContentBuilder()
                 .add(header)
-                .add(HtmlTree.DIV(HtmlStyle.mainGrid)
+                .add(HtmlTree.DIV(HtmlStyles.mainGrid)
                         .add(side == null ? Text.EMPTY : side)
                         .add(HtmlTree.MAIN()
                                 .add(mainContents)
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java
index c4a223a94c73b..3d5b1a494ba2c 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java
@@ -34,10 +34,15 @@
 import java.util.List;
 import java.util.Locale;
 
-import jdk.javadoc.internal.doclets.formats.html.Content;
 import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
+import jdk.javadoc.internal.html.Comment;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.HtmlAttr;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Script;
 
 /**
  * An HTML {@code <head>} element.
@@ -267,7 +272,7 @@ public boolean write(Writer out, String newline, boolean atNewline) throws IOExc
      * @return the HTML
      */
     private Content toContent() {
-        var head = new HtmlTree(TagName.HEAD);
+        var head = new HtmlTree(HtmlTag.HEAD);
         head.add(getGeneratedBy(showTimestamp, generatedDate));
         head.add(HtmlTree.TITLE(title));
 
@@ -295,7 +300,7 @@ private Content toContent() {
         }
 
         if (canonicalLink != null) {
-            var link = new HtmlTree(TagName.LINK);
+            var link = new HtmlTree(HtmlTag.LINK);
             link.put(HtmlAttr.REL, "canonical");
             link.put(HtmlAttr.HREF, canonicalLink.getPath());
             head.add(link);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlAttr.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlAttr.java
deleted file mode 100644
index 1d0d54a05252c..0000000000000
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlAttr.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package jdk.javadoc.internal.doclets.formats.html.markup;
-
-import jdk.javadoc.internal.doclets.toolkit.util.Utils;
-
-/**
- * Enum representing HTML tag attributes.
- */
-public enum HtmlAttr {
-    ALT,
-    ARIA_CONTROLS("aria-controls"),
-    ARIA_EXPANDED("aria-expanded"),
-    ARIA_LABEL("aria-label"),
-    ARIA_LABELLEDBY("aria-labelledby"),
-    ARIA_ORIENTATION("aria-orientation"),
-    ARIA_SELECTED("aria-selected"),
-    AUTOCOMPLETE,
-    CHECKED,
-    CLASS,
-    CLEAR,
-    COLS,
-    CONTENT,
-    DATA_COPIED("data-copied"), // custom HTML5 data attribute
-    DISABLED,
-    FOR,
-    HREF,
-    HTTP_EQUIV("http-equiv"),
-    ID,
-    LANG,
-    NAME,
-    ONCLICK,
-    ONKEYDOWN,
-    ONLOAD,
-    PLACEHOLDER,
-    REL,
-    ROLE,
-    ROWS,
-    SCOPE,
-    SCROLLING,
-    SRC,
-    STYLE,
-    SUMMARY,
-    TABINDEX,
-    TARGET,
-    TITLE,
-    TYPE,
-    VALUE,
-    WIDTH;
-
-    private final String value;
-
-    public enum Role {
-
-        BANNER,
-        CONTENTINFO,
-        MAIN,
-        NAVIGATION,
-        REGION;
-
-        private final String role;
-
-        Role() {
-            role = Utils.toLowerCase(name());
-        }
-
-        public String toString() {
-            return role;
-        }
-    }
-
-    public enum InputType {
-
-        CHECKBOX,
-        RESET,
-        TEXT;
-
-        private final String type;
-
-        InputType() {
-            type = Utils.toLowerCase(name());
-        }
-
-        public String toString() {
-            return type;
-        }
-    }
-
-    HtmlAttr() {
-        this.value = Utils.toLowerCase(name());
-    }
-
-    HtmlAttr(String name) {
-        this.value = name;
-    }
-
-    public String toString() {
-        return value;
-    }
-}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocument.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocument.java
index dcfed8707dd17..051cbfd00423b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocument.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocument.java
@@ -29,9 +29,11 @@
 import java.io.StringWriter;
 import java.io.Writer;
 
-import jdk.javadoc.internal.doclets.formats.html.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFile;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.DocType;
+import jdk.javadoc.internal.html.HtmlTag;
 
 /**
  * Class for generating an HTML document for javadoc output.
@@ -43,7 +45,7 @@ public class HtmlDocument {
     /**
      * Constructs an HTML document.
      *
-     * @param html the {@link TagName#HTML HTML} element of the document
+     * @param html the {@link HtmlTag#HTML HTML} element of the document
      */
     public HtmlDocument(Content html) {
         docContent = html;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyles.java
similarity index 99%
rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java
rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyles.java
index 35a52b0c05dd1..35240fa69dabc 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyles.java
@@ -28,6 +28,8 @@
 import java.util.Locale;
 import java.util.regex.Pattern;
 
+import jdk.javadoc.internal.html.HtmlStyle;
+
 /**
  * Enum representing HTML styles, with associated entries in the stylesheet files.
  *
@@ -49,7 +51,7 @@
  *
  * @see <a href="https://html.spec.whatwg.org/#classes">WhatWG: {@code class} attribute</a>
  */
-public enum HtmlStyle {
+public enum HtmlStyles implements HtmlStyle {
 
     //<editor-fold desc="navigation bar">
     //
@@ -1098,13 +1100,13 @@ public enum HtmlStyle {
 
     private final String cssName;
 
-    HtmlStyle() {
+    HtmlStyles() {
         cssName = Pattern.compile("\\p{Upper}")
                 .matcher(toString())
                 .replaceAll(mr -> "-" + mr.group().toLowerCase(Locale.US));
     }
 
-    HtmlStyle(String cssName) {
+    HtmlStyles(String cssName) {
         this.cssName = cssName;
     }
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Links.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Links.java
index a0bd0b3dd044a..0af2913565465 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Links.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Links.java
@@ -25,9 +25,14 @@
 
 package jdk.javadoc.internal.doclets.formats.html.markup;
 
-import jdk.javadoc.internal.doclets.formats.html.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.DocLink;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.HtmlAttr;
+import jdk.javadoc.internal.html.HtmlId;
+import jdk.javadoc.internal.html.HtmlStyle;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * Factory for HTML A elements: links (with a {@code href} attribute).
@@ -197,7 +202,7 @@ public HtmlTree createLink(DocLink link, Content label, HtmlStyle style,
         }
         if (isExternal) {
             // Use addStyle as external links might have an explicit style set above as well.
-            l.addStyle(HtmlStyle.externalLink);
+            l.addStyle(HtmlStyles.externalLink);
         }
         return l;
     }
@@ -211,6 +216,6 @@ public HtmlTree createLink(DocLink link, Content label, HtmlStyle style,
      */
     public HtmlTree createExternalLink(DocLink link, Content label) {
         return HtmlTree.A(link.relativizeAgainst(file).toString(), label)
-            .setStyle(HtmlStyle.externalLink);
+            .setStyle(HtmlStyles.externalLink);
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TagName.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TagName.java
deleted file mode 100644
index d849c2f1798ba..0000000000000
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TagName.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package jdk.javadoc.internal.doclets.formats.html.markup;
-
-import java.util.Locale;
-
-import jdk.javadoc.internal.doclets.toolkit.util.Utils;
-
-/**
- * Enum representing the names for HTML elements.
- *
- * @see <a href="https://html.spec.whatwg.org/multipage/syntax.html#syntax-tag-name">WhatWG: Tag Name</a>
- * @see <a href="https://www.w3.org/TR/html51/syntax.html#tag-name">HTML 5.1: Tag Name</a>
- */
-public enum TagName {
-    A(true),
-    ASIDE,
-    BUTTON(true),
-    BLOCKQUOTE,
-    BODY,
-    BR(true),
-    CAPTION,
-    CODE(true),
-    DD,
-    DETAILS,
-    DIV,
-    DL,
-    DT,
-    EM(true),
-    FOOTER,
-    FORM,
-    H1,
-    H2,
-    H3,
-    H4,
-    H5,
-    H6,
-    HEAD,
-    HEADER,
-    HR,
-    HTML,
-    I(true),
-    IMG(true),
-    INPUT(true),
-    LABEL(true),
-    LI,
-    LISTING,
-    LINK(true),
-    MAIN,
-    MENU,
-    META,
-    NAV,
-    NOSCRIPT(true),
-    OL,
-    P,
-    PRE,
-    SCRIPT(true),
-    SECTION,
-    SMALL(true),
-    SPAN(true),
-    STRONG(true),
-    SUB(true),
-    SUMMARY,
-    SUP(true),
-    TABLE,
-    TBODY,
-    THEAD,
-    TD,
-    TH,
-    TITLE,
-    TR,
-    UL,
-    WBR(true);
-
-    public final String value;
-    public final boolean phrasingContent;
-
-    static TagName of(String s) {
-        return valueOf(s.toUpperCase(Locale.ROOT));
-    }
-
-    TagName() {
-        this(false);
-    }
-
-    TagName(boolean phrasingContent) {
-        this.value = Utils.toLowerCase(name());
-        this.phrasingContent = phrasingContent;
-    }
-
-    public String toString() {
-        return value;
-    }
-
-}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/package-info.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/package-info.java
index aa279972f8c6a..efad5fc0fe925 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/package-info.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/package-info.java
@@ -27,7 +27,7 @@
  * This package contains classes that create and write HTML markup tags.
  *
  * <p>The primary low level classes are
- * {@link jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree HtmlTree}
+ * {@link jdk.javadoc.internal.html.HtmlTree HtmlTree}
  * and other subtypes of {@code Content}. In addition, there are mid-level builders
  * like {@link jdk.javadoc.internal.doclets.formats.html.TableHeader TableHeader}
  * and {@link jdk.javadoc.internal.doclets.formats.html.Table Table}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/BaseTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/BaseTaglet.java
index bda31883f35de..7b0a4329ee1c7 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/BaseTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/BaseTaglet.java
@@ -33,10 +33,10 @@
 
 import jdk.javadoc.doclet.Taglet.Location;
 import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
-import jdk.javadoc.internal.doclets.formats.html.Content;
 import jdk.javadoc.internal.doclets.toolkit.Messages;
 import jdk.javadoc.internal.doclets.toolkit.Resources;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
+import jdk.javadoc.internal.html.Content;
 
 /**
  * A base class that implements the {@link Taglet} interface.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/DeprecatedTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/DeprecatedTaglet.java
index d586b697bd771..fa30589e59d3d 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/DeprecatedTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/DeprecatedTaglet.java
@@ -35,11 +35,11 @@
 
 import jdk.javadoc.doclet.Taglet;
 import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.Content;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlTree;
 
 /**
  * A taglet that represents the {@code @deprecated} tag.
@@ -61,7 +61,7 @@ public Content getAllBlockTagOutput(Element element, TagletWriter tagletWriter)
         List<? extends DeprecatedTree> deprs = utils.getDeprecatedTrees(element);
         if (utils.isTypeElement(element)) {
             if (utils.isDeprecated(element)) {
-                result.add(HtmlTree.SPAN(HtmlStyle.deprecatedLabel,
+                result.add(HtmlTree.SPAN(HtmlStyles.deprecatedLabel,
                         htmlWriter.getDeprecatedPhrase(element)));
                 if (!deprs.isEmpty()) {
                     List<? extends DocTree> commentTrees = ch.getDescription(deprs.get(0));
@@ -72,18 +72,18 @@ public Content getAllBlockTagOutput(Element element, TagletWriter tagletWriter)
             }
         } else {
             if (utils.isDeprecated(element)) {
-                result.add(HtmlTree.SPAN(HtmlStyle.deprecatedLabel,
+                result.add(HtmlTree.SPAN(HtmlStyles.deprecatedLabel,
                         htmlWriter.getDeprecatedPhrase(element)));
                 if (!deprs.isEmpty()) {
                     List<? extends DocTree> bodyTrees = ch.getBody(deprs.get(0));
                     Content body = tagletWriter.commentTagsToOutput(element, null, bodyTrees, false);
                     if (!body.isEmpty())
-                        result.add(HtmlTree.DIV(HtmlStyle.deprecationComment, body));
+                        result.add(HtmlTree.DIV(HtmlStyles.deprecationComment, body));
                 }
             } else {
                 Element ee = utils.getEnclosingTypeElement(element);
                 if (utils.isDeprecated(ee)) {
-                    result.add(HtmlTree.SPAN(HtmlStyle.deprecatedLabel,
+                    result.add(HtmlTree.SPAN(HtmlStyles.deprecatedLabel,
                             htmlWriter.getDeprecatedPhrase(ee)));
                 }
             }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/DocRootTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/DocRootTaglet.java
index 94d701f7441e5..d4050f6e0ec26 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/DocRootTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/DocRootTaglet.java
@@ -33,8 +33,8 @@
 
 import jdk.javadoc.doclet.Taglet;
 import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
-import jdk.javadoc.internal.doclets.formats.html.Content;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * An inline taglet representing {@code {@docRoot}}.  This taglet is
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/IndexTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/IndexTaglet.java
index 4361dd5c1ef0c..6f5077bb32c1f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/IndexTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/IndexTaglet.java
@@ -35,7 +35,7 @@
 
 import jdk.javadoc.doclet.Taglet;
 import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
-import jdk.javadoc.internal.doclets.formats.html.Content;
+import jdk.javadoc.internal.html.Content;
 
 /**
  * An inline taglet used to index a word or a phrase.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/InheritDocTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/InheritDocTaglet.java
index b7b937a5fc6bd..b05bb144f1b0b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/InheritDocTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/InheritDocTaglet.java
@@ -39,12 +39,12 @@
 
 import jdk.javadoc.doclet.Taglet.Location;
 import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
-import jdk.javadoc.internal.doclets.formats.html.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFinder;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFinder.Result;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
 import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable;
+import jdk.javadoc.internal.html.Content;
 
 /**
  * A taglet that represents the {@code {@inheritDoc}} tag.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java
index 1b02c9ea05e07..e16acd0315ad7 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java
@@ -46,12 +46,12 @@
 import jdk.javadoc.internal.doclets.formats.html.ClassWriter;
 import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
 import jdk.javadoc.internal.doclets.formats.html.HtmlLinkInfo;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
-import jdk.javadoc.internal.doclets.formats.html.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
 import jdk.javadoc.internal.doclets.toolkit.util.DocLink;
 import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 import static com.sun.source.doctree.DocTree.Kind.LINK;
 import static com.sun.source.doctree.DocTree.Kind.LINK_PLAIN;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LiteralTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LiteralTaglet.java
index 1d209427c214d..c0543026f23dd 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LiteralTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LiteralTaglet.java
@@ -34,9 +34,9 @@
 
 import jdk.javadoc.doclet.Taglet;
 import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
-import jdk.javadoc.internal.doclets.formats.html.Content;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * An inline taglet used to denote literal text, possibly in monospace font.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/ParamTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/ParamTaglet.java
index 9963547acf3e7..ed46e6c5c864f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/ParamTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/ParamTaglet.java
@@ -43,13 +43,13 @@
 import jdk.javadoc.internal.doclets.formats.html.Contents;
 import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
 import jdk.javadoc.internal.doclets.formats.html.HtmlIds;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
-import jdk.javadoc.internal.doclets.formats.html.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFinder;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * A taglet that represents the {@code @param} tag.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/ReturnTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/ReturnTaglet.java
index 6ba5d897c463a..b9572afb9bc4f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/ReturnTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/ReturnTaglet.java
@@ -41,11 +41,11 @@
 import jdk.javadoc.doclet.Taglet;
 import jdk.javadoc.internal.doclets.formats.html.Contents;
 import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFinder;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlTree;
 
 /**
  * A taglet that represents the {@code @return} and {@code {@return }} tags.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SeeTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SeeTaglet.java
index 9052b1a49aa9d..abfb3b526ec08 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SeeTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SeeTaglet.java
@@ -45,16 +45,16 @@
 import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
 import jdk.javadoc.internal.doclets.formats.html.HtmlDocletWriter;
 import jdk.javadoc.internal.doclets.formats.html.SerializedFormWriter;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
-import jdk.javadoc.internal.doclets.formats.html.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFinder;
 import jdk.javadoc.internal.doclets.toolkit.util.DocLink;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 public class SeeTaglet extends BaseTaglet implements InheritableTaglet {
     SeeTaglet(HtmlConfiguration config) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SimpleTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SimpleTaglet.java
index 110a3e1246eb3..6ce38b3b515ab 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SimpleTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SimpleTaglet.java
@@ -42,11 +42,11 @@
 
 import jdk.javadoc.doclet.Taglet;
 import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
-import jdk.javadoc.internal.doclets.formats.html.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFinder;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.RawHtml;
 
 /**
  * A custom single-argument block tag.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java
index 0642b37406420..af2378c0351d1 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java
@@ -51,21 +51,21 @@
 
 import jdk.javadoc.doclet.Taglet;
 import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.formats.html.taglets.snippet.Action;
 import jdk.javadoc.internal.doclets.formats.html.taglets.snippet.ParseException;
 import jdk.javadoc.internal.doclets.formats.html.taglets.snippet.Parser;
 import jdk.javadoc.internal.doclets.formats.html.taglets.snippet.Style;
 import jdk.javadoc.internal.doclets.formats.html.taglets.snippet.StyledText;
-import jdk.javadoc.internal.doclets.formats.html.Content;
 import jdk.javadoc.internal.doclets.toolkit.DocletElement;
 import jdk.javadoc.internal.doclets.toolkit.Resources;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.HtmlAttr;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 import static jdk.javadoc.internal.doclets.formats.html.taglets.SnippetTaglet.Language.*;
 
@@ -122,13 +122,13 @@ public Content getInlineTagOutput(Element holder, DocTree tag, TagletWriter tagl
     private Content snippetTagOutput(Element element, SnippetTree tag, StyledText content,
                                        String id, String lang) {
         var pathToRoot = tagletWriter.htmlWriter.pathToRoot;
-        var pre = new HtmlTree(TagName.PRE).setStyle(HtmlStyle.snippet);
+        var pre = new HtmlTree(HtmlTag.PRE).setStyle(HtmlStyles.snippet);
         if (id != null && !id.isBlank()) {
             pre.put(HtmlAttr.ID, id);
         } else {
             pre.put(HtmlAttr.ID, config.htmlIds.forSnippet(element, ids).name());
         }
-        var code = new HtmlTree(TagName.CODE)
+        var code = new HtmlTree(HtmlTag.CODE)
                 .addUnchecked(Text.EMPTY); // Make sure the element is always rendered
         if (lang != null && !lang.isBlank()) {
             code.addStyle("language-" + lang);
@@ -196,16 +196,16 @@ private Content snippetTagOutput(Element element, SnippetTree tag, StyledText co
         String copyText = resources.getText("doclet.Copy_to_clipboard");
         String copiedText = resources.getText("doclet.Copied_to_clipboard");
         String copySnippetText = resources.getText("doclet.Copy_snippet_to_clipboard");
-        var snippetContainer = HtmlTree.DIV(HtmlStyle.snippetContainer,
-                new HtmlTree(TagName.BUTTON)
+        var snippetContainer = HtmlTree.DIV(HtmlStyles.snippetContainer,
+                new HtmlTree(HtmlTag.BUTTON)
                         .add(HtmlTree.SPAN(Text.of(copyText))
                                 .put(HtmlAttr.DATA_COPIED, copiedText))
-                        .add(new HtmlTree(TagName.IMG)
+                        .add(new HtmlTree(HtmlTag.IMG)
                                 .put(HtmlAttr.SRC, pathToRoot.resolve(DocPaths.RESOURCE_FILES)
                                                              .resolve(DocPaths.CLIPBOARD_SVG).getPath())
                                 .put(HtmlAttr.ALT, copySnippetText))
-                        .addStyle(HtmlStyle.copy)
-                        .addStyle(HtmlStyle.snippetCopy)
+                        .addStyle(HtmlStyles.copy)
+                        .addStyle(HtmlStyles.snippetCopy)
                         .put(HtmlAttr.ARIA_LABEL, copySnippetText)
                         .put(HtmlAttr.ONCLICK, "copySnippet(this)"));
         return snippetContainer.add(pre.add(code));
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SpecTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SpecTaglet.java
index e55ede7a7e1cf..b408d30b16835 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SpecTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SpecTaglet.java
@@ -30,7 +30,6 @@
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
@@ -42,16 +41,16 @@
 import jdk.javadoc.doclet.Taglet;
 import jdk.javadoc.internal.doclets.formats.html.Contents;
 import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
-import jdk.javadoc.internal.doclets.formats.html.Content;
-import jdk.javadoc.internal.doclets.formats.html.markup.TextBuilder;
 import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFinder;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.Entity;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.RawHtml;
+import jdk.javadoc.internal.html.Text;
+import jdk.javadoc.internal.html.TextBuilder;
 
 /**
  * A taglet that represents the {@code @spec} tag.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SummaryTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SummaryTaglet.java
index 0961c7312d563..7912abef0c6ec 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SummaryTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SummaryTaglet.java
@@ -34,7 +34,7 @@
 
 import jdk.javadoc.doclet.Taglet.Location;
 import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
-import jdk.javadoc.internal.doclets.formats.html.Content;
+import jdk.javadoc.internal.html.Content;
 
 /**
  * A taglet that represents the {@code {@summary}} tag.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SystemPropertyTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SystemPropertyTaglet.java
index 3dc72e561a131..4cab9d90ce0d0 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SystemPropertyTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SystemPropertyTaglet.java
@@ -34,8 +34,8 @@
 
 import jdk.javadoc.doclet.Taglet;
 import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.Content;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.HtmlTree;
 
 /**
  * A taglet that represents the {@code @systemProperty} tag.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/Taglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/Taglet.java
index 0236287468cb2..c1c6a56e5cbb3 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/Taglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/Taglet.java
@@ -26,12 +26,14 @@
 package jdk.javadoc.internal.doclets.formats.html.taglets;
 
 import java.util.Set;
+
 import javax.lang.model.element.Element;
 
 import com.sun.source.doctree.DocTree;
+
 import jdk.javadoc.doclet.Taglet.Location;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.Content;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.HtmlTree;
 
 /**
  * This is the taglet interface used internally within the doclet.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/TagletWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/TagletWriter.java
index b977951f2fa73..79b4433a58bc0 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/TagletWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/TagletWriter.java
@@ -43,20 +43,13 @@
 import javax.lang.model.util.SimpleElementVisitor14;
 
 import com.sun.source.doctree.DocTree;
-
 import com.sun.source.doctree.InlineTagTree;
+
 import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
 import jdk.javadoc.internal.doclets.formats.html.HtmlDocletWriter;
 import jdk.javadoc.internal.doclets.formats.html.HtmlIds;
 import jdk.javadoc.internal.doclets.formats.html.HtmlOptions;
-import jdk.javadoc.internal.doclets.formats.html.IndexWriter;
-import jdk.javadoc.internal.doclets.formats.html.SummaryListWriter;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlId;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
-import jdk.javadoc.internal.doclets.formats.html.Content;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 import jdk.javadoc.internal.doclets.formats.html.taglets.Taglet.UnsupportedTagletOperationException;
 import jdk.javadoc.internal.doclets.toolkit.DocletElement;
 import jdk.javadoc.internal.doclets.toolkit.Resources;
@@ -64,6 +57,11 @@
 import jdk.javadoc.internal.doclets.toolkit.util.DocLink;
 import jdk.javadoc.internal.doclets.toolkit.util.IndexItem;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlId;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * Context and utility methods for taglet classes.
@@ -377,7 +375,7 @@ Content createAnchorAndSearchIndex(Element element, String tagText, Content tagC
             result = tagContent;
         } else {
             HtmlId id = HtmlIds.forText(tagText, htmlWriter.indexAnchorTable);
-            result = HtmlTree.SPAN(id, HtmlStyle.searchTagResult, tagContent);
+            result = HtmlTree.SPAN(id, HtmlStyles.searchTagResult, tagContent);
             if (options.createIndex() && !tagText.isEmpty()) {
                 String holder = getHolderName(element);
                 IndexItem item = IndexItem.of(element, tree, tagText, holder, desc,
@@ -457,7 +455,7 @@ private String getHolderName(DocletElement de) {
     Content tagList(List<Content> items) {
         // Use a different style if any list item is longer than 30 chars or contains commas.
         boolean hasLongLabels = items.stream().anyMatch(this::isLongOrHasComma);
-        var list = HtmlTree.UL(hasLongLabels ? HtmlStyle.tagListLong : HtmlStyle.tagList);
+        var list = HtmlTree.UL(hasLongLabels ? HtmlStyles.tagListLong : HtmlStyles.tagList);
         items.stream()
                 .filter(Predicate.not(Content::isEmpty))
                 .forEach(item -> list.add(HtmlTree.LI(item)));
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/ThrowsTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/ThrowsTaglet.java
index 131f0350e5e13..ca4a8c939abba 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/ThrowsTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/ThrowsTaglet.java
@@ -57,12 +57,12 @@
 import jdk.javadoc.internal.doclets.formats.html.Contents;
 import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
 import jdk.javadoc.internal.doclets.formats.html.HtmlLinkInfo;
-import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFinder;
 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
 import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberTable;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.HtmlTree;
 
 /**
  * A taglet that processes {@link ThrowsTree}, which represents {@code @throws}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/UserTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/UserTaglet.java
index bcfdd6682ed29..cc5ae21ba2965 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/UserTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/UserTaglet.java
@@ -32,8 +32,8 @@
 
 import com.sun.source.doctree.DocTree;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.RawHtml;
-import jdk.javadoc.internal.doclets.formats.html.Content;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.RawHtml;
 
 /**
  * A taglet wrapper, allows the public taglet {@link jdk.javadoc.doclet.Taglet}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/ValueTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/ValueTaglet.java
index 006277eeeb006..a4fddef0f117a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/ValueTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/ValueTaglet.java
@@ -39,10 +39,10 @@
 import jdk.javadoc.doclet.Taglet;
 import jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration;
 import jdk.javadoc.internal.doclets.formats.html.HtmlLinkInfo;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
 import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
-import jdk.javadoc.internal.doclets.formats.html.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper;
+import jdk.javadoc.internal.html.Content;
+import jdk.javadoc.internal.html.Text;
 
 /**
  * An inline taglet representing the value tag. This tag should only be used with
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java
index d33e4874c008a..7bc5563950186 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java
@@ -101,9 +101,16 @@
 import com.sun.tools.javac.util.DefinedBy;
 import com.sun.tools.javac.util.DefinedBy.Api;
 
-import jdk.javadoc.internal.doclint.HtmlTag.AttrKind;
-import jdk.javadoc.internal.doclint.HtmlTag.ElemKind;
-import static jdk.javadoc.internal.doclint.Messages.Group.*;
+import jdk.javadoc.internal.html.HtmlAttr;
+import jdk.javadoc.internal.html.HtmlAttr.AttrKind;
+import jdk.javadoc.internal.html.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTag.ElemKind;
+
+import static jdk.javadoc.internal.doclint.Messages.Group.ACCESSIBILITY;
+import static jdk.javadoc.internal.doclint.Messages.Group.HTML;
+import static jdk.javadoc.internal.doclint.Messages.Group.MISSING;
+import static jdk.javadoc.internal.doclint.Messages.Group.REFERENCE;
+import static jdk.javadoc.internal.doclint.Messages.Group.SYNTAX;
 
 
 /**
@@ -132,12 +139,12 @@ public enum Flag {
     static class TagStackItem {
         final DocTree tree; // typically, but not always, StartElementTree
         final HtmlTag tag;
-        final Set<HtmlTag.Attr> attrs;
+        final Set<HtmlAttr> attrs;
         final Set<Flag> flags;
         TagStackItem(DocTree tree, HtmlTag tag) {
             this.tree = tree;
             this.tag = tag;
-            attrs = EnumSet.noneOf(HtmlTag.Attr.class);
+            attrs = EnumSet.noneOf(HtmlAttr.class);
             flags = EnumSet.noneOf(Flag.class);
         }
         @Override
@@ -399,7 +406,7 @@ void checkAllowsText(DocTree tree) {
     @Override @DefinedBy(Api.COMPILER_TREE)
     public Void visitStartElement(StartElementTree tree, Void ignore) {
         final Name treeName = tree.getName();
-        final HtmlTag t = HtmlTag.get(treeName);
+        final HtmlTag t = HtmlTag.of(treeName);
         if (t == null) {
             env.messages.error(HTML, tree, "dc.tag.unknown", treeName);
         } else if (t.elemKind == ElemKind.HTML4) {
@@ -472,7 +479,7 @@ public Void visitStartElement(StartElementTree tree, Void ignore) {
                     }
 
                     case IMG -> {
-                        if (!top.attrs.contains(HtmlTag.Attr.ALT))
+                        if (!top.attrs.contains(HtmlAttr.ALT))
                             env.messages.error(ACCESSIBILITY, tree, "dc.no.alt.attr.for.image");
                     }
                 }
@@ -592,7 +599,7 @@ private int getHeadingRank(HtmlTag tag) {
     @Override @DefinedBy(Api.COMPILER_TREE)
     public Void visitEndElement(EndElementTree tree, Void ignore) {
         final Name treeName = tree.getName();
-        final HtmlTag t = HtmlTag.get(treeName);
+        final HtmlTag t = HtmlTag.of(treeName);
         if (t == null) {
             env.messages.error(HTML, tree, "dc.tag.unknown", treeName);
         } else if (t.endKind == HtmlTag.EndKind.NONE) {
@@ -605,7 +612,7 @@ public Void visitEndElement(EndElementTree tree, Void ignore) {
                     switch (t) {
                         case TABLE -> {
                             if (!top.flags.contains(Flag.TABLE_IS_PRESENTATION)
-                                    && !top.attrs.contains(HtmlTag.Attr.SUMMARY)
+                                    && !top.attrs.contains(HtmlAttr.SUMMARY)
                                     && !top.flags.contains(Flag.TABLE_HAS_CAPTION)) {
                                 env.messages.error(ACCESSIBILITY, tree,
                                         "dc.no.summary.or.caption.for.table");
@@ -682,7 +689,7 @@ public Void visitAttribute(AttributeTree tree, Void ignore) {
         HtmlTag currTag = tagStack.peek().tag;
         if (currTag != null && currTag.elemKind != ElemKind.HTML4) {
             Name name = tree.getName();
-            HtmlTag.Attr attr = currTag.getAttr(name);
+            HtmlAttr attr = currTag.getAttr(name);
             if (attr != null) {
                 boolean first = tagStack.peek().attrs.add(attr);
                 if (!first)
@@ -758,19 +765,21 @@ public Void visitAttribute(AttributeTree tree, Void ignore) {
                             String v = getAttrValue(tree);
                             try {
                                 if (v == null || (!v.isEmpty() && Integer.parseInt(v) != 1)) {
-                                    env.messages.error(HTML, tree, "dc.attr.table.border.not.valid", attr);
+                                    env.messages.error(HTML, tree, "dc.attr.table.border.not.valid",
+                                            (v == null ? tree : v));
                                 }
                             } catch (NumberFormatException ex) {
-                                env.messages.error(HTML, tree, "dc.attr.table.border.not.number", attr);
+                                env.messages.error(HTML, tree, "dc.attr.table.border.not.number", v);
                             }
                         } else if (currTag == HtmlTag.IMG) {
                             String v = getAttrValue(tree);
                             try {
                                 if (v == null || (!v.isEmpty() && Integer.parseInt(v) != 0)) {
-                                    env.messages.error(HTML, tree, "dc.attr.img.border.not.valid", attr);
+                                    env.messages.error(HTML, tree, "dc.attr.img.border.not.valid",
+                                            (v == null ? tree : v));
                                 }
                             } catch (NumberFormatException ex) {
-                                env.messages.error(HTML, tree, "dc.attr.img.border.not.number", attr);
+                                env.messages.error(HTML, tree, "dc.attr.img.border.not.number", v);
                             }
                         }
                     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Comment.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Comment.java
similarity index 94%
rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Comment.java
rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Comment.java
index aa563eeded768..77b456cc7ffe8 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Comment.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Comment.java
@@ -23,14 +23,12 @@
  * questions.
  */
 
-package jdk.javadoc.internal.doclets.formats.html.markup;
+package jdk.javadoc.internal.html;
 
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Objects;
 
-import jdk.javadoc.internal.doclets.formats.html.Content;
-
 /**
  * Class for generating a comment for HTML pages of javadoc output.
  */
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Content.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Content.java
similarity index 99%
rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Content.java
rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Content.java
index 13a2bb4c1bf8b..63142f8301138 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Content.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Content.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.javadoc.internal.doclets.formats.html;
+package jdk.javadoc.internal.html;
 
 import java.io.IOException;
 import java.io.StringWriter;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/ContentBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/ContentBuilder.java
similarity index 96%
rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/ContentBuilder.java
rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/ContentBuilder.java
index b059b0fdb3660..358b1591dfc66 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/ContentBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/ContentBuilder.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.javadoc.internal.doclets.formats.html.markup;
+package jdk.javadoc.internal.html;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -31,8 +31,6 @@
 import java.util.List;
 import java.util.Objects;
 
-import jdk.javadoc.internal.doclets.formats.html.Content;
-
 /**
  * A sequence of Content nodes.
  */
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/DocType.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/DocType.java
similarity index 96%
rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/DocType.java
rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/DocType.java
index dd4b50eb76089..5e6bf502fe111 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/DocType.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/DocType.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.javadoc.internal.doclets.formats.html.markup;
+package jdk.javadoc.internal.html;
 
 /**
  * Supported DOCTYPE declarations.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Entity.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Entity.java
similarity index 97%
rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Entity.java
rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Entity.java
index 542e081a58385..fbc7e08761626 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Entity.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Entity.java
@@ -23,9 +23,7 @@
  * questions.
  */
 
-package jdk.javadoc.internal.doclets.formats.html.markup;
-
-import jdk.javadoc.internal.doclets.formats.html.Content;
+package jdk.javadoc.internal.html;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlAttr.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlAttr.java
new file mode 100644
index 0000000000000..ccb193d6ab9ad
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlAttr.java
@@ -0,0 +1,275 @@
+/*
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package jdk.javadoc.internal.html;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Locale;
+
+
+/**
+ * An abstraction for the type-safe representation and use of HTML attributes.
+ *
+ * @apiNote
+ * Attributes are used when performing simple validity checks on HTML in
+ * documentation comments, and when generating HTML for output.
+ *
+ * @see HtmlTree#put(HtmlAttr, String)
+ */
+public enum HtmlAttr {
+    ABBR,
+    ACCESSKEY(true),
+    ALIGN,
+    ALINK,
+    ALT,
+    ARIA_ACTIVEDESCENDANT(true),
+    ARIA_CONTROLS(true),
+    ARIA_DESCRIBEDBY(true),
+    ARIA_EXPANDED(true),
+    ARIA_LABEL(true),
+    ARIA_LABELLEDBY(true),
+    ARIA_LEVEL(true),
+    ARIA_MULTISELECTABLE(true),
+    ARIA_ORIENTATION(true),
+    ARIA_OWNS(true),
+    ARIA_POSINSET(true),
+    ARIA_READONLY(true),
+    ARIA_REQUIRED(true),
+    ARIA_SELECTED(true),
+    ARIA_SETSIZE(true),
+    ARIA_SORT(true),
+    AUTOCAPITALIZE(true),
+    AUTOCOMPLETE,
+    AUTOFOCUS(true),
+    AXIS,
+    BACKGROUND,
+    BGCOLOR,
+    BORDER,
+    CELLPADDING,
+    CELLSPACING,
+    CHAR,
+    CHAROFF,
+    CHARSET,
+    CHECKED,
+    CITE,
+    CLASS(true),
+    CLEAR,
+    COLOR,
+    COLS,
+    COLSPAN,
+    COMPACT,
+    CONTENT,
+    CONTENTEDITABLE(true),
+    COORDS,
+    CROSSORIGIN,
+    DATA_COPIED, // custom HTML5 data attribute
+    DATETIME,
+    DIR(true),
+    DISABLED,
+    DRAGGABLE(true),
+    ENTERKEYHINT(true),
+    FACE,
+    FOR,
+    FORM,
+    FRAME,
+    FRAMEBORDER,
+    HEADERS,
+    HEIGHT,
+    HIDDEN(true),
+    HREF,
+    HSPACE,
+    HTTP_EQUIV,
+    ID(true),
+    INERT(true),
+    INPUTMODE(true),
+    IS(true),
+    ITEMID(true),
+    ITEMPROP(true),
+    ITEMREF(true),
+    ITEMSCOPE(true),
+    ITEMTYPE(true),
+    LANG(true),
+    LINK,
+    LONGDESC,
+    MARGINHEIGHT,
+    MARGINWIDTH,
+    NAME,
+    NONCE(true),
+    NOSHADE,
+    NOWRAP,
+    ONCLICK,
+    ONKEYDOWN,
+    ONLOAD,
+    PLACEHOLDER,
+    POPOVER(true),
+    PROFILE,
+    REL,
+    REV,
+    REVERSED,
+    ROLE(true),
+    ROWS,
+    ROWSPAN,
+    RULES,
+    SCHEME,
+    SCOPE,
+    SCROLLING,
+    SHAPE,
+    SIZE,
+    SPACE,
+    SPELLCHECK(true),
+    SRC,
+    START,
+    STYLE(true),
+    SUMMARY,
+    TABINDEX(true),
+    TARGET,
+    TEXT,
+    TITLE(true),
+    TRANSLATE(true),
+    TYPE,
+    VALIGN,
+    VALUE,
+    VERSION,
+    VLINK,
+    VSPACE,
+    WIDTH,
+    WRITINGSUGGESTIONS(true);
+
+    /**
+     * The "external" name of this attribute.
+     */
+    private final String name;
+
+    /**
+     * Whether this is a global attribute, that can be used with all HTML tags.
+     */
+    private final boolean isGlobal;
+
+    /**
+     * An abstraction for the type-safe representation and use of ARIA roles.
+     *
+     * @see HtmlTree#setRole(Role)
+     */
+    public enum Role {
+
+        BANNER,
+        CONTENTINFO,
+        MAIN,
+        NAVIGATION,
+        REGION;
+
+        private final String role;
+
+        Role() {
+            role = name().toLowerCase(Locale.ROOT);
+        }
+
+        public String toString() {
+            return role;
+        }
+    }
+
+    /**
+     * An abstraction for the type-safe representation and use of "input" types.
+     *
+     * @see HtmlTree#INPUT(InputType, HtmlId)
+     * @see HtmlTree#INPUT(InputType, HtmlStyle)
+     */
+    public enum InputType {
+
+        CHECKBOX,
+        RESET,
+        TEXT;
+
+        private final String type;
+
+        InputType() {
+            type = name().toLowerCase(Locale.ROOT);
+        }
+
+        public String toString() {
+            return type;
+        }
+    }
+
+    /**
+     * An abstraction for the kind of an attribute in the context of an HTML tag.
+     *
+     * @see HtmlTag#attrs(AttrKind,HtmlAttr...)
+     */
+    public enum AttrKind {
+        OK,
+        INVALID,
+        OBSOLETE,
+        HTML4
+    }
+
+    HtmlAttr() {
+        this(false);
+    }
+
+    HtmlAttr(boolean flag) {
+        name = name().toLowerCase(Locale.ROOT).replace("_", "-");
+        isGlobal = flag;
+    }
+
+    /**
+     * {@return the "external" name of this attribute}
+     * The external name is the name of the enum member in lower case with {@code _} replaced by {@code -}.
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * {@return whether this attribute is a global attribute, that may appear on all tags}
+     */
+    public boolean isGlobal() {
+        return isGlobal;
+    }
+
+    // FIXME: this is used in doclint Checker, when generating messages
+    @Override
+    public String toString() {
+        return name;
+    }
+
+    private static final Map<String, HtmlAttr> index = new HashMap<>();
+    static {
+        for (HtmlAttr t : values()) {
+            index.put(t.getName(), t);
+        }
+    }
+
+    /**
+     * {@return the attribute with the given name, or {@code null} if there is no known attribute}
+     *
+     * @param name the name
+     */
+    public static HtmlAttr of(CharSequence name) {
+        return index.get(name.toString().toLowerCase(Locale.ROOT));
+    }
+}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlId.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlId.java
similarity index 96%
rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlId.java
rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlId.java
index 1e0db271ef544..a6af14382848b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlId.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlId.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.javadoc.internal.doclets.formats.html.markup;
+package jdk.javadoc.internal.html;
 
 /**
  * A type-safe wrapper around a {@code String}, for use as an "id"
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlStyle.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlStyle.java
new file mode 100644
index 0000000000000..9b77d5de8b49f
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlStyle.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package jdk.javadoc.internal.html;
+
+/**
+ * An abstraction for the type-safe representation and use of CSS class names.
+ *
+ * @apiNote
+ * Despite the name, implementations of this interface provide values for the HTML
+ * {@code class} attribute, and <strong>not</strong> the HTML {@code style} attribute.
+ * This is to avoid confusion with the widespread use of the word "class" in the Java ecosystem,
+ * and the potential for clashes with methods called {@code setClass} instead of {@code setStyle}.
+ *
+ * @see HtmlTree#addStyle(HtmlStyle)
+ * @see HtmlTree#setStyle(HtmlStyle)
+ */
+public interface HtmlStyle {
+    String cssName();
+}
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/HtmlTag.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlTag.java
similarity index 72%
rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/HtmlTag.java
rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlTag.java
index fa9d3ea578dd4..7b198a066315a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/HtmlTag.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlTag.java
@@ -23,18 +23,18 @@
  * questions.
  */
 
-package jdk.javadoc.internal.doclint;
+package jdk.javadoc.internal.html;
 
+import java.io.Serial;
 import java.util.EnumMap;
 import java.util.EnumSet;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import javax.lang.model.element.Name;
 
-import com.sun.tools.javac.util.StringUtils;
-
-import static jdk.javadoc.internal.doclint.HtmlTag.Attr.*;
+import static jdk.javadoc.internal.html.HtmlAttr.*;
 
 /**
  * Enum representing HTML tags.
@@ -42,10 +42,6 @@
  * The intent of this class is to embody the semantics of the current HTML standard,
  * to the extent supported/used by javadoc.
  *
- * This class is derivative of {@link jdk.javadoc.internal.doclets.formats.html.markup.TagName}.
- * Eventually, these two should be merged back together, and possibly made
- * public.
- *
  * @see <a href="https://html.spec.whatwg.org/multipage/">HTML Living Standard</a>
  * @see <a href="http://www.w3.org/TR/html5/">HTML 5 Specification</a>
  * @see <a href="http://www.w3.org/TR/REC-html40/">HTML 4.01 Specification</a>
@@ -88,6 +84,9 @@ public enum HtmlTag {
     BR(BlockType.INLINE, EndKind.NONE,
             attrs(AttrKind.HTML4, CLEAR)),
 
+    BUTTON(BlockType.INLINE, EndKind.REQUIRED,
+            attrs(AttrKind.OK, FORM, NAME, TYPE, VALUE)),
+
     CAPTION(BlockType.TABLE_ITEM, EndKind.REQUIRED,
             EnumSet.of(Flag.ACCEPTS_INLINE, Flag.EXPECT_CONTENT),
             attrs(AttrKind.HTML4, ALIGN)),
@@ -117,7 +116,10 @@ public boolean accepts(HtmlTag t) {
 
     DEL(BlockType.INLINE, EndKind.REQUIRED,
             EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST),
-            attrs(AttrKind.OK, Attr.CITE, Attr.DATETIME)),
+            attrs(AttrKind.OK, HtmlAttr.CITE, HtmlAttr.DATETIME)),
+
+    DETAILS(BlockType.BLOCK, EndKind.REQUIRED,
+            EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)),
 
     DFN(BlockType.INLINE, EndKind.REQUIRED,
             EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
@@ -149,12 +151,10 @@ public boolean accepts(HtmlTag t) {
             EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)) {
         @Override
         public boolean accepts(HtmlTag t) {
-            switch (t) {
-                case HEADER: case FOOTER: case MAIN:
-                    return false;
-                default:
-                    return (t.blockType == BlockType.BLOCK) || (t.blockType == BlockType.INLINE);
-            }
+            return switch (t) {
+                case HEADER, FOOTER, MAIN -> false;
+                default -> (t.blockType == BlockType.BLOCK) || (t.blockType == BlockType.INLINE);
+            };
         }
     },
 
@@ -186,12 +186,10 @@ public boolean accepts(HtmlTag t) {
             EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)) {
         @Override
         public boolean accepts(HtmlTag t) {
-            switch (t) {
-                case HEADER: case FOOTER: case MAIN:
-                    return false;
-                default:
-                    return (t.blockType == BlockType.BLOCK) || (t.blockType == BlockType.INLINE);
-            }
+            return switch (t) {
+                case HEADER, FOOTER, MAIN -> false;
+                default -> (t.blockType == BlockType.BLOCK) || (t.blockType == BlockType.INLINE);
+            };
         }
     },
 
@@ -209,19 +207,25 @@ public boolean accepts(HtmlTag t) {
             attrs(AttrKind.OK, SRC, ALT, HEIGHT, WIDTH, CROSSORIGIN),
             attrs(AttrKind.HTML4, NAME, ALIGN, HSPACE, VSPACE, BORDER)),
 
+    INPUT(BlockType.INLINE, EndKind.NONE,
+            attrs(AttrKind.OK, NAME, TYPE, VALUE)),
+
     INS(BlockType.INLINE, EndKind.REQUIRED,
             EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST),
-            attrs(AttrKind.OK, Attr.CITE, Attr.DATETIME)),
+            attrs(AttrKind.OK, HtmlAttr.CITE, HtmlAttr.DATETIME)),
 
     KBD(BlockType.INLINE, EndKind.REQUIRED,
             EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
 
+    LABEL(BlockType.INLINE, EndKind.REQUIRED),
+
     LI(BlockType.LIST_ITEM, EndKind.OPTIONAL,
             EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE),
             attrs(AttrKind.OK, VALUE),
             attrs(AttrKind.HTML4, TYPE)),
 
-    LINK(BlockType.OTHER, EndKind.NONE),
+    LINK(BlockType.INLINE, EndKind.NONE,
+            attrs(AttrKind.OK, REL)),
 
     MAIN(BlockType.OTHER, EndKind.REQUIRED),
 
@@ -262,12 +266,10 @@ public boolean accepts(HtmlTag t) {
             attrs(AttrKind.HTML4, WIDTH)) {
         @Override
         public boolean accepts(HtmlTag t) {
-            switch (t) {
-                case IMG: case BIG: case SMALL: case SUB: case SUP:
-                    return false;
-                default:
-                    return (t.blockType == BlockType.INLINE);
-            }
+            return switch (t) {
+                case IMG, BIG, SMALL, SUB, SUP -> false;
+                default -> (t.blockType == BlockType.INLINE);
+            };
         }
     },
 
@@ -280,8 +282,8 @@ public boolean accepts(HtmlTag t) {
     SAMP(BlockType.INLINE, EndKind.REQUIRED,
             EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
 
-    SCRIPT(BlockType.OTHER, EndKind.REQUIRED,
-            attrs(AttrKind.OK, SRC)),
+    SCRIPT(BlockType.INLINE, EndKind.REQUIRED,
+            attrs(AttrKind.OK, SRC, TYPE)),
 
     SECTION(BlockType.BLOCK, EndKind.REQUIRED,
             EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)),
@@ -303,25 +305,22 @@ public boolean accepts(HtmlTag t) {
     SUB(BlockType.INLINE, EndKind.REQUIRED,
             EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
 
+    SUMMARY(BlockType.BLOCK, EndKind.REQUIRED),
+
     SUP(BlockType.INLINE, EndKind.REQUIRED,
             EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
 
     TABLE(BlockType.BLOCK, EndKind.REQUIRED,
             EnumSet.of(Flag.EXPECT_CONTENT),
             attrs(AttrKind.OK, BORDER),
-            attrs(AttrKind.HTML4, SUMMARY, CELLPADDING, CELLSPACING,
-                    Attr.FRAME, RULES, WIDTH, ALIGN, BGCOLOR)) {
+            attrs(AttrKind.HTML4, HtmlAttr.SUMMARY, CELLPADDING, CELLSPACING,
+                    HtmlAttr.FRAME, RULES, WIDTH, ALIGN, BGCOLOR)) {
         @Override
         public boolean accepts(HtmlTag t) {
-            switch (t) {
-                case CAPTION:
-                case COLGROUP:
-                case THEAD: case TBODY: case TFOOT:
-                case TR: // HTML 3.2
-                    return true;
-                default:
-                    return false;
-            }
+            return switch (t) {
+                case CAPTION, COLGROUP, THEAD, TBODY, TFOOT, TR -> true;
+                default -> false;
+            };
         }
     },
 
@@ -337,7 +336,7 @@ public boolean accepts(HtmlTag t) {
     TD(BlockType.TABLE_ITEM, EndKind.OPTIONAL,
             EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE),
             attrs(AttrKind.OK, COLSPAN, ROWSPAN, HEADERS),
-            attrs(AttrKind.HTML4, AXIS, Attr.ABBR, SCOPE, ALIGN, VALIGN, CHAR, CHAROFF,
+            attrs(AttrKind.HTML4, AXIS, HtmlAttr.ABBR, SCOPE, ALIGN, VALIGN, CHAR, CHAROFF,
                     WIDTH, BGCOLOR, HEIGHT, NOWRAP)),
 
     TEMPLATE(BlockType.BLOCK, EndKind.REQUIRED,
@@ -353,7 +352,7 @@ public boolean accepts(HtmlTag t) {
 
     TH(BlockType.TABLE_ITEM, EndKind.OPTIONAL,
             EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE),
-            attrs(AttrKind.OK, COLSPAN, ROWSPAN, HEADERS, SCOPE, Attr.ABBR),
+            attrs(AttrKind.OK, COLSPAN, ROWSPAN, HEADERS, SCOPE, HtmlAttr.ABBR),
             attrs(AttrKind.HTML4, WIDTH, BGCOLOR, HEIGHT, NOWRAP, AXIS, ALIGN, CHAR, CHAROFF, VALIGN)),
 
     THEAD(BlockType.TABLE_ITEM, EndKind.REQUIRED,
@@ -408,6 +407,7 @@ public enum ElemKind {
     /**
      * Enum representing the type of HTML element.
      */
+    // See JDK-8337586 for suggestions
     public enum BlockType {
         BLOCK,
         INLINE,
@@ -432,150 +432,13 @@ public enum Flag {
         NO_NEST
     }
 
-    public enum Attr {
-        ABBR,
-        ACCESSKEY(true),
-        ALIGN,
-        ALINK,
-        ALT,
-        ARIA_ACTIVEDESCENDANT(true),
-        ARIA_CONTROLS(true),
-        ARIA_DESCRIBEDBY(true),
-        ARIA_EXPANDED(true),
-        ARIA_LABEL(true),
-        ARIA_LABELLEDBY(true),
-        ARIA_LEVEL(true),
-        ARIA_MULTISELECTABLE(true),
-        ARIA_OWNS(true),
-        ARIA_POSINSET(true),
-        ARIA_READONLY(true),
-        ARIA_REQUIRED(true),
-        ARIA_SELECTED(true),
-        ARIA_SETSIZE(true),
-        ARIA_SORT(true),
-        AUTOCAPITALIZE(true),
-        AUTOFOCUS(true),
-        AXIS,
-        BACKGROUND,
-        BGCOLOR,
-        BORDER,
-        CELLPADDING,
-        CELLSPACING,
-        CHAR,
-        CHAROFF,
-        CHARSET,
-        CITE,
-        CLASS(true),
-        CLEAR,
-        COLOR,
-        COLSPAN,
-        COMPACT,
-        CONTENTEDITABLE(true),
-        COORDS,
-        CROSSORIGIN,
-        DATETIME,
-        DIR(true),
-        DRAGGABLE(true),
-        ENTERKEYHINT(true),
-        FACE,
-        FRAME,
-        FRAMEBORDER,
-        HEADERS,
-        HEIGHT,
-        HIDDEN(true),
-        HREF,
-        HSPACE,
-        ID(true),
-        INERT(true),
-        INPUTMODE(true),
-        IS(true),
-        ITEMID(true),
-        ITEMPROP(true),
-        ITEMREF(true),
-        ITEMSCOPE(true),
-        ITEMTYPE(true),
-        LANG(true),
-        LINK,
-        LONGDESC,
-        MARGINHEIGHT,
-        MARGINWIDTH,
-        NAME,
-        NONCE(true),
-        NOSHADE,
-        NOWRAP,
-        POPOVER(true),
-        PROFILE,
-        REV,
-        REVERSED,
-        ROLE(true),
-        ROWSPAN,
-        RULES,
-        SCHEME,
-        SCOPE,
-        SCROLLING,
-        SHAPE,
-        SIZE,
-        SPACE,
-        SPELLCHECK(true),
-        SRC,
-        START,
-        STYLE(true),
-        SUMMARY,
-        TABINDEX(true),
-        TARGET,
-        TEXT,
-        TITLE(true),
-        TRANSLATE(true),
-        TYPE,
-        VALIGN,
-        VALUE,
-        VERSION,
-        VLINK,
-        VSPACE,
-        WIDTH,
-        WRITINGSUGGESTIONS(true);
-
-        private final String name;
-        private final boolean isGlobal;
-
-        Attr() {
-            this(false);
-        }
-
-        Attr(boolean flag) {
-            name = StringUtils.toLowerCase(name().replace("_", "-"));
-            isGlobal = flag;
-        }
-
-        public boolean isGlobal() {
-            return isGlobal;
-        }
-
-        public String getText() {
-            return name;
-        }
-
-        static final Map<String,Attr> index = new HashMap<>();
-        static {
-            for (Attr t: values()) {
-                index.put(t.getText(), t);
-            }
-        }
-    }
-
-    public enum AttrKind {
-        OK,
-        INVALID,
-        OBSOLETE,
-        HTML4
-    }
-
     // This class exists to avoid warnings from using parameterized vararg type
     // Map<Attr,AttrKind> in signature of HtmlTag constructor.
-    private static class AttrMap extends EnumMap<Attr,AttrKind>  {
+    private static class AttrMap extends EnumMap<HtmlAttr,AttrKind> {
+        @Serial
         private static final long serialVersionUID = 0;
         AttrMap() {
-            super(Attr.class);
+            super(HtmlAttr.class);
         }
     }
 
@@ -584,7 +447,7 @@ private static class AttrMap extends EnumMap<Attr,AttrKind>  {
     public final BlockType blockType;
     public final EndKind endKind;
     public final Set<Flag> flags;
-    private final Map<Attr,AttrKind> attrs;
+    private final Map<HtmlAttr,AttrKind> attrs;
 
     HtmlTag(BlockType blockType, EndKind endKind, AttrMap... attrMaps) {
         this(ElemKind.OK, blockType, endKind, Set.of(), attrMaps);
@@ -603,8 +466,8 @@ private static class AttrMap extends EnumMap<Attr,AttrKind>  {
         this.blockType = blockType;
         this.endKind = endKind;
         this.flags = flags;
-        this.attrs = new EnumMap<>(Attr.class);
-        for (Map<Attr,AttrKind> m: attrMaps)
+        this.attrs = new EnumMap<>(HtmlAttr.class);
+        for (Map<HtmlAttr,AttrKind> m: attrMaps)
             this.attrs.putAll(m);
     }
 
@@ -615,20 +478,18 @@ public boolean accepts(HtmlTag t) {
             return (t.blockType == BlockType.BLOCK);
         } else if (flags.contains(Flag.ACCEPTS_INLINE)) {
             return (t.blockType == BlockType.INLINE);
-        } else
-            switch (blockType) {
-                case BLOCK:
-                case INLINE:
-                    return (t.blockType == BlockType.INLINE);
-                case OTHER:
+        } else {
+            // any combination which could otherwise arrive here
+            // ought to have been handled in an overriding method
+            return switch (blockType) {
+                case BLOCK, INLINE -> (t.blockType == BlockType.INLINE);
+                case OTHER ->
                     // OTHER tags are invalid in doc comments, and will be
                     // reported separately, so silently accept/ignore any content
-                    return true;
-                default:
-                    // any combination which could otherwise arrive here
-                    // ought to have been handled in an overriding method
-                    throw new AssertionError(this + ":" + t);
-            }
+                        true;
+                default -> throw new AssertionError(this + ":" + t);
+            };
+        }
     }
 
     public boolean acceptsText() {
@@ -637,16 +498,16 @@ public boolean acceptsText() {
         return accepts(B);
     }
 
-    public String getText() {
-        return StringUtils.toLowerCase(name());
+    public String getName() {
+        return name().toLowerCase(Locale.ROOT).replace("_", "-");
     }
 
-    public Attr getAttr(Name attrName) {
-        return Attr.index.get(StringUtils.toLowerCase(attrName.toString()));
+    public HtmlAttr getAttr(Name attrName) {
+        return HtmlAttr.of(attrName);
     }
 
     public AttrKind getAttrKind(Name attrName) {
-        Attr attr = getAttr(attrName);
+        HtmlAttr attr = getAttr(attrName);
         if (attr == null) {
             return AttrKind.INVALID;
         }
@@ -655,20 +516,20 @@ public AttrKind getAttrKind(Name attrName) {
                 attrs.getOrDefault(attr, AttrKind.INVALID);
     }
 
-    private static AttrMap attrs(AttrKind k, Attr... attrs) {
+    private static AttrMap attrs(AttrKind k, HtmlAttr... attrs) {
         AttrMap map = new AttrMap();
-        for (Attr a: attrs) map.put(a, k);
+        for (HtmlAttr a : attrs) map.put(a, k);
         return map;
     }
 
     private static final Map<String, HtmlTag> index = new HashMap<>();
     static {
         for (HtmlTag t: values()) {
-            index.put(t.getText(), t);
+            index.put(t.getName(), t);
         }
     }
 
-    public static HtmlTag get(Name tagName) {
-        return index.get(StringUtils.toLowerCase(tagName.toString()));
+    public static HtmlTag of(CharSequence tagName) {
+        return index.get(tagName.toString().toLowerCase(Locale.ROOT));
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlTree.java
similarity index 90%
rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java
rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlTree.java
index 57adb96632612..f60537511746d 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlTree.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.javadoc.internal.doclets.formats.html.markup;
+package jdk.javadoc.internal.html;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -38,9 +38,6 @@
 import java.util.Objects;
 import java.util.function.Function;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr.Role;
-import jdk.javadoc.internal.doclets.formats.html.Content;
-
 /**
  * A tree node representing an HTML element, containing the name of the element,
  * a collection of attributes, and content.
@@ -63,10 +60,10 @@
 public class HtmlTree extends Content {
 
     /**
-     * The name of the HTML element.
+     * The tag for the HTML element.
      * This value is never {@code null}.
      */
-    public final TagName tagName;
+    public final HtmlTag tag;
 
     /**
      * The attributes for the HTML element.
@@ -84,10 +81,10 @@ public class HtmlTree extends Content {
      * Creates an {@code HTMLTree} object representing an HTML element
      * with the given name.
      *
-     * @param tagName the name
+     * @param tag the name
      */
-    public HtmlTree(TagName tagName) {
-        this.tagName = Objects.requireNonNull(tagName);
+    public HtmlTree(HtmlTag tag) {
+        this.tag = Objects.requireNonNull(tag);
     }
 
     /**
@@ -131,7 +128,7 @@ public HtmlTree setTitle(Content body) {
      * @param role the role
      * @return this object
      */
-    public HtmlTree setRole(Role role) {
+    public HtmlTree setRole(HtmlAttr.Role role) {
         return put(HtmlAttr.ROLE, role.toString());
     }
 
@@ -347,7 +344,7 @@ public static String encodeURL(String url) {
      * @return the element
      */
     public static HtmlTree A(String ref, Content body) {
-        return new HtmlTree(TagName.A)
+        return new HtmlTree(HtmlTag.A)
                 .put(HtmlAttr.HREF, encodeURL(ref))
                 .add(body);
     }
@@ -363,7 +360,7 @@ public static HtmlTree A(String ref, Content body) {
      * @return the element
      */
     public static HtmlTree A(URI ref, Content body) {
-        return new HtmlTree(TagName.A)
+        return new HtmlTree(HtmlTag.A)
                 .put(HtmlAttr.HREF, ref.toASCIIString())
                 .add(body);
     }
@@ -375,7 +372,7 @@ public static HtmlTree A(URI ref, Content body) {
      * @return the element
      */
     public static HtmlTree CAPTION(Content body) {
-        return new HtmlTree(TagName.CAPTION)
+        return new HtmlTree(HtmlTag.CAPTION)
                 .add(body);
     }
 
@@ -386,7 +383,7 @@ public static HtmlTree CAPTION(Content body) {
      * @return the element
      */
     public static HtmlTree CODE(Content body) {
-        return new HtmlTree(TagName.CODE)
+        return new HtmlTree(HtmlTag.CODE)
                 .add(body);
     }
 
@@ -397,7 +394,7 @@ public static HtmlTree CODE(Content body) {
      * @return the element
      */
     public static HtmlTree DD(Content body) {
-        return new HtmlTree(TagName.DD)
+        return new HtmlTree(HtmlTag.DD)
                 .add(body);
     }
 
@@ -407,7 +404,7 @@ public static HtmlTree DD(Content body) {
      * @return the element
      */
     public static HtmlTree DETAILS() {
-        return new HtmlTree(TagName.DETAILS);
+        return new HtmlTree(HtmlTag.DETAILS);
     }
 
     /**
@@ -416,7 +413,7 @@ public static HtmlTree DETAILS() {
      * @return the element
      */
     public static HtmlTree DETAILS(HtmlStyle style) {
-        return new HtmlTree(TagName.DETAILS)
+        return new HtmlTree(HtmlTag.DETAILS)
                 .setStyle(style);
     }
 
@@ -427,7 +424,7 @@ public static HtmlTree DETAILS(HtmlStyle style) {
      * @return the element
      */
     public static HtmlTree DL(HtmlStyle style) {
-        return new HtmlTree(TagName.DL)
+        return new HtmlTree(HtmlTag.DL)
                 .setStyle(style);
     }
 
@@ -439,7 +436,7 @@ public static HtmlTree DL(HtmlStyle style) {
      * @return the element
      */
     public static HtmlTree DL(HtmlStyle style, Content body) {
-        return new HtmlTree(TagName.DL)
+        return new HtmlTree(HtmlTag.DL)
                 .setStyle(style)
                 .add(body);
     }
@@ -451,7 +448,7 @@ public static HtmlTree DL(HtmlStyle style, Content body) {
      * @return the element
      */
     public static HtmlTree DIV(HtmlStyle style) {
-        return new HtmlTree(TagName.DIV)
+        return new HtmlTree(HtmlTag.DIV)
                 .setStyle(style);
     }
 
@@ -463,7 +460,7 @@ public static HtmlTree DIV(HtmlStyle style) {
      * @return the element
      */
     public static HtmlTree DIV(HtmlStyle style, Content body) {
-        return new HtmlTree(TagName.DIV)
+        return new HtmlTree(HtmlTag.DIV)
                 .setStyle(style)
                 .add(body);
     }
@@ -475,7 +472,7 @@ public static HtmlTree DIV(HtmlStyle style, Content body) {
      * @return the element
      */
     public static HtmlTree DIV(Content body) {
-        return new HtmlTree(TagName.DIV)
+        return new HtmlTree(HtmlTag.DIV)
                 .add(body);
     }
 
@@ -486,7 +483,7 @@ public static HtmlTree DIV(Content body) {
      * @return the element
      */
     public static HtmlTree DT(Content body) {
-        return new HtmlTree(TagName.DT)
+        return new HtmlTree(HtmlTag.DT)
                 .add(body);
     }
 
@@ -497,8 +494,8 @@ public static HtmlTree DT(Content body) {
      * @return the element
      */
     public static HtmlTree FOOTER() {
-        return new HtmlTree(TagName.FOOTER)
-                .setRole(Role.CONTENTINFO);
+        return new HtmlTree(HtmlTag.FOOTER)
+                .setRole(HtmlAttr.Role.CONTENTINFO);
     }
 
     /**
@@ -508,8 +505,8 @@ public static HtmlTree FOOTER() {
      * @return the element
      */
     public static HtmlTree HEADER() {
-        return new HtmlTree(TagName.HEADER)
-                .setRole(Role.BANNER);
+        return new HtmlTree(HtmlTag.HEADER)
+                .setRole(HtmlAttr.Role.BANNER);
     }
 
     /**
@@ -519,7 +516,7 @@ public static HtmlTree HEADER() {
      * @param body       the content
      * @return the element
      */
-    public static HtmlTree HEADING(TagName headingTag, Content body) {
+    public static HtmlTree HEADING(HtmlTag headingTag, Content body) {
         return new HtmlTree(checkHeading(headingTag))
                 .add(body);
     }
@@ -532,7 +529,7 @@ public static HtmlTree HEADING(TagName headingTag, Content body) {
      * @param body       the content
      * @return the element
      */
-    public static HtmlTree HEADING(TagName headingTag, HtmlStyle style, Content body) {
+    public static HtmlTree HEADING(HtmlTag headingTag, HtmlStyle style, Content body) {
         return new HtmlTree(checkHeading(headingTag))
                 .setStyle(style)
                 .add(body);
@@ -547,7 +544,7 @@ public static HtmlTree HEADING(TagName headingTag, HtmlStyle style, Content body
      * @param body       the content
      * @return the element
      */
-    public static HtmlTree HEADING_TITLE(TagName headingTag,
+    public static HtmlTree HEADING_TITLE(HtmlTag headingTag,
                                          HtmlStyle style, Content body) {
         return new HtmlTree(checkHeading(headingTag))
                 .setTitle(body)
@@ -563,13 +560,13 @@ public static HtmlTree HEADING_TITLE(TagName headingTag,
      * @param body       the content
      * @return the element
      */
-    public static HtmlTree HEADING_TITLE(TagName headingTag, Content body) {
+    public static HtmlTree HEADING_TITLE(HtmlTag headingTag, Content body) {
         return new HtmlTree(checkHeading(headingTag))
                 .setTitle(body)
                 .add(body);
     }
 
-    private static TagName checkHeading(TagName headingTag) {
+    private static HtmlTag checkHeading(HtmlTag headingTag) {
         return switch (headingTag) {
             case H1, H2, H3, H4, H5, H6 -> headingTag;
             default -> throw new IllegalArgumentException(headingTag.toString());
@@ -586,7 +583,7 @@ private static TagName checkHeading(TagName headingTag) {
      * @return the {@code HTML} element
      */
     public static HtmlTree HTML(String lang, Content head, Content body) {
-        return new HtmlTree(TagName.HTML)
+        return new HtmlTree(HtmlTag.HTML)
                 .put(HtmlAttr.LANG, lang)
                 .add(head)
                 .add(body);
@@ -601,7 +598,7 @@ public static HtmlTree HTML(String lang, Content head, Content body) {
      * @return the element
      */
     public static HtmlTree INPUT(HtmlAttr.InputType type, HtmlId id) {
-        return new HtmlTree(TagName.INPUT)
+        return new HtmlTree(HtmlTag.INPUT)
                 .put(HtmlAttr.TYPE, type.toString())
                 .setId(id)
                 .put(HtmlAttr.DISABLED, "");
@@ -615,7 +612,7 @@ public static HtmlTree INPUT(HtmlAttr.InputType type, HtmlId id) {
      * @return      the element
      */
     public static HtmlTree INPUT(HtmlAttr.InputType type, HtmlStyle style) {
-        return new HtmlTree(TagName.INPUT)
+        return new HtmlTree(HtmlTag.INPUT)
                 .put(HtmlAttr.TYPE, type.toString())
                 .setStyle(style)
                 .put(HtmlAttr.DISABLED, "");
@@ -628,7 +625,7 @@ public static HtmlTree INPUT(HtmlAttr.InputType type, HtmlStyle style) {
      * @return the element
      */
     public static HtmlTree LABEL(String forLabel, Content body) {
-        return new HtmlTree(TagName.LABEL)
+        return new HtmlTree(HtmlTag.LABEL)
                 .put(HtmlAttr.FOR, forLabel)
                 .add(body);
     }
@@ -640,7 +637,7 @@ public static HtmlTree LABEL(String forLabel, Content body) {
      * @return the element
      */
     public static HtmlTree LI(Content body) {
-        return new HtmlTree(TagName.LI)
+        return new HtmlTree(HtmlTag.LI)
                 .add(body);
     }
 
@@ -666,7 +663,7 @@ public static HtmlTree LI(HtmlStyle style, Content body) {
      * @return the element
      */
     public static HtmlTree LINK(String rel, String type, String href, String title) {
-        return new HtmlTree(TagName.LINK)
+        return new HtmlTree(HtmlTag.LINK)
                 .put(HtmlAttr.REL, rel)
                 .put(HtmlAttr.TYPE, type)
                 .put(HtmlAttr.HREF, href)
@@ -680,8 +677,8 @@ public static HtmlTree LINK(String rel, String type, String href, String title)
      * @return the element
      */
     public static HtmlTree MAIN() {
-        return new HtmlTree(TagName.MAIN)
-                .setRole(Role.MAIN);
+        return new HtmlTree(HtmlTag.MAIN)
+                .setRole(HtmlAttr.Role.MAIN);
     }
 
     /**
@@ -691,8 +688,8 @@ public static HtmlTree MAIN() {
      * @return the element
      */
     public static HtmlTree MAIN(Content body) {
-        return new HtmlTree(TagName.MAIN)
-                .setRole(Role.MAIN)
+        return new HtmlTree(HtmlTag.MAIN)
+                .setRole(HtmlAttr.Role.MAIN)
                 .add(body);
     }
 
@@ -705,7 +702,7 @@ public static HtmlTree MAIN(Content body) {
      * @return the element
      */
     public static HtmlTree META(String httpEquiv, String content, String charset) {
-        return new HtmlTree(TagName.META)
+        return new HtmlTree(HtmlTag.META)
                 .put(HtmlAttr.HTTP_EQUIV, httpEquiv)
                 .put(HtmlAttr.CONTENT, content + "; charset=" + charset);
     }
@@ -718,7 +715,7 @@ public static HtmlTree META(String httpEquiv, String content, String charset) {
      * @return the element
      */
     public static HtmlTree META(String name, String content) {
-        return new HtmlTree(TagName.META)
+        return new HtmlTree(HtmlTag.META)
                 .put(HtmlAttr.NAME, name)
                 .put(HtmlAttr.CONTENT, content);
     }
@@ -730,8 +727,8 @@ public static HtmlTree META(String name, String content) {
      * @return the element
      */
     public static HtmlTree NAV() {
-        return new HtmlTree(TagName.NAV)
-                .setRole(Role.NAVIGATION);
+        return new HtmlTree(HtmlTag.NAV)
+                .setRole(HtmlAttr.Role.NAVIGATION);
     }
 
     /**
@@ -741,7 +738,7 @@ public static HtmlTree NAV() {
      * @return the element
      */
     public static HtmlTree NOSCRIPT(Content body) {
-        return new HtmlTree(TagName.NOSCRIPT)
+        return new HtmlTree(HtmlTag.NOSCRIPT)
                 .add(body);
     }
 
@@ -752,7 +749,7 @@ public static HtmlTree NOSCRIPT(Content body) {
      * @return the element
      */
     public static HtmlTree OL(HtmlStyle style) {
-        return new HtmlTree(TagName.OL)
+        return new HtmlTree(HtmlTag.OL)
                 .setStyle(style);
     }
 
@@ -763,7 +760,7 @@ public static HtmlTree OL(HtmlStyle style) {
      * @return the element
      */
     public static HtmlTree P(Content body) {
-        return new HtmlTree(TagName.P)
+        return new HtmlTree(HtmlTag.P)
                 .add(body);
     }
 
@@ -786,7 +783,7 @@ public static HtmlTree P(HtmlStyle style, Content body) {
      * @return the element
      */
     public static HtmlTree PRE(Content body) {
-        return new HtmlTree(TagName.PRE).add(body);
+        return new HtmlTree(HtmlTag.PRE).add(body);
     }
 
     /**
@@ -797,7 +794,7 @@ public static HtmlTree PRE(Content body) {
      * @return the element
      */
     public static HtmlTree SCRIPT(String src) {
-        return new HtmlTree(TagName.SCRIPT)
+        return new HtmlTree(HtmlTag.SCRIPT)
                 .put(HtmlAttr.TYPE, "text/javascript")
                 .put(HtmlAttr.SRC, src);
 
@@ -810,7 +807,7 @@ public static HtmlTree SCRIPT(String src) {
      * @return the element
      */
     public static HtmlTree SECTION(HtmlStyle style) {
-        return new HtmlTree(TagName.SECTION)
+        return new HtmlTree(HtmlTag.SECTION)
                 .setStyle(style);
     }
 
@@ -822,7 +819,7 @@ public static HtmlTree SECTION(HtmlStyle style) {
      * @return the element
      */
     public static HtmlTree SECTION(HtmlStyle style, Content body) {
-        return new HtmlTree(TagName.SECTION)
+        return new HtmlTree(HtmlTag.SECTION)
                 .setStyle(style)
                 .add(body);
     }
@@ -834,7 +831,7 @@ public static HtmlTree SECTION(HtmlStyle style, Content body) {
      * @return the element
      */
     public static HtmlTree SMALL(Content body) {
-        return new HtmlTree(TagName.SMALL)
+        return new HtmlTree(HtmlTag.SMALL)
                 .add(body);
     }
 
@@ -845,7 +842,7 @@ public static HtmlTree SMALL(Content body) {
      * @return the element
      */
     public static HtmlTree SPAN(Content body) {
-        return new HtmlTree(TagName.SPAN)
+        return new HtmlTree(HtmlTag.SPAN)
                 .add(body);
     }
 
@@ -856,7 +853,7 @@ public static HtmlTree SPAN(Content body) {
      * @return the element
      */
     public static HtmlTree SPAN(HtmlStyle styleClass) {
-        return new HtmlTree(TagName.SPAN)
+        return new HtmlTree(HtmlTag.SPAN)
                 .setStyle(styleClass);
     }
 
@@ -880,7 +877,7 @@ public static HtmlTree SPAN(HtmlStyle styleClass, Content body) {
      * @return the element
      */
     public static HtmlTree SPAN_ID(HtmlId id, Content body) {
-        return new HtmlTree(TagName.SPAN)
+        return new HtmlTree(HtmlTag.SPAN)
                 .setId(id)
                 .add(body);
     }
@@ -894,7 +891,7 @@ public static HtmlTree SPAN_ID(HtmlId id, Content body) {
      * @return the element
      */
     public static HtmlTree SPAN(HtmlId id, HtmlStyle style, Content body) {
-        return new HtmlTree(TagName.SPAN)
+        return new HtmlTree(HtmlTag.SPAN)
                 .setId(id)
                 .setStyle(style)
                 .add(body);
@@ -907,7 +904,7 @@ public static HtmlTree SPAN(HtmlId id, HtmlStyle style, Content body) {
      * @return the element
      */
     public static HtmlTree SUMMARY(Content body) {
-        return new HtmlTree(TagName.SUMMARY)
+        return new HtmlTree(HtmlTag.SUMMARY)
                 .add(body);
     }
 
@@ -918,7 +915,7 @@ public static HtmlTree SUMMARY(Content body) {
      * @return the element
      */
     public static HtmlTree SUP(Content body) {
-        return new HtmlTree(TagName.SUP)
+        return new HtmlTree(HtmlTag.SUP)
                 .add(body);
     }
 
@@ -930,7 +927,7 @@ public static HtmlTree SUP(Content body) {
      * @return the element
      */
     public static HtmlTree TD(HtmlStyle style, Content body) {
-        return new HtmlTree(TagName.TD)
+        return new HtmlTree(HtmlTag.TD)
                 .setStyle(style)
                 .add(body);
     }
@@ -944,7 +941,7 @@ public static HtmlTree TD(HtmlStyle style, Content body) {
      * @return the element
      */
     public static HtmlTree TH(HtmlStyle style, String scope, Content body) {
-        return new HtmlTree(TagName.TH)
+        return new HtmlTree(HtmlTag.TH)
                 .setStyle(style)
                 .put(HtmlAttr.SCOPE, scope)
                 .add(body);
@@ -958,7 +955,7 @@ public static HtmlTree TH(HtmlStyle style, String scope, Content body) {
      * @return the element
      */
     public static HtmlTree TH(String scope, Content body) {
-        return new HtmlTree(TagName.TH)
+        return new HtmlTree(HtmlTag.TH)
                 .put(HtmlAttr.SCOPE, scope)
                 .add(body);
     }
@@ -970,7 +967,7 @@ public static HtmlTree TH(String scope, Content body) {
      * @return the element
      */
     public static HtmlTree TITLE(String body) {
-        return new HtmlTree(TagName.TITLE)
+        return new HtmlTree(HtmlTag.TITLE)
                 .add(body);
     }
 
@@ -981,7 +978,7 @@ public static HtmlTree TITLE(String body) {
      * @return the element
      */
     public static HtmlTree UL(HtmlStyle style) {
-        return new HtmlTree(TagName.UL)
+        return new HtmlTree(HtmlTag.UL)
                 .setStyle(style);
     }
 
@@ -994,7 +991,7 @@ public static HtmlTree UL(HtmlStyle style) {
      * @return the element
      */
     public static HtmlTree UL(HtmlStyle style, Content first, Content... more) {
-        var ul = new HtmlTree(TagName.UL)
+        var ul = new HtmlTree(HtmlTag.UL)
                 .setStyle(style);
         ul.add(first);
         for (Content c : more) {
@@ -1013,7 +1010,7 @@ public static HtmlTree UL(HtmlStyle style, Content first, Content... more) {
      * @return the element
      */
     public static <T> HtmlTree UL(HtmlStyle style, Collection<T> items, Function<T,Content> mapper) {
-        return new HtmlTree(TagName.UL)
+        return new HtmlTree(HtmlTag.UL)
                 .setStyle(style)
                 .addAll(items, mapper);
     }
@@ -1025,7 +1022,7 @@ public boolean isEmpty() {
 
     @Override
     public boolean isPhrasingContent() {
-        return tagName.phrasingContent;
+        return tag.blockType == HtmlTag.BlockType.INLINE;
     }
 
     /**
@@ -1069,7 +1066,7 @@ public boolean isDiscardable() {
         return !isVoid()
             && !hasContent()
             && !hasAttr(HtmlAttr.ID)
-            && tagName != TagName.SCRIPT;
+            && tag != HtmlTag.SCRIPT;
     }
 
     /**
@@ -1080,22 +1077,22 @@ public boolean isDiscardable() {
      * @see <a href="https://www.w3.org/TR/html51/dom.html#kinds-of-content-phrasing-content">Phrasing Content</a>
      */
     public boolean isInline() {
-        return switch (tagName) {
+        return switch (tag) {
             case A, BUTTON, BR, CODE, EM, I, IMG, LABEL, SMALL, SPAN, STRONG, SUB, SUP, WBR -> true;
             default -> false;
         };
     }
 
     /**
-     * Returns whether or not this is a <em>void</em> element.
+     * Returns whether this is a <em>void</em> element.
      *
-     * @return whether or not this is a void element
+     * @return whether this is a void element
      *
      * @see <a href="https://www.w3.org/TR/html51/syntax.html#void-elements">Void Elements</a>
      */
     public boolean isVoid() {
-        return switch (tagName) {
-            case BR, HR, IMG, INPUT, LINK, META, WBR -> true;
+        return switch (tag) {
+            case BR, COL, FRAME, HR, IMG, INPUT, LINK, META, WBR -> true;
             default -> false;
         };
     }
@@ -1106,14 +1103,14 @@ public boolean write(Writer out, String newline, boolean atNewline) throws IOExc
         if (!isInline && !atNewline) {
             out.write(newline);
         }
-        String tagString = tagName.toString();
+        String tagString = tag.getName();
         out.write("<");
         out.write(tagString);
         for (var attr : attrs.entrySet()) {
             var key = attr.getKey();
             var value = attr.getValue();
             out.write(" ");
-            out.write(key.toString());
+            out.write(key.getName());
             if (!value.isEmpty()) {
                 out.write("=\"");
                 out.write(value.replace("\"", "&quot;"));
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/ListBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/ListBuilder.java
similarity index 97%
rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/ListBuilder.java
rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/ListBuilder.java
index 603e571789564..05c9f8388dbc6 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/ListBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/ListBuilder.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.javadoc.internal.doclets.formats.html.markup;
+package jdk.javadoc.internal.html;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -32,8 +32,6 @@
 import java.util.NoSuchElementException;
 import java.util.Objects;
 
-import jdk.javadoc.internal.doclets.formats.html.Content;
-
 /**
  * A utility class for building nested HTML lists. This class is implemented as a
  * stack of nested list/item pairs where list items are added to the inner-most
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/RawHtml.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/RawHtml.java
similarity index 96%
rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/RawHtml.java
rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/RawHtml.java
index a71ea7831da4a..1c9f60f69e866 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/RawHtml.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/RawHtml.java
@@ -23,15 +23,13 @@
  * questions.
  */
 
-package jdk.javadoc.internal.doclets.formats.html.markup;
+package jdk.javadoc.internal.html;
 
 import java.io.IOException;
 import java.io.Writer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import jdk.javadoc.internal.doclets.formats.html.Content;
-
 /**
  * Class for generating raw HTML content to be added to HTML pages of javadoc output.
  */
@@ -147,8 +145,8 @@ public boolean isPhrasingContent() {
         Matcher m = tag.matcher(rawHtmlContent);
         while (m.find()) {
             try {
-                var tn = TagName.of(m.group("tag"));
-                if (!tn.phrasingContent) {
+                var tn = HtmlTag.of(m.group("tag"));
+                if (tn.blockType != HtmlTag.BlockType.INLINE) {
                     return false;
                 }
             } catch (IllegalArgumentException e) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Script.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Script.java
similarity index 97%
rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Script.java
rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Script.java
index f194aa5527a53..a5fc15215092c 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Script.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Script.java
@@ -23,13 +23,11 @@
  * questions.
  */
 
-package jdk.javadoc.internal.doclets.formats.html.markup;
+package jdk.javadoc.internal.html;
 
 import java.io.IOException;
 import java.io.Writer;
 
-import jdk.javadoc.internal.doclets.formats.html.Content;
-
 /**
  * A builder for HTML script elements.
  */
@@ -100,7 +98,7 @@ public Script appendStringLiteral(CharSequence text, char quoteChar) {
      */
     public Content asContent() {
         ScriptContent scriptContent = new ScriptContent(sb);
-        var script = new HtmlTree(TagName.SCRIPT) {
+        var script = new HtmlTree(HtmlTag.SCRIPT) {
             @Override
             public HtmlTree add(Content c) {
                 if (c != scriptContent) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Text.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Text.java
similarity index 97%
rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Text.java
rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Text.java
index e05ca73001af7..78bb5cb89e66c 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Text.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Text.java
@@ -23,13 +23,11 @@
  * questions.
  */
 
-package jdk.javadoc.internal.doclets.formats.html.markup;
+package jdk.javadoc.internal.html;
 
 import java.io.IOException;
 import java.io.Writer;
 
-import jdk.javadoc.internal.doclets.formats.html.Content;
-
 /**
  * Class for containing immutable string content for HTML tags of javadoc output.
  * Newlines are always represented by {@code \n}.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TextBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/TextBuilder.java
similarity index 96%
rename from src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TextBuilder.java
rename to src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/TextBuilder.java
index 6c4d66024c58a..f27e5922043f6 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/TextBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/TextBuilder.java
@@ -23,13 +23,11 @@
  * questions.
  */
 
-package jdk.javadoc.internal.doclets.formats.html.markup;
+package jdk.javadoc.internal.html;
 
 import java.io.IOException;
 import java.io.Writer;
 
-import jdk.javadoc.internal.doclets.formats.html.Content;
-
 /**
  * Class for generating string content for HTML tags of javadoc output.
  * The content is mutable to the extent that additional content may be added.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/package-info.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/package-info.java
index 4f5601b96003d..dffb34f1e9306 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/package-info.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/package-info.java
@@ -68,9 +68,9 @@
  *          library in the
  *          {@link jdk.javadoc.internal.doclets.formats.html.markup formats.html.markup} package,
  *          to create trees (or acyclic graphs) of
- *          {@linkplain jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree HTML tree nodes}.
+ *          {@linkplain jdk.javadoc.internal.html.HtmlTree HTML tree nodes}.
  *          Apart from using a common format-neutral supertype,
- *          {@link jdk.javadoc.internal.doclets.formats.html.Content}, the {@code markup} library
+ *          {@link jdk.javadoc.internal.html.Content}, the {@code markup} library
  *          is mostly independent of the rest of the javadoc software stack.
  *
  *        <dt id="toolkit">Toolkit
diff --git a/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java b/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java
index b26f2afe96be1..f103ef4e608f0 100644
--- a/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java
+++ b/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java
@@ -26,7 +26,8 @@
  * @test
  * @bug 8267574
  * @summary check stylesheet names against HtmlStyle
- * @modules jdk.javadoc/jdk.javadoc.internal.doclets.formats.html.markup
+ * @modules jdk.javadoc/jdk.javadoc.internal.html
+ *          jdk.javadoc/jdk.javadoc.internal.doclets.formats.html.markup
  *          jdk.javadoc/jdk.javadoc.internal.doclets.formats.html.resources:open
  */
 
@@ -44,10 +45,11 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
+import jdk.javadoc.internal.html.HtmlStyle;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
 
 /**
- * This test compares the set of CSS class names defined in HtmlStyle
+ * This test compares the set of CSS class names defined in HtmlStyles
  * and other files (such as search.js) against the set of CSS class names
  * defined in the main stylesheet.css provided by the doclet.
  *
@@ -185,7 +187,7 @@ void error(String message) {
     }
 
     Set<String> getHtmlStyleNames() {
-        return Arrays.stream(HtmlStyle.values())
+        return Arrays.stream(HtmlStyles.values())
                 .map(HtmlStyle::cssName)
                 .collect(Collectors.toCollection(TreeSet::new));
     }
@@ -193,7 +195,7 @@ Set<String> getHtmlStyleNames() {
     Set<String> getStylesheetNames() throws IOException {
         Set<String> names = new TreeSet<>();
         String stylesheet = "/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css";
-        URL url = HtmlStyle.class.getResource(stylesheet);
+        URL url = HtmlStyles.class.getResource(stylesheet);
         readStylesheet(url, names);
         return names;
     }
diff --git a/test/langtools/jdk/javadoc/doclet/testHtmlDocument/TestHtmlDocument.java b/test/langtools/jdk/javadoc/doclet/testHtmlDocument/TestHtmlDocument.java
index 7472a2c397e88..9a9b20541c8b6 100644
--- a/test/langtools/jdk/javadoc/doclet/testHtmlDocument/TestHtmlDocument.java
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlDocument/TestHtmlDocument.java
@@ -28,6 +28,7 @@
  * @library ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.doclets.formats.html.markup
  *          jdk.javadoc/jdk.javadoc.internal.doclets.toolkit.util
+ *          jdk.javadoc/jdk.javadoc.internal.html
  *          jdk.javadoc/jdk.javadoc.internal.tool
  * @build javadoc.tester.*
  * @run main TestHtmlDocument
@@ -35,6 +36,7 @@
 
 
 import jdk.javadoc.internal.doclets.formats.html.markup.*;
+import jdk.javadoc.internal.html.*;
 
 /**
  * The class reads each file, complete with newlines, into a string to easily
@@ -68,19 +70,19 @@ public void test() {
     // Generate the HTML output using the HTML document generation within doclet.
     public static String generateHtmlTree() {
         // Document type for the HTML document
-        HtmlTree html = new HtmlTree(TagName.HTML);
-        HtmlTree head = new HtmlTree(TagName.HEAD);
-        HtmlTree title = new HtmlTree(TagName.TITLE);
+        HtmlTree html = new HtmlTree(HtmlTag.HTML);
+        HtmlTree head = new HtmlTree(HtmlTag.HEAD);
+        HtmlTree title = new HtmlTree(HtmlTag.TITLE);
         // String content within the document
         TextBuilder titleContent = new TextBuilder("Markup test");
         title.add(titleContent);
         head.add(title);
         // Test META tag
-        HtmlTree meta = new HtmlTree(TagName.META);
+        HtmlTree meta = new HtmlTree(HtmlTag.META);
         meta.put(HtmlAttr.NAME, "keywords");
         meta.put(HtmlAttr.CONTENT, "testContent");
         head.add(meta);
-        HtmlTree link = new HtmlTree(TagName.LINK);
+        HtmlTree link = new HtmlTree(HtmlTag.LINK);
         link.put(HtmlAttr.REL, "testRel");
         link.put(HtmlAttr.HREF, "testLink.html");
         head.add(link);
@@ -88,10 +90,10 @@ public static String generateHtmlTree() {
         // Comment within the document
         Comment bodyMarker = new Comment("======== START OF BODY ========");
         html.add(bodyMarker);
-        HtmlTree body = new HtmlTree(TagName.BODY);
+        HtmlTree body = new HtmlTree(HtmlTag.BODY);
         Comment pMarker = new Comment("======== START OF PARAGRAPH ========");
         body.add(pMarker);
-        HtmlTree p = new HtmlTree(TagName.P);
+        HtmlTree p = new HtmlTree(HtmlTag.P);
         TextBuilder bodyContent = new TextBuilder(
                 "This document is generated from sample source code and HTML " +
                 "files with examples of a wide variety of Java language constructs: packages, " +
@@ -104,24 +106,24 @@ public static String generateHtmlTree() {
         TextBuilder pContent = new TextBuilder(" to <test> out a link.");
         p.add(pContent);
         body.add(p);
-        HtmlTree p1 = new HtmlTree(TagName.P);
+        HtmlTree p1 = new HtmlTree(HtmlTag.P);
         // Test another version of A tag.
-        HtmlTree anchor = new HtmlTree(TagName.A);
+        HtmlTree anchor = new HtmlTree(HtmlTag.A);
         anchor.put(HtmlAttr.HREF, "testLink.html");
         anchor.put(HtmlAttr.ID, "Another version of a tag");
         p1.add(anchor);
         body.add(p1);
         // Test for empty tags.
-        HtmlTree dl = new HtmlTree(TagName.DL);
+        HtmlTree dl = new HtmlTree(HtmlTag.DL);
         html.add(dl);
         // Test for empty nested tags.
-        HtmlTree dlTree = new HtmlTree(TagName.DL);
-        dlTree.add(new HtmlTree(TagName.DT));
-        dlTree.add(new HtmlTree (TagName.DD));
+        HtmlTree dlTree = new HtmlTree(HtmlTag.DL);
+        dlTree.add(new HtmlTree(HtmlTag.DT));
+        dlTree.add(new HtmlTree (HtmlTag.DD));
         html.add(dlTree);
-        HtmlTree dlDisplay = new HtmlTree(TagName.DL);
-        dlDisplay.add(new HtmlTree(TagName.DT));
-        HtmlTree dd = new HtmlTree (TagName.DD);
+        HtmlTree dlDisplay = new HtmlTree(HtmlTag.DL);
+        dlDisplay.add(new HtmlTree(HtmlTag.DT));
+        HtmlTree dd = new HtmlTree (HtmlTag.DD);
         TextBuilder ddContent = new TextBuilder("Test DD");
         dd.add(ddContent);
         dlDisplay.add(dd);
@@ -130,7 +132,7 @@ public static String generateHtmlTree() {
         body.add(emptyString);
         Comment emptyComment = new Comment("");
         body.add(emptyComment);
-        HtmlTree hr = new HtmlTree(TagName.HR);
+        HtmlTree hr = new HtmlTree(HtmlTag.HR);
         body.add(hr);
         html.add(body);
         HtmlDocument htmlDoc = new HtmlDocument(html);
diff --git a/test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java b/test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java
index 2225de2f9c5d4..c11e6d5f720fa 100644
--- a/test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java
@@ -50,7 +50,7 @@ public void test() {
         checkOutput(Output.OUT, true,
                 "attribute not supported in HTML5: summary",
                 """
-                    attribute "border" for table only accepts "" or "1": BORDER""",
+                    attribute "border" for table only accepts "" or "1": border""",
                 "attribute not supported in HTML5: cellpadding",
                 "attribute not supported in HTML5: cellspacing",
                 "attribute not supported in HTML5: align");
diff --git a/test/langtools/jdk/javadoc/doclet/testVoidHtmlElements/TestVoidHtmlElements.java b/test/langtools/jdk/javadoc/doclet/testVoidHtmlElements/TestVoidHtmlElements.java
index 6229533af4a55..bd44fe8814119 100644
--- a/test/langtools/jdk/javadoc/doclet/testVoidHtmlElements/TestVoidHtmlElements.java
+++ b/test/langtools/jdk/javadoc/doclet/testVoidHtmlElements/TestVoidHtmlElements.java
@@ -25,13 +25,12 @@
  * @test
  * @bug 8266856
  * @modules jdk.javadoc/jdk.javadoc.internal.doclint
- *          jdk.javadoc/jdk.javadoc.internal.doclets.formats.html.markup
+ *          jdk.javadoc/jdk.javadoc.internal.html
  * @run main TestVoidHtmlElements
  */
 
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
-import jdk.javadoc.internal.doclint.HtmlTag;
+import jdk.javadoc.internal.html.HtmlTree;
+import jdk.javadoc.internal.html.HtmlTag;
 
 public class TestVoidHtmlElements {
 
@@ -42,9 +41,8 @@ public static void main(String[] args) {
         // check that the definition of void-ness is the same.
         for (HtmlTag htmlTag : HtmlTag.values()) {
             try {
-                TagName tagName = TagName.valueOf(htmlTag.name());
                 checks++;
-                check(htmlTag, tagName);
+                check(htmlTag);
             } catch (IllegalArgumentException e) {
                 // no matching TagName
             }
@@ -56,8 +54,8 @@ public static void main(String[] args) {
         System.out.println(checks + " checks passed");
     }
 
-    private static void check(HtmlTag htmlTag, TagName tagName) {
-        boolean elementIsVoid = new HtmlTree(tagName).isVoid();
+    private static void check(HtmlTag htmlTag) {
+        boolean elementIsVoid = new HtmlTree(htmlTag).isVoid();
         boolean elementHasNoEndTag = htmlTag.endKind == HtmlTag.EndKind.NONE;
         if (elementIsVoid != elementHasNoEndTag) {
             throw new AssertionError(htmlTag + ", " + elementIsVoid + ", " + elementHasNoEndTag);
diff --git a/test/langtools/tools/doclint/CoverageExtras.java b/test/langtools/tools/doclint/CoverageExtras.java
index 5a6c90c4b7462..55ac63d6ab3d4 100644
--- a/test/langtools/tools/doclint/CoverageExtras.java
+++ b/test/langtools/tools/doclint/CoverageExtras.java
@@ -26,13 +26,15 @@
  * @bug 8006263
  * @summary Supplementary test cases needed for doclint
  * @modules jdk.javadoc/jdk.javadoc.internal.doclint
+ *          jdk.javadoc/jdk.javadoc.internal.html
  */
 
 import java.util.Objects;
 
 import jdk.javadoc.internal.doclint.Checker;
-import jdk.javadoc.internal.doclint.HtmlTag;
 import jdk.javadoc.internal.doclint.Messages;
+import jdk.javadoc.internal.html.HtmlAttr;
+import jdk.javadoc.internal.html.HtmlTag;
 
 public class CoverageExtras {
     public static void main(String... args) {
@@ -41,8 +43,8 @@ public static void main(String... args) {
 
     void run() {
         check(HtmlTag.A, HtmlTag.valueOf("A"), HtmlTag.values());
-        check(HtmlTag.Attr.ABBR, HtmlTag.Attr.valueOf("ABBR"), HtmlTag.Attr.values());
-        check(HtmlTag.AttrKind.INVALID, HtmlTag.AttrKind.valueOf("INVALID"), HtmlTag.AttrKind.values());
+        check(HtmlAttr.ABBR, HtmlAttr.valueOf("ABBR"), HtmlAttr.values());
+        check(HtmlAttr.AttrKind.INVALID, HtmlAttr.AttrKind.valueOf("INVALID"), HtmlAttr.AttrKind.values());
         check(HtmlTag.BlockType.BLOCK, HtmlTag.BlockType.valueOf("BLOCK"), HtmlTag.BlockType.values());
         check(HtmlTag.EndKind.NONE, HtmlTag.EndKind.valueOf("NONE"), HtmlTag.EndKind.values());
         check(HtmlTag.Flag.EXPECT_CONTENT, HtmlTag.Flag.valueOf("EXPECT_CONTENT"), HtmlTag.Flag.values());
diff --git a/test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTest.java b/test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTest.java
index 3b8f29d2d62af..6ef32c881bb78 100644
--- a/test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTest.java
+++ b/test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTest.java
@@ -100,10 +100,6 @@ public void SupportedAttrs_html5() { }
      * </hgroup>
      * hgroup no longer supported in HTML5.
      * </section>
-     * <details>
-     * <summary>Summary</summary>
-     * <p>Details and Summary no longer supported in HTML5</p>
-     * </details>
      */
     public void notSupportedTags_html5() { }
 
@@ -152,6 +148,10 @@ public void notSupportedTags_html5() { }
      * </template>
      * <p>Test current time is <time>10:00</time> at night</p>
      * <p>Test<wbr>text</p>
+     * <details>
+     * <summary>Summary</summary>
+     * <p>Details</p>
+     * </details>
      */
     public void SupportedTags_html5() { }
 
diff --git a/test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTest.out b/test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTest.out
index 69b31d53831f4..badd9ea998273 100644
--- a/test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTest.out
+++ b/test/langtools/tools/doclint/html/HtmlVersionTagsAttrsTest.out
@@ -226,7 +226,7 @@ HtmlVersionTagsAttrsTest.java:67: error: attribute not supported in HTML5: width
 HtmlVersionTagsAttrsTest.java:68: error: attribute not supported in HTML5: name
      * <a name="AnchorTest">Anchor Test</a>
           ^
-HtmlVersionTagsAttrsTest.java:69: error: attribute "border" for table only accepts "" or "1": BORDER
+HtmlVersionTagsAttrsTest.java:69: error: attribute "border" for table only accepts "" or "1": 0
      * <table border="0">
               ^
 HtmlVersionTagsAttrsTest.java:71: error: no caption for table
@@ -259,19 +259,7 @@ HtmlVersionTagsAttrsTest.java:97: error: unknown tag: hgroup
 HtmlVersionTagsAttrsTest.java:100: error: unknown tag: hgroup
      * </hgroup>
        ^
-HtmlVersionTagsAttrsTest.java:103: error: unknown tag: details
-     * <details>
-       ^
-HtmlVersionTagsAttrsTest.java:104: error: unknown tag: summary
-     * <summary>Summary</summary>
-       ^
-HtmlVersionTagsAttrsTest.java:104: error: unknown tag: summary
-     * <summary>Summary</summary>
-                       ^
-HtmlVersionTagsAttrsTest.java:106: error: unknown tag: details
-     * </details>
-       ^
-HtmlVersionTagsAttrsTest.java:129: error: element not allowed in documentation comments: <main>
+HtmlVersionTagsAttrsTest.java:125: error: element not allowed in documentation comments: <main>
      * <main>
        ^
 HtmlVersionTagsAttrsTest.java:161: error: heading not found for </section>
@@ -298,7 +286,7 @@ HtmlVersionTagsAttrsTest.java:181: error: tag not allowed here: <footer>
 HtmlVersionTagsAttrsTest.java:184: error: element not allowed in documentation comments: <main>
      * <main>
        ^
-HtmlVersionTagsAttrsTest.java:189: error: attribute "border" for table only accepts "" or "1": BORDER
+HtmlVersionTagsAttrsTest.java:189: error: attribute "border" for table only accepts "" or "1": 2
      * <table border="2">
               ^
 HtmlVersionTagsAttrsTest.java:191: error: no caption for table
@@ -310,5 +298,5 @@ HtmlVersionTagsAttrsTest.java:202: error: no caption for table
 HtmlVersionTagsAttrsTest.java:205: error: no caption for table
      * </table>
        ^
-102 errors
+98 errors
 2 warnings
diff --git a/test/langtools/tools/doclint/html/OtherTagsTest.java b/test/langtools/tools/doclint/html/OtherTagsTest.java
index e64b12a71a8b2..6da198b3cef4c 100644
--- a/test/langtools/tools/doclint/html/OtherTagsTest.java
+++ b/test/langtools/tools/doclint/html/OtherTagsTest.java
@@ -16,7 +16,7 @@ public class OtherTagsTest {
      *  <frameset> </frameset>
      *  <head> </head>
      *  <hr width="50%">
-     *  <link>
+     *  <link rel="http://example.com/stylesheet.css">
      *  <meta>
      *  <noframes> </noframes>
      *  <script> </script>
diff --git a/test/langtools/tools/doclint/html/OtherTagsTest.out b/test/langtools/tools/doclint/html/OtherTagsTest.out
index 571df0f20a3df..f8e06bb6bb6c0 100644
--- a/test/langtools/tools/doclint/html/OtherTagsTest.out
+++ b/test/langtools/tools/doclint/html/OtherTagsTest.out
@@ -13,9 +13,6 @@ OtherTagsTest.java:17: error: element not allowed in documentation comments: <he
 OtherTagsTest.java:18: error: attribute not supported in HTML5: width
      *  <hr width="50%">
             ^
-OtherTagsTest.java:19: error: element not allowed in documentation comments: <link>
-     *  <link>
-        ^
 OtherTagsTest.java:20: error: element not allowed in documentation comments: <meta>
      *  <meta>
         ^
@@ -25,4 +22,4 @@ OtherTagsTest.java:21: error: tag not supported in HTML5: noframes
 OtherTagsTest.java:23: error: element not allowed in documentation comments: <title>
      *  <title> </title>
         ^
-9 errors
+8 errors

From 34edc7358f733cdf433d0ff50921bcb5a94c5e35 Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <kvn@openjdk.org>
Date: Sat, 3 Aug 2024 06:21:28 +0000
Subject: [PATCH 295/401] 8337396: Cleanup usage of ExternalAddess

Co-authored-by: Fei Yang <fyang@openjdk.org>
Reviewed-by: vlivanov, adinn
---
 .../cpu/aarch64/macroAssembler_aarch64.cpp    |  8 +-
 .../cpu/aarch64/stubGenerator_aarch64.cpp     |  2 +-
 .../templateInterpreterGenerator_aarch64.cpp  | 12 +--
 .../cpu/riscv/macroAssembler_riscv.cpp        |  4 +-
 src/hotspot/cpu/riscv/stubGenerator_riscv.cpp |  2 +-
 .../templateInterpreterGenerator_riscv.cpp    |  6 +-
 src/hotspot/cpu/x86/stubGenerator_x86_64.cpp  |  2 +-
 .../x86/templateInterpreterGenerator_x86.cpp  |  6 +-
 src/hotspot/cpu/x86/templateTable_x86.cpp     | 18 ++--
 src/hotspot/share/code/oopRecorder.cpp        | 92 ++++++++++++++++++-
 10 files changed, 117 insertions(+), 35 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index f90aefc8fd3e6..e210c8b3de05a 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -736,7 +736,7 @@ void MacroAssembler::reserved_stack_check() {
     br(Assembler::LO, no_reserved_zone_enabling);
 
     enter();   // LR and FP are live.
-    lea(rscratch1, CAST_FROM_FN_PTR(address, SharedRuntime::enable_stack_reserved_zone));
+    lea(rscratch1, RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::enable_stack_reserved_zone)));
     mov(c_rarg0, rthread);
     blr(rscratch1);
     leave();
@@ -1879,7 +1879,7 @@ void MacroAssembler::_verify_oop(Register reg, const char* s, const char* file,
   movptr(rscratch1, (uintptr_t)(address)b);
 
   // call indirectly to solve generation ordering problem
-  lea(rscratch2, ExternalAddress(StubRoutines::verify_oop_subroutine_entry_address()));
+  lea(rscratch2, RuntimeAddress(StubRoutines::verify_oop_subroutine_entry_address()));
   ldr(rscratch2, Address(rscratch2));
   blr(rscratch2);
 
@@ -1918,7 +1918,7 @@ void MacroAssembler::_verify_oop_addr(Address addr, const char* s, const char* f
   movptr(rscratch1, (uintptr_t)(address)b);
 
   // call indirectly to solve generation ordering problem
-  lea(rscratch2, ExternalAddress(StubRoutines::verify_oop_subroutine_entry_address()));
+  lea(rscratch2, RuntimeAddress(StubRoutines::verify_oop_subroutine_entry_address()));
   ldr(rscratch2, Address(rscratch2));
   blr(rscratch2);
 
@@ -6454,7 +6454,7 @@ void MacroAssembler::verify_cross_modify_fence_not_required() {
     Label fence_not_required;
     cbz(rscratch1, fence_not_required);
     // If it does then fail.
-    lea(rscratch1, CAST_FROM_FN_PTR(address, JavaThread::verify_cross_modify_fence_failure));
+    lea(rscratch1, RuntimeAddress(CAST_FROM_FN_PTR(address, JavaThread::verify_cross_modify_fence_failure)));
     mov(c_rarg0, rthread);
     blr(rscratch1);
     bind(fence_not_required);
diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
index 3f1a4423b5efe..5e2ef97e4a3ad 100644
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
@@ -7045,7 +7045,7 @@ class StubGenerator: public StubCodeGenerator {
     Label thaw_success;
     // rscratch2 contains the size of the frames to thaw, 0 if overflow or no more frames
     __ cbnz(rscratch2, thaw_success);
-    __ lea(rscratch1, ExternalAddress(StubRoutines::throw_StackOverflowError_entry()));
+    __ lea(rscratch1, RuntimeAddress(StubRoutines::throw_StackOverflowError_entry()));
     __ br(rscratch1);
     __ bind(thaw_success);
 
diff --git a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
index 89f5fbd281b79..d639d9cf17ee5 100644
--- a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -1337,8 +1337,8 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   {
     Label L;
     __ ldr(r10, Address(rmethod, Method::native_function_offset()));
-    address unsatisfied = (SharedRuntime::native_method_throw_unsatisfied_link_error_entry());
-    __ mov(rscratch2, unsatisfied);
+    ExternalAddress unsatisfied(SharedRuntime::native_method_throw_unsatisfied_link_error_entry());
+    __ lea(rscratch2, unsatisfied);
     __ ldr(rscratch2, rscratch2);
     __ cmp(r10, rscratch2);
     __ br(Assembler::NE, L);
@@ -1432,7 +1432,7 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
     // hand.
     //
     __ mov(c_rarg0, rthread);
-    __ mov(rscratch2, CAST_FROM_FN_PTR(address, JavaThread::check_special_condition_for_native_trans));
+    __ lea(rscratch2, RuntimeAddress(CAST_FROM_FN_PTR(address, JavaThread::check_special_condition_for_native_trans)));
     __ blr(rscratch2);
     __ get_method(rmethod);
     __ reinit_heapbase();
@@ -1482,7 +1482,7 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
 
     __ push_call_clobbered_registers();
     __ mov(c_rarg0, rthread);
-    __ mov(rscratch2, CAST_FROM_FN_PTR(address, SharedRuntime::reguard_yellow_pages));
+    __ lea(rscratch2, RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::reguard_yellow_pages)));
     __ blr(rscratch2);
     __ pop_call_clobbered_registers();
 
@@ -2085,7 +2085,7 @@ void TemplateInterpreterGenerator::trace_bytecode(Template* t) {
 
   assert(Interpreter::trace_code(t->tos_in()) != nullptr,
          "entry must have been generated");
-  __ bl(Interpreter::trace_code(t->tos_in()));
+  __ bl(RuntimeAddress(Interpreter::trace_code(t->tos_in())));
   __ reinit_heapbase();
 }
 
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index e349eab317760..cd7a4ecf22803 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -547,7 +547,7 @@ void MacroAssembler::_verify_oop(Register reg, const char* s, const char* file,
   }
 
   // call indirectly to solve generation ordering problem
-  ExternalAddress target(StubRoutines::verify_oop_subroutine_entry_address());
+  RuntimeAddress target(StubRoutines::verify_oop_subroutine_entry_address());
   relocate(target.rspec(), [&] {
     int32_t offset;
     la(t1, target.target(), offset);
@@ -592,7 +592,7 @@ void MacroAssembler::_verify_oop_addr(Address addr, const char* s, const char* f
   }
 
   // call indirectly to solve generation ordering problem
-  ExternalAddress target(StubRoutines::verify_oop_subroutine_entry_address());
+  RuntimeAddress target(StubRoutines::verify_oop_subroutine_entry_address());
   relocate(target.rspec(), [&] {
     int32_t offset;
     la(t1, target.target(), offset);
diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
index f78d7261e40a5..198835d733f79 100644
--- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
@@ -3774,7 +3774,7 @@ class StubGenerator: public StubCodeGenerator {
     Label thaw_success;
     // t1 contains the size of the frames to thaw, 0 if overflow or no more frames
     __ bnez(t1, thaw_success);
-    __ la(t0, ExternalAddress(StubRoutines::throw_StackOverflowError_entry()));
+    __ la(t0, RuntimeAddress(StubRoutines::throw_StackOverflowError_entry()));
     __ jr(t0);
     __ bind(thaw_success);
 
diff --git a/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp b/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
index 769e4dc5ccc78..f01945bc6a3d1 100644
--- a/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
@@ -1111,8 +1111,8 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   {
     Label L;
     __ ld(x28, Address(xmethod, Method::native_function_offset()));
-    address unsatisfied = (SharedRuntime::native_method_throw_unsatisfied_link_error_entry());
-    __ mv(t, unsatisfied);
+    ExternalAddress unsatisfied(SharedRuntime::native_method_throw_unsatisfied_link_error_entry());
+    __ la(t, unsatisfied);
     __ load_long_misaligned(t1, Address(t, 0), t0, 2); // 2 bytes aligned, but not 4 or 8
 
     __ bne(x28, t1, L);
@@ -1815,7 +1815,7 @@ void TemplateInterpreterGenerator::trace_bytecode(Template* t) {
   // the tosca in-state for the given template.
 
   assert(Interpreter::trace_code(t->tos_in()) != nullptr, "entry must have been generated");
-  __ call(Interpreter::trace_code(t->tos_in()));
+  __ rt_call(Interpreter::trace_code(t->tos_in()));
   __ reinit_heapbase();
 }
 
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
index c9c4b056eb59d..a7404b298f673 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
@@ -3702,7 +3702,7 @@ address StubGenerator::generate_cont_thaw(const char* label, Continuation::thaw_
   Label L_thaw_success;
   __ testptr(rbx, rbx);
   __ jccb(Assembler::notZero, L_thaw_success);
-  __ jump(ExternalAddress(StubRoutines::throw_StackOverflowError_entry()));
+  __ jump(RuntimeAddress(StubRoutines::throw_StackOverflowError_entry()));
   __ bind(L_thaw_success);
 
   // Make room for the thawed frames and align the stack.
diff --git a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
index fe2bf67afc96e..3b32d577d4470 100644
--- a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
+++ b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -178,7 +178,7 @@ address TemplateInterpreterGenerator::generate_exception_handler_common(
                rarg, rarg2);
   }
   // throw exception
-  __ jump(ExternalAddress(Interpreter::throw_exception_entry()));
+  __ jump(RuntimeAddress(Interpreter::throw_exception_entry()));
   return entry;
 }
 
@@ -546,7 +546,7 @@ void TemplateInterpreterGenerator::generate_stack_overflow_check(void) {
   // Note: the restored frame is not necessarily interpreted.
   // Use the shared runtime version of the StackOverflowError.
   assert(StubRoutines::throw_StackOverflowError_entry() != nullptr, "stub not yet generated");
-  __ jump(ExternalAddress(StubRoutines::throw_StackOverflowError_entry()));
+  __ jump(RuntimeAddress(StubRoutines::throw_StackOverflowError_entry()));
   // all done with frame size check
   __ bind(after_frame_check_pop);
   NOT_LP64(__ pop(rsi));
diff --git a/src/hotspot/cpu/x86/templateTable_x86.cpp b/src/hotspot/cpu/x86/templateTable_x86.cpp
index 6446ec6598791..fc6844aedd6b2 100644
--- a/src/hotspot/cpu/x86/templateTable_x86.cpp
+++ b/src/hotspot/cpu/x86/templateTable_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -774,7 +774,7 @@ void TemplateTable::index_check_without_pop(Register array, Register index) {
   __ jccb(Assembler::below, skip);
   // Pass array to create more detailed exceptions.
   __ mov(NOT_LP64(rax) LP64_ONLY(c_rarg1), array);
-  __ jump(ExternalAddress(Interpreter::_throw_ArrayIndexOutOfBoundsException_entry));
+  __ jump(RuntimeAddress(Interpreter::_throw_ArrayIndexOutOfBoundsException_entry));
   __ bind(skip);
 }
 
@@ -1152,7 +1152,7 @@ void TemplateTable::aastore() {
 
   // Come here on failure
   // object is at TOS
-  __ jump(ExternalAddress(Interpreter::_throw_ArrayStoreException_entry));
+  __ jump(RuntimeAddress(Interpreter::_throw_ArrayStoreException_entry));
 
   // Come here on success
   __ bind(ok_is_subtype);
@@ -1432,7 +1432,7 @@ void TemplateTable::ldiv() {
   // generate explicit div0 check
   __ testq(rcx, rcx);
   __ jump_cc(Assembler::zero,
-             ExternalAddress(Interpreter::_throw_ArithmeticException_entry));
+             RuntimeAddress(Interpreter::_throw_ArithmeticException_entry));
   // Note: could xor rax and rcx and compare with (-1 ^ min_int). If
   //       they are not equal, one could do a normal division (no correction
   //       needed), which may speed up this implementation for the common case.
@@ -1445,7 +1445,7 @@ void TemplateTable::ldiv() {
   // check if y = 0
   __ orl(rax, rdx);
   __ jump_cc(Assembler::zero,
-             ExternalAddress(Interpreter::_throw_ArithmeticException_entry));
+             RuntimeAddress(Interpreter::_throw_ArithmeticException_entry));
   __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::ldiv));
   __ addptr(rsp, 4 * wordSize);  // take off temporaries
 #endif
@@ -1458,7 +1458,7 @@ void TemplateTable::lrem() {
   __ pop_l(rax);
   __ testq(rcx, rcx);
   __ jump_cc(Assembler::zero,
-             ExternalAddress(Interpreter::_throw_ArithmeticException_entry));
+             RuntimeAddress(Interpreter::_throw_ArithmeticException_entry));
   // Note: could xor rax and rcx and compare with (-1 ^ min_int). If
   //       they are not equal, one could do a normal division (no correction
   //       needed), which may speed up this implementation for the common case.
@@ -1472,7 +1472,7 @@ void TemplateTable::lrem() {
   // check if y = 0
   __ orl(rax, rdx);
   __ jump_cc(Assembler::zero,
-             ExternalAddress(Interpreter::_throw_ArithmeticException_entry));
+             RuntimeAddress(Interpreter::_throw_ArithmeticException_entry));
   __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::lrem));
   __ addptr(rsp, 4 * wordSize);
 #endif
@@ -4222,7 +4222,7 @@ void TemplateTable::checkcast() {
   // Come here on failure
   __ push_ptr(rdx);
   // object is at TOS
-  __ jump(ExternalAddress(Interpreter::_throw_ClassCastException_entry));
+  __ jump(RuntimeAddress(Interpreter::_throw_ClassCastException_entry));
 
   // Come here on success
   __ bind(ok_is_subtype);
@@ -4340,7 +4340,7 @@ void TemplateTable::_breakpoint() {
 void TemplateTable::athrow() {
   transition(atos, vtos);
   __ null_check(rax);
-  __ jump(ExternalAddress(Interpreter::throw_exception_entry()));
+  __ jump(RuntimeAddress(Interpreter::throw_exception_entry()));
 }
 
 //-----------------------------------------------------------------------------
diff --git a/src/hotspot/share/code/oopRecorder.cpp b/src/hotspot/share/code/oopRecorder.cpp
index fd13b1050410e..1849493974ca4 100644
--- a/src/hotspot/share/code/oopRecorder.cpp
+++ b/src/hotspot/share/code/oopRecorder.cpp
@@ -32,6 +32,7 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/jniHandles.inline.hpp"
 #include "runtime/mutexLocker.hpp"
+#include "runtime/os.hpp"
 #include "utilities/copy.hpp"
 
 #ifdef ASSERT
@@ -220,6 +221,11 @@ ExternalsRecorder* ExternalsRecorder::_recorder = nullptr;
 
 ExternalsRecorder::ExternalsRecorder(): _arena(mtCode), _externals(&_arena) {}
 
+#ifndef PRODUCT
+static int total_access_count = 0;
+static GrowableArray<int>* extern_hist = nullptr;
+#endif
+
 void ExternalsRecorder_init() {
   ExternalsRecorder::initialize();
 }
@@ -228,30 +234,106 @@ void ExternalsRecorder::initialize() {
   // After Mutex and before CodeCache are initialized
   assert(_recorder == nullptr, "should initialize only once");
   _recorder = new ExternalsRecorder();
+#ifndef PRODUCT
+  if (PrintNMethodStatistics) {
+    Arena* arena = &_recorder->_arena;
+    extern_hist = new(arena) GrowableArray<int>(arena, 512, 512, 0);
+  }
+#endif
 }
 
 int ExternalsRecorder::find_index(address adr) {
-  MutexLocker ml(ExternalsRecorder_lock, Mutex::_no_safepoint_check_flag);
   assert(_recorder != nullptr, "sanity");
-  return _recorder->_externals.find_index(adr);
+  MutexLocker ml(ExternalsRecorder_lock, Mutex::_no_safepoint_check_flag);
+  int index = _recorder->_externals.find_index(adr);
+#ifndef PRODUCT
+  if (PrintNMethodStatistics) {
+    total_access_count++;
+    int n = extern_hist->at_grow(index, 0);
+    extern_hist->at_put(index, (n + 1));
+  }
+#endif
+  return index;
 }
 
 address ExternalsRecorder::at(int index) {
+  assert(_recorder != nullptr, "sanity");
   // find_index() may resize array by reallocating it and freeing old,
   // we need loock here to make sure we not accessing to old freed array.
   MutexLocker ml(ExternalsRecorder_lock, Mutex::_no_safepoint_check_flag);
-  assert(_recorder != nullptr, "sanity");
   return _recorder->_externals.at(index);
 }
 
 int ExternalsRecorder::count() {
-  MutexLocker ml(ExternalsRecorder_lock, Mutex::_no_safepoint_check_flag);
   assert(_recorder != nullptr, "sanity");
+  MutexLocker ml(ExternalsRecorder_lock, Mutex::_no_safepoint_check_flag);
   return _recorder->_externals.count();
 }
 
 #ifndef PRODUCT
+extern "C" {
+  // Order from large to small values
+  static int count_cmp(const void *i, const void *j) {
+    int a = *(int*)i;
+    int b = *(int*)j;
+    return a < b ? 1 : a > b ? -1 : 0;
+  }
+}
+
 void ExternalsRecorder::print_statistics() {
-  tty->print_cr("External addresses table: %d entries", count());
+  int cnt = count();
+  tty->print_cr("External addresses table: %d entries, %d accesses", cnt, total_access_count);
+  { // Print most accessed entries in the table.
+    int* array = NEW_C_HEAP_ARRAY(int, (2 * cnt), mtCode);
+    for (int i = 0; i < cnt; i++) {
+      array[(2 * i) + 0] = extern_hist->at(i);
+      array[(2 * i) + 1] = i;
+    }
+    // Reverse sort to have "hottest" addresses first.
+    qsort(array, cnt, 2*sizeof(int), count_cmp);
+    // Print all entries with Verbose flag otherwise only top 5.
+    int limit = (Verbose || cnt <= 5) ? cnt : 5;
+    int j = 0;
+    for (int i = 0; i < limit; i++) {
+      int index = array[(2 * i) + 1];
+      int n = extern_hist->at(index);
+      if (n > 0) {
+        address addr = at(index);
+        tty->print("%d: %8d " INTPTR_FORMAT " :", j++, n, p2i(addr));
+        if (addr != nullptr) {
+          if (StubRoutines::contains(addr)) {
+            StubCodeDesc* desc = StubCodeDesc::desc_for(addr);
+            if (desc == nullptr) {
+              desc = StubCodeDesc::desc_for(addr + frame::pc_return_offset);
+            }
+            const char* stub_name = (desc != nullptr) ? desc->name() : "<unknown>";
+            tty->print(" stub: %s", stub_name);
+          } else {
+            ResourceMark rm;
+            const int buflen = 1024;
+            char* buf = NEW_RESOURCE_ARRAY(char, buflen);
+            int offset = 0;
+            if (os::dll_address_to_function_name(addr, buf, buflen, &offset)) {
+              tty->print(" extn: %s", buf);
+              if (offset != 0) {
+                tty->print("+%d", offset);
+              }
+            } else {
+              if (CodeCache::contains((void*)addr)) {
+                // Something in CodeCache
+                tty->print(" in CodeCache");
+              } else {
+                // It could be string
+                memcpy(buf, (char*)addr, 80);
+                buf[80] = '\0';
+                tty->print(" '%s'", buf);
+              }
+            }
+          }
+        }
+        tty->cr();
+      }
+    }
+  }
 }
 #endif

From 367e0a65561f95aad61b40930d5f46843fee3444 Mon Sep 17 00:00:00 2001
From: fabioromano1 <51378941+fabioromano1@users.noreply.github.com>
Date: Sat, 3 Aug 2024 13:08:54 +0000
Subject: [PATCH 296/401] 8334755: Asymptotically faster implementation of
 square root algorithm

Reviewed-by: rgiulietti
---
 .../share/classes/java/math/BigInteger.java   |  12 +-
 .../classes/java/math/MutableBigInteger.java  | 307 +++++++++++++-----
 .../java/math/BigInteger/BigIntegerTest.java  |  24 +-
 .../bench/java/math/BigIntegerSquareRoot.java | 132 ++++++++
 4 files changed, 390 insertions(+), 85 deletions(-)
 create mode 100644 test/micro/org/openjdk/bench/java/math/BigIntegerSquareRoot.java

diff --git a/src/java.base/share/classes/java/math/BigInteger.java b/src/java.base/share/classes/java/math/BigInteger.java
index c69e291d0e2be..3a5fd1439373c 100644
--- a/src/java.base/share/classes/java/math/BigInteger.java
+++ b/src/java.base/share/classes/java/math/BigInteger.java
@@ -2723,7 +2723,7 @@ public BigInteger sqrt() {
             throw new ArithmeticException("Negative BigInteger");
         }
 
-        return new MutableBigInteger(this.mag).sqrt().toBigInteger();
+        return new MutableBigInteger(this.mag).sqrtRem(false)[0].toBigInteger();
     }
 
     /**
@@ -2742,10 +2742,12 @@ public BigInteger sqrt() {
      * @since  9
      */
     public BigInteger[] sqrtAndRemainder() {
-        BigInteger s = sqrt();
-        BigInteger r = this.subtract(s.square());
-        assert r.compareTo(BigInteger.ZERO) >= 0;
-        return new BigInteger[] {s, r};
+        if (this.signum < 0) {
+            throw new ArithmeticException("Negative BigInteger");
+        }
+
+        MutableBigInteger[] sqrtRem = new MutableBigInteger(this.mag).sqrtRem(true);
+        return new BigInteger[] { sqrtRem[0].toBigInteger(), sqrtRem[1].toBigInteger() };
     }
 
     /**
diff --git a/src/java.base/share/classes/java/math/MutableBigInteger.java b/src/java.base/share/classes/java/math/MutableBigInteger.java
index 30ea8e130fcca..b84e50f567eb7 100644
--- a/src/java.base/share/classes/java/math/MutableBigInteger.java
+++ b/src/java.base/share/classes/java/math/MutableBigInteger.java
@@ -109,9 +109,26 @@ class MutableBigInteger {
      * the int val.
      */
     MutableBigInteger(int val) {
-        value = new int[1];
-        intLen = 1;
-        value[0] = val;
+        init(val);
+    }
+
+    /**
+     * Construct a new MutableBigInteger with a magnitude specified by
+     * the long val.
+     */
+    MutableBigInteger(long val) {
+        int hi = (int) (val >>> 32);
+        if (hi == 0) {
+            init((int) val);
+        } else {
+            value = new int[] { hi, (int) val };
+            intLen = 2;
+        }
+    }
+
+    private void init(int val) {
+        value = new int[] { val };
+        intLen = val != 0 ? 1 : 0;
     }
 
     /**
@@ -260,6 +277,7 @@ void reset() {
      * Compare the magnitude of two MutableBigIntegers. Returns -1, 0 or 1
      * as this MutableBigInteger is numerically less than, equal to, or
      * greater than {@code b}.
+     * Assumes no leading unnecessary zeros.
      */
     final int compare(MutableBigInteger b) {
         int blen = b.intLen;
@@ -285,6 +303,7 @@ final int compare(MutableBigInteger b) {
     /**
      * Returns a value equal to what {@code b.leftShift(32*ints); return compare(b);}
      * would return, but doesn't change the value of {@code b}.
+     * Assumes no leading unnecessary zeros.
      */
     private int compareShifted(MutableBigInteger b, int ints) {
         int blen = b.intLen;
@@ -538,6 +557,7 @@ void safeRightShift(int n) {
     /**
      * Right shift this MutableBigInteger n bits. The MutableBigInteger is left
      * in normal form.
+     * Assumes {@code Math.ceilDiv(n, 32) <= intLen || intLen == 0}
      */
     void rightShift(int n) {
         if (intLen == 0)
@@ -911,6 +931,58 @@ void addLower(MutableBigInteger addend, int n) {
         add(a);
     }
 
+    /**
+     * Shifts {@code this} of {@code n} ints to the left and adds {@code addend}.
+     * Assumes {@code n > 0} for speed.
+     */
+    void shiftAdd(MutableBigInteger addend, int n) {
+        // Fast cases
+        if (addend.intLen <= n) {
+            shiftAddDisjoint(addend, n);
+        } else if (intLen == 0) {
+            copyValue(addend);
+        } else {
+            leftShift(n << 5);
+            add(addend);
+        }
+    }
+
+    /**
+     * Shifts {@code this} of {@code n} ints to the left and adds {@code addend}.
+     * Assumes {@code addend.intLen <= n}.
+     */
+    void shiftAddDisjoint(MutableBigInteger addend, int n) {
+        if (intLen == 0) { // Avoid unnormal values
+            copyValue(addend);
+            return;
+        }
+
+        int[] res;
+        final int resLen = intLen + n, resOffset;
+        if (resLen > value.length) {
+            res = new int[resLen];
+            System.arraycopy(value, offset, res, 0, intLen);
+            resOffset = 0;
+        } else {
+            res = value;
+            if (offset + resLen > value.length) {
+                System.arraycopy(value, offset, res, 0, intLen);
+                resOffset = 0;
+            } else {
+                resOffset = offset;
+            }
+            // Clear words where necessary
+            if (addend.intLen < n)
+                Arrays.fill(res, resOffset + intLen, resOffset + resLen - addend.intLen, 0);
+        }
+
+        System.arraycopy(addend.value, addend.offset, res, resOffset + resLen - addend.intLen, addend.intLen);
+
+        value = res;
+        offset = resOffset;
+        intLen = resLen;
+    }
+
     /**
      * Subtracts the smaller of this and b from the larger and places the
      * result into this MutableBigInteger.
@@ -1003,6 +1075,7 @@ private int difference(MutableBigInteger b) {
     /**
      * Multiply the contents of two MutableBigInteger objects. The result is
      * placed into MutableBigInteger z. The contents of y are not changed.
+     * Assume {@code intLen > 0}
      */
     void multiply(MutableBigInteger y, MutableBigInteger z) {
         int xLen = intLen;
@@ -1793,93 +1866,169 @@ private boolean unsignedLongCompare(long one, long two) {
     }
 
     /**
-     * Calculate the integer square root {@code floor(sqrt(this))} where
-     * {@code sqrt(.)} denotes the mathematical square root. The contents of
-     * {@code this} are <b>not</b> changed. The value of {@code this} is assumed
-     * to be non-negative.
+     * Calculate the integer square root {@code floor(sqrt(this))} and the remainder
+     * if needed, where {@code sqrt(.)} denotes the mathematical square root.
+     * The contents of {@code this} are <em>not</em> changed.
+     * The value of {@code this} is assumed to be non-negative.
      *
-     * @implNote The implementation is based on the material in Henry S. Warren,
-     * Jr., <i>Hacker's Delight (2nd ed.)</i> (Addison Wesley, 2013), 279-282.
-     *
-     * @throws ArithmeticException if the value returned by {@code bitLength()}
-     * overflows the range of {@code int}.
-     * @return the integer square root of {@code this}
-     * @since 9
+     * @return the integer square root of {@code this} and the remainder if needed
      */
-    MutableBigInteger sqrt() {
+    MutableBigInteger[] sqrtRem(boolean needRemainder) {
         // Special cases.
-        if (this.isZero()) {
-            return new MutableBigInteger(0);
-        } else if (this.value.length == 1
-                && (this.value[0] & LONG_MASK) < 4) { // result is unity
-            return ONE;
-        }
-
-        if (bitLength() <= 63) {
-            // Initial estimate is the square root of the positive long value.
-            long v = new BigInteger(this.value, 1).longValueExact();
-            long xk = (long)Math.floor(Math.sqrt(v));
-
-            // Refine the estimate.
-            do {
-                long xk1 = (xk + v/xk)/2;
-
-                // Terminate when non-decreasing.
-                if (xk1 >= xk) {
-                    return new MutableBigInteger(new int[] {
-                        (int)(xk >>> 32), (int)(xk & LONG_MASK)
-                    });
+        if (this.intLen <= 2) {
+            final long x = this.toLong(); // unsigned
+            long s = unsignedLongSqrt(x);
+
+            return new MutableBigInteger[] {
+                    new MutableBigInteger((int) s),
+                    needRemainder ? new MutableBigInteger(x - s * s) : null
+            };
+        }
+
+        // Normalize
+        MutableBigInteger x = this;
+        final int shift = (Integer.numberOfLeadingZeros(x.value[x.offset]) & ~1) // shift must be even
+                + ((x.intLen & 1) << 5); // x.intLen must be even
+
+        if (shift != 0) {
+            x = new MutableBigInteger(x);
+            x.leftShift(shift);
+        }
+
+        // Compute sqrt and remainder
+        MutableBigInteger[] sqrtRem = x.sqrtRemKaratsuba(x.intLen, needRemainder);
+
+        // Unnormalize
+        if (shift != 0) {
+            final int halfShift = shift >> 1;
+            if (needRemainder) {
+                // shift <= 62, so s0 is at most 31 bit long
+                final long s0 = sqrtRem[0].value[sqrtRem[0].offset + sqrtRem[0].intLen - 1]
+                        & (-1 >>> -halfShift); // Remove excess bits
+                if (s0 != 0L) { // An optimization
+                    MutableBigInteger doubleProd = new MutableBigInteger();
+                    sqrtRem[0].mul((int) (s0 << 1), doubleProd);
+
+                    sqrtRem[1].add(doubleProd);
+                    sqrtRem[1].subtract(new MutableBigInteger(s0 * s0));
                 }
+                sqrtRem[1].rightShift(shift);
+            }
+            sqrtRem[0].primitiveRightShift(halfShift);
+        }
+        return sqrtRem;
+    }
 
-                xk = xk1;
-            } while (true);
-        } else {
-            // Set up the initial estimate of the iteration.
+    private static long unsignedLongSqrt(long x) {
+        /* For every long value s in [0, 2^32) such that x == s * s,
+         * it is true that s - 1 <= (long) Math.sqrt(x >= 0 ? x : x + 0x1p64) <= s,
+         * and if x == 2^64 - 1, then (long) Math.sqrt(x >= 0 ? x : x + 0x1p64) == 2^32.
+         * Since both cast to long and `Math.sqrt()` are (weakly) increasing,
+         * this means that the value returned by Math.sqrt()
+         * for a long value in the range [0, 2^64) is either correct,
+         * or rounded up/down by one if the value is too high
+         * and too close to a perfect square.
+         */
+        long s = (long) Math.sqrt(x >= 0 ? x : x + 0x1p64);
+        long s2 = s * s;  // overflows iff s == 2^32
+        return Long.compareUnsigned(x, s2) < 0 || s > LONG_MASK
+                ? s - 1
+                : (Long.compareUnsigned(x, s2 + (s << 1)) <= 0 // x <= (s + 1)^2 - 1, does not overflow
+                        ? s
+                        : s + 1);
+    }
 
-            // Obtain the bitLength > 63.
-            int bitLength = (int) this.bitLength();
-            if (bitLength != this.bitLength()) {
-                throw new ArithmeticException("bitLength() integer overflow");
-            }
+    /**
+     * Assumes {@code 2 <= len <= intLen && len % 2 == 0
+     * && Integer.numberOfLeadingZeros(value[offset]) <= 1}
+     * @implNote The implementation is based on Zimmermann's works available
+     * <a href="https://inria.hal.science/inria-00072854v1/document">  here</a> and
+     * <a href="https://inria.hal.science/inria-00072113/document">  here</a>
+     */
+    private MutableBigInteger[] sqrtRemKaratsuba(int len, boolean needRemainder) {
+        if (len == 2) { // Base case
+            long x = ((value[offset] & LONG_MASK) << 32) | (value[offset + 1] & LONG_MASK);
+            long s = unsignedLongSqrt(x);
 
-            // Determine an even valued right shift into positive long range.
-            int shift = bitLength - 63;
-            if (shift % 2 == 1) {
-                shift++;
-            }
+            // Allocate sufficient space to hold the final square root, assuming intLen % 2 == 0
+            MutableBigInteger sqrt = new MutableBigInteger(new int[intLen >> 1]);
 
-            // Shift the value into positive long range.
-            MutableBigInteger xk = new MutableBigInteger(this);
-            xk.rightShift(shift);
-            xk.normalize();
-
-            // Use the square root of the shifted value as an approximation.
-            double d = new BigInteger(xk.value, 1).doubleValue();
-            BigInteger bi = BigInteger.valueOf((long)Math.ceil(Math.sqrt(d)));
-            xk = new MutableBigInteger(bi.mag);
-
-            // Shift the approximate square root back into the original range.
-            xk.leftShift(shift / 2);
-
-            // Refine the estimate.
-            MutableBigInteger xk1 = new MutableBigInteger();
-            do {
-                // xk1 = (xk + n/xk)/2
-                this.divide(xk, xk1, false);
-                xk1.add(xk);
-                xk1.rightShift(1);
-
-                // Terminate when non-decreasing.
-                if (xk1.compare(xk) >= 0) {
-                    return xk;
-                }
+            // Place the partial square root
+            sqrt.intLen = 1;
+            sqrt.value[0] = (int) s;
+
+            return new MutableBigInteger[] { sqrt, new MutableBigInteger(x - s * s) };
+        }
 
-                // xk = xk1
-                xk.copyValue(xk1);
+        // Recursive step (len >= 4)
 
-                xk1.reset();
-            } while (true);
+        final int halfLen = len >> 1;
+        // Recursive invocation
+        MutableBigInteger[] sr = sqrtRemKaratsuba(halfLen + (halfLen & 1), true);
+
+        final int blockLen = halfLen >> 1;
+        MutableBigInteger dividend = sr[1];
+        dividend.shiftAddDisjoint(getBlockForSqrt(1, len, blockLen), blockLen);
+
+        // Compute dividend / (2*sqrt)
+        MutableBigInteger sqrt = sr[0];
+        MutableBigInteger q = new MutableBigInteger();
+        MutableBigInteger u = dividend.divide(sqrt, q);
+        if (q.isOdd())
+            u.add(sqrt);
+        q.rightShift(1);
+
+        sqrt.shiftAdd(q, blockLen);
+        // Corresponds to ub + a_0 in the paper
+        u.shiftAddDisjoint(getBlockForSqrt(0, len, blockLen), blockLen);
+        BigInteger qBig = q.toBigInteger(); // Cast to BigInteger to use fast multiplication
+        MutableBigInteger qSqr = new MutableBigInteger(qBig.multiply(qBig).mag);
+
+        MutableBigInteger rem;
+        if (needRemainder) {
+            rem = u;
+            if (rem.subtract(qSqr) < 0) {
+                MutableBigInteger twiceSqrt = new MutableBigInteger(sqrt);
+                twiceSqrt.leftShift(1);
+
+                // Since subtract() performs an absolute difference, to get the correct algebraic sum
+                // we must first add the sum of absolute values of addends concordant with the sign of rem
+                // and then subtract the sum of absolute values of addends that are discordant
+                rem.add(ONE);
+                rem.subtract(twiceSqrt);
+                sqrt.subtract(ONE);
+            }
+        } else {
+            rem = null;
+            if (u.compare(qSqr) < 0)
+                sqrt.subtract(ONE);
         }
+
+        sr[1] = rem;
+        return sr;
+    }
+
+    /**
+     * Returns a {@code MutableBigInteger} obtained by taking {@code blockLen} ints from
+     * {@code this} number, ending at {@code blockIndex*blockLen} (exclusive).<br/>
+     * Used in Karatsuba square root.
+     * @param blockIndex the block index, starting from the lowest
+     * @param len the logical length of the input value in units of 32 bits
+     * @param blockLen the length of the block in units of 32 bits
+     *
+     * @return a {@code MutableBigInteger} obtained by taking {@code blockLen} ints from
+     * {@code this} number, ending at {@code blockIndex*blockLen} (exclusive).
+     */
+    private MutableBigInteger getBlockForSqrt(int blockIndex, int len, int blockLen) {
+        final int to = offset + len - blockIndex * blockLen;
+
+        // Skip leading zeros
+        int from;
+        for (from = to - blockLen; from < to && value[from] == 0; from++);
+
+        return from == to
+                ? new MutableBigInteger()
+                : new MutableBigInteger(Arrays.copyOfRange(value, from, to));
     }
 
     /**
diff --git a/test/jdk/java/math/BigInteger/BigIntegerTest.java b/test/jdk/java/math/BigInteger/BigIntegerTest.java
index 2ac4750e43fa0..7da3fdac61813 100644
--- a/test/jdk/java/math/BigInteger/BigIntegerTest.java
+++ b/test/jdk/java/math/BigInteger/BigIntegerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -293,8 +293,30 @@ private static void squareRootSmall() {
         report("squareRootSmall", failCount);
     }
 
+    private static void perfectSquaresLong() {
+        /* For every long value n in [0, 2^32) such that x == n * n,
+         * n - 1 <= (long) Math.sqrt(x >= 0 ? x : x + 0x1p64) <= n
+         * must be true.
+         * This property is used to implement MutableBigInteger.unsignedLongSqrt().
+         */
+        int failCount = 0;
+
+        long limit = 1L << 32;
+        for (long n = 0; n < limit; n++) {
+            long x = n * n;
+            long s = (long) Math.sqrt(x >= 0 ? x : x + 0x1p64);
+            if (!(s == n || s == n - 1)) {
+                failCount++;
+                System.err.println(s + "^2 != " + x + " && (" + s + "+1)^2 != " + x);
+            }
+        }
+
+        report("perfectSquaresLong", failCount);
+    }
+
     public static void squareRoot() {
         squareRootSmall();
+        perfectSquaresLong();
 
         ToIntFunction<BigInteger> f = (n) -> {
             int failCount = 0;
diff --git a/test/micro/org/openjdk/bench/java/math/BigIntegerSquareRoot.java b/test/micro/org/openjdk/bench/java/math/BigIntegerSquareRoot.java
new file mode 100644
index 0000000000000..4b78b4cd8fa7f
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/math/BigIntegerSquareRoot.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+package org.openjdk.bench.java.math;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OperationsPerInvocation;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.math.BigInteger;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+@Warmup(iterations = 5, time = 1)
+@Measurement(iterations = 5, time = 1)
+@Fork(value = 3)
+public class BigIntegerSquareRoot {
+
+    private BigInteger[] xsArray, sArray, mArray, lArray, xlArray;
+    private static final int TESTSIZE = 1000;
+
+    @Setup
+    public void setup() {
+        Random r = new Random(1123);
+
+        xsArray = new BigInteger[TESTSIZE]; /*
+         * Each array entry is atmost 64 bits
+         * in size
+         */
+        sArray = new BigInteger[TESTSIZE]; /*
+         * Each array entry is atmost 256 bits
+         * in size
+         */
+        mArray = new BigInteger[TESTSIZE]; /*
+         * Each array entry is atmost 1024 bits
+         * in size
+         */
+        lArray = new BigInteger[TESTSIZE]; /*
+         * Each array entry is atmost 4096 bits
+         * in size
+         */
+        xlArray = new BigInteger[TESTSIZE]; /*
+         * Each array entry is atmost 16384 bits
+         * in size
+         */
+
+        for (int i = 0; i < TESTSIZE; i++) {
+            xsArray[i] = new BigInteger(r.nextInt(64), r);
+            sArray[i] = new BigInteger(r.nextInt(256), r);
+            mArray[i] = new BigInteger(r.nextInt(1024), r);
+            lArray[i] = new BigInteger(r.nextInt(4096), r);
+            xlArray[i] = new BigInteger(r.nextInt(16384), r);
+        }
+    }
+
+    /** Test BigInteger.sqrt() with numbers long at most 64 bits  */
+    @Benchmark
+    @OperationsPerInvocation(TESTSIZE)
+    public void testSqrtXS(Blackhole bh) {
+        for (BigInteger s : xsArray) {
+            bh.consume(s.sqrt());
+        }
+    }
+
+    /** Test BigInteger.sqrt() with numbers long at most 256 bits */
+    @Benchmark
+    @OperationsPerInvocation(TESTSIZE)
+    public void testSqrtS(Blackhole bh) {
+        for (BigInteger s : sArray) {
+            bh.consume(s.sqrt());
+        }
+    }
+
+    /** Test BigInteger.sqrt() with numbers long at most 1024 bits */
+    @Benchmark
+    @OperationsPerInvocation(TESTSIZE)
+    public void testSqrtM(Blackhole bh) {
+        for (BigInteger s : mArray) {
+            bh.consume(s.sqrt());
+        }
+    }
+
+    /** Test BigInteger.sqrt() with numbers long at most 4096 bits */
+    @Benchmark
+    @OperationsPerInvocation(TESTSIZE)
+    public void testSqrtL(Blackhole bh) {
+        for (BigInteger s : lArray) {
+            bh.consume(s.sqrt());
+        }
+    }
+
+    /** Test BigInteger.sqrt() with numbers long at most 16384 bits */
+    @Benchmark
+    @OperationsPerInvocation(TESTSIZE)
+    public void testSqrtXL(Blackhole bh) {
+        for (BigInteger s : xlArray) {
+            bh.consume(s.sqrt());
+        }
+    }
+}

From 8bd3cd51562ff9e76fa0e3d49d38e6e19210f878 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Sun, 4 Aug 2024 15:42:51 +0000
Subject: [PATCH 297/401] 8337716: ByteBuffer hashCode implementations are
 inconsistent

Reviewed-by: alanb, liach
---
 .../java/nio/Heap-X-Buffer.java.template      |  7 ------
 .../java/nio/Buffer/EqualsCompareTest.java    | 24 ++++++++++++++++++-
 .../openjdk/bench/java/nio/ByteBuffers.java   |  7 +-----
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template b/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template
index 8fbc1a3b69dfa..4820725d6c4ea 100644
--- a/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template
+++ b/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template
@@ -29,7 +29,6 @@ package java.nio;
 
 import java.lang.foreign.MemorySegment;
 import java.util.Objects;
-import jdk.internal.util.ArraysSupport;
 
 /**
 #if[rw]
@@ -706,9 +705,6 @@ class Heap$Type$Buffer$RW$
                                                                    addr, segment)));
     }
 
-    public int hashCode() {
-        return ArraysSupport.hashCode(hb, ix(position()), remaining(), 1);
-    }
 
 #end[byte]
 
@@ -737,9 +733,6 @@ class Heap$Type$Buffer$RW$
                                       offset, segment);
     }
 
-    public int hashCode() {
-        return ArraysSupport.hashCode(hb, ix(position()), remaining(), 1);
-    }
 #end[char]
 
 
diff --git a/test/jdk/java/nio/Buffer/EqualsCompareTest.java b/test/jdk/java/nio/Buffer/EqualsCompareTest.java
index baee641208411..03bd7c26a584a 100644
--- a/test/jdk/java/nio/Buffer/EqualsCompareTest.java
+++ b/test/jdk/java/nio/Buffer/EqualsCompareTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
+import java.io.IOException;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
@@ -36,13 +37,21 @@
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 import java.nio.LongBuffer;
+import java.nio.MappedByteBuffer;
 import java.nio.ShortBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 import java.util.function.BiFunction;
 import java.util.function.LongFunction;
 import java.util.stream.IntStream;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.nio.file.StandardOpenOption.*;
+
 /*
  * @test
  * @bug 8193085 8199773
@@ -713,4 +722,17 @@ static int[] ranges(int from, int to) {
                         .distinct().toArray();
         }
     }
+
+    @Test
+    void testHashCode() throws IOException {
+        byte[] bytes = "hello world".getBytes(UTF_8);
+        Path path = Files.createTempFile("", "");
+        Files.write(path, bytes);
+        try (FileChannel fc = FileChannel.open(path, READ, DELETE_ON_CLOSE)) {
+            MappedByteBuffer one = fc.map(FileChannel.MapMode.READ_ONLY, 0, bytes.length);
+            ByteBuffer two = ByteBuffer.wrap(bytes);
+            Assert.assertEquals(one, two);
+            Assert.assertEquals(one.hashCode(), two.hashCode());
+        }
+    }
 }
diff --git a/test/micro/org/openjdk/bench/java/nio/ByteBuffers.java b/test/micro/org/openjdk/bench/java/nio/ByteBuffers.java
index c2f4e93313c91..48f75a3ec8117 100644
--- a/test/micro/org/openjdk/bench/java/nio/ByteBuffers.java
+++ b/test/micro/org/openjdk/bench/java/nio/ByteBuffers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -923,9 +923,4 @@ public double testDirectLoopGetDouble() {
         }
         return r;
     }
-
-    @Benchmark
-    public int testHeapHashCode() {
-        return heapByteBuffer.hashCode();
-    }
 }

From dabdae6b355b3e7a2795f6b01ba475652d483288 Mon Sep 17 00:00:00 2001
From: Julian Waters <jwaters@openjdk.org>
Date: Mon, 5 Aug 2024 05:13:08 +0000
Subject: [PATCH 298/401] 8334599: Improve code from JDK-8302671

Reviewed-by: aivanov, stuefe, prr
---
 .../windows/native/libawt/windows/awt_Component.cpp         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp
index 4f87e8ef4c113..640b06d0521a9 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp
@@ -3362,10 +3362,10 @@ BOOL AwtComponent::IsNumPadKey(UINT vkey, BOOL extended)
     return FALSE;
 }
 static void
-resetKbdState( BYTE kstate[256]) {
-    BYTE tmpState[256];
+resetKbdState( BYTE (&kstate)[AwtToolkit::KB_STATE_SIZE]) {
+    BYTE tmpState[AwtToolkit::KB_STATE_SIZE];
     WCHAR wc[2];
-    memmove(tmpState, kstate, 256 * sizeof(BYTE));
+    memmove(tmpState, kstate, sizeof(kstate));
     tmpState[VK_SHIFT] = 0;
     tmpState[VK_CONTROL] = 0;
     tmpState[VK_MENU] = 0;

From fbe8a81d1900d0de1920ad1df6ad574f3da4bd51 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Mon, 5 Aug 2024 05:57:41 +0000
Subject: [PATCH 299/401] 8333144: docker tests do not work when ubsan is
 configured

Reviewed-by: clanger, stuefe
---
 test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java b/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
index 2404394690ebd..c87796da47e7e 100644
--- a/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
+++ b/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
@@ -323,6 +323,7 @@ private static void generateDockerFile(Path dockerfile, String baseImage,
                                            String baseImageVersion) throws Exception {
         String template =
             "FROM %s:%s\n" +
+            "RUN apt-get install libubsan1\n" +
             "COPY /jdk /jdk\n" +
             "ENV JAVA_HOME=/jdk\n" +
             "CMD [\"/bin/bash\"]\n";

From be34730fb4e6818ac13c46b34b735c967351e5cd Mon Sep 17 00:00:00 2001
From: Christian Hagedorn <chagedorn@openjdk.org>
Date: Mon, 5 Aug 2024 09:52:07 +0000
Subject: [PATCH 300/401] 8335257: Refactor code to create Initialized
 Assertion Predicates into separate class

Reviewed-by: kvn, epeter
---
 src/hotspot/share/opto/cfgnode.hpp       |   4 +
 src/hotspot/share/opto/ifnode.cpp        |   4 +-
 src/hotspot/share/opto/loopPredicate.cpp |  12 +--
 src/hotspot/share/opto/loopTransform.cpp |  82 +++++++---------
 src/hotspot/share/opto/loopnode.hpp      |   9 +-
 src/hotspot/share/opto/predicates.cpp    | 118 +++++++++++++++++++----
 src/hotspot/share/opto/predicates.hpp    |  61 ++++++++----
 src/hotspot/share/opto/split_if.cpp      |  24 ++---
 8 files changed, 206 insertions(+), 108 deletions(-)

diff --git a/src/hotspot/share/opto/cfgnode.hpp b/src/hotspot/share/opto/cfgnode.hpp
index 18d7577d9e621..5edd31fa71695 100644
--- a/src/hotspot/share/opto/cfgnode.hpp
+++ b/src/hotspot/share/opto/cfgnode.hpp
@@ -449,6 +449,10 @@ class IfNode : public MultiBranchNode {
   static const TypeInt* filtered_int_type(PhaseGVN* phase, Node* val, Node* if_proj);
 
 #ifndef PRODUCT
+  AssertionPredicateType assertion_predicate_type() const {
+    return _assertion_predicate_type;
+  }
+
   virtual void dump_spec(outputStream *st) const;
 #endif
 
diff --git a/src/hotspot/share/opto/ifnode.cpp b/src/hotspot/share/opto/ifnode.cpp
index cedbc66bbb444..8e5cd2702137a 100644
--- a/src/hotspot/share/opto/ifnode.cpp
+++ b/src/hotspot/share/opto/ifnode.cpp
@@ -1843,10 +1843,10 @@ void IfProjNode::pin_array_access_nodes(PhaseIterGVN* igvn) {
 #ifndef PRODUCT
 void IfNode::dump_spec(outputStream* st) const {
   switch (_assertion_predicate_type) {
-    case AssertionPredicateType::Init_value:
+    case AssertionPredicateType::InitValue:
       st->print("#Init Value Assertion Predicate  ");
       break;
-    case AssertionPredicateType::Last_value:
+    case AssertionPredicateType::LastValue:
       st->print("#Last Value Assertion Predicate  ");
       break;
     case AssertionPredicateType::None:
diff --git a/src/hotspot/share/opto/loopPredicate.cpp b/src/hotspot/share/opto/loopPredicate.cpp
index b22931e56630e..5e585a406f20c 100644
--- a/src/hotspot/share/opto/loopPredicate.cpp
+++ b/src/hotspot/share/opto/loopPredicate.cpp
@@ -374,10 +374,10 @@ IfProjNode* PhaseIdealLoop::clone_assertion_predicate_for_unswitched_loops(IfNod
                                                                            IfProjNode* predicate,
                                                                            Deoptimization::DeoptReason reason,
                                                                            ParsePredicateSuccessProj* parse_predicate_proj) {
-  TemplateAssertionPredicateExpression template_assertion_predicate_expression(
-      template_assertion_predicate->in(1)->as_Opaque4());
-  Opaque4Node* cloned_opaque4_node = template_assertion_predicate_expression.clone(parse_predicate_proj->in(0)->in(0), this);
-  IfProjNode* if_proj = create_new_if_for_predicate(parse_predicate_proj, nullptr, reason, template_assertion_predicate->Opcode(), false);
+  TemplateAssertionExpression template_assertion_expression(template_assertion_predicate->in(1)->as_Opaque4());
+  Opaque4Node* cloned_opaque4_node = template_assertion_expression.clone(parse_predicate_proj->in(0)->in(0), this);
+  IfProjNode* if_proj = create_new_if_for_predicate(parse_predicate_proj, nullptr, reason,
+                                                    template_assertion_predicate->Opcode(), false);
   _igvn.replace_input_of(if_proj->in(0), 1, cloned_opaque4_node);
   _igvn.replace_input_of(parse_predicate_proj->in(0), 0, if_proj);
   set_idom(parse_predicate_proj->in(0), if_proj, dom_depth(if_proj));
@@ -1324,7 +1324,7 @@ IfTrueNode* PhaseIdealLoop::add_template_assertion_predicate(IfNode* iff, IdealL
   C->add_template_assertion_predicate_opaq(opaque_bol);
   register_new_node(opaque_bol, upper_bound_proj);
   IfTrueNode* new_proj = create_new_if_for_predicate(parse_predicate_proj, nullptr, reason, overflow ? Op_If : iff->Opcode(),
-                                                     false NOT_PRODUCT(COMMA AssertionPredicateType::Init_value));
+                                                     false NOT_PRODUCT(COMMA AssertionPredicateType::InitValue));
   _igvn.replace_input_of(new_proj->in(0), 1, opaque_bol);
   assert(opaque_init->outcnt() > 0, "should be used");
 
@@ -1350,7 +1350,7 @@ IfTrueNode* PhaseIdealLoop::add_template_assertion_predicate(IfNode* iff, IdealL
   C->add_template_assertion_predicate_opaq(opaque_bol);
   register_new_node(opaque_bol, new_proj);
   new_proj = create_new_if_for_predicate(parse_predicate_proj, nullptr, reason, overflow ? Op_If : iff->Opcode(),
-                                         false NOT_PRODUCT(COMMA AssertionPredicateType::Last_value));
+                                         false NOT_PRODUCT(COMMA AssertionPredicateType::LastValue));
   _igvn.replace_input_of(new_proj->in(0), 1, opaque_bol);
   assert(max_value->outcnt() > 0, "should be used");
   assert(assertion_predicate_has_loop_opaque_node(new_proj->in(0)->as_If()), "unexpected");
diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index 6ca7bb51fb458..99742a598e858 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -1373,17 +1373,12 @@ void PhaseIdealLoop::copy_assertion_predicates_to_main_loop_helper(const Predica
       Node* bol = iff->in(1);
       assert(!bol->is_OpaqueInitializedAssertionPredicate(), "should not find an Initialized Assertion Predicate");
       if (bol->is_Opaque4()) {
-        assert(assertion_predicate_has_loop_opaque_node(iff), "must find OpaqueLoop* nodes");
         // Clone the Assertion Predicate twice and initialize one with the initial
         // value of the loop induction variable. Leave the other predicate
         // to be initialized when increasing the stride during loop unrolling.
-        prev_proj = clone_assertion_predicate_and_initialize(iff, opaque_init, nullptr, predicate_proj, uncommon_proj,
-                                                             current_proj, outer_loop, prev_proj);
-        assert(assertion_predicate_has_loop_opaque_node(prev_proj->in(0)->as_If()), "");
-
-        prev_proj = clone_assertion_predicate_and_initialize(iff, init, stride, predicate_proj, uncommon_proj,
-                                                             current_proj, outer_loop, prev_proj);
-        assert(!assertion_predicate_has_loop_opaque_node(prev_proj->in(0)->as_If()), "");
+        prev_proj = clone_template_assertion_predicate(iff, opaque_init, predicate_proj, uncommon_proj,
+                                                       current_proj, outer_loop, prev_proj);
+        prev_proj = create_initialized_assertion_predicate(iff, init, stride, prev_proj);
 
         // Rewire any control inputs from the cloned Assertion Predicates down to the main and post loop for data nodes
         // that are part of the main loop (and were cloned to the pre and post loop).
@@ -1460,7 +1455,7 @@ void PhaseIdealLoop::count_opaque_loop_nodes(Node* n, uint& init, uint& stride)
   wq.push(n);
   for (uint i = 0; i < wq.size(); i++) {
     Node* n = wq.at(i);
-    if (TemplateAssertionPredicateExpressionNode::is_maybe_in_expression(n)) {
+    if (TemplateAssertionExpressionNode::is_maybe_in_expression(n)) {
       if (n->is_OpaqueLoopInit()) {
         init++;
       } else if (n->is_OpaqueLoopStride()) {
@@ -1477,27 +1472,28 @@ void PhaseIdealLoop::count_opaque_loop_nodes(Node* n, uint& init, uint& stride)
   }
 }
 
-// Clone an Assertion Predicate for the main loop. new_init and new_stride are set as new inputs. Since the predicates
-// cannot fail at runtime, Halt nodes are inserted instead of uncommon traps.
-Node* PhaseIdealLoop::clone_assertion_predicate_and_initialize(Node* iff, Node* new_init, Node* new_stride, Node* predicate,
-                                                               Node* uncommon_proj, Node* control, IdealLoopTree* outer_loop,
-                                                               Node* input_proj) {
-  TemplateAssertionPredicateExpression template_assertion_predicate_expression(iff->in(1)->as_Opaque4());
-  Node* new_opaque_node;
-  if (new_stride == nullptr) {
-    // Clone the Template Assertion Predicate and set a new OpaqueLoopInitNode to create a new Template Assertion Predicate.
-    // This is done when creating a new Template Assertion Predicate for the main loop which requires a new init node.
-    // We keep the Opaque4 node since it's still a template.
-    assert(new_init->is_OpaqueLoopInit(), "only for creating new Template Assertion Predicates");
-    new_opaque_node = template_assertion_predicate_expression.clone_and_replace_init(new_init, control, this);
-  } else {
-    // Create an Initialized Assertion Predicate from the Template Assertion Predicate.
-    new_opaque_node = template_assertion_predicate_expression.clone_and_replace_init_and_stride(new_init, new_stride,
-                                                                                                 control, this);
-    // Since this is an Initialized Assertion Predicate, we use the dedicated opaque node.
-    new_opaque_node = new OpaqueInitializedAssertionPredicateNode(new_opaque_node->in(1)->as_Bool(), C);
-    register_new_node(new_opaque_node, control);
-  }
+// Create an Initialized Assertion Predicate from the template_assertion_predicate
+IfTrueNode* PhaseIdealLoop::create_initialized_assertion_predicate(IfNode* template_assertion_predicate, Node* new_init,
+                                                                   Node* new_stride, Node* control) {
+  assert(assertion_predicate_has_loop_opaque_node(template_assertion_predicate),
+         "must find OpaqueLoop* nodes for Template Assertion Predicate");
+  InitializedAssertionPredicate initialized_assertion_predicate(template_assertion_predicate, new_init, new_stride, this);
+  IfTrueNode* success_proj = initialized_assertion_predicate.create(control);
+  assert(!assertion_predicate_has_loop_opaque_node(success_proj->in(0)->as_If()),
+         "Initialized Assertion Predicates do not have OpaqueLoop* nodes in the bool expression anymore");
+  return success_proj;
+}
+
+// Clone the Template Assertion Predicate and set a new OpaqueLoopInitNode to create a new Template Assertion Predicate.
+// This is done when creating a new Template Assertion Predicate for the main loop which requires a new init node.
+// We keep the Opaque4 node since it's still a template. Since the templates are eventually removed after loop opts,
+// these are never executed. We therefore insert a Halt node instead of an uncommon trap.
+Node* PhaseIdealLoop::clone_template_assertion_predicate(IfNode* iff, Node* new_init, Node* predicate, Node* uncommon_proj,
+                                                         Node* control, IdealLoopTree* outer_loop, Node* input_proj) {
+  assert(assertion_predicate_has_loop_opaque_node(iff), "must find OpaqueLoop* nodes for Template Assertion Predicate");
+  TemplateAssertionExpression template_assertion_expression(iff->in(1)->as_Opaque4());
+  assert(new_init->is_OpaqueLoopInit(), "only for creating new Template Assertion Predicates");
+  Opaque4Node* new_opaque_node = template_assertion_expression.clone_and_replace_init(new_init, control, this);
   Node* proj = predicate->clone();
   Node* other_proj = uncommon_proj->clone();
   Node* new_iff = iff->clone();
@@ -1506,8 +1502,7 @@ Node* PhaseIdealLoop::clone_assertion_predicate_and_initialize(Node* iff, Node*
   other_proj->set_req(0, new_iff);
   Node* frame = new ParmNode(C->start(), TypeFunc::FramePtr);
   register_new_node(frame, C->start());
-  // It's impossible for the predicate to fail at runtime. Use a Halt node.
-  Node* halt = new HaltNode(other_proj, frame, "duplicated predicate failed which is impossible");
+  Node* halt = new HaltNode(other_proj, frame, "Template Assertion Predicates are always removed before code generation");
   _igvn.add_input_to(C->root(), halt);
   new_iff->set_req(0, input_proj);
 
@@ -1515,6 +1510,8 @@ Node* PhaseIdealLoop::clone_assertion_predicate_and_initialize(Node* iff, Node*
   register_control(proj, outer_loop == _ltree_root ? _ltree_root : outer_loop->_parent, new_iff);
   register_control(other_proj, _ltree_root, new_iff);
   register_control(halt, _ltree_root, other_proj);
+  assert(assertion_predicate_has_loop_opaque_node(proj->in(0)->as_If()),
+         "Template Assertion Predicates must have OpaqueLoop* nodes in the bool expression");
   return proj;
 }
 
@@ -1967,9 +1964,7 @@ void PhaseIdealLoop::update_main_loop_assertion_predicates(Node* ctrl, CountedLo
         // Create an Initialized Assertion Predicates for it accordingly:
         // - For the initial access a[init] (same as before)
         // - For the last access a[init+new_stride-orig_stride] (with the new unroll stride)
-        prev_proj = clone_assertion_predicate_and_initialize(iff, init, max_value, entry, proj, ctrl, outer_loop,
-                                                             prev_proj);
-        assert(!assertion_predicate_has_loop_opaque_node(prev_proj->in(0)->as_If()), "unexpected");
+        prev_proj = create_initialized_assertion_predicate(iff, init, max_value, prev_proj);
       } else {
         // Ignore Opaque4 from a non-null-check for an intrinsic or unsafe access. This could happen when we maximally
         // unroll a non-main loop with such an If with an Opaque4 node directly above the loop entry.
@@ -2008,10 +2003,7 @@ void PhaseIdealLoop::copy_assertion_predicates_to_post_loop(LoopNode* main_loop_
     }
     if (iff->in(1)->is_Opaque4()) {
       // Initialize from Template Assertion Predicate.
-      assert(assertion_predicate_has_loop_opaque_node(iff), "must find OpaqueLoop* nodes");
-      prev_proj = clone_assertion_predicate_and_initialize(iff, init, stride, ctrl, proj, post_loop_entry,
-                                                           post_loop, prev_proj);
-      assert(!assertion_predicate_has_loop_opaque_node(prev_proj->in(0)->as_If()), "must not find OpaqueLoop* nodes");
+      prev_proj = create_initialized_assertion_predicate(iff, init, stride, prev_proj);
     }
     ctrl = ctrl->in(0)->in(0);
   }
@@ -2030,9 +2022,7 @@ void PhaseIdealLoop::initialize_assertion_predicates_for_peeled_loop(const Predi
   if (!predicate_block->has_parse_predicate()) {
     return;
   }
-  Node* control = outer_loop_head->in(LoopNode::EntryControl);
-  Node* input_proj = control;
-
+  Node* input_proj = outer_loop_head->in(LoopNode::EntryControl);
   const Node* parse_predicate_uncommon_trap = predicate_block->parse_predicate()->uncommon_trap();
   Node* next_regular_predicate_proj = predicate_block->skip_parse_predicate();
   while (next_regular_predicate_proj->is_IfProj()) {
@@ -2046,9 +2036,7 @@ void PhaseIdealLoop::initialize_assertion_predicates_for_peeled_loop(const Predi
     assert(!bol->is_OpaqueInitializedAssertionPredicate(), "should not find an Initialized Assertion Predicate");
     if (bol->is_Opaque4()) {
       // Initialize from Template Assertion Predicate.
-      assert(assertion_predicate_has_loop_opaque_node(iff), "must find OpaqueLoop* nodes");
-      input_proj = clone_assertion_predicate_and_initialize(iff, init, stride, next_regular_predicate_proj, uncommon_proj, control,
-                                                            outer_loop, input_proj);
+      input_proj = create_initialized_assertion_predicate(iff, init, stride, input_proj);
 
       // Rewire any control inputs from the old Assertion Predicates above the peeled iteration down to the initialized
       // Assertion Predicates above the peeled loop.
@@ -3018,7 +3006,7 @@ void PhaseIdealLoop::do_range_check(IdealLoopTree *loop, Node_List &old_new) {
           // unrolling or splitting this main-loop further.
           loop_entry = add_range_check_elimination_assertion_predicate(
               loop, loop_entry, scale_con, int_offset, int_limit, stride_con, opaque_init, true
-              NOT_PRODUCT(COMMA AssertionPredicateType::Init_value));
+              NOT_PRODUCT(COMMA AssertionPredicateType::InitValue));
           assert(assertion_predicate_has_loop_opaque_node(loop_entry->in(0)->as_If()), "unexpected");
 
           Node* opaque_stride = new OpaqueLoopStrideNode(C, cl->stride());
@@ -3032,7 +3020,7 @@ void PhaseIdealLoop::do_range_check(IdealLoopTree *loop, Node_List &old_new) {
           register_new_node(max_value, loop_entry);
           loop_entry = add_range_check_elimination_assertion_predicate(
               loop, loop_entry, scale_con, int_offset, int_limit, stride_con, max_value, true
-              NOT_PRODUCT(COMMA AssertionPredicateType::Last_value));
+              NOT_PRODUCT(COMMA AssertionPredicateType::LastValue));
           assert(assertion_predicate_has_loop_opaque_node(loop_entry->in(0)->as_If()), "unexpected");
 
         } else {
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index 24101ea07a002..94632be268d58 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -952,9 +952,10 @@ class PhaseIdealLoop : public PhaseTransform {
                                               LoopNode* outer_main_head, uint dd_main_head, uint idx_before_pre_post,
                                               uint idx_after_post_before_pre, Node* zero_trip_guard_proj_main,
                                               Node* zero_trip_guard_proj_post, const Node_List& old_new);
-  Node* clone_assertion_predicate_and_initialize(Node* iff, Node* new_init, Node* new_stride, Node* predicate,
-                                                 Node* uncommon_proj, Node* control, IdealLoopTree* outer_loop,
-                                                 Node* input_proj);
+  Node* clone_template_assertion_predicate(IfNode* iff, Node* new_init, Node* predicate, Node* uncommon_proj, Node* control,
+                                           IdealLoopTree* outer_loop, Node* input_proj);
+  IfTrueNode* create_initialized_assertion_predicate(IfNode* template_assertion_predicate, Node* new_init,
+                                                     Node* new_stride, Node* control);
   static void count_opaque_loop_nodes(Node* n, uint& init, uint& stride);
   static bool assertion_predicate_has_loop_opaque_node(IfNode* iff);
   static void get_assertion_predicates(Node* predicate, Unique_Node_List& list, bool get_opaque = false);
@@ -1774,7 +1775,7 @@ class PhaseIdealLoop : public PhaseTransform {
   bool clone_cmp_loadklass_down(Node* n, const Node* blk1, const Node* blk2);
   void clone_loadklass_nodes_at_cmp_index(const Node* n, Node* cmp, int i);
   bool clone_cmp_down(Node* n, const Node* blk1, const Node* blk2);
-  void clone_template_assertion_predicate_expression_down(Node* node);
+  void clone_template_assertion_expression_down(Node* node);
 
   Node* similar_subtype_check(const Node* x, Node* r_in);
 
diff --git a/src/hotspot/share/opto/predicates.cpp b/src/hotspot/share/opto/predicates.cpp
index 5b0de2e02d5f0..3887e8a5f6cdf 100644
--- a/src/hotspot/share/opto/predicates.cpp
+++ b/src/hotspot/share/opto/predicates.cpp
@@ -27,6 +27,7 @@
 #include "opto/loopnode.hpp"
 #include "opto/node.hpp"
 #include "opto/predicates.hpp"
+#include "opto/rootnode.hpp"
 
 // Walk over all Initialized Assertion Predicates and return the entry into the first Initialized Assertion Predicate
 // (i.e. not belonging to an Initialized Assertion Predicate anymore)
@@ -239,27 +240,27 @@ class ReplaceInitAndStrideStrategy : public TransformStrategyForOpaqueLoopNodes
   }
 };
 
-// Creates an identical clone of this Template Assertion Predicate Expression (i.e.cloning all nodes from the Opaque4Node
-// to and including the OpaqueLoop* nodes). The cloned nodes are rewired to reflect the same graph structure as found for
-// this Template Assertion Predicate Expression. The cloned nodes get 'new_ctrl' as ctrl. There is no other update done
-// for the cloned nodes. Return the newly cloned Opaque4Node.
-Opaque4Node* TemplateAssertionPredicateExpression::clone(Node* new_ctrl, PhaseIdealLoop* phase) {
+// Creates an identical clone of this Template Assertion Expression (i.e.cloning all nodes from the Opaque4Node to and
+// including the OpaqueLoop* nodes). The cloned nodes are rewired to reflect the same graph structure as found for this
+// Template Assertion Expression. The cloned nodes get 'new_ctrl' as ctrl. There is no other update done for the cloned
+// nodes. Return the newly cloned Opaque4Node.
+Opaque4Node* TemplateAssertionExpression::clone(Node* new_ctrl, PhaseIdealLoop* phase) {
   CloneStrategy clone_init_and_stride_strategy(phase, new_ctrl);
   return clone(clone_init_and_stride_strategy, new_ctrl, phase);
 }
 
 // Same as clone() but instead of cloning the OpaqueLoopInitNode, we replace it with the provided 'new_init' node.
-Opaque4Node* TemplateAssertionPredicateExpression::clone_and_replace_init(Node* new_init, Node* new_ctrl,
-                                                                          PhaseIdealLoop* phase) {
+Opaque4Node* TemplateAssertionExpression::clone_and_replace_init(Node* new_init, Node* new_ctrl,
+                                                                 PhaseIdealLoop* phase) {
   ReplaceInitAndCloneStrideStrategy replace_init_and_clone_stride_strategy(new_init, new_ctrl, phase);
   return clone(replace_init_and_clone_stride_strategy, new_ctrl, phase);
 }
 
 // Same as clone() but instead of cloning the OpaqueLoopInit and OpaqueLoopStride node, we replace them with the provided
 // 'new_init' and 'new_stride' nodes, respectively.
-Opaque4Node* TemplateAssertionPredicateExpression::clone_and_replace_init_and_stride(Node* new_init, Node* new_stride,
-                                                                                     Node* new_ctrl,
-                                                                                     PhaseIdealLoop* phase) {
+Opaque4Node* TemplateAssertionExpression::clone_and_replace_init_and_stride(Node* new_init, Node* new_stride,
+                                                                            Node* new_ctrl,
+                                                                            PhaseIdealLoop* phase) {
   ReplaceInitAndStrideStrategy replace_init_and_stride_strategy(new_init, new_stride);
   return clone(replace_init_and_stride_strategy, new_ctrl, phase);
 }
@@ -307,8 +308,7 @@ class DataNodesOnPathsToTargets : public StackObj {
   // Do a BFS from the start_node to collect all target nodes. We can then do another BFS from the target nodes to
   // find all nodes on the paths from start->target(s).
   // Note: We could do a single DFS pass to search targets and backtrack in one walk. But this is much more complex.
-  //       Given that the typical Template Assertion Predicate Expression only consists of a few nodes, we aim for
-  //       simplicity here.
+  //       Given that the typical Template Assertion Expression only consists of a few nodes, we aim for simplicity here.
   void collect_target_nodes(Node* start_node) {
     _nodes_to_visit.push(start_node);
     for (uint i = 0; i < _nodes_to_visit.size(); i++) {
@@ -342,14 +342,14 @@ class DataNodesOnPathsToTargets : public StackObj {
   }
 };
 
-// Clones this Template Assertion Predicate Expression and applies the given strategy to transform the OpaqueLoop* nodes.
-Opaque4Node* TemplateAssertionPredicateExpression::clone(const TransformStrategyForOpaqueLoopNodes& transform_strategy,
-                                                         Node* new_ctrl, PhaseIdealLoop* phase) {
+// Clones this Template Assertion Expression and applies the given strategy to transform the OpaqueLoop* nodes.
+Opaque4Node* TemplateAssertionExpression::clone(const TransformStrategyForOpaqueLoopNodes& transform_strategy,
+                                                Node* new_ctrl, PhaseIdealLoop* phase) {
   ResourceMark rm;
   auto is_opaque_loop_node = [](const Node* node) {
     return node->is_Opaque1();
   };
-  DataNodesOnPathsToTargets data_nodes_on_path_to_targets(TemplateAssertionPredicateExpressionNode::is_maybe_in_expression,
+  DataNodesOnPathsToTargets data_nodes_on_path_to_targets(TemplateAssertionExpressionNode::is_maybe_in_expression,
                                                           is_opaque_loop_node);
   const Unique_Node_List& collected_nodes = data_nodes_on_path_to_targets.collect(_opaque4_node);
   DataNodeGraph data_node_graph(collected_nodes, phase);
@@ -359,8 +359,8 @@ Opaque4Node* TemplateAssertionPredicateExpression::clone(const TransformStrategy
   return opaque4_clone->as_Opaque4();
 }
 
-// Check if this node belongs a Template Assertion Predicate Expression (including OpaqueLoop* nodes).
-bool TemplateAssertionPredicateExpressionNode::is_in_expression(Node* node) {
+// Check if this node belongs a Template Assertion Expression (including OpaqueLoop* nodes).
+bool TemplateAssertionExpressionNode::is_in_expression(Node* node) {
   if (is_maybe_in_expression(node)) {
     ResourceMark rm;
     Unique_Node_List list;
@@ -377,10 +377,90 @@ bool TemplateAssertionPredicateExpressionNode::is_in_expression(Node* node) {
   return false;
 }
 
-bool TemplateAssertionPredicateExpressionNode::is_template_assertion_predicate(Node* node) {
+bool TemplateAssertionExpressionNode::is_template_assertion_predicate(Node* node) {
   return node->is_If() && node->in(1)->is_Opaque4();
 }
 
+InitializedAssertionPredicate::InitializedAssertionPredicate(IfNode* template_assertion_predicate, Node* new_init,
+                                                             Node* new_stride, PhaseIdealLoop* phase)
+    : _template_assertion_predicate(template_assertion_predicate),
+      _new_init(new_init),
+      _new_stride(new_stride),
+      _phase(phase) {}
+
+// Create an Initialized Assertion Predicate at the provided control from the _template_assertion_predicate.
+// We clone the Template Assertion Expression and replace:
+// - Opaque4 with OpaqueInitializedAssertionPredicate
+// - OpaqueLoop*Nodes with _new_init and _new_stride, respectively.
+//
+//             /         init                 stride
+//             |           |                    |
+//             |  OpaqueLoopInitNode  OpaqueLoopStrideNode                      /       _new_init    _new_stride
+//  Template   |                 \     /                                        |              \     /
+//  Assertion  |                   ...                               Assertion  |                ...
+//  Expression |                    |                                Expression |                 |
+//             |                   Bool                                         |              new Bool
+//             |                    |                                           |                 |
+//             \                 Opaque4           ======>          control     \  OpaqueInitializedAssertionPredicate
+//                                  |                                      \      /
+//                                 If                                       new If
+//                               /    \                                     /    \
+//                         success     fail path                   new success   new Halt
+//                           proj    (Halt or UCT)                     proj
+//
+IfTrueNode* InitializedAssertionPredicate::create(Node* control) {
+  IdealLoopTree* loop = _phase->get_loop(control);
+  OpaqueInitializedAssertionPredicateNode* assertion_expression = create_assertion_expression(control);
+  IfNode* if_node = create_if_node(control, assertion_expression, loop);
+  create_fail_path(if_node, loop);
+  return create_success_path(if_node, loop);
+}
+
+// Create a new Assertion Expression to be used as bool input for the Initialized Assertion Predicate IfNode.
+OpaqueInitializedAssertionPredicateNode* InitializedAssertionPredicate::create_assertion_expression(Node* control) {
+  Opaque4Node* template_opaque = _template_assertion_predicate->in(1)->as_Opaque4();
+  TemplateAssertionExpression template_assertion_expression(template_opaque);
+  Opaque4Node* tmp_opaque = template_assertion_expression.clone_and_replace_init_and_stride(_new_init, _new_stride,
+                                                                                            control, _phase);
+  OpaqueInitializedAssertionPredicateNode* assertion_expression =
+      new OpaqueInitializedAssertionPredicateNode(tmp_opaque->in(1)->as_Bool(), _phase->C);
+  _phase->register_new_node(assertion_expression, control);
+  return assertion_expression;
+}
+
+IfNode* InitializedAssertionPredicate::create_if_node(Node* control,
+                                                      OpaqueInitializedAssertionPredicateNode* assertion_expression,
+                                                      IdealLoopTree* loop) {
+  const int if_opcode = _template_assertion_predicate->Opcode();
+  NOT_PRODUCT(const AssertionPredicateType assertion_predicate_type = _template_assertion_predicate->assertion_predicate_type();)
+  IfNode* if_node = if_opcode == Op_If ?
+      new IfNode(control, assertion_expression, PROB_MAX, COUNT_UNKNOWN NOT_PRODUCT(COMMA assertion_predicate_type)) :
+      new RangeCheckNode(control, assertion_expression, PROB_MAX, COUNT_UNKNOWN NOT_PRODUCT(COMMA assertion_predicate_type));
+  _phase->register_control(if_node, loop, control);
+  return if_node;
+}
+
+IfTrueNode* InitializedAssertionPredicate::create_success_path(IfNode* if_node, IdealLoopTree* loop) {
+  IfTrueNode* success_proj = new IfTrueNode(if_node);
+  _phase->register_control(success_proj, loop, if_node);
+  return success_proj;
+}
+
+void InitializedAssertionPredicate::create_fail_path(IfNode* if_node, IdealLoopTree* loop) {
+  IfFalseNode* fail_proj = new IfFalseNode(if_node);
+  _phase->register_control(fail_proj, loop, if_node);
+  create_halt_node(fail_proj, loop);
+}
+
+void InitializedAssertionPredicate::create_halt_node(IfFalseNode* fail_proj, IdealLoopTree* loop) {
+  StartNode* start_node = _phase->C->start();
+  Node* frame = new ParmNode(start_node, TypeFunc::FramePtr);
+  _phase->register_new_node(frame, start_node);
+  Node* halt = new HaltNode(fail_proj, frame, "Initialized Assertion Predicate cannot fail");
+  _phase->igvn().add_input_to(_phase->C->root(), halt);
+  _phase->register_control(halt, loop, fail_proj);
+}
+
 // Is current node pointed to by iterator a predicate?
 bool PredicateEntryIterator::has_next() const {
     return ParsePredicate::is_predicate(_current) ||
diff --git a/src/hotspot/share/opto/predicates.hpp b/src/hotspot/share/opto/predicates.hpp
index 08aa64f03e583..96f5c438b802f 100644
--- a/src/hotspot/share/opto/predicates.hpp
+++ b/src/hotspot/share/opto/predicates.hpp
@@ -29,6 +29,8 @@
 #include "opto/connode.hpp"
 #include "opto/opaquenode.hpp"
 
+class IdealLoopTree;
+
 /*
  * There are different kinds of predicates throughout the code. We differentiate between the following predicates:
  *
@@ -198,8 +200,8 @@
 // value of a range check in the last iteration of a loop.
 enum class AssertionPredicateType {
   None, // Not an Assertion Predicate
-  Init_value,
-  Last_value
+  InitValue,
+  LastValue
 };
 #endif // NOT PRODUCT
 
@@ -294,20 +296,20 @@ class RuntimePredicate : public StackObj {
   static bool is_success_proj(Node* node, Deoptimization::DeoptReason deopt_reason);
 };
 
-// Interface to transform OpaqueLoopInit and OpaqueLoopStride nodes of a Template Assertion Predicate Expression.
+// Interface to transform OpaqueLoopInit and OpaqueLoopStride nodes of a Template Assertion Expression.
 class TransformStrategyForOpaqueLoopNodes : public StackObj {
  public:
   virtual Node* transform_opaque_init(OpaqueLoopInitNode* opaque_init) const = 0;
   virtual Node* transform_opaque_stride(OpaqueLoopStrideNode* opaque_stride) const = 0;
 };
 
-// A Template Assertion Predicate Expression represents the Opaque4Node for the initial value or the last value of a
+// A Template Assertion Predicate represents the Opaque4Node for the initial value or the last value of a
 // Template Assertion Predicate and all the nodes up to and including the OpaqueLoop* nodes.
-class TemplateAssertionPredicateExpression : public StackObj {
+class TemplateAssertionExpression : public StackObj {
   Opaque4Node* _opaque4_node;
 
  public:
-  explicit TemplateAssertionPredicateExpression(Opaque4Node* opaque4_node) : _opaque4_node(opaque4_node) {}
+  explicit TemplateAssertionExpression(Opaque4Node* opaque4_node) : _opaque4_node(opaque4_node) {}
 
  private:
   Opaque4Node* clone(const TransformStrategyForOpaqueLoopNodes& transform_strategy, Node* new_ctrl, PhaseIdealLoop* phase);
@@ -318,29 +320,29 @@ class TemplateAssertionPredicateExpression : public StackObj {
   Opaque4Node* clone_and_replace_init_and_stride(Node* new_init, Node* new_stride, Node* new_ctrl, PhaseIdealLoop* phase);
 };
 
-// Class to represent a node being part of a Template Assertion Predicate Expression.
+// Class to represent a node being part of a Template Assertion Expression. Note that this is not an IR node.
 //
 // The expression itself can belong to no, one, or two Template Assertion Predicates:
 // - None: This node is already dead (i.e. we replaced the Bool condition of the Template Assertion Predicate).
 // - Two: A OpaqueLoopInitNode could be part of two Template Assertion Predicates.
 // - One: In all other cases.
-class TemplateAssertionPredicateExpressionNode : public StackObj {
+class TemplateAssertionExpressionNode : public StackObj {
   Node* const _node;
 
  public:
-  explicit TemplateAssertionPredicateExpressionNode(Node* node) : _node(node) {
+  explicit TemplateAssertionExpressionNode(Node* node) : _node(node) {
     assert(is_in_expression(node), "must be valid");
   }
-  NONCOPYABLE(TemplateAssertionPredicateExpressionNode);
+  NONCOPYABLE(TemplateAssertionExpressionNode);
 
  private:
   static bool is_template_assertion_predicate(Node* node);
 
  public:
-  // Check whether the provided node is part of a Template Assertion Predicate Expression or not.
+  // Check whether the provided node is part of a Template Assertion Expression or not.
   static bool is_in_expression(Node* node);
 
-  // Check if the opcode of node could be found in a Template Assertion Predicate Expression.
+  // Check if the opcode of node could be found in a Template Assertion Expression.
   // This also provides a fast check whether a node is unrelated.
   static bool is_maybe_in_expression(const Node* node) {
     const int opcode = node->Opcode();
@@ -377,21 +379,44 @@ class TemplateAssertionPredicateExpressionNode : public StackObj {
         callback(next->as_If());
         DEBUG_ONLY(template_counter++;)
       } else {
-        assert(!next->is_CFG(), "no CFG expected in Template Assertion Predicate Expression");
+        assert(!next->is_CFG(), "no CFG expected in Template Assertion Expression");
         list.push_outputs_of(next);
       }
     }
 
-    // Each node inside a Template Assertion Predicate Expression is in between a Template Assertion Predicate and
-    // its OpaqueLoop* nodes (or an OpaqueLoop* node itself). The OpaqueLoop* nodes do not common up. Therefore, each
-    // Template Assertion Predicate Expression node belongs to a single expression - except for OpaqueLoopInitNodes.
-    // An OpaqueLoopInitNode is shared between the init and last value Template Assertion Predicate at creation.
-    // Later, when cloning the expressions, they are no longer shared.
+    // Each node inside a Template Assertion Expression is in between a Template Assertion Predicate and its OpaqueLoop*
+    // nodes (or an OpaqueLoop* node itself). The OpaqueLoop* nodes do not common up. Therefore, each Template Assertion
+    // Expression node belongs to a single expression - except for OpaqueLoopInitNodes. An OpaqueLoopInitNode is shared
+    // between the init and last value Template Assertion Predicate at creation. Later, when cloning the expressions,
+    // they are no longer shared.
     assert(template_counter <= 2, "a node cannot be part of more than two templates");
     assert(template_counter <= 1 || _node->is_OpaqueLoopInit(), "only OpaqueLoopInit nodes can be part of two templates");
   }
 };
 
+// This class creates a new Initialized Assertion Predicate.
+class InitializedAssertionPredicate : public StackObj {
+  IfNode* const _template_assertion_predicate;
+  Node* const _new_init;
+  Node* const _new_stride;
+  PhaseIdealLoop* const _phase;
+
+ public:
+  InitializedAssertionPredicate(IfNode* template_assertion_predicate, Node* new_init, Node* new_stride,
+                                PhaseIdealLoop* phase);
+  NONCOPYABLE(InitializedAssertionPredicate);
+
+  IfTrueNode* create(Node* control);
+
+ private:
+  OpaqueInitializedAssertionPredicateNode* create_assertion_expression(Node* control);
+  IfNode* create_if_node(Node* control, OpaqueInitializedAssertionPredicateNode* assertion_expression, IdealLoopTree* loop);
+  void create_fail_path(IfNode* if_node, IdealLoopTree* loop);
+  void create_halt_node(IfFalseNode* fail_proj, IdealLoopTree* loop);
+  IfTrueNode* create_success_path(IfNode* if_node, IdealLoopTree* loop);
+};
+
+
 // This class represents a Predicate Block (i.e. either a Loop Predicate Block, a Profiled Loop Predicate Block,
 // or a Loop Limit Check Predicate Block). It contains zero or more Regular Predicates followed by a Parse Predicate
 // which, however, does not need to exist (we could already have decided to remove Parse Predicates for this loop).
diff --git a/src/hotspot/share/opto/split_if.cpp b/src/hotspot/share/opto/split_if.cpp
index ad4053e2c98c4..1eff44ab7834f 100644
--- a/src/hotspot/share/opto/split_if.cpp
+++ b/src/hotspot/share/opto/split_if.cpp
@@ -95,7 +95,7 @@ bool PhaseIdealLoop::split_up( Node *n, Node *blk1, Node *blk2 ) {
     return true;
   }
 
-  clone_template_assertion_predicate_expression_down(n);
+  clone_template_assertion_expression_down(n);
 
   if (n->Opcode() == Op_OpaqueZeroTripGuard) {
     // If this Opaque1 is part of the zero trip guard for a loop:
@@ -409,25 +409,25 @@ bool PhaseIdealLoop::clone_cmp_down(Node* n, const Node* blk1, const Node* blk2)
   return false;
 }
 
-// 'n' could be a node belonging to a Template Assertion Predicate Expression (i.e. any node between a Template
-// Assertion Predicate and its OpaqueLoop* nodes (included)). We cannot simply split this node up since this would
-// create a phi node inside the Template Assertion Predicate Expression - making it unrecognizable as such. Therefore,
-// we completely clone the entire Template Assertion Predicate Expression "down". This ensures that we have an
-// untouched copy that is still recognized by the Template Assertion Predicate matching code.
-void PhaseIdealLoop::clone_template_assertion_predicate_expression_down(Node* node) {
-  if (!TemplateAssertionPredicateExpressionNode::is_in_expression(node)) {
+// 'n' could be a node belonging to a Template Assertion Expression (i.e. any node between a Template Assertion Predicate
+// and its OpaqueLoop* nodes (included)). We cannot simply split this node up since this would  create a phi node inside
+// the Template Assertion Expression - making it unrecognizable as such. Therefore, we completely clone the entire
+// Template Assertion Expression "down". This ensures that we have an untouched copy that is still recognized by the
+// Template Assertion Predicate matching code.
+void PhaseIdealLoop::clone_template_assertion_expression_down(Node* node) {
+  if (!TemplateAssertionExpressionNode::is_in_expression(node)) {
     return;
   }
 
-  TemplateAssertionPredicateExpressionNode template_assertion_predicate_expression_node(node);
+  TemplateAssertionExpressionNode template_assertion_expression_node(node);
   auto clone_expression = [&](IfNode* template_assertion_predicate) {
     Opaque4Node* opaque4_node = template_assertion_predicate->in(1)->as_Opaque4();
-    TemplateAssertionPredicateExpression template_assertion_predicate_expression(opaque4_node);
+    TemplateAssertionExpression template_assertion_expression(opaque4_node);
     Node* new_ctrl = template_assertion_predicate->in(0);
-    Opaque4Node* cloned_opaque4_node = template_assertion_predicate_expression.clone(new_ctrl, this);
+    Opaque4Node* cloned_opaque4_node = template_assertion_expression.clone(new_ctrl, this);
     igvn().replace_input_of(template_assertion_predicate, 1, cloned_opaque4_node);
   };
-  template_assertion_predicate_expression_node.for_each_template_assertion_predicate(clone_expression);
+  template_assertion_expression_node.for_each_template_assertion_predicate(clone_expression);
 }
 
 //------------------------------register_new_node------------------------------

From d3e7b0c12afde03985f1b06e6e7d789928971090 Mon Sep 17 00:00:00 2001
From: Viktor Klang <vklang@openjdk.org>
Date: Mon, 5 Aug 2024 10:56:21 +0000
Subject: [PATCH 301/401] 8336462: ConcurrentSkipListSet Javadoc incorrectly
 warns about size method complexity

Reviewed-by: jpai
---
 .../java/util/concurrent/ConcurrentSkipListSet.java   | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java b/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java
index 3a72c4f4189a4..2a2fbc54d8618 100644
--- a/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java
+++ b/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java
@@ -189,14 +189,9 @@ public ConcurrentSkipListSet<E> clone() {
      * contains more than {@code Integer.MAX_VALUE} elements, it
      * returns {@code Integer.MAX_VALUE}.
      *
-     * <p>Beware that, unlike in most collections, this method is
-     * <em>NOT</em> a constant-time operation. Because of the
-     * asynchronous nature of these sets, determining the current
-     * number of elements requires traversing them all to count them.
-     * Additionally, it is possible for the size to change during
-     * execution of this method, in which case the returned result
-     * will be inaccurate. Thus, this method is typically not very
-     * useful in concurrent applications.
+     * <p>It is possible for the size to change during execution of this method,
+     * in which case the returned result will be inaccurate.
+     * Thus, this method is typically not very useful in concurrent applications.
      *
      * @return the number of elements in this set
      */

From 2e093b06916b72b4feae5635aa8c5aa90679172b Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Mon, 5 Aug 2024 13:17:32 +0000
Subject: [PATCH 302/401] 8337779: test/jdk/jdk/jfr/jvm/TestHiddenWait.java is
 a bit fragile

Reviewed-by: mgronlun
---
 test/jdk/jdk/jfr/jvm/TestHiddenWait.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/test/jdk/jdk/jfr/jvm/TestHiddenWait.java b/test/jdk/jdk/jfr/jvm/TestHiddenWait.java
index f4b810f192e48..b064285329c0f 100644
--- a/test/jdk/jdk/jfr/jvm/TestHiddenWait.java
+++ b/test/jdk/jdk/jfr/jvm/TestHiddenWait.java
@@ -77,6 +77,15 @@ public static void main(String... args) throws Exception {
                 s.start();
             }
             List<RecordedEvent> events = Events.fromRecording(r);
+            // Only keep events from the test thread and the JFR threads
+            String testThread = Thread.currentThread().getName();
+            events.removeIf(event -> {
+               String threadName = event.getThread().getJavaName();
+               if (threadName.equals(testThread) || threadName.contains("JFR")) {
+                   return false;
+               }
+               return true;
+            });
             for (RecordedEvent event : events) {
                 if (!event.getEventType().getName().equals(PERIODIC_EVENT_NAME)) {
                     System.out.println(event);

From 7e925d727f716e5c366b0d85b9c0de24efe43103 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Mon, 5 Aug 2024 14:05:00 +0000
Subject: [PATCH 303/401] 8337283: configure.log is truncated when build dir is
 on different filesystem

Reviewed-by: phh, stuefe, clanger, ihse
---
 make/autoconf/configure.ac | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/make/autoconf/configure.ac b/make/autoconf/configure.ac
index 6afa36ac18d33..f7e9844a64301 100644
--- a/make/autoconf/configure.ac
+++ b/make/autoconf/configure.ac
@@ -313,9 +313,11 @@ AC_OUTPUT
 
 # After AC_OUTPUT, we need to do final work
 CUSTOM_CONFIG_OUTPUT_GENERATED_HOOK
-BASIC_POST_CONFIG_OUTPUT
 
 # Finally output some useful information to the user
 HELP_PRINT_SUMMARY_AND_WARNINGS
 CUSTOM_SUMMARY_AND_WARNINGS_HOOK
 HELP_REPEAT_WARNINGS
+
+# All output is done. Do the post-config output management.
+BASIC_POST_CONFIG_OUTPUT

From c095c0e6a58b1665d51ff19381e32f168e99e8f5 Mon Sep 17 00:00:00 2001
From: Carlo Refice <carlo.refice@oracle.com>
Date: Mon, 5 Aug 2024 14:09:54 +0000
Subject: [PATCH 304/401] 8336489: Track scoped accesses in JVMCI compiled code

Reviewed-by: dnsimon, never
---
 .../share/jvmci/jvmciCodeInstaller.cpp        |  3 +++
 src/hotspot/share/jvmci/jvmciRuntime.cpp      |  3 ++-
 src/hotspot/share/jvmci/jvmciRuntime.hpp      |  3 ++-
 src/hotspot/share/jvmci/vmStructs_jvmci.cpp   |  1 +
 .../ci/hotspot/HotSpotCompiledCodeStream.java |  1 +
 .../vm/ci/hotspot/HotSpotCompiledNmethod.java | 20 ++++++++++++++++++-
 .../HotSpotResolvedJavaMethodImpl.java        | 15 ++++++++++++--
 .../jdk/vm/ci/hotspot/HotSpotVMConfig.java    |  1 +
 .../jdk/vm/ci/meta/ResolvedJavaMethod.java    | 10 ++++++++++
 .../runtime/test/TestResolvedJavaMethod.java  | 18 +++++++++++++++++
 .../jdk/vm/ci/runtime/test/TypeUniverse.java  |  3 ++-
 11 files changed, 72 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
index 79bc97f53ac6b..6bca2aa644e55 100644
--- a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
+++ b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
@@ -722,6 +722,7 @@ JVMCI::CodeInstallResult CodeInstaller::install(JVMCICompiler* compiler,
   jint entry_bci = -1;
   JVMCICompileState* compile_state = nullptr;
   bool has_unsafe_access = false;
+  bool has_scoped_access = false;
   jint id = -1;
 
   if (is_nmethod) {
@@ -729,6 +730,7 @@ JVMCI::CodeInstallResult CodeInstaller::install(JVMCICompiler* compiler,
     entry_bci = is_nmethod ? stream->read_s4("entryBCI") : -1;
     compile_state = (JVMCICompileState*) stream->read_u8("compileState");
     has_unsafe_access = stream->read_bool("hasUnsafeAccess");
+    has_scoped_access = stream->read_bool("hasScopedAccess");
     id = stream->read_s4("id");
   }
   stream->set_code_desc(name, method);
@@ -795,6 +797,7 @@ JVMCI::CodeInstallResult CodeInstaller::install(JVMCICompiler* compiler,
                                         id,
                                         _has_monitors,
                                         has_unsafe_access,
+                                        has_scoped_access,
                                         _has_wide_vector,
                                         compiled_code,
                                         mirror,
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.cpp b/src/hotspot/share/jvmci/jvmciRuntime.cpp
index ad0430787aa13..8241fc2498c39 100644
--- a/src/hotspot/share/jvmci/jvmciRuntime.cpp
+++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp
@@ -2078,6 +2078,7 @@ JVMCI::CodeInstallResult JVMCIRuntime::register_method(JVMCIEnv* JVMCIENV,
                                                        int compile_id,
                                                        bool has_monitors,
                                                        bool has_unsafe_access,
+                                                       bool has_scoped_access,
                                                        bool has_wide_vector,
                                                        JVMCIObject compiled_code,
                                                        JVMCIObject nmethod_mirror,
@@ -2183,7 +2184,7 @@ JVMCI::CodeInstallResult JVMCIRuntime::register_method(JVMCIEnv* JVMCIENV,
         nm->set_has_unsafe_access(has_unsafe_access);
         nm->set_has_wide_vectors(has_wide_vector);
         nm->set_has_monitors(has_monitors);
-        nm->set_has_scoped_access(true); // conservative
+        nm->set_has_scoped_access(has_scoped_access);
 
         JVMCINMethodData* data = nm->jvmci_nmethod_data();
         assert(data != nullptr, "must be");
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.hpp b/src/hotspot/share/jvmci/jvmciRuntime.hpp
index bc5bee4edebee..99738393b5b0d 100644
--- a/src/hotspot/share/jvmci/jvmciRuntime.hpp
+++ b/src/hotspot/share/jvmci/jvmciRuntime.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -452,6 +452,7 @@ class JVMCIRuntime: public CHeapObj<mtJVMCI> {
                                            int                       compile_id,
                                            bool                      has_monitors,
                                            bool                      has_unsafe_access,
+                                           bool                      has_scoped_access,
                                            bool                      has_wide_vector,
                                            JVMCIObject               compiled_code,
                                            JVMCIObject               nmethod_mirror,
diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index 1e2ca0e990edb..ac895cc93f2f7 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -655,6 +655,7 @@
   declare_constant(ConstMethodFlags::_misc_intrinsic_candidate)           \
   declare_constant(ConstMethodFlags::_misc_reserved_stack_access)         \
   declare_constant(ConstMethodFlags::_misc_changes_current_thread)        \
+  declare_constant(ConstMethodFlags::_misc_is_scoped)                     \
                                                                           \
   declare_constant(CounterData::count_off)                                \
                                                                           \
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledCodeStream.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledCodeStream.java
index 87c6ecde07b6e..ab7a57f2759d4 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledCodeStream.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledCodeStream.java
@@ -563,6 +563,7 @@ private String codeDesc() {
             writeInt("entryBCI", nmethod.entryBCI);
             writeLong("compileState", nmethod.compileState);
             writeBoolean("hasUnsafeAccess", nmethod.hasUnsafeAccess);
+            writeBoolean("hasScopedAccess", nmethod.hasScopedAccess());
             writeInt("id", nmethod.id);
         }
 
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledNmethod.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledNmethod.java
index c364af7ad410c..b1be3dee25cd8 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledNmethod.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledNmethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -100,4 +100,22 @@ public String toString() {
     public String getInstallationFailureMessage() {
         return installationFailureMessage;
     }
+
+    /**
+     * Determines if {@code methods} contains at least one entry for which {@code HotSpotResolvedJavaMethod.isScoped()} returns true.
+     */
+    public boolean hasScopedAccess() {
+        if (methods == null) {
+            return false;
+        }
+        for (ResolvedJavaMethod method : methods) {
+            if (method instanceof HotSpotResolvedJavaMethod hotSpotMethod) {
+                if (hotSpotMethod.isScoped()) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
 }
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
index 4c9dc509ce1dc..4fbd479602437 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
@@ -170,7 +170,7 @@ public int hashCode() {
      * @return flags of this method
      */
     private int getFlags() {
-        return UNSAFE.getShort(getMethodPointer() + config().methodFlagsOffset);
+        return UNSAFE.getInt(getMethodPointer() + config().methodFlagsOffset);
     }
 
     /**
@@ -179,7 +179,7 @@ private int getFlags() {
      * @return flags of this method's ConstMethod
      */
     private int getConstMethodFlags() {
-        return UNSAFE.getChar(getConstMethod() + config().constMethodFlagsOffset);
+        return UNSAFE.getInt(getConstMethod() + config().constMethodFlagsOffset);
     }
 
     @Override
@@ -324,6 +324,17 @@ public boolean hasReservedStackAccess() {
         return (getConstMethodFlags() & config().constMethodFlagsReservedStackAccess) != 0;
     }
 
+    /**
+     * Returns true if this method has a
+     * {@code jdk.internal.misc.ScopedMemoryAccess.Scoped} annotation.
+     *
+     * @return true if Scoped annotation present, false otherwise
+     */
+    @Override
+    public boolean isScoped() {
+        return (getConstMethodFlags() & config().constMethodFlagsIsScoped) != 0;
+    }
+
     /**
      * Sets flags on {@code method} indicating that it should never be inlined or compiled by the
      * VM.
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotVMConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotVMConfig.java
index 57f9473c90209..954e1f6b20173 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotVMConfig.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotVMConfig.java
@@ -194,6 +194,7 @@ long prototypeMarkWord() {
     final int constMethodFlagsReservedStackAccess = getConstant("ConstMethodFlags::_misc_reserved_stack_access", Integer.class);
     final int constMethodFlagsCallerSensitive = getConstant("ConstMethodFlags::_misc_caller_sensitive", Integer.class);
     final int constMethodFlagsIntrinsicCandidate = getConstant("ConstMethodFlags::_misc_intrinsic_candidate", Integer.class);
+    final int constMethodFlagsIsScoped = getConstant("ConstMethodFlags::_misc_is_scoped", Integer.class);
     final int constMethodHasLineNumberTable = getConstant("ConstMethodFlags::_misc_has_linenumber_table", Integer.class);
     final int constMethodHasLocalVariableTable = getConstant("ConstMethodFlags::_misc_has_localvariable_table", Integer.class);
     final int constMethodHasMethodAnnotations = getConstant("ConstMethodFlags::_misc_has_method_annotations", Integer.class);
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ResolvedJavaMethod.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ResolvedJavaMethod.java
index 41eccc9d1c65d..fa42dc26ac8da 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ResolvedJavaMethod.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ResolvedJavaMethod.java
@@ -463,6 +463,16 @@ default boolean isJavaLangObjectInit() {
         return getDeclaringClass().isJavaLangObject() && getName().equals("<init>");
     }
 
+    /**
+     * Returns true if this method has a
+     * {@code jdk.internal.misc.ScopedMemoryAccess.Scoped} annotation.
+     *
+     * @return true if Scoped annotation present, false otherwise.
+     */
+    default boolean isScoped() {
+        throw new UnsupportedOperationException();
+    }
+
     /**
      * Gets a speculation log that can be used when compiling this method to make new speculations
      * and query previously failed speculations. The implementation may return a new
diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java
index 00973fd78c29d..98d7d168ba718 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java
@@ -475,6 +475,24 @@ public void isJavaLangObjectInitTest() throws NoSuchMethodException {
         }
     }
 
+    @Test
+    public void isScopedTest() throws NoSuchMethodException, ClassNotFoundException {
+        // Must use reflection as ScopedMemoryAccess$Scoped is package-private
+        Class<? extends Annotation> scopedAnnotationClass = Class.forName("jdk.internal.misc.ScopedMemoryAccess$Scoped").asSubclass(Annotation.class);
+        boolean scopedMethodFound = false;
+        for (Map.Entry<Method, ResolvedJavaMethod> e : methods.entrySet()) {
+            ResolvedJavaMethod m = e.getValue();
+            Method key = e.getKey();
+            boolean expect = key.isAnnotationPresent(scopedAnnotationClass);
+            boolean actual = m.isScoped();
+            assertEquals(m.toString(), expect, actual);
+            if (expect) {
+                scopedMethodFound = true;
+            }
+        }
+        assertTrue("At least one scoped method must be present", scopedMethodFound);
+    }
+
     abstract static class UnlinkedType {
         abstract void abstractMethod();
 
diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TypeUniverse.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TypeUniverse.java
index 2420a133b63f9..13003095ee6a2 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TypeUniverse.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TypeUniverse.java
@@ -51,6 +51,7 @@
 import org.junit.Test;
 
 import jdk.internal.misc.Unsafe;
+import jdk.internal.misc.ScopedMemoryAccess;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.MetaAccessProvider;
@@ -115,7 +116,7 @@ protected class ProtectedInnerClass {
                         byte[][].class, short[][].class, char[][].class, int[][].class, float[][].class, long[][].class, double[][].class, Object[][].class, Class[][].class, List[][].class,
                         ClassLoader.class, String.class, Serializable.class, Cloneable.class, Test.class, TestMetaAccessProvider.class, List.class, Collection.class, Map.class, Queue.class,
                         HashMap.class, LinkedHashMap.class, IdentityHashMap.class, AbstractCollection.class, AbstractList.class, ArrayList.class, InnerClass.class, InnerStaticClass.class,
-                        InnerStaticFinalClass.class, PrivateInnerClass.class, ProtectedInnerClass.class};
+                        InnerStaticFinalClass.class, PrivateInnerClass.class, ProtectedInnerClass.class, ScopedMemoryAccess.class};
         for (Class<?> c : initialClasses) {
             addClass(c);
         }

From 97afbd9603ba8ec1956c4cedf542667d33988661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Sj=C3=B6len?= <jsjolen@openjdk.org>
Date: Mon, 5 Aug 2024 14:49:38 +0000
Subject: [PATCH 305/401] 8336410: runtime/NMT/TotalMallocMmapDiffTest.java
 Total malloc diff is incorrect. Expected malloc diff range

Reviewed-by: gziemski, stuefe
---
 .../jtreg/runtime/NMT/TotalMallocMmapDiffTest.java       | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/NMT/TotalMallocMmapDiffTest.java b/test/hotspot/jtreg/runtime/NMT/TotalMallocMmapDiffTest.java
index 3ba94c6a31a86..cd89bded57827 100644
--- a/test/hotspot/jtreg/runtime/NMT/TotalMallocMmapDiffTest.java
+++ b/test/hotspot/jtreg/runtime/NMT/TotalMallocMmapDiffTest.java
@@ -32,7 +32,7 @@
  *          java.management
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=summary -Xms32m -Xmx32m TotalMallocMmapDiffTest
+ * @run main/othervm -Xbootclasspath/a:. -XX:TieredStopAtLevel=1 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=summary -Xms32m -Xmx32m TotalMallocMmapDiffTest
  *
  */
 
@@ -43,9 +43,10 @@
 public class TotalMallocMmapDiffTest {
     private static final WhiteBox wb = WhiteBox.getWhiteBox();
     private static final long ALLOCATE_SIZE = 250 * 1024 * 1024; // 250MB
-    private static final double FUDGE_FACTOR = 0.2;
-    private static final double UPPER_BOUND = ALLOCATE_SIZE * (1 + FUDGE_FACTOR);
-    private static final double LOWER_BOUND = ALLOCATE_SIZE * (1 - FUDGE_FACTOR);
+    private static final double FUDGE_FACTOR_UPPER = 0.3;
+    private static final double FUDGE_FACTOR_LOWER = 0.2;
+    private static final double UPPER_BOUND = ALLOCATE_SIZE * (1 + FUDGE_FACTOR_UPPER);
+    private static final double LOWER_BOUND = ALLOCATE_SIZE * (1 - FUDGE_FACTOR_LOWER);
 
     public static void main(String[] args) throws Exception {
 

From 219e1eb13a688532705e603e276799c0157f5f28 Mon Sep 17 00:00:00 2001
From: Per Minborg <pminborg@openjdk.org>
Date: Mon, 5 Aug 2024 15:06:38 +0000
Subject: [PATCH 306/401] 8337712: Wrong javadoc in java.util.Date#toString():
 "61" and right parenthesis

Reviewed-by: rgiulietti
---
 src/java.base/share/classes/java/util/Date.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/util/Date.java b/src/java.base/share/classes/java/util/Date.java
index 1850564d8b290..aa16f2a75ee60 100644
--- a/src/java.base/share/classes/java/util/Date.java
+++ b/src/java.base/share/classes/java/util/Date.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1012,7 +1012,7 @@ public int hashCode() {
      * <li>{@code mm} is the minute within the hour ({@code 00} through
      *     {@code 59}), as two decimal digits.
      * <li>{@code ss} is the second within the minute ({@code 00} through
-     *     {@code 61}, as two decimal digits.
+     *     {@code 61}), as two decimal digits.
      * <li>{@code zzz} is the time zone (and may reflect daylight saving
      *     time). Standard time zone abbreviations include those
      *     recognized by the method {@code parse}. If time zone

From 98562166e4a4c8921709014423c6cbc993aa0d97 Mon Sep 17 00:00:00 2001
From: Zdenek Zambersky <zzambers@openjdk.org>
Date: Mon, 5 Aug 2024 15:09:45 +0000
Subject: [PATCH 307/401] 8336928: GHA: Bundle artifacts removal broken

Reviewed-by: ihse
---
 .github/workflows/main.yml | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 067548b9768e3..b16335b7091c2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -363,26 +363,23 @@ jobs:
       - test-windows-x64
 
     steps:
-        # Hack to get hold of the api environment variables that are only defined for actions
-      - name: 'Get API configuration'
-        id: api
-        uses: actions/github-script@v7
-        with:
-          script: 'return { url: process.env["ACTIONS_RUNTIME_URL"], token: process.env["ACTIONS_RUNTIME_TOKEN"] }'
-
       - name: 'Remove bundle artifacts'
         run: |
           # Find and remove all bundle artifacts
-          ALL_ARTIFACT_URLS="$(curl -s \
-              -H 'Accept: application/json;api-version=6.0-preview' \
-              -H 'Authorization: Bearer ${{ fromJson(steps.api.outputs.result).token }}' \
-              '${{ fromJson(steps.api.outputs.result).url }}_apis/pipelines/workflows/${{ github.run_id }}/artifacts?api-version=6.0-preview')"
-          BUNDLE_ARTIFACT_URLS="$(echo "$ALL_ARTIFACT_URLS" | jq -r -c '.value | map(select(.name|startswith("bundles-"))) | .[].url')"
-          for url in $BUNDLE_ARTIFACT_URLS; do
-            echo "Removing $url"
-            curl -s \
-                -H 'Accept: application/json;api-version=6.0-preview' \
-                -H 'Authorization: Bearer ${{ fromJson(steps.api.outputs.result).token }}' \
-                -X DELETE "$url" \
+          # See: https://docs.github.com/en/rest/actions/artifacts?apiVersion=2022-11-28
+          ALL_ARTIFACT_IDS="$(curl -sL \
+              -H 'Accept: application/vnd.github+json' \
+              -H 'Authorization: Bearer ${{ github.token }}' \
+              -H 'X-GitHub-Api-Version: 2022-11-28' \
+              '${{ github.api_url }}/repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/artifacts')"
+          BUNDLE_ARTIFACT_IDS="$(echo "$ALL_ARTIFACT_IDS" | jq -r -c '.artifacts | map(select(.name|startswith("bundles-"))) | .[].id')"
+          for id in $BUNDLE_ARTIFACT_IDS; do
+            echo "Removing $id"
+            curl -sL \
+                -X DELETE \
+                -H 'Accept: application/vnd.github+json' \
+                -H 'Authorization: Bearer ${{ github.token }}' \
+                -H 'X-GitHub-Api-Version: 2022-11-28' \
+                "${{ github.api_url }}/repos/${{ github.repository }}/actions/artifacts/$id" \
             || echo "Failed to remove bundle"
           done

From e68df528f80cff3a5564a12b7ec71a920800ce28 Mon Sep 17 00:00:00 2001
From: Damon Nguyen <dnguyen@openjdk.org>
Date: Mon, 5 Aug 2024 16:48:18 +0000
Subject: [PATCH 308/401] 8337054: JDK 23 RDP2 L10n resource files update

Reviewed-by: naoto, jlu
---
 .../tools/javac/resources/compiler_de.properties  |  9 +++++----
 .../tools/javac/resources/compiler_ja.properties  |  9 +++++----
 .../javac/resources/compiler_zh_CN.properties     | 15 ++++++++-------
 .../javac/resources/launcher_zh_CN.properties     |  2 +-
 .../toolkit/resources/doclets_de.properties       |  4 ++--
 .../toolkit/resources/doclets_ja.properties       |  4 ++--
 .../toolkit/resources/doclets_zh_CN.properties    |  4 ++--
 7 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_de.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_de.properties
index dfbeb0fd0b715..33063b6558d3a 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_de.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_de.properties
@@ -2305,13 +2305,14 @@ compiler.err.this.as.identifier=Ab Release 8 ist "this" nur als Parametername f
 
 compiler.err.receiver.parameter.not.applicable.constructor.toplevel.class=receiver-Parameter nicht für Konstruktor der obersten Klasse anwendbar
 
-# TODO 308: make a better error message
+# 0: fragment, 1: symbol, 2: annotated-type
+compiler.err.type.annotation.inadmissible={0} wurde hier nicht erwartet\n(Um einen qualifizierten Typ zu annotieren, schreiben Sie {1}.{2})
+
 # 0: annotation
-compiler.err.cant.type.annotate.scoping.1=Scoping-Konstrukt kann nicht mit type-use-Annotation versehen werden: {0}
+compiler.misc.type.annotation.1=Typannotation {0} ist
 
-# TODO 308: make a better error message
 # 0: list of annotation
-compiler.err.cant.type.annotate.scoping=Scoping-Konstrukt kann nicht mit type-use-Annotationen versehen werden: {0}
+compiler.misc.type.annotation=Typannotationen {0} sind
 
 # 0: type, 1: type
 compiler.err.incorrect.receiver.name=Der Empfängername stimmt nicht mit dem einschließenden Klassentyp überein\nErforderlich: {0}\nErmittelt:    {1}
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
index 4d98e4cabccba..818b5fb70668b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
@@ -2305,13 +2305,14 @@ compiler.err.this.as.identifier=リリース8から''this''は受信タイプの
 
 compiler.err.receiver.parameter.not.applicable.constructor.toplevel.class=受取り側パラメータは最上位レベル・クラスのコンストラクタに適用できません
 
-# TODO 308: make a better error message
+# 0: fragment, 1: symbol, 2: annotated-type
+compiler.err.type.annotation.inadmissible=ここでは{0}は予期されていません\n(修飾されたタイプに注釈を付けるには、{1}.{2}と記述します)
+
 # 0: annotation
-compiler.err.cant.type.annotate.scoping.1=スコープ・コンストラクトを型使用注釈で注釈付けすることはできません: {0}
+compiler.misc.type.annotation.1=タイプ注釈{0}は
 
-# TODO 308: make a better error message
 # 0: list of annotation
-compiler.err.cant.type.annotate.scoping=スコープ・コンストラクトを型使用注釈で注釈付けすることはできません: {0}
+compiler.misc.type.annotation=タイプ注釈{0}は
 
 # 0: type, 1: type
 compiler.err.incorrect.receiver.name=受取り側の名前が、包含するクラス・タイプと一致しません\n必須: {0}\n検出:    {1}
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
index 81452f23a0d55..54298cb23b912 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
@@ -93,7 +93,7 @@ compiler.err.abstract.cant.be.instantiated={0}是抽象的; 无法实例化
 compiler.err.abstract.meth.cant.have.body=抽象方法不能有主体
 
 # 0: kind name, 1: symbol
-compiler.err.already.annotated={0} {1}已进行注释
+compiler.err.already.annotated={0} {1} 已进行批注
 
 # 0: kind name, 1: symbol, 2: kind name, 3: symbol
 compiler.err.already.defined=已在{2} {3}中定义了{0} {1}
@@ -642,7 +642,7 @@ compiler.err.malformed.fp.lit=浮点文字的格式错误
 
 compiler.err.method.does.not.override.superclass=方法不会覆盖或实现超类型的方法
 
-compiler.err.static.methods.cannot.be.annotated.with.override=不能使用 @Override 注释静态方法
+compiler.err.static.methods.cannot.be.annotated.with.override=不能使用 @Override 对静态方法进行批注
 
 compiler.err.missing.meth.body.or.decl.abstract=缺少方法主体, 或声明抽象
 
@@ -1638,7 +1638,7 @@ compiler.warn.unchecked.varargs.non.reifiable.type=参数化 vararg 类型{0}的
 # 0: symbol
 compiler.warn.varargs.unsafe.use.varargs.param=Varargs 方法可能导致来自不可具体化 varargs 参数 {0} 的堆污染
 
-compiler.warn.missing.deprecated.annotation=未使用 @Deprecated 对已过时的项目进行注释
+compiler.warn.missing.deprecated.annotation=未使用 @Deprecated 对已过时的项目进行批注
 
 # 0: kind name
 compiler.warn.deprecated.annotation.has.no.effect=@Deprecated 批注对此 {0} 声明没有任何效果
@@ -2305,13 +2305,14 @@ compiler.err.this.as.identifier=从发行版 8 开始，''this'' 只能作为接
 
 compiler.err.receiver.parameter.not.applicable.constructor.toplevel.class=接收方参数不适用于顶层类的构造器
 
-# TODO 308: make a better error message
+# 0: fragment, 1: symbol, 2: annotated-type
+compiler.err.type.annotation.inadmissible={0} 不应出现在此处\n（要对限定类型进行批注，请编写 {1}.{2}）
+
 # 0: annotation
-compiler.err.cant.type.annotate.scoping.1=无法使用 type-use 批注 {0} 来批注确定作用域结构
+compiler.misc.type.annotation.1=类型批注 {0} 为
 
-# TODO 308: make a better error message
 # 0: list of annotation
-compiler.err.cant.type.annotate.scoping=无法使用 type-use 批注 {0} 来批注确定作用域结构
+compiler.misc.type.annotation=类型批注 {0} 为
 
 # 0: type, 1: type
 compiler.err.incorrect.receiver.name=接收方名称与封闭类类型不匹配\n需要: {0}\n找到:    {1}
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_zh_CN.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_zh_CN.properties
index ee666cc02c11d..9382ac9e348e4 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_zh_CN.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/launcher_zh_CN.properties
@@ -120,7 +120,7 @@ launcher.err.cant.read.file=读取源文件 {0} 时出错：{1}
 launcher.err.no.value.for.option=没有为选项 {0} 指定值
 
 # 0: string
-launcher.err.invalid.value.for.source=--source 选项的值无效：{0}\n
+launcher.err.invalid.value.for.source=--source 选项的值无效：{0}
 
 launcher.err.unnamed.pkg.not.allowed.named.modules=命名模块中不允许未命名程序包
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_de.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_de.properties
index 4e84cdc52c77f..7ab2d3fc1dcaf 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_de.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_de.properties
@@ -278,9 +278,9 @@ doclet.record_constructor_doc.param_name=Wert für die Datensatzkomponente {0}
 
 doclet.record_equals_doc.fullbody.head=Gibt an, ob ein anderes Objekt diesem gleich ("equal to") ist. Die Objekte sind gleich, wenn das andere Objekt der gleichen Klasse angehört und alle Datensatzkomponenten gleich sind.
 
-doclet.record_equals_doc.fullbody.tail.both=Referenzkomponenten werden verglichen mit {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}; primitive Komponenten werden verglichen mit "==".
+doclet.record_equals_doc.fullbody.tail.both=Referenzkomponenten werden verglichen mit {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}. Primitive Komponenten werden mit der <code>compare</code>-Methode aus den entsprechenden Wrapper-Klassen verglichen.
 
-doclet.record_equals_doc.fullbody.tail.primitive=Alle Komponenten in dieser Datensatzklasse werden verglichen mit "==".
+doclet.record_equals_doc.fullbody.tail.primitive=Alle Komponenten dieser Datensatzklasse werden mit der <code>compare</code>-Methode aus den entsprechenden Wrapper-Klassen verglichen.
 
 doclet.record_equals_doc.fullbody.tail.reference=Alle Komponenten in dieser Datensatzklasse werden verglichen mit {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}.
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties
index 515df706272d8..1b00ea9fbc02c 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_ja.properties
@@ -278,9 +278,9 @@ doclet.record_constructor_doc.param_name={0}レコード・コンポーネント
 
 doclet.record_equals_doc.fullbody.head=他のオブジェクトがこれと"等しい"かどうかを示します。他のオブジェクトが同じクラスであり、すべてのレコード・コンポーネントが等しい場合、オブジェクトは等しくなります。
 
-doclet.record_equals_doc.fullbody.tail.both=参照コンポーネントは{@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}と比較され、プリミティブ・コンポーネントは'=='と比較されます。
+doclet.record_equals_doc.fullbody.tail.both=参照コンポーネントは{@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}と比較され、プリミティブ・コンポーネントは対応するラッパー・クラスの<code>compare</code>メソッドで比較されます。
 
-doclet.record_equals_doc.fullbody.tail.primitive=このレコード・クラスのすべてのコンポーネントは'=='と比較されます。
+doclet.record_equals_doc.fullbody.tail.primitive=このレコード・クラスのすべてのコンポーネントは対応するラッパー・クラスの<code>compare</code>メソッドで比較されます。
 
 doclet.record_equals_doc.fullbody.tail.reference=このレコード・クラスのすべてのコンポーネントは{@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}と比較されます。
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties
index d01d42faa56a4..e9786173c5f1d 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets_zh_CN.properties
@@ -278,9 +278,9 @@ doclet.record_constructor_doc.param_name={0} 记录组件的值
 
 doclet.record_equals_doc.fullbody.head=指示某个其他对象是否“等于”此对象。如果两个对象属于同一个类，而且所有记录组件都相等，则这两个对象相等。
 
-doclet.record_equals_doc.fullbody.tail.both=使用 {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)} 对参考组件进行比较；使用 '==' 对基元组件进行比较
+doclet.record_equals_doc.fullbody.tail.both=使用 {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)} 对参考组件进行比较；使用 <code>compare</code> 方法从对应的包装类对基元组件进行比较。
 
-doclet.record_equals_doc.fullbody.tail.primitive=此记录类中的所有组件都使用 '==' 进行比较。
+doclet.record_equals_doc.fullbody.tail.primitive=此记录类中的所有组件都使用 <code>compare</code> 方法从对应的包装类进行比较。
 
 doclet.record_equals_doc.fullbody.tail.reference=此记录类中的所有组件都使用 {@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)} 进行比较。
 

From 807186ffc6a0a9f2515a66329c2a98a43385463c Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Mon, 5 Aug 2024 16:53:30 +0000
Subject: [PATCH 309/401] 8337784: Fix simple -Wzero-as-null-pointer-constant
 warnings in linux/posix code

Reviewed-by: stefank, shade
---
 src/hotspot/os/linux/os_linux.cpp         | 4 ++--
 src/hotspot/os/posix/perfMemory_posix.cpp | 4 ++--
 src/hotspot/os/posix/signals_posix.cpp    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 1c735f1b3c9d8..d4699567733b2 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -864,7 +864,7 @@ static void *thread_native_entry(Thread *thread) {
   log_info(os, thread)("Thread finished (tid: " UINTX_FORMAT ", pthread id: " UINTX_FORMAT ").",
     os::current_thread_id(), (uintx) pthread_self());
 
-  return 0;
+  return nullptr;
 }
 
 // On Linux, glibc places static TLS blocks (for __thread variables) on
@@ -4449,7 +4449,7 @@ void os::init(void) {
   check_pax();
 
   // Check the availability of MADV_POPULATE_WRITE.
-  FLAG_SET_DEFAULT(UseMadvPopulateWrite, (::madvise(0, 0, MADV_POPULATE_WRITE) == 0));
+  FLAG_SET_DEFAULT(UseMadvPopulateWrite, (::madvise(nullptr, 0, MADV_POPULATE_WRITE) == 0));
 
   os::Posix::init();
 }
diff --git a/src/hotspot/os/posix/perfMemory_posix.cpp b/src/hotspot/os/posix/perfMemory_posix.cpp
index 4339a21ae4e92..56bc8a1ef6b81 100644
--- a/src/hotspot/os/posix/perfMemory_posix.cpp
+++ b/src/hotspot/os/posix/perfMemory_posix.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2021 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -1329,7 +1329,7 @@ void PerfMemory::attach(int vmid, char** addrp, size_t* sizep, TRAPS) {
 //
 void PerfMemory::detach(char* addr, size_t bytes) {
 
-  assert(addr != 0, "address sanity check");
+  assert(addr != nullptr, "address sanity check");
   assert(bytes > 0, "capacity sanity check");
 
   if (PerfMemory::contains(addr) || PerfMemory::contains(addr + bytes - 1)) {
diff --git a/src/hotspot/os/posix/signals_posix.cpp b/src/hotspot/os/posix/signals_posix.cpp
index a9d3bb9284c49..6a14d0a485643 100644
--- a/src/hotspot/os/posix/signals_posix.cpp
+++ b/src/hotspot/os/posix/signals_posix.cpp
@@ -1719,7 +1719,7 @@ static int SR_initialize() {
   struct sigaction act;
   char *s;
   // Get signal number to use for suspend/resume
-  if ((s = ::getenv("_JAVA_SR_SIGNUM")) != 0) {
+  if ((s = ::getenv("_JAVA_SR_SIGNUM")) != nullptr) {
     int sig;
     bool result = parse_integer(s, &sig);
     if (result && sig > MAX2(SIGSEGV, SIGBUS) &&  // See 4355769.
@@ -1742,7 +1742,7 @@ static int SR_initialize() {
   pthread_sigmask(SIG_BLOCK, nullptr, &act.sa_mask);
   remove_error_signals_from_set(&(act.sa_mask));
 
-  if (sigaction(PosixSignals::SR_signum, &act, 0) == -1) {
+  if (sigaction(PosixSignals::SR_signum, &act, nullptr) == -1) {
     return -1;
   }
 

From 42652b2e5350bcab6fceb0148be8bf3d65a0e173 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Mon, 5 Aug 2024 16:57:11 +0000
Subject: [PATCH 310/401] 8337787: Fix -Wzero-as-null-pointer-constant warnings
 when JVMTI feature is disabled

Reviewed-by: ayang, sspitsyn
---
 src/hotspot/share/prims/jvmtiExport.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/prims/jvmtiExport.hpp b/src/hotspot/share/prims/jvmtiExport.hpp
index 36df28f271677..e98020aef1d3b 100644
--- a/src/hotspot/share/prims/jvmtiExport.hpp
+++ b/src/hotspot/share/prims/jvmtiExport.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -287,10 +287,10 @@ class JvmtiExport : public AllStatic {
   }
 
   // field access management
-  static address  get_field_access_count_addr() NOT_JVMTI_RETURN_(0);
+  static address  get_field_access_count_addr() NOT_JVMTI_RETURN_(nullptr);
 
   // field modification management
-  static address  get_field_modification_count_addr() NOT_JVMTI_RETURN_(0);
+  static address  get_field_modification_count_addr() NOT_JVMTI_RETURN_(nullptr);
 
   // -----------------
 

From 08f697f4fcbcdd912c3aa5f331fbf8212906465f Mon Sep 17 00:00:00 2001
From: Christoph Langer <clanger@openjdk.org>
Date: Mon, 5 Aug 2024 17:58:12 +0000
Subject: [PATCH 311/401] 8337819: Update GHA JDKs to 22.0.2

Reviewed-by: mbaesken, ihse, shade
---
 make/conf/github-actions.conf | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/make/conf/github-actions.conf b/make/conf/github-actions.conf
index deb5e36f60572..3cb56b47b50b8 100644
--- a/make/conf/github-actions.conf
+++ b/make/conf/github-actions.conf
@@ -29,17 +29,17 @@ GTEST_VERSION=1.14.0
 JTREG_VERSION=7.4+1
 
 LINUX_X64_BOOT_JDK_EXT=tar.gz
-LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk22/830ec9fcccef480bb3e73fb7ecafe059/36/GPL/openjdk-22_linux-x64_bin.tar.gz
-LINUX_X64_BOOT_JDK_SHA256=4d65cc6ed28711768fd72c2043a7925f7c83f5f51bb64970bd9d52f7791fc6ac
-
-MACOS_X64_BOOT_JDK_EXT=tar.gz
-MACOS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk22/830ec9fcccef480bb3e73fb7ecafe059/36/GPL/openjdk-22_macos-x64_bin.tar.gz
-MACOS_X64_BOOT_JDK_SHA256=ae31fe10916429e3fe284266095067a5ce9fecbdc03ff1a079d20459f731ca36
+LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk22.0.2/c9ecb94cd31b495da20a27d4581645e8/9/GPL/openjdk-22.0.2_linux-x64_bin.tar.gz
+LINUX_X64_BOOT_JDK_SHA256=41536f115668308ecf4eba92aaf6acaeb0936225828b741efd83b6173ba82963
 
 MACOS_AARCH64_BOOT_JDK_EXT=tar.gz
-MACOS_AARCH64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk22/830ec9fcccef480bb3e73fb7ecafe059/36/GPL/openjdk-22_macos-aarch64_bin.tar.gz
-MACOS_AARCH64_BOOT_JDK_SHA256=d10f82429d01047968c52c7975c326388cb5d212791e14c1de21c987463a4b53
+MACOS_AARCH64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk22.0.2/c9ecb94cd31b495da20a27d4581645e8/9/GPL/openjdk-22.0.2_macos-aarch64_bin.tar.gz
+MACOS_AARCH64_BOOT_JDK_SHA256=3dab98730234e1a87aec14bcb8171d2cae101e96ff4eed1dab96abbb08e843fd
+
+MACOS_X64_BOOT_JDK_EXT=tar.gz
+MACOS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk22.0.2/c9ecb94cd31b495da20a27d4581645e8/9/GPL/openjdk-22.0.2_macos-x64_bin.tar.gz
+MACOS_X64_BOOT_JDK_SHA256=e8b3ec7a7077711223d31156e771f11723cd7af31c2017f1bd2eda20855940fb
 
 WINDOWS_X64_BOOT_JDK_EXT=zip
-WINDOWS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk22/830ec9fcccef480bb3e73fb7ecafe059/36/GPL/openjdk-22_windows-x64_bin.zip
-WINDOWS_X64_BOOT_JDK_SHA256=8f5138fecb53c08c20abd4fa6812f9400051f3852582a2142ffda0dff73a5824
+WINDOWS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk22.0.2/c9ecb94cd31b495da20a27d4581645e8/9/GPL/openjdk-22.0.2_windows-x64_bin.zip
+WINDOWS_X64_BOOT_JDK_SHA256=f2a9b9ab944e71a64637fcdc6b13a1188cf02d4eb9ecf71dc927e98b3e45f5dc

From e2c07d5044587476fc0fff14260e2b73816d2062 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Mon, 5 Aug 2024 18:42:27 +0000
Subject: [PATCH 312/401] 8337299:
 vmTestbase/nsk/jdb/stop_at/stop_at002/stop_at002.java failure goes undetected

Reviewed-by: amenkov, sspitsyn
---
 .../jdb/stop_at/stop_at002/stop_at002.java    | 64 ++++++++++++++-----
 .../jdb/stop_at/stop_at002/stop_at002a.java   |  8 ++-
 2 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/stop_at/stop_at002/stop_at002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/stop_at/stop_at002/stop_at002.java
index 620c50fa2ae22..9dae8c17cfc36 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/stop_at/stop_at002/stop_at002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/stop_at/stop_at002/stop_at002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -82,17 +82,10 @@ public static int run(String argv[], PrintStream out) {
     static final String DEBUGGEE_CLASS = TEST_CLASS + "a";
     static final String FIRST_BREAK        = DEBUGGEE_CLASS + ".main";
     static final String LAST_BREAK         = DEBUGGEE_CLASS + ".lastBreak";
-    static final String DEBUGGEE_LOCATION1 = DEBUGGEE_CLASS + "$Nested$DeeperNested$DeepestNested:43";
-    static final String DEBUGGEE_LOCATION2 = DEBUGGEE_CLASS + "$Inner$MoreInner:57";
-    static final String FAILURE_PATTERN = "Unable to set";
+    static final String DEBUGGEE_LOCATION1 = DEBUGGEE_CLASS + "$Nested$DeeperNested$DeepestNested:64";
+    static final String DEBUGGEE_LOCATION2 = DEBUGGEE_CLASS + "$Inner$MoreInner:78";
 
     protected void runCases() {
-        String[] reply;
-        Paragrep grep;
-        int count;
-        Vector v;
-        String found;
-
         if (!checkStop(DEBUGGEE_LOCATION1)) {
             success = false;
         }
@@ -101,25 +94,62 @@ protected void runCases() {
             success = false;
         }
 
-        jdb.contToExit(3);
+        if (!checkBreakpointHit(DEBUGGEE_LOCATION1)) {
+            success = false;
+        }
+
+        if (!checkBreakpointHit(DEBUGGEE_LOCATION2)) {
+            success = false;
+        }
+
+        jdb.contToExit(1);
     }
 
-    private boolean checkStop (String location) {
+    private boolean checkStop(String location) {
         Paragrep grep;
         String[] reply;
         String found;
-        boolean result = true;
 
         log.display("Trying to set breakpoint at line: " + location);
         reply = jdb.receiveReplyFor(JdbCommand.stop_at + location);
 
         grep = new Paragrep(reply);
-        found = grep.findFirst(FAILURE_PATTERN);
+        found = grep.findFirst("Deferring breakpoint " + location);
+        if (found.length() == 0) {
+            log.complain("jdb failed to setup deferred breakpoint at line: " + location);
+            return false;
+        }
+
+        return true;
+    }
+
+    private boolean checkBreakpointHit(String location) {
+        Paragrep grep;
+        String[] reply;
+        String found;
+
+        log.display("continuing to breakpoint at line: " + location);
+        reply = jdb.receiveReplyFor(JdbCommand.cont);
+        grep = new Paragrep(reply);
+
+        found = grep.findFirst("Unable to set deferred breakpoint");
         if (found.length() > 0) {
-            log.complain("jdb failed to set line breakpoint at line: " + found);
-            result = false;
+            log.complain("jdb failed to set deferred breakpoint at line: " + location);
+            return false;
+        }
+
+        found = grep.findFirst("Set deferred breakpoint " + location);
+        if (found.length() == 0) {
+            log.complain("jdb failed to set deferred breakpoint at line: " + location);
+            return false;
+        }
+
+        found = grep.findFirst("Breakpoint hit: \"thread=main\", ");
+        if (found.length() == 0) {
+            log.complain("jdb failed to hit breakpoint at line: " + location);
+            return false;
         }
 
-        return result;
+        return true;
     }
 }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/stop_at/stop_at002/stop_at002a.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/stop_at/stop_at002/stop_at002a.java
index 9195dd2698612..d4a40689372d4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/stop_at/stop_at002/stop_at002a.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/stop_at/stop_at002/stop_at002a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,6 +21,8 @@
  * questions.
  */
 
+//    THIS TEST IS LINE NUMBER SENSITIVE
+
 package nsk.jdb.stop_at.stop_at002;
 
 import nsk.share.*;
@@ -59,7 +61,7 @@ class Nested {
         class DeeperNested {
             class  DeepestNested {
                 public void foo(boolean input) {
-                    flag = input; /* <--------  This is line number 43 */
+                    flag = input; /* <--------  This is line number 64 */
                 }
             }
         }
@@ -73,7 +75,7 @@ public MoreInner() {
                 content = "";
             }
             public void foo(String input) {
-                content += input; /* <--------  This is line number 57 */
+                content += input; /* <--------  This is line number 78 */
             }
         }
     }

From 431d4f7e18369466eedd00926a5162a1461d0b25 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Mon, 5 Aug 2024 19:53:49 +0000
Subject: [PATCH 313/401] 8337785: Fix simple -Wzero-as-null-pointer-constant
 warnings in x86 code

Reviewed-by: jwaters, ayang, shade
---
 src/hotspot/cpu/x86/frame_x86.cpp              | 6 +++---
 src/hotspot/cpu/x86/macroAssembler_x86_sha.cpp | 6 +++---
 src/hotspot/cpu/x86/methodHandles_x86.cpp      | 4 ++--
 src/hotspot/cpu/x86/vm_version_x86.cpp         | 8 ++++----
 src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp  | 2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/hotspot/cpu/x86/frame_x86.cpp b/src/hotspot/cpu/x86/frame_x86.cpp
index 2366d31992d6e..aeb77763e7fff 100644
--- a/src/hotspot/cpu/x86/frame_x86.cpp
+++ b/src/hotspot/cpu/x86/frame_x86.cpp
@@ -279,7 +279,7 @@ void frame::patch_pc(Thread* thread, address pc) {
 
   assert(!Continuation::is_return_barrier_entry(*pc_addr), "return barrier");
 
-  assert(_pc == *pc_addr || pc == *pc_addr || *pc_addr == 0, "");
+  assert(_pc == *pc_addr || pc == *pc_addr || *pc_addr == nullptr, "");
   DEBUG_ONLY(address old_pc = _pc;)
   *pc_addr = pc;
   _pc = pc; // must be set before call to get_deopt_original_pc
@@ -483,10 +483,10 @@ frame frame::sender_for_interpreter_frame(RegisterMap* map) const {
 bool frame::is_interpreted_frame_valid(JavaThread* thread) const {
   assert(is_interpreted_frame(), "Not an interpreted frame");
   // These are reasonable sanity checks
-  if (fp() == 0 || (intptr_t(fp()) & (wordSize-1)) != 0) {
+  if (fp() == nullptr || (intptr_t(fp()) & (wordSize-1)) != 0) {
     return false;
   }
-  if (sp() == 0 || (intptr_t(sp()) & (wordSize-1)) != 0) {
+  if (sp() == nullptr || (intptr_t(sp()) & (wordSize-1)) != 0) {
     return false;
   }
   if (fp() + interpreter_frame_initial_sp_offset < sp()) {
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86_sha.cpp b/src/hotspot/cpu/x86/macroAssembler_x86_sha.cpp
index c4e9e836fd312..090de71425f17 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86_sha.cpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86_sha.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2016, 2021, Intel Corporation. All rights reserved.
+* Copyright (c) 2016, 2024, Intel Corporation. All rights reserved.
 *
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
@@ -689,7 +689,7 @@ void MacroAssembler::sha256_AVX2(XMMRegister msg, XMMRegister state0, XMMRegiste
 
   address K256_W = StubRoutines::x86::k256_W_addr();
   address pshuffle_byte_flip_mask = StubRoutines::x86::pshuffle_byte_flip_mask_addr();
-  address pshuffle_byte_flip_mask_addr = 0;
+  address pshuffle_byte_flip_mask_addr = nullptr;
 
 const XMMRegister& SHUF_00BA        = xmm10;    // ymm10: shuffle xBxA -> 00BA
 const XMMRegister& SHUF_DC00        = xmm12;    // ymm12: shuffle xDxC -> DC00
@@ -1247,7 +1247,7 @@ void MacroAssembler::sha512_AVX2(XMMRegister msg, XMMRegister state0, XMMRegiste
 
     address K512_W = StubRoutines::x86::k512_W_addr();
     address pshuffle_byte_flip_mask_sha512 = StubRoutines::x86::pshuffle_byte_flip_mask_addr_sha512();
-    address pshuffle_byte_flip_mask_addr = 0;
+    address pshuffle_byte_flip_mask_addr = nullptr;
 
     const XMMRegister& XFER = xmm0; // YTMP0
     const XMMRegister& BYTE_FLIP_MASK = xmm9; // ymm9
diff --git a/src/hotspot/cpu/x86/methodHandles_x86.cpp b/src/hotspot/cpu/x86/methodHandles_x86.cpp
index de897d71facef..3a8c104876677 100644
--- a/src/hotspot/cpu/x86/methodHandles_x86.cpp
+++ b/src/hotspot/cpu/x86/methodHandles_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -572,7 +572,7 @@ void trace_method_handle_stub(const char* adaptername,
 
       frame cur_frame = os::current_frame();
 
-      if (cur_frame.fp() != 0) {  // not walkable
+      if (cur_frame.fp() != nullptr) { // not walkable
 
         // Robust search of trace_calling_frame (independent of inlining).
         // Assumes saved_regs comes from a pusha in the trace_calling_frame.
diff --git a/src/hotspot/cpu/x86/vm_version_x86.cpp b/src/hotspot/cpu/x86/vm_version_x86.cpp
index 02e147743cb1d..6216cf44b887a 100644
--- a/src/hotspot/cpu/x86/vm_version_x86.cpp
+++ b/src/hotspot/cpu/x86/vm_version_x86.cpp
@@ -53,13 +53,13 @@ const char* VM_Version::_features_names[] = { CPU_FEATURE_FLAGS(DECLARE_CPU_FEAT
 #undef DECLARE_CPU_FEATURE_FLAG
 
 // Address of instruction which causes SEGV
-address VM_Version::_cpuinfo_segv_addr = 0;
+address VM_Version::_cpuinfo_segv_addr = nullptr;
 // Address of instruction after the one which causes SEGV
-address VM_Version::_cpuinfo_cont_addr = 0;
+address VM_Version::_cpuinfo_cont_addr = nullptr;
 // Address of instruction which causes APX specific SEGV
-address VM_Version::_cpuinfo_segv_addr_apx = 0;
+address VM_Version::_cpuinfo_segv_addr_apx = nullptr;
 // Address of instruction after the one which causes APX specific SEGV
-address VM_Version::_cpuinfo_cont_addr_apx = 0;
+address VM_Version::_cpuinfo_cont_addr_apx = nullptr;
 
 static BufferBlob* stub_blob;
 static const int stub_size = 2000;
diff --git a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
index 78988dd4fd005..0d5d07fc8a804 100644
--- a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
+++ b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
@@ -224,7 +224,7 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
   if (info != nullptr && uc != nullptr && thread != nullptr) {
     pc = (address) os::Posix::ucontext_get_pc(uc);
 
-    if (sig == SIGSEGV && info->si_addr == 0 && info->si_code == SI_KERNEL) {
+    if (sig == SIGSEGV && info->si_addr == nullptr && info->si_code == SI_KERNEL) {
       // An irrecoverable SI_KERNEL SIGSEGV has occurred.
       // It's likely caused by dereferencing an address larger than TASK_SIZE.
       return false;

From 7146daee68788bf9a33d6eed6fb0614a82644cbc Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Mon, 5 Aug 2024 20:05:07 +0000
Subject: [PATCH 314/401] 8337783: Use THROW_NULL instead of THROW_0 in pointer
 contexts in misc runtime code

Reviewed-by: stefank, shade
---
 src/hotspot/os/posix/perfMemory_posix.cpp     |  6 +--
 src/hotspot/share/classfile/javaClasses.cpp   |  2 +-
 .../share/classfile/systemDictionary.cpp      |  2 +-
 src/hotspot/share/oops/objArrayKlass.cpp      |  2 +-
 src/hotspot/share/runtime/perfData.cpp        | 16 ++++----
 src/hotspot/share/runtime/reflection.cpp      | 38 +++++++++----------
 6 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/hotspot/os/posix/perfMemory_posix.cpp b/src/hotspot/os/posix/perfMemory_posix.cpp
index 56bc8a1ef6b81..4eb46169878cd 100644
--- a/src/hotspot/os/posix/perfMemory_posix.cpp
+++ b/src/hotspot/os/posix/perfMemory_posix.cpp
@@ -499,11 +499,11 @@ static char* get_user_name_slow(int vmid, int nspid, TRAPS) {
   // short circuit the directory search if the process doesn't even exist.
   if (kill(vmid, 0) == OS_ERR) {
     if (errno == ESRCH) {
-      THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(),
-                  "Process not found");
+      THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(),
+                     "Process not found");
     }
     else /* EPERM */ {
-      THROW_MSG_0(vmSymbols::java_io_IOException(), os::strerror(errno));
+      THROW_MSG_NULL(vmSymbols::java_io_IOException(), os::strerror(errno));
     }
   }
 
diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index b1b74bbba05cf..ab9460e2b9b01 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -475,7 +475,7 @@ Handle java_lang_String::externalize_classname(Symbol* java_name, TRAPS) {
 jchar* java_lang_String::as_unicode_string(oop java_string, int& length, TRAPS) {
   jchar* result = as_unicode_string_or_null(java_string, length);
   if (result == nullptr) {
-    THROW_MSG_0(vmSymbols::java_lang_OutOfMemoryError(), "could not allocate Unicode string");
+    THROW_MSG_NULL(vmSymbols::java_lang_OutOfMemoryError(), "could not allocate Unicode string");
   }
   return result;
 }
diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
index 3016d41b28923..7f9e6430cc651 100644
--- a/src/hotspot/share/classfile/systemDictionary.cpp
+++ b/src/hotspot/share/classfile/systemDictionary.cpp
@@ -259,7 +259,7 @@ Handle SystemDictionary::get_loader_lock_or_null(Handle class_loader) {
 
 Symbol* SystemDictionary::class_name_symbol(const char* name, Symbol* exception, TRAPS) {
   if (name == nullptr) {
-    THROW_MSG_0(exception, "No class name given");
+    THROW_MSG_NULL(exception, "No class name given");
   }
   if ((int)strlen(name) > Symbol::max_length()) {
     // It's impossible to create this class;  the name cannot fit
diff --git a/src/hotspot/share/oops/objArrayKlass.cpp b/src/hotspot/share/oops/objArrayKlass.cpp
index 94d3c6b6b358e..bee010b6d7244 100644
--- a/src/hotspot/share/oops/objArrayKlass.cpp
+++ b/src/hotspot/share/oops/objArrayKlass.cpp
@@ -173,7 +173,7 @@ oop ObjArrayKlass::multi_allocate(int rank, jint* sizes, TRAPS) {
       for (int i = 0; i < rank - 1; ++i) {
         sizes += 1;
         if (*sizes < 0) {
-          THROW_MSG_0(vmSymbols::java_lang_NegativeArraySizeException(), err_msg("%d", *sizes));
+          THROW_MSG_NULL(vmSymbols::java_lang_NegativeArraySizeException(), err_msg("%d", *sizes));
         }
       }
     }
diff --git a/src/hotspot/share/runtime/perfData.cpp b/src/hotspot/share/runtime/perfData.cpp
index 5e78baad3ab2a..657427943aa2f 100644
--- a/src/hotspot/share/runtime/perfData.cpp
+++ b/src/hotspot/share/runtime/perfData.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -361,7 +361,7 @@ PerfStringConstant* PerfDataManager::create_string_constant(CounterNS ns,
   if (!p->is_valid()) {
     // allocation of native resources failed.
     delete p;
-    THROW_0(vmSymbols::java_lang_OutOfMemoryError());
+    THROW_NULL(vmSymbols::java_lang_OutOfMemoryError());
   }
 
   add_item(p, false);
@@ -379,7 +379,7 @@ PerfLongConstant* PerfDataManager::create_long_constant(CounterNS ns,
   if (!p->is_valid()) {
     // allocation of native resources failed.
     delete p;
-    THROW_0(vmSymbols::java_lang_OutOfMemoryError());
+    THROW_NULL(vmSymbols::java_lang_OutOfMemoryError());
   }
 
   add_item(p, false);
@@ -402,7 +402,7 @@ PerfStringVariable* PerfDataManager::create_string_variable(CounterNS ns,
   if (!p->is_valid()) {
     // allocation of native resources failed.
     delete p;
-    THROW_0(vmSymbols::java_lang_OutOfMemoryError());
+    THROW_NULL(vmSymbols::java_lang_OutOfMemoryError());
   }
 
   add_item(p, false);
@@ -420,7 +420,7 @@ PerfLongVariable* PerfDataManager::create_long_variable(CounterNS ns,
   if (!p->is_valid()) {
     // allocation of native resources failed.
     delete p;
-    THROW_0(vmSymbols::java_lang_OutOfMemoryError());
+    THROW_NULL(vmSymbols::java_lang_OutOfMemoryError());
   }
 
   add_item(p, false);
@@ -442,7 +442,7 @@ PerfLongVariable* PerfDataManager::create_long_variable(CounterNS ns,
   if (!p->is_valid()) {
     // allocation of native resources failed.
     delete p;
-    THROW_0(vmSymbols::java_lang_OutOfMemoryError());
+    THROW_NULL(vmSymbols::java_lang_OutOfMemoryError());
   }
 
   add_item(p, true);
@@ -460,7 +460,7 @@ PerfLongCounter* PerfDataManager::create_long_counter(CounterNS ns,
   if (!p->is_valid()) {
     // allocation of native resources failed.
     delete p;
-    THROW_0(vmSymbols::java_lang_OutOfMemoryError());
+    THROW_NULL(vmSymbols::java_lang_OutOfMemoryError());
   }
 
   add_item(p, false);
@@ -482,7 +482,7 @@ PerfLongCounter* PerfDataManager::create_long_counter(CounterNS ns,
   if (!p->is_valid()) {
     // allocation of native resources failed.
     delete p;
-    THROW_0(vmSymbols::java_lang_OutOfMemoryError());
+    THROW_NULL(vmSymbols::java_lang_OutOfMemoryError());
   }
 
   add_item(p, true);
diff --git a/src/hotspot/share/runtime/reflection.cpp b/src/hotspot/share/runtime/reflection.cpp
index bc8779158d31d..865d25fa06b8a 100644
--- a/src/hotspot/share/runtime/reflection.cpp
+++ b/src/hotspot/share/runtime/reflection.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -325,7 +325,7 @@ static Klass* basic_type_mirror_to_arrayklass(oop basic_type_mirror, TRAPS) {
   assert(java_lang_Class::is_primitive(basic_type_mirror), "just checking");
   BasicType type = java_lang_Class::primitive_type(basic_type_mirror);
   if (type == T_VOID) {
-    THROW_0(vmSymbols::java_lang_IllegalArgumentException());
+    THROW_NULL(vmSymbols::java_lang_IllegalArgumentException());
   }
   else {
     return Universe::typeArrayKlass(type);
@@ -334,10 +334,10 @@ static Klass* basic_type_mirror_to_arrayklass(oop basic_type_mirror, TRAPS) {
 
 arrayOop Reflection::reflect_new_array(oop element_mirror, jint length, TRAPS) {
   if (element_mirror == nullptr) {
-    THROW_0(vmSymbols::java_lang_NullPointerException());
+    THROW_NULL(vmSymbols::java_lang_NullPointerException());
   }
   if (length < 0) {
-    THROW_MSG_0(vmSymbols::java_lang_NegativeArraySizeException(), err_msg("%d", length));
+    THROW_MSG_NULL(vmSymbols::java_lang_NegativeArraySizeException(), err_msg("%d", length));
   }
   if (java_lang_Class::is_primitive(element_mirror)) {
     Klass* tak = basic_type_mirror_to_arrayklass(element_mirror, CHECK_NULL);
@@ -345,7 +345,7 @@ arrayOop Reflection::reflect_new_array(oop element_mirror, jint length, TRAPS) {
   } else {
     Klass* k = java_lang_Class::as_Klass(element_mirror);
     if (k->is_array_klass() && ArrayKlass::cast(k)->dimension() >= MAX_DIM) {
-      THROW_0(vmSymbols::java_lang_IllegalArgumentException());
+      THROW_NULL(vmSymbols::java_lang_IllegalArgumentException());
     }
     return oopFactory::new_objArray(k, length, THREAD);
   }
@@ -357,19 +357,19 @@ arrayOop Reflection::reflect_new_multi_array(oop element_mirror, typeArrayOop di
   assert(TypeArrayKlass::cast(dim_array->klass())->element_type() == T_INT, "just checking");
 
   if (element_mirror == nullptr) {
-    THROW_0(vmSymbols::java_lang_NullPointerException());
+    THROW_NULL(vmSymbols::java_lang_NullPointerException());
   }
 
   int len = dim_array->length();
   if (len <= 0 || len > MAX_DIM) {
-    THROW_0(vmSymbols::java_lang_IllegalArgumentException());
+    THROW_NULL(vmSymbols::java_lang_IllegalArgumentException());
   }
 
   jint dimensions[MAX_DIM];   // C array copy of intArrayOop
   for (int i = 0; i < len; i++) {
     int d = dim_array->int_at(i);
     if (d < 0) {
-      THROW_MSG_0(vmSymbols::java_lang_NegativeArraySizeException(), err_msg("%d", d));
+      THROW_MSG_NULL(vmSymbols::java_lang_NegativeArraySizeException(), err_msg("%d", d));
     }
     dimensions[i] = d;
   }
@@ -383,7 +383,7 @@ arrayOop Reflection::reflect_new_multi_array(oop element_mirror, typeArrayOop di
     if (klass->is_array_klass()) {
       int k_dim = ArrayKlass::cast(klass)->dimension();
       if (k_dim + len > MAX_DIM) {
-        THROW_0(vmSymbols::java_lang_IllegalArgumentException());
+        THROW_NULL(vmSymbols::java_lang_IllegalArgumentException());
       }
       dim += k_dim;
     }
@@ -977,11 +977,11 @@ static oop invoke(InstanceKlass* klass,
   } else {
     // check for null receiver
     if (receiver.is_null()) {
-      THROW_0(vmSymbols::java_lang_NullPointerException());
+      THROW_NULL(vmSymbols::java_lang_NullPointerException());
     }
     // Check class of receiver against class declaring method
     if (!receiver->is_a(klass)) {
-      THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "object is not an instance of declaring class");
+      THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "object is not an instance of declaring class");
     }
     // target klass is receiver's klass
     target_klass = receiver->klass();
@@ -1047,15 +1047,15 @@ static oop invoke(InstanceKlass* klass,
                                      reflected_method->name(),
                                      reflected_method->signature());
     ss.print("'");
-    THROW_MSG_0(vmSymbols::java_lang_NoSuchMethodError(), ss.as_string());
+    THROW_MSG_NULL(vmSymbols::java_lang_NoSuchMethodError(), ss.as_string());
   }
 
   assert(ptypes->is_objArray(), "just checking");
   int args_len = args.is_null() ? 0 : args->length();
   // Check number of arguments
   if (ptypes->length() != args_len) {
-    THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(),
-                "wrong number of arguments");
+    THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(),
+                   "wrong number of arguments");
   }
 
   // Create object to contain parameters for the JavaCall
@@ -1085,14 +1085,14 @@ static oop invoke(InstanceKlass* klass,
         case T_FLOAT:       java_args.push_float(value.f);  break;
         case T_DOUBLE:      java_args.push_double(value.d); break;
         default:
-          THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "argument type mismatch");
+          THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "argument type mismatch");
       }
     } else {
       if (arg != nullptr) {
         Klass* k = java_lang_Class::as_Klass(type_mirror);
         if (!arg->is_a(k)) {
-          THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(),
-                      "argument type mismatch");
+          THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(),
+                         "argument type mismatch");
         }
       }
       Handle arg_handle(THREAD, arg);         // Create handle for argument
@@ -1148,7 +1148,7 @@ oop Reflection::invoke_method(oop method_mirror, Handle receiver, objArrayHandle
   InstanceKlass* klass = InstanceKlass::cast(java_lang_Class::as_Klass(mirror));
   Method* m = klass->method_with_idnum(slot);
   if (m == nullptr) {
-    THROW_MSG_0(vmSymbols::java_lang_InternalError(), "invoke");
+    THROW_MSG_NULL(vmSymbols::java_lang_InternalError(), "invoke");
   }
   methodHandle method(THREAD, m);
 
@@ -1165,7 +1165,7 @@ oop Reflection::invoke_constructor(oop constructor_mirror, objArrayHandle args,
   InstanceKlass* klass = InstanceKlass::cast(java_lang_Class::as_Klass(mirror));
   Method* m = klass->method_with_idnum(slot);
   if (m == nullptr) {
-    THROW_MSG_0(vmSymbols::java_lang_InternalError(), "invoke");
+    THROW_MSG_NULL(vmSymbols::java_lang_InternalError(), "invoke");
   }
   methodHandle method(THREAD, m);
   assert(method->name() == vmSymbols::object_initializer_name(), "invalid constructor");

From 965d6b9cbe2dd882fe3c3c955dfa08685af7d6c2 Mon Sep 17 00:00:00 2001
From: Serguei Spitsyn <sspitsyn@openjdk.org>
Date: Mon, 5 Aug 2024 23:29:17 +0000
Subject: [PATCH 315/401] 8335836:
 serviceability/jvmti/StartPhase/AllowedFunctions/AllowedFunctions.java fails
 with unexpected exit code: 112

Reviewed-by: cjplummer, amenkov
---
 .../AllowedFunctions/libAllowedFunctions.c    | 45 +++++++++++++++++--
 1 file changed, 41 insertions(+), 4 deletions(-)

diff --git a/test/hotspot/jtreg/serviceability/jvmti/StartPhase/AllowedFunctions/libAllowedFunctions.c b/test/hotspot/jtreg/serviceability/jvmti/StartPhase/AllowedFunctions/libAllowedFunctions.c
index 4299a98d7e63b..97b5cab341eb2 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/StartPhase/AllowedFunctions/libAllowedFunctions.c
+++ b/test/hotspot/jtreg/serviceability/jvmti/StartPhase/AllowedFunctions/libAllowedFunctions.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,6 +47,8 @@ extern "C" {
 #define FAILED 2
 
 static jint result = PASSED;
+static jrawMonitorID event_mon = NULL;
+static jboolean is_vm_dead = JNI_FALSE;
 
 static jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved);
 
@@ -68,7 +70,7 @@ jint JNICALL JNI_OnLoad(JavaVM *jvm, void *reserved) {
 static void check_jvmti_error(jvmtiEnv *jvmti, char* fname, jvmtiError err) {
     if (err != JVMTI_ERROR_NONE) {
         printf("  ## %s error: %d\n", fname, err);
-        exit(err);
+        abort();
     }
 }
 
@@ -317,7 +319,7 @@ VMStart(jvmtiEnv *jvmti, JNIEnv* jni) {
 }
 
 static void JNICALL
-VMInit(jvmtiEnv *jvmti, JNIEnv* jnii, jthread thread) {
+VMInit(jvmtiEnv *jvmti, JNIEnv* jni, jthread thread) {
     jvmtiPhase phase;
 
     printf("VMInit event\n");
@@ -329,22 +331,52 @@ VMInit(jvmtiEnv *jvmti, JNIEnv* jnii, jthread thread) {
     }
 }
 
+static void JNICALL
+VMDeath(jvmtiEnv *jvmti, JNIEnv* jni) {
+    jvmtiError err;
+
+    // Block ClassPrepare events while this callback is executed.
+    err  = (*jvmti)->RawMonitorEnter(jvmti, event_mon);
+    check_jvmti_error(jvmti, "VMDeath event: Failed in RawMonitorEnter", err);
+
+    is_vm_dead = JNI_TRUE;
+    printf("VMDeath event\n");
+
+    err = (*jvmti)->RawMonitorExit(jvmti, event_mon);
+    check_jvmti_error(jvmti, "VMDeath event: Failed in RawMonitorExit", err);
+}
+
 static void JNICALL
 ClassPrepare(jvmtiEnv *jvmti, JNIEnv *env, jthread thread, jclass klass) {
     static const jint EVENTS_LIMIT = 2;
     static       jint event_no = 0;
-    jthread cur_thread = get_cur_thread(jvmti);
     jvmtiPhase phase;
     intptr_t exp_val = 777;
     intptr_t act_val;
+    jvmtiError err;
+
+    // Block VMDeath event and other ClassPrepare events while this callback is executed.
+    // Sync with VMDeath event and check for is_vm_dead guard against JVMTI_ERROR WRONG_PHASE.
+    err = (*jvmti)->RawMonitorEnter(jvmti, event_mon);
+    check_jvmti_error(jvmti, "ClassPrepare event: Failed in RawMonitorEnter", err);
 
+    if (is_vm_dead) {
+        printf("\nIgnoring ClassPrepare event during the dead phase\n");
+        err = (*jvmti)->RawMonitorExit(jvmti, event_mon);
+        check_jvmti_error(jvmti, "ClassPrepare event: Failed in RawMonitorExit", err);
+        return;
+    }
     get_phase(jvmti, &phase);
     if (phase != JVMTI_PHASE_START && phase != JVMTI_PHASE_LIVE) {
         printf("  ## Error: unexpected phase: %d, expected: %d or %d\n",
                phase, JVMTI_PHASE_START, JVMTI_PHASE_LIVE);
+        result = FAILED;
+        err = (*jvmti)->RawMonitorExit(jvmti, event_mon);
+        check_jvmti_error(jvmti, "ClassPrepare event: Failed in RawMonitorExit", err);
         return;
     }
     if (phase == JVMTI_PHASE_START && event_no < EVENTS_LIMIT) {
+        jthread cur_thread = get_cur_thread(jvmti);
         printf("\nClassPrepare event during the start phase: #%d\n", event_no);
         // Test the JVMTI class functions during the start phase
         test_class_functions(jvmti, env, thread, klass);
@@ -360,6 +392,8 @@ ClassPrepare(jvmtiEnv *jvmti, JNIEnv *env, jthread thread, jclass klass) {
         }
         event_no++;
     }
+    err = (*jvmti)->RawMonitorExit(jvmti, event_mon);
+    check_jvmti_error(jvmti, "ClassPrepare event: Failed in RawMonitorExit", err);
 }
 
 static
@@ -400,6 +434,9 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     callbacks.VMInit = VMInit;
     callbacks.ClassPrepare = ClassPrepare;
 
+    err = (*jvmti)->CreateRawMonitor(jvmti, "Events Monitor", &event_mon);
+    check_jvmti_error(jvmti, "## Agent_Initialize: CreateRawMonitor", err);
+
     err = (*jvmti)->SetEventCallbacks(jvmti, &callbacks, size);
     check_jvmti_error(jvmti, "## Agent_Initialize: SetEventCallbacks", err);
 

From 73718fb8a3570023e7855137eb008f78b8a1e8ce Mon Sep 17 00:00:00 2001
From: Gui Cao <gcao@openjdk.org>
Date: Tue, 6 Aug 2024 02:16:19 +0000
Subject: [PATCH 316/401] 8337788: RISC-V: Cleanup code in
 MacroAssembler::reserved_stack_check

Reviewed-by: fyang, rehn, fjiang
---
 .../cpu/riscv/macroAssembler_riscv.cpp        | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index cd7a4ecf22803..e0b24b7fd66ca 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -4130,29 +4130,25 @@ void MacroAssembler::remove_frame(int framesize) {
 }
 
 void MacroAssembler::reserved_stack_check() {
-    // testing if reserved zone needs to be enabled
-    Label no_reserved_zone_enabling;
+  // testing if reserved zone needs to be enabled
+  Label no_reserved_zone_enabling;
 
-    ld(t0, Address(xthread, JavaThread::reserved_stack_activation_offset()));
-    bltu(sp, t0, no_reserved_zone_enabling);
+  ld(t0, Address(xthread, JavaThread::reserved_stack_activation_offset()));
+  bltu(sp, t0, no_reserved_zone_enabling);
 
-    enter();   // RA and FP are live.
-    mv(c_rarg0, xthread);
-    rt_call(CAST_FROM_FN_PTR(address, SharedRuntime::enable_stack_reserved_zone));
-    leave();
+  enter();   // RA and FP are live.
+  mv(c_rarg0, xthread);
+  rt_call(CAST_FROM_FN_PTR(address, SharedRuntime::enable_stack_reserved_zone));
+  leave();
 
-    // We have already removed our own frame.
-    // throw_delayed_StackOverflowError will think that it's been
-    // called by our caller.
-    RuntimeAddress target(StubRoutines::throw_delayed_StackOverflowError_entry());
-    relocate(target.rspec(), [&] {
-      int32_t offset;
-      movptr(t0, target.target(), offset);
-      jr(t0, offset);
-    });
-    should_not_reach_here();
+  // We have already removed our own frame.
+  // throw_delayed_StackOverflowError will think that it's been
+  // called by our caller.
+  la(t0, RuntimeAddress(StubRoutines::throw_delayed_StackOverflowError_entry()));
+  jr(t0);
+  should_not_reach_here();
 
-    bind(no_reserved_zone_enabling);
+  bind(no_reserved_zone_enabling);
 }
 
 // Move the address of the polling page into dest.

From 20575949612a750a428316635715737183a2d58c Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Tue, 6 Aug 2024 05:34:33 +0000
Subject: [PATCH 317/401] 8337782: Use THROW_NULL instead of THROW_0 in pointer
 contexts in prims code

Reviewed-by: shade, dholmes
---
 src/hotspot/share/prims/jni.cpp          | 16 +++----
 src/hotspot/share/prims/jvm.cpp          | 54 ++++++++++++------------
 src/hotspot/share/prims/nativeLookup.cpp |  4 +-
 src/hotspot/share/prims/perf.cpp         | 16 +++----
 src/hotspot/share/prims/unsafe.cpp       |  2 +-
 src/hotspot/share/prims/whitebox.cpp     |  2 +-
 6 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp
index a91d7375761e2..12eba0ff623be 100644
--- a/src/hotspot/share/prims/jni.cpp
+++ b/src/hotspot/share/prims/jni.cpp
@@ -1074,7 +1074,7 @@ static jmethodID get_method_id(JNIEnv *env, jclass clazz, const char *name_str,
   TempNewSymbol signature = SymbolTable::probe(sig, (int)strlen(sig));
 
   if (name == nullptr || signature == nullptr) {
-    THROW_MSG_0(vmSymbols::java_lang_NoSuchMethodError(), name_str);
+    THROW_MSG_NULL(vmSymbols::java_lang_NoSuchMethodError(), name_str);
   }
 
   oop mirror = JNIHandles::resolve_non_null(clazz);
@@ -1084,7 +1084,7 @@ static jmethodID get_method_id(JNIEnv *env, jclass clazz, const char *name_str,
   // primitive java.lang.Class
   if (java_lang_Class::is_primitive(mirror)) {
     ResourceMark rm(THREAD);
-    THROW_MSG_0(vmSymbols::java_lang_NoSuchMethodError(), err_msg("%s%s.%s%s", is_static ? "static " : "", klass->signature_name(), name_str, sig));
+    THROW_MSG_NULL(vmSymbols::java_lang_NoSuchMethodError(), err_msg("%s%s.%s%s", is_static ? "static " : "", klass->signature_name(), name_str, sig));
   }
 
   // Make sure class is linked and initialized before handing id's out to
@@ -1108,7 +1108,7 @@ static jmethodID get_method_id(JNIEnv *env, jclass clazz, const char *name_str,
   }
   if (m == nullptr || (m->is_static() != is_static)) {
     ResourceMark rm(THREAD);
-    THROW_MSG_0(vmSymbols::java_lang_NoSuchMethodError(), err_msg("%s%s.%s%s", is_static ? "static " : "", klass->signature_name(), name_str, sig));
+    THROW_MSG_NULL(vmSymbols::java_lang_NoSuchMethodError(), err_msg("%s%s.%s%s", is_static ? "static " : "", klass->signature_name(), name_str, sig));
   }
   return m->jmethod_id();
 }
@@ -1762,7 +1762,7 @@ JNI_ENTRY(jfieldID, jni_GetFieldID(JNIEnv *env, jclass clazz,
   TempNewSymbol signame = SymbolTable::probe(sig, (int)strlen(sig));
   if (fieldname == nullptr || signame == nullptr) {
     ResourceMark rm;
-    THROW_MSG_0(vmSymbols::java_lang_NoSuchFieldError(), err_msg("%s.%s %s", k->external_name(), name, sig));
+    THROW_MSG_NULL(vmSymbols::java_lang_NoSuchFieldError(), err_msg("%s.%s %s", k->external_name(), name, sig));
   }
 
   // Make sure class is initialized before handing id's out to fields
@@ -1772,7 +1772,7 @@ JNI_ENTRY(jfieldID, jni_GetFieldID(JNIEnv *env, jclass clazz,
   if (!k->is_instance_klass() ||
       !InstanceKlass::cast(k)->find_field(fieldname, signame, false, &fd)) {
     ResourceMark rm;
-    THROW_MSG_0(vmSymbols::java_lang_NoSuchFieldError(), err_msg("%s.%s %s", k->external_name(), name, sig));
+    THROW_MSG_NULL(vmSymbols::java_lang_NoSuchFieldError(), err_msg("%s.%s %s", k->external_name(), name, sig));
   }
 
   // A jfieldID for a non-static field is simply the offset of the field within the instanceOop
@@ -1986,7 +1986,7 @@ JNI_ENTRY(jfieldID, jni_GetStaticFieldID(JNIEnv *env, jclass clazz,
   TempNewSymbol fieldname = SymbolTable::probe(name, (int)strlen(name));
   TempNewSymbol signame = SymbolTable::probe(sig, (int)strlen(sig));
   if (fieldname == nullptr || signame == nullptr) {
-    THROW_MSG_0(vmSymbols::java_lang_NoSuchFieldError(), (char*) name);
+    THROW_MSG_NULL(vmSymbols::java_lang_NoSuchFieldError(), (char*) name);
   }
   Klass* k = java_lang_Class::as_Klass(JNIHandles::resolve_non_null(clazz));
   // Make sure class is initialized before handing id's out to static fields
@@ -1995,7 +1995,7 @@ JNI_ENTRY(jfieldID, jni_GetStaticFieldID(JNIEnv *env, jclass clazz,
   fieldDescriptor fd;
   if (!k->is_instance_klass() ||
       !InstanceKlass::cast(k)->find_field(fieldname, signame, true, &fd)) {
-    THROW_MSG_0(vmSymbols::java_lang_NoSuchFieldError(), (char*) name);
+    THROW_MSG_NULL(vmSymbols::java_lang_NoSuchFieldError(), (char*) name);
   }
 
   // A jfieldID for a static field is a JNIid specifying the field holder and the offset within the Klass*
@@ -2309,7 +2309,7 @@ JNI_ENTRY(jobject, jni_GetObjectArrayElement(JNIEnv *env, jobjectArray array, js
     ResourceMark rm(THREAD);
     stringStream ss;
     ss.print("Index %d out of bounds for length %d", index, a->length());
-    THROW_MSG_0(vmSymbols::java_lang_ArrayIndexOutOfBoundsException(), ss.as_string());
+    THROW_MSG_NULL(vmSymbols::java_lang_ArrayIndexOutOfBoundsException(), ss.as_string());
   }
 JNI_END
 
diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
index 1e3806474b540..e40c11289661e 100644
--- a/src/hotspot/share/prims/jvm.cpp
+++ b/src/hotspot/share/prims/jvm.cpp
@@ -691,7 +691,7 @@ JVM_ENTRY(jobject, JVM_Clone(JNIEnv* env, jobject handle))
       (klass->is_instance_klass() &&
        InstanceKlass::cast(klass)->reference_type() != REF_NONE)) {
     ResourceMark rm(THREAD);
-    THROW_MSG_0(vmSymbols::java_lang_CloneNotSupportedException(), klass->external_name());
+    THROW_MSG_NULL(vmSymbols::java_lang_CloneNotSupportedException(), klass->external_name());
   }
 
   // Make shallow object copy
@@ -791,7 +791,7 @@ JVM_ENTRY(jclass, JVM_FindPrimitiveClass(JNIEnv* env, const char* utf))
     mirror = Universe::java_mirror(t);
   }
   if (mirror == nullptr) {
-    THROW_MSG_0(vmSymbols::java_lang_ClassNotFoundException(), (char*) utf);
+    THROW_MSG_NULL(vmSymbols::java_lang_ClassNotFoundException(), (char*) utf);
   } else {
     return (jclass) JNIHandles::make_local(THREAD, mirror);
   }
@@ -952,7 +952,7 @@ static jclass jvm_lookup_define_class(jclass lookup, const char *name,
   Klass* lookup_k = java_lang_Class::as_Klass(JNIHandles::resolve_non_null(lookup));
   // Lookup class must be a non-null instance
   if (lookup_k == nullptr) {
-    THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Lookup class is null");
+    THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "Lookup class is null");
   }
   assert(lookup_k->is_instance_klass(), "Lookup class must be an instance klass");
 
@@ -979,20 +979,20 @@ static jclass jvm_lookup_define_class(jclass lookup, const char *name,
   if (!is_hidden) {
     // classData is only applicable for hidden classes
     if (classData != nullptr) {
-      THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "classData is only applicable for hidden classes");
+      THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "classData is only applicable for hidden classes");
     }
     if (is_nestmate) {
-      THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "dynamic nestmate is only applicable for hidden classes");
+      THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "dynamic nestmate is only applicable for hidden classes");
     }
     if (!is_strong) {
-      THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "an ordinary class must be strongly referenced by its defining loader");
+      THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "an ordinary class must be strongly referenced by its defining loader");
     }
     if (vm_annotations) {
-      THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "vm annotations only allowed for hidden classes");
+      THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "vm annotations only allowed for hidden classes");
     }
     if (flags != STRONG_LOADER_LINK) {
-      THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(),
-                  err_msg("invalid flag 0x%x", flags));
+      THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(),
+                     err_msg("invalid flag 0x%x", flags));
     }
   }
 
@@ -1047,7 +1047,7 @@ static jclass jvm_lookup_define_class(jclass lookup, const char *name,
 
   if ((!is_hidden || is_nestmate) && !Reflection::is_same_class_package(lookup_k, ik)) {
     // non-hidden class or nestmate class must be in the same package as the Lookup class
-    THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Lookup class and defined class are in different packages");
+    THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "Lookup class and defined class are in different packages");
   }
 
   if (init) {
@@ -1078,7 +1078,7 @@ JVM_ENTRY(jclass, JVM_LookupDefineClass(JNIEnv *env, jclass lookup, const char *
           jsize len, jobject pd, jboolean initialize, int flags, jobject classData))
 
   if (lookup == nullptr) {
-    THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Lookup class is null");
+    THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "Lookup class is null");
   }
 
   assert(buf != nullptr, "buf must not be null");
@@ -1703,8 +1703,8 @@ JVM_ENTRY(jobjectArray, JVM_GetMethodParameters(JNIEnv *env, jobject method))
       bounds_check(cp, index, CHECK_NULL);
 
       if (0 != index && !mh->constants()->tag_at(index).is_utf8()) {
-        THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(),
-                    "Wrong type at constant pool index");
+        THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(),
+                       "Wrong type at constant pool index");
       }
 
     }
@@ -2133,7 +2133,7 @@ JVM_ENTRY(jclass, JVM_ConstantPoolGetClassAt(JNIEnv *env, jobject obj, jobject u
   bounds_check(cp, index, CHECK_NULL);
   constantTag tag = cp->tag_at(index);
   if (!tag.is_klass() && !tag.is_unresolved_klass()) {
-    THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
+    THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
   }
   Klass* k = cp->klass_at(index, CHECK_NULL);
   return (jclass) JNIHandles::make_local(THREAD, k->java_mirror());
@@ -2146,7 +2146,7 @@ JVM_ENTRY(jclass, JVM_ConstantPoolGetClassAtIfLoaded(JNIEnv *env, jobject obj, j
   bounds_check(cp, index, CHECK_NULL);
   constantTag tag = cp->tag_at(index);
   if (!tag.is_klass() && !tag.is_unresolved_klass()) {
-    THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
+    THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
   }
   Klass* k = ConstantPool::klass_at_if_loaded(cp, index);
   if (k == nullptr) return nullptr;
@@ -2157,7 +2157,7 @@ JVM_END
 static jobject get_method_at_helper(const constantPoolHandle& cp, jint index, bool force_resolution, TRAPS) {
   constantTag tag = cp->tag_at(index);
   if (!tag.is_method() && !tag.is_interface_method()) {
-    THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
+    THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
   }
   int klass_ref  = cp->uncached_klass_ref_index_at(index);
   Klass* k_o;
@@ -2172,7 +2172,7 @@ static jobject get_method_at_helper(const constantPoolHandle& cp, jint index, bo
   Symbol* sig  = cp->uncached_signature_ref_at(index);
   methodHandle m (THREAD, k->find_method(name, sig));
   if (m.is_null()) {
-    THROW_MSG_0(vmSymbols::java_lang_RuntimeException(), "Unable to look up method in target class");
+    THROW_MSG_NULL(vmSymbols::java_lang_RuntimeException(), "Unable to look up method in target class");
   }
   oop method;
   if (!m->is_initializer() || m->is_static()) {
@@ -2206,7 +2206,7 @@ JVM_END
 static jobject get_field_at_helper(constantPoolHandle cp, jint index, bool force_resolution, TRAPS) {
   constantTag tag = cp->tag_at(index);
   if (!tag.is_field()) {
-    THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
+    THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
   }
   int klass_ref  = cp->uncached_klass_ref_index_at(index);
   Klass* k_o;
@@ -2222,7 +2222,7 @@ static jobject get_field_at_helper(constantPoolHandle cp, jint index, bool force
   fieldDescriptor fd;
   Klass* target_klass = k->find_field(name, sig, &fd);
   if (target_klass == nullptr) {
-    THROW_MSG_0(vmSymbols::java_lang_RuntimeException(), "Unable to look up field in target class");
+    THROW_MSG_NULL(vmSymbols::java_lang_RuntimeException(), "Unable to look up field in target class");
   }
   oop field = Reflection::new_field(&fd, CHECK_NULL);
   return JNIHandles::make_local(THREAD, field);
@@ -2255,7 +2255,7 @@ JVM_ENTRY(jobjectArray, JVM_ConstantPoolGetMemberRefInfoAt(JNIEnv *env, jobject
   bounds_check(cp, index, CHECK_NULL);
   constantTag tag = cp->tag_at(index);
   if (!tag.is_field_or_method()) {
-    THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
+    THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
   }
   int klass_ref = cp->uncached_klass_ref_index_at(index);
   Symbol*  klass_name  = cp->klass_name_at(klass_ref);
@@ -2306,7 +2306,7 @@ JVM_ENTRY(jobjectArray, JVM_ConstantPoolGetNameAndTypeRefInfoAt(JNIEnv *env, job
   bounds_check(cp, index, CHECK_NULL);
   constantTag tag = cp->tag_at(index);
   if (!tag.is_name_and_type()) {
-    THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
+    THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
   }
   Symbol* member_name = cp->symbol_at(cp->name_ref_index_at(index));
   Symbol* member_sig = cp->symbol_at(cp->signature_ref_index_at(index));
@@ -2374,7 +2374,7 @@ JVM_ENTRY(jstring, JVM_ConstantPoolGetStringAt(JNIEnv *env, jobject obj, jobject
   bounds_check(cp, index, CHECK_NULL);
   constantTag tag = cp->tag_at(index);
   if (!tag.is_string()) {
-    THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
+    THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
   }
   oop str = cp->string_at(index, CHECK_NULL);
   return (jstring) JNIHandles::make_local(THREAD, str);
@@ -2388,7 +2388,7 @@ JVM_ENTRY(jstring, JVM_ConstantPoolGetUTF8At(JNIEnv *env, jobject obj, jobject u
   bounds_check(cp, index, CHECK_NULL);
   constantTag tag = cp->tag_at(index);
   if (!tag.is_symbol()) {
-    THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
+    THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
   }
   Symbol* sym = cp->symbol_at(index);
   Handle str = java_lang_String::create_from_symbol(sym, CHECK_NULL);
@@ -3292,13 +3292,13 @@ JVM_END
 // resolve array handle and check arguments
 static inline arrayOop check_array(JNIEnv *env, jobject arr, bool type_array_only, TRAPS) {
   if (arr == nullptr) {
-    THROW_0(vmSymbols::java_lang_NullPointerException());
+    THROW_NULL(vmSymbols::java_lang_NullPointerException());
   }
   oop a = JNIHandles::resolve_non_null(arr);
   if (!a->is_array()) {
-    THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Argument is not an array");
+    THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "Argument is not an array");
   } else if (type_array_only && !a->is_typeArray()) {
-    THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Argument is not an array of primitive type");
+    THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "Argument is not an array of primitive type");
   }
   return arrayOop(a);
 }
@@ -3535,7 +3535,7 @@ JVM_ENTRY(jobject, JVM_InvokeMethod(JNIEnv *env, jobject method, jobject obj, jo
     }
     return res;
   } else {
-    THROW_0(vmSymbols::java_lang_StackOverflowError());
+    THROW_NULL(vmSymbols::java_lang_StackOverflowError());
   }
 JVM_END
 
diff --git a/src/hotspot/share/prims/nativeLookup.cpp b/src/hotspot/share/prims/nativeLookup.cpp
index e838c831ff1ab..78cf7481abfd0 100644
--- a/src/hotspot/share/prims/nativeLookup.cpp
+++ b/src/hotspot/share/prims/nativeLookup.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -414,7 +414,7 @@ address NativeLookup::lookup_base(const methodHandle& method, TRAPS) {
   ss.print("'");
   method->print_external_name(&ss);
   ss.print("'");
-  THROW_MSG_0(vmSymbols::java_lang_UnsatisfiedLinkError(), ss.as_string());
+  THROW_MSG_NULL(vmSymbols::java_lang_UnsatisfiedLinkError(), ss.as_string());
 }
 
 
diff --git a/src/hotspot/share/prims/perf.cpp b/src/hotspot/share/prims/perf.cpp
index 9ff831dded9fa..feef9760d8fdf 100644
--- a/src/hotspot/share/prims/perf.cpp
+++ b/src/hotspot/share/prims/perf.cpp
@@ -50,7 +50,7 @@ static char* jstr_to_utf(JNIEnv *env, jstring str, TRAPS) {
   char* utfstr = nullptr;
 
   if (str == nullptr) {
-    THROW_0(vmSymbols::java_lang_NullPointerException());
+    THROW_NULL(vmSymbols::java_lang_NullPointerException());
     //throw_new(env,"NullPointerException");
   }
 
@@ -113,7 +113,7 @@ PERF_ENTRY(jobject, Perf_CreateLong(JNIEnv *env, jobject perf, jstring name,
 
   if (units <= 0 || units > PerfData::U_Last) {
     debug_only(warning("unexpected units argument, units = %d", units));
-    THROW_0(vmSymbols::java_lang_IllegalArgumentException());
+    THROW_NULL(vmSymbols::java_lang_IllegalArgumentException());
   }
 
   ResourceMark rm;
@@ -128,7 +128,7 @@ PERF_ENTRY(jobject, Perf_CreateLong(JNIEnv *env, jobject perf, jstring name,
 
   // check that the PerfData name doesn't already exist
   if (PerfDataManager::exists(name_utf)) {
-    THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "PerfLong name already exists");
+    THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "PerfLong name already exists");
   }
 
   switch(variability) {
@@ -152,7 +152,7 @@ PERF_ENTRY(jobject, Perf_CreateLong(JNIEnv *env, jobject perf, jstring name,
 
   default: /* Illegal Argument */
     debug_only(warning("unexpected variability value: %d", variability));
-    THROW_0(vmSymbols::java_lang_IllegalArgumentException());
+    THROW_NULL(vmSymbols::java_lang_IllegalArgumentException());
     break;
   }
 
@@ -174,21 +174,21 @@ PERF_ENTRY(jobject, Perf_CreateByteArray(JNIEnv *env, jobject perf,
 
   // check for valid byte array objects
   if (name == nullptr || value == nullptr) {
-    THROW_0(vmSymbols::java_lang_NullPointerException());
+    THROW_NULL(vmSymbols::java_lang_NullPointerException());
   }
 
   // check for valid variability classification
   if (variability != PerfData::V_Constant &&
       variability != PerfData::V_Variable) {
     debug_only(warning("unexpected variability value: %d", variability));
-    THROW_0(vmSymbols::java_lang_IllegalArgumentException());
+    THROW_NULL(vmSymbols::java_lang_IllegalArgumentException());
   }
 
   // check for valid units
   if (units != PerfData::U_String) {
     // only String based ByteArray objects are currently supported
     debug_only(warning("unexpected units value: %d", variability));
-    THROW_0(vmSymbols::java_lang_IllegalArgumentException());
+    THROW_NULL(vmSymbols::java_lang_IllegalArgumentException());
   }
 
   int value_length;
@@ -211,7 +211,7 @@ PERF_ENTRY(jobject, Perf_CreateByteArray(JNIEnv *env, jobject perf,
 
   // check that the counter name doesn't already exist
   if (PerfDataManager::exists((char*)name_utf)) {
-    THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "PerfByteArray name already exists");
+    THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), "PerfByteArray name already exists");
   }
 
   PerfByteArray* pbv = nullptr;
diff --git a/src/hotspot/share/prims/unsafe.cpp b/src/hotspot/share/prims/unsafe.cpp
index 1be157b2e44eb..239ae480030f5 100644
--- a/src/hotspot/share/prims/unsafe.cpp
+++ b/src/hotspot/share/prims/unsafe.cpp
@@ -552,7 +552,7 @@ UNSAFE_ENTRY(jobject, Unsafe_StaticFieldBase0(JNIEnv *env, jobject unsafe, jobje
   int modifiers   = java_lang_reflect_Field::modifiers(reflected);
 
   if ((modifiers & JVM_ACC_STATIC) == 0) {
-    THROW_0(vmSymbols::java_lang_IllegalArgumentException());
+    THROW_NULL(vmSymbols::java_lang_IllegalArgumentException());
   }
 
   return JNIHandles::make_local(THREAD, mirror);
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index 43e47409c4cb6..6ee33a6107998 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -590,7 +590,7 @@ WB_ENTRY(jobject, WB_G1AuxiliaryMemoryUsage(JNIEnv* env))
     Handle h = MemoryService::create_MemoryUsage_obj(usage, CHECK_NULL);
     return JNIHandles::make_local(THREAD, h());
   }
-  THROW_MSG_0(vmSymbols::java_lang_UnsupportedOperationException(), "WB_G1AuxiliaryMemoryUsage: G1 GC is not enabled");
+  THROW_MSG_NULL(vmSymbols::java_lang_UnsupportedOperationException(), "WB_G1AuxiliaryMemoryUsage: G1 GC is not enabled");
 WB_END
 
 WB_ENTRY(jint, WB_G1ActiveMemoryNodeCount(JNIEnv* env, jobject o))

From 0d8ec42969fb60c140aaed7795ea1b9591915b8d Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Tue, 6 Aug 2024 06:59:11 +0000
Subject: [PATCH 318/401] 8337642: Remove unused APIs of GCPolicyCounters

Reviewed-by: tschatzl
---
 .../share/gc/parallel/gcAdaptivePolicyCounters.hpp  |  4 ----
 .../gc/parallel/psGCAdaptivePolicyCounters.hpp      |  4 ----
 src/hotspot/share/gc/serial/defNewGeneration.cpp    |  1 -
 src/hotspot/share/gc/shared/gcPolicyCounters.hpp    | 13 -------------
 4 files changed, 22 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/gcAdaptivePolicyCounters.hpp b/src/hotspot/share/gc/parallel/gcAdaptivePolicyCounters.hpp
index e83813c78f48f..e21d568955a38 100644
--- a/src/hotspot/share/gc/parallel/gcAdaptivePolicyCounters.hpp
+++ b/src/hotspot/share/gc/parallel/gcAdaptivePolicyCounters.hpp
@@ -223,10 +223,6 @@ class GCAdaptivePolicyCounters : public GCPolicyCounters {
   }
 
   void set_size_policy(AdaptiveSizePolicy* v) { _size_policy = v; }
-
-  virtual GCPolicyCounters::Name kind() const {
-    return GCPolicyCounters::GCAdaptivePolicyCountersKind;
-  }
 };
 
 #endif // SHARE_GC_PARALLEL_GCADAPTIVEPOLICYCOUNTERS_HPP
diff --git a/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp b/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp
index ad84eb4368b80..217cd7b9c5c36 100644
--- a/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp
+++ b/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp
@@ -180,10 +180,6 @@ class PSGCAdaptivePolicyCounters : public GCAdaptivePolicyCounters {
   // counter or from globals.  This is distinguished from counters
   // that are updated via input parameters.
   void update_counters();
-
-  virtual GCPolicyCounters::Name kind() const {
-    return GCPolicyCounters::PSGCAdaptivePolicyCountersKind;
-  }
 };
 
 #endif // SHARE_GC_PARALLEL_PSGCADAPTIVEPOLICYCOUNTERS_HPP
diff --git a/src/hotspot/share/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp
index 715b82fd38d32..e93b97c85eb12 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.cpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.cpp
@@ -833,7 +833,6 @@ void DefNewGeneration::gc_epilogue(bool full) {
   assert(!GCLocker::is_active(), "We should not be executing here");
   // update the generation and space performance counters
   update_counters();
-  SerialHeap::heap()->counters()->update_counters();
 }
 
 void DefNewGeneration::update_counters() {
diff --git a/src/hotspot/share/gc/shared/gcPolicyCounters.hpp b/src/hotspot/share/gc/shared/gcPolicyCounters.hpp
index a631664fcab93..9c7e5788a7eec 100644
--- a/src/hotspot/share/gc/shared/gcPolicyCounters.hpp
+++ b/src/hotspot/share/gc/shared/gcPolicyCounters.hpp
@@ -46,13 +46,6 @@ class GCPolicyCounters: public CHeapObj<mtGC> {
   const char* _name_space;
 
 public:
-  enum Name {
-    NONE,
-    GCPolicyCountersKind,
-    GCAdaptivePolicyCountersKind,
-    PSGCAdaptivePolicyCountersKind
-  };
-
   GCPolicyCounters(const char* name, int collectors, int generations);
 
   inline PerfVariable* tenuring_threshold() const  {
@@ -68,12 +61,6 @@ class GCPolicyCounters: public CHeapObj<mtGC> {
   }
 
   const char* name_space() const { return _name_space; }
-
-  virtual void update_counters() {}
-
-  virtual GCPolicyCounters::Name kind() const {
-    return GCPolicyCounters::GCPolicyCountersKind;
-  }
 };
 
 #endif // SHARE_GC_SHARED_GCPOLICYCOUNTERS_HPP

From f92c60e1a9968620cbc92b52aa546b57c09da487 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Tue, 6 Aug 2024 07:06:43 +0000
Subject: [PATCH 319/401] 8337810: ProblemList
 BasicDirectoryModel/LoaderThreadCount.java on Windows

Reviewed-by: clanger
---
 test/jdk/ProblemList.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index f8bdfd26e8f79..bd29d64addf04 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -640,6 +640,7 @@ javax/sound/sampled/Clip/ClipFlushCrash.java 8308395 linux-x64
 # jdk_swing
 
 javax/swing/plaf/basic/BasicTextUI/8001470/bug8001470.java 8233177 linux-all,windows-all
+javax/swing/plaf/basic/BasicDirectoryModel/LoaderThreadCount.java 8333880 windows-all
 
 javax/swing/JFrame/MaximizeWindowTest.java 8321289 linux-all
 javax/swing/JWindow/ShapedAndTranslucentWindows/ShapedTranslucentPerPixelTranslucentGradient.java 8233582 linux-all

From 958786b28ffb532b38746640b6fc11242f056ad9 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Tue, 6 Aug 2024 09:07:44 +0000
Subject: [PATCH 320/401] 8332522: SwitchBootstraps::mappedEnumLookup
 constructs unused array

Reviewed-by: liach, redestad
---
 .../java/lang/runtime/SwitchBootstraps.java   | 112 ++++++++++++------
 .../bench/java/lang/runtime/SwitchEnum.java   | 105 ++++++++++++++++
 2 files changed, 178 insertions(+), 39 deletions(-)
 create mode 100644 test/micro/org/openjdk/bench/java/lang/runtime/SwitchEnum.java

diff --git a/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java b/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java
index ccb33a0e4dbd1..43f7339c75a96 100644
--- a/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java
+++ b/src/java.base/share/classes/java/lang/runtime/SwitchBootstraps.java
@@ -56,6 +56,7 @@
 
 import static java.lang.invoke.MethodHandles.Lookup.ClassOption.NESTMATE;
 import static java.lang.invoke.MethodHandles.Lookup.ClassOption.STRONG;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import static java.util.Objects.requireNonNull;
@@ -95,19 +96,13 @@ private SwitchBootstraps() {}
     private static final ClassDesc CD_Objects = ReferenceClassDescImpl.ofValidated("Ljava/util/Objects;");
 
     private static class StaticHolders {
-        private static final MethodHandle NULL_CHECK;
-        private static final MethodHandle IS_ZERO;
-        private static final MethodHandle MAPPED_ENUM_LOOKUP;
+        private static final MethodHandle MAPPED_ENUM_SWITCH;
 
         static {
             try {
-                NULL_CHECK = LOOKUP.findStatic(Objects.class, "isNull",
-                                               MethodType.methodType(boolean.class, Object.class));
-                IS_ZERO = LOOKUP.findStatic(SwitchBootstraps.class, "isZero",
-                                               MethodType.methodType(boolean.class, int.class));
-                MAPPED_ENUM_LOOKUP = LOOKUP.findStatic(SwitchBootstraps.class, "mappedEnumLookup",
-                                                       MethodType.methodType(int.class, Enum.class, MethodHandles.Lookup.class,
-                                                                             Class.class, EnumDesc[].class, EnumMap.class));
+                MAPPED_ENUM_SWITCH = LOOKUP.findStatic(SwitchBootstraps.class, "mappedEnumSwitch",
+                                                       MethodType.methodType(int.class, Enum.class, int.class, MethodHandles.Lookup.class,
+                                                                             Class.class, EnumDesc[].class, MappedEnumCache.class));
             }
             catch (ReflectiveOperationException e) {
                 throw new ExceptionInInitializerError(e);
@@ -211,10 +206,6 @@ private static void verifyLabel(Object label, Class<?> selectorType) {
         }
     }
 
-    private static boolean isZero(int value) {
-        return value == 0;
-    }
-
     /**
      * Bootstrap method for linking an {@code invokedynamic} call site that
      * implements a {@code switch} on a target of an enum type. The static
@@ -286,23 +277,27 @@ public static CallSite enumSwitch(MethodHandles.Lookup lookup,
         labels = labels.clone();
 
         Class<?> enumClass = invocationType.parameterType(0);
-        labels = Stream.of(labels).map(l -> convertEnumConstants(lookup, enumClass, l)).toArray();
+        boolean constantsOnly = true;
+        int len = labels.length;
+
+        for (int i = 0; i < len; i++) {
+            Object convertedLabel =
+                    convertEnumConstants(lookup, enumClass, labels[i]);
+            labels[i] = convertedLabel;
+            if (constantsOnly)
+                constantsOnly = convertedLabel instanceof EnumDesc;
+        }
 
         MethodHandle target;
-        boolean constantsOnly = Stream.of(labels).allMatch(l -> enumClass.isAssignableFrom(EnumDesc.class));
 
         if (labels.length > 0 && constantsOnly) {
             //If all labels are enum constants, construct an optimized handle for repeat index 0:
             //if (selector == null) return -1
             //else if (idx == 0) return mappingArray[selector.ordinal()]; //mapping array created lazily
             //else return "typeSwitch(labels)"
-            MethodHandle body =
-                    MethodHandles.guardWithTest(MethodHandles.dropArguments(StaticHolders.NULL_CHECK, 0, int.class),
-                                                MethodHandles.dropArguments(MethodHandles.constant(int.class, -1), 0, int.class, Object.class),
-                                                MethodHandles.guardWithTest(MethodHandles.dropArguments(StaticHolders.IS_ZERO, 1, Object.class),
-                                                                            generateTypeSwitch(lookup, invocationType.parameterType(0), labels),
-                                                                            MethodHandles.insertArguments(StaticHolders.MAPPED_ENUM_LOOKUP, 1, lookup, enumClass, labels, new EnumMap())));
-            target = MethodHandles.permuteArguments(body, MethodType.methodType(int.class, Object.class, int.class), 1, 0);
+            EnumDesc<?>[] enumDescLabels =
+                    Arrays.copyOf(labels, labels.length, EnumDesc[].class);
+            target = MethodHandles.insertArguments(StaticHolders.MAPPED_ENUM_SWITCH, 2, lookup, enumClass, enumDescLabels, new MappedEnumCache());
         } else {
             target = generateTypeSwitch(lookup, invocationType.parameterType(0), labels);
         }
@@ -331,26 +326,63 @@ private static <E extends Enum<E>> Object convertEnumConstants(MethodHandles.Loo
         }
     }
 
-    private static <T extends Enum<T>> int mappedEnumLookup(T value, MethodHandles.Lookup lookup, Class<T> enumClass, EnumDesc<?>[] labels, EnumMap enumMap) {
-        if (enumMap.map == null) {
-            T[] constants = SharedSecrets.getJavaLangAccess().getEnumConstantsShared(enumClass);
-            int[] map = new int[constants.length];
-            int ordinal = 0;
-
-            for (T constant : constants) {
-                map[ordinal] = labels.length;
+    private static <T extends Enum<T>> int mappedEnumSwitch(T value, int restartIndex, MethodHandles.Lookup lookup, Class<T> enumClass, EnumDesc<?>[] labels, MappedEnumCache enumCache) throws Throwable {
+        if (value == null) {
+            return -1;
+        }
 
-                for (int i = 0; i < labels.length; i++) {
-                    if (Objects.equals(labels[i].constantName(), constant.name())) {
-                        map[ordinal] = i;
-                        break;
+        if (restartIndex != 0) {
+            MethodHandle generatedSwitch = enumCache.generatedSwitch;
+            if (generatedSwitch == null) {
+                synchronized (enumCache) {
+                    generatedSwitch = enumCache.generatedSwitch;
+
+                    if (generatedSwitch == null) {
+                        generatedSwitch =
+                                generateTypeSwitch(lookup, enumClass, labels)
+                                        .asType(MethodType.methodType(int.class,
+                                                                      Enum.class,
+                                                                      int.class));
+                        enumCache.generatedSwitch = generatedSwitch;
                     }
                 }
+            }
+
+            return (int) generatedSwitch.invokeExact(value, restartIndex);
+        }
+
+        int[] constantsMap = enumCache.constantsMap;
+
+        if (constantsMap == null) {
+            synchronized (enumCache) {
+                constantsMap = enumCache.constantsMap;
 
-                ordinal++;
+                if (constantsMap == null) {
+                    T[] constants = SharedSecrets.getJavaLangAccess()
+                                                 .getEnumConstantsShared(enumClass);
+                    constantsMap = new int[constants.length];
+                    int ordinal = 0;
+
+                    for (T constant : constants) {
+                        constantsMap[ordinal] = labels.length;
+
+                        for (int i = 0; i < labels.length; i++) {
+                            if (Objects.equals(labels[i].constantName(),
+                                               constant.name())) {
+                                constantsMap[ordinal] = i;
+                                break;
+                            }
+                        }
+
+                        ordinal++;
+                    }
+
+                    enumCache.constantsMap = constantsMap;
+                }
             }
         }
-        return enumMap.map[value.ordinal()];
+
+        return constantsMap[value.ordinal()];
     }
 
     private static final class ResolvedEnumLabels implements BiPredicate<Integer, Object> {
@@ -395,9 +427,11 @@ public boolean test(Integer labelIndex, Object value) {
         }
     }
 
-    private static final class EnumMap {
+    private static final class MappedEnumCache {
+        @Stable
+        public int[] constantsMap;
         @Stable
-        public int[] map;
+        public MethodHandle generatedSwitch;
     }
 
     /*
diff --git a/test/micro/org/openjdk/bench/java/lang/runtime/SwitchEnum.java b/test/micro/org/openjdk/bench/java/lang/runtime/SwitchEnum.java
new file mode 100644
index 0000000000000..bfec0d321b29d
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/runtime/SwitchEnum.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+package org.openjdk.bench.java.lang.runtime;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+
+import java.util.concurrent.TimeUnit;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+@Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
+@Measurement(iterations = 5, time = 2, timeUnit = TimeUnit.SECONDS)
+@Fork(3)
+public class SwitchEnum {
+
+    public E[] inputs;
+    @Setup
+    public void setup() {
+        inputs = E.values();
+    }
+
+    @Benchmark
+    public int enumSwitchWithBootstrap() {
+        int sum = 0;
+        for (E e : inputs) {
+            sum += switch (e) {
+                case null -> -1;
+                case E0 -> 10;
+                case E1 -> 11;
+                case E2 -> 12;
+                case E3 -> 13;
+                case E4 -> 14;
+                case E5 -> 15;
+                case E6 -> 16;
+                case E7 -> 17;
+                case E8 -> 18;
+                case E9 -> 19;
+                default -> 17;
+            };
+        }
+        return sum;
+    }
+
+    @Benchmark
+    public int enumSwitchTraditional() {
+        int sum = 0;
+        for (E e : inputs) {
+            sum += switch (e) {
+                case E0 -> 10;
+                case E1 -> 11;
+                case E2 -> 12;
+                case E3 -> 13;
+                case E4 -> 14;
+                case E5 -> 15;
+                case E6 -> 16;
+                case E7 -> 17;
+                case E8 -> 18;
+                case E9 -> 19;
+                default -> 17;
+            };
+        }
+        return sum;
+    }
+
+    public static void main(String[] args) {
+        SwitchEnum s = new SwitchEnum();
+        s.setup();
+        System.out.println(s.enumSwitchWithBootstrap());
+        System.out.println(s.enumSwitchTraditional());
+    }
+
+    enum E {
+        E0, E1, E2, E3, E4, E5, E6, E7, E8, E9;
+    }
+}

From f9b8a22062c7ad7ffb150394da6b3ab069785535 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Tue, 6 Aug 2024 09:28:12 +0000
Subject: [PATCH 321/401] 8337798: JFR: Remove
 jdk/jfr/api/consumer/recordingstream/TestOnEvent.java from ProblemList.txt

Reviewed-by: mgronlun
---
 test/jdk/ProblemList.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index bd29d64addf04..3211f27b5c1e4 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -744,7 +744,6 @@ jdk/jfr/event/runtime/TestResidentSetSizeEvent.java             8309846 aix-ppc6
 jdk/jfr/startupargs/TestStartName.java                          8214685 windows-x64
 jdk/jfr/startupargs/TestStartDuration.java                      8214685 windows-x64
 jdk/jfr/jvm/TestWaste.java                                      8282427 generic-all
-jdk/jfr/api/consumer/recordingstream/TestOnEvent.java           8255404 linux-x64,linux-aarch64
 
 ############################################################################
 

From a117945d5a704781944ae15c852c31d090f03adb Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Tue, 6 Aug 2024 09:37:21 +0000
Subject: [PATCH 322/401] 8337344: Redundant javadoc at
 RasterPrinterJob.isCancelled

Reviewed-by: aivanov, prr
---
 .../share/classes/sun/print/RasterPrinterJob.java           | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java b/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java
index 0dfa5e42d9a89..82f47824bfae7 100644
--- a/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java
+++ b/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java
@@ -2474,11 +2474,7 @@ public void cancel() {
         }
     }
 
-    /**
-     * Returns true is a print job is ongoing but will
-     * be cancelled and the next opportunity. false is
-     * returned otherwise.
-     */
+    @Override
     public boolean isCancelled() {
 
         boolean cancelled = false;

From ef909bdf7f08dfd67bac2665aa85f86c0e303db9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= <mgronlun@openjdk.org>
Date: Tue, 6 Aug 2024 11:32:24 +0000
Subject: [PATCH 323/401] 8335121: Native memory leak when not recording any
 events

Reviewed-by: egahlin, shade
---
 .../share/jfr/recorder/service/jfrRecorderService.cpp       | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp
index fc2043a4d921d..418b774996e4c 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp
@@ -639,11 +639,7 @@ static void write_thread_local_buffer(JfrChunkWriter& chunkwriter, Thread* t) {
 
 size_t JfrRecorderService::flush() {
   size_t total_elements = flush_metadata(_chunkwriter);
-  const size_t storage_elements = flush_storage(_storage, _chunkwriter);
-  if (0 == storage_elements) {
-    return total_elements;
-  }
-  total_elements += storage_elements;
+  total_elements += flush_storage(_storage, _chunkwriter);
   if (_string_pool.is_modified()) {
     total_elements += flush_stringpool(_string_pool, _chunkwriter);
   }

From 1348ece6df7b460501931533c238e819995a2086 Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Tue, 6 Aug 2024 11:34:57 +0000
Subject: [PATCH 324/401] 8332120: Potential compilation failure in
 istream.cpp:205 - loss of data on conversion

Reviewed-by: dholmes, iklam
---
 src/hotspot/share/utilities/istream.cpp | 8 +-------
 src/hotspot/share/utilities/istream.hpp | 2 --
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/hotspot/share/utilities/istream.cpp b/src/hotspot/share/utilities/istream.cpp
index cb082128c62ca..55fa443af69e9 100644
--- a/src/hotspot/share/utilities/istream.cpp
+++ b/src/hotspot/share/utilities/istream.cpp
@@ -78,7 +78,6 @@ bool inputStream::next() {
 void inputStream::set_done() {
   size_t end = _beg = _end = _content_end;
   _next = end + NEXT_PHANTOM;
-  _line_ending = 0;
   assert(definitely_done(), "");
 }
 
@@ -94,7 +93,6 @@ void inputStream::set_error(bool error_condition) {
 
 void inputStream::clear_buffer() {
   _content_end = _beg = _end = _next = 0;
-  _line_ending = 0;
 }
 
 const char* inputStream::next_content(size_t& next_content_length) const {
@@ -146,7 +144,6 @@ bool inputStream::fill_buffer() {
     else                { COV(FIB_L); }
     if (last_partial) {
       assert(have_current_line(), "");
-      _line_ending = 0;
       _content_end -= 1;  // reverse insertion of phantom newline
       assert(_next == _content_end + NEXT_PHANTOM, "");
       assert(have_current_line(), "");
@@ -224,7 +221,6 @@ void inputStream::set_buffer_content(size_t content_start,
   if (nl == nullptr) {
     COV(SBC_N);
     _next = _end = content_end;
-    _line_ending = 0;
     assert(need_to_read(), "");
   } else {
     COV(SBC_L);
@@ -247,7 +243,6 @@ void inputStream::set_buffer_content(size_t content_start,
       // accept '\r' before '\n'.
     }
     _end = end;  // now this->current_line() points to buf[beg..end]
-    _line_ending = (int)(_next - end);
     assert(have_current_line(), "");
     assert(current_line() == &_buffer[_beg], "");
     assert(current_line_length() == _end - _beg, "");
@@ -299,7 +294,7 @@ void inputStream::dump(const char* what) {
   bool ntr = (_next == _end),
        hcl = (_beg < _content_end && _end < _next),
        ddn = (_beg == _content_end && _next > _content_end);
-  tty->print_cr("%s%sistream %s%s%s%s%s [%d<%.*s>%d/%d..%d] LE=%d,"
+  tty->print_cr("%s%sistream %s%s%s%s%s [%d<%.*s>%d/%d..%d] "
                 " B=%llx%s[%d], LN=%d, CH=%d",
                 what ? what : "", what ? ": " : "",
                 _buffer == nullptr ? "U" : "",
@@ -312,7 +307,6 @@ void inputStream::dump(const char* what) {
                 diff < 0 ? 0 : diff > 10 ? 10 : diff,
                 _buffer ? &_buffer[_beg] : "",
                 (int)_end, (int)_next, (int)_content_end,
-                _line_ending,
                 (unsigned long long)(intptr_t)_buffer,
                 _buffer == _small_buffer ? "(SB)" : "",
                 (int)_buffer_size,
diff --git a/src/hotspot/share/utilities/istream.hpp b/src/hotspot/share/utilities/istream.hpp
index b6a58055b937c..dd12028185956 100644
--- a/src/hotspot/share/utilities/istream.hpp
+++ b/src/hotspot/share/utilities/istream.hpp
@@ -96,7 +96,6 @@ class inputStream : public CHeapObjBase {
 
   Input* _input;   // where the input comes from or else nullptr
   IState _input_state;  // one of {NTR,EOF,ERR}_STATE
-  char   _line_ending;  // one of {0,1,2} for "", "\n", "\r\n"
   char*  _buffer;       // scratch buffer holding at least the current line
   size_t _buffer_size;  // allocated size of buffer
   size_t _content_end;  // offset to end of valid contents of buffer
@@ -225,7 +224,6 @@ class inputStream : public CHeapObjBase {
   inputStream() :
     _input(nullptr),
     _input_state(IState::NTR_STATE),
-    _line_ending(0),
     _buffer(&_small_buffer[0]),
     _buffer_size(sizeof(_small_buffer)),
     _content_end(0),

From ab509f1b98329b1624a3111e226b640ee76f5969 Mon Sep 17 00:00:00 2001
From: Andrew Dinn <adinn@openjdk.org>
Date: Tue, 6 Aug 2024 13:22:55 +0000
Subject: [PATCH 325/401] 8337654: Relocate uncommon trap stub from
 SharedRuntime to OptoRuntime

Reviewed-by: kvn, vlivanov, fyang
---
 src/hotspot/cpu/aarch64/runtime_aarch64.cpp   | 343 ++++++++++++++++
 .../cpu/aarch64/sharedRuntime_aarch64.cpp     | 349 ----------------
 src/hotspot/cpu/arm/runtime_arm.cpp           | 141 ++++++-
 src/hotspot/cpu/arm/sharedRuntime_arm.cpp     | 141 -------
 src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp     |   4 +-
 src/hotspot/cpu/riscv/runtime_riscv.cpp       | 382 ++++++++++++++++++
 src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp | 343 ----------------
 src/hotspot/cpu/s390/sharedRuntime_s390.cpp   |   4 +-
 src/hotspot/cpu/x86/runtime_x86_32.cpp        | 174 ++++++++
 src/hotspot/cpu/x86/runtime_x86_64.cpp        | 327 ++++++++++++++-
 src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp  | 177 --------
 src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp  | 327 ---------------
 src/hotspot/share/opto/graphKit.cpp           |   2 +-
 src/hotspot/share/opto/lcm.cpp                |   2 +-
 src/hotspot/share/opto/library_call.cpp       |   2 +-
 src/hotspot/share/opto/loopnode.cpp           |   2 +-
 src/hotspot/share/opto/matcher.cpp            |   2 +-
 src/hotspot/share/opto/runtime.cpp            |   4 +-
 src/hotspot/share/opto/runtime.hpp            |   4 +
 src/hotspot/share/opto/stringopts.cpp         |   2 +-
 src/hotspot/share/runtime/sharedRuntime.cpp   |   8 -
 src/hotspot/share/runtime/sharedRuntime.hpp   |   9 -
 22 files changed, 1378 insertions(+), 1371 deletions(-)
 create mode 100644 src/hotspot/cpu/riscv/runtime_riscv.cpp

diff --git a/src/hotspot/cpu/aarch64/runtime_aarch64.cpp b/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
index 61d27e3224248..09bb370f210f7 100644
--- a/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
@@ -36,6 +36,349 @@
 #include "runtime/vframeArray.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "vmreg_aarch64.inline.hpp"
+
+class SimpleRuntimeFrame {
+
+  public:
+
+  // Most of the runtime stubs have this simple frame layout.
+  // This class exists to make the layout shared in one place.
+  // Offsets are for compiler stack slots, which are jints.
+  enum layout {
+    // The frame sender code expects that rbp will be in the "natural" place and
+    // will override any oopMap setting for it. We must therefore force the layout
+    // so that it agrees with the frame sender code.
+    // we don't expect any arg reg save area so aarch64 asserts that
+    // frame::arg_reg_save_area_bytes == 0
+    rfp_off = 0,
+    rfp_off2,
+    return_off, return_off2,
+    framesize
+  };
+};
+
+#define __ masm->
+
+//------------------------------generate_uncommon_trap_blob--------------------
+void OptoRuntime::generate_uncommon_trap_blob() {
+  // Allocate space for the code
+  ResourceMark rm;
+  // Setup code generation tools
+  CodeBuffer buffer("uncommon_trap_blob", 2048, 1024);
+  MacroAssembler* masm = new MacroAssembler(&buffer);
+
+  assert(SimpleRuntimeFrame::framesize % 4 == 0, "sp not 16-byte aligned");
+
+  address start = __ pc();
+
+  // Push self-frame.  We get here with a return address in LR
+  // and sp should be 16 byte aligned
+  // push rfp and retaddr by hand
+  __ protect_return_address();
+  __ stp(rfp, lr, Address(__ pre(sp, -2 * wordSize)));
+  // we don't expect an arg reg save area
+#ifndef PRODUCT
+  assert(frame::arg_reg_save_area_bytes == 0, "not expecting frame reg save area");
+#endif
+  // compiler left unloaded_class_index in j_rarg0 move to where the
+  // runtime expects it.
+  if (c_rarg1 != j_rarg0) {
+    __ movw(c_rarg1, j_rarg0);
+  }
+
+  // we need to set the past SP to the stack pointer of the stub frame
+  // and the pc to the address where this runtime call will return
+  // although actually any pc in this code blob will do).
+  Label retaddr;
+  __ set_last_Java_frame(sp, noreg, retaddr, rscratch1);
+
+  // Call C code.  Need thread but NOT official VM entry
+  // crud.  We cannot block on this call, no GC can happen.  Call should
+  // capture callee-saved registers as well as return values.
+  //
+  // UnrollBlock* uncommon_trap(JavaThread* thread, jint unloaded_class_index);
+  //
+  // n.b. 2 gp args, 0 fp args, integral return type
+
+  __ mov(c_rarg0, rthread);
+  __ movw(c_rarg2, (unsigned)Deoptimization::Unpack_uncommon_trap);
+  __ lea(rscratch1,
+         RuntimeAddress(CAST_FROM_FN_PTR(address,
+                                         Deoptimization::uncommon_trap)));
+  __ blr(rscratch1);
+  __ bind(retaddr);
+
+  // Set an oopmap for the call site
+  OopMapSet* oop_maps = new OopMapSet();
+  OopMap* map = new OopMap(SimpleRuntimeFrame::framesize, 0);
+
+  // location of rfp is known implicitly by the frame sender code
+
+  oop_maps->add_gc_map(__ pc() - start, map);
+
+  __ reset_last_Java_frame(false);
+
+  // move UnrollBlock* into r4
+  __ mov(r4, r0);
+
+#ifdef ASSERT
+  { Label L;
+    __ ldrw(rscratch1, Address(r4, Deoptimization::UnrollBlock::unpack_kind_offset()));
+    __ cmpw(rscratch1, (unsigned)Deoptimization::Unpack_uncommon_trap);
+    __ br(Assembler::EQ, L);
+    __ stop("OptoRuntime::generate_uncommon_trap_blob: expected Unpack_uncommon_trap");
+    __ bind(L);
+  }
+#endif
+
+  // Pop all the frames we must move/replace.
+  //
+  // Frame picture (youngest to oldest)
+  // 1: self-frame (no frame link)
+  // 2: deopting frame  (no frame link)
+  // 3: caller of deopting frame (could be compiled/interpreted).
+
+  // Pop self-frame.  We have no frame, and must rely only on r0 and sp.
+  __ add(sp, sp, (SimpleRuntimeFrame::framesize) << LogBytesPerInt); // Epilog!
+
+  // Pop deoptimized frame (int)
+  __ ldrw(r2, Address(r4,
+                      Deoptimization::UnrollBlock::
+                      size_of_deoptimized_frame_offset()));
+  __ sub(r2, r2, 2 * wordSize);
+  __ add(sp, sp, r2);
+  __ ldp(rfp, zr, __ post(sp, 2 * wordSize));
+
+#ifdef ASSERT
+  // Compilers generate code that bang the stack by as much as the
+  // interpreter would need. So this stack banging should never
+  // trigger a fault. Verify that it does not on non product builds.
+  __ ldrw(r1, Address(r4,
+                      Deoptimization::UnrollBlock::
+                      total_frame_sizes_offset()));
+  __ bang_stack_size(r1, r2);
+#endif
+
+  // Load address of array of frame pcs into r2 (address*)
+  __ ldr(r2, Address(r4,
+                     Deoptimization::UnrollBlock::frame_pcs_offset()));
+
+  // Load address of array of frame sizes into r5 (intptr_t*)
+  __ ldr(r5, Address(r4,
+                     Deoptimization::UnrollBlock::
+                     frame_sizes_offset()));
+
+  // Counter
+  __ ldrw(r3, Address(r4,
+                      Deoptimization::UnrollBlock::
+                      number_of_frames_offset())); // (int)
+
+  // Now adjust the caller's stack to make up for the extra locals but
+  // record the original sp so that we can save it in the skeletal
+  // interpreter frame and the stack walking of interpreter_sender
+  // will get the unextended sp value and not the "real" sp value.
+
+  const Register sender_sp = r8;
+
+  __ mov(sender_sp, sp);
+  __ ldrw(r1, Address(r4,
+                      Deoptimization::UnrollBlock::
+                      caller_adjustment_offset())); // (int)
+  __ sub(sp, sp, r1);
+
+  // Push interpreter frames in a loop
+  Label loop;
+  __ bind(loop);
+  __ ldr(r1, Address(r5, 0));       // Load frame size
+  __ sub(r1, r1, 2 * wordSize);     // We'll push pc and rfp by hand
+  __ ldr(lr, Address(r2, 0));       // Save return address
+  __ enter();                       // and old rfp & set new rfp
+  __ sub(sp, sp, r1);               // Prolog
+  __ str(sender_sp, Address(rfp, frame::interpreter_frame_sender_sp_offset * wordSize)); // Make it walkable
+  // This value is corrected by layout_activation_impl
+  __ str(zr, Address(rfp, frame::interpreter_frame_last_sp_offset * wordSize));
+  __ mov(sender_sp, sp);          // Pass sender_sp to next frame
+  __ add(r5, r5, wordSize);       // Bump array pointer (sizes)
+  __ add(r2, r2, wordSize);       // Bump array pointer (pcs)
+  __ subsw(r3, r3, 1);            // Decrement counter
+  __ br(Assembler::GT, loop);
+  __ ldr(lr, Address(r2, 0));     // save final return address
+  // Re-push self-frame
+  __ enter();                     // & old rfp & set new rfp
+
+  // Use rfp because the frames look interpreted now
+  // Save "the_pc" since it cannot easily be retrieved using the last_java_SP after we aligned SP.
+  // Don't need the precise return PC here, just precise enough to point into this code blob.
+  address the_pc = __ pc();
+  __ set_last_Java_frame(sp, rfp, the_pc, rscratch1);
+
+  // Call C code.  Need thread but NOT official VM entry
+  // crud.  We cannot block on this call, no GC can happen.  Call should
+  // restore return values to their stack-slots with the new SP.
+  // Thread is in rdi already.
+  //
+  // BasicType unpack_frames(JavaThread* thread, int exec_mode);
+  //
+  // n.b. 2 gp args, 0 fp args, integral return type
+
+  // sp should already be aligned
+  __ mov(c_rarg0, rthread);
+  __ movw(c_rarg1, (unsigned)Deoptimization::Unpack_uncommon_trap);
+  __ lea(rscratch1, RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::unpack_frames)));
+  __ blr(rscratch1);
+
+  // Set an oopmap for the call site
+  // Use the same PC we used for the last java frame
+  oop_maps->add_gc_map(the_pc - start, new OopMap(SimpleRuntimeFrame::framesize, 0));
+
+  // Clear fp AND pc
+  __ reset_last_Java_frame(true);
+
+  // Pop self-frame.
+  __ leave();                 // Epilog
+
+  // Jump to interpreter
+  __ ret(lr);
+
+  // Make sure all code is generated
+  masm->flush();
+
+  _uncommon_trap_blob =  UncommonTrapBlob::create(&buffer, oop_maps,
+                                                 SimpleRuntimeFrame::framesize >> 1);
+}
+
+//------------------------------generate_exception_blob---------------------------
+// creates exception blob at the end
+// Using exception blob, this code is jumped from a compiled method.
+// (see emit_exception_handler in aarch64.ad file)
+//
+// Given an exception pc at a call we call into the runtime for the
+// handler in this method. This handler might merely restore state
+// (i.e. callee save registers) unwind the frame and jump to the
+// exception handler for the nmethod if there is no Java level handler
+// for the nmethod.
+//
+// This code is entered with a jmp.
+//
+// Arguments:
+//   r0: exception oop
+//   r3: exception pc
+//
+// Results:
+//   r0: exception oop
+//   r3: exception pc in caller or ???
+//   destination: exception handler of caller
+//
+// Note: the exception pc MUST be at a call (precise debug information)
+//       Registers r0, r3, r2, r4, r5, r8-r11 are not callee saved.
+//
+
+void OptoRuntime::generate_exception_blob() {
+  assert(!OptoRuntime::is_callee_saved_register(R3_num), "");
+  assert(!OptoRuntime::is_callee_saved_register(R0_num), "");
+  assert(!OptoRuntime::is_callee_saved_register(R2_num), "");
+
+  assert(SimpleRuntimeFrame::framesize % 4 == 0, "sp not 16-byte aligned");
+
+  // Allocate space for the code
+  ResourceMark rm;
+  // Setup code generation tools
+  CodeBuffer buffer("exception_blob", 2048, 1024);
+  MacroAssembler* masm = new MacroAssembler(&buffer);
+
+  // TODO check various assumptions made here
+  //
+  // make sure we do so before running this
+
+  address start = __ pc();
+
+  // push rfp and retaddr by hand
+  // Exception pc is 'return address' for stack walker
+  __ protect_return_address();
+  __ stp(rfp, lr, Address(__ pre(sp, -2 * wordSize)));
+  // there are no callee save registers and we don't expect an
+  // arg reg save area
+#ifndef PRODUCT
+  assert(frame::arg_reg_save_area_bytes == 0, "not expecting frame reg save area");
+#endif
+  // Store exception in Thread object. We cannot pass any arguments to the
+  // handle_exception call, since we do not want to make any assumption
+  // about the size of the frame where the exception happened in.
+  __ str(r0, Address(rthread, JavaThread::exception_oop_offset()));
+  __ str(r3, Address(rthread, JavaThread::exception_pc_offset()));
+
+  // This call does all the hard work.  It checks if an exception handler
+  // exists in the method.
+  // If so, it returns the handler address.
+  // If not, it prepares for stack-unwinding, restoring the callee-save
+  // registers of the frame being removed.
+  //
+  // address OptoRuntime::handle_exception_C(JavaThread* thread)
+  //
+  // n.b. 1 gp arg, 0 fp args, integral return type
+
+  // the stack should always be aligned
+  address the_pc = __ pc();
+  __ set_last_Java_frame(sp, noreg, the_pc, rscratch1);
+  __ mov(c_rarg0, rthread);
+  __ lea(rscratch1, RuntimeAddress(CAST_FROM_FN_PTR(address, OptoRuntime::handle_exception_C)));
+  __ blr(rscratch1);
+  // handle_exception_C is a special VM call which does not require an explicit
+  // instruction sync afterwards.
+
+  // May jump to SVE compiled code
+  __ reinitialize_ptrue();
+
+  // Set an oopmap for the call site.  This oopmap will only be used if we
+  // are unwinding the stack.  Hence, all locations will be dead.
+  // Callee-saved registers will be the same as the frame above (i.e.,
+  // handle_exception_stub), since they were restored when we got the
+  // exception.
+
+  OopMapSet* oop_maps = new OopMapSet();
+
+  oop_maps->add_gc_map(the_pc - start, new OopMap(SimpleRuntimeFrame::framesize, 0));
+
+  __ reset_last_Java_frame(false);
+
+  // Restore callee-saved registers
+
+  // rfp is an implicitly saved callee saved register (i.e. the calling
+  // convention will save restore it in prolog/epilog) Other than that
+  // there are no callee save registers now that adapter frames are gone.
+  // and we dont' expect an arg reg save area
+  __ ldp(rfp, r3, Address(__ post(sp, 2 * wordSize)));
+  __ authenticate_return_address(r3);
+
+  // r0: exception handler
+
+  // We have a handler in r0 (could be deopt blob).
+  __ mov(r8, r0);
+
+  // Get the exception oop
+  __ ldr(r0, Address(rthread, JavaThread::exception_oop_offset()));
+  // Get the exception pc in case we are deoptimized
+  __ ldr(r4, Address(rthread, JavaThread::exception_pc_offset()));
+#ifdef ASSERT
+  __ str(zr, Address(rthread, JavaThread::exception_handler_pc_offset()));
+  __ str(zr, Address(rthread, JavaThread::exception_pc_offset()));
 #endif
+  // Clear the exception oop so GC no longer processes it as a root.
+  __ str(zr, Address(rthread, JavaThread::exception_oop_offset()));
+
+  // r0: exception oop
+  // r8:  exception handler
+  // r4: exception pc
+  // Jump to handler
+
+  __ br(r8);
+
+  // Make sure all code is generated
+  masm->flush();
+
+  // Set exception blob
+  _exception_blob =  ExceptionBlob::create(&buffer, oop_maps, SimpleRuntimeFrame::framesize >> 1);
+}
+#endif // COMPILER2
 
 
diff --git a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
index bb2554e65ce83..65c026b95abbd 100644
--- a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
@@ -68,26 +68,6 @@
 
 const int StackAlignmentInSlots = StackAlignmentInBytes / VMRegImpl::stack_slot_size;
 
-class SimpleRuntimeFrame {
-
-  public:
-
-  // Most of the runtime stubs have this simple frame layout.
-  // This class exists to make the layout shared in one place.
-  // Offsets are for compiler stack slots, which are jints.
-  enum layout {
-    // The frame sender code expects that rbp will be in the "natural" place and
-    // will override any oopMap setting for it. We must therefore force the layout
-    // so that it agrees with the frame sender code.
-    // we don't expect any arg reg save area so aarch64 asserts that
-    // frame::arg_reg_save_area_bytes == 0
-    rfp_off = 0,
-    rfp_off2,
-    return_off, return_off2,
-    framesize
-  };
-};
-
 // FIXME -- this is used by C1
 class RegisterSaver {
   const bool _save_vectors;
@@ -2581,197 +2561,6 @@ uint SharedRuntime::out_preserve_stack_slots() {
   return 0;
 }
 
-#ifdef COMPILER2
-//------------------------------generate_uncommon_trap_blob--------------------
-void SharedRuntime::generate_uncommon_trap_blob() {
-  // Allocate space for the code
-  ResourceMark rm;
-  // Setup code generation tools
-  CodeBuffer buffer("uncommon_trap_blob", 2048, 1024);
-  MacroAssembler* masm = new MacroAssembler(&buffer);
-
-  assert(SimpleRuntimeFrame::framesize % 4 == 0, "sp not 16-byte aligned");
-
-  address start = __ pc();
-
-  // Push self-frame.  We get here with a return address in LR
-  // and sp should be 16 byte aligned
-  // push rfp and retaddr by hand
-  __ protect_return_address();
-  __ stp(rfp, lr, Address(__ pre(sp, -2 * wordSize)));
-  // we don't expect an arg reg save area
-#ifndef PRODUCT
-  assert(frame::arg_reg_save_area_bytes == 0, "not expecting frame reg save area");
-#endif
-  // compiler left unloaded_class_index in j_rarg0 move to where the
-  // runtime expects it.
-  if (c_rarg1 != j_rarg0) {
-    __ movw(c_rarg1, j_rarg0);
-  }
-
-  // we need to set the past SP to the stack pointer of the stub frame
-  // and the pc to the address where this runtime call will return
-  // although actually any pc in this code blob will do).
-  Label retaddr;
-  __ set_last_Java_frame(sp, noreg, retaddr, rscratch1);
-
-  // Call C code.  Need thread but NOT official VM entry
-  // crud.  We cannot block on this call, no GC can happen.  Call should
-  // capture callee-saved registers as well as return values.
-  // Thread is in rdi already.
-  //
-  // UnrollBlock* uncommon_trap(JavaThread* thread, jint unloaded_class_index);
-  //
-  // n.b. 2 gp args, 0 fp args, integral return type
-
-  __ mov(c_rarg0, rthread);
-  __ movw(c_rarg2, (unsigned)Deoptimization::Unpack_uncommon_trap);
-  __ lea(rscratch1,
-         RuntimeAddress(CAST_FROM_FN_PTR(address,
-                                         Deoptimization::uncommon_trap)));
-  __ blr(rscratch1);
-  __ bind(retaddr);
-
-  // Set an oopmap for the call site
-  OopMapSet* oop_maps = new OopMapSet();
-  OopMap* map = new OopMap(SimpleRuntimeFrame::framesize, 0);
-
-  // location of rfp is known implicitly by the frame sender code
-
-  oop_maps->add_gc_map(__ pc() - start, map);
-
-  __ reset_last_Java_frame(false);
-
-  // move UnrollBlock* into r4
-  __ mov(r4, r0);
-
-#ifdef ASSERT
-  { Label L;
-    __ ldrw(rscratch1, Address(r4, Deoptimization::UnrollBlock::unpack_kind_offset()));
-    __ cmpw(rscratch1, (unsigned)Deoptimization::Unpack_uncommon_trap);
-    __ br(Assembler::EQ, L);
-    __ stop("SharedRuntime::generate_uncommon_trap_blob: expected Unpack_uncommon_trap");
-    __ bind(L);
-  }
-#endif
-
-  // Pop all the frames we must move/replace.
-  //
-  // Frame picture (youngest to oldest)
-  // 1: self-frame (no frame link)
-  // 2: deopting frame  (no frame link)
-  // 3: caller of deopting frame (could be compiled/interpreted).
-
-  // Pop self-frame.  We have no frame, and must rely only on r0 and sp.
-  __ add(sp, sp, (SimpleRuntimeFrame::framesize) << LogBytesPerInt); // Epilog!
-
-  // Pop deoptimized frame (int)
-  __ ldrw(r2, Address(r4,
-                      Deoptimization::UnrollBlock::
-                      size_of_deoptimized_frame_offset()));
-  __ sub(r2, r2, 2 * wordSize);
-  __ add(sp, sp, r2);
-  __ ldp(rfp, zr, __ post(sp, 2 * wordSize));
-
-#ifdef ASSERT
-  // Compilers generate code that bang the stack by as much as the
-  // interpreter would need. So this stack banging should never
-  // trigger a fault. Verify that it does not on non product builds.
-  __ ldrw(r1, Address(r4,
-                      Deoptimization::UnrollBlock::
-                      total_frame_sizes_offset()));
-  __ bang_stack_size(r1, r2);
-#endif
-
-  // Load address of array of frame pcs into r2 (address*)
-  __ ldr(r2, Address(r4,
-                     Deoptimization::UnrollBlock::frame_pcs_offset()));
-
-  // Load address of array of frame sizes into r5 (intptr_t*)
-  __ ldr(r5, Address(r4,
-                     Deoptimization::UnrollBlock::
-                     frame_sizes_offset()));
-
-  // Counter
-  __ ldrw(r3, Address(r4,
-                      Deoptimization::UnrollBlock::
-                      number_of_frames_offset())); // (int)
-
-  // Now adjust the caller's stack to make up for the extra locals but
-  // record the original sp so that we can save it in the skeletal
-  // interpreter frame and the stack walking of interpreter_sender
-  // will get the unextended sp value and not the "real" sp value.
-
-  const Register sender_sp = r8;
-
-  __ mov(sender_sp, sp);
-  __ ldrw(r1, Address(r4,
-                      Deoptimization::UnrollBlock::
-                      caller_adjustment_offset())); // (int)
-  __ sub(sp, sp, r1);
-
-  // Push interpreter frames in a loop
-  Label loop;
-  __ bind(loop);
-  __ ldr(r1, Address(r5, 0));       // Load frame size
-  __ sub(r1, r1, 2 * wordSize);     // We'll push pc and rfp by hand
-  __ ldr(lr, Address(r2, 0));       // Save return address
-  __ enter();                       // and old rfp & set new rfp
-  __ sub(sp, sp, r1);               // Prolog
-  __ str(sender_sp, Address(rfp, frame::interpreter_frame_sender_sp_offset * wordSize)); // Make it walkable
-  // This value is corrected by layout_activation_impl
-  __ str(zr, Address(rfp, frame::interpreter_frame_last_sp_offset * wordSize));
-  __ mov(sender_sp, sp);          // Pass sender_sp to next frame
-  __ add(r5, r5, wordSize);       // Bump array pointer (sizes)
-  __ add(r2, r2, wordSize);       // Bump array pointer (pcs)
-  __ subsw(r3, r3, 1);            // Decrement counter
-  __ br(Assembler::GT, loop);
-  __ ldr(lr, Address(r2, 0));     // save final return address
-  // Re-push self-frame
-  __ enter();                     // & old rfp & set new rfp
-
-  // Use rfp because the frames look interpreted now
-  // Save "the_pc" since it cannot easily be retrieved using the last_java_SP after we aligned SP.
-  // Don't need the precise return PC here, just precise enough to point into this code blob.
-  address the_pc = __ pc();
-  __ set_last_Java_frame(sp, rfp, the_pc, rscratch1);
-
-  // Call C code.  Need thread but NOT official VM entry
-  // crud.  We cannot block on this call, no GC can happen.  Call should
-  // restore return values to their stack-slots with the new SP.
-  // Thread is in rdi already.
-  //
-  // BasicType unpack_frames(JavaThread* thread, int exec_mode);
-  //
-  // n.b. 2 gp args, 0 fp args, integral return type
-
-  // sp should already be aligned
-  __ mov(c_rarg0, rthread);
-  __ movw(c_rarg1, (unsigned)Deoptimization::Unpack_uncommon_trap);
-  __ lea(rscratch1, RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::unpack_frames)));
-  __ blr(rscratch1);
-
-  // Set an oopmap for the call site
-  // Use the same PC we used for the last java frame
-  oop_maps->add_gc_map(the_pc - start, new OopMap(SimpleRuntimeFrame::framesize, 0));
-
-  // Clear fp AND pc
-  __ reset_last_Java_frame(true);
-
-  // Pop self-frame.
-  __ leave();                 // Epilog
-
-  // Jump to interpreter
-  __ ret(lr);
-
-  // Make sure all code is generated
-  masm->flush();
-
-  _uncommon_trap_blob =  UncommonTrapBlob::create(&buffer, oop_maps,
-                                                 SimpleRuntimeFrame::framesize >> 1);
-}
-#endif // COMPILER2
-
 
 //------------------------------generate_handler_blob------
 //
@@ -2983,141 +2772,3 @@ RuntimeStub* SharedRuntime::generate_resolve_blob(address destination, const cha
   // frame_size_words or bytes??
   return RuntimeStub::new_runtime_stub(name, &buffer, frame_complete, frame_size_in_words, oop_maps, true);
 }
-
-#ifdef COMPILER2
-// This is here instead of runtime_aarch64_64.cpp because it uses SimpleRuntimeFrame
-//
-//------------------------------generate_exception_blob---------------------------
-// creates exception blob at the end
-// Using exception blob, this code is jumped from a compiled method.
-// (see emit_exception_handler in x86_64.ad file)
-//
-// Given an exception pc at a call we call into the runtime for the
-// handler in this method. This handler might merely restore state
-// (i.e. callee save registers) unwind the frame and jump to the
-// exception handler for the nmethod if there is no Java level handler
-// for the nmethod.
-//
-// This code is entered with a jmp.
-//
-// Arguments:
-//   r0: exception oop
-//   r3: exception pc
-//
-// Results:
-//   r0: exception oop
-//   r3: exception pc in caller or ???
-//   destination: exception handler of caller
-//
-// Note: the exception pc MUST be at a call (precise debug information)
-//       Registers r0, r3, r2, r4, r5, r8-r11 are not callee saved.
-//
-
-void OptoRuntime::generate_exception_blob() {
-  assert(!OptoRuntime::is_callee_saved_register(R3_num), "");
-  assert(!OptoRuntime::is_callee_saved_register(R0_num), "");
-  assert(!OptoRuntime::is_callee_saved_register(R2_num), "");
-
-  assert(SimpleRuntimeFrame::framesize % 4 == 0, "sp not 16-byte aligned");
-
-  // Allocate space for the code
-  ResourceMark rm;
-  // Setup code generation tools
-  CodeBuffer buffer("exception_blob", 2048, 1024);
-  MacroAssembler* masm = new MacroAssembler(&buffer);
-
-  // TODO check various assumptions made here
-  //
-  // make sure we do so before running this
-
-  address start = __ pc();
-
-  // push rfp and retaddr by hand
-  // Exception pc is 'return address' for stack walker
-  __ protect_return_address();
-  __ stp(rfp, lr, Address(__ pre(sp, -2 * wordSize)));
-  // there are no callee save registers and we don't expect an
-  // arg reg save area
-#ifndef PRODUCT
-  assert(frame::arg_reg_save_area_bytes == 0, "not expecting frame reg save area");
-#endif
-  // Store exception in Thread object. We cannot pass any arguments to the
-  // handle_exception call, since we do not want to make any assumption
-  // about the size of the frame where the exception happened in.
-  __ str(r0, Address(rthread, JavaThread::exception_oop_offset()));
-  __ str(r3, Address(rthread, JavaThread::exception_pc_offset()));
-
-  // This call does all the hard work.  It checks if an exception handler
-  // exists in the method.
-  // If so, it returns the handler address.
-  // If not, it prepares for stack-unwinding, restoring the callee-save
-  // registers of the frame being removed.
-  //
-  // address OptoRuntime::handle_exception_C(JavaThread* thread)
-  //
-  // n.b. 1 gp arg, 0 fp args, integral return type
-
-  // the stack should always be aligned
-  address the_pc = __ pc();
-  __ set_last_Java_frame(sp, noreg, the_pc, rscratch1);
-  __ mov(c_rarg0, rthread);
-  __ lea(rscratch1, RuntimeAddress(CAST_FROM_FN_PTR(address, OptoRuntime::handle_exception_C)));
-  __ blr(rscratch1);
-  // handle_exception_C is a special VM call which does not require an explicit
-  // instruction sync afterwards.
-
-  // May jump to SVE compiled code
-  __ reinitialize_ptrue();
-
-  // Set an oopmap for the call site.  This oopmap will only be used if we
-  // are unwinding the stack.  Hence, all locations will be dead.
-  // Callee-saved registers will be the same as the frame above (i.e.,
-  // handle_exception_stub), since they were restored when we got the
-  // exception.
-
-  OopMapSet* oop_maps = new OopMapSet();
-
-  oop_maps->add_gc_map(the_pc - start, new OopMap(SimpleRuntimeFrame::framesize, 0));
-
-  __ reset_last_Java_frame(false);
-
-  // Restore callee-saved registers
-
-  // rfp is an implicitly saved callee saved register (i.e. the calling
-  // convention will save restore it in prolog/epilog) Other than that
-  // there are no callee save registers now that adapter frames are gone.
-  // and we dont' expect an arg reg save area
-  __ ldp(rfp, r3, Address(__ post(sp, 2 * wordSize)));
-  __ authenticate_return_address(r3);
-
-  // r0: exception handler
-
-  // We have a handler in r0 (could be deopt blob).
-  __ mov(r8, r0);
-
-  // Get the exception oop
-  __ ldr(r0, Address(rthread, JavaThread::exception_oop_offset()));
-  // Get the exception pc in case we are deoptimized
-  __ ldr(r4, Address(rthread, JavaThread::exception_pc_offset()));
-#ifdef ASSERT
-  __ str(zr, Address(rthread, JavaThread::exception_handler_pc_offset()));
-  __ str(zr, Address(rthread, JavaThread::exception_pc_offset()));
-#endif
-  // Clear the exception oop so GC no longer processes it as a root.
-  __ str(zr, Address(rthread, JavaThread::exception_oop_offset()));
-
-  // r0: exception oop
-  // r8:  exception handler
-  // r4: exception pc
-  // Jump to handler
-
-  __ br(r8);
-
-  // Make sure all code is generated
-  masm->flush();
-
-  // Set exception blob
-  _exception_blob =  ExceptionBlob::create(&buffer, oop_maps, SimpleRuntimeFrame::framesize >> 1);
-}
-
-#endif // COMPILER2
diff --git a/src/hotspot/cpu/arm/runtime_arm.cpp b/src/hotspot/cpu/arm/runtime_arm.cpp
index 94a9ef553c75e..6f6c0c17e000d 100644
--- a/src/hotspot/cpu/arm/runtime_arm.cpp
+++ b/src/hotspot/cpu/arm/runtime_arm.cpp
@@ -37,10 +37,146 @@
 #include "runtime/vframeArray.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "vmreg_arm.inline.hpp"
-#endif
 
 #define __ masm->
 
+//------------------------------generate_uncommon_trap_blob--------------------
+// Ought to generate an ideal graph & compile, but here's some ASM
+// instead.
+void OptoRuntime::generate_uncommon_trap_blob() {
+  // allocate space for the code
+  ResourceMark rm;
+
+  // setup code generation tools
+#ifdef _LP64
+  CodeBuffer buffer("uncommon_trap_blob", 2700, 512);
+#else
+  // Measured 8/7/03 at 660 in 32bit debug build
+  CodeBuffer buffer("uncommon_trap_blob", 2000, 512);
+#endif
+  // bypassed when code generation useless
+  MacroAssembler* masm               = new MacroAssembler(&buffer);
+  const Register Rublock = R6;
+  const Register Rsender = altFP_7_11;
+  assert_different_registers(Rublock, Rsender, Rexception_obj, R0, R1, R2, R3, R8, Rtemp);
+
+  //
+  // This is the entry point for all traps the compiler takes when it thinks
+  // it cannot handle further execution of compilation code. The frame is
+  // deoptimized in these cases and converted into interpreter frames for
+  // execution
+  // The steps taken by this frame are as follows:
+  //   - push a fake "unpack_frame"
+  //   - call the C routine Deoptimization::uncommon_trap (this function
+  //     packs the current compiled frame into vframe arrays and returns
+  //     information about the number and size of interpreter frames which
+  //     are equivalent to the frame which is being deoptimized)
+  //   - deallocate the "unpack_frame"
+  //   - deallocate the deoptimization frame
+  //   - in a loop using the information returned in the previous step
+  //     push interpreter frames;
+  //   - create a dummy "unpack_frame"
+  //   - call the C routine: Deoptimization::unpack_frames (this function
+  //     lays out values on the interpreter frame which was just created)
+  //   - deallocate the dummy unpack_frame
+  //   - return to the interpreter entry point
+  //
+  //  Refer to the following methods for more information:
+  //   - Deoptimization::uncommon_trap
+  //   - Deoptimization::unpack_frame
+
+  // the unloaded class index is in R0 (first parameter to this blob)
+
+  __ raw_push(FP, LR);
+  __ set_last_Java_frame(SP, FP, false, Rtemp);
+  __ mov(R2, Deoptimization::Unpack_uncommon_trap);
+  __ mov(R1, R0);
+  __ mov(R0, Rthread);
+  __ call(CAST_FROM_FN_PTR(address, Deoptimization::uncommon_trap));
+  __ mov(Rublock, R0);
+  __ reset_last_Java_frame(Rtemp);
+  __ raw_pop(FP, LR);
+
+#ifdef ASSERT
+  { Label L;
+    __ ldr_s32(Rtemp, Address(Rublock, Deoptimization::UnrollBlock::unpack_kind_offset()));
+    __ cmp_32(Rtemp, Deoptimization::Unpack_uncommon_trap);
+    __ b(L, eq);
+    __ stop("OptoRuntime::generate_uncommon_trap_blob: expected Unpack_uncommon_trap");
+    __ bind(L);
+  }
+#endif
+
+
+  // Set initial stack state before pushing interpreter frames
+  __ ldr_s32(Rtemp, Address(Rublock, Deoptimization::UnrollBlock::size_of_deoptimized_frame_offset()));
+  __ ldr(R2, Address(Rublock, Deoptimization::UnrollBlock::frame_pcs_offset()));
+  __ ldr(R3, Address(Rublock, Deoptimization::UnrollBlock::frame_sizes_offset()));
+
+  __ add(SP, SP, Rtemp);
+
+  // See if it is enough stack to push deoptimized frames.
+#ifdef ASSERT
+  // Compilers generate code that bang the stack by as much as the
+  // interpreter would need. So this stack banging should never
+  // trigger a fault. Verify that it does not on non product builds.
+  //
+  // The compiled method that we are deoptimizing was popped from the stack.
+  // If the stack bang results in a stack overflow, we don't return to the
+  // method that is being deoptimized. The stack overflow exception is
+  // propagated to the caller of the deoptimized method. Need to get the pc
+  // from the caller in LR and restore FP.
+  __ ldr(LR, Address(R2, 0));
+  __ ldr(FP, Address(Rublock, Deoptimization::UnrollBlock::initial_info_offset()));
+  __ ldr_s32(R8, Address(Rublock, Deoptimization::UnrollBlock::total_frame_sizes_offset()));
+  __ arm_stack_overflow_check(R8, Rtemp);
+#endif
+  __ ldr_s32(R8, Address(Rublock, Deoptimization::UnrollBlock::number_of_frames_offset()));
+  __ ldr_s32(Rtemp, Address(Rublock, Deoptimization::UnrollBlock::caller_adjustment_offset()));
+  __ mov(Rsender, SP);
+  __ sub(SP, SP, Rtemp);
+  //  __ ldr(FP, Address(FP));
+  __ ldr(FP, Address(Rublock, Deoptimization::UnrollBlock::initial_info_offset()));
+
+  // Push interpreter frames in a loop
+  Label loop;
+  __ bind(loop);
+  __ ldr(LR, Address(R2, wordSize, post_indexed));         // load frame pc
+  __ ldr(Rtemp, Address(R3, wordSize, post_indexed));      // load frame size
+
+  __ raw_push(FP, LR);                                     // create new frame
+  __ mov(FP, SP);
+  __ sub(Rtemp, Rtemp, 2*wordSize);
+
+  __ sub(SP, SP, Rtemp);
+
+  __ str(Rsender, Address(FP, frame::interpreter_frame_sender_sp_offset * wordSize));
+  __ mov(LR, 0);
+  __ str(LR, Address(FP, frame::interpreter_frame_last_sp_offset * wordSize));
+  __ subs(R8, R8, 1);                               // decrement counter
+  __ mov(Rsender, SP);
+  __ b(loop, ne);
+
+  // Re-push self-frame
+  __ ldr(LR, Address(R2));
+  __ raw_push(FP, LR);
+  __ mov(FP, SP);
+
+  // Call unpack_frames with proper arguments
+  __ mov(R0, Rthread);
+  __ mov(R1, Deoptimization::Unpack_uncommon_trap);
+  __ set_last_Java_frame(SP, FP, true, Rtemp);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, Deoptimization::unpack_frames));
+  //  oop_maps->add_gc_map(__ pc() - start, new OopMap(frame_size_in_words, 0));
+  __ reset_last_Java_frame(Rtemp);
+
+  __ mov(SP, FP);
+  __ pop(RegisterSet(FP) | RegisterSet(PC));
+
+  masm->flush();
+  _uncommon_trap_blob = UncommonTrapBlob::create(&buffer, nullptr, 2 /* LR+FP */);
+}
+
 //------------------------------ generate_exception_blob ---------------------------
 // creates exception blob at the end
 // Using exception blob, this code is jumped from a compiled method.
@@ -148,3 +284,6 @@ void OptoRuntime::generate_exception_blob() {
 
   _exception_blob = ExceptionBlob::create(&buffer, oop_maps, framesize_in_words);
 }
+
+#endif // COMPILER2
+
diff --git a/src/hotspot/cpu/arm/sharedRuntime_arm.cpp b/src/hotspot/cpu/arm/sharedRuntime_arm.cpp
index 3792fab082ba6..1305283aeaeba 100644
--- a/src/hotspot/cpu/arm/sharedRuntime_arm.cpp
+++ b/src/hotspot/cpu/arm/sharedRuntime_arm.cpp
@@ -1595,147 +1595,6 @@ void SharedRuntime::generate_deopt_blob() {
   _deopt_blob->set_unpack_with_exception_in_tls_offset(exception_in_tls_offset);
 }
 
-#ifdef COMPILER2
-
-//------------------------------generate_uncommon_trap_blob--------------------
-// Ought to generate an ideal graph & compile, but here's some ASM
-// instead.
-void SharedRuntime::generate_uncommon_trap_blob() {
-  // allocate space for the code
-  ResourceMark rm;
-
-  // setup code generation tools
-#ifdef _LP64
-  CodeBuffer buffer("uncommon_trap_blob", 2700, 512);
-#else
-  // Measured 8/7/03 at 660 in 32bit debug build
-  CodeBuffer buffer("uncommon_trap_blob", 2000, 512);
-#endif
-  // bypassed when code generation useless
-  MacroAssembler* masm               = new MacroAssembler(&buffer);
-  const Register Rublock = R6;
-  const Register Rsender = altFP_7_11;
-  assert_different_registers(Rublock, Rsender, Rexception_obj, R0, R1, R2, R3, R8, Rtemp);
-
-  //
-  // This is the entry point for all traps the compiler takes when it thinks
-  // it cannot handle further execution of compilation code. The frame is
-  // deoptimized in these cases and converted into interpreter frames for
-  // execution
-  // The steps taken by this frame are as follows:
-  //   - push a fake "unpack_frame"
-  //   - call the C routine Deoptimization::uncommon_trap (this function
-  //     packs the current compiled frame into vframe arrays and returns
-  //     information about the number and size of interpreter frames which
-  //     are equivalent to the frame which is being deoptimized)
-  //   - deallocate the "unpack_frame"
-  //   - deallocate the deoptimization frame
-  //   - in a loop using the information returned in the previous step
-  //     push interpreter frames;
-  //   - create a dummy "unpack_frame"
-  //   - call the C routine: Deoptimization::unpack_frames (this function
-  //     lays out values on the interpreter frame which was just created)
-  //   - deallocate the dummy unpack_frame
-  //   - return to the interpreter entry point
-  //
-  //  Refer to the following methods for more information:
-  //   - Deoptimization::uncommon_trap
-  //   - Deoptimization::unpack_frame
-
-  // the unloaded class index is in R0 (first parameter to this blob)
-
-  __ raw_push(FP, LR);
-  __ set_last_Java_frame(SP, FP, false, Rtemp);
-  __ mov(R2, Deoptimization::Unpack_uncommon_trap);
-  __ mov(R1, R0);
-  __ mov(R0, Rthread);
-  __ call(CAST_FROM_FN_PTR(address, Deoptimization::uncommon_trap));
-  __ mov(Rublock, R0);
-  __ reset_last_Java_frame(Rtemp);
-  __ raw_pop(FP, LR);
-
-#ifdef ASSERT
-  { Label L;
-    __ ldr_s32(Rtemp, Address(Rublock, Deoptimization::UnrollBlock::unpack_kind_offset()));
-    __ cmp_32(Rtemp, Deoptimization::Unpack_uncommon_trap);
-    __ b(L, eq);
-    __ stop("SharedRuntime::generate_uncommon_trap_blob: expected Unpack_uncommon_trap");
-    __ bind(L);
-  }
-#endif
-
-
-  // Set initial stack state before pushing interpreter frames
-  __ ldr_s32(Rtemp, Address(Rublock, Deoptimization::UnrollBlock::size_of_deoptimized_frame_offset()));
-  __ ldr(R2, Address(Rublock, Deoptimization::UnrollBlock::frame_pcs_offset()));
-  __ ldr(R3, Address(Rublock, Deoptimization::UnrollBlock::frame_sizes_offset()));
-
-  __ add(SP, SP, Rtemp);
-
-  // See if it is enough stack to push deoptimized frames.
-#ifdef ASSERT
-  // Compilers generate code that bang the stack by as much as the
-  // interpreter would need. So this stack banging should never
-  // trigger a fault. Verify that it does not on non product builds.
-  //
-  // The compiled method that we are deoptimizing was popped from the stack.
-  // If the stack bang results in a stack overflow, we don't return to the
-  // method that is being deoptimized. The stack overflow exception is
-  // propagated to the caller of the deoptimized method. Need to get the pc
-  // from the caller in LR and restore FP.
-  __ ldr(LR, Address(R2, 0));
-  __ ldr(FP, Address(Rublock, Deoptimization::UnrollBlock::initial_info_offset()));
-  __ ldr_s32(R8, Address(Rublock, Deoptimization::UnrollBlock::total_frame_sizes_offset()));
-  __ arm_stack_overflow_check(R8, Rtemp);
-#endif
-  __ ldr_s32(R8, Address(Rublock, Deoptimization::UnrollBlock::number_of_frames_offset()));
-  __ ldr_s32(Rtemp, Address(Rublock, Deoptimization::UnrollBlock::caller_adjustment_offset()));
-  __ mov(Rsender, SP);
-  __ sub(SP, SP, Rtemp);
-  //  __ ldr(FP, Address(FP));
-  __ ldr(FP, Address(Rublock, Deoptimization::UnrollBlock::initial_info_offset()));
-
-  // Push interpreter frames in a loop
-  Label loop;
-  __ bind(loop);
-  __ ldr(LR, Address(R2, wordSize, post_indexed));         // load frame pc
-  __ ldr(Rtemp, Address(R3, wordSize, post_indexed));      // load frame size
-
-  __ raw_push(FP, LR);                                     // create new frame
-  __ mov(FP, SP);
-  __ sub(Rtemp, Rtemp, 2*wordSize);
-
-  __ sub(SP, SP, Rtemp);
-
-  __ str(Rsender, Address(FP, frame::interpreter_frame_sender_sp_offset * wordSize));
-  __ mov(LR, 0);
-  __ str(LR, Address(FP, frame::interpreter_frame_last_sp_offset * wordSize));
-  __ subs(R8, R8, 1);                               // decrement counter
-  __ mov(Rsender, SP);
-  __ b(loop, ne);
-
-  // Re-push self-frame
-  __ ldr(LR, Address(R2));
-  __ raw_push(FP, LR);
-  __ mov(FP, SP);
-
-  // Call unpack_frames with proper arguments
-  __ mov(R0, Rthread);
-  __ mov(R1, Deoptimization::Unpack_uncommon_trap);
-  __ set_last_Java_frame(SP, FP, true, Rtemp);
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, Deoptimization::unpack_frames));
-  //  oop_maps->add_gc_map(__ pc() - start, new OopMap(frame_size_in_words, 0));
-  __ reset_last_Java_frame(Rtemp);
-
-  __ mov(SP, FP);
-  __ pop(RegisterSet(FP) | RegisterSet(PC));
-
-  masm->flush();
-  _uncommon_trap_blob = UncommonTrapBlob::create(&buffer, nullptr, 2 /* LR+FP */);
-}
-
-#endif // COMPILER2
-
 //------------------------------generate_handler_blob------
 //
 // Generate a special Compile2Runtime blob that saves all registers,
diff --git a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
index 9b5a86bc45bfd..505f67ab6f952 100644
--- a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
+++ b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
@@ -3078,7 +3078,7 @@ void SharedRuntime::generate_deopt_blob() {
 }
 
 #ifdef COMPILER2
-void SharedRuntime::generate_uncommon_trap_blob() {
+void OptoRuntime::generate_uncommon_trap_blob() {
   // Allocate space for the code.
   ResourceMark rm;
   // Setup code generation tools.
@@ -3144,7 +3144,7 @@ void SharedRuntime::generate_uncommon_trap_blob() {
 #ifdef ASSERT
   __ lwz(R22_tmp2, in_bytes(Deoptimization::UnrollBlock::unpack_kind_offset()), unroll_block_reg);
   __ cmpdi(CCR0, R22_tmp2, (unsigned)Deoptimization::Unpack_uncommon_trap);
-  __ asm_assert_eq("SharedRuntime::generate_deopt_blob: expected Unpack_uncommon_trap");
+  __ asm_assert_eq("OptoRuntime::generate_uncommon_trap_blob: expected Unpack_uncommon_trap");
 #endif
 
   // Freezing continuation frames requires that the caller is trimmed to unextended sp if compiled.
diff --git a/src/hotspot/cpu/riscv/runtime_riscv.cpp b/src/hotspot/cpu/riscv/runtime_riscv.cpp
new file mode 100644
index 0000000000000..9e16278c3b547
--- /dev/null
+++ b/src/hotspot/cpu/riscv/runtime_riscv.cpp
@@ -0,0 +1,382 @@
+/*
+ * Copyright (c) 2024, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 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.
+ *
+ */
+
+#include "precompiled.hpp"
+#ifdef COMPILER2
+#include "asm/macroAssembler.hpp"
+#include "asm/macroAssembler.inline.hpp"
+#include "code/vmreg.hpp"
+#include "interpreter/interpreter.hpp"
+#include "opto/runtime.hpp"
+#include "runtime/interfaceSupport.inline.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "runtime/stubRoutines.hpp"
+#include "runtime/vframeArray.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "vmreg_riscv.inline.hpp"
+
+class SimpleRuntimeFrame {
+public:
+
+  // Most of the runtime stubs have this simple frame layout.
+  // This class exists to make the layout shared in one place.
+  // Offsets are for compiler stack slots, which are jints.
+  enum layout {
+    // The frame sender code expects that fp will be in the "natural" place and
+    // will override any oopMap setting for it. We must therefore force the layout
+    // so that it agrees with the frame sender code.
+    // we don't expect any arg reg save area so riscv asserts that
+    // frame::arg_reg_save_area_bytes == 0
+    fp_off = 0, fp_off2,
+    return_off, return_off2,
+    framesize
+  };
+};
+
+#define __ masm->
+
+//------------------------------generate_uncommon_trap_blob--------------------
+void OptoRuntime::generate_uncommon_trap_blob() {
+  // Allocate space for the code
+  ResourceMark rm;
+  // Setup code generation tools
+  CodeBuffer buffer("uncommon_trap_blob", 2048, 1024);
+  MacroAssembler* masm = new MacroAssembler(&buffer);
+  assert_cond(masm != nullptr);
+
+  assert(SimpleRuntimeFrame::framesize % 4 == 0, "sp not 16-byte aligned");
+
+  address start = __ pc();
+
+  // Push self-frame.  We get here with a return address in RA
+  // and sp should be 16 byte aligned
+  // push fp and retaddr by hand
+  __ addi(sp, sp, -2 * wordSize);
+  __ sd(ra, Address(sp, wordSize));
+  __ sd(fp, Address(sp, 0));
+  // we don't expect an arg reg save area
+#ifndef PRODUCT
+  assert(frame::arg_reg_save_area_bytes == 0, "not expecting frame reg save area");
+#endif
+  // compiler left unloaded_class_index in j_rarg0 move to where the
+  // runtime expects it.
+  __ sign_extend(c_rarg1, j_rarg0, 32);
+
+  // we need to set the past SP to the stack pointer of the stub frame
+  // and the pc to the address where this runtime call will return
+  // although actually any pc in this code blob will do).
+  Label retaddr;
+  __ set_last_Java_frame(sp, noreg, retaddr, t0);
+
+  // Call C code.  Need thread but NOT official VM entry
+  // crud.  We cannot block on this call, no GC can happen.  Call should
+  // capture callee-saved registers as well as return values.
+  //
+  // UnrollBlock* uncommon_trap(JavaThread* thread, jint unloaded_class_index, jint exec_mode)
+  //
+  // n.b. 3 gp args, 0 fp args, integral return type
+
+  __ mv(c_rarg0, xthread);
+  __ mv(c_rarg2, Deoptimization::Unpack_uncommon_trap);
+  __ rt_call(CAST_FROM_FN_PTR(address, Deoptimization::uncommon_trap));
+  __ bind(retaddr);
+
+  // Set an oopmap for the call site
+  OopMapSet* oop_maps = new OopMapSet();
+  OopMap* map = new OopMap(SimpleRuntimeFrame::framesize, 0);
+  assert_cond(oop_maps != nullptr && map != nullptr);
+
+  // location of fp is known implicitly by the frame sender code
+
+  oop_maps->add_gc_map(__ pc() - start, map);
+
+  __ reset_last_Java_frame(false);
+
+  // move UnrollBlock* into x14
+  __ mv(x14, x10);
+
+#ifdef ASSERT
+  { Label L;
+    __ lwu(t0, Address(x14, Deoptimization::UnrollBlock::unpack_kind_offset()));
+    __ mv(t1, Deoptimization::Unpack_uncommon_trap);
+    __ beq(t0, t1, L);
+    __ stop("OptoRuntime::generate_uncommon_trap_blob: expected Unpack_uncommon_trap");
+    __ bind(L);
+  }
+#endif
+
+  // Pop all the frames we must move/replace.
+  //
+  // Frame picture (youngest to oldest)
+  // 1: self-frame (no frame link)
+  // 2: deopting frame  (no frame link)
+  // 3: caller of deopting frame (could be compiled/interpreted).
+
+  __ add(sp, sp, (SimpleRuntimeFrame::framesize) << LogBytesPerInt); // Epilog!
+
+  // Pop deoptimized frame (int)
+  __ lwu(x12, Address(x14,
+                      Deoptimization::UnrollBlock::
+                      size_of_deoptimized_frame_offset()));
+  __ sub(x12, x12, 2 * wordSize);
+  __ add(sp, sp, x12);
+  __ ld(fp, Address(sp, 0));
+  __ ld(ra, Address(sp, wordSize));
+  __ addi(sp, sp, 2 * wordSize);
+  // RA should now be the return address to the caller (3) frame
+
+#ifdef ASSERT
+  // Compilers generate code that bang the stack by as much as the
+  // interpreter would need. So this stack banging should never
+  // trigger a fault. Verify that it does not on non product builds.
+  __ lwu(x11, Address(x14,
+                      Deoptimization::UnrollBlock::
+                      total_frame_sizes_offset()));
+  __ bang_stack_size(x11, x12);
+#endif
+
+  // Load address of array of frame pcs into x12 (address*)
+  __ ld(x12, Address(x14,
+                     Deoptimization::UnrollBlock::frame_pcs_offset()));
+
+  // Load address of array of frame sizes into x15 (intptr_t*)
+  __ ld(x15, Address(x14,
+                     Deoptimization::UnrollBlock::
+                     frame_sizes_offset()));
+
+  // Counter
+  __ lwu(x13, Address(x14,
+                      Deoptimization::UnrollBlock::
+                      number_of_frames_offset())); // (int)
+
+  // Now adjust the caller's stack to make up for the extra locals but
+  // record the original sp so that we can save it in the skeletal
+  // interpreter frame and the stack walking of interpreter_sender
+  // will get the unextended sp value and not the "real" sp value.
+
+  const Register sender_sp = t1; // temporary register
+
+  __ lwu(x11, Address(x14,
+                      Deoptimization::UnrollBlock::
+                      caller_adjustment_offset())); // (int)
+  __ mv(sender_sp, sp);
+  __ sub(sp, sp, x11);
+
+  // Push interpreter frames in a loop
+  Label loop;
+  __ bind(loop);
+  __ ld(x11, Address(x15, 0));       // Load frame size
+  __ sub(x11, x11, 2 * wordSize);    // We'll push pc and fp by hand
+  __ ld(ra, Address(x12, 0));        // Save return address
+  __ enter();                        // and old fp & set new fp
+  __ sub(sp, sp, x11);               // Prolog
+  __ sd(sender_sp, Address(fp, frame::interpreter_frame_sender_sp_offset * wordSize)); // Make it walkable
+  // This value is corrected by layout_activation_impl
+  __ sd(zr, Address(fp, frame::interpreter_frame_last_sp_offset * wordSize));
+  __ mv(sender_sp, sp);              // Pass sender_sp to next frame
+  __ add(x15, x15, wordSize);        // Bump array pointer (sizes)
+  __ add(x12, x12, wordSize);        // Bump array pointer (pcs)
+  __ subw(x13, x13, 1);              // Decrement counter
+  __ bgtz(x13, loop);
+  __ ld(ra, Address(x12, 0));        // save final return address
+  // Re-push self-frame
+  __ enter();                        // & old fp & set new fp
+
+  // Use fp because the frames look interpreted now
+  // Save "the_pc" since it cannot easily be retrieved using the last_java_SP after we aligned SP.
+  // Don't need the precise return PC here, just precise enough to point into this code blob.
+  address the_pc = __ pc();
+  __ set_last_Java_frame(sp, fp, the_pc, t0);
+
+  // Call C code.  Need thread but NOT official VM entry
+  // crud.  We cannot block on this call, no GC can happen.  Call should
+  // restore return values to their stack-slots with the new SP.
+  //
+  // BasicType unpack_frames(JavaThread* thread, int exec_mode)
+  //
+
+  // n.b. 2 gp args, 0 fp args, integral return type
+
+  // sp should already be aligned
+  __ mv(c_rarg0, xthread);
+  __ mv(c_rarg1, Deoptimization::Unpack_uncommon_trap);
+  __ rt_call(CAST_FROM_FN_PTR(address, Deoptimization::unpack_frames));
+
+  // Set an oopmap for the call site
+  // Use the same PC we used for the last java frame
+  oop_maps->add_gc_map(the_pc - start, new OopMap(SimpleRuntimeFrame::framesize, 0));
+
+  // Clear fp AND pc
+  __ reset_last_Java_frame(true);
+
+  // Pop self-frame.
+  __ leave();                 // Epilog
+
+  // Jump to interpreter
+  __ ret();
+
+  // Make sure all code is generated
+  masm->flush();
+
+  _uncommon_trap_blob =  UncommonTrapBlob::create(&buffer, oop_maps,
+                                                  SimpleRuntimeFrame::framesize >> 1);
+}
+
+//------------------------------generate_exception_blob---------------------------
+// creates exception blob at the end
+// Using exception blob, this code is jumped from a compiled method.
+// (see emit_exception_handler in riscv.ad file)
+//
+// Given an exception pc at a call we call into the runtime for the
+// handler in this method. This handler might merely restore state
+// (i.e. callee save registers) unwind the frame and jump to the
+// exception handler for the nmethod if there is no Java level handler
+// for the nmethod.
+//
+// This code is entered with a jmp.
+//
+// Arguments:
+//   x10: exception oop
+//   x13: exception pc
+//
+// Results:
+//   x10: exception oop
+//   x13: exception pc in caller
+//   destination: exception handler of caller
+//
+// Note: the exception pc MUST be at a call (precise debug information)
+//       Registers x10, x13, x12, x14, x15, t0 are not callee saved.
+//
+
+void OptoRuntime::generate_exception_blob() {
+  assert(!OptoRuntime::is_callee_saved_register(R13_num), "");
+  assert(!OptoRuntime::is_callee_saved_register(R10_num), "");
+  assert(!OptoRuntime::is_callee_saved_register(R12_num), "");
+
+  assert(SimpleRuntimeFrame::framesize % 4 == 0, "sp not 16-byte aligned");
+
+  // Allocate space for the code
+  ResourceMark rm;
+  // Setup code generation tools
+  CodeBuffer buffer("exception_blob", 2048, 1024);
+  MacroAssembler* masm = new MacroAssembler(&buffer);
+  assert_cond(masm != nullptr);
+
+  // TODO check various assumptions made here
+  //
+  // make sure we do so before running this
+
+  address start = __ pc();
+
+  // push fp and retaddr by hand
+  // Exception pc is 'return address' for stack walker
+  __ addi(sp, sp, -2 * wordSize);
+  __ sd(ra, Address(sp, wordSize));
+  __ sd(fp, Address(sp));
+  // there are no callee save registers and we don't expect an
+  // arg reg save area
+#ifndef PRODUCT
+  assert(frame::arg_reg_save_area_bytes == 0, "not expecting frame reg save area");
+#endif
+  // Store exception in Thread object. We cannot pass any arguments to the
+  // handle_exception call, since we do not want to make any assumption
+  // about the size of the frame where the exception happened in.
+  __ sd(x10, Address(xthread, JavaThread::exception_oop_offset()));
+  __ sd(x13, Address(xthread, JavaThread::exception_pc_offset()));
+
+  // This call does all the hard work.  It checks if an exception handler
+  // exists in the method.
+  // If so, it returns the handler address.
+  // If not, it prepares for stack-unwinding, restoring the callee-save
+  // registers of the frame being removed.
+  //
+  // address OptoRuntime::handle_exception_C(JavaThread* thread)
+  //
+  // n.b. 1 gp arg, 0 fp args, integral return type
+
+  // the stack should always be aligned
+  address the_pc = __ pc();
+  __ set_last_Java_frame(sp, noreg, the_pc, t0);
+  __ mv(c_rarg0, xthread);
+  __ rt_call(CAST_FROM_FN_PTR(address, OptoRuntime::handle_exception_C));
+
+  // handle_exception_C is a special VM call which does not require an explicit
+  // instruction sync afterwards.
+
+  // Set an oopmap for the call site.  This oopmap will only be used if we
+  // are unwinding the stack.  Hence, all locations will be dead.
+  // Callee-saved registers will be the same as the frame above (i.e.,
+  // handle_exception_stub), since they were restored when we got the
+  // exception.
+
+  OopMapSet* oop_maps = new OopMapSet();
+  assert_cond(oop_maps != nullptr);
+
+  oop_maps->add_gc_map(the_pc - start, new OopMap(SimpleRuntimeFrame::framesize, 0));
+
+  __ reset_last_Java_frame(false);
+
+  // Restore callee-saved registers
+
+  // fp is an implicitly saved callee saved register (i.e. the calling
+  // convention will save restore it in prolog/epilog) Other than that
+  // there are no callee save registers now that adapter frames are gone.
+  // and we dont' expect an arg reg save area
+  __ ld(fp, Address(sp));
+  __ ld(x13, Address(sp, wordSize));
+  __ addi(sp, sp , 2 * wordSize);
+
+  // x10: exception handler
+
+  // We have a handler in x10 (could be deopt blob).
+  __ mv(t0, x10);
+
+  // Get the exception oop
+  __ ld(x10, Address(xthread, JavaThread::exception_oop_offset()));
+  // Get the exception pc in case we are deoptimized
+  __ ld(x14, Address(xthread, JavaThread::exception_pc_offset()));
+#ifdef ASSERT
+  __ sd(zr, Address(xthread, JavaThread::exception_handler_pc_offset()));
+  __ sd(zr, Address(xthread, JavaThread::exception_pc_offset()));
+#endif
+  // Clear the exception oop so GC no longer processes it as a root.
+  __ sd(zr, Address(xthread, JavaThread::exception_oop_offset()));
+
+  // x10: exception oop
+  // t0:  exception handler
+  // x14: exception pc
+  // Jump to handler
+
+  __ jr(t0);
+
+  // Make sure all code is generated
+  masm->flush();
+
+  // Set exception blob
+  _exception_blob =  ExceptionBlob::create(&buffer, oop_maps, SimpleRuntimeFrame::framesize >> 1);
+}
+#endif // COMPILER2
+
+
diff --git a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
index 01ab3d5c27403..ad06f688d6a36 100644
--- a/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
+++ b/src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
@@ -67,24 +67,6 @@
 
 const int StackAlignmentInSlots = StackAlignmentInBytes / VMRegImpl::stack_slot_size;
 
-class SimpleRuntimeFrame {
-public:
-
-  // Most of the runtime stubs have this simple frame layout.
-  // This class exists to make the layout shared in one place.
-  // Offsets are for compiler stack slots, which are jints.
-  enum layout {
-    // The frame sender code expects that fp will be in the "natural" place and
-    // will override any oopMap setting for it. We must therefore force the layout
-    // so that it agrees with the frame sender code.
-    // we don't expect any arg reg save area so riscv asserts that
-    // frame::arg_reg_save_area_bytes == 0
-    fp_off = 0, fp_off2,
-    return_off, return_off2,
-    framesize
-  };
-};
-
 class RegisterSaver {
   const bool _save_vectors;
  public:
@@ -2441,195 +2423,6 @@ uint SharedRuntime::out_preserve_stack_slots() {
   return 0;
 }
 
-#ifdef COMPILER2
-//------------------------------generate_uncommon_trap_blob--------------------
-void SharedRuntime::generate_uncommon_trap_blob() {
-  // Allocate space for the code
-  ResourceMark rm;
-  // Setup code generation tools
-  CodeBuffer buffer("uncommon_trap_blob", 2048, 1024);
-  MacroAssembler* masm = new MacroAssembler(&buffer);
-  assert_cond(masm != nullptr);
-
-  assert(SimpleRuntimeFrame::framesize % 4 == 0, "sp not 16-byte aligned");
-
-  address start = __ pc();
-
-  // Push self-frame.  We get here with a return address in RA
-  // and sp should be 16 byte aligned
-  // push fp and retaddr by hand
-  __ addi(sp, sp, -2 * wordSize);
-  __ sd(ra, Address(sp, wordSize));
-  __ sd(fp, Address(sp, 0));
-  // we don't expect an arg reg save area
-#ifndef PRODUCT
-  assert(frame::arg_reg_save_area_bytes == 0, "not expecting frame reg save area");
-#endif
-  // compiler left unloaded_class_index in j_rarg0 move to where the
-  // runtime expects it.
-  __ sign_extend(c_rarg1, j_rarg0, 32);
-
-  // we need to set the past SP to the stack pointer of the stub frame
-  // and the pc to the address where this runtime call will return
-  // although actually any pc in this code blob will do).
-  Label retaddr;
-  __ set_last_Java_frame(sp, noreg, retaddr, t0);
-
-  // Call C code.  Need thread but NOT official VM entry
-  // crud.  We cannot block on this call, no GC can happen.  Call should
-  // capture callee-saved registers as well as return values.
-  //
-  // UnrollBlock* uncommon_trap(JavaThread* thread, jint unloaded_class_index, jint exec_mode)
-  //
-  // n.b. 3 gp args, 0 fp args, integral return type
-
-  __ mv(c_rarg0, xthread);
-  __ mv(c_rarg2, Deoptimization::Unpack_uncommon_trap);
-  __ rt_call(CAST_FROM_FN_PTR(address, Deoptimization::uncommon_trap));
-  __ bind(retaddr);
-
-  // Set an oopmap for the call site
-  OopMapSet* oop_maps = new OopMapSet();
-  OopMap* map = new OopMap(SimpleRuntimeFrame::framesize, 0);
-  assert_cond(oop_maps != nullptr && map != nullptr);
-
-  // location of fp is known implicitly by the frame sender code
-
-  oop_maps->add_gc_map(__ pc() - start, map);
-
-  __ reset_last_Java_frame(false);
-
-  // move UnrollBlock* into x14
-  __ mv(x14, x10);
-
-#ifdef ASSERT
-  { Label L;
-    __ lwu(t0, Address(x14, Deoptimization::UnrollBlock::unpack_kind_offset()));
-    __ mv(t1, Deoptimization::Unpack_uncommon_trap);
-    __ beq(t0, t1, L);
-    __ stop("SharedRuntime::generate_uncommon_trap_blob: expected Unpack_uncommon_trap");
-    __ bind(L);
-  }
-#endif
-
-  // Pop all the frames we must move/replace.
-  //
-  // Frame picture (youngest to oldest)
-  // 1: self-frame (no frame link)
-  // 2: deopting frame  (no frame link)
-  // 3: caller of deopting frame (could be compiled/interpreted).
-
-  __ add(sp, sp, (SimpleRuntimeFrame::framesize) << LogBytesPerInt); // Epilog!
-
-  // Pop deoptimized frame (int)
-  __ lwu(x12, Address(x14,
-                      Deoptimization::UnrollBlock::
-                      size_of_deoptimized_frame_offset()));
-  __ sub(x12, x12, 2 * wordSize);
-  __ add(sp, sp, x12);
-  __ ld(fp, Address(sp, 0));
-  __ ld(ra, Address(sp, wordSize));
-  __ addi(sp, sp, 2 * wordSize);
-  // RA should now be the return address to the caller (3) frame
-
-#ifdef ASSERT
-  // Compilers generate code that bang the stack by as much as the
-  // interpreter would need. So this stack banging should never
-  // trigger a fault. Verify that it does not on non product builds.
-  __ lwu(x11, Address(x14,
-                      Deoptimization::UnrollBlock::
-                      total_frame_sizes_offset()));
-  __ bang_stack_size(x11, x12);
-#endif
-
-  // Load address of array of frame pcs into x12 (address*)
-  __ ld(x12, Address(x14,
-                     Deoptimization::UnrollBlock::frame_pcs_offset()));
-
-  // Load address of array of frame sizes into x15 (intptr_t*)
-  __ ld(x15, Address(x14,
-                     Deoptimization::UnrollBlock::
-                     frame_sizes_offset()));
-
-  // Counter
-  __ lwu(x13, Address(x14,
-                      Deoptimization::UnrollBlock::
-                      number_of_frames_offset())); // (int)
-
-  // Now adjust the caller's stack to make up for the extra locals but
-  // record the original sp so that we can save it in the skeletal
-  // interpreter frame and the stack walking of interpreter_sender
-  // will get the unextended sp value and not the "real" sp value.
-
-  const Register sender_sp = t1; // temporary register
-
-  __ lwu(x11, Address(x14,
-                      Deoptimization::UnrollBlock::
-                      caller_adjustment_offset())); // (int)
-  __ mv(sender_sp, sp);
-  __ sub(sp, sp, x11);
-
-  // Push interpreter frames in a loop
-  Label loop;
-  __ bind(loop);
-  __ ld(x11, Address(x15, 0));       // Load frame size
-  __ sub(x11, x11, 2 * wordSize);    // We'll push pc and fp by hand
-  __ ld(ra, Address(x12, 0));        // Save return address
-  __ enter();                        // and old fp & set new fp
-  __ sub(sp, sp, x11);               // Prolog
-  __ sd(sender_sp, Address(fp, frame::interpreter_frame_sender_sp_offset * wordSize)); // Make it walkable
-  // This value is corrected by layout_activation_impl
-  __ sd(zr, Address(fp, frame::interpreter_frame_last_sp_offset * wordSize));
-  __ mv(sender_sp, sp);              // Pass sender_sp to next frame
-  __ add(x15, x15, wordSize);        // Bump array pointer (sizes)
-  __ add(x12, x12, wordSize);        // Bump array pointer (pcs)
-  __ subw(x13, x13, 1);              // Decrement counter
-  __ bgtz(x13, loop);
-  __ ld(ra, Address(x12, 0));        // save final return address
-  // Re-push self-frame
-  __ enter();                        // & old fp & set new fp
-
-  // Use fp because the frames look interpreted now
-  // Save "the_pc" since it cannot easily be retrieved using the last_java_SP after we aligned SP.
-  // Don't need the precise return PC here, just precise enough to point into this code blob.
-  address the_pc = __ pc();
-  __ set_last_Java_frame(sp, fp, the_pc, t0);
-
-  // Call C code.  Need thread but NOT official VM entry
-  // crud.  We cannot block on this call, no GC can happen.  Call should
-  // restore return values to their stack-slots with the new SP.
-  //
-  // BasicType unpack_frames(JavaThread* thread, int exec_mode)
-  //
-
-  // n.b. 2 gp args, 0 fp args, integral return type
-
-  // sp should already be aligned
-  __ mv(c_rarg0, xthread);
-  __ mv(c_rarg1, Deoptimization::Unpack_uncommon_trap);
-  __ rt_call(CAST_FROM_FN_PTR(address, Deoptimization::unpack_frames));
-
-  // Set an oopmap for the call site
-  // Use the same PC we used for the last java frame
-  oop_maps->add_gc_map(the_pc - start, new OopMap(SimpleRuntimeFrame::framesize, 0));
-
-  // Clear fp AND pc
-  __ reset_last_Java_frame(true);
-
-  // Pop self-frame.
-  __ leave();                 // Epilog
-
-  // Jump to interpreter
-  __ ret();
-
-  // Make sure all code is generated
-  masm->flush();
-
-  _uncommon_trap_blob =  UncommonTrapBlob::create(&buffer, oop_maps,
-                                                  SimpleRuntimeFrame::framesize >> 1);
-}
-#endif // COMPILER2
-
 //------------------------------generate_handler_blob------
 //
 // Generate a special Compile2Runtime blob that saves all registers,
@@ -2835,139 +2628,3 @@ RuntimeStub* SharedRuntime::generate_resolve_blob(address destination, const cha
   // return the  blob
   return RuntimeStub::new_runtime_stub(name, &buffer, frame_complete, frame_size_in_words, oop_maps, true);
 }
-
-#ifdef COMPILER2
-//------------------------------generate_exception_blob---------------------------
-// creates exception blob at the end
-// Using exception blob, this code is jumped from a compiled method.
-// (see emit_exception_handler in riscv.ad file)
-//
-// Given an exception pc at a call we call into the runtime for the
-// handler in this method. This handler might merely restore state
-// (i.e. callee save registers) unwind the frame and jump to the
-// exception handler for the nmethod if there is no Java level handler
-// for the nmethod.
-//
-// This code is entered with a jmp.
-//
-// Arguments:
-//   x10: exception oop
-//   x13: exception pc
-//
-// Results:
-//   x10: exception oop
-//   x13: exception pc in caller
-//   destination: exception handler of caller
-//
-// Note: the exception pc MUST be at a call (precise debug information)
-//       Registers x10, x13, x12, x14, x15, t0 are not callee saved.
-//
-
-void OptoRuntime::generate_exception_blob() {
-  assert(!OptoRuntime::is_callee_saved_register(R13_num), "");
-  assert(!OptoRuntime::is_callee_saved_register(R10_num), "");
-  assert(!OptoRuntime::is_callee_saved_register(R12_num), "");
-
-  assert(SimpleRuntimeFrame::framesize % 4 == 0, "sp not 16-byte aligned");
-
-  // Allocate space for the code
-  ResourceMark rm;
-  // Setup code generation tools
-  CodeBuffer buffer("exception_blob", 2048, 1024);
-  MacroAssembler* masm = new MacroAssembler(&buffer);
-  assert_cond(masm != nullptr);
-
-  // TODO check various assumptions made here
-  //
-  // make sure we do so before running this
-
-  address start = __ pc();
-
-  // push fp and retaddr by hand
-  // Exception pc is 'return address' for stack walker
-  __ addi(sp, sp, -2 * wordSize);
-  __ sd(ra, Address(sp, wordSize));
-  __ sd(fp, Address(sp));
-  // there are no callee save registers and we don't expect an
-  // arg reg save area
-#ifndef PRODUCT
-  assert(frame::arg_reg_save_area_bytes == 0, "not expecting frame reg save area");
-#endif
-  // Store exception in Thread object. We cannot pass any arguments to the
-  // handle_exception call, since we do not want to make any assumption
-  // about the size of the frame where the exception happened in.
-  __ sd(x10, Address(xthread, JavaThread::exception_oop_offset()));
-  __ sd(x13, Address(xthread, JavaThread::exception_pc_offset()));
-
-  // This call does all the hard work.  It checks if an exception handler
-  // exists in the method.
-  // If so, it returns the handler address.
-  // If not, it prepares for stack-unwinding, restoring the callee-save
-  // registers of the frame being removed.
-  //
-  // address OptoRuntime::handle_exception_C(JavaThread* thread)
-  //
-  // n.b. 1 gp arg, 0 fp args, integral return type
-
-  // the stack should always be aligned
-  address the_pc = __ pc();
-  __ set_last_Java_frame(sp, noreg, the_pc, t0);
-  __ mv(c_rarg0, xthread);
-  __ rt_call(CAST_FROM_FN_PTR(address, OptoRuntime::handle_exception_C));
-
-  // handle_exception_C is a special VM call which does not require an explicit
-  // instruction sync afterwards.
-
-  // Set an oopmap for the call site.  This oopmap will only be used if we
-  // are unwinding the stack.  Hence, all locations will be dead.
-  // Callee-saved registers will be the same as the frame above (i.e.,
-  // handle_exception_stub), since they were restored when we got the
-  // exception.
-
-  OopMapSet* oop_maps = new OopMapSet();
-  assert_cond(oop_maps != nullptr);
-
-  oop_maps->add_gc_map(the_pc - start, new OopMap(SimpleRuntimeFrame::framesize, 0));
-
-  __ reset_last_Java_frame(false);
-
-  // Restore callee-saved registers
-
-  // fp is an implicitly saved callee saved register (i.e. the calling
-  // convention will save restore it in prolog/epilog) Other than that
-  // there are no callee save registers now that adapter frames are gone.
-  // and we dont' expect an arg reg save area
-  __ ld(fp, Address(sp));
-  __ ld(x13, Address(sp, wordSize));
-  __ addi(sp, sp , 2 * wordSize);
-
-  // x10: exception handler
-
-  // We have a handler in x10 (could be deopt blob).
-  __ mv(t0, x10);
-
-  // Get the exception oop
-  __ ld(x10, Address(xthread, JavaThread::exception_oop_offset()));
-  // Get the exception pc in case we are deoptimized
-  __ ld(x14, Address(xthread, JavaThread::exception_pc_offset()));
-#ifdef ASSERT
-  __ sd(zr, Address(xthread, JavaThread::exception_handler_pc_offset()));
-  __ sd(zr, Address(xthread, JavaThread::exception_pc_offset()));
-#endif
-  // Clear the exception oop so GC no longer processes it as a root.
-  __ sd(zr, Address(xthread, JavaThread::exception_oop_offset()));
-
-  // x10: exception oop
-  // t0:  exception handler
-  // x14: exception pc
-  // Jump to handler
-
-  __ jr(t0);
-
-  // Make sure all code is generated
-  masm->flush();
-
-  // Set exception blob
-  _exception_blob =  ExceptionBlob::create(&buffer, oop_maps, SimpleRuntimeFrame::framesize >> 1);
-}
-#endif // COMPILER2
diff --git a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
index 0ee88345282b7..641b3712a175b 100644
--- a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
+++ b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
@@ -2706,7 +2706,7 @@ void SharedRuntime::generate_deopt_blob() {
 
 #ifdef COMPILER2
 //------------------------------generate_uncommon_trap_blob--------------------
-void SharedRuntime::generate_uncommon_trap_blob() {
+void OptoRuntime::generate_uncommon_trap_blob() {
   // Allocate space for the code
   ResourceMark rm;
   // Setup code generation tools
@@ -2769,7 +2769,7 @@ void SharedRuntime::generate_uncommon_trap_blob() {
   } else {
     __ z_cliy(unpack_kind_byte_offset, unroll_block_reg, Deoptimization::Unpack_uncommon_trap);
   }
-  __ asm_assert(Assembler::bcondEqual, "SharedRuntime::generate_deopt_blob: expected Unpack_uncommon_trap", 0);
+  __ asm_assert(Assembler::bcondEqual, "OptoRuntime::generate_deopt_blob: expected Unpack_uncommon_trap", 0);
 #endif
 
   __ zap_from_to(Z_SP, Z_SP, Z_R0_scratch, Z_R1, 500, -1);
diff --git a/src/hotspot/cpu/x86/runtime_x86_32.cpp b/src/hotspot/cpu/x86/runtime_x86_32.cpp
index d38fa3c60bdd1..2a21c42a5e606 100644
--- a/src/hotspot/cpu/x86/runtime_x86_32.cpp
+++ b/src/hotspot/cpu/x86/runtime_x86_32.cpp
@@ -41,6 +41,180 @@
 
 #define __ masm->
 
+//------------------------------generate_uncommon_trap_blob--------------------
+void OptoRuntime::generate_uncommon_trap_blob() {
+  // allocate space for the code
+  ResourceMark rm;
+  // setup code generation tools
+  CodeBuffer   buffer("uncommon_trap_blob", 512, 512);
+  MacroAssembler* masm = new MacroAssembler(&buffer);
+
+  enum frame_layout {
+    arg0_off,      // thread                     sp + 0 // Arg location for
+    arg1_off,      // unloaded_class_index       sp + 1 // calling C
+    arg2_off,      // exec_mode                  sp + 2
+    // The frame sender code expects that rbp will be in the "natural" place and
+    // will override any oopMap setting for it. We must therefore force the layout
+    // so that it agrees with the frame sender code.
+    rbp_off,       // callee saved register      sp + 3
+    return_off,    // slot for return address    sp + 4
+    framesize
+  };
+
+  address start = __ pc();
+
+  // Push self-frame.
+  __ subptr(rsp, return_off*wordSize);     // Epilog!
+
+  // rbp, is an implicitly saved callee saved register (i.e. the calling
+  // convention will save restore it in prolog/epilog) Other than that
+  // there are no callee save registers no that adapter frames are gone.
+  __ movptr(Address(rsp, rbp_off*wordSize), rbp);
+
+  // Clear the floating point exception stack
+  __ empty_FPU_stack();
+
+  // set last_Java_sp
+  __ get_thread(rdx);
+  __ set_last_Java_frame(rdx, noreg, noreg, nullptr, noreg);
+
+  // Call C code.  Need thread but NOT official VM entry
+  // crud.  We cannot block on this call, no GC can happen.  Call should
+  // capture callee-saved registers as well as return values.
+  __ movptr(Address(rsp, arg0_off*wordSize), rdx);
+  // argument already in ECX
+  __ movl(Address(rsp, arg1_off*wordSize),rcx);
+  __ movl(Address(rsp, arg2_off*wordSize), Deoptimization::Unpack_uncommon_trap);
+  __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::uncommon_trap)));
+
+  // Set an oopmap for the call site
+  OopMapSet *oop_maps = new OopMapSet();
+  OopMap* map =  new OopMap( framesize, 0 );
+  // No oopMap for rbp, it is known implicitly
+
+  oop_maps->add_gc_map( __ pc()-start, map);
+
+  __ get_thread(rcx);
+
+  __ reset_last_Java_frame(rcx, false);
+
+  // Load UnrollBlock into EDI
+  __ movptr(rdi, rax);
+
+#ifdef ASSERT
+  { Label L;
+    __ cmpptr(Address(rdi, Deoptimization::UnrollBlock::unpack_kind_offset()),
+            (int32_t)Deoptimization::Unpack_uncommon_trap);
+    __ jcc(Assembler::equal, L);
+    __ stop("OptoRuntime::generate_uncommon_trap_blob: expected Unpack_uncommon_trap");
+    __ bind(L);
+  }
+#endif
+
+  // Pop all the frames we must move/replace.
+  //
+  // Frame picture (youngest to oldest)
+  // 1: self-frame (no frame link)
+  // 2: deopting frame  (no frame link)
+  // 3: caller of deopting frame (could be compiled/interpreted).
+
+  // Pop self-frame.  We have no frame, and must rely only on EAX and ESP.
+  __ addptr(rsp,(framesize-1)*wordSize);     // Epilog!
+
+  // Pop deoptimized frame
+  __ movl2ptr(rcx, Address(rdi,Deoptimization::UnrollBlock::size_of_deoptimized_frame_offset()));
+  __ addptr(rsp, rcx);
+
+  // sp should be pointing at the return address to the caller (3)
+
+  // Pick up the initial fp we should save
+  // restore rbp before stack bang because if stack overflow is thrown it needs to be pushed (and preserved)
+  __ movptr(rbp, Address(rdi, Deoptimization::UnrollBlock::initial_info_offset()));
+
+#ifdef ASSERT
+  // Compilers generate code that bang the stack by as much as the
+  // interpreter would need. So this stack banging should never
+  // trigger a fault. Verify that it does not on non product builds.
+  __ movl(rbx, Address(rdi ,Deoptimization::UnrollBlock::total_frame_sizes_offset()));
+  __ bang_stack_size(rbx, rcx);
+#endif
+
+  // Load array of frame pcs into ECX
+  __ movl(rcx,Address(rdi,Deoptimization::UnrollBlock::frame_pcs_offset()));
+
+  __ pop(rsi); // trash the pc
+
+  // Load array of frame sizes into ESI
+  __ movptr(rsi,Address(rdi,Deoptimization::UnrollBlock::frame_sizes_offset()));
+
+  Address counter(rdi, Deoptimization::UnrollBlock::counter_temp_offset());
+
+  __ movl(rbx, Address(rdi, Deoptimization::UnrollBlock::number_of_frames_offset()));
+  __ movl(counter, rbx);
+
+  // Now adjust the caller's stack to make up for the extra locals
+  // but record the original sp so that we can save it in the skeletal interpreter
+  // frame and the stack walking of interpreter_sender will get the unextended sp
+  // value and not the "real" sp value.
+
+  Address sp_temp(rdi, Deoptimization::UnrollBlock::sender_sp_temp_offset());
+  __ movptr(sp_temp, rsp);
+  __ movl(rbx, Address(rdi, Deoptimization::UnrollBlock::caller_adjustment_offset()));
+  __ subptr(rsp, rbx);
+
+  // Push interpreter frames in a loop
+  Label loop;
+  __ bind(loop);
+  __ movptr(rbx, Address(rsi, 0));      // Load frame size
+  __ subptr(rbx, 2*wordSize);           // we'll push pc and rbp, by hand
+  __ pushptr(Address(rcx, 0));          // save return address
+  __ enter();                           // save old & set new rbp,
+  __ subptr(rsp, rbx);                  // Prolog!
+  __ movptr(rbx, sp_temp);              // sender's sp
+  // This value is corrected by layout_activation_impl
+  __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD );
+  __ movptr(Address(rbp, frame::interpreter_frame_sender_sp_offset * wordSize), rbx); // Make it walkable
+  __ movptr(sp_temp, rsp);              // pass to next frame
+  __ addptr(rsi, wordSize);             // Bump array pointer (sizes)
+  __ addptr(rcx, wordSize);             // Bump array pointer (pcs)
+  __ decrementl(counter);             // decrement counter
+  __ jcc(Assembler::notZero, loop);
+  __ pushptr(Address(rcx, 0));            // save final return address
+
+  // Re-push self-frame
+  __ enter();                           // save old & set new rbp,
+  __ subptr(rsp, (framesize-2) * wordSize);   // Prolog!
+
+
+  // set last_Java_sp, last_Java_fp
+  __ get_thread(rdi);
+  __ set_last_Java_frame(rdi, noreg, rbp, nullptr, noreg);
+
+  // Call C code.  Need thread but NOT official VM entry
+  // crud.  We cannot block on this call, no GC can happen.  Call should
+  // restore return values to their stack-slots with the new SP.
+  __ movptr(Address(rsp,arg0_off*wordSize),rdi);
+  __ movl(Address(rsp,arg1_off*wordSize), Deoptimization::Unpack_uncommon_trap);
+  __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::unpack_frames)));
+  // Set an oopmap for the call site
+  oop_maps->add_gc_map( __ pc()-start, new OopMap( framesize, 0 ) );
+
+  __ get_thread(rdi);
+  __ reset_last_Java_frame(rdi, true);
+
+  // Pop self-frame.
+  __ leave();     // Epilog!
+
+  // Jump to interpreter
+  __ ret(0);
+
+  // -------------
+  // make sure all code is generated
+  masm->flush();
+
+   _uncommon_trap_blob = UncommonTrapBlob::create(&buffer, oop_maps, framesize);
+}
+
 //------------------------------generate_exception_blob---------------------------
 // creates exception blob at the end
 // Using exception blob, this code is jumped from a compiled method.
diff --git a/src/hotspot/cpu/x86/runtime_x86_64.cpp b/src/hotspot/cpu/x86/runtime_x86_64.cpp
index e08550715b495..eb3bab36b88cb 100644
--- a/src/hotspot/cpu/x86/runtime_x86_64.cpp
+++ b/src/hotspot/cpu/x86/runtime_x86_64.cpp
@@ -34,11 +34,328 @@
 #include "runtime/vframeArray.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "vmreg_x86.inline.hpp"
+
+class SimpleRuntimeFrame {
+
+  public:
+
+  // Most of the runtime stubs have this simple frame layout.
+  // This class exists to make the layout shared in one place.
+  // Offsets are for compiler stack slots, which are jints.
+  enum layout {
+    // The frame sender code expects that rbp will be in the "natural" place and
+    // will override any oopMap setting for it. We must therefore force the layout
+    // so that it agrees with the frame sender code.
+    rbp_off = frame::arg_reg_save_area_bytes/BytesPerInt,
+    rbp_off2,
+    return_off, return_off2,
+    framesize
+  };
+};
+
+#define __ masm->
+
+//------------------------------generate_uncommon_trap_blob--------------------
+void OptoRuntime::generate_uncommon_trap_blob() {
+  // Allocate space for the code
+  ResourceMark rm;
+  // Setup code generation tools
+  CodeBuffer buffer("uncommon_trap_blob", 2048, 1024);
+  MacroAssembler* masm = new MacroAssembler(&buffer);
+
+  assert(SimpleRuntimeFrame::framesize % 4 == 0, "sp not 16-byte aligned");
+
+  address start = __ pc();
+
+  // Push self-frame.  We get here with a return address on the
+  // stack, so rsp is 8-byte aligned until we allocate our frame.
+  __ subptr(rsp, SimpleRuntimeFrame::return_off << LogBytesPerInt); // Epilog!
+
+  // No callee saved registers. rbp is assumed implicitly saved
+  __ movptr(Address(rsp, SimpleRuntimeFrame::rbp_off << LogBytesPerInt), rbp);
+
+  // compiler left unloaded_class_index in j_rarg0 move to where the
+  // runtime expects it.
+  __ movl(c_rarg1, j_rarg0);
+
+  __ set_last_Java_frame(noreg, noreg, nullptr, rscratch1);
+
+  // Call C code.  Need thread but NOT official VM entry
+  // crud.  We cannot block on this call, no GC can happen.  Call should
+  // capture callee-saved registers as well as return values.
+  // Thread is in rdi already.
+  //
+  // UnrollBlock* uncommon_trap(JavaThread* thread, jint unloaded_class_index);
+
+  __ mov(c_rarg0, r15_thread);
+  __ movl(c_rarg2, Deoptimization::Unpack_uncommon_trap);
+  __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::uncommon_trap)));
+
+  // Set an oopmap for the call site
+  OopMapSet* oop_maps = new OopMapSet();
+  OopMap* map = new OopMap(SimpleRuntimeFrame::framesize, 0);
+
+  // location of rbp is known implicitly by the frame sender code
+
+  oop_maps->add_gc_map(__ pc() - start, map);
+
+  __ reset_last_Java_frame(false);
+
+  // Load UnrollBlock* into rdi
+  __ mov(rdi, rax);
+
+#ifdef ASSERT
+  { Label L;
+    __ cmpptr(Address(rdi, Deoptimization::UnrollBlock::unpack_kind_offset()),
+              Deoptimization::Unpack_uncommon_trap);
+    __ jcc(Assembler::equal, L);
+    __ stop("OptoRuntime::generate_uncommon_trap_blob: expected Unpack_uncommon_trap");
+    __ bind(L);
+  }
 #endif
 
+  // Pop all the frames we must move/replace.
+  //
+  // Frame picture (youngest to oldest)
+  // 1: self-frame (no frame link)
+  // 2: deopting frame  (no frame link)
+  // 3: caller of deopting frame (could be compiled/interpreted).
+
+  // Pop self-frame.  We have no frame, and must rely only on rax and rsp.
+  __ addptr(rsp, (SimpleRuntimeFrame::framesize - 2) << LogBytesPerInt); // Epilog!
+
+  // Pop deoptimized frame (int)
+  __ movl(rcx, Address(rdi,
+                       Deoptimization::UnrollBlock::
+                       size_of_deoptimized_frame_offset()));
+  __ addptr(rsp, rcx);
+
+  // rsp should be pointing at the return address to the caller (3)
+
+  // Pick up the initial fp we should save
+  // restore rbp before stack bang because if stack overflow is thrown it needs to be pushed (and preserved)
+  __ movptr(rbp, Address(rdi, Deoptimization::UnrollBlock::initial_info_offset()));
+
+#ifdef ASSERT
+  // Compilers generate code that bang the stack by as much as the
+  // interpreter would need. So this stack banging should never
+  // trigger a fault. Verify that it does not on non product builds.
+  __ movl(rbx, Address(rdi ,Deoptimization::UnrollBlock::total_frame_sizes_offset()));
+  __ bang_stack_size(rbx, rcx);
+#endif
+
+  // Load address of array of frame pcs into rcx (address*)
+  __ movptr(rcx, Address(rdi, Deoptimization::UnrollBlock::frame_pcs_offset()));
+
+  // Trash the return pc
+  __ addptr(rsp, wordSize);
+
+  // Load address of array of frame sizes into rsi (intptr_t*)
+  __ movptr(rsi, Address(rdi, Deoptimization::UnrollBlock:: frame_sizes_offset()));
+
+  // Counter
+  __ movl(rdx, Address(rdi, Deoptimization::UnrollBlock:: number_of_frames_offset())); // (int)
+
+  // Now adjust the caller's stack to make up for the extra locals but
+  // record the original sp so that we can save it in the skeletal
+  // interpreter frame and the stack walking of interpreter_sender
+  // will get the unextended sp value and not the "real" sp value.
+
+  const Register sender_sp = r8;
+
+  __ mov(sender_sp, rsp);
+  __ movl(rbx, Address(rdi, Deoptimization::UnrollBlock:: caller_adjustment_offset())); // (int)
+  __ subptr(rsp, rbx);
+
+  // Push interpreter frames in a loop
+  Label loop;
+  __ bind(loop);
+  __ movptr(rbx, Address(rsi, 0)); // Load frame size
+  __ subptr(rbx, 2 * wordSize);    // We'll push pc and rbp by hand
+  __ pushptr(Address(rcx, 0));     // Save return address
+  __ enter();                      // Save old & set new rbp
+  __ subptr(rsp, rbx);             // Prolog
+  __ movptr(Address(rbp, frame::interpreter_frame_sender_sp_offset * wordSize),
+            sender_sp);            // Make it walkable
+  // This value is corrected by layout_activation_impl
+  __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD);
+  __ mov(sender_sp, rsp);          // Pass sender_sp to next frame
+  __ addptr(rsi, wordSize);        // Bump array pointer (sizes)
+  __ addptr(rcx, wordSize);        // Bump array pointer (pcs)
+  __ decrementl(rdx);              // Decrement counter
+  __ jcc(Assembler::notZero, loop);
+  __ pushptr(Address(rcx, 0));     // Save final return address
+
+  // Re-push self-frame
+  __ enter();                 // Save old & set new rbp
+  __ subptr(rsp, (SimpleRuntimeFrame::framesize - 4) << LogBytesPerInt);
+                              // Prolog
+
+  // Use rbp because the frames look interpreted now
+  // Save "the_pc" since it cannot easily be retrieved using the last_java_SP after we aligned SP.
+  // Don't need the precise return PC here, just precise enough to point into this code blob.
+  address the_pc = __ pc();
+  __ set_last_Java_frame(noreg, rbp, the_pc, rscratch1);
+
+  // Call C code.  Need thread but NOT official VM entry
+  // crud.  We cannot block on this call, no GC can happen.  Call should
+  // restore return values to their stack-slots with the new SP.
+  // Thread is in rdi already.
+  //
+  // BasicType unpack_frames(JavaThread* thread, int exec_mode);
+
+  __ andptr(rsp, -(StackAlignmentInBytes)); // Align SP as required by ABI
+  __ mov(c_rarg0, r15_thread);
+  __ movl(c_rarg1, Deoptimization::Unpack_uncommon_trap);
+  __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::unpack_frames)));
+
+  // Set an oopmap for the call site
+  // Use the same PC we used for the last java frame
+  oop_maps->add_gc_map(the_pc - start, new OopMap(SimpleRuntimeFrame::framesize, 0));
+
+  // Clear fp AND pc
+  __ reset_last_Java_frame(true);
+
+  // Pop self-frame.
+  __ leave();                 // Epilog
+
+  // Jump to interpreter
+  __ ret(0);
+
+  // Make sure all code is generated
+  masm->flush();
+
+  _uncommon_trap_blob =  UncommonTrapBlob::create(&buffer, oop_maps,
+                                                 SimpleRuntimeFrame::framesize >> 1);
+}
+
+//------------------------------generate_exception_blob---------------------------
+// creates exception blob at the end
+// Using exception blob, this code is jumped from a compiled method.
+// (see emit_exception_handler in x86_64.ad file)
+//
+// Given an exception pc at a call we call into the runtime for the
+// handler in this method. This handler might merely restore state
+// (i.e. callee save registers) unwind the frame and jump to the
+// exception handler for the nmethod if there is no Java level handler
+// for the nmethod.
+//
+// This code is entered with a jmp.
+//
+// Arguments:
+//   rax: exception oop
+//   rdx: exception pc
+//
+// Results:
+//   rax: exception oop
+//   rdx: exception pc in caller or ???
+//   destination: exception handler of caller
+//
+// Note: the exception pc MUST be at a call (precise debug information)
+//       Registers rax, rdx, rcx, rsi, rdi, r8-r11 are not callee saved.
+//
+
+void OptoRuntime::generate_exception_blob() {
+  assert(!OptoRuntime::is_callee_saved_register(RDX_num), "");
+  assert(!OptoRuntime::is_callee_saved_register(RAX_num), "");
+  assert(!OptoRuntime::is_callee_saved_register(RCX_num), "");
+
+  assert(SimpleRuntimeFrame::framesize % 4 == 0, "sp not 16-byte aligned");
+
+  // Allocate space for the code
+  ResourceMark rm;
+  // Setup code generation tools
+  CodeBuffer buffer("exception_blob", 2048, 1024);
+  MacroAssembler* masm = new MacroAssembler(&buffer);
+
+
+  address start = __ pc();
+
+  // Exception pc is 'return address' for stack walker
+  __ push(rdx);
+  __ subptr(rsp, SimpleRuntimeFrame::return_off << LogBytesPerInt); // Prolog
+
+  // Save callee-saved registers.  See x86_64.ad.
+
+  // rbp is an implicitly saved callee saved register (i.e., the calling
+  // convention will save/restore it in the prolog/epilog). Other than that
+  // there are no callee save registers now that adapter frames are gone.
+
+  __ movptr(Address(rsp, SimpleRuntimeFrame::rbp_off << LogBytesPerInt), rbp);
+
+  // Store exception in Thread object. We cannot pass any arguments to the
+  // handle_exception call, since we do not want to make any assumption
+  // about the size of the frame where the exception happened in.
+  // c_rarg0 is either rdi (Linux) or rcx (Windows).
+  __ movptr(Address(r15_thread, JavaThread::exception_oop_offset()),rax);
+  __ movptr(Address(r15_thread, JavaThread::exception_pc_offset()), rdx);
+
+  // This call does all the hard work.  It checks if an exception handler
+  // exists in the method.
+  // If so, it returns the handler address.
+  // If not, it prepares for stack-unwinding, restoring the callee-save
+  // registers of the frame being removed.
+  //
+  // address OptoRuntime::handle_exception_C(JavaThread* thread)
+
+  // At a method handle call, the stack may not be properly aligned
+  // when returning with an exception.
+  address the_pc = __ pc();
+  __ set_last_Java_frame(noreg, noreg, the_pc, rscratch1);
+  __ mov(c_rarg0, r15_thread);
+  __ andptr(rsp, -(StackAlignmentInBytes));    // Align stack
+  __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, OptoRuntime::handle_exception_C)));
+
+  // Set an oopmap for the call site.  This oopmap will only be used if we
+  // are unwinding the stack.  Hence, all locations will be dead.
+  // Callee-saved registers will be the same as the frame above (i.e.,
+  // handle_exception_stub), since they were restored when we got the
+  // exception.
+
+  OopMapSet* oop_maps = new OopMapSet();
+
+  oop_maps->add_gc_map(the_pc - start, new OopMap(SimpleRuntimeFrame::framesize, 0));
+
+  __ reset_last_Java_frame(false);
+
+  // Restore callee-saved registers
+
+  // rbp is an implicitly saved callee-saved register (i.e., the calling
+  // convention will save restore it in prolog/epilog) Other than that
+  // there are no callee save registers now that adapter frames are gone.
+
+  __ movptr(rbp, Address(rsp, SimpleRuntimeFrame::rbp_off << LogBytesPerInt));
+
+  __ addptr(rsp, SimpleRuntimeFrame::return_off << LogBytesPerInt); // Epilog
+  __ pop(rdx);                  // No need for exception pc anymore
+
+  // rax: exception handler
+
+  // We have a handler in rax (could be deopt blob).
+  __ mov(r8, rax);
+
+  // Get the exception oop
+  __ movptr(rax, Address(r15_thread, JavaThread::exception_oop_offset()));
+  // Get the exception pc in case we are deoptimized
+  __ movptr(rdx, Address(r15_thread, JavaThread::exception_pc_offset()));
+#ifdef ASSERT
+  __ movptr(Address(r15_thread, JavaThread::exception_handler_pc_offset()), NULL_WORD);
+  __ movptr(Address(r15_thread, JavaThread::exception_pc_offset()), NULL_WORD);
+#endif
+  // Clear the exception oop so GC no longer processes it as a root.
+  __ movptr(Address(r15_thread, JavaThread::exception_oop_offset()), NULL_WORD);
+
+  // rax: exception oop
+  // r8:  exception handler
+  // rdx: exception pc
+  // Jump to handler
+
+  __ jmp(r8);
+
+  // Make sure all code is generated
+  masm->flush();
 
-// This file should really contain the code for generating the OptoRuntime
-// exception_blob. However that code uses SimpleRuntimeFrame which only
-// exists in sharedRuntime_x86_64.cpp. When there is a sharedRuntime_<arch>.hpp
-// file and SimpleRuntimeFrame is able to move there then the exception_blob
-// code will move here where it belongs.
+  // Set exception blob
+  _exception_blob =  ExceptionBlob::create(&buffer, oop_maps, SimpleRuntimeFrame::framesize >> 1);
+}
+#endif // COMPILER2
diff --git a/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
index 6303c279195ca..80be7c7d5b642 100644
--- a/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
@@ -2389,183 +2389,6 @@ void SharedRuntime::generate_deopt_blob() {
   _deopt_blob->set_unpack_with_exception_in_tls_offset(exception_in_tls_offset);
 }
 
-
-#ifdef COMPILER2
-//------------------------------generate_uncommon_trap_blob--------------------
-void SharedRuntime::generate_uncommon_trap_blob() {
-  // allocate space for the code
-  ResourceMark rm;
-  // setup code generation tools
-  CodeBuffer   buffer("uncommon_trap_blob", 512, 512);
-  MacroAssembler* masm = new MacroAssembler(&buffer);
-
-  enum frame_layout {
-    arg0_off,      // thread                     sp + 0 // Arg location for
-    arg1_off,      // unloaded_class_index       sp + 1 // calling C
-    arg2_off,      // exec_mode                  sp + 2
-    // The frame sender code expects that rbp will be in the "natural" place and
-    // will override any oopMap setting for it. We must therefore force the layout
-    // so that it agrees with the frame sender code.
-    rbp_off,       // callee saved register      sp + 3
-    return_off,    // slot for return address    sp + 4
-    framesize
-  };
-
-  address start = __ pc();
-
-  // Push self-frame.
-  __ subptr(rsp, return_off*wordSize);     // Epilog!
-
-  // rbp, is an implicitly saved callee saved register (i.e. the calling
-  // convention will save restore it in prolog/epilog) Other than that
-  // there are no callee save registers no that adapter frames are gone.
-  __ movptr(Address(rsp, rbp_off*wordSize), rbp);
-
-  // Clear the floating point exception stack
-  __ empty_FPU_stack();
-
-  // set last_Java_sp
-  __ get_thread(rdx);
-  __ set_last_Java_frame(rdx, noreg, noreg, nullptr, noreg);
-
-  // Call C code.  Need thread but NOT official VM entry
-  // crud.  We cannot block on this call, no GC can happen.  Call should
-  // capture callee-saved registers as well as return values.
-  __ movptr(Address(rsp, arg0_off*wordSize), rdx);
-  // argument already in ECX
-  __ movl(Address(rsp, arg1_off*wordSize),rcx);
-  __ movl(Address(rsp, arg2_off*wordSize), Deoptimization::Unpack_uncommon_trap);
-  __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::uncommon_trap)));
-
-  // Set an oopmap for the call site
-  OopMapSet *oop_maps = new OopMapSet();
-  OopMap* map =  new OopMap( framesize, 0 );
-  // No oopMap for rbp, it is known implicitly
-
-  oop_maps->add_gc_map( __ pc()-start, map);
-
-  __ get_thread(rcx);
-
-  __ reset_last_Java_frame(rcx, false);
-
-  // Load UnrollBlock into EDI
-  __ movptr(rdi, rax);
-
-#ifdef ASSERT
-  { Label L;
-    __ cmpptr(Address(rdi, Deoptimization::UnrollBlock::unpack_kind_offset()),
-            (int32_t)Deoptimization::Unpack_uncommon_trap);
-    __ jcc(Assembler::equal, L);
-    __ stop("SharedRuntime::generate_uncommon_trap_blob: expected Unpack_uncommon_trap");
-    __ bind(L);
-  }
-#endif
-
-  // Pop all the frames we must move/replace.
-  //
-  // Frame picture (youngest to oldest)
-  // 1: self-frame (no frame link)
-  // 2: deopting frame  (no frame link)
-  // 3: caller of deopting frame (could be compiled/interpreted).
-
-  // Pop self-frame.  We have no frame, and must rely only on EAX and ESP.
-  __ addptr(rsp,(framesize-1)*wordSize);     // Epilog!
-
-  // Pop deoptimized frame
-  __ movl2ptr(rcx, Address(rdi,Deoptimization::UnrollBlock::size_of_deoptimized_frame_offset()));
-  __ addptr(rsp, rcx);
-
-  // sp should be pointing at the return address to the caller (3)
-
-  // Pick up the initial fp we should save
-  // restore rbp before stack bang because if stack overflow is thrown it needs to be pushed (and preserved)
-  __ movptr(rbp, Address(rdi, Deoptimization::UnrollBlock::initial_info_offset()));
-
-#ifdef ASSERT
-  // Compilers generate code that bang the stack by as much as the
-  // interpreter would need. So this stack banging should never
-  // trigger a fault. Verify that it does not on non product builds.
-  __ movl(rbx, Address(rdi ,Deoptimization::UnrollBlock::total_frame_sizes_offset()));
-  __ bang_stack_size(rbx, rcx);
-#endif
-
-  // Load array of frame pcs into ECX
-  __ movl(rcx,Address(rdi,Deoptimization::UnrollBlock::frame_pcs_offset()));
-
-  __ pop(rsi); // trash the pc
-
-  // Load array of frame sizes into ESI
-  __ movptr(rsi,Address(rdi,Deoptimization::UnrollBlock::frame_sizes_offset()));
-
-  Address counter(rdi, Deoptimization::UnrollBlock::counter_temp_offset());
-
-  __ movl(rbx, Address(rdi, Deoptimization::UnrollBlock::number_of_frames_offset()));
-  __ movl(counter, rbx);
-
-  // Now adjust the caller's stack to make up for the extra locals
-  // but record the original sp so that we can save it in the skeletal interpreter
-  // frame and the stack walking of interpreter_sender will get the unextended sp
-  // value and not the "real" sp value.
-
-  Address sp_temp(rdi, Deoptimization::UnrollBlock::sender_sp_temp_offset());
-  __ movptr(sp_temp, rsp);
-  __ movl(rbx, Address(rdi, Deoptimization::UnrollBlock::caller_adjustment_offset()));
-  __ subptr(rsp, rbx);
-
-  // Push interpreter frames in a loop
-  Label loop;
-  __ bind(loop);
-  __ movptr(rbx, Address(rsi, 0));      // Load frame size
-  __ subptr(rbx, 2*wordSize);           // we'll push pc and rbp, by hand
-  __ pushptr(Address(rcx, 0));          // save return address
-  __ enter();                           // save old & set new rbp,
-  __ subptr(rsp, rbx);                  // Prolog!
-  __ movptr(rbx, sp_temp);              // sender's sp
-  // This value is corrected by layout_activation_impl
-  __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD );
-  __ movptr(Address(rbp, frame::interpreter_frame_sender_sp_offset * wordSize), rbx); // Make it walkable
-  __ movptr(sp_temp, rsp);              // pass to next frame
-  __ addptr(rsi, wordSize);             // Bump array pointer (sizes)
-  __ addptr(rcx, wordSize);             // Bump array pointer (pcs)
-  __ decrementl(counter);             // decrement counter
-  __ jcc(Assembler::notZero, loop);
-  __ pushptr(Address(rcx, 0));            // save final return address
-
-  // Re-push self-frame
-  __ enter();                           // save old & set new rbp,
-  __ subptr(rsp, (framesize-2) * wordSize);   // Prolog!
-
-
-  // set last_Java_sp, last_Java_fp
-  __ get_thread(rdi);
-  __ set_last_Java_frame(rdi, noreg, rbp, nullptr, noreg);
-
-  // Call C code.  Need thread but NOT official VM entry
-  // crud.  We cannot block on this call, no GC can happen.  Call should
-  // restore return values to their stack-slots with the new SP.
-  __ movptr(Address(rsp,arg0_off*wordSize),rdi);
-  __ movl(Address(rsp,arg1_off*wordSize), Deoptimization::Unpack_uncommon_trap);
-  __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::unpack_frames)));
-  // Set an oopmap for the call site
-  oop_maps->add_gc_map( __ pc()-start, new OopMap( framesize, 0 ) );
-
-  __ get_thread(rdi);
-  __ reset_last_Java_frame(rdi, true);
-
-  // Pop self-frame.
-  __ leave();     // Epilog!
-
-  // Jump to interpreter
-  __ ret(0);
-
-  // -------------
-  // make sure all code is generated
-  masm->flush();
-
-   _uncommon_trap_blob = UncommonTrapBlob::create(&buffer, oop_maps, framesize);
-}
-#endif // COMPILER2
-
 //------------------------------generate_handler_blob------
 //
 // Generate a special Compile2Runtime blob that saves all registers,
diff --git a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
index decaa9d1ee914..f2488ef4e7445 100644
--- a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
@@ -72,24 +72,6 @@
 
 const int StackAlignmentInSlots = StackAlignmentInBytes / VMRegImpl::stack_slot_size;
 
-class SimpleRuntimeFrame {
-
-  public:
-
-  // Most of the runtime stubs have this simple frame layout.
-  // This class exists to make the layout shared in one place.
-  // Offsets are for compiler stack slots, which are jints.
-  enum layout {
-    // The frame sender code expects that rbp will be in the "natural" place and
-    // will override any oopMap setting for it. We must therefore force the layout
-    // so that it agrees with the frame sender code.
-    rbp_off = frame::arg_reg_save_area_bytes/BytesPerInt,
-    rbp_off2,
-    return_off, return_off2,
-    framesize
-  };
-};
-
 class RegisterSaver {
   // Capture info about frame layout.  Layout offsets are in jint
   // units because compiler frame slots are jints.
@@ -2987,182 +2969,6 @@ void SharedRuntime::generate_deopt_blob() {
 #endif
 }
 
-#ifdef COMPILER2
-//------------------------------generate_uncommon_trap_blob--------------------
-void SharedRuntime::generate_uncommon_trap_blob() {
-  // Allocate space for the code
-  ResourceMark rm;
-  // Setup code generation tools
-  CodeBuffer buffer("uncommon_trap_blob", 2048, 1024);
-  MacroAssembler* masm = new MacroAssembler(&buffer);
-
-  assert(SimpleRuntimeFrame::framesize % 4 == 0, "sp not 16-byte aligned");
-
-  address start = __ pc();
-
-  // Push self-frame.  We get here with a return address on the
-  // stack, so rsp is 8-byte aligned until we allocate our frame.
-  __ subptr(rsp, SimpleRuntimeFrame::return_off << LogBytesPerInt); // Epilog!
-
-  // No callee saved registers. rbp is assumed implicitly saved
-  __ movptr(Address(rsp, SimpleRuntimeFrame::rbp_off << LogBytesPerInt), rbp);
-
-  // compiler left unloaded_class_index in j_rarg0 move to where the
-  // runtime expects it.
-  __ movl(c_rarg1, j_rarg0);
-
-  __ set_last_Java_frame(noreg, noreg, nullptr, rscratch1);
-
-  // Call C code.  Need thread but NOT official VM entry
-  // crud.  We cannot block on this call, no GC can happen.  Call should
-  // capture callee-saved registers as well as return values.
-  // Thread is in rdi already.
-  //
-  // UnrollBlock* uncommon_trap(JavaThread* thread, jint unloaded_class_index);
-
-  __ mov(c_rarg0, r15_thread);
-  __ movl(c_rarg2, Deoptimization::Unpack_uncommon_trap);
-  __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::uncommon_trap)));
-
-  // Set an oopmap for the call site
-  OopMapSet* oop_maps = new OopMapSet();
-  OopMap* map = new OopMap(SimpleRuntimeFrame::framesize, 0);
-
-  // location of rbp is known implicitly by the frame sender code
-
-  oop_maps->add_gc_map(__ pc() - start, map);
-
-  __ reset_last_Java_frame(false);
-
-  // Load UnrollBlock* into rdi
-  __ mov(rdi, rax);
-
-#ifdef ASSERT
-  { Label L;
-    __ cmpptr(Address(rdi, Deoptimization::UnrollBlock::unpack_kind_offset()),
-              Deoptimization::Unpack_uncommon_trap);
-    __ jcc(Assembler::equal, L);
-    __ stop("SharedRuntime::generate_uncommon_trap_blob: expected Unpack_uncommon_trap");
-    __ bind(L);
-  }
-#endif
-
-  // Pop all the frames we must move/replace.
-  //
-  // Frame picture (youngest to oldest)
-  // 1: self-frame (no frame link)
-  // 2: deopting frame  (no frame link)
-  // 3: caller of deopting frame (could be compiled/interpreted).
-
-  // Pop self-frame.  We have no frame, and must rely only on rax and rsp.
-  __ addptr(rsp, (SimpleRuntimeFrame::framesize - 2) << LogBytesPerInt); // Epilog!
-
-  // Pop deoptimized frame (int)
-  __ movl(rcx, Address(rdi,
-                       Deoptimization::UnrollBlock::
-                       size_of_deoptimized_frame_offset()));
-  __ addptr(rsp, rcx);
-
-  // rsp should be pointing at the return address to the caller (3)
-
-  // Pick up the initial fp we should save
-  // restore rbp before stack bang because if stack overflow is thrown it needs to be pushed (and preserved)
-  __ movptr(rbp, Address(rdi, Deoptimization::UnrollBlock::initial_info_offset()));
-
-#ifdef ASSERT
-  // Compilers generate code that bang the stack by as much as the
-  // interpreter would need. So this stack banging should never
-  // trigger a fault. Verify that it does not on non product builds.
-  __ movl(rbx, Address(rdi ,Deoptimization::UnrollBlock::total_frame_sizes_offset()));
-  __ bang_stack_size(rbx, rcx);
-#endif
-
-  // Load address of array of frame pcs into rcx (address*)
-  __ movptr(rcx, Address(rdi, Deoptimization::UnrollBlock::frame_pcs_offset()));
-
-  // Trash the return pc
-  __ addptr(rsp, wordSize);
-
-  // Load address of array of frame sizes into rsi (intptr_t*)
-  __ movptr(rsi, Address(rdi, Deoptimization::UnrollBlock:: frame_sizes_offset()));
-
-  // Counter
-  __ movl(rdx, Address(rdi, Deoptimization::UnrollBlock:: number_of_frames_offset())); // (int)
-
-  // Now adjust the caller's stack to make up for the extra locals but
-  // record the original sp so that we can save it in the skeletal
-  // interpreter frame and the stack walking of interpreter_sender
-  // will get the unextended sp value and not the "real" sp value.
-
-  const Register sender_sp = r8;
-
-  __ mov(sender_sp, rsp);
-  __ movl(rbx, Address(rdi, Deoptimization::UnrollBlock:: caller_adjustment_offset())); // (int)
-  __ subptr(rsp, rbx);
-
-  // Push interpreter frames in a loop
-  Label loop;
-  __ bind(loop);
-  __ movptr(rbx, Address(rsi, 0)); // Load frame size
-  __ subptr(rbx, 2 * wordSize);    // We'll push pc and rbp by hand
-  __ pushptr(Address(rcx, 0));     // Save return address
-  __ enter();                      // Save old & set new rbp
-  __ subptr(rsp, rbx);             // Prolog
-  __ movptr(Address(rbp, frame::interpreter_frame_sender_sp_offset * wordSize),
-            sender_sp);            // Make it walkable
-  // This value is corrected by layout_activation_impl
-  __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD);
-  __ mov(sender_sp, rsp);          // Pass sender_sp to next frame
-  __ addptr(rsi, wordSize);        // Bump array pointer (sizes)
-  __ addptr(rcx, wordSize);        // Bump array pointer (pcs)
-  __ decrementl(rdx);              // Decrement counter
-  __ jcc(Assembler::notZero, loop);
-  __ pushptr(Address(rcx, 0));     // Save final return address
-
-  // Re-push self-frame
-  __ enter();                 // Save old & set new rbp
-  __ subptr(rsp, (SimpleRuntimeFrame::framesize - 4) << LogBytesPerInt);
-                              // Prolog
-
-  // Use rbp because the frames look interpreted now
-  // Save "the_pc" since it cannot easily be retrieved using the last_java_SP after we aligned SP.
-  // Don't need the precise return PC here, just precise enough to point into this code blob.
-  address the_pc = __ pc();
-  __ set_last_Java_frame(noreg, rbp, the_pc, rscratch1);
-
-  // Call C code.  Need thread but NOT official VM entry
-  // crud.  We cannot block on this call, no GC can happen.  Call should
-  // restore return values to their stack-slots with the new SP.
-  // Thread is in rdi already.
-  //
-  // BasicType unpack_frames(JavaThread* thread, int exec_mode);
-
-  __ andptr(rsp, -(StackAlignmentInBytes)); // Align SP as required by ABI
-  __ mov(c_rarg0, r15_thread);
-  __ movl(c_rarg1, Deoptimization::Unpack_uncommon_trap);
-  __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::unpack_frames)));
-
-  // Set an oopmap for the call site
-  // Use the same PC we used for the last java frame
-  oop_maps->add_gc_map(the_pc - start, new OopMap(SimpleRuntimeFrame::framesize, 0));
-
-  // Clear fp AND pc
-  __ reset_last_Java_frame(true);
-
-  // Pop self-frame.
-  __ leave();                 // Epilog
-
-  // Jump to interpreter
-  __ ret(0);
-
-  // Make sure all code is generated
-  masm->flush();
-
-  _uncommon_trap_blob =  UncommonTrapBlob::create(&buffer, oop_maps,
-                                                 SimpleRuntimeFrame::framesize >> 1);
-}
-#endif // COMPILER2
-
 //------------------------------generate_handler_blob------
 //
 // Generate a special Compile2Runtime blob that saves all registers,
@@ -3669,136 +3475,3 @@ void SharedRuntime::montgomery_square(jint *a_ints, jint *n_ints,
   reverse_words(m, (julong *)m_ints, longwords);
 }
 
-#ifdef COMPILER2
-// This is here instead of runtime_x86_64.cpp because it uses SimpleRuntimeFrame
-//
-//------------------------------generate_exception_blob---------------------------
-// creates exception blob at the end
-// Using exception blob, this code is jumped from a compiled method.
-// (see emit_exception_handler in x86_64.ad file)
-//
-// Given an exception pc at a call we call into the runtime for the
-// handler in this method. This handler might merely restore state
-// (i.e. callee save registers) unwind the frame and jump to the
-// exception handler for the nmethod if there is no Java level handler
-// for the nmethod.
-//
-// This code is entered with a jmp.
-//
-// Arguments:
-//   rax: exception oop
-//   rdx: exception pc
-//
-// Results:
-//   rax: exception oop
-//   rdx: exception pc in caller or ???
-//   destination: exception handler of caller
-//
-// Note: the exception pc MUST be at a call (precise debug information)
-//       Registers rax, rdx, rcx, rsi, rdi, r8-r11 are not callee saved.
-//
-
-void OptoRuntime::generate_exception_blob() {
-  assert(!OptoRuntime::is_callee_saved_register(RDX_num), "");
-  assert(!OptoRuntime::is_callee_saved_register(RAX_num), "");
-  assert(!OptoRuntime::is_callee_saved_register(RCX_num), "");
-
-  assert(SimpleRuntimeFrame::framesize % 4 == 0, "sp not 16-byte aligned");
-
-  // Allocate space for the code
-  ResourceMark rm;
-  // Setup code generation tools
-  CodeBuffer buffer("exception_blob", 2048, 1024);
-  MacroAssembler* masm = new MacroAssembler(&buffer);
-
-
-  address start = __ pc();
-
-  // Exception pc is 'return address' for stack walker
-  __ push(rdx);
-  __ subptr(rsp, SimpleRuntimeFrame::return_off << LogBytesPerInt); // Prolog
-
-  // Save callee-saved registers.  See x86_64.ad.
-
-  // rbp is an implicitly saved callee saved register (i.e., the calling
-  // convention will save/restore it in the prolog/epilog). Other than that
-  // there are no callee save registers now that adapter frames are gone.
-
-  __ movptr(Address(rsp, SimpleRuntimeFrame::rbp_off << LogBytesPerInt), rbp);
-
-  // Store exception in Thread object. We cannot pass any arguments to the
-  // handle_exception call, since we do not want to make any assumption
-  // about the size of the frame where the exception happened in.
-  // c_rarg0 is either rdi (Linux) or rcx (Windows).
-  __ movptr(Address(r15_thread, JavaThread::exception_oop_offset()),rax);
-  __ movptr(Address(r15_thread, JavaThread::exception_pc_offset()), rdx);
-
-  // This call does all the hard work.  It checks if an exception handler
-  // exists in the method.
-  // If so, it returns the handler address.
-  // If not, it prepares for stack-unwinding, restoring the callee-save
-  // registers of the frame being removed.
-  //
-  // address OptoRuntime::handle_exception_C(JavaThread* thread)
-
-  // At a method handle call, the stack may not be properly aligned
-  // when returning with an exception.
-  address the_pc = __ pc();
-  __ set_last_Java_frame(noreg, noreg, the_pc, rscratch1);
-  __ mov(c_rarg0, r15_thread);
-  __ andptr(rsp, -(StackAlignmentInBytes));    // Align stack
-  __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, OptoRuntime::handle_exception_C)));
-
-  // Set an oopmap for the call site.  This oopmap will only be used if we
-  // are unwinding the stack.  Hence, all locations will be dead.
-  // Callee-saved registers will be the same as the frame above (i.e.,
-  // handle_exception_stub), since they were restored when we got the
-  // exception.
-
-  OopMapSet* oop_maps = new OopMapSet();
-
-  oop_maps->add_gc_map(the_pc - start, new OopMap(SimpleRuntimeFrame::framesize, 0));
-
-  __ reset_last_Java_frame(false);
-
-  // Restore callee-saved registers
-
-  // rbp is an implicitly saved callee-saved register (i.e., the calling
-  // convention will save restore it in prolog/epilog) Other than that
-  // there are no callee save registers now that adapter frames are gone.
-
-  __ movptr(rbp, Address(rsp, SimpleRuntimeFrame::rbp_off << LogBytesPerInt));
-
-  __ addptr(rsp, SimpleRuntimeFrame::return_off << LogBytesPerInt); // Epilog
-  __ pop(rdx);                  // No need for exception pc anymore
-
-  // rax: exception handler
-
-  // We have a handler in rax (could be deopt blob).
-  __ mov(r8, rax);
-
-  // Get the exception oop
-  __ movptr(rax, Address(r15_thread, JavaThread::exception_oop_offset()));
-  // Get the exception pc in case we are deoptimized
-  __ movptr(rdx, Address(r15_thread, JavaThread::exception_pc_offset()));
-#ifdef ASSERT
-  __ movptr(Address(r15_thread, JavaThread::exception_handler_pc_offset()), NULL_WORD);
-  __ movptr(Address(r15_thread, JavaThread::exception_pc_offset()), NULL_WORD);
-#endif
-  // Clear the exception oop so GC no longer processes it as a root.
-  __ movptr(Address(r15_thread, JavaThread::exception_oop_offset()), NULL_WORD);
-
-  // rax: exception oop
-  // r8:  exception handler
-  // rdx: exception pc
-  // Jump to handler
-
-  __ jmp(r8);
-
-  // Make sure all code is generated
-  masm->flush();
-
-  // Set exception blob
-  _exception_blob =  ExceptionBlob::create(&buffer, oop_maps, SimpleRuntimeFrame::framesize >> 1);
-}
-#endif // COMPILER2
diff --git a/src/hotspot/share/opto/graphKit.cpp b/src/hotspot/share/opto/graphKit.cpp
index 569d6bc35cd16..3bc5b9a8b2a7d 100644
--- a/src/hotspot/share/opto/graphKit.cpp
+++ b/src/hotspot/share/opto/graphKit.cpp
@@ -2151,7 +2151,7 @@ Node* GraphKit::uncommon_trap(int trap_request,
   kill_dead_locals();
 
   // Now insert the uncommon trap subroutine call
-  address call_addr = SharedRuntime::uncommon_trap_blob()->entry_point();
+  address call_addr = OptoRuntime::uncommon_trap_blob()->entry_point();
   const TypePtr* no_memory_effects = nullptr;
   // Pass the index of the class to be loaded
   Node* call = make_runtime_call(RC_NO_LEAF | RC_UNCOMMON |
diff --git a/src/hotspot/share/opto/lcm.cpp b/src/hotspot/share/opto/lcm.cpp
index 549290397e3b7..9db94748ca27c 100644
--- a/src/hotspot/share/opto/lcm.cpp
+++ b/src/hotspot/share/opto/lcm.cpp
@@ -122,7 +122,7 @@ void PhaseCFG::implicit_null_check(Block* block, Node *proj, Node *val, int allo
     for (uint i1 = 0; i1 < null_block->number_of_nodes(); i1++) {
       Node* nn = null_block->get_node(i1);
       if (nn->is_MachCall() &&
-          nn->as_MachCall()->entry_point() == SharedRuntime::uncommon_trap_blob()->entry_point()) {
+          nn->as_MachCall()->entry_point() == OptoRuntime::uncommon_trap_blob()->entry_point()) {
         const Type* trtype = nn->in(TypeFunc::Parms)->bottom_type();
         if (trtype->isa_int() && trtype->is_int()->is_con()) {
           jint tr_con = trtype->is_int()->get_con();
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index f1c3e592fff53..9660413dd190f 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -5949,7 +5949,7 @@ CallStaticJavaNode* LibraryCallKit::get_uncommon_trap_from_success_proj(Node* no
     for (DUIterator_Fast jmax, j = other_proj->fast_outs(jmax); j < jmax; j++) {
       Node* obs = other_proj->fast_out(j);
       if (obs->in(0) == other_proj && obs->is_CallStaticJava() &&
-          (obs->as_CallStaticJava()->entry_point() == SharedRuntime::uncommon_trap_blob()->entry_point())) {
+          (obs->as_CallStaticJava()->entry_point() == OptoRuntime::uncommon_trap_blob()->entry_point())) {
         return obs->as_CallStaticJava();
       }
     }
diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index 45e59f4e21680..b4c134570e63f 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -567,7 +567,7 @@ void PhaseIdealLoop::add_parse_predicate(Deoptimization::DeoptReason reason, Nod
     register_control(if_true, loop, parse_predicate);
 
     int trap_request = Deoptimization::make_trap_request(reason, Deoptimization::Action_maybe_recompile);
-    address call_addr = SharedRuntime::uncommon_trap_blob()->entry_point();
+    address call_addr = OptoRuntime::uncommon_trap_blob()->entry_point();
     const TypePtr* no_memory_effects = nullptr;
     JVMState* jvms = sfpt->jvms();
     CallNode* unc = new CallStaticJavaNode(OptoRuntime::uncommon_trap_Type(), call_addr, "uncommon_trap",
diff --git a/src/hotspot/share/opto/matcher.cpp b/src/hotspot/share/opto/matcher.cpp
index 4c2f208e445c1..4e2306602e6f7 100644
--- a/src/hotspot/share/opto/matcher.cpp
+++ b/src/hotspot/share/opto/matcher.cpp
@@ -2960,7 +2960,7 @@ bool Matcher::branches_to_uncommon_trap(const Node *n) {
     }
 
     if (call &&
-        call->entry_point() == SharedRuntime::uncommon_trap_blob()->entry_point()) {
+        call->entry_point() == OptoRuntime::uncommon_trap_blob()->entry_point()) {
       const Type* trtype = call->in(TypeFunc::Parms)->bottom_type();
       if (trtype->isa_int() && trtype->is_int()->is_con()) {
         jint tr_con = trtype->is_int()->get_con();
diff --git a/src/hotspot/share/opto/runtime.cpp b/src/hotspot/share/opto/runtime.cpp
index 465404bb4693f..54408146d0c26 100644
--- a/src/hotspot/share/opto/runtime.cpp
+++ b/src/hotspot/share/opto/runtime.cpp
@@ -114,7 +114,8 @@ address OptoRuntime::_notify_jvmti_vthread_mount                  = nullptr;
 address OptoRuntime::_notify_jvmti_vthread_unmount                = nullptr;
 #endif
 
-ExceptionBlob* OptoRuntime::_exception_blob;
+UncommonTrapBlob*   OptoRuntime::_uncommon_trap_blob;
+ExceptionBlob*      OptoRuntime::_exception_blob;
 
 // This should be called in an assertion at the start of OptoRuntime routines
 // which are entered from compiled code (all of them)
@@ -138,6 +139,7 @@ static bool check_compiled_frame(JavaThread* thread) {
 
 bool OptoRuntime::generate(ciEnv* env) {
 
+  generate_uncommon_trap_blob();
   generate_exception_blob();
 
   // Note: tls: Means fetching the return oop out of the thread-local storage
diff --git a/src/hotspot/share/opto/runtime.hpp b/src/hotspot/share/opto/runtime.hpp
index 6aadab9712243..34c2780a2f8d7 100644
--- a/src/hotspot/share/opto/runtime.hpp
+++ b/src/hotspot/share/opto/runtime.hpp
@@ -168,7 +168,10 @@ class OptoRuntime : public AllStatic {
   // CodeBlob support
   // ===================================================================
 
+  static UncommonTrapBlob*   _uncommon_trap_blob;
   static ExceptionBlob*       _exception_blob;
+
+  static void generate_uncommon_trap_blob(void);
   static void generate_exception_blob();
 
   static void register_finalizer(oopDesc* obj, JavaThread* current);
@@ -208,6 +211,7 @@ class OptoRuntime : public AllStatic {
   static address notify_jvmti_vthread_unmount()          { return _notify_jvmti_vthread_unmount; }
 #endif
 
+  static UncommonTrapBlob* uncommon_trap_blob()                  { return _uncommon_trap_blob; }
   static ExceptionBlob*    exception_blob()                      { return _exception_blob; }
 
   // Implicit exception support
diff --git a/src/hotspot/share/opto/stringopts.cpp b/src/hotspot/share/opto/stringopts.cpp
index 2e227be765cfa..7bf75c93055a5 100644
--- a/src/hotspot/share/opto/stringopts.cpp
+++ b/src/hotspot/share/opto/stringopts.cpp
@@ -203,7 +203,7 @@ class StringConcat : public ResourceObj {
       Node* uct = _uncommon_traps.at(u);
 
       // Build a new call using the jvms state of the allocate
-      address call_addr = SharedRuntime::uncommon_trap_blob()->entry_point();
+      address call_addr = OptoRuntime::uncommon_trap_blob()->entry_point();
       const TypeFunc* call_type = OptoRuntime::uncommon_trap_Type();
       const TypePtr* no_memory_effects = nullptr;
       Compile* C = _stringopts->C;
diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index 0e6d367586b9d..0eec7e4c34cae 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -100,10 +100,6 @@ SafepointBlob*      SharedRuntime::_polling_page_vectors_safepoint_handler_blob;
 SafepointBlob*      SharedRuntime::_polling_page_safepoint_handler_blob;
 SafepointBlob*      SharedRuntime::_polling_page_return_handler_blob;
 
-#ifdef COMPILER2
-UncommonTrapBlob*   SharedRuntime::_uncommon_trap_blob;
-#endif // COMPILER2
-
 nmethod*            SharedRuntime::_cont_doYield_stub;
 
 //----------------------------generate_stubs-----------------------------------
@@ -129,10 +125,6 @@ void SharedRuntime::generate_stubs() {
   _polling_page_return_handler_blob    = generate_handler_blob(CAST_FROM_FN_PTR(address, SafepointSynchronize::handle_polling_page_exception), POLL_AT_RETURN);
 
   generate_deopt_blob();
-
-#ifdef COMPILER2
-  generate_uncommon_trap_blob();
-#endif // COMPILER2
 }
 
 #include <math.h>
diff --git a/src/hotspot/share/runtime/sharedRuntime.hpp b/src/hotspot/share/runtime/sharedRuntime.hpp
index da61883b2fe64..9eec8e079ec34 100644
--- a/src/hotspot/share/runtime/sharedRuntime.hpp
+++ b/src/hotspot/share/runtime/sharedRuntime.hpp
@@ -62,10 +62,6 @@ class SharedRuntime: AllStatic {
   static SafepointBlob*      _polling_page_safepoint_handler_blob;
   static SafepointBlob*      _polling_page_return_handler_blob;
 
-#ifdef COMPILER2
-  static UncommonTrapBlob*   _uncommon_trap_blob;
-#endif // COMPILER2
-
   static nmethod*            _cont_doYield_stub;
 
 #ifndef PRODUCT
@@ -223,11 +219,6 @@ class SharedRuntime: AllStatic {
     return _wrong_method_abstract_blob->entry_point();
   }
 
-#ifdef COMPILER2
-  static void generate_uncommon_trap_blob(void);
-  static UncommonTrapBlob* uncommon_trap_blob()                  { return _uncommon_trap_blob; }
-#endif // COMPILER2
-
   static address get_resolve_opt_virtual_call_stub() {
     assert(_resolve_opt_virtual_call_blob != nullptr, "oops");
     return _resolve_opt_virtual_call_blob->entry_point();

From 53db937dd0766695906dc20c1dbbd3228c02fe1e Mon Sep 17 00:00:00 2001
From: Feilong Jiang <fjiang@openjdk.org>
Date: Tue, 6 Aug 2024 14:01:23 +0000
Subject: [PATCH 326/401] 8337780: RISC-V: C2: Change C calling convention for
 sp to NS

Reviewed-by: fyang, rehn
---
 src/hotspot/cpu/riscv/riscv.ad | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index b176c6e9cb7c2..1e26c2bf14202 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -84,8 +84,8 @@ reg_def R0      ( NS,  NS,  Op_RegI, 0,  x0->as_VMReg()         ); // zr
 reg_def R0_H    ( NS,  NS,  Op_RegI, 0,  x0->as_VMReg()->next() );
 reg_def R1      ( NS,  SOC, Op_RegI, 1,  x1->as_VMReg()         ); // ra
 reg_def R1_H    ( NS,  SOC, Op_RegI, 1,  x1->as_VMReg()->next() );
-reg_def R2      ( NS,  SOE, Op_RegI, 2,  x2->as_VMReg()         ); // sp
-reg_def R2_H    ( NS,  SOE, Op_RegI, 2,  x2->as_VMReg()->next() );
+reg_def R2      ( NS,  NS,  Op_RegI, 2,  x2->as_VMReg()         ); // sp
+reg_def R2_H    ( NS,  NS,  Op_RegI, 2,  x2->as_VMReg()->next() );
 reg_def R3      ( NS,  NS,  Op_RegI, 3,  x3->as_VMReg()         ); // gp
 reg_def R3_H    ( NS,  NS,  Op_RegI, 3,  x3->as_VMReg()->next() );
 reg_def R4      ( NS,  NS,  Op_RegI, 4,  x4->as_VMReg()         ); // tp

From 3f8b3e55276336cbb814d3b746d4337678389969 Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Tue, 6 Aug 2024 16:37:59 +0000
Subject: [PATCH 327/401] 8337887: [JVMCI] Clarify
 jdk.vm.ci.code.Architecture.getName javadoc

Reviewed-by: never
---
 .../share/classes/jdk/vm/ci/aarch64/AArch64.java    |  2 ++
 .../share/classes/jdk/vm/ci/amd64/AMD64.java        |  2 ++
 .../share/classes/jdk/vm/ci/code/Architecture.java  | 13 +++++++++----
 .../share/classes/jdk/vm/ci/riscv64/RISCV64.java    |  2 ++
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/aarch64/AArch64.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/aarch64/AArch64.java
index 609e01a8db154..c0d6c4cdb84ee 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/aarch64/AArch64.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/aarch64/AArch64.java
@@ -35,6 +35,8 @@
 
 /**
  * Represents the AArch64 architecture.
+ *
+ * The value returned by {@code Architecture#getName} for an instance of this class is {@code "aarch64"}.
  */
 public class AArch64 extends Architecture {
 
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/amd64/AMD64.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/amd64/AMD64.java
index 83401fed62033..f0ca7a2fc2359 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/amd64/AMD64.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/amd64/AMD64.java
@@ -40,6 +40,8 @@
 
 /**
  * Represents the AMD64 architecture.
+ *
+ * The value returned by {@code Architecture#getName} for an instance of this class is {@code "AMD64"}.
  */
 public class AMD64 extends Architecture {
 
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/Architecture.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/Architecture.java
index f14855cd6b995..64b0600674fd6 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/Architecture.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/code/Architecture.java
@@ -107,7 +107,7 @@ protected Architecture(String name, PlatformKind wordKind, ByteOrder byteOrder,
     /**
      * Converts this architecture to a string.
      *
-     * @return the string representation of this architecture
+     * @return a lowercase version of {@linkplain #getName name}
      */
     @Override
     public final String toString() {
@@ -126,9 +126,14 @@ public PlatformKind getWordKind() {
         return wordKind;
     }
 
-    /**
-     * Gets the name of this architecture.
-     */
+    /// Gets the name of this architecture. The value returned for
+    /// each architecture is shown in the table below.
+    ///
+    /// | Name      | Receiver type               |
+    /// |-----------|-----------------------------|
+    /// | "aarch64" | [jdk.vm.ci.aarch64.AArch64] |
+    /// | "AMD64"   | [jdk.vm.ci.amd64.AMD64]     |
+    /// | "riscv64" | [jdk.vm.ci.riscv64.RISCV64] |
     public String getName() {
         return name;
     }
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/riscv64/RISCV64.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/riscv64/RISCV64.java
index c06ba315a149c..0a28703001503 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/riscv64/RISCV64.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/riscv64/RISCV64.java
@@ -35,6 +35,8 @@
 
 /**
  * Represents the RISCV64 architecture.
+ *
+ * The value returned by {@code Architecture#getName} for an instance of this class is {@code "riscv64"}.
  */
 public class RISCV64 extends Architecture {
 

From ff634a967027cfa56b666d31c45db9a4acc09ea4 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Tue, 6 Aug 2024 20:11:21 +0000
Subject: [PATCH 328/401] 8337506: Disable "best-fit" mapping on Windows
 command line

Reviewed-by: alanb
---
 src/java.base/share/native/launcher/main.c    | 22 ++++-
 .../launcher/DisableBestFitMappingTest.java   | 83 +++++++++++++++++++
 2 files changed, 103 insertions(+), 2 deletions(-)
 create mode 100644 test/jdk/tools/launcher/DisableBestFitMappingTest.java

diff --git a/src/java.base/share/native/launcher/main.c b/src/java.base/share/native/launcher/main.c
index d3898d7adc634..c504c13154f5b 100644
--- a/src/java.base/share/native/launcher/main.c
+++ b/src/java.base/share/native/launcher/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -110,7 +110,25 @@ main(int argc, char **argv)
             }
         }
     }
-    JLI_CmdToArgs(GetCommandLine());
+
+    // Obtain the command line in UTF-16, then convert it to ANSI code page
+    // without the "best-fit" option
+    LPWSTR wcCmdline = GetCommandLineW();
+    int mbSize = WideCharToMultiByte(CP_ACP,
+        WC_NO_BEST_FIT_CHARS | WC_COMPOSITECHECK | WC_DEFAULTCHAR,
+        wcCmdline, -1, NULL, 0, NULL, NULL);
+    // If the call to WideCharToMultiByte() fails, it returns 0, which
+    // will then make the following JLI_MemAlloc() to issue exit(1)
+    LPSTR mbCmdline = JLI_MemAlloc(mbSize);
+    if (WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS | WC_COMPOSITECHECK | WC_DEFAULTCHAR,
+        wcCmdline, -1, mbCmdline, mbSize, NULL, NULL) == 0) {
+        perror("command line encoding conversion failure");
+        exit(1);
+    }
+
+    JLI_CmdToArgs(mbCmdline);
+    JLI_MemFree(mbCmdline);
+
     margc = JLI_GetStdArgc();
     // add one more to mark the end
     margv = (char **)JLI_MemAlloc((margc + 1) * (sizeof(char *)));
diff --git a/test/jdk/tools/launcher/DisableBestFitMappingTest.java b/test/jdk/tools/launcher/DisableBestFitMappingTest.java
new file mode 100644
index 0000000000000..6602aae60a9fe
--- /dev/null
+++ b/test/jdk/tools/launcher/DisableBestFitMappingTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 8337506
+ * @summary Verify Command Line arguments are not mapped with
+ *     "best-fit" mappings on Windows
+ * @requires (os.family == "windows")
+ * @library /test/lib
+ * @run junit DisableBestFitMappingTest
+ */
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetEncoder;
+import java.util.stream.Stream;
+import jdk.test.lib.process.ProcessTools;
+
+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.*;
+import static org.junit.jupiter.api.Assumptions.*;
+
+public class DisableBestFitMappingTest {
+    private static final CharsetEncoder NATIVE_ENC =
+            Charset.forName(System.getProperty("native.encoding")).newEncoder();
+    private static final String REPLACEMENT =
+            NATIVE_ENC.charset().decode(ByteBuffer.wrap(NATIVE_ENC.replacement())).toString();
+    private static final int EXIT_SUCCESS = 0;
+    private static final int EXIT_FAILURE = -1;
+
+    static Stream<Arguments> CMD_ARGS() {
+        return Stream.of(
+                Arguments.of("aa\uff02 \uff02bb", "aa" + REPLACEMENT + " " + REPLACEMENT + "bb"),
+                Arguments.of("aa\uff01bb", "aa" + REPLACEMENT + "bb"),
+                Arguments.of("aa\u221ebb", "aa" + REPLACEMENT + "bb")
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("CMD_ARGS")
+    void testDisableBestFitMapping(String arg, String expected) throws Exception {
+        // Only execute if the arg cannot be encoded
+        assumeFalse(NATIVE_ENC.canEncode(arg),
+                "native.encoding (%s) can encode the argument '%s'. Test ignored."
+                        .formatted(NATIVE_ENC.charset(), arg));
+
+        var result= ProcessTools.executeTestJava(
+                DisableBestFitMappingTest.class.getSimpleName(), arg, expected);
+        result.asLines().forEach(System.out::println);
+        assertEquals(EXIT_SUCCESS, result.getExitValue(),
+                "Disabling best-fit mapping failed");
+    }
+
+    public static void main(String... args) {
+        System.out.println(args[0]);
+        System.out.println(args[1]);
+        System.exit(args[0].equals(args[1]) ? EXIT_SUCCESS : EXIT_FAILURE);
+    }
+}

From 22a3421379162bb302fb8e5ccc315e53d95b6245 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Tue, 6 Aug 2024 20:15:47 +0000
Subject: [PATCH 329/401] 8337786: Fix simple -Wzero-as-null-pointer-constant
 warnings in aarch64 code

Reviewed-by: shade, tschatzl
---
 src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp | 2 +-
 src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp     | 4 ++--
 src/hotspot/cpu/aarch64/frame_aarch64.cpp           | 6 +++---
 src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp  | 2 +-
 src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp      | 4 ++--
 src/hotspot/cpu/aarch64/vm_version_aarch64.cpp      | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
index 615c8e19ac863..91430be5835b5 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
@@ -647,7 +647,7 @@ void LIR_Assembler::const2mem(LIR_Opr src, LIR_Opr dest, BasicType type, CodeEmi
     break;
   case T_OBJECT:
   case T_ARRAY:
-    assert(c->as_jobject() == 0, "should be");
+    assert(c->as_jobject() == nullptr, "should be");
     if (UseCompressedOops && !wide) {
       insn = &Assembler::strw;
     } else {
diff --git a/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp
index 63a32e714e365..780055a611f3b 100644
--- a/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2021, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -1029,4 +1029,4 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) {
 
 #undef __
 
-const char *Runtime1::pd_name_for_address(address entry) { Unimplemented(); return 0; }
+const char *Runtime1::pd_name_for_address(address entry) { Unimplemented(); }
diff --git a/src/hotspot/cpu/aarch64/frame_aarch64.cpp b/src/hotspot/cpu/aarch64/frame_aarch64.cpp
index 0387f763bbdd7..c2b127f31bb6d 100644
--- a/src/hotspot/cpu/aarch64/frame_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/frame_aarch64.cpp
@@ -293,7 +293,7 @@ void frame::patch_pc(Thread* thread, address pc) {
 
   // Either the return address is the original one or we are going to
   // patch in the same address that's already there.
-  assert(_pc == pc_old || pc == pc_old || pc_old == 0, "");
+  assert(_pc == pc_old || pc == pc_old || pc_old == nullptr, "");
   DEBUG_ONLY(address old_pc = _pc;)
   *pc_addr = signed_pc;
   _pc = pc; // must be set before call to get_deopt_original_pc
@@ -497,10 +497,10 @@ frame frame::sender_for_interpreter_frame(RegisterMap* map) const {
 bool frame::is_interpreted_frame_valid(JavaThread* thread) const {
   assert(is_interpreted_frame(), "Not an interpreted frame");
   // These are reasonable sanity checks
-  if (fp() == 0 || (intptr_t(fp()) & (wordSize-1)) != 0) {
+  if (fp() == nullptr || (intptr_t(fp()) & (wordSize-1)) != 0) {
     return false;
   }
-  if (sp() == 0 || (intptr_t(sp()) & (wordSize-1)) != 0) {
+  if (sp() == nullptr || (intptr_t(sp()) & (wordSize-1)) != 0) {
     return false;
   }
   if (fp() + interpreter_frame_initial_sp_offset < sp()) {
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index e210c8b3de05a..25dfaca6dca20 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -215,7 +215,7 @@ class RelocActions {
           break;
         } else {
           // nothing to do
-          assert(target == 0, "did not expect to relocate target for polling page load");
+          assert(target == nullptr, "did not expect to relocate target for polling page load");
         }
         break;
       }
diff --git a/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp b/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp
index 5a3f9d228ca89..770ed2f6c3868 100644
--- a/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp
@@ -228,7 +228,7 @@ address NativeJump::jump_destination() const          {
   // load
 
   // return -1 if jump to self or to 0
-  if ((dest == (address)this) || dest == 0) {
+  if ((dest == (address)this) || dest == nullptr) {
     dest = (address) -1;
   }
   return dest;
@@ -256,7 +256,7 @@ address NativeGeneralJump::jump_destination() const {
   // a general jump
 
   // return -1 if jump to self or to 0
-  if ((dest == (address)this) || dest == 0) {
+  if ((dest == (address)this) || dest == nullptr) {
     dest = (address) -1;
   }
   return dest;
diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
index aa64f411dbfb9..c0f10adc85df9 100644
--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
@@ -606,12 +606,12 @@ static bool check_info_file(const char* fpath,
     return false;
   }
   while (fgets(line, sizeof(line), fp) != nullptr) {
-    if (strcasestr(line, virt1) != 0) {
+    if (strcasestr(line, virt1) != nullptr) {
       Abstract_VM_Version::_detected_virtualization = vt1;
       fclose(fp);
       return true;
     }
-    if (virt2 != nullptr && strcasestr(line, virt2) != 0) {
+    if (virt2 != nullptr && strcasestr(line, virt2) != nullptr) {
       Abstract_VM_Version::_detected_virtualization = vt2;
       fclose(fp);
       return true;

From fc652d2a58bfd99b05011c051e5710d1dac049ab Mon Sep 17 00:00:00 2001
From: Alisen Chung <achung@openjdk.org>
Date: Tue, 6 Aug 2024 21:10:06 +0000
Subject: [PATCH 330/401] 8235404: [macos] JOptionPane blocks drawing string on
 another component

Reviewed-by: honkar, dnguyen
---
 .../classes/javax/swing/JOptionPane.java      |  7 +-
 .../swing/JOptionPane/OptionPaneInput.java    | 80 +++++++++++++++++++
 2 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 test/jdk/javax/swing/JOptionPane/OptionPaneInput.java

diff --git a/src/java.desktop/share/classes/javax/swing/JOptionPane.java b/src/java.desktop/share/classes/javax/swing/JOptionPane.java
index 930acc90b35c3..1c1f3ee9ba355 100644
--- a/src/java.desktop/share/classes/javax/swing/JOptionPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JOptionPane.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -883,6 +883,11 @@ public static int showOptionDialog(Component parentComponent,
 
         Object        selectedValue = pane.getValue();
 
+        if (parentComponent != null) {
+            parentComponent.revalidate();
+            parentComponent.repaint();
+        }
+
         if(selectedValue == null)
             return CLOSED_OPTION;
         if(options == null) {
diff --git a/test/jdk/javax/swing/JOptionPane/OptionPaneInput.java b/test/jdk/javax/swing/JOptionPane/OptionPaneInput.java
new file mode 100644
index 0000000000000..998efccf1f3ce
--- /dev/null
+++ b/test/jdk/javax/swing/JOptionPane/OptionPaneInput.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.Graphics2D;
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+import javax.swing.JTextField;
+import javax.swing.SwingUtilities;
+
+/*
+ * @test
+ * @bug 8235404
+ * @summary Checks that JOptionPane doesn't block drawing strings on another component
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual OptionPaneInput
+ */
+public class OptionPaneInput {
+    private static JFrame f;
+    private static Canvas c;
+    private static JTextField t;
+    private static final String instructions = """
+            1. Type "test" into the message dialog.
+            2. Press enter key.
+            3. Press OK button.
+            4. If the OptionPaneInput frame has test drawn on it, pass. Otherwise fail.
+            """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame testFrame = new PassFailJFrame(instructions);
+
+        SwingUtilities.invokeAndWait(() -> createGUI());
+        testFrame.awaitAndCheck();
+    }
+
+    public static void createGUI() {
+        f = new JFrame("OptionPaneInput");
+        c = new Canvas();
+        t = new JTextField();
+        f.add(c);
+
+        t.addActionListener(e -> {
+            String text = t.getText();
+            Graphics2D g2 = (Graphics2D)(c.getGraphics());
+            g2.setColor(Color.BLACK);
+            g2.drawString(text, 10, 10);
+            System.out.println("drawing "+text);
+            g2.dispose();
+        });
+
+        f.setSize(300, 100);
+        PassFailJFrame.addTestWindow(f);
+        PassFailJFrame.positionTestWindow(f, PassFailJFrame.Position.HORIZONTAL);
+        f.setVisible(true);
+
+        JOptionPane.showMessageDialog(f, t);
+    }
+}

From 6733b89de1ed9ebcc1e8a8271970048ad0f0aac3 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Tue, 6 Aug 2024 21:44:30 +0000
Subject: [PATCH 331/401] 8337667: sun/tools/jcmd/TestJcmdPIDSubstitution.java
 is failing on mac and windows

Reviewed-by: stuefe, kevinw
---
 test/jdk/sun/tools/jcmd/TestJcmdPIDSubstitution.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/jdk/sun/tools/jcmd/TestJcmdPIDSubstitution.java b/test/jdk/sun/tools/jcmd/TestJcmdPIDSubstitution.java
index f462ea1a52b0d..4af5bf1ff6755 100644
--- a/test/jdk/sun/tools/jcmd/TestJcmdPIDSubstitution.java
+++ b/test/jdk/sun/tools/jcmd/TestJcmdPIDSubstitution.java
@@ -40,6 +40,8 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
+import jdk.test.lib.Platform;
+
 public class TestJcmdPIDSubstitution {
 
     private static final String FILENAME = "myfile%p";
@@ -47,8 +49,10 @@ public class TestJcmdPIDSubstitution {
     public static void main(String[] args) throws Exception {
         verifyOutputFilenames("Thread.dump_to_file", FILENAME);
         verifyOutputFilenames("GC.heap_dump", FILENAME);
-        verifyOutputFilenames("Compiler.perfmap", FILENAME);
-        verifyOutputFilenames("System.dump_map", "-F=%s".formatted(FILENAME));
+        if (Platform.isLinux()) {
+            verifyOutputFilenames("Compiler.perfmap", FILENAME);
+            verifyOutputFilenames("System.dump_map", "-F=%s".formatted(FILENAME));
+        }
     }
 
     private static void verifyOutputFilenames(String... args) throws Exception {

From 920751e5d5838dab90438117a77f43876902eb72 Mon Sep 17 00:00:00 2001
From: Alex Menkov <amenkov@openjdk.org>
Date: Tue, 6 Aug 2024 21:56:48 +0000
Subject: [PATCH 332/401] 8311990: Two JDI tests may interfere with each other

Reviewed-by: dholmes, sspitsyn
---
 test/jdk/com/sun/jdi/JdwpListenTest.java |  5 +++--
 test/jdk/com/sun/jdi/JdwpNetProps.java   | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/test/jdk/com/sun/jdi/JdwpListenTest.java b/test/jdk/com/sun/jdi/JdwpListenTest.java
index a55eefb58689c..53f5b404de5e4 100644
--- a/test/jdk/com/sun/jdi/JdwpListenTest.java
+++ b/test/jdk/com/sun/jdi/JdwpListenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,8 @@ public class JdwpListenTest {
 
     // Set to true to allow testing of attach from wrong address (expected to fail).
     // It's off by default as it causes test time increase and test interference (see JDK-8231915).
-    private static boolean allowNegativeTesting = false;
+    private static boolean allowNegativeTesting =
+        "true".equalsIgnoreCase(System.getProperty("jdk.jdi.allowNegativeTesting"));
 
     public static void main(String[] args) throws Exception {
         List<InetAddress> addresses = Utils.getAddressesWithSymbolicAndNumericScopes();
diff --git a/test/jdk/com/sun/jdi/JdwpNetProps.java b/test/jdk/com/sun/jdi/JdwpNetProps.java
index af69c9ca3adf2..0247e4551a3da 100644
--- a/test/jdk/com/sun/jdi/JdwpNetProps.java
+++ b/test/jdk/com/sun/jdi/JdwpNetProps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,6 +49,11 @@
  */
 public class JdwpNetProps {
 
+    // Set to true to allow testing of attach from wrong address (expected to fail).
+    // It's off by default as it causes test interference (see JDK-8311990).
+    private static boolean allowNegativeAttachTesting =
+        "true".equalsIgnoreCase(System.getProperty("jdk.jdi.allowNegativeTesting"));
+
     public static void main(String[] args) throws Exception {
         InetAddress addrs[] = InetAddress.getAllByName("localhost");
         InetAddress ipv4Address = null;
@@ -171,6 +176,14 @@ public ListenTest preferIPv6Addresses(String value) {
         }
 
         public void run(TestResult expectedResult) throws Exception {
+            log("\nTest: listen at " + listenAddress + ", attaching to " + connectAddress
+                + ", preferIPv4Stack = " + preferIPv4Stack
+                + ", preferIPv6Addresses = " + preferIPv6Addresses
+                + ", expectedResult = " + expectedResult);
+            if (expectedResult == TestResult.AttachFailed && !allowNegativeAttachTesting) {
+                log("SKIPPED: negative attach testing is disabled");
+                return;
+            }
             List<String> options = new LinkedList<>();
             if (preferIPv4Stack != null) {
                 options.add("-Djava.net.preferIPv4Stack=" + preferIPv4Stack.toString());

From 66286b25a183de2ffd0689da9c2bd1978b881aa7 Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <thartmann@openjdk.org>
Date: Wed, 7 Aug 2024 05:32:28 +0000
Subject: [PATCH 333/401] 8337968: Problem list
 compiler/vectorapi/VectorRebracket128Test.java

Reviewed-by: chagedorn
---
 test/hotspot/jtreg/ProblemList.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 7e7970a4c6caf..f5b14e87607e3 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -59,6 +59,8 @@ compiler/codecache/CheckLargePages.java 8332654 linux-x64
 
 compiler/vectorapi/reshape/TestVectorReinterpret.java 8320897 aix-ppc64,linux-ppc64le
 compiler/vectorapi/VectorLogicalOpIdentityTest.java 8302459 linux-x64,windows-x64
+compiler/vectorapi/VectorRebracket128Test.java#ZSinglegen 8330538 generic-all
+compiler/vectorapi/VectorRebracket128Test.java#ZGenerational 8330538 generic-all
 
 compiler/jvmci/TestUncaughtErrorInCompileMethod.java 8309073 generic-all
 

From 41f784fe63f8e06a25e1fe00dc96e398874adf81 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Wed, 7 Aug 2024 07:48:05 +0000
Subject: [PATCH 334/401] 8335925: Serial: Move allocation API from Generation
 to subclasses

Reviewed-by: gli, kbarrett, iwalulya
---
 src/hotspot/share/gc/serial/defNewGeneration.cpp   | 10 ++--------
 src/hotspot/share/gc/serial/defNewGeneration.hpp   |  8 +++-----
 src/hotspot/share/gc/serial/generation.hpp         | 14 --------------
 src/hotspot/share/gc/serial/serialHeap.cpp         | 13 +++++++------
 src/hotspot/share/gc/serial/tenuredGeneration.cpp  |  9 ++++-----
 src/hotspot/share/gc/serial/tenuredGeneration.hpp  |  8 +++++---
 .../share/gc/serial/tenuredGeneration.inline.hpp   | 14 +-------------
 7 files changed, 22 insertions(+), 54 deletions(-)

diff --git a/src/hotspot/share/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp
index e93b97c85eb12..047171a5eb364 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.cpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.cpp
@@ -572,11 +572,6 @@ HeapWord* DefNewGeneration::block_start(const void* p) const {
   return block_start_const(to(), p);
 }
 
-HeapWord* DefNewGeneration::expand_and_allocate(size_t size, bool is_tlab) {
-  // We don't attempt to expand the young generation (but perhaps we should.)
-  return allocate(size, is_tlab);
-}
-
 void DefNewGeneration::adjust_desired_tenuring_threshold() {
   // Set the desired survivor size to half the real survivor space
   size_t const survivor_capacity = to()->capacity() / HeapWordSize;
@@ -865,7 +860,7 @@ const char* DefNewGeneration::name() const {
   return "def new generation";
 }
 
-HeapWord* DefNewGeneration::allocate(size_t word_size, bool is_tlab) {
+HeapWord* DefNewGeneration::allocate(size_t word_size) {
   // This is the slow-path allocation for the DefNewGeneration.
   // Most allocations are fast-path in compiled code.
   // We try to allocate from the eden.  If that works, we are happy.
@@ -875,8 +870,7 @@ HeapWord* DefNewGeneration::allocate(size_t word_size, bool is_tlab) {
   return result;
 }
 
-HeapWord* DefNewGeneration::par_allocate(size_t word_size,
-                                         bool is_tlab) {
+HeapWord* DefNewGeneration::par_allocate(size_t word_size) {
   return eden()->par_allocate(word_size);
 }
 
diff --git a/src/hotspot/share/gc/serial/defNewGeneration.hpp b/src/hotspot/share/gc/serial/defNewGeneration.hpp
index 011b79fdabd6b..c5b7c095ac4e6 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.hpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.hpp
@@ -209,9 +209,9 @@ class DefNewGeneration: public Generation {
     return result;
   }
 
-  HeapWord* allocate(size_t word_size, bool is_tlab);
-
-  HeapWord* par_allocate(size_t word_size, bool is_tlab);
+  // Allocate requested size or return null; single-threaded and lock-free versions.
+  HeapWord* allocate(size_t word_size);
+  HeapWord* par_allocate(size_t word_size);
 
   void gc_epilogue(bool full);
 
@@ -227,8 +227,6 @@ class DefNewGeneration: public Generation {
 
   bool collect(bool clear_all_soft_refs);
 
-  HeapWord* expand_and_allocate(size_t size, bool is_tlab);
-
   oop copy_to_survivor_space(oop old);
   uint tenuring_threshold() { return _tenuring_threshold; }
 
diff --git a/src/hotspot/share/gc/serial/generation.hpp b/src/hotspot/share/gc/serial/generation.hpp
index a757c97c5cb15..beb29928f4826 100644
--- a/src/hotspot/share/gc/serial/generation.hpp
+++ b/src/hotspot/share/gc/serial/generation.hpp
@@ -103,20 +103,6 @@ class Generation: public CHeapObj<mtGC> {
     return _reserved.contains(p);
   }
 
-  // Allocate and returns a block of the requested size, or returns "null".
-  // Assumes the caller has done any necessary locking.
-  virtual HeapWord* allocate(size_t word_size, bool is_tlab) = 0;
-
-  // Like "allocate", but performs any necessary locking internally.
-  virtual HeapWord* par_allocate(size_t word_size, bool is_tlab) = 0;
-
-  // Perform a heap collection, attempting to create (at least) enough
-  // space to support an allocation of the given "word_size".  If
-  // successful, perform the allocation and return the resulting
-  // "oop" (initializing the allocated block). If the allocation is
-  // still unsuccessful, return "null".
-  virtual HeapWord* expand_and_allocate(size_t word_size, bool is_tlab) = 0;
-
   // Printing
   virtual const char* name() const = 0;
   virtual const char* short_name() const = 0;
diff --git a/src/hotspot/share/gc/serial/serialHeap.cpp b/src/hotspot/share/gc/serial/serialHeap.cpp
index c1fdc1eba1a32..3c48177554121 100644
--- a/src/hotspot/share/gc/serial/serialHeap.cpp
+++ b/src/hotspot/share/gc/serial/serialHeap.cpp
@@ -156,7 +156,7 @@ void SerialHeap::safepoint_synchronize_end() {
 
 HeapWord* SerialHeap::allocate_loaded_archive_space(size_t word_size) {
   MutexLocker ml(Heap_lock);
-  return old_gen()->allocate(word_size, false /* is_tlab */);
+  return old_gen()->allocate(word_size);
 }
 
 void SerialHeap::complete_loaded_archive_space(MemRegion archive_space) {
@@ -292,11 +292,12 @@ bool SerialHeap::should_try_older_generation_allocation(size_t word_size) const
 HeapWord* SerialHeap::expand_heap_and_allocate(size_t size, bool is_tlab) {
   HeapWord* result = nullptr;
   if (_old_gen->should_allocate(size, is_tlab)) {
-    result = _old_gen->expand_and_allocate(size, is_tlab);
+    result = _old_gen->expand_and_allocate(size);
   }
   if (result == nullptr) {
     if (_young_gen->should_allocate(size, is_tlab)) {
-      result = _young_gen->expand_and_allocate(size, is_tlab);
+      // Young-gen is not expanded.
+      result = _young_gen->allocate(size);
     }
   }
   assert(result == nullptr || is_in_reserved(result), "result not in heap");
@@ -314,7 +315,7 @@ HeapWord* SerialHeap::mem_allocate_work(size_t size,
     // First allocation attempt is lock-free.
     DefNewGeneration *young = _young_gen;
     if (young->should_allocate(size, is_tlab)) {
-      result = young->par_allocate(size, is_tlab);
+      result = young->par_allocate(size);
       if (result != nullptr) {
         assert(is_in_reserved(result), "result not in heap");
         return result;
@@ -406,14 +407,14 @@ HeapWord* SerialHeap::attempt_allocation(size_t size,
   HeapWord* res = nullptr;
 
   if (_young_gen->should_allocate(size, is_tlab)) {
-    res = _young_gen->allocate(size, is_tlab);
+    res = _young_gen->allocate(size);
     if (res != nullptr || first_only) {
       return res;
     }
   }
 
   if (_old_gen->should_allocate(size, is_tlab)) {
-    res = _old_gen->allocate(size, is_tlab);
+    res = _old_gen->allocate(size);
   }
 
   return res;
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.cpp b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
index b1b7507094771..febc4713d0372 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.cpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
@@ -397,20 +397,19 @@ oop TenuredGeneration::allocate_for_promotion(oop obj, size_t obj_size) {
 #endif  // #ifndef PRODUCT
 
   // Allocate new object.
-  HeapWord* result = allocate(obj_size, false);
+  HeapWord* result = allocate(obj_size);
   if (result == nullptr) {
     // Promotion of obj into gen failed.  Try to expand and allocate.
-    result = expand_and_allocate(obj_size, false);
+    result = expand_and_allocate(obj_size);
   }
 
   return cast_to_oop<HeapWord*>(result);
 }
 
 HeapWord*
-TenuredGeneration::expand_and_allocate(size_t word_size, bool is_tlab) {
-  assert(!is_tlab, "TenuredGeneration does not support TLAB allocation");
+TenuredGeneration::expand_and_allocate(size_t word_size) {
   expand(word_size*HeapWordSize, _min_heap_delta_bytes);
-  return allocate(word_size, is_tlab);
+  return allocate(word_size);
 }
 
 void TenuredGeneration::assert_correct_size_change_locking() {
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
index dcec912d4887f..fc0578d4e4fe4 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.hpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
@@ -130,10 +130,12 @@ class TenuredGeneration: public Generation {
   void complete_loaded_archive_space(MemRegion archive_space);
   inline void update_for_block(HeapWord* start, HeapWord* end);
 
-  virtual inline HeapWord* allocate(size_t word_size, bool is_tlab);
-  virtual inline HeapWord* par_allocate(size_t word_size, bool is_tlab);
+  // Allocate and returns a block of the requested size, or returns "null".
+  // Assumes the caller has done any necessary locking.
+  inline HeapWord* allocate(size_t word_size);
 
-  HeapWord* expand_and_allocate(size_t size, bool is_tlab);
+  // Expand the old-gen then invoke allocate above.
+  HeapWord* expand_and_allocate(size_t size);
 
   void gc_prologue();
   void gc_epilogue();
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
index ba0dbcdc02d57..c6a6a0ae71634 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
@@ -48,9 +48,7 @@ inline void TenuredGeneration::update_for_block(HeapWord* start, HeapWord* end)
   _bts->update_for_block(start, end);
 }
 
-HeapWord* TenuredGeneration::allocate(size_t word_size,
-                                      bool is_tlab) {
-  assert(!is_tlab, "TenuredGeneration does not support TLAB allocation");
+HeapWord* TenuredGeneration::allocate(size_t word_size) {
   HeapWord* res = _the_space->allocate(word_size);
   if (res != nullptr) {
     _bts->update_for_block(res, res + word_size);
@@ -58,14 +56,4 @@ HeapWord* TenuredGeneration::allocate(size_t word_size,
   return res;
 }
 
-HeapWord* TenuredGeneration::par_allocate(size_t word_size,
-                                          bool is_tlab) {
-  assert(!is_tlab, "TenuredGeneration does not support TLAB allocation");
-  HeapWord* res = _the_space->par_allocate(word_size);
-  if (res != nullptr) {
-    _bts->update_for_block(res, res + word_size);
-  }
-  return res;
-}
-
 #endif // SHARE_GC_SERIAL_TENUREDGENERATION_INLINE_HPP

From 88a05a853ed9e0425ba3315b751a5015bed62675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= <mgronlun@openjdk.org>
Date: Wed, 7 Aug 2024 10:24:34 +0000
Subject: [PATCH 335/401] 8337975: [BACKOUT] Native memory leak when not
 recording any events

Reviewed-by: jpai, egahlin
---
 .../share/jfr/recorder/service/jfrRecorderService.cpp       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp
index 418b774996e4c..fc2043a4d921d 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp
@@ -639,7 +639,11 @@ static void write_thread_local_buffer(JfrChunkWriter& chunkwriter, Thread* t) {
 
 size_t JfrRecorderService::flush() {
   size_t total_elements = flush_metadata(_chunkwriter);
-  total_elements += flush_storage(_storage, _chunkwriter);
+  const size_t storage_elements = flush_storage(_storage, _chunkwriter);
+  if (0 == storage_elements) {
+    return total_elements;
+  }
+  total_elements += storage_elements;
   if (_string_pool.is_modified()) {
     total_elements += flush_stringpool(_string_pool, _chunkwriter);
   }

From 21f710e7f6698b12b06cc3685cefa31f5fcff2a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <joel.sikstrom@oracle.com>
Date: Wed, 7 Aug 2024 14:16:01 +0000
Subject: [PATCH 336/401] 8310675: Fix -Wconversion warnings in ZGC code

Reviewed-by: stefank, ayang
---
 src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp   |  2 +-
 src/hotspot/share/gc/z/zArguments.cpp         |  2 +-
 src/hotspot/share/gc/z/zArray.inline.hpp      |  4 +-
 src/hotspot/share/gc/z/zBarrier.cpp           |  4 +-
 src/hotspot/share/gc/z/zBarrierSetNMethod.cpp |  4 +-
 src/hotspot/share/gc/z/zCPU.inline.hpp        |  4 +-
 src/hotspot/share/gc/z/zDirector.cpp          | 10 ++---
 .../gc/z/zForwardingAllocator.inline.hpp      |  4 +-
 src/hotspot/share/gc/z/zGeneration.cpp        |  6 +--
 src/hotspot/share/gc/z/zGeneration.hpp        |  4 +-
 src/hotspot/share/gc/z/zHeapIterator.cpp      |  6 +--
 src/hotspot/share/gc/z/zHeuristics.cpp        | 14 +++----
 .../share/gc/z/zIndexDistributor.inline.hpp   |  6 +--
 src/hotspot/share/gc/z/zLiveMap.cpp           |  6 +--
 src/hotspot/share/gc/z/zLiveMap.hpp           |  4 +-
 src/hotspot/share/gc/z/zMarkCache.cpp         |  4 +-
 src/hotspot/share/gc/z/zMarkStack.cpp         |  4 +-
 src/hotspot/share/gc/z/zMetronome.cpp         | 10 ++---
 src/hotspot/share/gc/z/zNMethod.cpp           |  6 +--
 src/hotspot/share/gc/z/zNMethodTable.cpp      |  8 ++--
 src/hotspot/share/gc/z/zObjArrayAllocator.cpp |  4 +-
 src/hotspot/share/gc/z/zPage.inline.hpp       | 12 +++---
 src/hotspot/share/gc/z/zPageCache.cpp         |  6 +--
 src/hotspot/share/gc/z/zPageTable.inline.hpp  |  4 +-
 src/hotspot/share/gc/z/zRelocationSet.cpp     |  6 +--
 .../share/gc/z/zRelocationSetSelector.cpp     |  8 ++--
 src/hotspot/share/gc/z/zStat.cpp              | 38 ++++++++++---------
 src/hotspot/share/gc/z/zStat.hpp              |  3 +-
 .../share/gc/z/zStoreBarrierBuffer.cpp        | 20 +++++-----
 .../share/gc/z/zStoreBarrierBuffer.hpp        | 10 ++---
 .../share/gc/z/zStoreBarrierBuffer.inline.hpp |  4 +-
 src/hotspot/share/gc/z/zUnmapper.cpp          |  4 +-
 src/hotspot/share/gc/z/zVerify.cpp            |  4 +-
 33 files changed, 120 insertions(+), 115 deletions(-)

diff --git a/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp b/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
index dbec45fd96ea9..f72e84eaf5935 100644
--- a/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
+++ b/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
@@ -327,7 +327,7 @@ int ZBarrierSetC2::estimate_stub_size() const {
   int size = 0;
 
   for (int i = 0; i < stubs->length(); i++) {
-    CodeBuffer cb(blob->content_begin(), (address)C->output()->scratch_locs_memory() - blob->content_begin());
+    CodeBuffer cb(blob->content_begin(), checked_cast<CodeBuffer::csize_t>((address)C->output()->scratch_locs_memory() - blob->content_begin()));
     MacroAssembler masm(&cb);
     stubs->at(i)->emit_code(masm);
     size += cb.insts_size();
diff --git a/src/hotspot/share/gc/z/zArguments.cpp b/src/hotspot/share/gc/z/zArguments.cpp
index c71e59944f095..f3ff568c64d14 100644
--- a/src/hotspot/share/gc/z/zArguments.cpp
+++ b/src/hotspot/share/gc/z/zArguments.cpp
@@ -146,7 +146,7 @@ void ZArguments::initialize() {
   ZHeuristics::set_medium_page_size();
 
   if (!FLAG_IS_DEFAULT(ZTenuringThreshold) && ZTenuringThreshold != -1) {
-    FLAG_SET_ERGO_IF_DEFAULT(MaxTenuringThreshold, ZTenuringThreshold);
+    FLAG_SET_ERGO_IF_DEFAULT(MaxTenuringThreshold, (uint)ZTenuringThreshold);
     if (MaxTenuringThreshold == 0) {
       FLAG_SET_ERGO_IF_DEFAULT(AlwaysTenure, true);
     }
diff --git a/src/hotspot/share/gc/z/zArray.inline.hpp b/src/hotspot/share/gc/z/zArray.inline.hpp
index 2ec87a761564e..ec7feda8d6398 100644
--- a/src/hotspot/share/gc/z/zArray.inline.hpp
+++ b/src/hotspot/share/gc/z/zArray.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,7 @@ inline ZArrayIteratorImpl<T, Parallel>::ZArrayIteratorImpl(const T* array, size_
 
 template <typename T, bool Parallel>
 inline ZArrayIteratorImpl<T, Parallel>::ZArrayIteratorImpl(const ZArray<T>* array)
-  : ZArrayIteratorImpl<T, Parallel>(array->is_empty() ? nullptr : array->adr_at(0), array->length()) {}
+  : ZArrayIteratorImpl<T, Parallel>(array->is_empty() ? nullptr : array->adr_at(0), (size_t)array->length()) {}
 
 template <typename T, bool Parallel>
 inline bool ZArrayIteratorImpl<T, Parallel>::next(T* elem) {
diff --git a/src/hotspot/share/gc/z/zBarrier.cpp b/src/hotspot/share/gc/z/zBarrier.cpp
index c4b6e0f8239e1..7d7f1284bdfdc 100644
--- a/src/hotspot/share/gc/z/zBarrier.cpp
+++ b/src/hotspot/share/gc/z/zBarrier.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -291,7 +291,7 @@ zaddress ZBarrier::keep_alive_slow_path(zaddress addr) {
 // ON_WEAK barriers should only ever be applied to j.l.r.Reference.referents.
 void ZBarrier::verify_on_weak(volatile zpointer* referent_addr) {
   if (referent_addr != nullptr) {
-    const uintptr_t base = (uintptr_t)referent_addr - java_lang_ref_Reference::referent_offset();
+    const uintptr_t base = (uintptr_t)referent_addr - (size_t)java_lang_ref_Reference::referent_offset();
     const oop obj = cast_to_oop(base);
     assert(oopDesc::is_oop(obj), "Verification failed for: ref " PTR_FORMAT " obj: " PTR_FORMAT, (uintptr_t)referent_addr, base);
     assert(java_lang_ref_Reference::is_referent_field(obj, java_lang_ref_Reference::referent_offset()), "Sanity");
diff --git a/src/hotspot/share/gc/z/zBarrierSetNMethod.cpp b/src/hotspot/share/gc/z/zBarrierSetNMethod.cpp
index b8ecc3eddd3cd..33894f166a3e9 100644
--- a/src/hotspot/share/gc/z/zBarrierSetNMethod.cpp
+++ b/src/hotspot/share/gc/z/zBarrierSetNMethod.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -79,7 +79,7 @@ bool ZBarrierSetNMethod::nmethod_entry_barrier(nmethod* nm) {
   ZNMethod::nmethod_oops_do_inner(nm, &cl);
 
   const uintptr_t prev_color = ZNMethod::color(nm);
-  const uintptr_t new_color = *(int*)ZPointerStoreGoodMaskLowOrderBitsAddr;
+  const uintptr_t new_color = *ZPointerStoreGoodMaskLowOrderBitsAddr;
   log_develop_trace(gc, nmethod)("nmethod: " PTR_FORMAT " visited by entry (complete) [" PTR_FORMAT " -> " PTR_FORMAT "]", p2i(nm), prev_color, new_color);
 
   // CodeCache unloading support
diff --git a/src/hotspot/share/gc/z/zCPU.inline.hpp b/src/hotspot/share/gc/z/zCPU.inline.hpp
index 67d26f4c2e17c..b3712dc5ac98b 100644
--- a/src/hotspot/share/gc/z/zCPU.inline.hpp
+++ b/src/hotspot/share/gc/z/zCPU.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
 #include "utilities/debug.hpp"
 
 inline uint32_t ZCPU::count() {
-  return os::processor_count();
+  return (uint32_t)os::processor_count();
 }
 
 inline uint32_t ZCPU::id() {
diff --git a/src/hotspot/share/gc/z/zDirector.cpp b/src/hotspot/share/gc/z/zDirector.cpp
index 162e05f2c0763..3ba8698bd8e22 100644
--- a/src/hotspot/share/gc/z/zDirector.cpp
+++ b/src/hotspot/share/gc/z/zDirector.cpp
@@ -102,7 +102,7 @@ static double estimated_gc_workers(double serial_gc_time, double parallelizable_
 }
 
 static uint discrete_young_gc_workers(double gc_workers) {
-  return clamp<uint>(ceil(gc_workers), 1, ZYoungGCThreads);
+  return clamp<uint>((uint)ceil(gc_workers), 1, ZYoungGCThreads);
 }
 
 static double select_young_gc_workers(const ZDirectorStats& stats, double serial_gc_time, double parallelizable_gc_time, double alloc_rate_sd_percent, double time_until_oom) {
@@ -426,7 +426,7 @@ static bool rule_major_warmup(const ZDirectorStats& stats) {
   const size_t soft_max_capacity = stats._heap._soft_max_heap_size;
   const size_t used = stats._heap._used;
   const double used_threshold_percent = (stats._old_stats._cycle._nwarmup_cycles + 1) * 0.1;
-  const size_t used_threshold = soft_max_capacity * used_threshold_percent;
+  const size_t used_threshold = (size_t)(soft_max_capacity * used_threshold_percent);
 
   log_debug(gc, director)("Rule Major: Warmup %.0f%%, Used: " SIZE_FORMAT "MB, UsedThreshold: " SIZE_FORMAT "MB",
                           used_threshold_percent * 100, used / M, used_threshold / M);
@@ -497,13 +497,13 @@ static bool rule_major_allocation_rate(const ZDirectorStats& stats) {
   // Doing an old collection makes subsequent young collections more efficient.
   // Calculate the number of young collections ahead that we will try to amortize
   // the cost of doing an old collection for.
-  const int lookahead = stats._heap._total_collections - stats._old_stats._general._total_collections_at_start;
+  const uint lookahead = stats._heap._total_collections - stats._old_stats._general._total_collections_at_start;
 
   // Calculate extra young collection overhead predicted for a number of future
   // young collections, due to not freeing up memory in the old generation.
   const double extra_young_gc_time_for_lookahead = extra_young_gc_time * lookahead;
 
-  log_debug(gc, director)("Rule Major: Allocation Rate, ExtraYoungGCTime: %.3fs, OldGCTime: %.3fs, Lookahead: %d, ExtraYoungGCTimeForLookahead: %.3fs",
+  log_debug(gc, director)("Rule Major: Allocation Rate, ExtraYoungGCTime: %.3fs, OldGCTime: %.3fs, Lookahead: %u, ExtraYoungGCTimeForLookahead: %.3fs",
                           extra_young_gc_time, old_gc_time, lookahead, extra_young_gc_time_for_lookahead);
 
   // If we continue doing as many minor collections as we already did since the
@@ -565,7 +565,7 @@ static bool rule_major_proactive(const ZDirectorStats& stats) {
   // passed since the previous GC. This helps avoid superfluous GCs when running
   // applications with very low allocation rate.
   const size_t used_after_last_gc = stats._old_stats._stat_heap._used_at_relocate_end;
-  const size_t used_increase_threshold = stats._heap._soft_max_heap_size * 0.10; // 10%
+  const size_t used_increase_threshold = (size_t)(stats._heap._soft_max_heap_size * 0.10); // 10%
   const size_t used_threshold = used_after_last_gc + used_increase_threshold;
   const size_t used = stats._heap._used;
   const double time_since_last_gc = stats._old_stats._cycle._time_since_last;
diff --git a/src/hotspot/share/gc/z/zForwardingAllocator.inline.hpp b/src/hotspot/share/gc/z/zForwardingAllocator.inline.hpp
index 41d9106843450..42d006a5b3734 100644
--- a/src/hotspot/share/gc/z/zForwardingAllocator.inline.hpp
+++ b/src/hotspot/share/gc/z/zForwardingAllocator.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
 #include "utilities/debug.hpp"
 
 inline size_t ZForwardingAllocator::size() const {
-  return _end - _start;
+  return (size_t)(_end - _start);
 }
 
 inline bool ZForwardingAllocator::is_full() const {
diff --git a/src/hotspot/share/gc/z/zGeneration.cpp b/src/hotspot/share/gc/z/zGeneration.cpp
index be86550d32171..8a7d38e299166 100644
--- a/src/hotspot/share/gc/z/zGeneration.cpp
+++ b/src/hotspot/share/gc/z/zGeneration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -299,7 +299,7 @@ void ZGeneration::reset_statistics() {
   _page_allocator->reset_statistics(_id);
 }
 
-ssize_t ZGeneration::freed() const {
+size_t ZGeneration::freed() const {
   return _freed;
 }
 
@@ -448,7 +448,7 @@ class VM_ZOperation : public VM_Operation {
     _success = do_operation();
 
     // Update statistics
-    ZStatSample(ZSamplerJavaThreads, Threads::number_of_threads());
+    ZStatSample(ZSamplerJavaThreads, (uint64_t)Threads::number_of_threads());
   }
 
   virtual void doit_epilogue() {
diff --git a/src/hotspot/share/gc/z/zGeneration.hpp b/src/hotspot/share/gc/z/zGeneration.hpp
index 32762a50b6278..aec48a0a07236 100644
--- a/src/hotspot/share/gc/z/zGeneration.hpp
+++ b/src/hotspot/share/gc/z/zGeneration.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -122,7 +122,7 @@ class ZGeneration {
   // Statistics
   void reset_statistics();
   virtual bool should_record_stats() = 0;
-  ssize_t freed() const;
+  size_t freed() const;
   void increase_freed(size_t size);
   size_t promoted() const;
   void increase_promoted(size_t size);
diff --git a/src/hotspot/share/gc/z/zHeapIterator.cpp b/src/hotspot/share/gc/z/zHeapIterator.cpp
index cbcac39a11bbc..50fc921131fe7 100644
--- a/src/hotspot/share/gc/z/zHeapIterator.cpp
+++ b/src/hotspot/share/gc/z/zHeapIterator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -204,7 +204,7 @@ class ZHeapIteratorOopClosure : public OopIterateClosure {
     assert(ZCollectedHeap::heap()->is_in(p), "Should be in heap");
 
     if (VisitReferents) {
-      return HeapAccess<AS_NO_KEEPALIVE | ON_UNKNOWN_OOP_REF>::oop_load_at(_base, _base->field_offset(p));
+      return HeapAccess<AS_NO_KEEPALIVE | ON_UNKNOWN_OOP_REF>::oop_load_at(_base, (ptrdiff_t)_base->field_offset(p));
     }
 
     return HeapAccess<AS_NO_KEEPALIVE>::oop_load(p);
@@ -447,7 +447,7 @@ void ZHeapIterator::follow_array_chunk(const ZHeapIteratorContext& context, cons
   const objArrayOop obj = objArrayOop(array.obj());
   const int length = obj->length();
   const int start = array.index();
-  const int stride = MIN2<int>(length - start, ObjArrayMarkingStride);
+  const int stride = MIN2<int>(length - start, (int)ObjArrayMarkingStride);
   const int end = start + stride;
 
   // Push remaining array chunk first
diff --git a/src/hotspot/share/gc/z/zHeuristics.cpp b/src/hotspot/share/gc/z/zHeuristics.cpp
index c764227061e88..ebf979af79518 100644
--- a/src/hotspot/share/gc/z/zHeuristics.cpp
+++ b/src/hotspot/share/gc/z/zHeuristics.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,14 +39,14 @@ void ZHeuristics::set_medium_page_size() {
   // becomes larger than ZPageSizeSmall.
   const size_t min = ZGranuleSize;
   const size_t max = ZGranuleSize * 16;
-  const size_t unclamped = MaxHeapSize * 0.03125;
+  const size_t unclamped = (size_t)(MaxHeapSize * 0.03125);
   const size_t clamped = clamp(unclamped, min, max);
   const size_t size = round_down_power_of_2(clamped);
 
   if (size > ZPageSizeSmall) {
     // Enable medium pages
     ZPageSizeMedium             = size;
-    ZPageSizeMediumShift        = log2i_exact(ZPageSizeMedium);
+    ZPageSizeMediumShift        = (size_t)log2i_exact(ZPageSizeMedium);
     ZObjectSizeLimitMedium      = ZPageSizeMedium / 8;
     ZObjectAlignmentMediumShift = (int)ZPageSizeMediumShift - 13;
     ZObjectAlignmentMedium      = 1 << ZObjectAlignmentMediumShift;
@@ -68,11 +68,11 @@ bool ZHeuristics::use_per_cpu_shared_small_pages() {
 }
 
 static uint nworkers_based_on_ncpus(double cpu_share_in_percent) {
-  return ceil(os::initial_active_processor_count() * cpu_share_in_percent / 100.0);
+  return (uint)ceil(os::initial_active_processor_count() * cpu_share_in_percent / 100.0);
 }
 
 static uint nworkers_based_on_heap_size(double heap_share_in_percent) {
-  return (MaxHeapSize * (heap_share_in_percent / 100.0)) / ZPageSizeSmall;
+  return (uint)(MaxHeapSize * (heap_share_in_percent / 100.0) / ZPageSizeSmall);
 }
 
 static uint nworkers(double cpu_share_in_percent) {
@@ -101,9 +101,9 @@ uint ZHeuristics::nconcurrent_workers() {
 }
 
 size_t ZHeuristics::significant_heap_overhead() {
-  return MaxHeapSize * (ZFragmentationLimit / 100);
+  return (size_t)(MaxHeapSize * (ZFragmentationLimit / 100));
 }
 
 size_t ZHeuristics::significant_young_overhead() {
-  return MaxHeapSize * (ZYoungCompactionLimit / 100);
+  return (size_t)(MaxHeapSize * (ZYoungCompactionLimit / 100));
 }
diff --git a/src/hotspot/share/gc/z/zIndexDistributor.inline.hpp b/src/hotspot/share/gc/z/zIndexDistributor.inline.hpp
index 172ba2505759d..26afdef9d052d 100644
--- a/src/hotspot/share/gc/z/zIndexDistributor.inline.hpp
+++ b/src/hotspot/share/gc/z/zIndexDistributor.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@ class ZIndexDistributorStriped : public CHeapObj<mtGC> {
   }
 
   volatile int* claim_addr(int index) {
-    return (volatile int*)(align_up(_mem, ZCacheLineSize) + index * ZCacheLineSize);
+    return (volatile int*)(align_up(_mem, ZCacheLineSize) + (size_t)index * ZCacheLineSize);
   }
 
 public:
@@ -136,7 +136,7 @@ class ZIndexDistributorClaimTree : public CHeapObj<mtGC> {
 
   // Total size used to hold all claim variables
   static size_t claim_variables_size() {
-    return sizeof(int) * claim_level_end_index(ClaimLevels);
+    return sizeof(int) * (size_t)claim_level_end_index(ClaimLevels);
   }
 
   // Returns the index of the start of the current segment of the current level
diff --git a/src/hotspot/share/gc/z/zLiveMap.cpp b/src/hotspot/share/gc/z/zLiveMap.cpp
index 2e4a8edd356cc..4123620f8b7e0 100644
--- a/src/hotspot/share/gc/z/zLiveMap.cpp
+++ b/src/hotspot/share/gc/z/zLiveMap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@ ZLiveMap::ZLiveMap(uint32_t size)
     _segment_live_bits(0),
     _segment_claim_bits(0),
     _bitmap(bitmap_size(size, nsegments)),
-    _segment_shift(exact_log2(segment_size())) {}
+    _segment_shift(log2i_exact(segment_size())) {}
 
 void ZLiveMap::reset(ZGenerationId id) {
   ZGeneration* const generation = ZGeneration::generation(id);
@@ -130,6 +130,6 @@ void ZLiveMap::resize(uint32_t size) {
   const size_t new_bitmap_size = bitmap_size(size, nsegments);
   if (_bitmap.size() != new_bitmap_size) {
     _bitmap.reinitialize(new_bitmap_size, false /* clear */);
-    _segment_shift = exact_log2(segment_size());
+    _segment_shift = log2i_exact(segment_size());
   }
 }
diff --git a/src/hotspot/share/gc/z/zLiveMap.hpp b/src/hotspot/share/gc/z/zLiveMap.hpp
index e3bcd2e267ddb..f8b16d06dc52c 100644
--- a/src/hotspot/share/gc/z/zLiveMap.hpp
+++ b/src/hotspot/share/gc/z/zLiveMap.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@ class ZLiveMap {
   BitMap::bm_word_t _segment_live_bits;
   BitMap::bm_word_t _segment_claim_bits;
   ZBitMap           _bitmap;
-  size_t            _segment_shift;
+  int               _segment_shift;
 
   const BitMapView segment_live_bits() const;
   const BitMapView segment_claim_bits() const;
diff --git a/src/hotspot/share/gc/z/zMarkCache.cpp b/src/hotspot/share/gc/z/zMarkCache.cpp
index 7fbb5a8be4e61..0eecfbfaa6773 100644
--- a/src/hotspot/share/gc/z/zMarkCache.cpp
+++ b/src/hotspot/share/gc/z/zMarkCache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
 #include "utilities/powerOfTwo.hpp"
 
 static size_t shift_for_stripes(size_t nstripes) {
-  return ZMarkStripeShift + exact_log2(nstripes);
+  return ZMarkStripeShift + (size_t)log2i_exact(nstripes);
 }
 
 ZMarkCacheEntry::ZMarkCacheEntry()
diff --git a/src/hotspot/share/gc/z/zMarkStack.cpp b/src/hotspot/share/gc/z/zMarkStack.cpp
index 1e10c41eb41dd..c4938af0a5f6d 100644
--- a/src/hotspot/share/gc/z/zMarkStack.cpp
+++ b/src/hotspot/share/gc/z/zMarkStack.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -86,7 +86,7 @@ ZMarkStripe* ZMarkStripeSet::stripe_for_worker(uint nworkers, uint worker_id) {
     const size_t spillover_nworkers = nworkers - spillover_limit;
     const size_t spillover_worker_id = worker_id - spillover_limit;
     const double spillover_chunk = (double)nstripes / (double)spillover_nworkers;
-    index = spillover_worker_id * spillover_chunk;
+    index = (size_t)(spillover_worker_id * spillover_chunk);
   }
 
   assert(index < nstripes, "Invalid index");
diff --git a/src/hotspot/share/gc/z/zMetronome.cpp b/src/hotspot/share/gc/z/zMetronome.cpp
index 0cc209cd7c843..876b1f6922799 100644
--- a/src/hotspot/share/gc/z/zMetronome.cpp
+++ b/src/hotspot/share/gc/z/zMetronome.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@ bool ZMetronome::wait_for_tick() {
   if (_nticks++ == 0) {
     // First tick, set start time
     const Ticks now = Ticks::now();
-    _start_ms = TimeHelper::counter_to_millis(now.value());
+    _start_ms = (uint64_t)TimeHelper::counter_to_millis(now.value());
   }
 
   MonitorLocker ml(&_monitor, Monitor::_no_safepoint_check_flag);
@@ -47,9 +47,9 @@ bool ZMetronome::wait_for_tick() {
     // We might wake up spuriously from wait, so always recalculate
     // the timeout after a wakeup to see if we need to wait again.
     const Ticks now = Ticks::now();
-    const uint64_t now_ms = TimeHelper::counter_to_millis(now.value());
+    const uint64_t now_ms = (uint64_t)TimeHelper::counter_to_millis(now.value());
     const uint64_t next_ms = _start_ms + (_interval_ms * _nticks);
-    const int64_t timeout_ms = next_ms - now_ms;
+    const int64_t timeout_ms = (int64_t)(next_ms - now_ms);
 
     if (timeout_ms > 0) {
       // Wait
@@ -57,7 +57,7 @@ bool ZMetronome::wait_for_tick() {
     } else {
       // Tick
       if (timeout_ms < 0) {
-        const uint64_t overslept = -timeout_ms;
+        const uint64_t overslept = (uint64_t)-timeout_ms;
         if (overslept > _interval_ms) {
           // Missed one or more ticks. Bump _nticks accordingly to
           // avoid firing a string of immediate ticks to make up
diff --git a/src/hotspot/share/gc/z/zNMethod.cpp b/src/hotspot/share/gc/z/zNMethod.cpp
index 7ae7b204d08c9..7c5b1e06edbb0 100644
--- a/src/hotspot/share/gc/z/zNMethod.cpp
+++ b/src/hotspot/share/gc/z/zNMethod.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -302,8 +302,8 @@ void ZNMethod::nmethods_do(bool secondary, NMethodClosure* cl) {
 
 uintptr_t ZNMethod::color(nmethod* nm) {
   BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
-  // color is stored at low order bits of int; implicit conversion to uintptr_t is fine
-  return bs_nm->guard_value(nm);
+  // color is stored at low order bits of int; conversion to uintptr_t is fine
+  return (uintptr_t)bs_nm->guard_value(nm);
 }
 
 oop ZNMethod::load_oop(oop* p, DecoratorSet decorators) {
diff --git a/src/hotspot/share/gc/z/zNMethodTable.cpp b/src/hotspot/share/gc/z/zNMethodTable.cpp
index a4b56292c522b..9714bee4bd88f 100644
--- a/src/hotspot/share/gc/z/zNMethodTable.cpp
+++ b/src/hotspot/share/gc/z/zNMethodTable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -144,9 +144,9 @@ void ZNMethodTable::rebuild_if_needed() {
   // grows/shrinks by doubling/halving its size. Pruning of unregistered
   // entries is done by rebuilding the table with or without resizing it.
   const size_t min_size = 1024;
-  const size_t shrink_threshold = _size * 0.30;
-  const size_t prune_threshold = _size * 0.65;
-  const size_t grow_threshold = _size * 0.70;
+  const size_t shrink_threshold = (size_t)(_size * 0.30);
+  const size_t prune_threshold = (size_t)(_size * 0.65);
+  const size_t grow_threshold = (size_t)(_size * 0.70);
 
   if (_size == 0) {
     // Initialize table
diff --git a/src/hotspot/share/gc/z/zObjArrayAllocator.cpp b/src/hotspot/share/gc/z/zObjArrayAllocator.cpp
index ad19f273dcf0f..ada8351a9f65f 100644
--- a/src/hotspot/share/gc/z/zObjArrayAllocator.cpp
+++ b/src/hotspot/share/gc/z/zObjArrayAllocator.cpp
@@ -76,8 +76,8 @@ oop ZObjArrayAllocator::initialize(HeapWord* mem) const {
   ZThreadLocalData::set_invisible_root(_thread, (zaddress_unsafe*)&mem);
 
   const BasicType element_type = ArrayKlass::cast(_klass)->element_type();
-  const size_t base_offset_in_bytes = arrayOopDesc::base_offset_in_bytes(element_type);
-  const size_t process_start_offset_in_bytes = align_up(base_offset_in_bytes, BytesPerWord);
+  const size_t base_offset_in_bytes = (size_t)arrayOopDesc::base_offset_in_bytes(element_type);
+  const size_t process_start_offset_in_bytes = align_up(base_offset_in_bytes, (size_t)BytesPerWord);
 
   if (process_start_offset_in_bytes != base_offset_in_bytes) {
     // initialize_memory can only fill word aligned memory,
diff --git a/src/hotspot/share/gc/z/zPage.inline.hpp b/src/hotspot/share/gc/z/zPage.inline.hpp
index 0b4ee28ba7d0a..fcf69c685f7b6 100644
--- a/src/hotspot/share/gc/z/zPage.inline.hpp
+++ b/src/hotspot/share/gc/z/zPage.inline.hpp
@@ -83,13 +83,13 @@ inline uint32_t ZPage::object_max_count() const {
 inline size_t ZPage::object_alignment_shift() const {
   switch (type()) {
   case ZPageType::small:
-    return ZObjectAlignmentSmallShift;
+    return (size_t)ZObjectAlignmentSmallShift;
 
   case ZPageType::medium:
-    return ZObjectAlignmentMediumShift;
+    return (size_t)ZObjectAlignmentMediumShift;
 
   case ZPageType::large:
-    return ZObjectAlignmentLargeShift;
+    return (size_t)ZObjectAlignmentLargeShift;
 
   default:
     fatal("Unexpected page type");
@@ -100,13 +100,13 @@ inline size_t ZPage::object_alignment_shift() const {
 inline size_t ZPage::object_alignment() const {
   switch (type()) {
   case ZPageType::small:
-    return ZObjectAlignmentSmall;
+    return (size_t)ZObjectAlignmentSmall;
 
   case ZPageType::medium:
-    return ZObjectAlignmentMedium;
+    return (size_t)ZObjectAlignmentMedium;
 
   case ZPageType::large:
-    return ZObjectAlignmentLarge;
+    return (size_t)ZObjectAlignmentLarge;
 
   default:
     fatal("Unexpected page type");
diff --git a/src/hotspot/share/gc/z/zPageCache.cpp b/src/hotspot/share/gc/z/zPageCache.cpp
index 96fd2eafe0f66..163bb395560de 100644
--- a/src/hotspot/share/gc/z/zPageCache.cpp
+++ b/src/hotspot/share/gc/z/zPageCache.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -308,7 +308,7 @@ class ZPageCacheFlushForUncommitClosure : public ZPageCacheFlushClosure {
 };
 
 size_t ZPageCache::flush_for_uncommit(size_t requested, ZList<ZPage>* to, uint64_t* timeout) {
-  const uint64_t now = os::elapsedTime();
+  const uint64_t now = (uint64_t)os::elapsedTime();
   const uint64_t expires = _last_commit + ZUncommitDelay;
   if (expires > now) {
     // Delay uncommit, set next timeout
@@ -329,5 +329,5 @@ size_t ZPageCache::flush_for_uncommit(size_t requested, ZList<ZPage>* to, uint64
 }
 
 void ZPageCache::set_last_commit() {
-  _last_commit = ceil(os::elapsedTime());
+  _last_commit = (uint64_t)ceil(os::elapsedTime());
 }
diff --git a/src/hotspot/share/gc/z/zPageTable.inline.hpp b/src/hotspot/share/gc/z/zPageTable.inline.hpp
index 3b4cbe9220cfb..79a2d297df889 100644
--- a/src/hotspot/share/gc/z/zPageTable.inline.hpp
+++ b/src/hotspot/share/gc/z/zPageTable.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -69,7 +69,7 @@ inline ZPageTableParallelIterator::ZPageTableParallelIterator(const ZPageTable*
 template <typename Function>
 inline void ZPageTableParallelIterator::do_pages(Function function) {
   _index_distributor.do_indices([&](int index) {
-    ZPage* const page = _table->at(index);
+    ZPage* const page = _table->at(size_t(index));
     if (page != nullptr) {
       const size_t start_index = untype(page->start()) >> ZGranuleSizeShift;
       if (size_t(index) == start_index) {
diff --git a/src/hotspot/share/gc/z/zRelocationSet.cpp b/src/hotspot/share/gc/z/zRelocationSet.cpp
index 92f245777b4e9..5c82f55bbbfe7 100644
--- a/src/hotspot/share/gc/z/zRelocationSet.cpp
+++ b/src/hotspot/share/gc/z/zRelocationSet.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -84,7 +84,7 @@ class ZRelocationSetInstallTask : public ZTask {
     : ZTask("ZRelocationSetInstallTask"),
       _allocator(allocator),
       _forwardings(nullptr),
-      _nforwardings(selector->selected_small()->length() + selector->selected_medium()->length()),
+      _nforwardings((size_t)selector->selected_small()->length() + (size_t)selector->selected_medium()->length()),
       _small(selector->selected_small()),
       _medium(selector->selected_medium()),
       _small_iter(selector->selected_small()),
@@ -113,7 +113,7 @@ class ZRelocationSetInstallTask : public ZTask {
     for (size_t page_index; _small_iter.next_index(&page_index);) {
       ZPage* page = _small->at(int(page_index));
       ZForwarding* const forwarding = ZForwarding::alloc(_allocator, page, to_age(page));
-      install_small(forwarding, _medium->length() + page_index);
+      install_small(forwarding, (size_t)_medium->length() + page_index);
 
       SuspendibleThreadSet::yield();
     }
diff --git a/src/hotspot/share/gc/z/zRelocationSetSelector.cpp b/src/hotspot/share/gc/z/zRelocationSetSelector.cpp
index ab1df68fe5110..ec904b914fb0b 100644
--- a/src/hotspot/share/gc/z/zRelocationSetSelector.cpp
+++ b/src/hotspot/share/gc/z/zRelocationSetSelector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,7 +51,7 @@ ZRelocationSetSelectorGroup::ZRelocationSetSelectorGroup(const char* name,
     _page_size(page_size),
     _object_size_limit(object_size_limit),
     _fragmentation_limit(fragmentation_limit),
-    _page_fragmentation_limit(page_size * (fragmentation_limit / 100)),
+    _page_fragmentation_limit((size_t)(page_size * (fragmentation_limit / 100))),
     _live_pages(),
     _not_selected_pages(),
     _forwarding_entries(0),
@@ -72,7 +72,7 @@ void ZRelocationSetSelectorGroup::semi_sort() {
   const size_t npartitions_shift = 11;
   const size_t npartitions = (size_t)1 << npartitions_shift;
   const size_t partition_size = _page_size >> npartitions_shift;
-  const size_t partition_size_shift = exact_log2(partition_size);
+  const int partition_size_shift = log2i_exact(partition_size);
 
   // Partition slots/fingers
   int partitions[npartitions] = { /* zero initialize */ };
@@ -135,7 +135,7 @@ void ZRelocationSetSelectorGroup::select_inner() {
     // By subtracting the object size limit from the pages size we get the maximum
     // number of pages that the relocation set is guaranteed to fit in, regardless
     // of in which order the objects are relocated.
-    const int to = ceil((double)(from_live_bytes) / (double)(_page_size - _object_size_limit));
+    const int to = (int)ceil(from_live_bytes / (double)(_page_size - _object_size_limit));
 
     // Calculate the relative difference in reclaimable space compared to our
     // currently selected final relocation set. If this number is larger than the
diff --git a/src/hotspot/share/gc/z/zStat.cpp b/src/hotspot/share/gc/z/zStat.cpp
index d838cb0b8138a..613f7b2740b43 100644
--- a/src/hotspot/share/gc/z/zStat.cpp
+++ b/src/hotspot/share/gc/z/zStat.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -250,14 +250,14 @@ void ZStatUnitTime(LogTargetHandle log, const ZStatSampler& sampler, const ZStat
             "%9.3f / %-9.3f   ms",
             sampler.group(),
             sampler.name(),
-            TimeHelper::counter_to_millis(history.avg_10_seconds()),
-            TimeHelper::counter_to_millis(history.max_10_seconds()),
-            TimeHelper::counter_to_millis(history.avg_10_minutes()),
-            TimeHelper::counter_to_millis(history.max_10_minutes()),
-            TimeHelper::counter_to_millis(history.avg_10_hours()),
-            TimeHelper::counter_to_millis(history.max_10_hours()),
-            TimeHelper::counter_to_millis(history.avg_total()),
-            TimeHelper::counter_to_millis(history.max_total()));
+            TimeHelper::counter_to_millis((jlong)history.avg_10_seconds()),
+            TimeHelper::counter_to_millis((jlong)history.max_10_seconds()),
+            TimeHelper::counter_to_millis((jlong)history.avg_10_minutes()),
+            TimeHelper::counter_to_millis((jlong)history.max_10_minutes()),
+            TimeHelper::counter_to_millis((jlong)history.avg_10_hours()),
+            TimeHelper::counter_to_millis((jlong)history.max_10_hours()),
+            TimeHelper::counter_to_millis((jlong)history.avg_total()),
+            TimeHelper::counter_to_millis((jlong)history.max_total()));
 }
 
 void ZStatUnitBytes(LogTargetHandle log, const ZStatSampler& sampler, const ZStatSamplerHistory& history) {
@@ -677,7 +677,7 @@ void ZStatPhaseCollection::register_end(ConcurrentGCTimer* timer, const Ticks& s
   ZCollectedHeap::heap()->trace_heap_after_gc(jfr_tracer());
 
   const Tickspan duration = end - start;
-  ZStatSample(_sampler, duration.value());
+  ZStatDurationSample(_sampler, duration);
 
   const size_t used_at_end = ZHeap::heap()->used();
 
@@ -718,7 +718,7 @@ void ZStatPhaseGeneration::register_end(ConcurrentGCTimer* timer, const Ticks& s
   ZCollectedHeap::heap()->print_heap_after_gc();
 
   const Tickspan duration = end - start;
-  ZStatSample(_sampler, duration.value());
+  ZStatDurationSample(_sampler, duration);
 
   ZGeneration* const generation = ZGeneration::generation(_id);
 
@@ -766,7 +766,7 @@ void ZStatPhasePause::register_end(ConcurrentGCTimer* timer, const Ticks& start,
   timer->register_gc_pause_end(end);
 
   const Tickspan duration = end - start;
-  ZStatSample(_sampler, duration.value());
+  ZStatDurationSample(_sampler, duration);
 
   // Track max pause time
   if (_max < duration) {
@@ -798,7 +798,7 @@ void ZStatPhaseConcurrent::register_end(ConcurrentGCTimer* timer, const Ticks& s
   timer->register_gc_concurrent_end(end);
 
   const Tickspan duration = end - start;
-  ZStatSample(_sampler, duration.value());
+  ZStatDurationSample(_sampler, duration);
 
   LogTarget(Info, gc, phases) log;
   log_end(log, duration);
@@ -835,7 +835,7 @@ void ZStatSubPhase::register_end(ConcurrentGCTimer* timer, const Ticks& start, c
   ZTracer::report_thread_phase(name(), start, end);
 
   const Tickspan duration = end - start;
-  ZStatSample(_sampler, duration.value());
+  ZStatDurationSample(_sampler, duration);
 
   if (Thread::current()->is_Worker_thread()) {
     LogTarget(Trace, gc, phases) log;
@@ -862,7 +862,7 @@ void ZStatCriticalPhase::register_end(ConcurrentGCTimer* timer, const Ticks& sta
   ZTracer::report_thread_phase(name(), start, end);
 
   const Tickspan duration = end - start;
-  ZStatSample(_sampler, duration.value());
+  ZStatDurationSample(_sampler, duration);
   ZStatInc(_counter);
 
   if (_verbose) {
@@ -914,6 +914,10 @@ void ZStatSample(const ZStatSampler& sampler, uint64_t value) {
   ZTracer::report_stat_sampler(sampler, value);
 }
 
+void ZStatDurationSample(const ZStatSampler& sampler, const Tickspan& duration) {
+  ZStatSample(sampler, (uint64_t)duration.value());
+}
+
 void ZStatInc(const ZStatCounter& counter, uint64_t increment) {
   ZStatCounterData* const cpu_data = counter.get();
   const uint64_t value = Atomic::add(&cpu_data->_counter, increment);
@@ -1036,7 +1040,7 @@ void ZStat::sample_and_collect(ZStatSamplerHistory* history) const {
 
 bool ZStat::should_print(LogTargetHandle log) const {
   static uint64_t print_at = ZStatisticsInterval;
-  const uint64_t now = os::elapsedTime();
+  const uint64_t now = (uint64_t)os::elapsedTime();
 
   if (now < print_at) {
     return false;
@@ -1846,7 +1850,7 @@ void ZStatHeap::at_relocate_end(const ZPageAllocatorStats& stats, bool record_st
 }
 
 size_t ZStatHeap::reclaimed_avg() {
-  return _reclaimed_bytes.davg();
+  return (size_t)_reclaimed_bytes.davg();
 }
 
 size_t ZStatHeap::max_capacity() {
diff --git a/src/hotspot/share/gc/z/zStat.hpp b/src/hotspot/share/gc/z/zStat.hpp
index 346773c3b7e2a..d7482dbe6aaaf 100644
--- a/src/hotspot/share/gc/z/zStat.hpp
+++ b/src/hotspot/share/gc/z/zStat.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -345,6 +345,7 @@ class ZStatTimerWorker : public ZStatTimer {
 // Stat sample/increment
 //
 void ZStatSample(const ZStatSampler& sampler, uint64_t value);
+void ZStatDurationSample(const ZStatSampler& sampler, const Tickspan& duration);
 void ZStatInc(const ZStatCounter& counter, uint64_t increment = 1);
 void ZStatInc(const ZStatUnsampledCounter& counter, uint64_t increment = 1);
 
diff --git a/src/hotspot/share/gc/z/zStoreBarrierBuffer.cpp b/src/hotspot/share/gc/z/zStoreBarrierBuffer.cpp
index 537609e723bbb..c94551dc62d20 100644
--- a/src/hotspot/share/gc/z/zStoreBarrierBuffer.cpp
+++ b/src/hotspot/share/gc/z/zStoreBarrierBuffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -79,7 +79,7 @@ void ZStoreBarrierBuffer::install_base_pointers_inner() {
          (ZPointer::remap_bits(_last_processed_color) & ZPointerRemappedOldMask) == 0,
          "Should not have double bit errors");
 
-  for (int i = current(); i < (int)_buffer_length; ++i) {
+  for (size_t i = current(); i < _buffer_length; ++i) {
     const ZStoreBarrierEntry& entry = _buffer[i];
     volatile zpointer* const p = entry._p;
     const zaddress_unsafe p_unsafe = to_zaddress_unsafe((uintptr_t)p);
@@ -141,7 +141,7 @@ static volatile zpointer* make_load_good(volatile zpointer* p, zaddress_unsafe p
   return (volatile zpointer*)p_remapped;
 }
 
-void ZStoreBarrierBuffer::on_new_phase_relocate(int i) {
+void ZStoreBarrierBuffer::on_new_phase_relocate(size_t i) {
   const uintptr_t last_remap_bits = ZPointer::remap_bits(_last_processed_color);
   if (last_remap_bits == ZPointerRemapped) {
     // All pointers are already remapped
@@ -160,7 +160,7 @@ void ZStoreBarrierBuffer::on_new_phase_relocate(int i) {
   entry._p = make_load_good(entry._p, p_base, _last_processed_color);
 }
 
-void ZStoreBarrierBuffer::on_new_phase_remember(int i) {
+void ZStoreBarrierBuffer::on_new_phase_remember(size_t i) {
   volatile zpointer* const p = _buffer[i]._p;
 
   if (ZHeap::heap()->is_young(p)) {
@@ -197,7 +197,7 @@ bool ZStoreBarrierBuffer::stored_during_old_mark() const {
   return last_mark_old_bits == ZPointerMarkedOld;
 }
 
-void ZStoreBarrierBuffer::on_new_phase_mark(int i) {
+void ZStoreBarrierBuffer::on_new_phase_mark(size_t i) {
   const ZStoreBarrierEntry& entry = _buffer[i];
   const zpointer prev = entry._prev;
 
@@ -229,7 +229,7 @@ void ZStoreBarrierBuffer::on_new_phase() {
   // Install all base pointers for relocation
   install_base_pointers();
 
-  for (int i = current(); i < (int)_buffer_length; ++i) {
+  for (size_t i = current(); i < _buffer_length; ++i) {
     on_new_phase_relocate(i);
     on_new_phase_remember(i);
     on_new_phase_mark(i);
@@ -259,8 +259,8 @@ void ZStoreBarrierBuffer::on_error(outputStream* st) {
   st->print_cr(" _last_processed_color: " PTR_FORMAT, _last_processed_color);
   st->print_cr(" _last_installed_color: " PTR_FORMAT, _last_installed_color);
 
-  for (int i = current(); i < (int)_buffer_length; ++i) {
-    st->print_cr(" [%2d]: base: " PTR_FORMAT " p: " PTR_FORMAT " prev: " PTR_FORMAT,
+  for (size_t i = current(); i < _buffer_length; ++i) {
+    st->print_cr(" [%2zu]: base: " PTR_FORMAT " p: " PTR_FORMAT " prev: " PTR_FORMAT,
         i,
         untype(_base_pointers[i]),
         p2i(_buffer[i]._p),
@@ -276,7 +276,7 @@ void ZStoreBarrierBuffer::flush() {
   OnError on_error(this);
   VMErrorCallbackMark mark(&on_error);
 
-  for (int i = current(); i < (int)_buffer_length; ++i) {
+  for (size_t i = current(); i < _buffer_length; ++i) {
     const ZStoreBarrierEntry& entry = _buffer[i];
     const zaddress addr = ZBarrier::make_load_good(entry._prev);
     ZBarrier::mark_and_remember(entry._p, addr);
@@ -296,7 +296,7 @@ bool ZStoreBarrierBuffer::is_in(volatile zpointer* p) {
     const uintptr_t  last_remap_bits = ZPointer::remap_bits(buffer->_last_processed_color) & ZPointerRemappedMask;
     const bool needs_remap = last_remap_bits != ZPointerRemapped;
 
-    for (int i = buffer->current(); i < (int)_buffer_length; ++i) {
+    for (size_t i = buffer->current(); i < _buffer_length; ++i) {
       const ZStoreBarrierEntry& entry = buffer->_buffer[i];
       volatile zpointer* entry_p = entry._p;
 
diff --git a/src/hotspot/share/gc/z/zStoreBarrierBuffer.hpp b/src/hotspot/share/gc/z/zStoreBarrierBuffer.hpp
index f917a6c3e7b58..5903edb6ad409 100644
--- a/src/hotspot/share/gc/z/zStoreBarrierBuffer.hpp
+++ b/src/hotspot/share/gc/z/zStoreBarrierBuffer.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,16 +59,16 @@ class ZStoreBarrierBuffer : public CHeapObj<mtGC> {
   // sizeof(ZStoreBarrierEntry) scaled index growing downwards
   size_t             _current;
 
-  void on_new_phase_relocate(int i);
-  void on_new_phase_remember(int i);
-  void on_new_phase_mark(int i);
+  void on_new_phase_relocate(size_t i);
+  void on_new_phase_remember(size_t i);
+  void on_new_phase_mark(size_t i);
 
   void clear();
 
   bool is_old_mark() const;
   bool stored_during_old_mark() const;
   bool is_empty() const;
-  intptr_t current() const;
+  size_t current() const;
 
   void install_base_pointers_inner();
 
diff --git a/src/hotspot/share/gc/z/zStoreBarrierBuffer.inline.hpp b/src/hotspot/share/gc/z/zStoreBarrierBuffer.inline.hpp
index 762aac3ccd5bf..72327fe83466b 100644
--- a/src/hotspot/share/gc/z/zStoreBarrierBuffer.inline.hpp
+++ b/src/hotspot/share/gc/z/zStoreBarrierBuffer.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
 #include "gc/z/zThreadLocalData.hpp"
 #include "runtime/thread.hpp"
 
-inline intptr_t ZStoreBarrierBuffer::current() const {
+inline size_t ZStoreBarrierBuffer::current() const {
   return _current / sizeof(ZStoreBarrierEntry);
 }
 
diff --git a/src/hotspot/share/gc/z/zUnmapper.cpp b/src/hotspot/share/gc/z/zUnmapper.cpp
index 3b2bac7eb00a7..b6ef40b6b059f 100644
--- a/src/hotspot/share/gc/z/zUnmapper.cpp
+++ b/src/hotspot/share/gc/z/zUnmapper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -85,7 +85,7 @@ bool ZUnmapper::try_enqueue(ZPage* page) {
 }
 
 size_t ZUnmapper::queue_capacity() const {
-  return align_up<size_t>(_page_allocator->max_capacity() * ZAsyncUnmappingLimit / 100.0, ZGranuleSize);
+  return align_up((size_t)(_page_allocator->max_capacity() * ZAsyncUnmappingLimit / 100.0), ZGranuleSize);
 }
 
 bool ZUnmapper::is_saturated() const {
diff --git a/src/hotspot/share/gc/z/zVerify.cpp b/src/hotspot/share/gc/z/zVerify.cpp
index fba8adfb3c16f..d47886ec7c2fc 100644
--- a/src/hotspot/share/gc/z/zVerify.cpp
+++ b/src/hotspot/share/gc/z/zVerify.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -583,7 +583,7 @@ void ZVerify::on_color_flip() {
   for (JavaThreadIteratorWithHandle jtiwh; JavaThread* const jt = jtiwh.next(); ) {
     const ZStoreBarrierBuffer* const buffer = ZThreadLocalData::store_barrier_buffer(jt);
 
-    for (int i = buffer->current(); i < (int)ZStoreBarrierBuffer::_buffer_length; ++i) {
+    for (size_t i = buffer->current(); i < ZStoreBarrierBuffer::_buffer_length; ++i) {
       volatile zpointer* const p = buffer->_buffer[i]._p;
       bool created = false;
       z_verify_store_barrier_buffer_table->put_if_absent(p, true, &created);

From d19ba81ce12a99de1114c1bfe67392f5aee2104e Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Wed, 7 Aug 2024 15:58:03 +0000
Subject: [PATCH 337/401] 8337603: Change in behavior with
 -Djava.locale.useOldISOCodes=true

Reviewed-by: iris, bpb
---
 .../util/locale/provider/LocaleResources.java | 13 ++++++-
 test/jdk/java/util/Locale/LocaleTest.java     | 35 +++++++++++++++++--
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/sun/util/locale/provider/LocaleResources.java b/src/java.base/share/classes/sun/util/locale/provider/LocaleResources.java
index e83f2896304af..ee6ec0f72baa8 100644
--- a/src/java.base/share/classes/sun/util/locale/provider/LocaleResources.java
+++ b/src/java.base/share/classes/sun/util/locale/provider/LocaleResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,6 +62,7 @@
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
+import jdk.internal.util.StaticProperty;
 import sun.security.action.GetPropertyAction;
 import sun.util.resources.LocaleData;
 import sun.util.resources.OpenListResourceBundle;
@@ -289,6 +290,16 @@ public String getCurrencyName(String key) {
     }
 
     public String getLocaleName(String key) {
+        // Get names for old ISO codes with new ISO code resources
+        if (StaticProperty.javaLocaleUseOldISOCodes().equalsIgnoreCase("true")) {
+            key = switch (key) {
+                case "iw" -> "he";
+                case "in" -> "id";
+                case "ji" -> "yi";
+                default -> key;
+            };
+        }
+
         Object localeName = null;
         String cacheKey = LOCALE_NAMES + key;
 
diff --git a/test/jdk/java/util/Locale/LocaleTest.java b/test/jdk/java/util/Locale/LocaleTest.java
index c6afbc099ae75..0cf272f20a0d2 100644
--- a/test/jdk/java/util/Locale/LocaleTest.java
+++ b/test/jdk/java/util/Locale/LocaleTest.java
@@ -20,12 +20,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/**
+/*
  * @test
  * @bug 4052404 4052440 4084688 4092475 4101316 4105828 4107014 4107953 4110613
  * 4118587 4118595 4122371 4126371 4126880 4135316 4135752 4139504 4139940 4143951
  * 4147315 4147317 4147552 4335196 4778440 4940539 5010672 6475525 6544471 6627549
  * 6786276 7066203 7085757 8008577 8030696 8170840 8174269 8255086 8263202 8287868
+ * 8337603
  * @summary test Locales
  * @modules jdk.localedata
  * @run junit LocaleTest
@@ -84,9 +85,13 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.MissingResourceException;
+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.fail;
 
 public class LocaleTest {
@@ -734,6 +739,32 @@ public void TestChangedISO639Codes() {
 
     }
 
+    /**
+     * @bug 8337603
+     */
+    static Stream<Arguments> changedISOCodes() {
+        var hebrew = "\u05e2\u05d1\u05e8\u05d9\u05ea";
+        var yiddish = "\u05d9\u05d9\u05b4\u05d3\u05d9\u05e9";
+        var indonesian = "Indonesia";
+
+        return Stream.of(
+            Arguments.of("he", hebrew),
+            Arguments.of("iw", hebrew),
+            Arguments.of("yi", yiddish),
+            Arguments.of("ji", yiddish),
+            Arguments.of("id", indonesian),
+            Arguments.of("in", indonesian)
+        );
+    }
+    @ParameterizedTest
+    @MethodSource("changedISOCodes")
+    public void TestOldISOCodeLanguageName(String code, String expected) {
+        var loc = Locale.of(code);
+        assertEquals(expected,
+            loc.getDisplayName(loc),
+            "java.locale.useOldISOCodes=" + System.getProperty("java.locale.useOldISOCodes"));
+    }
+
     /**
      * @bug 4092475
      * I could not reproduce this bug.  I'm pretty convinced it was fixed with the

From 36d08c213d03deddf69ecb9770a3afef73a15444 Mon Sep 17 00:00:00 2001
From: Serguei Spitsyn <sspitsyn@openjdk.org>
Date: Wed, 7 Aug 2024 17:41:23 +0000
Subject: [PATCH 338/401] 8336846: assert(state->get_thread() == jt) failed:
 handshake unsafe conditions

Reviewed-by: amenkov, dholmes, cjplummer, pchilanomate, lmesnik
---
 src/hotspot/share/prims/jvmtiEventController.cpp | 4 +++-
 src/hotspot/share/runtime/mutexLocker.cpp        | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/prims/jvmtiEventController.cpp b/src/hotspot/share/prims/jvmtiEventController.cpp
index d5c5d53ba8104..c9867ff164350 100644
--- a/src/hotspot/share/prims/jvmtiEventController.cpp
+++ b/src/hotspot/share/prims/jvmtiEventController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -982,6 +982,8 @@ JvmtiEventControllerPrivate::change_field_watch(jvmtiEvent event_type, bool adde
             added? "add" : "remove",
             *count_addr));
 
+  JvmtiVTMSTransitionDisabler disabler;
+
   if (added) {
     (*count_addr)++;
     if (*count_addr == 1) {
diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp
index a63014d78a171..8c1dff38051d9 100644
--- a/src/hotspot/share/runtime/mutexLocker.cpp
+++ b/src/hotspot/share/runtime/mutexLocker.cpp
@@ -269,7 +269,6 @@ void mutex_init() {
 
   MUTEX_DEFN(JvmtiThreadState_lock           , PaddedMutex  , safepoint);   // Used by JvmtiThreadState/JvmtiEventController
   MUTEX_DEFN(EscapeBarrier_lock              , PaddedMonitor, nosafepoint); // Used to synchronize object reallocation/relocking triggered by JVMTI
-  MUTEX_DEFN(JvmtiVTMSTransition_lock        , PaddedMonitor, safepoint);   // used for Virtual Thread Mount State transition management
   MUTEX_DEFN(Management_lock                 , PaddedMutex  , safepoint);   // used for JVM management
 
   MUTEX_DEFN(ConcurrentGCBreakpoints_lock    , PaddedMonitor, safepoint, true);
@@ -355,6 +354,7 @@ void mutex_init() {
   // JVMCIRuntime_lock must be acquired before JVMCI_lock to avoid deadlock
   MUTEX_DEFL(JVMCI_lock                     , PaddedMonitor, JVMCIRuntime_lock);
 #endif
+  MUTEX_DEFL(JvmtiVTMSTransition_lock        , PaddedMonitor, JvmtiThreadState_lock); // used for Virtual Thread Mount State transition management
 
   // Allocate RecursiveMutex
   MultiArray_lock = new RecursiveMutex();

From a5c2d7b305407974b3f67c48b8dcb1f8e77abde3 Mon Sep 17 00:00:00 2001
From: Fernando Guallini <fguallini@openjdk.org>
Date: Wed, 7 Aug 2024 18:24:08 +0000
Subject: [PATCH 339/401] 8335172: Add manual steps to run
 security/auth/callback/TextCallbackHandler/Password.java test

Reviewed-by: rhalade
---
 test/jdk/ProblemList.txt                         |  1 -
 test/jdk/TEST.groups                             |  2 +-
 .../callback/TextCallbackHandler/Password.java   | 16 ++++++++++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 3211f27b5c1e4..84c7a7d855f73 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -606,7 +606,6 @@ sun/security/smartcardio/TestExclusive.java                     8039280 generic-
 sun/security/smartcardio/TestMultiplePresent.java               8039280 generic-all
 sun/security/smartcardio/TestPresent.java                       8039280 generic-all
 sun/security/smartcardio/TestTransmit.java                      8039280 generic-all
-com/sun/security/auth/callback/TextCallbackHandler/Password.java 8039280 generic-all
 com/sun/security/sasl/gsskerb/AuthOnly.java                     8039280 generic-all
 com/sun/security/sasl/gsskerb/ConfSecurityLayer.java            8039280 generic-all
 com/sun/security/sasl/gsskerb/NoSecurityLayer.java              8039280 generic-all
diff --git a/test/jdk/TEST.groups b/test/jdk/TEST.groups
index 55ae0e9c67b14..97b355fbea6c5 100644
--- a/test/jdk/TEST.groups
+++ b/test/jdk/TEST.groups
@@ -623,7 +623,6 @@ jdk_security_manual_no_input = \
     :jdk_security_infra \
     com/sun/crypto/provider/Cipher/AEAD/GCMIncrementByte4.java \
     com/sun/crypto/provider/Cipher/AEAD/GCMIncrementDirect4.java \
-    com/sun/security/auth/callback/TextCallbackHandler/Password.java \
     com/sun/security/sasl/gsskerb/AuthOnly.java \
     com/sun/security/sasl/gsskerb/ConfSecurityLayer.java \
     com/sun/security/sasl/gsskerb/NoSecurityLayer.java \
@@ -652,6 +651,7 @@ jdk_core_manual_interactive = \
 jdk_security_manual_interactive = \
     sun/security/tools/keytool/i18n.java \
     java/security/Policy/Root/Root.java \
+    com/sun/security/auth/callback/TextCallbackHandler/Password.java \
     sun/security/krb5/config/native/TestDynamicStore.java
 
 # Test sets for running inside container environment
diff --git a/test/jdk/com/sun/security/auth/callback/TextCallbackHandler/Password.java b/test/jdk/com/sun/security/auth/callback/TextCallbackHandler/Password.java
index b34ef04355867..f9231a0b36edc 100644
--- a/test/jdk/com/sun/security/auth/callback/TextCallbackHandler/Password.java
+++ b/test/jdk/com/sun/security/auth/callback/TextCallbackHandler/Password.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,11 +23,23 @@
 
 /*
  * @test
- * @bug 6825240
+ * @bug 6825240 6829785
  * @summary Password.readPassword() echos the input when System.Console is null
  * @run main/manual Password
  */
 
+/*
+ * This scenario cannot be automated because util/Password.java verifies the given input stream is
+ * equal to the initialSystemIn. This prevents the test from providing a custom input stream.
+ *
+ *  Steps to run the test:
+ *  1) Compile the class using the JDK version being tested: '<JdkBin>/javac Password.java'
+ *  2) Run the test using the JDK version being tested: '<JdkBin>/java -cp . Password'
+ *  3) Type in the first password, it should not be visible in the console
+ *  4) Type in the second password, it should be visible in the console
+ *  5) The final output line displays the entered passwords, both should be visible
+ */
+
 import com.sun.security.auth.callback.TextCallbackHandler;
 import javax.security.auth.callback.*;
 

From 5e021cbcc7a6cb30a27380950e115ff12846239c Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Wed, 7 Aug 2024 20:25:51 +0000
Subject: [PATCH 340/401] 8337410: The makefiles should set problemlist and
 adjust timeout basing on the given VM flags

Reviewed-by: ihse
---
 make/RunTests.gmk | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index b0291e4eff4e7..8cfee45892339 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -748,8 +748,6 @@ define SetupRunJtregTestBody
   # we may end up with a lot of JVM's
   $1_JTREG_MAX_RAM_PERCENTAGE := $$(shell $(AWK) 'BEGIN { print 25 / $$($1_JTREG_JOBS); }')
 
-  JTREG_TIMEOUT_FACTOR ?= 4
-
   JTREG_VERBOSE ?= fail,error,summary
   JTREG_RETAIN ?= fail,error
   JTREG_TEST_THREAD_FACTORY ?=
@@ -837,6 +835,24 @@ define SetupRunJtregTestBody
     $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$($1_JTREG_PROBLEM_LIST))
   endif
 
+  JTREG_ALL_OPTIONS := $$(JTREG_JAVA_OPTIONS) $$(JTREG_VM_OPTIONS)
+
+  JTREG_AUTO_PROBLEM_LISTS :=
+  JTREG_AUTO_TIMEOUT_FACTOR := 4
+
+  ifneq ($$(findstring -Xcomp, $$(JTREG_ALL_OPTIONS)), )
+    JTREG_AUTO_PROBLEM_LISTS += ProblemList-Xcomp.txt
+    JTREG_AUTO_TIMEOUT_FACTOR := 10
+  endif
+
+  ifneq ($$(findstring -XX:+UseZGC, $$(JTREG_ALL_OPTIONS)), )
+    ifneq ($$(findstring -XX:-ZGenerational, $$(JTREG_ALL_OPTIONS)), )
+      JTREG_AUTO_PROBLEM_LISTS += ProblemList-zgc.txt
+    else
+      JTREG_AUTO_PROBLEM_LISTS += ProblemList-generational-zgc.txt
+    endif
+  endif
+
   ifneq ($$(JTREG_EXTRA_PROBLEM_LISTS), )
     # Accept both absolute paths as well as relative to the current test root.
     $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \
@@ -868,6 +884,18 @@ define SetupRunJtregTestBody
 
   $$(eval $$(call SetupRunJtregTestCustom, $1))
 
+  # SetupRunJtregTestCustom might also adjust JTREG_AUTO_ variables
+  # so set the final results after setting values from custom setup
+  ifneq ($$(JTREG_AUTO_PROBLEM_LISTS), )
+    # Accept both absolute paths as well as relative to the current test root.
+    $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \
+        $$(JTREG_AUTO_PROBLEM_LISTS) \
+        $$(addprefix $$($1_TEST_ROOT)/, $$(JTREG_AUTO_PROBLEM_LISTS)) \
+    ))
+  endif
+
+  JTREG_TIMEOUT_FACTOR ?= $$(JTREG_AUTO_TIMEOUT_FACTOR)
+
   clean-outputdirs-$1:
 	$$(RM) -r $$($1_TEST_SUPPORT_DIR)
 	$$(RM) -r $$($1_TEST_RESULTS_DIR)

From 9b11bd7f4a511ddadf9f02e82aab6ba78beb6763 Mon Sep 17 00:00:00 2001
From: Jamil Nimeh <jnimeh@openjdk.org>
Date: Wed, 7 Aug 2024 21:06:47 +0000
Subject: [PATCH 341/401] 8337826: Improve logging in OCSPTimeout and
 SimpleOCSPResponder to help diagnose JDK-8309754

Reviewed-by: mullan
---
 .../CertPathValidator/OCSP/OCSPTimeout.java   | 124 ++++++++++--------
 .../testlibrary/SimpleOCSPServer.java         |  16 ++-
 2 files changed, 81 insertions(+), 59 deletions(-)

diff --git a/test/jdk/java/security/cert/CertPathValidator/OCSP/OCSPTimeout.java b/test/jdk/java/security/cert/CertPathValidator/OCSP/OCSPTimeout.java
index 3e2648af7cb5f..dfd7dcdc81efe 100644
--- a/test/jdk/java/security/cert/CertPathValidator/OCSP/OCSPTimeout.java
+++ b/test/jdk/java/security/cert/CertPathValidator/OCSP/OCSPTimeout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,17 +36,17 @@
  *          java.base/sun.security.util
  * @library ../../../../../java/security/testlibrary
  * @build CertificateBuilder SimpleOCSPServer
- * @run main/othervm OCSPTimeout 1000 true
- * @run main/othervm -Dcom.sun.security.ocsp.readtimeout=5
- *      OCSPTimeout 1000 true
- * @run main/othervm -Dcom.sun.security.ocsp.readtimeout=1
- *      OCSPTimeout 5000 false
- * @run main/othervm -Dcom.sun.security.ocsp.readtimeout=1s
- *      OCSPTimeout 5000 false
- * @run main/othervm -Dcom.sun.security.ocsp.readtimeout=1500ms
- *      OCSPTimeout 5000 false
- * @run main/othervm -Dcom.sun.security.ocsp.readtimeout=4500ms
- *      OCSPTimeout 1000 true
+ * @run main/othervm -Djava.security.debug=certpath OCSPTimeout 1000 true
+ * @run main/othervm -Djava.security.debug=certpath
+ *      -Dcom.sun.security.ocsp.readtimeout=5 OCSPTimeout 1000 true
+ * @run main/othervm -Djava.security.debug=certpath
+ *      -Dcom.sun.security.ocsp.readtimeout=1 OCSPTimeout 5000 false
+ * @run main/othervm -Djava.security.debug=certpath
+ *      -Dcom.sun.security.ocsp.readtimeout=1s OCSPTimeout 5000 false
+ * @run main/othervm -Djava.security.debug=certpath
+ *      -Dcom.sun.security.ocsp.readtimeout=1500ms OCSPTimeout 5000 false
+ * @run main/othervm -Djava.security.debug=certpath
+ *      -Dcom.sun.security.ocsp.readtimeout=4500ms OCSPTimeout 1000 true
  */
 
 import java.io.*;
@@ -82,62 +82,72 @@ public class OCSPTimeout {
     static SimpleOCSPServer rootOcsp;       // Root CA OCSP Responder
     static int rootOcspPort;                // Port number for root OCSP
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         int ocspTimeout = 15000;
         boolean expected = false;
 
         createPKI();
 
-        if (args[0] != null) {
-            ocspTimeout = Integer.parseInt(args[0]);
-        }
-        rootOcsp.setDelay(ocspTimeout);
-
-        expected = (args[1] != null && Boolean.parseBoolean(args[1]));
-        log("Test case expects to " + (expected ? "pass" : "fail"));
-
-        // validate chain
-        CertPathValidator cpv = CertPathValidator.getInstance("PKIX");
-        PKIXRevocationChecker prc =
-                (PKIXRevocationChecker) cpv.getRevocationChecker();
-        prc.setOptions(EnumSet.of(NO_FALLBACK, SOFT_FAIL));
-        PKIXParameters params =
-                new PKIXParameters(Set.of(new TrustAnchor(rootCert, null)));
-        params.addCertPathChecker(prc);
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-        CertPath cp = cf.generateCertPath(List.of(eeCert));
-        cpv.validate(cp, params);
-
-        // unwrap soft fail exceptions and check for SocketTimeoutException
-        List<CertPathValidatorException> softExc = prc.getSoftFailExceptions();
-        if (expected) {
-            if (softExc.size() > 0) {
-                throw new RuntimeException("Expected to pass, found " +
-                        softExc.size() + " soft fail exceptions");
+        try {
+            if (args[0] != null) {
+                ocspTimeout = Integer.parseInt(args[0]);
             }
-        } else {
-            // If we expect to fail the validation then there should be a
-            // SocketTimeoutException
-            boolean found = false;
-            for (CertPathValidatorException softFail : softExc) {
-                log("CPVE: " + softFail);
-                Throwable cause = softFail.getCause();
-                log("Cause: " + cause);
-                while (cause != null) {
-                    if (cause instanceof SocketTimeoutException) {
-                        found = true;
-                        break;
+            rootOcsp.setDelay(ocspTimeout);
+
+            expected = (args[1] != null && Boolean.parseBoolean(args[1]));
+            log("Test case expects to " + (expected ? "pass" : "fail"));
+
+            // validate chain
+            CertPathValidator cpv = CertPathValidator.getInstance("PKIX");
+            PKIXRevocationChecker prc =
+                    (PKIXRevocationChecker) cpv.getRevocationChecker();
+            prc.setOptions(EnumSet.of(NO_FALLBACK, SOFT_FAIL));
+            PKIXParameters params =
+                    new PKIXParameters(Set.of(new TrustAnchor(rootCert, null)));
+            params.addCertPathChecker(prc);
+            CertificateFactory cf = CertificateFactory.getInstance("X.509");
+            CertPath cp = cf.generateCertPath(List.of(eeCert));
+            cpv.validate(cp, params);
+
+            // unwrap soft fail exceptions and check for SocketTimeoutException
+            List<CertPathValidatorException> softExc = prc.getSoftFailExceptions();
+            if (expected) {
+                if (!softExc.isEmpty()) {
+                    log("Expected to pass, found " + softExc.size() +
+                            " soft fail exceptions");
+                    for (CertPathValidatorException cpve : softExc) {
+                        log("Exception: " + cpve);
                     }
-                    cause = cause.getCause();
+                    throw new RuntimeException("Expected to pass, found " +
+                            softExc.size() + " soft fail exceptions");
                 }
-                if (found) {
-                    break;
+            } else {
+                // If we expect to fail the validation then there should be a
+                // SocketTimeoutException
+                boolean found = false;
+                for (CertPathValidatorException softFail : softExc) {
+                    log("CPVE: " + softFail);
+                    Throwable cause = softFail.getCause();
+                    log("Cause: " + cause);
+                    while (cause != null) {
+                        if (cause instanceof SocketTimeoutException) {
+                            found = true;
+                            break;
+                        }
+                        cause = cause.getCause();
+                    }
+                    if (found) {
+                        break;
+                    }
                 }
-            }
 
-            if (!found) {
-                throw new RuntimeException("SocketTimeoutException not thrown");
+                if (!found) {
+                    throw new RuntimeException("SocketTimeoutException not thrown");
+                }
             }
+        } finally {
+            rootOcsp.stop();
+            rootOcsp.shutdownNow();
         }
     }
 
diff --git a/test/jdk/java/security/testlibrary/SimpleOCSPServer.java b/test/jdk/java/security/testlibrary/SimpleOCSPServer.java
index e1883edeec51f..5b9fb23c4ef90 100644
--- a/test/jdk/java/security/testlibrary/SimpleOCSPServer.java
+++ b/test/jdk/java/security/testlibrary/SimpleOCSPServer.java
@@ -572,8 +572,8 @@ public void setDisableContentLength(boolean isDisabled) {
      */
     private synchronized void log(String message) {
         if (logEnabled || debug != null) {
-            System.out.println("[" + Thread.currentThread().getName() + "]: " +
-                    message);
+            System.out.println("[" + Thread.currentThread().getName() + "][" +
+                    System.currentTimeMillis() + "]: " + message);
         }
     }
 
@@ -727,6 +727,7 @@ public void run() {
             // wait out the delay here before any other processing.
             try {
                 if (delayMsec > 0) {
+                    log("Delaying response for " + delayMsec + " milliseconds.");
                     Thread.sleep(delayMsec);
                 }
             } catch (InterruptedException ie) {
@@ -908,6 +909,13 @@ private LocalOcspRequest parseHttpOcspPost(InputStream inStream)
          */
         private LocalOcspRequest parseHttpOcspGet(String[] headerTokens,
                 InputStream inStream) throws IOException, CertificateException {
+            // Display the whole request
+            StringBuilder sb = new StringBuilder("OCSP GET REQUEST\n");
+            for (String hTok : headerTokens) {
+                sb.append(hTok).append("\n");
+            }
+            log(sb.toString());
+
             // Before we process the remainder of the GET URL, we should drain
             // the InputStream of any other header data.  We (for now) won't
             // use it, but will display the contents if logging is enabled.
@@ -1000,6 +1008,10 @@ private LocalOcspRequest(byte[] requestBytes) throws IOException,
                 CertificateException {
             Objects.requireNonNull(requestBytes, "Received null input");
 
+            // Display the DER encoding before parsing
+            log("Local OCSP Request Constructor, parsing bytes:\n" +
+                    dumpHexBytes(requestBytes));
+
             DerInputStream dis = new DerInputStream(requestBytes);
 
             // Parse the top-level structure, it should have no more than

From 16df9c33e9bbc9329ae60ba14332c09aadaba3f0 Mon Sep 17 00:00:00 2001
From: Gui Cao <gcao@openjdk.org>
Date: Thu, 8 Aug 2024 05:22:20 +0000
Subject: [PATCH 342/401] 8337971: Problem list several jvmci tests on
 linux-riscv64 until JDK-8331704 is fixed

Reviewed-by: fyang, shade
---
 test/hotspot/jtreg/ProblemList.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index f5b14e87607e3..d40a8c2d5f431 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -63,6 +63,12 @@ compiler/vectorapi/VectorRebracket128Test.java#ZSinglegen 8330538 generic-all
 compiler/vectorapi/VectorRebracket128Test.java#ZGenerational 8330538 generic-all
 
 compiler/jvmci/TestUncaughtErrorInCompileMethod.java 8309073 generic-all
+compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DataPatchTest.java 8331704 linux-riscv64
+compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/MaxOopMapStackOffsetTest.java 8331704 linux-riscv64
+compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/NativeCallTest.java 8331704 linux-riscv64
+compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java 8331704 linux-riscv64
+compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleCodeInstallationTest.java 8331704 linux-riscv64
+compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectDebugInfoTest.java 8331704 linux-riscv64
 
 compiler/floatingpoint/TestSubnormalFloat.java 8317810 generic-i586
 compiler/floatingpoint/TestSubnormalDouble.java 8317810 generic-i586

From 1846a65e32624f6da691c1072f44fcb762b43233 Mon Sep 17 00:00:00 2001
From: Turkhan Badalov <badalov.turxan@gmail.com>
Date: Thu, 8 Aug 2024 05:34:32 +0000
Subject: [PATCH 343/401] 8337205: Typo in Stack vs Deque Method table in Deque
 specification

Reviewed-by: liach
---
 src/java.base/share/classes/java/util/Deque.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/java/util/Deque.java b/src/java.base/share/classes/java/util/Deque.java
index ce40687989434..79e4187a586d8 100644
--- a/src/java.base/share/classes/java/util/Deque.java
+++ b/src/java.base/share/classes/java/util/Deque.java
@@ -163,7 +163,7 @@
  *  </tr>
  *  <tr>
  *    <th scope="row">{@link #peek() peek()}</th>
- *    <td>{@link #getFirst() getFirst()}</td>
+ *    <td>{@link #peekFirst() peekFirst()}</td>
  *  </tr>
  *  </tbody>
  * </table>

From fa18359007bd80d2e74c07a5a1ea6170e1bd474d Mon Sep 17 00:00:00 2001
From: Afshin Zafari <azafari@openjdk.org>
Date: Thu, 8 Aug 2024 08:55:05 +0000
Subject: [PATCH 344/401] 8335981: ProblemList
 runtime/Thread/TestAlwaysPreTouchStacks.java for MacOS

Reviewed-by: tschatzl
---
 test/hotspot/jtreg/ProblemList.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index d40a8c2d5f431..2414f3d090a18 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -117,8 +117,10 @@ runtime/ErrorHandling/CreateCoredumpOnCrash.java 8267433 macosx-x64
 runtime/StackGuardPages/TestStackGuardPagesNative.java 8303612 linux-all
 runtime/ErrorHandling/TestDwarf.java#checkDecoder 8305489 linux-all
 runtime/ErrorHandling/MachCodeFramesInErrorFile.java 8313315 linux-ppc64le
+runtime/Thread/TestAlwaysPreTouchStacks.java 8335167 macosx-aarch64
 runtime/cds/appcds/customLoader/HelloCustom_JFR.java 8241075 linux-all,windows-x64
 
+
 applications/jcstress/copy.java 8229852 linux-all
 
 containers/docker/TestJcmd.java 8278102 linux-all

From a9460a69e74f876274ec64394ac6504580041b21 Mon Sep 17 00:00:00 2001
From: Casper Norrbin <casper.norrbin@oracle.com>
Date: Thu, 8 Aug 2024 10:38:02 +0000
Subject: [PATCH 345/401] 8337982: Remove dead undef assrt0n

Reviewed-by: stefank, dholmes
---
 src/hotspot/share/memory/metaspace/blockTree.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/hotspot/share/memory/metaspace/blockTree.cpp b/src/hotspot/share/memory/metaspace/blockTree.cpp
index 934f25d84ccb3..1f1e54f4a4612 100644
--- a/src/hotspot/share/memory/metaspace/blockTree.cpp
+++ b/src/hotspot/share/memory/metaspace/blockTree.cpp
@@ -178,8 +178,6 @@ void BlockTree::verify() const {
   // (which also verifies that we visited every node, or at least
   //  as many nodes as are in this tree)
   _counter.check(counter);
-
-  #undef assrt0n
 }
 
 void BlockTree::zap_range(MetaWord* p, size_t word_size) {

From 3bc4a1acc4bb1885ddba69283b99bbe02f8e43b7 Mon Sep 17 00:00:00 2001
From: Tejesh R <tr@openjdk.org>
Date: Thu, 8 Aug 2024 10:40:56 +0000
Subject: [PATCH 346/401] 8233068: HIDPI: Linux: AWT Checkbox check mark is
 unscaled

Reviewed-by: jdv, abhiscxk, honkar
---
 .../classes/sun/awt/X11/XCheckboxPeer.java    |  9 +-
 .../Checkbox/CheckboxCheckerScalingTest.java  | 92 +++++++++++++++++++
 2 files changed, 98 insertions(+), 3 deletions(-)
 create mode 100644 test/jdk/java/awt/Checkbox/CheckboxCheckerScalingTest.java

diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XCheckboxPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XCheckboxPeer.java
index 88f1784889e73..c66cda1644372 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11/XCheckboxPeer.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XCheckboxPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -362,12 +362,15 @@ public void paintCheckbox(Graphics g,
 
             if (armed | selected) {
                 //Paint the check
+                AffineTransform af = g2.getTransform();
+                double scaleX = af.getScaleX();
+                double scaleY = af.getScaleY();
 
                 // FIXME: is this the right color?
                 g2.setColor(getPeerForeground());
 
-                AffineTransform af = g2.getTransform();
-                g2.setTransform(AffineTransform.getTranslateInstance(rx,ry));
+                g2.setTransform(AffineTransform.getTranslateInstance(rx * scaleX, ry * scaleY));
+                g2.scale(scaleX, scaleY);
                 g2.fill(myCheckMark);
                 g2.setTransform(af);
             }
diff --git a/test/jdk/java/awt/Checkbox/CheckboxCheckerScalingTest.java b/test/jdk/java/awt/Checkbox/CheckboxCheckerScalingTest.java
new file mode 100644
index 0000000000000..5e531e84801cd
--- /dev/null
+++ b/test/jdk/java/awt/Checkbox/CheckboxCheckerScalingTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.Checkbox;
+import java.awt.Color;
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.image.BufferedImage;
+
+/*
+ * @test
+ * @key headful
+ * @bug 8233068
+ * @summary Tests checkbox checker on scaling
+ * @requires (os.family == "linux")
+ * @run main CheckboxCheckerScalingTest
+ */
+
+public class CheckboxCheckerScalingTest {
+    private static Frame frame;
+    private static Checkbox checkbox;
+    private static BufferedImage imageAfterChecked;
+    private static volatile boolean checkmarkFound = false;
+
+    public static void main(String[] args) throws Exception {
+        System.setProperty("sun.java2d.uiScale", "2");
+        Robot robot = new Robot();
+        try {
+            EventQueue.invokeAndWait(() -> {
+                frame = new Frame("ComboBox checker scaling test");
+                checkbox = new Checkbox("one");
+                checkbox.setState(true);
+                frame.add(checkbox);
+                frame.pack();
+                frame.setVisible(true);
+            });
+
+            robot.waitForIdle();
+            robot.delay(100);
+            EventQueue.invokeAndWait(() -> {
+                Point point = checkbox.getLocationOnScreen();
+                Rectangle rect = new Rectangle(point.x + 5, point.y + 7, 8, 8);
+                imageAfterChecked = robot.createScreenCapture(rect);
+
+                check: {
+                    for (int i = 0; i < imageAfterChecked.getHeight(); i++) {
+                        for (int j = 0; j < imageAfterChecked.getWidth(); j++) {
+                            if (Color.black.getRGB() == imageAfterChecked.getRGB(i, j)) {
+                                checkmarkFound = true;
+                                break check;
+                            }
+                        }
+                    }
+                }
+            });
+
+            if (!checkmarkFound) {
+                throw new RuntimeException("Checkmark not scaled");
+            }
+            System.out.println("Test Passed");
+        } finally {
+            EventQueue.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+}

From 088871ce36f85fb30b24c49146f547bc8e2b0dcb Mon Sep 17 00:00:00 2001
From: Alexander Zvegintsev <azvegint@openjdk.org>
Date: Thu, 8 Aug 2024 10:51:47 +0000
Subject: [PATCH 347/401] 8335267: [XWayland] move screencast tokens from .awt
 to .java folder

Reviewed-by: prr, avu
---
 .../sun/awt/screencast/TokenStorage.java      | 91 +++++++++++--------
 1 file changed, 53 insertions(+), 38 deletions(-)

diff --git a/src/java.desktop/unix/classes/sun/awt/screencast/TokenStorage.java b/src/java.desktop/unix/classes/sun/awt/screencast/TokenStorage.java
index 3daf9b2a8b8e8..b05ff7f8c4add 100644
--- a/src/java.desktop/unix/classes/sun/awt/screencast/TokenStorage.java
+++ b/src/java.desktop/unix/classes/sun/awt/screencast/TokenStorage.java
@@ -60,35 +60,33 @@
  * The restore token allows the ScreenCast session to be restored
  * with previously granted screen access permissions.
  */
-@SuppressWarnings("removal")
 final class TokenStorage {
 
     private TokenStorage() {}
 
     private static final String REL_NAME =
+            ".java/robot/screencast-tokens.properties";
+    private static final String REL_NAME_SECONDARY =
             ".awt/robot/screencast-tokens.properties";
 
     private static final Properties PROPS = new Properties();
     private static final Path PROPS_PATH;
     private static final Path PROP_FILENAME;
 
+    @SuppressWarnings("removal")
     private static void doPrivilegedRunnable(Runnable runnable) {
-        AccessController.doPrivileged(new PrivilegedAction<Void>() {
-            @Override
-            public Void run() {
-                runnable.run();
-                return null;
-            }
+        AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
+            runnable.run();
+            return null;
         });
     }
 
     static {
-        PROPS_PATH = AccessController.doPrivileged(new PrivilegedAction<Path>() {
-            @Override
-            public Path run() {
-                return setupPath();
-            }
-        });
+        @SuppressWarnings("removal")
+        Path propsPath = AccessController
+                .doPrivileged((PrivilegedAction<Path>) () -> setupPath());
+
+        PROPS_PATH = propsPath;
 
         if (PROPS_PATH != null) {
             PROP_FILENAME = PROPS_PATH.getFileName();
@@ -110,25 +108,32 @@ private static Path setupPath() {
         }
 
         Path path = Path.of(userHome, REL_NAME);
+        Path secondaryPath = Path.of(userHome, REL_NAME_SECONDARY);
+
+        boolean copyFromSecondary = !Files.isWritable(path)
+                && Files.isWritable(secondaryPath);
+
         Path workdir = path.getParent();
 
-        if (!Files.exists(workdir)) {
-            try {
-                Files.createDirectories(workdir);
-            } catch (Exception e) {
-                if (SCREENCAST_DEBUG) {
-                    System.err.printf("Token storage: cannot create" +
-                                    " directory %s %s\n", workdir, e);
+        if (!Files.isWritable(path)) {
+            if (!Files.exists(workdir)) {
+                try {
+                    Files.createDirectories(workdir);
+                } catch (Exception e) {
+                    if (SCREENCAST_DEBUG) {
+                        System.err.printf("Token storage: cannot create" +
+                                " directory %s %s\n", workdir, e);
+                    }
+                    return null;
                 }
-                return null;
             }
-        }
 
-        if (!Files.isWritable(workdir)) {
-            if (SCREENCAST_DEBUG) {
-                System.err.printf("Token storage: %s is not writable\n", workdir);
+            if (!Files.isWritable(workdir)) {
+                if (SCREENCAST_DEBUG) {
+                    System.err.printf("Token storage: %s is not writable\n", workdir);
+                }
+                return null;
             }
-            return null;
         }
 
         try {
@@ -145,7 +150,17 @@ private static Path setupPath() {
             }
         }
 
-        if (Files.exists(path)) {
+        if (copyFromSecondary) {
+            if (SCREENCAST_DEBUG) {
+                System.out.println("Token storage: copying from the secondary location "
+                                        + secondaryPath);
+            }
+            synchronized (PROPS) {
+                if (readTokens(secondaryPath)) {
+                    store(path, "copy from the secondary location");
+                }
+            }
+        } else if (Files.exists(path)) {
             if (!setFilePermission(path)) {
                 return null;
             }
@@ -302,7 +317,7 @@ private static void storeTokenFromNative(String oldToken,
             }
 
             if (changed) {
-                doPrivilegedRunnable(() -> store("save tokens"));
+                doPrivilegedRunnable(() -> store(PROPS_PATH, "save tokens"));
             }
         }
     }
@@ -315,7 +330,7 @@ private static boolean readTokens(Path path) {
                 PROPS.clear();
                 PROPS.load(reader);
             }
-        } catch (IOException e) {
+        } catch (IOException | IllegalArgumentException e) {
             if (SCREENCAST_DEBUG) {
                 System.err.printf("""
                         Token storage: failed to load property file %s
@@ -410,7 +425,7 @@ static Set<TokenItem> getTokens(List<Rectangle> affectedScreenBounds) {
     }
 
     private static void removeMalformedRecords(Set<String> malformedRecords) {
-        if (!isWritable()
+        if (!isWritable(PROPS_PATH)
             || malformedRecords == null
             || malformedRecords.isEmpty()) {
             return;
@@ -424,17 +439,17 @@ private static void removeMalformedRecords(Set<String> malformedRecords) {
                 }
             }
 
-            store("remove malformed records");
+            store(PROPS_PATH, "remove malformed records");
         }
     }
 
-    private static void store(String failMsg) {
-        if (!isWritable()) {
+    private static void store(Path path, String failMsg) {
+        if (!isWritable(path)) {
             return;
         }
 
         synchronized (PROPS) {
-            try (BufferedWriter writer = Files.newBufferedWriter(PROPS_PATH)) {
+            try (BufferedWriter writer = Files.newBufferedWriter(path)) {
                 PROPS.store(writer, null);
             } catch (IOException e) {
                 if (SCREENCAST_DEBUG) {
@@ -445,13 +460,13 @@ private static void store(String failMsg) {
         }
     }
 
-    private static boolean isWritable() {
-        if (PROPS_PATH == null
-            || (Files.exists(PROPS_PATH) && !Files.isWritable(PROPS_PATH))) {
+    private static boolean isWritable(Path path) {
+        if (path == null
+            || (Files.exists(path) && !Files.isWritable(path))) {
 
             if (SCREENCAST_DEBUG) {
                 System.err.printf(
-                        "Token storage: %s is not writable\n", PROPS_PATH);
+                        "Token storage: %s is not writable\n", path);
             }
             return false;
         } else {

From 12c553f12876b4095685676f800119c0e275bf44 Mon Sep 17 00:00:00 2001
From: Alexander Zvegintsev <azvegint@openjdk.org>
Date: Thu, 8 Aug 2024 10:51:58 +0000
Subject: [PATCH 348/401] 8329471: Remove GTK2

Reviewed-by: abhiscxk, prr, ihse
---
 .../modules/java.desktop/lib/AwtLibraries.gmk |    4 -
 .../sun/java/swing/plaf/gtk/GTKEngine.java    |   16 +-
 .../java/swing/plaf/gtk/GTKIconFactory.java   |    6 +-
 .../java/swing/plaf/gtk/GTKLookAndFeel.java   |   24 +-
 .../sun/java/swing/plaf/gtk/GTKPainter.java   |   98 +-
 .../com/sun/java/swing/plaf/gtk/GTKStyle.java |   11 +-
 .../unix/classes/sun/awt/UNIXToolkit.java     |   19 +-
 .../native/libawt_xawt/awt/gtk2_interface.c   | 2603 -----------------
 .../native/libawt_xawt/awt/gtk2_interface.h   |  448 ---
 .../native/libawt_xawt/awt/gtk_interface.c    |   11 +-
 .../libawt_xawt/awt/screencast_pipewire.c     |    3 +-
 .../Gtk/GtkVersionTest/GtkVersionTest.java    |    7 +-
 .../ScreenCaptureGtkTest.java                 |   11 +-
 .../swing/LookAndFeel/8145547/DemandGTK.java  |    3 +-
 .../swing/LookAndFeel/8145547/DemandGTK2.sh   |   91 -
 .../swing/LookAndFeel/8145547/DemandGTK2.txt  |   36 -
 .../swing/LookAndFeel/8145547/DemandGTK3.sh   |   11 +-
 17 files changed, 54 insertions(+), 3348 deletions(-)
 delete mode 100644 src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c
 delete mode 100644 src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.h
 delete mode 100644 test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK2.sh
 delete mode 100644 test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK2.txt

diff --git a/make/modules/java.desktop/lib/AwtLibraries.gmk b/make/modules/java.desktop/lib/AwtLibraries.gmk
index 11f92585bd919..be29805f35271 100644
--- a/make/modules/java.desktop/lib/AwtLibraries.gmk
+++ b/make/modules/java.desktop/lib/AwtLibraries.gmk
@@ -237,7 +237,6 @@ ifeq ($(call isTargetOs, windows macosx)+$(ENABLE_HEADLESS_ONLY), false+false)
       DISABLED_WARNINGS_gcc := int-to-pointer-cast, \
       DISABLED_WARNINGS_gcc_awt_Taskbar.c := parentheses, \
       DISABLED_WARNINGS_gcc_GLXSurfaceData.c := unused-function, \
-      DISABLED_WARNINGS_gcc_gtk2_interface.c := parentheses type-limits, \
       DISABLED_WARNINGS_gcc_gtk3_interface.c := parentheses type-limits \
           unused-function, \
       DISABLED_WARNINGS_gcc_OGLBufImgOps.c := format-nonliteral, \
@@ -252,7 +251,6 @@ ifeq ($(call isTargetOs, windows macosx)+$(ENABLE_HEADLESS_ONLY), false+false)
       DISABLED_WARNINGS_gcc_XToolkit.c := unused-result, \
       DISABLED_WARNINGS_gcc_XWindow.c := unused-function, \
       DISABLED_WARNINGS_clang_awt_Taskbar.c := parentheses, \
-      DISABLED_WARNINGS_clang_gtk2_interface.c := parentheses, \
       DISABLED_WARNINGS_clang_gtk3_interface.c := parentheses, \
       DISABLED_WARNINGS_clang_OGLBufImgOps.c := format-nonliteral, \
       DISABLED_WARNINGS_clang_OGLPaints.c := format-nonliteral, \
@@ -262,8 +260,6 @@ ifeq ($(call isTargetOs, windows macosx)+$(ENABLE_HEADLESS_ONLY), false+false)
       DISABLED_WARNINGS_clang_aix_awt_Taskbar.c := parentheses, \
       DISABLED_WARNINGS_clang_aix_OGLPaints.c := format-nonliteral, \
       DISABLED_WARNINGS_clang_aix_OGLBufImgOps.c := format-nonliteral, \
-      DISABLED_WARNINGS_clang_aix_gtk2_interface.c := parentheses \
-          logical-op-parentheses, \
       DISABLED_WARNINGS_clang_aix_gtk3_interface.c := parentheses \
           logical-op-parentheses, \
       DISABLED_WARNINGS_clang_aix_sun_awt_X11_GtkFileDialogPeer.c := \
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java
index 1326cee140371..f9f6307678108 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,7 @@ class GTKEngine {
     /** Size of the image cache */
     private static final int CACHE_SIZE = 50;
 
-    /** This enum mirrors that in gtk2_interface.h */
+    /** This enum mirrors that in gtk_interface.h */
     static enum WidgetType {
         BUTTON, CHECK_BOX, CHECK_BOX_MENU_ITEM, COLOR_CHOOSER,
         COMBO_BOX, COMBO_BOX_ARROW_BUTTON, COMBO_BOX_TEXT_FIELD,
@@ -493,13 +493,13 @@ public void paintShadow(Graphics g, SynthContext context,
             GTKLookAndFeel.synthStateToGTKStateType(state).ordinal();
         int synthState = context.getComponentState();
         Container parent = context.getComponent().getParent();
-        if(GTKLookAndFeel.is3()) {
-            if (parent != null && parent.getParent() instanceof JComboBox) {
-                if (parent.getParent().hasFocus()) {
-                    synthState |= SynthConstants.FOCUSED;
-                }
+
+        if (parent != null && parent.getParent() instanceof JComboBox) {
+            if (parent.getParent().hasFocus()) {
+                synthState |= SynthConstants.FOCUSED;
             }
         }
+
         int dir = getTextDirection(context);
         int widget = getWidgetType(context.getComponent(), id).ordinal();
         native_paint_shadow(widget, gtkState, shadowType.ordinal(), detail,
@@ -628,7 +628,7 @@ public void themeChanged() {
         cache.flush();
     }
 
-    /* GtkSettings enum mirrors that in gtk2_interface.h */
+    /* GtkSettings enum mirrors that in gtk_interface.h */
     public Object getSetting(Settings property) {
         synchronized(sun.awt.UNIXToolkit.GTK_LOCK) {
             return native_get_gtk_setting(property.ordinal());
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKIconFactory.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKIconFactory.java
index 46f8d3ff189c0..4f04d729099f7 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKIconFactory.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKIconFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@ class GTKIconFactory {
     static final int CHECK_ICON_EXTRA_INSET        = 1;
     static final int DEFAULT_ICON_SPACING          = 2;
     static final int DEFAULT_ICON_SIZE             = 13;
-    static final int DEFAULT_TOGGLE_MENU_ITEM_SIZE = 12; // For pre-gtk2.4
+    static final int DEFAULT_TOGGLE_MENU_ITEM_SIZE = 12;
 
     private static final String RADIO_BUTTON_ICON    = "paintRadioButtonIcon";
     private static final String CHECK_BOX_ICON       = "paintCheckBoxIcon";
@@ -214,7 +214,7 @@ int getIconDimension(SynthContext context) {
 
             Region region = context.getRegion();
             GTKStyle style = (GTKStyle) context.getStyle();
-            if (GTKLookAndFeel.is3() && region == Region.MENU) {
+            if (region == Region.MENU) {
                 Object value = style.getClassSpecificValue("arrow-scaling");
                 if (value instanceof Number) {
                     iconDimension = (int)(((Number) value).floatValue() *
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
index 93ba22d8dd3da..681c0e5195838 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
@@ -77,7 +77,6 @@
  */
 @SuppressWarnings("serial") // Superclass not serializable
 public class GTKLookAndFeel extends SynthLookAndFeel {
-    private static boolean IS_22;
     private static boolean IS_3;
 
     /**
@@ -124,17 +123,6 @@ public class GTKLookAndFeel extends SynthLookAndFeel {
      */
     private static String gtkThemeName = "Default";
 
-    /**
-     * Returns true if running on system containing at least 2.2.
-     */
-    static boolean is2_2() {
-        // NOTE: We're currently hard coding to use 2.2.
-        // If we want to support both GTK 2.0 and 2.2, we'll
-        // need to get the major/minor/micro version from the .so.
-        // Refer to bug 4912613 for details.
-        return IS_22;
-    }
-
     static boolean is3() {
         return IS_3;
     }
@@ -1454,17 +1442,7 @@ public void initialize() {
             throw new InternalError("Unable to load native GTK libraries");
         }
 
-        if (UNIXToolkit.getGtkVersion() == UNIXToolkit.GtkVersions.GTK2) {
-            @SuppressWarnings("removal")
-            String version = AccessController.doPrivileged(
-                    new GetPropertyAction("jdk.gtk.version"));
-            if (version != null) {
-                IS_22 = version.equals("2.2");
-            } else {
-                IS_22 = true;
-            }
-        } else if (UNIXToolkit.getGtkVersion() ==
-                                UNIXToolkit.GtkVersions.GTK3) {
+        if (UNIXToolkit.getGtkVersion() == UNIXToolkit.GtkVersions.GTK3) {
             IS_3 = true;
         }
 
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java
index 5d77800f88e5f..4787696a367eb 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java
@@ -211,20 +211,7 @@ public void paintRadioButtonMenuItemBackground(SynthContext context,
         int gtkState = GTKLookAndFeel.synthStateToGTKState(
                 id, context.getComponentState());
         if (gtkState == SynthConstants.MOUSE_OVER) {
-            if (GTKLookAndFeel.is3()) {
-                paintComponentBackground(context, g, x, y, w, h);
-                return;
-            }
-            synchronized (UNIXToolkit.GTK_LOCK) {
-                if (! ENGINE.paintCachedImage(g, x, y, w, h, id)) {
-                    ShadowType shadow = (GTKLookAndFeel.is2_2() ?
-                        ShadowType.NONE : ShadowType.OUT);
-                    ENGINE.startPainting(g, x, y, w, h, id);
-                    ENGINE.paintBox(g, context, id, gtkState,
-                            shadow, "menuitem", x, y, w, h);
-                    ENGINE.finishPainting();
-                }
-            }
+            paintComponentBackground(context, g, x, y, w, h);
         }
     }
 
@@ -570,21 +557,7 @@ public void paintMenuItemBackground(SynthContext context,
         int gtkState = GTKLookAndFeel.synthStateToGTKState(
                 context.getRegion(), context.getComponentState());
         if (gtkState == SynthConstants.MOUSE_OVER) {
-            if (GTKLookAndFeel.is3()) {
-                paintComponentBackground(context, g, x, y, w, h);
-                return;
-            }
-            Region id = Region.MENU_ITEM;
-            synchronized (UNIXToolkit.GTK_LOCK) {
-                if (! ENGINE.paintCachedImage(g, x, y, w, h, id)) {
-                    ShadowType shadow = (GTKLookAndFeel.is2_2() ?
-                        ShadowType.NONE : ShadowType.OUT);
-                    ENGINE.startPainting(g, x, y, w, h, id);
-                    ENGINE.paintBox(g, context, id, gtkState, shadow,
-                            "menuitem", x, y, w, h);
-                    ENGINE.finishPainting();
-                }
-            }
+            paintComponentBackground(context, g, x, y, w, h);
         }
     }
 
@@ -698,17 +671,14 @@ public void paintSeparatorBackground(SynthContext context,
             } else {
                 h -= (insets.top + insets.bottom);
             }
-            if (GTKLookAndFeel.is3()) {
-                if (id == Region.POPUP_MENU_SEPARATOR) {
-                    detail = "menuitem";
-                    h -= (insets.top + insets.bottom);
-                } else {
-                    detail = "separator";
-                }
+
+            if (id == Region.POPUP_MENU_SEPARATOR) {
+                detail = "menuitem";
+                h -= (insets.top + insets.bottom);
             } else {
-                detail = orientation == JSeparator.HORIZONTAL ?
-                                                    "hseparator" : "vseparator";
+                detail = "separator";
             }
+
             synchronized (UNIXToolkit.GTK_LOCK) {
                 if (! ENGINE.paintCachedImage(g, x, y, w, h, id, state,
                             detail, orientation)) {
@@ -823,15 +793,15 @@ public void paintSliderTrackBackground(SynthContext context,
         // The ubuntulooks engine paints slider troughs differently depending
         // on the current slider value and its component orientation.
         JSlider slider = (JSlider)context.getComponent();
-        if (GTKLookAndFeel.is3()) {
-            if (slider.getOrientation() == JSlider.VERTICAL) {
-                y += 1;
-                h -= 2;
-            } else {
-                x += 1;
-                w -= 2;
-            }
+
+        if (slider.getOrientation() == JSlider.VERTICAL) {
+            y += 1;
+            h -= 2;
+        } else {
+            x += 1;
+            w -= 2;
         }
+
         double value = slider.getValue();
         double min = slider.getMinimum();
         double max = slider.getMaximum();
@@ -865,7 +835,7 @@ public void paintSliderThumbBackground(SynthContext context,
         Region id = context.getRegion();
         int gtkState = GTKLookAndFeel.synthStateToGTKState(
                 id, context.getComponentState());
-        boolean hasFocus = GTKLookAndFeel.is3() &&
+        boolean hasFocus =
                 ((context.getComponentState() & SynthConstants.FOCUSED) != 0);
         synchronized (UNIXToolkit.GTK_LOCK) {
             if (! ENGINE.paintCachedImage(g, x, y, w, h, id, gtkState, dir,
@@ -1059,21 +1029,10 @@ private void paintTextBackground(SynthContext context, Graphics g,
             int yThickness = style.getYThickness();
 
             ENGINE.startPainting(g, x, y, w, h, id, state);
-            if (GTKLookAndFeel.is3()) {
-                ENGINE.paintBackground(g, context, id, gtkState, null,
-                                                                    x, y, w, h);
-            }
+            ENGINE.paintBackground(g, context, id, gtkState, null,
+                                                                x, y, w, h);
             ENGINE.paintShadow(g, context, id, gtkState,
                                ShadowType.IN, "entry", x, y, w, h);
-            if (!GTKLookAndFeel.is3()) {
-                ENGINE.paintFlatBox(g, context, id,
-                        gtkState, ShadowType.NONE, "entry_bg",
-                        x + xThickness,
-                        y + yThickness,
-                        w - (2 * xThickness),
-                        h - (2 * yThickness),
-                        ColorType.TEXT_BACKGROUND);
-            }
 
             if (focusSize > 0 && (state & SynthConstants.FOCUSED) != 0) {
                 if (!interiorFocus) {
@@ -1084,14 +1043,14 @@ private void paintTextBackground(SynthContext context, Graphics g,
                 } else {
                     if (containerParent instanceof JComboBox) {
                         x += (focusSize + 2);
-                        y += focusSize + (GTKLookAndFeel.is3() ? 3 : 1);
-                        w -= 2 * focusSize + (GTKLookAndFeel.is3() ? 4 : 1);
-                        h -= 2 * focusSize + (GTKLookAndFeel.is3() ? 6 : 2);
+                        y += focusSize + 3;
+                        w -= 2 * focusSize + 4;
+                        h -= 2 * focusSize + 6;
                     } else {
-                        x += focusSize + (GTKLookAndFeel.is3() ? 2 : 0);
-                        y += focusSize + (GTKLookAndFeel.is3() ? 2 :0 );
-                        w -= 2 * focusSize + (GTKLookAndFeel.is3() ? 4 : 0);
-                        h -= 2 * focusSize + (GTKLookAndFeel.is3() ? 4 : 0);
+                        x += focusSize + 2;
+                        y += focusSize + 2;
+                        w -= 2 * focusSize + 4;
+                        h -= 2 * focusSize + 4;
                     }
                 }
                 ENGINE.paintFocus(g, context, id, gtkState,
@@ -1437,11 +1396,6 @@ public void paintMenuArrowIcon(SynthContext context, Graphics g,
         if (gtkState == SynthConstants.MOUSE_OVER) {
             shadow = ShadowType.IN;
         }
-        if (!GTKLookAndFeel.is3()) {
-            x += 3;
-            y += 3;
-            w = h = 7;
-        }
         ENGINE.paintArrow(g, context, Region.MENU_ITEM, gtkState, shadow,
                 dir, "menuitem", x, y, w, h);
     }
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java
index 3ba534ea2a723..90c051353686e 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java
@@ -751,14 +751,7 @@ public boolean isOpaque(SynthContext context) {
               region == Region.EDITOR_PANE) {
             return true;
         }
-        if (!GTKLookAndFeel.is3()) {
-            if (region == Region.FORMATTED_TEXT_FIELD ||
-                  region == Region.PASSWORD_FIELD ||
-                  region == Region.SPINNER ||
-                  region == Region.TEXT_FIELD) {
-                return true;
-            }
-        }
+
         Component c = context.getComponent();
         String name = c.getName();
         if (name == "ComboBox.renderer" || name == "ComboBox.listRenderer") {
@@ -884,7 +877,7 @@ else if ("CheckBox.iconTextGap".equals(key) ||
             int focusPad =
                 getClassSpecificIntValue(context, "focus-padding", 1);
             return indicatorSpacing + focusSize + focusPad;
-        } else if (GTKLookAndFeel.is3() && "ComboBox.forceOpaque".equals(key)) {
+        } else if ("ComboBox.forceOpaque".equals(key)) {
             return true;
         } else if ("Tree.expanderSize".equals(key)) {
             Object value = getClassSpecificValue("expander-size");
diff --git a/src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java b/src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java
index 191a12092a1ff..d509fe802b028 100644
--- a/src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java
+++ b/src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java
@@ -70,19 +70,12 @@ public abstract class UNIXToolkit extends SunToolkit
     private static final int[] BAND_OFFSETS_ALPHA = { 0, 1, 2, 3 };
     private static final int DEFAULT_DATATRANSFER_TIMEOUT = 10000;
 
-    private static final String GTK2_DEPRECATION_MESSAGE =
-            "WARNING: the GTK 2 library is deprecated and " +
-                    "its support will be removed in a future release";
-    private static volatile boolean gtk2WarningIssued = false;
-
     // Allowed GTK versions
     public enum GtkVersions {
         ANY(0),
-        GTK2(Constants.GTK2_MAJOR_NUMBER),
         GTK3(Constants.GTK3_MAJOR_NUMBER);
 
         static class Constants {
-            static final int GTK2_MAJOR_NUMBER = 2;
             static final int GTK3_MAJOR_NUMBER = 3;
         }
 
@@ -94,8 +87,6 @@ static class Constants {
 
         public static GtkVersions getVersion(int number) {
             switch (number) {
-                case Constants.GTK2_MAJOR_NUMBER:
-                    return GTK2;
                 case Constants.GTK3_MAJOR_NUMBER:
                     return GTK3;
                 default:
@@ -498,15 +489,7 @@ public static GtkVersions getEnabledGtkVersion() {
         @SuppressWarnings("removal")
         String version = AccessController.doPrivileged(
                 new GetPropertyAction("jdk.gtk.version"));
-        if (version == null) {
-            return GtkVersions.ANY;
-        } else if (version.startsWith("2")) {
-            if (!gtk2WarningIssued) {
-                System.err.println(GTK2_DEPRECATION_MESSAGE);
-                gtk2WarningIssued = true;
-            }
-            return GtkVersions.GTK2;
-        } else if("3".equals(version) ){
+        if ("3".equals(version)) {
             return GtkVersions.GTK3;
         }
         return GtkVersions.ANY;
diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c b/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c
deleted file mode 100644
index 7dba83e9024d2..0000000000000
--- a/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c
+++ /dev/null
@@ -1,2603 +0,0 @@
-/*
- * Copyright (c) 2005, 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.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#ifdef HEADLESS
-    #error This file should not be included in headless library
-#endif
-
-#include <dlfcn.h>
-#include <setjmp.h>
-#include <X11/Xlib.h>
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-#include "gtk2_interface.h"
-#include "java_awt_Transparency.h"
-#include "jvm_md.h"
-#include "sizecalc.h"
-#include <jni_util.h>
-#include "awt.h"
-
-#define GTK_TYPE_BORDER                 ((*fp_gtk_border_get_type)())
-
-#define G_TYPE_FUNDAMENTAL_SHIFT        (2)
-#define G_TYPE_MAKE_FUNDAMENTAL(x)      ((GType) ((x) << G_TYPE_FUNDAMENTAL_SHIFT))
-
-#define CONV_BUFFER_SIZE 128
-
-#define NO_SYMBOL_EXCEPTION 1
-
-static void *gtk2_libhandle = NULL;
-static void *gthread_libhandle = NULL;
-
-static jmp_buf j;
-
-/* Widgets */
-static GtkWidget *gtk2_widget = NULL;
-static GtkWidget *gtk2_window = NULL;
-static GtkFixed  *gtk2_fixed  = NULL;
-
-/* Paint system */
-static GdkPixmap *gtk2_white_pixmap = NULL;
-static GdkPixmap *gtk2_black_pixmap = NULL;
-static GdkPixbuf *gtk2_white_pixbuf = NULL;
-static GdkPixbuf *gtk2_black_pixbuf = NULL;
-static int gtk2_pixbuf_width = 0;
-static int gtk2_pixbuf_height = 0;
-
-/* Static buffer for conversion from java.lang.String to UTF-8 */
-static char convertionBuffer[CONV_BUFFER_SIZE];
-
-static gboolean new_combo = TRUE;
-const char ENV_PREFIX[] = "GTK_MODULES=";
-
-
-static GtkWidget *gtk2_widgets[_GTK_WIDGET_TYPE_SIZE];
-
-/*************************
- * Glib function pointers
- *************************/
-
-static gboolean (*fp_g_main_context_iteration)(GMainContext *context,
-                                             gboolean may_block);
-
-static GValue*      (*fp_g_value_init)(GValue *value, GType g_type);
-static gboolean     (*fp_g_type_is_a)(GType type, GType is_a_type);
-static gboolean     (*fp_g_value_get_boolean)(const GValue *value);
-static gchar        (*fp_g_value_get_char)(const GValue *value);
-static guchar       (*fp_g_value_get_uchar)(const GValue *value);
-static gint         (*fp_g_value_get_int)(const GValue *value);
-static guint        (*fp_g_value_get_uint)(const GValue *value);
-static glong        (*fp_g_value_get_long)(const GValue *value);
-static gulong       (*fp_g_value_get_ulong)(const GValue *value);
-static gint64       (*fp_g_value_get_int64)(const GValue *value);
-static guint64      (*fp_g_value_get_uint64)(const GValue *value);
-static gfloat       (*fp_g_value_get_float)(const GValue *value);
-static gdouble      (*fp_g_value_get_double)(const GValue *value);
-static const gchar* (*fp_g_value_get_string)(const GValue *value);
-static gint         (*fp_g_value_get_enum)(const GValue *value);
-static guint        (*fp_g_value_get_flags)(const GValue *value);
-static GParamSpec*  (*fp_g_value_get_param)(const GValue *value);
-static gpointer*    (*fp_g_value_get_boxed)(const GValue *value);
-static gpointer*    (*fp_g_value_get_pointer)(const GValue *value);
-static GObject*     (*fp_g_value_get_object)(const GValue *value);
-static GParamSpec*  (*fp_g_param_spec_int)(const gchar *name,
-        const gchar *nick, const gchar *blurb,
-        gint minimum, gint maximum, gint default_value,
-        GParamFlags flags);
-static void         (*fp_g_object_get)(gpointer object,
-                                       const gchar* fpn, ...);
-static void         (*fp_g_object_set)(gpointer object,
-                                       const gchar *first_property_name,
-                                       ...);
-/************************
- * GDK function pointers
- ************************/
-static GdkPixmap *(*fp_gdk_pixmap_new)(GdkDrawable *drawable,
-        gint width, gint height, gint depth);
-static GdkGC *(*fp_gdk_gc_new)(GdkDrawable*);
-static void (*fp_gdk_rgb_gc_set_foreground)(GdkGC*, guint32);
-static void (*fp_gdk_draw_rectangle)(GdkDrawable*, GdkGC*, gboolean,
-        gint, gint, gint, gint);
-static GdkPixbuf *(*fp_gdk_pixbuf_new)(GdkColorspace colorspace,
-        gboolean has_alpha, int bits_per_sample, int width, int height);
-static void (*fp_gdk_drawable_get_size)(GdkDrawable *drawable,
-        gint* width, gint* height);
-
-/************************
- * Gtk function pointers
- ************************/
-static gboolean (*fp_gtk_init_check)(int* argc, char** argv);
-
-/* Painting */
-static void (*fp_gtk_paint_hline)(GtkStyle* style, GdkWindow* window,
-        GtkStateType state_type, GdkRectangle* area, GtkWidget* widget,
-        const gchar* detail, gint x1, gint x2, gint y);
-static void (*fp_gtk_paint_vline)(GtkStyle* style, GdkWindow* window,
-        GtkStateType state_type, GdkRectangle* area, GtkWidget* widget,
-        const gchar* detail, gint y1, gint y2, gint x);
-static void (*fp_gtk_paint_shadow)(GtkStyle* style, GdkWindow* window,
-        GtkStateType state_type, GtkShadowType shadow_type,
-        GdkRectangle* area, GtkWidget* widget, const gchar* detail,
-        gint x, gint y, gint width, gint height);
-static void (*fp_gtk_paint_arrow)(GtkStyle* style, GdkWindow* window,
-        GtkStateType state_type, GtkShadowType shadow_type,
-        GdkRectangle* area, GtkWidget* widget, const gchar* detail,
-        GtkArrowType arrow_type, gboolean fill, gint x, gint y,
-        gint width, gint height);
-static void (*fp_gtk_paint_box)(GtkStyle* style, GdkWindow* window,
-        GtkStateType state_type, GtkShadowType shadow_type,
-        GdkRectangle* area, GtkWidget* widget, const gchar* detail,
-        gint x, gint y, gint width, gint height);
-static void (*fp_gtk_paint_flat_box)(GtkStyle* style, GdkWindow* window,
-        GtkStateType state_type, GtkShadowType shadow_type,
-        GdkRectangle* area, GtkWidget* widget, const gchar* detail,
-        gint x, gint y, gint width, gint height);
-static void (*fp_gtk_paint_check)(GtkStyle* style, GdkWindow* window,
-        GtkStateType state_type, GtkShadowType shadow_type,
-        GdkRectangle* area, GtkWidget* widget, const gchar* detail,
-        gint x, gint y, gint width, gint height);
-static void (*fp_gtk_paint_option)(GtkStyle* style, GdkWindow* window,
-        GtkStateType state_type, GtkShadowType shadow_type,
-        GdkRectangle* area, GtkWidget* widget, const gchar* detail,
-        gint x, gint y, gint width, gint height);
-static void (*fp_gtk_paint_box_gap)(GtkStyle* style, GdkWindow* window,
-        GtkStateType state_type, GtkShadowType shadow_type,
-        GdkRectangle* area, GtkWidget* widget, const gchar* detail,
-        gint x, gint y, gint width, gint height,
-        GtkPositionType gap_side, gint gap_x, gint gap_width);
-static void (*fp_gtk_paint_extension)(GtkStyle* style, GdkWindow* window,
-        GtkStateType state_type, GtkShadowType shadow_type,
-        GdkRectangle* area, GtkWidget* widget, const gchar* detail,
-        gint x, gint y, gint width, gint height, GtkPositionType gap_side);
-static void (*fp_gtk_paint_focus)(GtkStyle* style, GdkWindow* window,
-        GtkStateType state_type, GdkRectangle* area, GtkWidget* widget,
-        const gchar* detail, gint x, gint y, gint width, gint height);
-static void (*fp_gtk_paint_slider)(GtkStyle* style, GdkWindow* window,
-        GtkStateType state_type, GtkShadowType shadow_type,
-        GdkRectangle* area, GtkWidget* widget, const gchar* detail,
-        gint x, gint y, gint width, gint height, GtkOrientation orientation);
-static void (*fp_gtk_paint_handle)(GtkStyle* style, GdkWindow* window,
-        GtkStateType state_type, GtkShadowType shadow_type,
-        GdkRectangle* area, GtkWidget* widget, const gchar* detail,
-        gint x, gint y, gint width, gint height, GtkOrientation orientation);
-static void (*fp_gtk_paint_expander)(GtkStyle* style, GdkWindow* window,
-        GtkStateType state_type, GdkRectangle* area, GtkWidget* widget,
-        const gchar* detail, gint x, gint y, GtkExpanderStyle expander_style);
-static void (*fp_gtk_style_apply_default_background)(GtkStyle* style,
-        GdkWindow* window, gboolean set_bg, GtkStateType state_type,
-        GdkRectangle* area, gint x, gint y, gint width, gint height);
-
-/* Widget creation */
-static GtkWidget* (*fp_gtk_arrow_new)(GtkArrowType arrow_type,
-                                      GtkShadowType shadow_type);
-static GtkWidget* (*fp_gtk_button_new)();
-static GtkWidget* (*fp_gtk_check_button_new)();
-static GtkWidget* (*fp_gtk_check_menu_item_new)();
-static GtkWidget* (*fp_gtk_color_selection_dialog_new)(const gchar* title);
-static GtkWidget* (*fp_gtk_combo_box_new)();
-static GtkWidget* (*fp_gtk_combo_box_entry_new)();
-static GtkWidget* (*fp_gtk_entry_new)();
-static GtkWidget* (*fp_gtk_fixed_new)();
-static GtkWidget* (*fp_gtk_handle_box_new)();
-static GtkWidget* (*fp_gtk_hpaned_new)();
-static GtkWidget* (*fp_gtk_vpaned_new)();
-static GtkWidget* (*fp_gtk_hscale_new)(GtkAdjustment* adjustment);
-static GtkWidget* (*fp_gtk_vscale_new)(GtkAdjustment* adjustment);
-static GtkWidget* (*fp_gtk_hscrollbar_new)(GtkAdjustment* adjustment);
-static GtkWidget* (*fp_gtk_vscrollbar_new)(GtkAdjustment* adjustment);
-static GtkWidget* (*fp_gtk_hseparator_new)();
-static GtkWidget* (*fp_gtk_vseparator_new)();
-static GtkWidget* (*fp_gtk_image_new)();
-static GtkWidget* (*fp_gtk_label_new)(const gchar* str);
-static GtkWidget* (*fp_gtk_menu_new)();
-static GtkWidget* (*fp_gtk_menu_bar_new)();
-static GtkWidget* (*fp_gtk_menu_item_new)();
-static GtkWidget* (*fp_gtk_notebook_new)();
-static GtkWidget* (*fp_gtk_progress_bar_new)();
-static GtkWidget* (*fp_gtk_progress_bar_set_orientation)(
-        GtkProgressBar *pbar,
-        GtkProgressBarOrientation orientation);
-static GtkWidget* (*fp_gtk_radio_button_new)(GSList *group);
-static GtkWidget* (*fp_gtk_radio_menu_item_new)(GSList *group);
-static GtkWidget* (*fp_gtk_scrolled_window_new)(GtkAdjustment *hadjustment,
-        GtkAdjustment *vadjustment);
-static GtkWidget* (*fp_gtk_separator_menu_item_new)();
-static GtkWidget* (*fp_gtk_separator_tool_item_new)();
-static GtkWidget* (*fp_gtk_text_view_new)();
-static GtkWidget* (*fp_gtk_toggle_button_new)();
-static GtkWidget* (*fp_gtk_toolbar_new)();
-static GtkWidget* (*fp_gtk_tree_view_new)();
-static GtkWidget* (*fp_gtk_viewport_new)(GtkAdjustment *hadjustment,
-        GtkAdjustment *vadjustment);
-static GtkWidget* (*fp_gtk_window_new)(GtkWindowType type);
-static GtkWidget* (*fp_gtk_dialog_new)();
-static GtkWidget* (*fp_gtk_spin_button_new)(GtkAdjustment *adjustment,
-        gdouble climb_rate, guint digits);
-static GtkWidget* (*fp_gtk_frame_new)(const gchar *label);
-
-/* Other widget operations */
-static GtkObject* (*fp_gtk_adjustment_new)(gdouble value,
-        gdouble lower, gdouble upper, gdouble step_increment,
-        gdouble page_increment, gdouble page_size);
-static void (*fp_gtk_container_add)(GtkContainer *window, GtkWidget *widget);
-static void (*fp_gtk_menu_shell_append)(GtkMenuShell *menu_shell,
-        GtkWidget *child);
-static void (*fp_gtk_menu_item_set_submenu)(GtkMenuItem *menu_item,
-        GtkWidget *submenu);
-static void (*fp_gtk_widget_realize)(GtkWidget *widget);
-static GdkPixbuf* (*fp_gtk_widget_render_icon)(GtkWidget *widget,
-        const gchar *stock_id, GtkIconSize size, const gchar *detail);
-static void (*fp_gtk_widget_set_name)(GtkWidget *widget, const gchar *name);
-static void (*fp_gtk_widget_set_parent)(GtkWidget *widget, GtkWidget *parent);
-static void (*fp_gtk_widget_set_direction)(GtkWidget *widget,
-        GtkTextDirection direction);
-static void (*fp_gtk_widget_style_get)(GtkWidget *widget,
-        const gchar *first_property_name, ...);
-static void (*fp_gtk_widget_class_install_style_property)(
-        GtkWidgetClass* class, GParamSpec *pspec);
-static GParamSpec* (*fp_gtk_widget_class_find_style_property)(
-        GtkWidgetClass* class, const gchar* property_name);
-static void (*fp_gtk_widget_style_get_property)(GtkWidget* widget,
-        const gchar* property_name, GValue* value);
-static char* (*fp_pango_font_description_to_string)(
-        const PangoFontDescription* fd);
-static GtkSettings* (*fp_gtk_settings_get_default)();
-static GtkSettings* (*fp_gtk_widget_get_settings)(GtkWidget *widget);
-static GType        (*fp_gtk_border_get_type)();
-static void (*fp_gtk_arrow_set)(GtkWidget* arrow,
-                                GtkArrowType arrow_type,
-                                GtkShadowType shadow_type);
-static void (*fp_gtk_widget_size_request)(GtkWidget *widget,
-                                          GtkRequisition *requisition);
-static GtkAdjustment* (*fp_gtk_range_get_adjustment)(GtkRange* range);
-
-/* Method bodies */
-
-static void throw_exception(JNIEnv *env, const char* name, const char* message)
-{
-    jclass class = (*env)->FindClass(env, name);
-
-    if (class != NULL)
-        (*env)->ThrowNew(env, class, message);
-
-    (*env)->DeleteLocalRef(env, class);
-}
-
-/* This is a workaround for the bug:
- * http://sourceware.org/bugzilla/show_bug.cgi?id=1814
- * (dlsym/dlopen clears dlerror state)
- * This bug is specific to Linux, but there is no harm in
- * applying this workaround on Solaris as well.
- */
-static void* dl_symbol(const char* name)
-{
-    void* result = dlsym(gtk2_libhandle, name);
-    if (!result)
-        longjmp(j, NO_SYMBOL_EXCEPTION);
-
-    return result;
-}
-
-static void* dl_symbol_gthread(const char* name)
-{
-    void* result = dlsym(gthread_libhandle, name);
-    if (!result)
-        longjmp(j, NO_SYMBOL_EXCEPTION);
-
-    return result;
-}
-
-gboolean gtk2_check(const char* lib_name, gboolean load)
-{
-    if (gtk2_libhandle != NULL) {
-        /* We've already successfully opened the GTK libs, so return true. */
-        return TRUE;
-    } else {
-        void *lib = NULL;
-
-#ifdef RTLD_NOLOAD
-        /* Just check if gtk libs are already in the process space */
-        lib = dlopen(lib_name, RTLD_LAZY | RTLD_NOLOAD);
-        if (!load || lib != NULL) {
-            return lib != NULL;
-        }
-#else
-#ifdef _AIX
-        /* On AIX we could implement this with the help of loadquery(L_GETINFO, ..)  */
-        /* (see reload_table() in hotspot/src/os/aix/vm/loadlib_aix.cpp) but it is   */
-        /* probably not worth it because most AIX servers don't have GTK libs anyway */
-#endif
-#endif
-
-        lib = dlopen(lib_name, RTLD_LAZY | RTLD_LOCAL);
-        if (lib == NULL) {
-            return FALSE;
-        }
-
-        fp_gtk_check_version = dlsym(lib, "gtk_check_version");
-        /* Check for GTK 2.2+ */
-        if (!fp_gtk_check_version(2, 2, 0)) {
-            return TRUE;
-        }
-
-        // 8048289: workaround for https://bugzilla.gnome.org/show_bug.cgi?id=733065
-        // dlclose(lib);
-
-        return FALSE;
-    }
-}
-
-#define ADD_SUPPORTED_ACTION(actionStr) \
-do { \
-    jfieldID fld_action = (*env)->GetStaticFieldID(env, cls_action, actionStr, "Ljava/awt/Desktop$Action;"); \
-    if (!(*env)->ExceptionCheck(env)) { \
-        jobject action = (*env)->GetStaticObjectField(env, cls_action, fld_action); \
-        (*env)->CallBooleanMethod(env, supportedActions, mid_arrayListAdd, action); \
-    } else { \
-        (*env)->ExceptionClear(env); \
-    } \
-} while(0);
-
-
-static void update_supported_actions(JNIEnv *env) {
-    GVfs * (*fp_g_vfs_get_default) (void);
-    const gchar * const * (*fp_g_vfs_get_supported_uri_schemes) (GVfs * vfs);
-    const gchar * const * schemes = NULL;
-
-    jclass cls_action = (*env)->FindClass(env, "java/awt/Desktop$Action");
-    CHECK_NULL(cls_action);
-    jclass cls_xDesktopPeer = (*env)->FindClass(env, "sun/awt/X11/XDesktopPeer");
-    CHECK_NULL(cls_xDesktopPeer);
-    jfieldID fld_supportedActions = (*env)->GetStaticFieldID(env, cls_xDesktopPeer, "supportedActions", "Ljava/util/List;");
-    CHECK_NULL(fld_supportedActions);
-    jobject supportedActions = (*env)->GetStaticObjectField(env, cls_xDesktopPeer, fld_supportedActions);
-
-    jclass cls_arrayList = (*env)->FindClass(env, "java/util/ArrayList");
-    CHECK_NULL(cls_arrayList);
-    jmethodID mid_arrayListAdd = (*env)->GetMethodID(env, cls_arrayList, "add", "(Ljava/lang/Object;)Z");
-    CHECK_NULL(mid_arrayListAdd);
-    jmethodID mid_arrayListClear = (*env)->GetMethodID(env, cls_arrayList, "clear", "()V");
-    CHECK_NULL(mid_arrayListClear);
-
-    (*env)->CallVoidMethod(env, supportedActions, mid_arrayListClear);
-
-    ADD_SUPPORTED_ACTION("OPEN");
-
-    /**
-     * gtk_show_uri() documentation says:
-     *
-     * > you need to install gvfs to get support for uri schemes such as http://
-     * > or ftp://, as only local files are handled by GIO itself.
-     *
-     * So OPEN action was safely added here.
-     * However, it looks like Solaris 11 have gvfs support only for 32-bit
-     * applications only by default.
-     */
-
-    fp_g_vfs_get_default = dl_symbol("g_vfs_get_default");
-    fp_g_vfs_get_supported_uri_schemes = dl_symbol("g_vfs_get_supported_uri_schemes");
-    dlerror();
-
-    if (fp_g_vfs_get_default && fp_g_vfs_get_supported_uri_schemes) {
-        GVfs * vfs = fp_g_vfs_get_default();
-        schemes = vfs ? fp_g_vfs_get_supported_uri_schemes(vfs) : NULL;
-        if (schemes) {
-            int i = 0;
-            while (schemes[i]) {
-                if (strcmp(schemes[i], "http") == 0) {
-                    ADD_SUPPORTED_ACTION("BROWSE");
-                    ADD_SUPPORTED_ACTION("MAIL");
-                    break;
-                }
-                i++;
-            }
-        }
-    } else {
-#ifdef DEBUG
-        fprintf(stderr, "Cannot load g_vfs_get_supported_uri_schemes\n");
-#endif /* DEBUG */
-    }
-
-}
-/**
- * Functions for awt_Desktop.c
- */
-static gboolean gtk2_show_uri_load(JNIEnv *env) {
-     gboolean success = FALSE;
-     dlerror();
-     const char *gtk_version = fp_gtk_check_version(2, 14, 0);
-     if (gtk_version != NULL) {
-         // The gtk_show_uri is available from GTK+ 2.14
-#ifdef DEBUG
-         fprintf (stderr, "The version of GTK is %s. "
-             "The gtk_show_uri function is supported "
-             "since GTK+ 2.14.\n", gtk_version);
-#endif /* DEBUG */
-     } else {
-         // Loading symbols only if the GTK version is 2.14 and higher
-         fp_gtk_show_uri = dl_symbol("gtk_show_uri");
-         const char *dlsym_error = dlerror();
-         if (dlsym_error) {
-#ifdef DEBUG
-             fprintf (stderr, "Cannot load symbol: %s \n", dlsym_error);
-#endif /* DEBUG */
-         } else if (fp_gtk_show_uri == NULL) {
-#ifdef DEBUG
-             fprintf(stderr, "dlsym(gtk_show_uri) returned NULL\n");
-#endif /* DEBUG */
-        } else {
-            gtk->gtk_show_uri = fp_gtk_show_uri;
-            update_supported_actions(env);
-            success = TRUE;
-        }
-     }
-     return success;
-}
-
-/**
- * Functions for sun_awt_X11_GtkFileDialogPeer.c
- */
-static void gtk2_file_chooser_load()
-{
-    fp_gtk_file_chooser_get_filename = dl_symbol(
-            "gtk_file_chooser_get_filename");
-    fp_gtk_file_chooser_dialog_new = dl_symbol("gtk_file_chooser_dialog_new");
-    fp_gtk_file_chooser_set_current_folder = dl_symbol(
-            "gtk_file_chooser_set_current_folder");
-    fp_gtk_file_chooser_set_filename = dl_symbol(
-            "gtk_file_chooser_set_filename");
-    fp_gtk_file_chooser_set_current_name = dl_symbol(
-            "gtk_file_chooser_set_current_name");
-    fp_gtk_file_filter_add_custom = dl_symbol("gtk_file_filter_add_custom");
-    fp_gtk_file_chooser_set_filter = dl_symbol("gtk_file_chooser_set_filter");
-    fp_gtk_file_chooser_get_type = dl_symbol("gtk_file_chooser_get_type");
-    fp_gtk_file_filter_new = dl_symbol("gtk_file_filter_new");
-    if (fp_gtk_check_version(2, 8, 0) == NULL) {
-        fp_gtk_file_chooser_set_do_overwrite_confirmation = dl_symbol(
-                "gtk_file_chooser_set_do_overwrite_confirmation");
-    }
-    fp_gtk_file_chooser_set_select_multiple = dl_symbol(
-            "gtk_file_chooser_set_select_multiple");
-    fp_gtk_file_chooser_get_current_folder = dl_symbol(
-            "gtk_file_chooser_get_current_folder");
-    fp_gtk_file_chooser_get_filenames = dl_symbol(
-            "gtk_file_chooser_get_filenames");
-    fp_gtk_g_slist_length = dl_symbol("g_slist_length");
-    fp_gdk_x11_drawable_get_xid = dl_symbol("gdk_x11_drawable_get_xid");
-}
-
-GtkApi* gtk2_load(JNIEnv *env, const char* lib_name)
-{
-    gboolean result;
-    int i;
-    int (*handler)();
-    int (*io_handler)();
-    char *gtk_modules_env;
-
-    gtk2_libhandle = dlopen(lib_name, RTLD_LAZY | RTLD_LOCAL);
-    if (gtk2_libhandle == NULL) {
-        return FALSE;
-    }
-
-    gthread_libhandle = dlopen(GTHREAD_LIB_VERSIONED, RTLD_LAZY | RTLD_LOCAL);
-    if (gthread_libhandle == NULL) {
-        gthread_libhandle = dlopen(GTHREAD_LIB, RTLD_LAZY | RTLD_LOCAL);
-        if (gthread_libhandle == NULL)
-            return FALSE;
-    }
-
-    if (setjmp(j) == 0)
-    {
-        fp_gtk_check_version = dl_symbol("gtk_check_version");
-        /* Check for GTK 2.2+ */
-        if (fp_gtk_check_version(2, 2, 0)) {
-            longjmp(j, NO_SYMBOL_EXCEPTION);
-        }
-
-        /* GLib */
-        fp_glib_check_version = dlsym(gtk2_libhandle, "glib_check_version");
-        if (!fp_glib_check_version) {
-            dlerror();
-        }
-        fp_g_free = dl_symbol("g_free");
-        fp_g_object_unref = dl_symbol("g_object_unref");
-
-        fp_g_main_context_iteration =
-            dl_symbol("g_main_context_iteration");
-
-        fp_g_value_init = dl_symbol("g_value_init");
-        fp_g_type_is_a = dl_symbol("g_type_is_a");
-
-        fp_g_value_get_boolean = dl_symbol("g_value_get_boolean");
-        fp_g_value_get_char = dl_symbol("g_value_get_char");
-        fp_g_value_get_uchar = dl_symbol("g_value_get_uchar");
-        fp_g_value_get_int = dl_symbol("g_value_get_int");
-        fp_g_value_get_uint = dl_symbol("g_value_get_uint");
-        fp_g_value_get_long = dl_symbol("g_value_get_long");
-        fp_g_value_get_ulong = dl_symbol("g_value_get_ulong");
-        fp_g_value_get_int64 = dl_symbol("g_value_get_int64");
-        fp_g_value_get_uint64 = dl_symbol("g_value_get_uint64");
-        fp_g_value_get_float = dl_symbol("g_value_get_float");
-        fp_g_value_get_double = dl_symbol("g_value_get_double");
-        fp_g_value_get_string = dl_symbol("g_value_get_string");
-        fp_g_value_get_enum = dl_symbol("g_value_get_enum");
-        fp_g_value_get_flags = dl_symbol("g_value_get_flags");
-        fp_g_value_get_param = dl_symbol("g_value_get_param");
-        fp_g_value_get_boxed = dl_symbol("g_value_get_boxed");
-        fp_g_value_get_pointer = dl_symbol("g_value_get_pointer");
-        fp_g_value_get_object = dl_symbol("g_value_get_object");
-        fp_g_param_spec_int = dl_symbol("g_param_spec_int");
-        fp_g_object_get = dl_symbol("g_object_get");
-        fp_g_object_set = dl_symbol("g_object_set");
-
-        /* GDK */
-        fp_gdk_get_default_root_window =
-            dl_symbol("gdk_get_default_root_window");
-        fp_gdk_pixmap_new = dl_symbol("gdk_pixmap_new");
-        fp_gdk_pixbuf_get_from_drawable =
-            dl_symbol("gdk_pixbuf_get_from_drawable");
-        fp_gdk_pixbuf_scale_simple =
-            dl_symbol("gdk_pixbuf_scale_simple");
-        fp_gdk_gc_new = dl_symbol("gdk_gc_new");
-        fp_gdk_rgb_gc_set_foreground =
-            dl_symbol("gdk_rgb_gc_set_foreground");
-        fp_gdk_draw_rectangle = dl_symbol("gdk_draw_rectangle");
-        fp_gdk_drawable_get_size = dl_symbol("gdk_drawable_get_size");
-
-        /* Pixbuf */
-        fp_gdk_pixbuf_new = dl_symbol("gdk_pixbuf_new");
-        fp_gdk_pixbuf_new_from_file =
-                dl_symbol("gdk_pixbuf_new_from_file");
-        fp_gdk_pixbuf_get_width = dl_symbol("gdk_pixbuf_get_width");
-        fp_gdk_pixbuf_get_height = dl_symbol("gdk_pixbuf_get_height");
-        fp_gdk_pixbuf_get_pixels = dl_symbol("gdk_pixbuf_get_pixels");
-        fp_gdk_pixbuf_get_rowstride =
-                dl_symbol("gdk_pixbuf_get_rowstride");
-        fp_gdk_pixbuf_get_has_alpha =
-                dl_symbol("gdk_pixbuf_get_has_alpha");
-        fp_gdk_pixbuf_get_bits_per_sample =
-                dl_symbol("gdk_pixbuf_get_bits_per_sample");
-        fp_gdk_pixbuf_get_n_channels =
-                dl_symbol("gdk_pixbuf_get_n_channels");
-        fp_gdk_pixbuf_get_colorspace =
-                dl_symbol("gdk_pixbuf_get_colorspace");
-
-        /* GTK painting */
-        fp_gtk_init_check = dl_symbol("gtk_init_check");
-        fp_gtk_paint_hline = dl_symbol("gtk_paint_hline");
-        fp_gtk_paint_vline = dl_symbol("gtk_paint_vline");
-        fp_gtk_paint_shadow = dl_symbol("gtk_paint_shadow");
-        fp_gtk_paint_arrow = dl_symbol("gtk_paint_arrow");
-        fp_gtk_paint_box = dl_symbol("gtk_paint_box");
-        fp_gtk_paint_flat_box = dl_symbol("gtk_paint_flat_box");
-        fp_gtk_paint_check = dl_symbol("gtk_paint_check");
-        fp_gtk_paint_option = dl_symbol("gtk_paint_option");
-        fp_gtk_paint_box_gap = dl_symbol("gtk_paint_box_gap");
-        fp_gtk_paint_extension = dl_symbol("gtk_paint_extension");
-        fp_gtk_paint_focus = dl_symbol("gtk_paint_focus");
-        fp_gtk_paint_slider = dl_symbol("gtk_paint_slider");
-        fp_gtk_paint_handle = dl_symbol("gtk_paint_handle");
-        fp_gtk_paint_expander = dl_symbol("gtk_paint_expander");
-        fp_gtk_style_apply_default_background =
-                dl_symbol("gtk_style_apply_default_background");
-
-        /* GTK widgets */
-        fp_gtk_arrow_new = dl_symbol("gtk_arrow_new");
-        fp_gtk_button_new = dl_symbol("gtk_button_new");
-        fp_gtk_spin_button_new = dl_symbol("gtk_spin_button_new");
-        fp_gtk_check_button_new = dl_symbol("gtk_check_button_new");
-        fp_gtk_check_menu_item_new =
-                dl_symbol("gtk_check_menu_item_new");
-        fp_gtk_color_selection_dialog_new =
-                dl_symbol("gtk_color_selection_dialog_new");
-        fp_gtk_entry_new = dl_symbol("gtk_entry_new");
-        fp_gtk_fixed_new = dl_symbol("gtk_fixed_new");
-        fp_gtk_handle_box_new = dl_symbol("gtk_handle_box_new");
-        fp_gtk_image_new = dl_symbol("gtk_image_new");
-        fp_gtk_hpaned_new = dl_symbol("gtk_hpaned_new");
-        fp_gtk_vpaned_new = dl_symbol("gtk_vpaned_new");
-        fp_gtk_hscale_new = dl_symbol("gtk_hscale_new");
-        fp_gtk_vscale_new = dl_symbol("gtk_vscale_new");
-        fp_gtk_hscrollbar_new = dl_symbol("gtk_hscrollbar_new");
-        fp_gtk_vscrollbar_new = dl_symbol("gtk_vscrollbar_new");
-        fp_gtk_hseparator_new = dl_symbol("gtk_hseparator_new");
-        fp_gtk_vseparator_new = dl_symbol("gtk_vseparator_new");
-        fp_gtk_label_new = dl_symbol("gtk_label_new");
-        fp_gtk_menu_new = dl_symbol("gtk_menu_new");
-        fp_gtk_menu_bar_new = dl_symbol("gtk_menu_bar_new");
-        fp_gtk_menu_item_new = dl_symbol("gtk_menu_item_new");
-        fp_gtk_menu_item_set_submenu =
-                dl_symbol("gtk_menu_item_set_submenu");
-        fp_gtk_notebook_new = dl_symbol("gtk_notebook_new");
-        fp_gtk_progress_bar_new =
-            dl_symbol("gtk_progress_bar_new");
-        fp_gtk_progress_bar_set_orientation =
-            dl_symbol("gtk_progress_bar_set_orientation");
-        fp_gtk_radio_button_new =
-            dl_symbol("gtk_radio_button_new");
-        fp_gtk_radio_menu_item_new =
-            dl_symbol("gtk_radio_menu_item_new");
-        fp_gtk_scrolled_window_new =
-            dl_symbol("gtk_scrolled_window_new");
-        fp_gtk_separator_menu_item_new =
-            dl_symbol("gtk_separator_menu_item_new");
-        fp_gtk_text_view_new = dl_symbol("gtk_text_view_new");
-        fp_gtk_toggle_button_new =
-            dl_symbol("gtk_toggle_button_new");
-        fp_gtk_toolbar_new = dl_symbol("gtk_toolbar_new");
-        fp_gtk_tree_view_new = dl_symbol("gtk_tree_view_new");
-        fp_gtk_viewport_new = dl_symbol("gtk_viewport_new");
-        fp_gtk_window_new = dl_symbol("gtk_window_new");
-        fp_gtk_window_present = dl_symbol("gtk_window_present");
-        fp_gtk_window_move = dl_symbol("gtk_window_move");
-        fp_gtk_window_resize = dl_symbol("gtk_window_resize");
-
-          fp_gtk_dialog_new = dl_symbol("gtk_dialog_new");
-        fp_gtk_frame_new = dl_symbol("gtk_frame_new");
-
-        fp_gtk_adjustment_new = dl_symbol("gtk_adjustment_new");
-        fp_gtk_container_add = dl_symbol("gtk_container_add");
-        fp_gtk_menu_shell_append =
-            dl_symbol("gtk_menu_shell_append");
-        fp_gtk_widget_realize = dl_symbol("gtk_widget_realize");
-        fp_gtk_widget_destroy = dl_symbol("gtk_widget_destroy");
-        fp_gtk_widget_render_icon =
-            dl_symbol("gtk_widget_render_icon");
-        fp_gtk_widget_set_name =
-            dl_symbol("gtk_widget_set_name");
-        fp_gtk_widget_set_parent =
-            dl_symbol("gtk_widget_set_parent");
-        fp_gtk_widget_set_direction =
-            dl_symbol("gtk_widget_set_direction");
-        fp_gtk_widget_style_get =
-            dl_symbol("gtk_widget_style_get");
-        fp_gtk_widget_class_install_style_property =
-            dl_symbol("gtk_widget_class_install_style_property");
-        fp_gtk_widget_class_find_style_property =
-            dl_symbol("gtk_widget_class_find_style_property");
-        fp_gtk_widget_style_get_property =
-            dl_symbol("gtk_widget_style_get_property");
-        fp_pango_font_description_to_string =
-            dl_symbol("pango_font_description_to_string");
-        fp_gtk_settings_get_default =
-            dl_symbol("gtk_settings_get_default");
-        fp_gtk_widget_get_settings =
-            dl_symbol("gtk_widget_get_settings");
-        fp_gtk_border_get_type =  dl_symbol("gtk_border_get_type");
-        fp_gtk_arrow_set = dl_symbol("gtk_arrow_set");
-        fp_gtk_widget_size_request =
-            dl_symbol("gtk_widget_size_request");
-        fp_gtk_range_get_adjustment =
-            dl_symbol("gtk_range_get_adjustment");
-
-        fp_gtk_widget_hide = dl_symbol("gtk_widget_hide");
-        fp_gtk_main_quit = dl_symbol("gtk_main_quit");
-        fp_g_signal_connect_data = dl_symbol("g_signal_connect_data");
-        fp_gtk_widget_show = dl_symbol("gtk_widget_show");
-        fp_gtk_main = dl_symbol("gtk_main");
-
-        fp_g_path_get_dirname = dl_symbol("g_path_get_dirname");
-
-        /**
-         * GLib thread system
-         */
-        if (GLIB_CHECK_VERSION(2, 20, 0)) {
-            fp_g_thread_get_initialized = dl_symbol_gthread("g_thread_get_initialized");
-        }
-        fp_g_thread_init = dl_symbol_gthread("g_thread_init");
-        fp_gdk_threads_init = dl_symbol("gdk_threads_init");
-        fp_gdk_threads_enter = dl_symbol("gdk_threads_enter");
-        fp_gdk_threads_leave = dl_symbol("gdk_threads_leave");
-
-        /**
-         * Functions for sun_awt_X11_GtkFileDialogPeer.c
-         */
-        if (fp_gtk_check_version(2, 4, 0) == NULL) {
-            // The current GtkFileChooser is available from GTK+ 2.4
-            gtk2_file_chooser_load();
-        }
-
-        /* Some functions may be missing in pre-2.4 GTK.
-           We handle them specially here.
-         */
-        fp_gtk_combo_box_new = dlsym(gtk2_libhandle, "gtk_combo_box_new");
-        if (fp_gtk_combo_box_new == NULL) {
-            fp_gtk_combo_box_new = dl_symbol("gtk_combo_new");
-        }
-
-        fp_gtk_combo_box_entry_new =
-            dlsym(gtk2_libhandle, "gtk_combo_box_entry_new");
-        if (fp_gtk_combo_box_entry_new == NULL) {
-            fp_gtk_combo_box_entry_new = dl_symbol("gtk_combo_new");
-            new_combo = FALSE;
-        }
-
-        fp_gtk_separator_tool_item_new =
-            dlsym(gtk2_libhandle, "gtk_separator_tool_item_new");
-        if (fp_gtk_separator_tool_item_new == NULL) {
-            fp_gtk_separator_tool_item_new =
-                dl_symbol("gtk_vseparator_new");
-        }
-
-        fp_g_list_append = dl_symbol("g_list_append");
-        fp_g_list_free = dl_symbol("g_list_free");
-        fp_g_list_free_full = dl_symbol("g_list_free_full");
-    }
-    /* Now we have only one kind of exceptions: NO_SYMBOL_EXCEPTION
-     * Otherwise we can check the return value of setjmp method.
-     */
-    else
-    {
-        dlclose(gtk2_libhandle);
-        gtk2_libhandle = NULL;
-
-        dlclose(gthread_libhandle);
-        gthread_libhandle = NULL;
-
-        return FALSE;
-    }
-
-    /*
-     * Strip the AT-SPI GTK_MODULES if present
-     */
-    gtk_modules_env = getenv ("GTK_MODULES");
-    if ((gtk_modules_env && strstr(gtk_modules_env, "atk-bridge")) ||
-        (gtk_modules_env && strstr(gtk_modules_env, "gail"))) {
-        /* careful, strtok modifies its args */
-        gchar *tmp_env = strdup(gtk_modules_env);
-        if (tmp_env) {
-            /* the new env will be smaller than the old one */
-            gchar *s, *new_env = SAFE_SIZE_STRUCT_ALLOC(malloc,
-                    sizeof(ENV_PREFIX), 1, strlen (gtk_modules_env));
-
-            if (new_env) {
-                strcpy(new_env, ENV_PREFIX);
-
-                /* strip out 'atk-bridge' and 'gail' */
-                size_t PREFIX_LENGTH = strlen(ENV_PREFIX);
-                gchar *tmp_ptr = NULL;
-                for (s = strtok_r(tmp_env, ":", &tmp_ptr); s;
-                     s = strtok_r(NULL, ":", &tmp_ptr)) {
-                    if ((!strstr(s, "atk-bridge")) && (!strstr(s, "gail"))) {
-                        if (strlen(new_env) > PREFIX_LENGTH) {
-                            new_env = strcat(new_env, ":");
-                        }
-                        new_env = strcat(new_env, s);
-                    }
-                }
-                if (putenv(new_env) != 0) {
-                    /* no free() on success, putenv() doesn't copy string */
-                    free(new_env);
-                }
-            }
-            free(tmp_env);
-        }
-    }
-    /*
-     * GTK should be initialized with gtk_init_check() before use.
-     *
-     * gtk_init_check installs its own error handlers. It is critical that
-     * we preserve error handler set from AWT. Otherwise we'll crash on
-     * BadMatch errors which we would normally ignore. The IO error handler
-     * is preserved here, too, just for consistency.
-    */
-    AWT_LOCK();
-    handler = XSetErrorHandler(NULL);
-    io_handler = XSetIOErrorHandler(NULL);
-
-    if (fp_gtk_check_version(2, 2, 0) == NULL) {
-
-        // Calling g_thread_init() multiple times leads to crash on GLib < 2.24
-        // We can use g_thread_get_initialized () but it is available only for
-        // GLib >= 2.20.
-        gboolean is_g_thread_get_initialized = FALSE;
-        if (GLIB_CHECK_VERSION(2, 20, 0)) {
-            is_g_thread_get_initialized = fp_g_thread_get_initialized();
-        }
-
-        if (!is_g_thread_get_initialized) {
-            fp_g_thread_init(NULL);
-        }
-
-        //According the GTK documentation, gdk_threads_init() should be
-        //called before gtk_init() or gtk_init_check()
-        fp_gdk_threads_init();
-    }
-    result = (*fp_gtk_init_check)(NULL, NULL);
-
-    XSetErrorHandler(handler);
-    XSetIOErrorHandler(io_handler);
-    AWT_UNLOCK();
-
-    /* Initialize widget array. */
-    for (i = 0; i < _GTK_WIDGET_TYPE_SIZE; i++)
-    {
-        gtk2_widgets[i] = NULL;
-    }
-    if (result) {
-        GtkApi* gtk = (GtkApi*)malloc(sizeof(GtkApi));
-        gtk2_init(gtk);
-        return gtk;
-    }
-    return NULL;
-}
-
-int gtk2_unload()
-{
-    int i;
-    char *gtk2_error;
-
-    if (!gtk2_libhandle)
-        return TRUE;
-
-    /* Release painting objects */
-    if (gtk2_white_pixmap != NULL) {
-        (*fp_g_object_unref)(gtk2_white_pixmap);
-        (*fp_g_object_unref)(gtk2_black_pixmap);
-        (*fp_g_object_unref)(gtk2_white_pixbuf);
-        (*fp_g_object_unref)(gtk2_black_pixbuf);
-        gtk2_white_pixmap = gtk2_black_pixmap =
-            gtk2_white_pixbuf = gtk2_black_pixbuf = NULL;
-    }
-    gtk2_pixbuf_width = 0;
-    gtk2_pixbuf_height = 0;
-
-    if (gtk2_window != NULL) {
-        /* Destroying toplevel widget will destroy all contained widgets */
-        (*fp_gtk_widget_destroy)(gtk2_window);
-
-        /* Unset some static data so they get reinitialized on next load */
-        gtk2_window = NULL;
-    }
-
-    dlerror();
-    dlclose(gtk2_libhandle);
-    dlclose(gthread_libhandle);
-    if ((gtk2_error = dlerror()) != NULL)
-    {
-        return FALSE;
-    }
-    return TRUE;
-}
-
-/* Dispatch all pending events from the GTK event loop.
- * This is needed to catch theme change and update widgets' style.
- */
-static void flush_gtk_event_loop()
-{
-    while( (*fp_g_main_context_iteration)(NULL, FALSE));
-}
-
-/*
- * Initialize components of containment hierarchy. This creates a GtkFixed
- * inside a GtkWindow. All widgets get realized.
- */
-static void init_containers()
-{
-    if (gtk2_window == NULL)
-    {
-        gtk2_window = (*fp_gtk_window_new)(GTK_WINDOW_TOPLEVEL);
-        gtk2_fixed = (GtkFixed *)(*fp_gtk_fixed_new)();
-        (*fp_gtk_container_add)((GtkContainer*)gtk2_window,
-                                (GtkWidget *)gtk2_fixed);
-        (*fp_gtk_widget_realize)(gtk2_window);
-        (*fp_gtk_widget_realize)((GtkWidget *)gtk2_fixed);
-    }
-}
-
-/*
- * Ensure everything is ready for drawing an element of the specified width
- * and height.
- *
- * We should somehow handle translucent images. GTK can draw to X Drawables
- * only, which don't support alpha. When we retrieve the image back from
- * the server, translucency information is lost. There're several ways to
- * work around this:
- * 1) Subclass GdkPixmap and cache translucent objects on client side. This
- * requires us to implement parts of X server drawing logic on client side.
- * Many X requests can potentially be "translucent"; e.g. XDrawLine with
- * fill=tile and a translucent tile is a "translucent" operation, whereas
- * XDrawLine with fill=solid is an "opaque" one. Moreover themes can (and some
- * do) intermix transparent and opaque operations which makes caching even
- * more problematic.
- * 2) Use Xorg 32bit ARGB visual when available. GDK has no native support
- * for it (as of version 2.6). Also even in JDS 3 Xorg does not support
- * these visuals by default, which makes optimizing for them pointless.
- * We can consider doing this at a later point when ARGB visuals become more
- * popular.
- * 3') GTK has plans to use Cairo as its graphical backend (presumably in
- * 2.8), and Cairo supports alpha. With it we could also get rid of the
- * unnecessary round trip to server and do all the drawing on client side.
- * 4) For now we draw to two different pixmaps and restore alpha channel by
- * comparing results. This can be optimized by using subclassed pixmap and
- * doing the second drawing only if necessary.
-*/
-static void gtk2_init_painting(JNIEnv *env, gint width, gint height)
-{
-    GdkGC *gc;
-    GdkPixbuf *white, *black;
-
-    init_containers();
-
-    if (gtk2_pixbuf_width < width || gtk2_pixbuf_height < height)
-    {
-        white = (*fp_gdk_pixbuf_new)(GDK_COLORSPACE_RGB, TRUE, 8, width, height);
-        black = (*fp_gdk_pixbuf_new)(GDK_COLORSPACE_RGB, TRUE, 8, width, height);
-
-        if (white == NULL || black == NULL)
-        {
-            snprintf(convertionBuffer, CONV_BUFFER_SIZE, "Couldn't create pixbuf of size %dx%d", width, height);
-            throw_exception(env, "java/lang/RuntimeException", convertionBuffer);
-            fp_gdk_threads_leave();
-            return;
-        }
-
-        if (gtk2_white_pixmap != NULL) {
-            /* free old stuff */
-            (*fp_g_object_unref)(gtk2_white_pixmap);
-            (*fp_g_object_unref)(gtk2_black_pixmap);
-            (*fp_g_object_unref)(gtk2_white_pixbuf);
-            (*fp_g_object_unref)(gtk2_black_pixbuf);
-        }
-
-        gtk2_white_pixmap = (*fp_gdk_pixmap_new)(gtk2_window->window, width, height, -1);
-        gtk2_black_pixmap = (*fp_gdk_pixmap_new)(gtk2_window->window, width, height, -1);
-
-        gtk2_white_pixbuf = white;
-        gtk2_black_pixbuf = black;
-
-        gtk2_pixbuf_width = width;
-        gtk2_pixbuf_height = height;
-    }
-
-    /* clear the pixmaps */
-    gc = (*fp_gdk_gc_new)(gtk2_white_pixmap);
-    (*fp_gdk_rgb_gc_set_foreground)(gc, 0xffffff);
-    (*fp_gdk_draw_rectangle)(gtk2_white_pixmap, gc, TRUE, 0, 0, width, height);
-    (*fp_g_object_unref)(gc);
-
-    gc = (*fp_gdk_gc_new)(gtk2_black_pixmap);
-    (*fp_gdk_rgb_gc_set_foreground)(gc, 0x000000);
-    (*fp_gdk_draw_rectangle)(gtk2_black_pixmap, gc, TRUE, 0, 0, width, height);
-    (*fp_g_object_unref)(gc);
-}
-
-/*
- * Restore image from white and black pixmaps and copy it into destination
- * buffer. This method compares two pixbufs taken from white and black
- * pixmaps and decodes color and alpha components. Pixbufs are RGB without
- * alpha, destination buffer is ABGR.
- *
- * The return value is the transparency type of the resulting image, either
- * one of java_awt_Transparency_OPAQUE, java_awt_Transparency_BITMASK, and
- * java_awt_Transparency_TRANSLUCENT.
- */
-static gint gtk2_copy_image(gint *dst, gint width, gint height)
-{
-    gint i, j, r, g, b;
-    guchar *white, *black;
-    gint stride, padding;
-    gboolean is_opaque = TRUE;
-    gboolean is_bitmask = TRUE;
-
-    (*fp_gdk_pixbuf_get_from_drawable)(gtk2_white_pixbuf, gtk2_white_pixmap,
-            NULL, 0, 0, 0, 0, width, height);
-    (*fp_gdk_pixbuf_get_from_drawable)(gtk2_black_pixbuf, gtk2_black_pixmap,
-            NULL, 0, 0, 0, 0, width, height);
-
-    white = (*fp_gdk_pixbuf_get_pixels)(gtk2_white_pixbuf);
-    black = (*fp_gdk_pixbuf_get_pixels)(gtk2_black_pixbuf);
-    stride = (*fp_gdk_pixbuf_get_rowstride)(gtk2_black_pixbuf);
-    padding = stride - width * 4;
-    if (padding >= 0 && stride > 0) {
-        for (i = 0; i < height; i++) {
-            for (j = 0; j < width; j++) {
-                int r1 = *white++;
-                int r2 = *black++;
-                int alpha = 0xff + r2 - r1;
-
-                switch (alpha) {
-                    case 0:       /* transparent pixel */
-                        r = g = b = 0;
-                        black += 3;
-                        white += 3;
-                        is_opaque = FALSE;
-                        break;
-
-                    case 0xff:    /* opaque pixel */
-                        r = r2;
-                        g = *black++;
-                        b = *black++;
-                        black++;
-                        white += 3;
-                        break;
-
-                    default:      /* translucent pixel */
-                        r = 0xff * r2 / alpha;
-                        g = 0xff * *black++ / alpha;
-                        b = 0xff * *black++ / alpha;
-                        black++;
-                        white += 3;
-                        is_opaque = FALSE;
-                        is_bitmask = FALSE;
-                        break;
-                }
-
-                *dst++ = (alpha << 24 | r << 16 | g << 8 | b);
-            }
-
-            white += padding;
-            black += padding;
-        }
-    }
-    return is_opaque ? java_awt_Transparency_OPAQUE :
-                       (is_bitmask ? java_awt_Transparency_BITMASK :
-                                     java_awt_Transparency_TRANSLUCENT);
-}
-
-static void
-gtk2_set_direction(GtkWidget *widget, GtkTextDirection dir)
-{
-    /*
-     * Some engines (inexplicably) look at the direction of the widget's
-     * parent, so we need to set the direction of both the widget and its
-     * parent.
-     */
-    (*fp_gtk_widget_set_direction)(widget, dir);
-    if (widget->parent != NULL) {
-        (*fp_gtk_widget_set_direction)(widget->parent, dir);
-    }
-}
-
-/*
- * Initializes the widget to correct state for some engines.
- * This is a pure empirical method.
- */
-static void init_toggle_widget(WidgetType widget_type, gint synth_state)
-{
-    gboolean is_active = ((synth_state & SELECTED) != 0);
-
-    if (widget_type == RADIO_BUTTON ||
-        widget_type == CHECK_BOX ||
-        widget_type == TOGGLE_BUTTON) {
-        ((GtkToggleButton*)gtk2_widget)->active = is_active;
-    }
-
-    if ((synth_state & FOCUSED) != 0) {
-        ((GtkObject*)gtk2_widget)->flags |= GTK_HAS_FOCUS;
-    } else {
-        ((GtkObject*)gtk2_widget)->flags &= ~GTK_HAS_FOCUS;
-    }
-
-    if ((((synth_state & MOUSE_OVER) != 0) && ((synth_state & PRESSED) == 0)) ||
-           (((synth_state & FOCUSED) != 0) && ((synth_state & PRESSED) != 0))) {
-        gtk2_widget->state = GTK_STATE_PRELIGHT;
-    } else if ((synth_state & DISABLED) != 0) {
-        gtk2_widget->state = GTK_STATE_INSENSITIVE;
-    } else {
-        gtk2_widget->state = is_active ? GTK_STATE_ACTIVE : GTK_STATE_NORMAL;
-    }
-}
-
-/* GTK state_type filter */
-static GtkStateType get_gtk_state_type(WidgetType widget_type, gint synth_state)
-{
-    GtkStateType result = GTK_STATE_NORMAL;
-
-    if ((synth_state & DISABLED) != 0) {
-        result = GTK_STATE_INSENSITIVE;
-    } else if ((synth_state & PRESSED) != 0) {
-        result = GTK_STATE_ACTIVE;
-    } else if ((synth_state & MOUSE_OVER) != 0) {
-        result = GTK_STATE_PRELIGHT;
-    }
-    return result;
-}
-
-/* GTK shadow_type filter */
-static GtkShadowType get_gtk_shadow_type(WidgetType widget_type, gint synth_state)
-{
-    GtkShadowType result = GTK_SHADOW_OUT;
-
-    if ((synth_state & SELECTED) != 0) {
-        result = GTK_SHADOW_IN;
-    }
-    return result;
-}
-
-
-static GtkWidget* gtk2_get_arrow(GtkArrowType arrow_type, GtkShadowType shadow_type)
-{
-    GtkWidget *arrow = NULL;
-    if (NULL == gtk2_widgets[_GTK_ARROW_TYPE])
-    {
-        gtk2_widgets[_GTK_ARROW_TYPE] = (*fp_gtk_arrow_new)(arrow_type, shadow_type);
-        (*fp_gtk_container_add)((GtkContainer *)gtk2_fixed, gtk2_widgets[_GTK_ARROW_TYPE]);
-        (*fp_gtk_widget_realize)(gtk2_widgets[_GTK_ARROW_TYPE]);
-    }
-    arrow = gtk2_widgets[_GTK_ARROW_TYPE];
-
-    (*fp_gtk_arrow_set)(arrow, arrow_type, shadow_type);
-    return arrow;
-}
-
-static GtkAdjustment* create_adjustment()
-{
-    return (GtkAdjustment *)
-            (*fp_gtk_adjustment_new)(50.0, 0.0, 100.0, 10.0, 20.0, 20.0);
-}
-
-/**
- * Returns a pointer to the cached native widget for the specified widget
- * type.
- */
-static GtkWidget *gtk2_get_widget(WidgetType widget_type)
-{
-    gboolean init_result = FALSE;
-    GtkWidget *result = NULL;
-    switch (widget_type)
-    {
-        case BUTTON:
-        case TABLE_HEADER:
-            if (init_result = (NULL == gtk2_widgets[_GTK_BUTTON_TYPE]))
-            {
-                gtk2_widgets[_GTK_BUTTON_TYPE] = (*fp_gtk_button_new)();
-            }
-            result = gtk2_widgets[_GTK_BUTTON_TYPE];
-            break;
-        case CHECK_BOX:
-            if (init_result = (NULL == gtk2_widgets[_GTK_CHECK_BUTTON_TYPE]))
-            {
-                gtk2_widgets[_GTK_CHECK_BUTTON_TYPE] =
-                    (*fp_gtk_check_button_new)();
-            }
-            result = gtk2_widgets[_GTK_CHECK_BUTTON_TYPE];
-            break;
-        case CHECK_BOX_MENU_ITEM:
-            if (init_result = (NULL == gtk2_widgets[_GTK_CHECK_MENU_ITEM_TYPE]))
-            {
-                gtk2_widgets[_GTK_CHECK_MENU_ITEM_TYPE] =
-                    (*fp_gtk_check_menu_item_new)();
-            }
-            result = gtk2_widgets[_GTK_CHECK_MENU_ITEM_TYPE];
-            break;
-        /************************************************************
-         *    Creation a dedicated color chooser is dangerous because
-         * it deadlocks the EDT
-         ************************************************************/
-/*        case COLOR_CHOOSER:
-            if (init_result =
-                    (NULL == gtk2_widgets[_GTK_COLOR_SELECTION_DIALOG_TYPE]))
-            {
-                gtk2_widgets[_GTK_COLOR_SELECTION_DIALOG_TYPE] =
-                    (*fp_gtk_color_selection_dialog_new)(NULL);
-            }
-            result = gtk2_widgets[_GTK_COLOR_SELECTION_DIALOG_TYPE];
-            break;*/
-        case COMBO_BOX:
-            if (init_result = (NULL == gtk2_widgets[_GTK_COMBO_BOX_TYPE]))
-            {
-                gtk2_widgets[_GTK_COMBO_BOX_TYPE] =
-                    (*fp_gtk_combo_box_new)();
-            }
-            result = gtk2_widgets[_GTK_COMBO_BOX_TYPE];
-            break;
-        case COMBO_BOX_ARROW_BUTTON:
-            if (init_result =
-                    (NULL == gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE]))
-            {
-                gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE] =
-                     (*fp_gtk_toggle_button_new)();
-            }
-            result = gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE];
-            break;
-        case COMBO_BOX_TEXT_FIELD:
-            if (init_result =
-                    (NULL == gtk2_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE]))
-            {
-                result = gtk2_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE] =
-                     (*fp_gtk_entry_new)();
-            }
-            result = gtk2_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE];
-            break;
-        case DESKTOP_ICON:
-        case INTERNAL_FRAME_TITLE_PANE:
-        case LABEL:
-            if (init_result = (NULL == gtk2_widgets[_GTK_LABEL_TYPE]))
-            {
-                gtk2_widgets[_GTK_LABEL_TYPE] =
-                    (*fp_gtk_label_new)(NULL);
-            }
-            result = gtk2_widgets[_GTK_LABEL_TYPE];
-            break;
-        case DESKTOP_PANE:
-        case PANEL:
-        case ROOT_PANE:
-            if (init_result = (NULL == gtk2_widgets[_GTK_CONTAINER_TYPE]))
-            {
-                /* There is no constructor for a container type.  I've
-                 * chosen GtkFixed container since it has a default
-                 * constructor.
-                 */
-                gtk2_widgets[_GTK_CONTAINER_TYPE] =
-                    (*fp_gtk_fixed_new)();
-            }
-            result = gtk2_widgets[_GTK_CONTAINER_TYPE];
-            break;
-        case EDITOR_PANE:
-        case TEXT_AREA:
-        case TEXT_PANE:
-            if (init_result = (NULL == gtk2_widgets[_GTK_TEXT_VIEW_TYPE]))
-            {
-                gtk2_widgets[_GTK_TEXT_VIEW_TYPE] =
-                    (*fp_gtk_text_view_new)();
-            }
-            result = gtk2_widgets[_GTK_TEXT_VIEW_TYPE];
-            break;
-        case FORMATTED_TEXT_FIELD:
-        case PASSWORD_FIELD:
-        case TEXT_FIELD:
-            if (init_result = (NULL == gtk2_widgets[_GTK_ENTRY_TYPE]))
-            {
-                gtk2_widgets[_GTK_ENTRY_TYPE] =
-                    (*fp_gtk_entry_new)();
-            }
-            result = gtk2_widgets[_GTK_ENTRY_TYPE];
-            break;
-        case HANDLE_BOX:
-            if (init_result = (NULL == gtk2_widgets[_GTK_HANDLE_BOX_TYPE]))
-            {
-                gtk2_widgets[_GTK_HANDLE_BOX_TYPE] =
-                    (*fp_gtk_handle_box_new)();
-            }
-            result = gtk2_widgets[_GTK_HANDLE_BOX_TYPE];
-            break;
-        case HSCROLL_BAR:
-        case HSCROLL_BAR_BUTTON_LEFT:
-        case HSCROLL_BAR_BUTTON_RIGHT:
-        case HSCROLL_BAR_TRACK:
-        case HSCROLL_BAR_THUMB:
-            if (init_result = (NULL == gtk2_widgets[_GTK_HSCROLLBAR_TYPE]))
-            {
-                gtk2_widgets[_GTK_HSCROLLBAR_TYPE] =
-                    (*fp_gtk_hscrollbar_new)(create_adjustment());
-            }
-            result = gtk2_widgets[_GTK_HSCROLLBAR_TYPE];
-            break;
-        case HSEPARATOR:
-            if (init_result = (NULL == gtk2_widgets[_GTK_HSEPARATOR_TYPE]))
-            {
-                gtk2_widgets[_GTK_HSEPARATOR_TYPE] =
-                    (*fp_gtk_hseparator_new)();
-            }
-            result = gtk2_widgets[_GTK_HSEPARATOR_TYPE];
-            break;
-        case HSLIDER:
-        case HSLIDER_THUMB:
-        case HSLIDER_TRACK:
-            if (init_result = (NULL == gtk2_widgets[_GTK_HSCALE_TYPE]))
-            {
-                gtk2_widgets[_GTK_HSCALE_TYPE] =
-                    (*fp_gtk_hscale_new)(NULL);
-            }
-            result = gtk2_widgets[_GTK_HSCALE_TYPE];
-            break;
-        case HSPLIT_PANE_DIVIDER:
-        case SPLIT_PANE:
-            if (init_result = (NULL == gtk2_widgets[_GTK_HPANED_TYPE]))
-            {
-                gtk2_widgets[_GTK_HPANED_TYPE] = (*fp_gtk_hpaned_new)();
-            }
-            result = gtk2_widgets[_GTK_HPANED_TYPE];
-            break;
-        case IMAGE:
-            if (init_result = (NULL == gtk2_widgets[_GTK_IMAGE_TYPE]))
-            {
-                gtk2_widgets[_GTK_IMAGE_TYPE] = (*fp_gtk_image_new)();
-            }
-            result = gtk2_widgets[_GTK_IMAGE_TYPE];
-            break;
-        case INTERNAL_FRAME:
-            if (init_result = (NULL == gtk2_widgets[_GTK_WINDOW_TYPE]))
-            {
-                gtk2_widgets[_GTK_WINDOW_TYPE] =
-                    (*fp_gtk_window_new)(GTK_WINDOW_TOPLEVEL);
-            }
-            result = gtk2_widgets[_GTK_WINDOW_TYPE];
-            break;
-        case TOOL_TIP:
-            if (init_result = (NULL == gtk2_widgets[_GTK_TOOLTIP_TYPE]))
-            {
-                result = (*fp_gtk_window_new)(GTK_WINDOW_TOPLEVEL);
-                (*fp_gtk_widget_set_name)(result, "gtk-tooltips");
-                gtk2_widgets[_GTK_TOOLTIP_TYPE] = result;
-            }
-            result = gtk2_widgets[_GTK_TOOLTIP_TYPE];
-            break;
-        case LIST:
-        case TABLE:
-        case TREE:
-        case TREE_CELL:
-            if (init_result = (NULL == gtk2_widgets[_GTK_TREE_VIEW_TYPE]))
-            {
-                gtk2_widgets[_GTK_TREE_VIEW_TYPE] =
-                    (*fp_gtk_tree_view_new)();
-            }
-            result = gtk2_widgets[_GTK_TREE_VIEW_TYPE];
-            break;
-        case TITLED_BORDER:
-            if (init_result = (NULL == gtk2_widgets[_GTK_FRAME_TYPE]))
-            {
-                gtk2_widgets[_GTK_FRAME_TYPE] = fp_gtk_frame_new(NULL);
-            }
-            result = gtk2_widgets[_GTK_FRAME_TYPE];
-            break;
-        case POPUP_MENU:
-            if (init_result = (NULL == gtk2_widgets[_GTK_MENU_TYPE]))
-            {
-                gtk2_widgets[_GTK_MENU_TYPE] =
-                    (*fp_gtk_menu_new)();
-            }
-            result = gtk2_widgets[_GTK_MENU_TYPE];
-            break;
-        case MENU:
-        case MENU_ITEM:
-        case MENU_ITEM_ACCELERATOR:
-            if (init_result = (NULL == gtk2_widgets[_GTK_MENU_ITEM_TYPE]))
-            {
-                gtk2_widgets[_GTK_MENU_ITEM_TYPE] =
-                    (*fp_gtk_menu_item_new)();
-            }
-            result = gtk2_widgets[_GTK_MENU_ITEM_TYPE];
-            break;
-        case MENU_BAR:
-            if (init_result = (NULL == gtk2_widgets[_GTK_MENU_BAR_TYPE]))
-            {
-                gtk2_widgets[_GTK_MENU_BAR_TYPE] =
-                    (*fp_gtk_menu_bar_new)();
-            }
-            result = gtk2_widgets[_GTK_MENU_BAR_TYPE];
-            break;
-        case COLOR_CHOOSER:
-        case OPTION_PANE:
-            if (init_result = (NULL == gtk2_widgets[_GTK_DIALOG_TYPE]))
-            {
-                gtk2_widgets[_GTK_DIALOG_TYPE] =
-                    (*fp_gtk_dialog_new)();
-            }
-            result = gtk2_widgets[_GTK_DIALOG_TYPE];
-            break;
-        case POPUP_MENU_SEPARATOR:
-            if (init_result =
-                    (NULL == gtk2_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE]))
-            {
-                gtk2_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE] =
-                    (*fp_gtk_separator_menu_item_new)();
-            }
-            result = gtk2_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE];
-            break;
-        case HPROGRESS_BAR:
-            if (init_result = (NULL == gtk2_widgets[_GTK_HPROGRESS_BAR_TYPE]))
-            {
-                gtk2_widgets[_GTK_HPROGRESS_BAR_TYPE] =
-                    (*fp_gtk_progress_bar_new)();
-            }
-            result = gtk2_widgets[_GTK_HPROGRESS_BAR_TYPE];
-            break;
-        case VPROGRESS_BAR:
-            if (init_result = (NULL == gtk2_widgets[_GTK_VPROGRESS_BAR_TYPE]))
-            {
-                gtk2_widgets[_GTK_VPROGRESS_BAR_TYPE] =
-                    (*fp_gtk_progress_bar_new)();
-                /*
-                 * Vertical JProgressBars always go bottom-to-top,
-                 * regardless of the ComponentOrientation.
-                 */
-                (*fp_gtk_progress_bar_set_orientation)(
-                    (GtkProgressBar *)gtk2_widgets[_GTK_VPROGRESS_BAR_TYPE],
-                    GTK_PROGRESS_BOTTOM_TO_TOP);
-            }
-            result = gtk2_widgets[_GTK_VPROGRESS_BAR_TYPE];
-            break;
-        case RADIO_BUTTON:
-            if (init_result = (NULL == gtk2_widgets[_GTK_RADIO_BUTTON_TYPE]))
-            {
-                gtk2_widgets[_GTK_RADIO_BUTTON_TYPE] =
-                    (*fp_gtk_radio_button_new)(NULL);
-            }
-            result = gtk2_widgets[_GTK_RADIO_BUTTON_TYPE];
-            break;
-        case RADIO_BUTTON_MENU_ITEM:
-            if (init_result =
-                    (NULL == gtk2_widgets[_GTK_RADIO_MENU_ITEM_TYPE]))
-            {
-                gtk2_widgets[_GTK_RADIO_MENU_ITEM_TYPE] =
-                    (*fp_gtk_radio_menu_item_new)(NULL);
-            }
-            result = gtk2_widgets[_GTK_RADIO_MENU_ITEM_TYPE];
-            break;
-        case SCROLL_PANE:
-            if (init_result =
-                    (NULL == gtk2_widgets[_GTK_SCROLLED_WINDOW_TYPE]))
-            {
-                gtk2_widgets[_GTK_SCROLLED_WINDOW_TYPE] =
-                    (*fp_gtk_scrolled_window_new)(NULL, NULL);
-            }
-            result = gtk2_widgets[_GTK_SCROLLED_WINDOW_TYPE];
-            break;
-        case SPINNER:
-        case SPINNER_ARROW_BUTTON:
-        case SPINNER_TEXT_FIELD:
-            if (init_result = (NULL == gtk2_widgets[_GTK_SPIN_BUTTON_TYPE]))
-            {
-                result = gtk2_widgets[_GTK_SPIN_BUTTON_TYPE] =
-                    (*fp_gtk_spin_button_new)(NULL, 0, 0);
-            }
-            result = gtk2_widgets[_GTK_SPIN_BUTTON_TYPE];
-            break;
-        case TABBED_PANE:
-        case TABBED_PANE_TAB_AREA:
-        case TABBED_PANE_CONTENT:
-        case TABBED_PANE_TAB:
-            if (init_result = (NULL == gtk2_widgets[_GTK_NOTEBOOK_TYPE]))
-            {
-                gtk2_widgets[_GTK_NOTEBOOK_TYPE] =
-                    (*fp_gtk_notebook_new)();
-            }
-            result = gtk2_widgets[_GTK_NOTEBOOK_TYPE];
-            break;
-        case TOGGLE_BUTTON:
-            if (init_result = (NULL == gtk2_widgets[_GTK_TOGGLE_BUTTON_TYPE]))
-            {
-                gtk2_widgets[_GTK_TOGGLE_BUTTON_TYPE] =
-                    (*fp_gtk_toggle_button_new)();
-            }
-            result = gtk2_widgets[_GTK_TOGGLE_BUTTON_TYPE];
-            break;
-        case TOOL_BAR:
-        case TOOL_BAR_DRAG_WINDOW:
-            if (init_result = (NULL == gtk2_widgets[_GTK_TOOLBAR_TYPE]))
-            {
-                gtk2_widgets[_GTK_TOOLBAR_TYPE] =
-                    (*fp_gtk_toolbar_new)();
-            }
-            result = gtk2_widgets[_GTK_TOOLBAR_TYPE];
-            break;
-        case TOOL_BAR_SEPARATOR:
-            if (init_result =
-                    (NULL == gtk2_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE]))
-            {
-                gtk2_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE] =
-                    (*fp_gtk_separator_tool_item_new)();
-            }
-            result = gtk2_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE];
-            break;
-        case VIEWPORT:
-            if (init_result = (NULL == gtk2_widgets[_GTK_VIEWPORT_TYPE]))
-            {
-                GtkAdjustment *adjustment = create_adjustment();
-                gtk2_widgets[_GTK_VIEWPORT_TYPE] =
-                    (*fp_gtk_viewport_new)(adjustment, adjustment);
-            }
-            result = gtk2_widgets[_GTK_VIEWPORT_TYPE];
-            break;
-        case VSCROLL_BAR:
-        case VSCROLL_BAR_BUTTON_UP:
-        case VSCROLL_BAR_BUTTON_DOWN:
-        case VSCROLL_BAR_TRACK:
-        case VSCROLL_BAR_THUMB:
-            if (init_result = (NULL == gtk2_widgets[_GTK_VSCROLLBAR_TYPE]))
-            {
-                gtk2_widgets[_GTK_VSCROLLBAR_TYPE] =
-                    (*fp_gtk_vscrollbar_new)(create_adjustment());
-            }
-            result = gtk2_widgets[_GTK_VSCROLLBAR_TYPE];
-            break;
-        case VSEPARATOR:
-            if (init_result = (NULL == gtk2_widgets[_GTK_VSEPARATOR_TYPE]))
-            {
-                gtk2_widgets[_GTK_VSEPARATOR_TYPE] =
-                    (*fp_gtk_vseparator_new)();
-            }
-            result = gtk2_widgets[_GTK_VSEPARATOR_TYPE];
-            break;
-        case VSLIDER:
-        case VSLIDER_THUMB:
-        case VSLIDER_TRACK:
-            if (init_result = (NULL == gtk2_widgets[_GTK_VSCALE_TYPE]))
-            {
-                gtk2_widgets[_GTK_VSCALE_TYPE] =
-                    (*fp_gtk_vscale_new)(NULL);
-            }
-            result = gtk2_widgets[_GTK_VSCALE_TYPE];
-            /*
-             * Vertical JSliders start at the bottom, while vertical
-             * GtkVScale widgets start at the top (by default), so to fix
-             * this we set the "inverted" flag to get the Swing behavior.
-             */
-            ((GtkRange*)result)->inverted = 1;
-            break;
-        case VSPLIT_PANE_DIVIDER:
-            if (init_result = (NULL == gtk2_widgets[_GTK_VPANED_TYPE]))
-            {
-                gtk2_widgets[_GTK_VPANED_TYPE] = (*fp_gtk_vpaned_new)();
-            }
-            result = gtk2_widgets[_GTK_VPANED_TYPE];
-            break;
-        default:
-            result = NULL;
-            break;
-    }
-
-    if (result != NULL && init_result)
-    {
-        if (widget_type == RADIO_BUTTON_MENU_ITEM ||
-                widget_type == CHECK_BOX_MENU_ITEM ||
-                widget_type == MENU_ITEM ||
-                widget_type == MENU ||
-                widget_type == POPUP_MENU_SEPARATOR)
-        {
-            GtkWidget *menu = gtk2_get_widget(POPUP_MENU);
-            (*fp_gtk_menu_shell_append)((GtkMenuShell *)menu, result);
-        }
-        else if (widget_type == POPUP_MENU)
-        {
-            GtkWidget *menu_bar = gtk2_get_widget(MENU_BAR);
-            GtkWidget *root_menu = (*fp_gtk_menu_item_new)();
-            (*fp_gtk_menu_item_set_submenu)((GtkMenuItem*)root_menu, result);
-            (*fp_gtk_menu_shell_append)((GtkMenuShell *)menu_bar, root_menu);
-        }
-        else if (widget_type == COMBO_BOX_ARROW_BUTTON ||
-                 widget_type == COMBO_BOX_TEXT_FIELD)
-        {
-            /*
-            * We add a regular GtkButton/GtkEntry to a GtkComboBoxEntry
-            * in order to trick engines into thinking it's a real combobox
-            * arrow button/text field.
-            */
-            GtkWidget *combo = (*fp_gtk_combo_box_entry_new)();
-
-            if (new_combo && widget_type == COMBO_BOX_ARROW_BUTTON) {
-                (*fp_gtk_widget_set_parent)(result, combo);
-                ((GtkBin*)combo)->child = result;
-            } else {
-                (*fp_gtk_container_add)((GtkContainer *)combo, result);
-            }
-            (*fp_gtk_container_add)((GtkContainer *)gtk2_fixed, combo);
-        }
-        else if (widget_type != TOOL_TIP &&
-                 widget_type != INTERNAL_FRAME &&
-                 widget_type != OPTION_PANE)
-        {
-            (*fp_gtk_container_add)((GtkContainer *)gtk2_fixed, result);
-        }
-        (*fp_gtk_widget_realize)(result);
-    }
-    return result;
-}
-
-void gtk2_paint_arrow(WidgetType widget_type, GtkStateType state_type,
-        GtkShadowType shadow_type, const gchar *detail,
-        gint x, gint y, gint width, gint height,
-        GtkArrowType arrow_type, gboolean fill)
-{
-    static int w, h;
-    static GtkRequisition size;
-
-    if (widget_type == COMBO_BOX_ARROW_BUTTON || widget_type == TABLE)
-        gtk2_widget = gtk2_get_arrow(arrow_type, shadow_type);
-    else
-        gtk2_widget = gtk2_get_widget(widget_type);
-
-    switch (widget_type)
-    {
-        case SPINNER_ARROW_BUTTON:
-            x = 1;
-            y = ((arrow_type == GTK_ARROW_UP) ? 2 : 0);
-            height -= 2;
-            width -= 3;
-
-            w = width / 2;
-            w -= w % 2 - 1;
-            h = (w + 1) / 2;
-            break;
-
-        case HSCROLL_BAR_BUTTON_LEFT:
-        case HSCROLL_BAR_BUTTON_RIGHT:
-        case VSCROLL_BAR_BUTTON_UP:
-        case VSCROLL_BAR_BUTTON_DOWN:
-            w = width / 2;
-            h = height / 2;
-            break;
-
-        case COMBO_BOX_ARROW_BUTTON:
-        case TABLE:
-            x = 1;
-            (*fp_gtk_widget_size_request)(gtk2_widget, &size);
-            w = size.width - ((GtkMisc*)gtk2_widget)->xpad * 2;
-            h = size.height - ((GtkMisc*)gtk2_widget)->ypad * 2;
-            w = h = MIN(MIN(w, h), MIN(width,height)) * 0.7;
-            break;
-
-        default:
-            w = width;
-            h = height;
-            break;
-    }
-    x += (width - w) / 2;
-    y += (height - h) / 2;
-
-    (*fp_gtk_paint_arrow)(gtk2_widget->style, gtk2_white_pixmap, state_type,
-            shadow_type, NULL, gtk2_widget, detail, arrow_type, fill,
-            x, y, w, h);
-    (*fp_gtk_paint_arrow)(gtk2_widget->style, gtk2_black_pixmap, state_type,
-            shadow_type, NULL, gtk2_widget, detail, arrow_type, fill,
-            x, y, w, h);
-}
-
-static void gtk2_paint_box(WidgetType widget_type, GtkStateType state_type,
-                    GtkShadowType shadow_type, const gchar *detail,
-                    gint x, gint y, gint width, gint height,
-                    gint synth_state, GtkTextDirection dir)
-{
-    gtk2_widget = gtk2_get_widget(widget_type);
-
-    /*
-     * The clearlooks engine sometimes looks at the widget's state field
-     * instead of just the state_type variable that we pass in, so to account
-     * for those cases we set the widget's state field accordingly.  The
-     * flags field is similarly important for things like focus/default state.
-     */
-    gtk2_widget->state = state_type;
-
-    if (widget_type == HSLIDER_TRACK) {
-        /*
-         * For horizontal JSliders with right-to-left orientation, we need
-         * to set the "inverted" flag to match the native GTK behavior where
-         * the foreground highlight is on the right side of the slider thumb.
-         * This is needed especially for the ubuntulooks engine, which looks
-         * exclusively at the "inverted" flag to determine on which side of
-         * the thumb to paint the highlight...
-         */
-        ((GtkRange*)gtk2_widget)->inverted = (dir == GTK_TEXT_DIR_RTL);
-
-        /*
-         * Note however that other engines like clearlooks will look at both
-         * the "inverted" field and the text direction to determine how
-         * the foreground highlight is painted:
-         *     !inverted && ltr --> paint highlight on left side
-         *     !inverted && rtl --> paint highlight on right side
-         *      inverted && ltr --> paint highlight on right side
-         *      inverted && rtl --> paint highlight on left side
-         * So the only way to reliably get the desired results for horizontal
-         * JSlider (i.e., highlight on left side for LTR ComponentOrientation
-         * and highlight on right side for RTL ComponentOrientation) is to
-         * always override text direction as LTR, and then set the "inverted"
-         * flag accordingly (as we have done above).
-         */
-        dir = GTK_TEXT_DIR_LTR;
-    }
-
-    /*
-     * Some engines (e.g. clearlooks) will paint the shadow of certain
-     * widgets (e.g. COMBO_BOX_ARROW_BUTTON) differently depending on the
-     * the text direction.
-     */
-    gtk2_set_direction(gtk2_widget, dir);
-
-    switch (widget_type) {
-    case BUTTON:
-        if (synth_state & DEFAULT) {
-            ((GtkObject*)gtk2_widget)->flags |= GTK_HAS_DEFAULT;
-        } else {
-            ((GtkObject*)gtk2_widget)->flags &= ~GTK_HAS_DEFAULT;
-        }
-        break;
-    case TOGGLE_BUTTON:
-        init_toggle_widget(widget_type, synth_state);
-        break;
-    case HSCROLL_BAR_BUTTON_LEFT:
-        /*
-         * The clearlooks engine will draw a "left" button when:
-         *   x == w->allocation.x
-         *
-         * The ubuntulooks engine will draw a "left" button when:
-         *   [x,y,width,height]
-         *     intersects
-         *   [w->alloc.x,w->alloc.y,width,height]
-         *
-         * The values that are set below should ensure that a "left"
-         * button is rendered for both of these (and other) engines.
-         */
-        gtk2_widget->allocation.x = x;
-        gtk2_widget->allocation.y = y;
-        gtk2_widget->allocation.width = width;
-        gtk2_widget->allocation.height = height;
-        break;
-    case HSCROLL_BAR_BUTTON_RIGHT:
-        /*
-         * The clearlooks engine will draw a "right" button when:
-         *   x + width == w->allocation.x + w->allocation.width
-         *
-         * The ubuntulooks engine will draw a "right" button when:
-         *   [x,y,width,height]
-         *     does not intersect
-         *   [w->alloc.x,w->alloc.y,width,height]
-         *     but does intersect
-         *   [w->alloc.x+width,w->alloc.y,width,height]
-         *
-         * The values that are set below should ensure that a "right"
-         * button is rendered for both of these (and other) engines.
-         */
-        gtk2_widget->allocation.x = x+width;
-        gtk2_widget->allocation.y = 0;
-        gtk2_widget->allocation.width = 0;
-        gtk2_widget->allocation.height = height;
-        break;
-    case VSCROLL_BAR_BUTTON_UP:
-        /*
-         * The clearlooks engine will draw an "up" button when:
-         *   y == w->allocation.y
-         *
-         * The ubuntulooks engine will draw an "up" button when:
-         *   [x,y,width,height]
-         *     intersects
-         *   [w->alloc.x,w->alloc.y,width,height]
-         *
-         * The values that are set below should ensure that an "up"
-         * button is rendered for both of these (and other) engines.
-         */
-        gtk2_widget->allocation.x = x;
-        gtk2_widget->allocation.y = y;
-        gtk2_widget->allocation.width = width;
-        gtk2_widget->allocation.height = height;
-        break;
-    case VSCROLL_BAR_BUTTON_DOWN:
-        /*
-         * The clearlooks engine will draw a "down" button when:
-         *   y + height == w->allocation.y + w->allocation.height
-         *
-         * The ubuntulooks engine will draw a "down" button when:
-         *   [x,y,width,height]
-         *     does not intersect
-         *   [w->alloc.x,w->alloc.y,width,height]
-         *     but does intersect
-         *   [w->alloc.x,w->alloc.y+height,width,height]
-         *
-         * The values that are set below should ensure that a "down"
-         * button is rendered for both of these (and other) engines.
-         */
-        gtk2_widget->allocation.x = x;
-        gtk2_widget->allocation.y = y+height;
-        gtk2_widget->allocation.width = width;
-        gtk2_widget->allocation.height = 0;
-        break;
-    default:
-        break;
-    }
-
-    (*fp_gtk_paint_box)(gtk2_widget->style, gtk2_white_pixmap, state_type,
-            shadow_type, NULL, gtk2_widget, detail, x, y, width, height);
-    (*fp_gtk_paint_box)(gtk2_widget->style, gtk2_black_pixmap, state_type,
-            shadow_type, NULL, gtk2_widget, detail, x, y, width, height);
-
-    /*
-     * Reset the text direction to the default value so that we don't
-     * accidentally affect other operations and widgets.
-     */
-    gtk2_set_direction(gtk2_widget, GTK_TEXT_DIR_LTR);
-}
-
-void gtk2_paint_box_gap(WidgetType widget_type, GtkStateType state_type,
-        GtkShadowType shadow_type, const gchar *detail,
-        gint x, gint y, gint width, gint height,
-        GtkPositionType gap_side, gint gap_x, gint gap_width)
-{
-    /* Clearlooks needs a real clip area to paint the gap properly */
-    GdkRectangle area = { x, y, width, height };
-
-    gtk2_widget = gtk2_get_widget(widget_type);
-    (*fp_gtk_paint_box_gap)(gtk2_widget->style, gtk2_white_pixmap, state_type,
-            shadow_type, &area, gtk2_widget, detail,
-            x, y, width, height, gap_side, gap_x, gap_width);
-    (*fp_gtk_paint_box_gap)(gtk2_widget->style, gtk2_black_pixmap, state_type,
-            shadow_type, &area, gtk2_widget, detail,
-            x, y, width, height, gap_side, gap_x, gap_width);
-}
-
-static void gtk2_paint_check(WidgetType widget_type, gint synth_state,
-        const gchar *detail, gint x, gint y, gint width, gint height)
-{
-    GtkStateType state_type = get_gtk_state_type(widget_type, synth_state);
-    GtkShadowType shadow_type = get_gtk_shadow_type(widget_type, synth_state);
-
-    gtk2_widget = gtk2_get_widget(widget_type);
-    init_toggle_widget(widget_type, synth_state);
-
-    (*fp_gtk_paint_check)(gtk2_widget->style, gtk2_white_pixmap, state_type,
-            shadow_type, NULL, gtk2_widget, detail,
-            x, y, width, height);
-    (*fp_gtk_paint_check)(gtk2_widget->style, gtk2_black_pixmap, state_type,
-            shadow_type, NULL, gtk2_widget, detail,
-            x, y, width, height);
-}
-
-static void gtk2_paint_expander(WidgetType widget_type, GtkStateType state_type,
-        const gchar *detail, gint x, gint y, gint width, gint height,
-        GtkExpanderStyle expander_style)
-{
-    gtk2_widget = gtk2_get_widget(widget_type);
-    (*fp_gtk_paint_expander)(gtk2_widget->style, gtk2_white_pixmap,
-            state_type, NULL, gtk2_widget, detail,
-            x + width / 2, y + height / 2, expander_style);
-    (*fp_gtk_paint_expander)(gtk2_widget->style, gtk2_black_pixmap,
-            state_type, NULL, gtk2_widget, detail,
-            x + width / 2, y + height / 2, expander_style);
-}
-
-static void gtk2_paint_extension(WidgetType widget_type, GtkStateType state_type,
-        GtkShadowType shadow_type, const gchar *detail,
-        gint x, gint y, gint width, gint height, GtkPositionType gap_side)
-{
-    gtk2_widget = gtk2_get_widget(widget_type);
-    (*fp_gtk_paint_extension)(gtk2_widget->style, gtk2_white_pixmap,
-            state_type, shadow_type, NULL, gtk2_widget, detail,
-            x, y, width, height, gap_side);
-    (*fp_gtk_paint_extension)(gtk2_widget->style, gtk2_black_pixmap,
-            state_type, shadow_type, NULL, gtk2_widget, detail,
-            x, y, width, height, gap_side);
-}
-
-static void gtk2_paint_flat_box(WidgetType widget_type, GtkStateType state_type,
-        GtkShadowType shadow_type, const gchar *detail,
-        gint x, gint y, gint width, gint height, gboolean has_focus)
-{
-    gtk2_widget = gtk2_get_widget(widget_type);
-
-    if (has_focus)
-        ((GtkObject*)gtk2_widget)->flags |= GTK_HAS_FOCUS;
-    else
-        ((GtkObject*)gtk2_widget)->flags &= ~GTK_HAS_FOCUS;
-
-    (*fp_gtk_paint_flat_box)(gtk2_widget->style, gtk2_white_pixmap,
-            state_type, shadow_type, NULL, gtk2_widget, detail,
-            x, y, width, height);
-    (*fp_gtk_paint_flat_box)(gtk2_widget->style, gtk2_black_pixmap,
-            state_type, shadow_type, NULL, gtk2_widget, detail,
-            x, y, width, height);
-}
-
-static void gtk2_paint_focus(WidgetType widget_type, GtkStateType state_type,
-        const char *detail, gint x, gint y, gint width, gint height)
-{
-    gtk2_widget = gtk2_get_widget(widget_type);
-    (*fp_gtk_paint_focus)(gtk2_widget->style, gtk2_white_pixmap, state_type,
-            NULL, gtk2_widget, detail, x, y, width, height);
-    (*fp_gtk_paint_focus)(gtk2_widget->style, gtk2_black_pixmap, state_type,
-            NULL, gtk2_widget, detail, x, y, width, height);
-}
-
-static void gtk2_paint_handle(WidgetType widget_type, GtkStateType state_type,
-        GtkShadowType shadow_type, const gchar *detail,
-        gint x, gint y, gint width, gint height, GtkOrientation orientation)
-{
-    gtk2_widget = gtk2_get_widget(widget_type);
-    (*fp_gtk_paint_handle)(gtk2_widget->style, gtk2_white_pixmap, state_type,
-            shadow_type, NULL, gtk2_widget, detail,
-            x, y, width, height, orientation);
-    (*fp_gtk_paint_handle)(gtk2_widget->style, gtk2_black_pixmap, state_type,
-            shadow_type, NULL, gtk2_widget, detail,
-            x, y, width, height, orientation);
-}
-
-static void gtk2_paint_hline(WidgetType widget_type, GtkStateType state_type,
-        const gchar *detail, gint x, gint y, gint width, gint height)
-{
-    gtk2_widget = gtk2_get_widget(widget_type);
-    (*fp_gtk_paint_hline)(gtk2_widget->style, gtk2_white_pixmap, state_type,
-            NULL, gtk2_widget, detail, x, x + width, y);
-    (*fp_gtk_paint_hline)(gtk2_widget->style, gtk2_black_pixmap, state_type,
-            NULL, gtk2_widget, detail, x, x + width, y);
-}
-
-static void gtk2_paint_option(WidgetType widget_type, gint synth_state,
-        const gchar *detail, gint x, gint y, gint width, gint height)
-{
-    GtkStateType state_type = get_gtk_state_type(widget_type, synth_state);
-    GtkShadowType shadow_type = get_gtk_shadow_type(widget_type, synth_state);
-
-    gtk2_widget = gtk2_get_widget(widget_type);
-    init_toggle_widget(widget_type, synth_state);
-
-    (*fp_gtk_paint_option)(gtk2_widget->style, gtk2_white_pixmap, state_type,
-            shadow_type, NULL, gtk2_widget, detail,
-            x, y, width, height);
-    (*fp_gtk_paint_option)(gtk2_widget->style, gtk2_black_pixmap, state_type,
-            shadow_type, NULL, gtk2_widget, detail,
-            x, y, width, height);
-}
-
-static void gtk2_paint_shadow(WidgetType widget_type, GtkStateType state_type,
-                       GtkShadowType shadow_type, const gchar *detail,
-                       gint x, gint y, gint width, gint height,
-                       gint synth_state, GtkTextDirection dir)
-{
-    gtk2_widget = gtk2_get_widget(widget_type);
-
-    /*
-     * The clearlooks engine sometimes looks at the widget's state field
-     * instead of just the state_type variable that we pass in, so to account
-     * for those cases we set the widget's state field accordingly.  The
-     * flags field is similarly important for things like focus state.
-     */
-    gtk2_widget->state = state_type;
-
-    /*
-     * Some engines (e.g. clearlooks) will paint the shadow of certain
-     * widgets (e.g. COMBO_BOX_TEXT_FIELD) differently depending on the
-     * the text direction.
-     */
-    gtk2_set_direction(gtk2_widget, dir);
-
-    switch (widget_type) {
-    case COMBO_BOX_TEXT_FIELD:
-    case FORMATTED_TEXT_FIELD:
-    case PASSWORD_FIELD:
-    case SPINNER_TEXT_FIELD:
-    case TEXT_FIELD:
-        if (synth_state & FOCUSED) {
-            ((GtkObject*)gtk2_widget)->flags |= GTK_HAS_FOCUS;
-        } else {
-            ((GtkObject*)gtk2_widget)->flags &= ~GTK_HAS_FOCUS;
-        }
-        break;
-    default:
-        break;
-    }
-
-    (*fp_gtk_paint_shadow)(gtk2_widget->style, gtk2_white_pixmap, state_type,
-            shadow_type, NULL, gtk2_widget, detail, x, y, width, height);
-    (*fp_gtk_paint_shadow)(gtk2_widget->style, gtk2_black_pixmap, state_type,
-            shadow_type, NULL, gtk2_widget, detail, x, y, width, height);
-
-    /*
-     * Reset the text direction to the default value so that we don't
-     * accidentally affect other operations and widgets.
-     */
-    gtk2_set_direction(gtk2_widget, GTK_TEXT_DIR_LTR);
-}
-
-static void gtk2_paint_slider(WidgetType widget_type, GtkStateType state_type,
-        GtkShadowType shadow_type, const gchar *detail,
-        gint x, gint y, gint width, gint height, GtkOrientation orientation,
-        gboolean has_focus)
-{
-    gtk2_widget = gtk2_get_widget(widget_type);
-    (*fp_gtk_paint_slider)(gtk2_widget->style, gtk2_white_pixmap, state_type,
-            shadow_type, NULL, gtk2_widget, detail,
-            x, y, width, height, orientation);
-    (*fp_gtk_paint_slider)(gtk2_widget->style, gtk2_black_pixmap, state_type,
-            shadow_type, NULL, gtk2_widget, detail,
-            x, y, width, height, orientation);
-}
-
-static void gtk2_paint_vline(WidgetType widget_type, GtkStateType state_type,
-        const gchar *detail, gint x, gint y, gint width, gint height)
-{
-    gtk2_widget = gtk2_get_widget(widget_type);
-    (*fp_gtk_paint_vline)(gtk2_widget->style, gtk2_white_pixmap, state_type,
-            NULL, gtk2_widget, detail, y, y + height, x);
-    (*fp_gtk_paint_vline)(gtk2_widget->style, gtk2_black_pixmap, state_type,
-            NULL, gtk2_widget, detail, y, y + height, x);
-}
-
-static void gtk_paint_background(WidgetType widget_type, GtkStateType state_type,
-        gint x, gint y, gint width, gint height)
-{
-    gtk2_widget = gtk2_get_widget(widget_type);
-    (*fp_gtk_style_apply_default_background)(gtk2_widget->style,
-            gtk2_white_pixmap, TRUE, state_type, NULL, x, y, width, height);
-    (*fp_gtk_style_apply_default_background)(gtk2_widget->style,
-            gtk2_black_pixmap, TRUE, state_type, NULL, x, y, width, height);
-}
-
-static GdkPixbuf *gtk2_get_stock_icon(gint widget_type, const gchar *stock_id,
-        GtkIconSize size, GtkTextDirection direction, const char *detail)
-{
-    init_containers();
-    gtk2_widget = gtk2_get_widget((widget_type < 0) ? IMAGE : widget_type);
-    gtk2_widget->state = GTK_STATE_NORMAL;
-    (*fp_gtk_widget_set_direction)(gtk2_widget, direction);
-    return (*fp_gtk_widget_render_icon)(gtk2_widget, stock_id, size, detail);
-}
-
-static jboolean gtk2_get_pixbuf_data(JNIEnv *env, GdkPixbuf* pixbuf,
-                              jmethodID icon_upcall_method, jobject this) {
-    if (!pixbuf) {
-        return JNI_FALSE;
-    }
-    guchar *pixbuf_data = (*fp_gdk_pixbuf_get_pixels)(pixbuf);
-    if (pixbuf_data) {
-        int row_stride = (*fp_gdk_pixbuf_get_rowstride)(pixbuf);
-        int width = (*fp_gdk_pixbuf_get_width)(pixbuf);
-        int height = (*fp_gdk_pixbuf_get_height)(pixbuf);
-        int bps = (*fp_gdk_pixbuf_get_bits_per_sample)(pixbuf);
-        int channels = (*fp_gdk_pixbuf_get_n_channels)(pixbuf);
-        gboolean alpha = (*fp_gdk_pixbuf_get_has_alpha)(pixbuf);
-
-        jbyteArray data = (*env)->NewByteArray(env, (row_stride * height));
-        JNU_CHECK_EXCEPTION_RETURN(env, JNI_FALSE);
-
-        (*env)->SetByteArrayRegion(env, data, 0, (row_stride * height),
-                                   (jbyte *)pixbuf_data);
-        (*fp_g_object_unref)(pixbuf);
-
-        /* Call the callback method to create the image on the Java side. */
-        (*env)->CallVoidMethod(env, this, icon_upcall_method, data,
-                width, height, row_stride, bps, channels, alpha);
-        return JNI_TRUE;
-    }
-    return JNI_FALSE;
-}
-
-static jboolean gtk2_get_file_icon_data(JNIEnv *env, const char *filename,
-                 GError **error, jmethodID icon_upcall_method, jobject this) {
-    GdkPixbuf* pixbuf = fp_gdk_pixbuf_new_from_file(filename, error);
-    return gtk2_get_pixbuf_data(env, pixbuf, icon_upcall_method, this);
-}
-
-static jboolean gtk2_get_icon_data(JNIEnv *env, gint widget_type,
-                              const gchar *stock_id, GtkIconSize size,
-                              GtkTextDirection direction, const char *detail,
-                              jmethodID icon_upcall_method, jobject this) {
-    GdkPixbuf* pixbuf = gtk2_get_stock_icon(widget_type, stock_id, size,
-                                       direction, detail);
-    return gtk2_get_pixbuf_data(env, pixbuf, icon_upcall_method, this);
-}
-
-/*************************************************/
-static gint gtk2_get_xthickness(JNIEnv *env, WidgetType widget_type)
-{
-    init_containers();
-
-    gtk2_widget = gtk2_get_widget(widget_type);
-    GtkStyle* style = gtk2_widget->style;
-    return style->xthickness;
-}
-
-static gint gtk2_get_ythickness(JNIEnv *env, WidgetType widget_type)
-{
-    init_containers();
-
-    gtk2_widget = gtk2_get_widget(widget_type);
-    GtkStyle* style = gtk2_widget->style;
-    return style->ythickness;
-}
-
-/*************************************************/
-static guint8 recode_color(guint16 channel)
-{
-    return (guint8)(channel>>8);
-}
-
-static gint gtk2_get_color_for_state(JNIEnv *env, WidgetType widget_type,
-                              GtkStateType state_type, ColorType color_type)
-{
-    gint result = 0;
-    GdkColor *color = NULL;
-
-    init_containers();
-
-    gtk2_widget = gtk2_get_widget(widget_type);
-    GtkStyle* style = gtk2_widget->style;
-
-    switch (color_type)
-    {
-        case FOREGROUND:
-            color = &(style->fg[state_type]);
-            break;
-        case BACKGROUND:
-            color = &(style->bg[state_type]);
-            break;
-        case TEXT_FOREGROUND:
-            color = &(style->text[state_type]);
-            break;
-        case TEXT_BACKGROUND:
-            color = &(style->base[state_type]);
-            break;
-        case LIGHT:
-            color = &(style->light[state_type]);
-            break;
-        case DARK:
-            color = &(style->dark[state_type]);
-            break;
-        case MID:
-            color = &(style->mid[state_type]);
-            break;
-        case FOCUS:
-        case BLACK:
-            color = &(style->black);
-            break;
-        case WHITE:
-            color = &(style->white);
-            break;
-    }
-
-    if (color)
-        result = recode_color(color->red)   << 16 |
-                 recode_color(color->green) << 8  |
-                 recode_color(color->blue);
-
-    return result;
-}
-
-/*************************************************/
-static jobject create_Boolean(JNIEnv *env, jboolean boolean_value);
-static jobject create_Integer(JNIEnv *env, jint int_value);
-static jobject create_Long(JNIEnv *env, jlong long_value);
-static jobject create_Float(JNIEnv *env, jfloat float_value);
-static jobject create_Double(JNIEnv *env, jdouble double_value);
-static jobject create_Character(JNIEnv *env, jchar char_value);
-static jobject create_Insets(JNIEnv *env, GtkBorder *border);
-
-static jobject gtk2_get_class_value(JNIEnv *env, WidgetType widget_type,
-                              const char* key)
-{
-    init_containers();
-
-    gtk2_widget = gtk2_get_widget(widget_type);
-
-    GValue value;
-    value.g_type = 0;
-
-    GParamSpec* param = (*fp_gtk_widget_class_find_style_property)(
-                                    ((GTypeInstance*)gtk2_widget)->g_class, key);
-    if( param )
-    {
-        (*fp_g_value_init)( &value, param->value_type );
-        (*fp_gtk_widget_style_get_property)(gtk2_widget, key, &value);
-
-        if( (*fp_g_type_is_a)( param->value_type, G_TYPE_BOOLEAN ))
-        {
-            gboolean val = (*fp_g_value_get_boolean)(&value);
-            return create_Boolean(env, (jboolean)val);
-        }
-        else if( (*fp_g_type_is_a)( param->value_type, G_TYPE_CHAR ))
-        {
-            gchar val = (*fp_g_value_get_char)(&value);
-            return create_Character(env, (jchar)val);
-        }
-        else if( (*fp_g_type_is_a)( param->value_type, G_TYPE_UCHAR ))
-        {
-            guchar val = (*fp_g_value_get_uchar)(&value);
-            return create_Character(env, (jchar)val);
-        }
-        else if( (*fp_g_type_is_a)( param->value_type, G_TYPE_INT ))
-        {
-            gint val = (*fp_g_value_get_int)(&value);
-            return create_Integer(env, (jint)val);
-        }
-        else if( (*fp_g_type_is_a)( param->value_type, G_TYPE_UINT ))
-        {
-            guint val = (*fp_g_value_get_uint)(&value);
-            return create_Integer(env, (jint)val);
-        }
-        else if( (*fp_g_type_is_a)( param->value_type, G_TYPE_LONG ))
-        {
-            glong val = (*fp_g_value_get_long)(&value);
-            return create_Long(env, (jlong)val);
-        }
-        else if( (*fp_g_type_is_a)( param->value_type, G_TYPE_ULONG ))
-        {
-            gulong val = (*fp_g_value_get_ulong)(&value);
-            return create_Long(env, (jlong)val);
-        }
-        else if( (*fp_g_type_is_a)( param->value_type, G_TYPE_INT64 ))
-        {
-            gint64 val = (*fp_g_value_get_int64)(&value);
-            return create_Long(env, (jlong)val);
-        }
-        else if( (*fp_g_type_is_a)( param->value_type, G_TYPE_UINT64 ))
-        {
-            guint64 val = (*fp_g_value_get_uint64)(&value);
-            return create_Long(env, (jlong)val);
-        }
-        else if( (*fp_g_type_is_a)( param->value_type, G_TYPE_FLOAT ))
-        {
-            gfloat val = (*fp_g_value_get_float)(&value);
-            return create_Float(env, (jfloat)val);
-        }
-        else if( (*fp_g_type_is_a)( param->value_type, G_TYPE_DOUBLE ))
-        {
-            gdouble val = (*fp_g_value_get_double)(&value);
-            return create_Double(env, (jdouble)val);
-        }
-        else if( (*fp_g_type_is_a)( param->value_type, G_TYPE_ENUM ))
-        {
-            gint val = (*fp_g_value_get_enum)(&value);
-            return create_Integer(env, (jint)val);
-        }
-        else if( (*fp_g_type_is_a)( param->value_type, G_TYPE_FLAGS ))
-        {
-            guint val = (*fp_g_value_get_flags)(&value);
-            return create_Integer(env, (jint)val);
-        }
-        else if( (*fp_g_type_is_a)( param->value_type, G_TYPE_STRING ))
-        {
-            const gchar* val = (*fp_g_value_get_string)(&value);
-
-            /* We suppose that all values come in C locale and
-             * utf-8 representation of a string is the same as
-             * the string itself. If this isn't so we should
-             * use g_convert.
-             */
-            return (*env)->NewStringUTF(env, val);
-        }
-        else if( (*fp_g_type_is_a)( param->value_type, GTK_TYPE_BORDER ))
-        {
-            GtkBorder *border = (GtkBorder*)(*fp_g_value_get_boxed)(&value);
-            return border ? create_Insets(env, border) : NULL;
-        }
-
-        /*      TODO: Other types are not supported yet.*/
-/*        else if( (*fp_g_type_is_a)( param->value_type, G_TYPE_PARAM ))
-        {
-            GParamSpec* val = (*fp_g_value_get_param)(&value);
-            printf( "Param: %p\n", val );
-        }
-        else if( (*fp_g_type_is_a)( param->value_type, G_TYPE_BOXED ))
-        {
-            gpointer* val = (*fp_g_value_get_boxed)(&value);
-            printf( "Boxed: %p\n", val );
-        }
-        else if( (*fp_g_type_is_a)( param->value_type, G_TYPE_POINTER ))
-        {
-            gpointer* val = (*fp_g_value_get_pointer)(&value);
-            printf( "Pointer: %p\n", val );
-        }
-        else if( (*fp_g_type_is_a)( param->value_type, G_TYPE_OBJECT ))
-        {
-            GObject* val = (GObject*)(*fp_g_value_get_object)(&value);
-            printf( "Object: %p\n", val );
-        }*/
-    }
-
-    return NULL;
-}
-
-static void gtk2_set_range_value(WidgetType widget_type, jdouble value,
-                          jdouble min, jdouble max, jdouble visible)
-{
-    GtkAdjustment *adj;
-
-    gtk2_widget = gtk2_get_widget(widget_type);
-
-    adj = (*fp_gtk_range_get_adjustment)((GtkRange *)gtk2_widget);
-    adj->value = (gdouble)value;
-    adj->lower = (gdouble)min;
-    adj->upper = (gdouble)max;
-    adj->page_size = (gdouble)visible;
-}
-
-/*************************************************/
-static jobject create_Object(JNIEnv *env, jmethodID *cid,
-                             const char* class_name,
-                             const char* signature,
-                             jvalue* value)
-{
-    jclass  class;
-    jobject result;
-
-    class = (*env)->FindClass(env, class_name);
-    if( class == NULL )
-        return NULL; /* can't find/load the class, exception thrown */
-
-    if( *cid == NULL)
-    {
-        *cid = (*env)->GetMethodID(env, class, "<init>", signature);
-        if( *cid == NULL )
-        {
-            (*env)->DeleteLocalRef(env, class);
-            return NULL; /* can't find/get the method, exception thrown */
-        }
-    }
-
-    result = (*env)->NewObjectA(env, class, *cid, value);
-
-    (*env)->DeleteLocalRef(env, class);
-    return result;
-}
-
-jobject create_Boolean(JNIEnv *env, jboolean boolean_value)
-{
-    static jmethodID cid = NULL;
-    jvalue value;
-
-    value.z = boolean_value;
-
-    return create_Object(env, &cid, "java/lang/Boolean", "(Z)V", &value);
-}
-
-jobject create_Integer(JNIEnv *env, jint int_value)
-{
-    static jmethodID cid = NULL;
-    jvalue value;
-
-    value.i = int_value;
-
-    return create_Object(env, &cid, "java/lang/Integer", "(I)V", &value);
-}
-
-jobject create_Long(JNIEnv *env, jlong long_value)
-{
-    static jmethodID cid = NULL;
-    jvalue value;
-
-    value.j = long_value;
-
-    return create_Object(env, &cid, "java/lang/Long", "(J)V", &value);
-}
-
-jobject create_Float(JNIEnv *env, jfloat float_value)
-{
-    static jmethodID cid = NULL;
-    jvalue value;
-
-    value.f = float_value;
-
-    return create_Object(env, &cid, "java/lang/Float", "(F)V", &value);
-}
-
-jobject create_Double(JNIEnv *env, jdouble double_value)
-{
-    static jmethodID cid = NULL;
-    jvalue value;
-
-    value.d = double_value;
-
-    return create_Object(env, &cid, "java/lang/Double", "(D)V", &value);
-}
-
-jobject create_Character(JNIEnv *env, jchar char_value)
-{
-    static jmethodID cid = NULL;
-    jvalue value;
-
-    value.c = char_value;
-
-    return create_Object(env, &cid, "java/lang/Character", "(C)V", &value);
-}
-
-
-jobject create_Insets(JNIEnv *env, GtkBorder *border)
-{
-    static jmethodID cid = NULL;
-    jvalue values[4];
-
-    values[0].i = border->top;
-    values[1].i = border->left;
-    values[2].i = border->bottom;
-    values[3].i = border->right;
-
-    return create_Object(env, &cid, "java/awt/Insets", "(IIII)V", values);
-}
-
-/*********************************************/
-static jstring gtk2_get_pango_font_name(JNIEnv *env, WidgetType widget_type)
-{
-    init_containers();
-
-    gtk2_widget = gtk2_get_widget(widget_type);
-    jstring  result = NULL;
-    GtkStyle* style = gtk2_widget->style;
-
-    if (style && style->font_desc)
-    {
-        gchar* val = (*fp_pango_font_description_to_string)(style->font_desc);
-        result = (*env)->NewStringUTF(env, val);
-        (*fp_g_free)( val );
-    }
-
-    return result;
-}
-
-/***********************************************/
-static jobject get_string_property(JNIEnv *env, GtkSettings* settings, const gchar* key)
-{
-    jobject result = NULL;
-    gchar*  strval = NULL;
-
-    (*fp_g_object_get)(settings, key, &strval, NULL);
-    result = (*env)->NewStringUTF(env, strval);
-    (*fp_g_free)(strval);
-
-    return result;
-}
-
-static jobject get_integer_property(JNIEnv *env, GtkSettings* settings, const gchar* key)
-{
-    gint intval = 0;
-    (*fp_g_object_get)(settings, key, &intval, NULL);
-    return create_Integer(env, intval);
-}
-
-static jobject get_boolean_property(JNIEnv *env, GtkSettings* settings, const gchar* key)
-{
-    gint intval = 0;
-    (*fp_g_object_get)(settings, key, &intval, NULL);
-    return create_Boolean(env, intval);
-}
-
-static jobject gtk2_get_setting(JNIEnv *env, Setting property)
-{
-    GtkSettings* settings = (*fp_gtk_settings_get_default)();
-
-    switch (property)
-    {
-        case GTK_FONT_NAME:
-            return get_string_property(env, settings, "gtk-font-name");
-        case GTK_ICON_SIZES:
-            return get_string_property(env, settings, "gtk-icon-sizes");
-        case GTK_CURSOR_BLINK:
-            return get_boolean_property(env, settings, "gtk-cursor-blink");
-        case GTK_CURSOR_BLINK_TIME:
-            return get_integer_property(env, settings, "gtk-cursor-blink-time");
-    }
-
-    return NULL;
-}
-
-static gboolean gtk2_get_drawable_data(JNIEnv *env, jintArray pixelArray, jint x,
-     jint y, jint width, jint height, jint jwidth, int dx, int dy) {
-    GdkPixbuf *pixbuf;
-    jint *ary;
-
-    GdkWindow *root = (*fp_gdk_get_default_root_window)();
-
-    pixbuf = (*fp_gdk_pixbuf_get_from_drawable)(NULL, root, NULL, x, y,
-                                                    0, 0, width, height);
-
-    if (pixbuf) {
-        int nchan = (*fp_gdk_pixbuf_get_n_channels)(pixbuf);
-        int stride = (*fp_gdk_pixbuf_get_rowstride)(pixbuf);
-
-        if ((*fp_gdk_pixbuf_get_width)(pixbuf) == width
-                && (*fp_gdk_pixbuf_get_height)(pixbuf) == height
-                && (*fp_gdk_pixbuf_get_bits_per_sample)(pixbuf) == 8
-                && (*fp_gdk_pixbuf_get_colorspace)(pixbuf) == GDK_COLORSPACE_RGB
-                && nchan >= 3
-                ) {
-            guchar *p, *pix = (*fp_gdk_pixbuf_get_pixels)(pixbuf);
-
-            ary = (*env)->GetPrimitiveArrayCritical(env, pixelArray, NULL);
-            if (ary) {
-                jint _x, _y;
-                int index;
-                for (_y = 0; _y < height; _y++) {
-                    for (_x = 0; _x < width; _x++) {
-                        p = pix + (intptr_t) _y * stride + _x * nchan;
-
-                        index = (_y + dy) * jwidth + (_x + dx);
-                        ary[index] = 0xff000000
-                                        | (p[0] << 16)
-                                        | (p[1] << 8)
-                                        | (p[2]);
-
-                    }
-                }
-                (*env)->ReleasePrimitiveArrayCritical(env, pixelArray, ary, 0);
-            }
-        }
-        (*fp_g_object_unref)(pixbuf);
-    }
-    return JNI_FALSE;
-}
-
-static GdkWindow* gtk2_get_window(void *widget) {
-    return ((GtkWidget*)widget)->window;
-}
-
-void gtk2_init(GtkApi* gtk) {
-    gtk->version = GTK_2;
-
-    gtk->show_uri_load = &gtk2_show_uri_load;
-    gtk->unload = &gtk2_unload;
-    gtk->flush_event_loop = &flush_gtk_event_loop;
-    gtk->gtk_check_version = fp_gtk_check_version;
-    gtk->get_setting = &gtk2_get_setting;
-
-    gtk->paint_arrow = &gtk2_paint_arrow;
-    gtk->paint_box = &gtk2_paint_box;
-    gtk->paint_box_gap = &gtk2_paint_box_gap;
-    gtk->paint_expander = &gtk2_paint_expander;
-    gtk->paint_extension = &gtk2_paint_extension;
-    gtk->paint_flat_box = &gtk2_paint_flat_box;
-    gtk->paint_focus = &gtk2_paint_focus;
-    gtk->paint_handle = &gtk2_paint_handle;
-    gtk->paint_hline = &gtk2_paint_hline;
-    gtk->paint_vline = &gtk2_paint_vline;
-    gtk->paint_option = &gtk2_paint_option;
-    gtk->paint_shadow = &gtk2_paint_shadow;
-    gtk->paint_slider = &gtk2_paint_slider;
-    gtk->paint_background = &gtk_paint_background;
-    gtk->paint_check = &gtk2_paint_check;
-    gtk->set_range_value = &gtk2_set_range_value;
-
-    gtk->init_painting = &gtk2_init_painting;
-    gtk->copy_image = &gtk2_copy_image;
-
-    gtk->get_xthickness = &gtk2_get_xthickness;
-    gtk->get_ythickness = &gtk2_get_ythickness;
-    gtk->get_color_for_state = &gtk2_get_color_for_state;
-    gtk->get_class_value = &gtk2_get_class_value;
-
-    gtk->get_pango_font_name = &gtk2_get_pango_font_name;
-    gtk->get_icon_data = &gtk2_get_icon_data;
-    gtk->get_file_icon_data = &gtk2_get_file_icon_data;
-    gtk->gdk_threads_enter = fp_gdk_threads_enter;
-    gtk->gdk_threads_leave = fp_gdk_threads_leave;
-    gtk->gtk_show_uri = fp_gtk_show_uri;
-    gtk->get_drawable_data = &gtk2_get_drawable_data;
-    gtk->g_free = fp_g_free;
-
-    gtk->gtk_file_chooser_get_filename = fp_gtk_file_chooser_get_filename;
-    gtk->gtk_widget_hide = fp_gtk_widget_hide;
-    gtk->gtk_main_quit = fp_gtk_main_quit;
-    gtk->gtk_file_chooser_dialog_new = fp_gtk_file_chooser_dialog_new;
-    gtk->gtk_file_chooser_set_current_folder =
-                          fp_gtk_file_chooser_set_current_folder;
-    gtk->gtk_file_chooser_set_filename = fp_gtk_file_chooser_set_filename;
-    gtk->gtk_file_chooser_set_current_name =
-                          fp_gtk_file_chooser_set_current_name;
-    gtk->gtk_file_filter_add_custom = fp_gtk_file_filter_add_custom;
-    gtk->gtk_file_chooser_set_filter = fp_gtk_file_chooser_set_filter;
-    gtk->gtk_file_chooser_get_type = fp_gtk_file_chooser_get_type;
-    gtk->gtk_file_filter_new = fp_gtk_file_filter_new;
-    gtk->gtk_file_chooser_set_do_overwrite_confirmation =
-                          fp_gtk_file_chooser_set_do_overwrite_confirmation;
-    gtk->gtk_file_chooser_set_select_multiple =
-                          fp_gtk_file_chooser_set_select_multiple;
-    gtk->gtk_file_chooser_get_current_folder =
-                          fp_gtk_file_chooser_get_current_folder;
-    gtk->gtk_file_chooser_get_filenames = fp_gtk_file_chooser_get_filenames;
-    gtk->gtk_g_slist_length = fp_gtk_g_slist_length;
-    gtk->g_signal_connect_data = fp_g_signal_connect_data;
-    gtk->gtk_widget_show = fp_gtk_widget_show;
-    gtk->gtk_main = fp_gtk_main;
-    gtk->gtk_main_level = fp_gtk_main_level;
-    gtk->g_path_get_dirname = fp_g_path_get_dirname;
-    gtk->gdk_x11_drawable_get_xid = fp_gdk_x11_drawable_get_xid;
-    gtk->gtk_widget_destroy = fp_gtk_widget_destroy;
-    gtk->gtk_window_present = fp_gtk_window_present;
-    gtk->gtk_window_move = fp_gtk_window_move;
-    gtk->gtk_window_resize = fp_gtk_window_resize;
-    gtk->get_window = &gtk2_get_window;
-
-    gtk->g_object_unref = fp_g_object_unref;
-    gtk->g_list_append = fp_g_list_append;
-    gtk->g_list_free = fp_g_list_free;
-    gtk->g_list_free_full = fp_g_list_free_full;
-}
diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.h b/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.h
deleted file mode 100644
index 8075d4f419fad..0000000000000
--- a/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.h
+++ /dev/null
@@ -1,448 +0,0 @@
-/*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#ifdef HEADLESS
-    #error This file should not be included in headless library
-#endif
-
-#ifndef _GTK2_INTERFACE_H
-#define _GTK2_INTERFACE_H
-
-#include <stdlib.h>
-#include <jni.h>
-#include <X11/X.h>
-#include "gtk_interface.h"
-
-#define GTK_HAS_FOCUS   (1 << 12)
-#define GTK_HAS_DEFAULT (1 << 14)
-
-typedef enum
-{
-  GTK_WINDOW_TOPLEVEL,
-  GTK_WINDOW_POPUP
-} GtkWindowType;
-
-typedef enum
-{
-  G_PARAM_READABLE            = 1 << 0,
-  G_PARAM_WRITABLE            = 1 << 1,
-  G_PARAM_CONSTRUCT           = 1 << 2,
-  G_PARAM_CONSTRUCT_ONLY      = 1 << 3,
-  G_PARAM_LAX_VALIDATION      = 1 << 4,
-  G_PARAM_PRIVATE             = 1 << 5
-} GParamFlags;
-
-/* We define all structure pointers to be void* */
-typedef void GVfs;
-
-typedef void GdkColormap;
-typedef void GdkDrawable;
-typedef void GdkGC;
-typedef void GdkPixmap;
-
-typedef void GtkFixed;
-typedef void GtkMenuItem;
-typedef void GtkMenuShell;
-typedef void GtkWidgetClass;
-typedef void PangoFontDescription;
-typedef void GtkSettings;
-
-/* Some real structures */
-typedef struct
-{
-  guint32 pixel;
-  guint16 red;
-  guint16 green;
-  guint16 blue;
-} GdkColor;
-
-typedef struct {
-  gint      fd;
-  gushort   events;
-  gushort   revents;
-} GPollFD;
-
-typedef struct {
-  gint x;
-  gint y;
-  gint width;
-  gint height;
-} GtkAllocation;
-
-typedef struct {
-  gint width;
-  gint height;
-} GtkRequisition;
-
-typedef struct {
-  GtkWidgetClass *g_class;
-} GTypeInstance;
-
-typedef struct {
-  gint left;
-  gint right;
-  gint top;
-  gint bottom;
-} GtkBorder;
-
-/******************************************************
- * FIXME: it is more safe to include gtk headers for
- * the precise type definition of GType and other
- * structures. This is a place where getting rid of gtk
- * headers may be dangerous.
- ******************************************************/
-
-typedef struct
-{
-  GType         g_type;
-
-  union {
-    gint        v_int;
-    guint       v_uint;
-    glong       v_long;
-    gulong      v_ulong;
-    gint64      v_int64;
-    guint64     v_uint64;
-    gfloat      v_float;
-    gdouble     v_double;
-    gpointer    v_pointer;
-  } data[2];
-} GValue;
-
-typedef struct
-{
-  GTypeInstance  g_type_instance;
-
-  gchar         *name;
-  GParamFlags    flags;
-  GType          value_type;
-  GType          owner_type;
-} GParamSpec;
-
-typedef struct {
-  GTypeInstance g_type_instance;
-  guint         ref_count;
-  void         *qdata;
-} GObject;
-
-typedef struct {
-  GObject parent_instance;
-  guint32 flags;
-} GtkObject;
-
-typedef struct
-{
-  GObject parent_instance;
-
-  GdkColor fg[5];
-  GdkColor bg[5];
-  GdkColor light[5];
-  GdkColor dark[5];
-  GdkColor mid[5];
-  GdkColor text[5];
-  GdkColor base[5];
-  GdkColor text_aa[5];          /* Halfway between text/base */
-
-  GdkColor black;
-  GdkColor white;
-  PangoFontDescription *font_desc;
-
-  gint xthickness;
-  gint ythickness;
-
-  GdkGC *fg_gc[5];
-  GdkGC *bg_gc[5];
-  GdkGC *light_gc[5];
-  GdkGC *dark_gc[5];
-  GdkGC *mid_gc[5];
-  GdkGC *text_gc[5];
-  GdkGC *base_gc[5];
-  GdkGC *text_aa_gc[5];
-  GdkGC *black_gc;
-  GdkGC *white_gc;
-
-  GdkPixmap *bg_pixmap[5];
-} GtkStyle;
-
-typedef struct _GtkWidget GtkWidget;
-struct _GtkWidget
-{
-  GtkObject object;
-  guint16 private_flags;
-  guint8 state;
-  guint8 saved_state;
-  gchar *name;
-  GtkStyle *style;
-  GtkRequisition requisition;
-  GtkAllocation allocation;
-  GdkWindow *window;
-  GtkWidget *parent;
-};
-
-typedef struct
-{
-  GtkWidget widget;
-
-  gfloat xalign;
-  gfloat yalign;
-
-  guint16 xpad;
-  guint16 ypad;
-} GtkMisc;
-
-typedef struct {
-  GtkWidget widget;
-  GtkWidget *focus_child;
-  guint border_width : 16;
-  guint need_resize : 1;
-  guint resize_mode : 2;
-  guint reallocate_redraws : 1;
-  guint has_focus_chain : 1;
-} GtkContainer;
-
-typedef struct {
-  GtkContainer container;
-  GtkWidget *child;
-} GtkBin;
-
-typedef struct {
-  GtkBin bin;
-  GdkWindow *event_window;
-  gchar *label_text;
-  guint activate_timeout;
-  guint constructed : 1;
-  guint in_button : 1;
-  guint button_down : 1;
-  guint relief : 2;
-  guint use_underline : 1;
-  guint use_stock : 1;
-  guint depressed : 1;
-  guint depress_on_activate : 1;
-  guint focus_on_click : 1;
-} GtkButton;
-
-typedef struct {
-  GtkButton button;
-  guint active : 1;
-  guint draw_indicator : 1;
-  guint inconsistent : 1;
-} GtkToggleButton;
-
-typedef struct _GtkAdjustment GtkAdjustment;
-struct _GtkAdjustment
-{
-  GtkObject parent_instance;
-
-  gdouble lower;
-  gdouble upper;
-  gdouble value;
-  gdouble step_increment;
-  gdouble page_increment;
-  gdouble page_size;
-};
-
-typedef enum
-{
-  GTK_UPDATE_CONTINUOUS,
-  GTK_UPDATE_DISCONTINUOUS,
-  GTK_UPDATE_DELAYED
-} GtkUpdateType;
-
-typedef struct _GtkRange GtkRange;
-struct _GtkRange
-{
-  GtkWidget widget;
-  GtkAdjustment *adjustment;
-  GtkUpdateType update_policy;
-  guint inverted : 1;
-  /*< protected >*/
-  guint flippable : 1;
-  guint has_stepper_a : 1;
-  guint has_stepper_b : 1;
-  guint has_stepper_c : 1;
-  guint has_stepper_d : 1;
-  guint need_recalc : 1;
-  guint slider_size_fixed : 1;
-  gint min_slider_size;
-  GtkOrientation orientation;
-  GdkRectangle range_rect;
-  gint slider_start, slider_end;
-  gint round_digits;
-  /*< private >*/
-  guint trough_click_forward : 1;
-  guint update_pending : 1;
-  /*GtkRangeLayout * */ void *layout;
-  /*GtkRangeStepTimer * */ void* timer;
-  gint slide_initial_slider_position;
-  gint slide_initial_coordinate;
-  guint update_timeout_id;
-  GdkWindow *event_window;
-};
-
-typedef struct _GtkProgressBar       GtkProgressBar;
-
-typedef enum
-{
-  GTK_PROGRESS_CONTINUOUS,
-  GTK_PROGRESS_DISCRETE
-} GtkProgressBarStyle;
-
-typedef enum
-{
-  GTK_PROGRESS_LEFT_TO_RIGHT,
-  GTK_PROGRESS_RIGHT_TO_LEFT,
-  GTK_PROGRESS_BOTTOM_TO_TOP,
-  GTK_PROGRESS_TOP_TO_BOTTOM
-} GtkProgressBarOrientation;
-
-typedef struct _GtkProgress       GtkProgress;
-
-struct _GtkProgress
-{
-  GtkWidget widget;
-  GtkAdjustment *adjustment;
-  GdkPixmap     *offscreen_pixmap;
-  gchar         *format;
-  gfloat         x_align;
-  gfloat         y_align;
-  guint          show_text : 1;
-  guint          activity_mode : 1;
-  guint          use_text_format : 1;
-};
-
-struct _GtkProgressBar
-{
-  GtkProgress progress;
-  GtkProgressBarStyle bar_style;
-  GtkProgressBarOrientation orientation;
-  guint blocks;
-  gint  in_block;
-  gint  activity_pos;
-  guint activity_step;
-  guint activity_blocks;
-  gdouble pulse_fraction;
-  guint activity_dir : 1;
-  guint ellipsize : 3;
-};
-
-/**
- * Returns :
- * NULL if the GLib library is compatible with the given version, or a string
- * describing the version mismatch.
- * Please note that the glib_check_version() is available since 2.6,
- * so you should use GLIB_CHECK_VERSION macro instead.
- */
-static gchar* (*fp_glib_check_version)(guint required_major, guint required_minor,
-                       guint required_micro);
-
-/**
- * Returns :
- *  TRUE if the GLib library is compatible with the given version
- */
-#define GLIB_CHECK_VERSION(major, minor, micro) \
-    (fp_glib_check_version && fp_glib_check_version(major, minor, micro) == NULL)
-
-/**
- * Returns :
- * NULL if the GTK+ library is compatible with the given version, or a string
- * describing the version mismatch.
- */
-static gchar* (*fp_gtk_check_version)(guint required_major, guint required_minor,
-                       guint required_micro);
-
-static void gtk2_init(GtkApi* gtk);
-
-static void (*fp_g_free)(gpointer mem);
-static void (*fp_g_object_unref)(gpointer object);
-static GdkWindow *(*fp_gdk_get_default_root_window) (void);
-
-static int (*fp_gdk_pixbuf_get_bits_per_sample)(const GdkPixbuf *pixbuf);
-static guchar *(*fp_gdk_pixbuf_get_pixels)(const GdkPixbuf *pixbuf);
-static gboolean (*fp_gdk_pixbuf_get_has_alpha)(const GdkPixbuf *pixbuf);
-static int (*fp_gdk_pixbuf_get_height)(const GdkPixbuf *pixbuf);
-static int (*fp_gdk_pixbuf_get_n_channels)(const GdkPixbuf *pixbuf);
-static int (*fp_gdk_pixbuf_get_rowstride)(const GdkPixbuf *pixbuf);
-static int (*fp_gdk_pixbuf_get_width)(const GdkPixbuf *pixbuf);
-static GdkPixbuf *(*fp_gdk_pixbuf_new_from_file)(const char *filename, GError **error);
-static GdkColorspace (*fp_gdk_pixbuf_get_colorspace)(const GdkPixbuf *pixbuf);
-
-static GdkPixbuf *(*fp_gdk_pixbuf_get_from_drawable)(GdkPixbuf *dest,
-        GdkDrawable *src, GdkColormap *cmap, int src_x, int src_y,
-        int dest_x, int dest_y, int width, int height);
-static GdkPixbuf *(*fp_gdk_pixbuf_scale_simple)(GdkPixbuf *src,
-        int dest_width, int dest_heigh, GdkInterpType interp_type);
-
-
-static void (*fp_gtk_widget_destroy)(void *widget);
-static void (*fp_gtk_window_present)(GtkWindow *window);
-static void (*fp_gtk_window_move)(GtkWindow *window, gint x, gint y);
-static void (*fp_gtk_window_resize)(GtkWindow *window, gint width, gint height);
-
-/**
- * Function Pointers for GtkFileChooser
- */
-static gchar* (*fp_gtk_file_chooser_get_filename)(GtkFileChooser *chooser);
-static void (*fp_gtk_widget_hide)(void *widget);
-static void (*fp_gtk_main_quit)(void);
-static void* (*fp_gtk_file_chooser_dialog_new)(const gchar *title,
-    GtkWindow *parent, GtkFileChooserAction action,
-    const gchar *first_button_text, ...);
-static gboolean (*fp_gtk_file_chooser_set_current_folder)(GtkFileChooser *chooser,
-    const gchar *filename);
-static gboolean (*fp_gtk_file_chooser_set_filename)(GtkFileChooser *chooser,
-    const char *filename);
-static void (*fp_gtk_file_chooser_set_current_name)(GtkFileChooser *chooser,
-    const gchar *name);
-static void (*fp_gtk_file_filter_add_custom)(GtkFileFilter *filter,
-    GtkFileFilterFlags needed, GtkFileFilterFunc func, gpointer data,
-    GDestroyNotify notify);
-static void (*fp_gtk_file_chooser_set_filter)(GtkFileChooser *chooser,
-    GtkFileFilter *filter);
-static GType (*fp_gtk_file_chooser_get_type)(void);
-static GtkFileFilter* (*fp_gtk_file_filter_new)(void);
-static void (*fp_gtk_file_chooser_set_do_overwrite_confirmation)(
-    GtkFileChooser *chooser, gboolean do_overwrite_confirmation);
-static void (*fp_gtk_file_chooser_set_select_multiple)(
-    GtkFileChooser *chooser, gboolean select_multiple);
-static gchar* (*fp_gtk_file_chooser_get_current_folder)(GtkFileChooser *chooser);
-static GSList* (*fp_gtk_file_chooser_get_filenames)(GtkFileChooser *chooser);
-static guint (*fp_gtk_g_slist_length)(GSList *list);
-static gulong (*fp_g_signal_connect_data)(gpointer instance,
-    const gchar *detailed_signal, GCallback c_handler, gpointer data,
-    GClosureNotify destroy_data, GConnectFlags connect_flags);
-static void (*fp_gtk_widget_show)(void *widget);
-static void (*fp_gtk_main)(void);
-static guint (*fp_gtk_main_level)(void);
-static gchar* (*fp_g_path_get_dirname) (const gchar *file_name);
-static XID (*fp_gdk_x11_drawable_get_xid) (GdkWindow *drawable);
-
-static GList* (*fp_g_list_append) (GList *list, gpointer data);
-static void (*fp_g_list_free) (GList *list);
-static void (*fp_g_list_free_full) (GList *list, GDestroyNotify free_func);
-
-static gboolean (*fp_gtk_show_uri)(GdkScreen *screen, const gchar *uri,
-    guint32 timestamp, GError **error);
-
-#endif /* !_GTK2_INTERFACE_H */
diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.c b/src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.c
index c8573ed3fbfb9..fcf84948c66ee 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.c
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,10 +32,8 @@
 #include "jvm_md.h"
 #include "gtk_interface.h"
 
-GtkApi* gtk2_load(JNIEnv *env, const char* lib_name);
 GtkApi* gtk3_load(JNIEnv *env, const char* lib_name);
 
-gboolean gtk2_check(const char* lib_name, gboolean load);
 gboolean gtk3_check(const char* lib_name, gboolean load);
 
 GtkApi *gtk;
@@ -56,13 +54,6 @@ static GtkLib gtk_libs[] = {
         &gtk3_load,
         &gtk3_check
     },
-    {
-        GTK_2,
-        JNI_LIB_NAME("gtk-x11-2.0"),
-        VERSIONED_JNI_LIB_NAME("gtk-x11-2.0", "0"),
-        &gtk2_load,
-        &gtk2_check
-    }
 };
 
 static GtkLib** get_libs_order(GtkVersion version) {
diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/screencast_pipewire.c b/src/java.desktop/unix/native/libawt_xawt/awt/screencast_pipewire.c
index e2f4ea31d2edb..6884b939ae727 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/screencast_pipewire.c
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/screencast_pipewire.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -675,7 +675,6 @@ static gboolean isAllDataReady() {
 
 
 static void *pipewire_libhandle = NULL;
-//glib_version_2_68 false for gtk2, as it comes from gtk3_interface.c
 
 extern gboolean glib_version_2_68;
 
diff --git a/test/jdk/java/awt/Gtk/GtkVersionTest/GtkVersionTest.java b/test/jdk/java/awt/Gtk/GtkVersionTest/GtkVersionTest.java
index d2e460d4a1637..3d530178a8afc 100644
--- a/test/jdk/java/awt/Gtk/GtkVersionTest/GtkVersionTest.java
+++ b/test/jdk/java/awt/Gtk/GtkVersionTest/GtkVersionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,8 +45,9 @@ public static void main(String[] args) {
 
     public static void main(String[] args) throws Exception {
         test(null, "3");
-        test("2", "2");
-        test("2.2", "2");
+//        GTK 2 is removed, but the test can still be useful.
+//        test("2", "2");
+//        test("2.2", "2");
         test("3", "3");
     }
 
diff --git a/test/jdk/java/awt/Robot/HiDPIScreenCapture/ScreenCaptureGtkTest.java b/test/jdk/java/awt/Robot/HiDPIScreenCapture/ScreenCaptureGtkTest.java
index 1f6298a2a612f..155933404e8c5 100644
--- a/test/jdk/java/awt/Robot/HiDPIScreenCapture/ScreenCaptureGtkTest.java
+++ b/test/jdk/java/awt/Robot/HiDPIScreenCapture/ScreenCaptureGtkTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2022, JetBrains s.r.o.. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -41,10 +41,9 @@
  * @test
  * @key headful
  * @bug 8280861
- * @summary  Verifies Robot screen capture capabilities with different
+ * @summary  Verifies Robot screen capture capabilities with available
  *           Gtk backends and presence of UI scaling
  * @requires os.family == "linux"
- * @run main/othervm -Djdk.gtk.version=2 -Dsun.java2d.uiScale=1 ScreenCaptureGtkTest
  * @run main/othervm -Djdk.gtk.version=3 -Dsun.java2d.uiScale=1 ScreenCaptureGtkTest
  */
 
@@ -53,12 +52,6 @@ public class ScreenCaptureGtkTest {
             Color.GREEN, Color.BLUE, Color.ORANGE, Color.RED};
 
     public static void main(String[] args) throws Exception {
-        if ("2".equals(System.getProperty("jdk.gtk.version"))
-                && System.getenv("WAYLAND_DISPLAY") != null) {
-            // screen capture is not supported with gtk2 on Wayland
-            return;
-        }
-
         final int topOffset = 50;
         final int leftOffset = 50;
 
diff --git a/test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK.java b/test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK.java
index a8d460bc48e0b..906126071ff1d 100644
--- a/test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK.java
+++ b/test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
   @bug 8156121
   @key headful
   @requires os.family == "linux"
-  @run main/othervm -Djdk.gtk.version=2 DemandGTK
   @run main/othervm -Djdk.gtk.version=3 DemandGTK
 */
 
diff --git a/test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK2.sh b/test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK2.sh
deleted file mode 100644
index eddae8748a7d1..0000000000000
--- a/test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK2.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/ksh -p
-
-#
-# Copyright (c) 2016, 2018, 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
-#   @summary  Try to force GTK2. We must bail out to GTK3 (if any) if no 2 available.
-#
-#   @key headful
-#   @bug 8156128 8212903
-#   @compile ProvokeGTK.java
-#   @requires os.family == "linux"
-#   @run shell/timeout=400 DemandGTK2.sh
-
-#
-# Note that we depend on
-# strace in the PATH
-# /sbin/ldconfig (which may be not in PATH)
-# It is true for OEL 7 and Ubuntu 14, 16
-# but may fail in future. Save tomorrow for tomorrow.
-#
-# Read DemandGTK2.txt how to prepare GTK2-less machine.
-#
-
-which strace
-if [ $?  -ne 0 ]
-then
-    echo "Please provide strace: \"which strace\" failed."
-    exit 1
-fi
-
-HAVE_2=`/sbin/ldconfig -v 2>/dev/null | grep libgtk-x11-2 | wc -l`
-HAVE_3=`/sbin/ldconfig -v 2>/dev/null | grep libgtk-3.so | wc -l`
-
-
-if [ "${HAVE_2}" = "0" ]
-then
-    
-    if [ "${HAVE_3}" = "0" ]
-    then
-        echo "Neither GTK2 nor GTK3 found: system misconfiguration. Exit."
-        exit 1
-    fi
-    echo "No GTK 2 library found: we should bail out to 3"
-    strace -o strace.log -fe open,openat ${TESTJAVA}/bin/java  -cp ${TESTCLASSPATH}  -Djdk.gtk.version=2 ProvokeGTK
-    EXECRES=$?
-    grep  'libgtk-3.*=\ *[0-9]*$' strace.log > logg
-else
-    echo "There is GTK 2 library: we should use it"
-    strace -o strace.log -fe open,openat ${TESTJAVA}/bin/java  -cp ${TESTCLASSPATH}  -Djdk.gtk.version=2 ProvokeGTK
-    EXECRES=$?
-    grep  'libgtk-x11.*=\ *[0-9]*$' strace.log > logg
-fi
-
-if [ ${EXECRES}  -ne 0 ]
-then
-    echo "java execution failed for unknown reason, see logs"
-    exit 2
-fi
-
-cat logg
-if [ -s logg ]
-then
-    echo "Success."
-    exit 0
-else
-    echo "Failed. Examine logs."
-    exit 3
-fi
-
-
diff --git a/test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK2.txt b/test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK2.txt
deleted file mode 100644
index 7313e3ee4a754..0000000000000
--- a/test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK2.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-How to prepare an Ubuntu machine for GTK-2-less test run.
-
-The test DemandGTK2.sh should work well without GTK-2 switching to version 3
-if there's no GTK-2 library available. 
-At the moment, it's not easy to find a system with GTK-3 and without GTK-2:
-many programs still depend on version 2.
-We can, however, rename GTK-2 library for a single test run and then restore
-it back.
-
-(1) Find GTK2 library: run
-  /sbin/ldconfig -v 2>/dev/null |  grep libgtk-x11-2
-
-It will output one or two lines like 
-libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.2400.23
-Search for the target of that symlink for instance with locate:
-locate libgtk-x11-2.0.so.0.2400.23
-Finally, you'll find the libraries. On my current machine they are
-/usr/lib/i386-linux-gnu/libgtk-x11-2.0.so.0.2400.23
-/usr/lib/x86_64-linux-gnu/libgtk-x11-2.0.so.0.2400.23
-
-I'm running 64-bit JDK and need to tamper with x86_64 copy only.
-
-(2) Find running programs depending on this library. They probably would crash
-if you rename it. Stop them for this test run.
-That said, I'm afraid it would be impossible to do on a system older than Ubuntu 16.04.
-On my Ubuntu 16.04 I have only hud-service using this library, and that's OK, it will restart
-after a crash, if any.
-To find these programs, run
-lsof /usr/lib/x86_64-linux-gnu/libgtk-x11-2.0.so.0.2400.23
-
-(3) Now,
-sudo mv  /usr/lib/x86_64-linux-gnu/libgtk-x11-2.0.so.0.2400.23  /usr/lib/x86_64-linux-gnu/bak.libgtk-x11-2.0.so.0.2400.23
-jtreg DemandGTK2.sh 
-sudo mv  /usr/lib/x86_64-linux-gnu/bak.libgtk-x11-2.0.so.0.2400.23  /usr/lib/x86_64-linux-gnu/libgtk-x11-2.0.so.0.2400.23
-
-Needless to say, you should substitute your own library path and however you run jtreg.
diff --git a/test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK3.sh b/test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK3.sh
index bb00493c8622f..2383cc828519b 100644
--- a/test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK3.sh
+++ b/test/jdk/javax/swing/LookAndFeel/8145547/DemandGTK3.sh
@@ -1,7 +1,7 @@
 #!/bin/ksh -p
 
 #
-# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 
 
 #   @test
-#   @summary  Try to force GTK3. We must bail out to GTK2 if no 3 available.
+#   @summary  Try to force GTK3.
 #
 #   @key headful
 #   @bug 8156128 8212903
@@ -53,11 +53,8 @@ HAVE_3=`/sbin/ldconfig -v 2>/dev/null | grep libgtk-3.so | wc -l`
 
 if [ "${HAVE_3}" = "0" ]
 then
-    
-    echo "No GTK 3 library found: we should bail out to 2"
-    strace -o strace.log -fe open,openat ${TESTJAVA}/bin/java  -cp ${TESTCLASSPATH}  -Djdk.gtk.version=3 ProvokeGTK
-    EXECRES=$?
-    grep  'libgtk-x11.*=\ *[0-9]*$' strace.log > logg
+    echo "No GTK 3 library found, do nothing"
+    exit 0
 else
     echo "There is GTK 3 library: we should use it"
     strace -o strace.log -fe open,openat ${TESTJAVA}/bin/java  -cp ${TESTCLASSPATH}  -Djdk.gtk.version=3 ProvokeGTK

From ddbd7a78f191462695ecbeeef7fd6312e322b15a Mon Sep 17 00:00:00 2001
From: Alexander Zvegintsev <azvegint@openjdk.org>
Date: Thu, 8 Aug 2024 10:53:23 +0000
Subject: [PATCH 349/401] 8337320: Update ProblemList.txt with tests known to
 fail on XWayland

Reviewed-by: prr
---
 test/jdk/ProblemList.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 84c7a7d855f73..3b8421eb9cc77 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -473,6 +473,12 @@ java/awt/image/multiresolution/MultiResolutionJOptionPaneIconTest.java 8274106 m
 # This test fails on macOS 14
 java/awt/Choice/SelectNewItemTest/SelectNewItemTest.java 8324782 macosx-all
 
+# Wayland related
+
+java/awt/Mouse/EnterExitEvents/ResizingFrameTest.java 8332158 linux-x64
+java/awt/FullScreen/FullscreenWindowProps/FullscreenWindowProps.java 8280991 linux-x64
+java/awt/FullScreen/SetFullScreenTest.java 8332155 linux-x64
+
 ############################################################################
 
 # jdk_beans

From 4b740d87ee50ba49305add4aae6490bebb6963ba Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Thu, 8 Aug 2024 10:57:43 +0000
Subject: [PATCH 350/401] 8225209: jdk/jfr/event/compiler/TestCodeSweeper.java
 fails

Reviewed-by: mgronlun
---
 test/jdk/ProblemList.txt                      |  1 -
 .../jfr/event/compiler/TestCodeSweeper.java   | 56 +++++++++++++------
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 3b8421eb9cc77..8aedbc7793116 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -744,7 +744,6 @@ jdk/incubator/vector/LoadJsvmlTest.java                         8305390 windows-
 
 # jdk_jfr
 
-jdk/jfr/event/compiler/TestCodeSweeper.java                     8225209 generic-all
 jdk/jfr/event/runtime/TestResidentSetSizeEvent.java             8309846 aix-ppc64
 jdk/jfr/startupargs/TestStartName.java                          8214685 windows-x64
 jdk/jfr/startupargs/TestStartDuration.java                      8214685 windows-x64
diff --git a/test/jdk/jdk/jfr/event/compiler/TestCodeSweeper.java b/test/jdk/jdk/jfr/event/compiler/TestCodeSweeper.java
index cb2a3f41b5582..df95af5b9be0a 100644
--- a/test/jdk/jdk/jfr/event/compiler/TestCodeSweeper.java
+++ b/test/jdk/jdk/jfr/event/compiler/TestCodeSweeper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,9 +27,11 @@
 import java.lang.reflect.Method;
 import java.time.Instant;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
-import jdk.jfr.Recording;
+import jdk.jfr.Event;
+import jdk.jfr.consumer.RecordingStream;
 import jdk.jfr.consumer.RecordedEvent;
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.EventNames;
@@ -39,7 +41,7 @@
 import jdk.test.whitebox.code.CodeBlob;
 
 /**
- * Test for events: vm/code_cache/full vm/compiler/failure
+ * Test for events: jdk.CodeCacheFull jdk.CompilationFailure
  *
  * We verify that we should get at least one of each of the events listed above.
  *
@@ -58,13 +60,15 @@
  */
 
 public class TestCodeSweeper {
+    static class ProvocationEvent extends Event {
+    }
     private static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
     private static final int COMP_LEVEL_SIMPLE = 1;
     private static final int COMP_LEVEL_FULL_OPTIMIZATION = 4;
     private static final int SIZE = 1;
     private static final String METHOD_NAME = "verifyFullEvent";
-    private static final String pathFull = EventNames.CodeCacheFull;
-    private static final String pathFailure = EventNames.CompilationFailure;
+    private static final String EVENT_CODE_CACHE_FULL = EventNames.CodeCacheFull;
+    private static final String EVENT_COMPILATION_FAILURE = EventNames.CompilationFailure;
     public static final long SEGMENT_SIZE = WhiteBox.getWhiteBox().getUintxVMFlag("CodeCacheSegmentSize");
     public static final long MIN_BLOCK_LENGTH = WhiteBox.getWhiteBox().getUintxVMFlag("CodeCacheMinBlockLength");
     public static final long MIN_ALLOCATION = SEGMENT_SIZE * MIN_BLOCK_LENGTH;
@@ -77,26 +81,41 @@ public static void main(String[] args) throws Throwable {
         System.out.println("This test will warn that the code cache is full.");
         System.out.println("That is expected and is the purpose of the test.");
         System.out.println("************************************************");
-
-        Recording r = new Recording();
-        r.enable(pathFull);
-        r.enable(pathFailure);
-        r.start();
-        provokeEvents();
-        r.stop();
+        List<RecordedEvent> events = Collections.synchronizedList(new ArrayList<>());
+        try (RecordingStream rs = new RecordingStream()) {
+            rs.setReuse(false);
+            rs.enable(EVENT_CODE_CACHE_FULL);
+            rs.enable(EVENT_COMPILATION_FAILURE);
+            rs.onEvent(EVENT_CODE_CACHE_FULL, events::add);
+            rs.onEvent(EVENT_COMPILATION_FAILURE, events::add);
+            rs.onEvent(ProvocationEvent.class.getName(), e -> {
+                if (!events.isEmpty()) {
+                    rs.close();
+                    return;
+                }
+                // Retry if CodeCacheFull or CompilationFailure events weren't provoked
+                try {
+                    provokeEvents();
+                } catch (Exception ex) {
+                    ex.printStackTrace();
+                    rs.close();
+                }
+            });
+            rs.startAsync();
+            provokeEvents();
+            rs.awaitTermination();
+        }
 
         int countEventFull = 0;
         int countEventFailure = 0;
-
-        List<RecordedEvent> events = Events.fromRecording(r);
         Events.hasEvents(events);
-        for (RecordedEvent event : events) {
+        for (RecordedEvent event : new ArrayList<>(events)) {
             switch (event.getEventType().getName()) {
-            case pathFull:
+            case EVENT_CODE_CACHE_FULL:
                 countEventFull++;
                 verifyFullEvent(event);
                 break;
-            case pathFailure:
+            case EVENT_COMPILATION_FAILURE:
                 countEventFailure++;
                 verifyFailureEvent(event);
                 break;
@@ -115,6 +134,8 @@ private static boolean canAllocate(double size, long maxSize, MemoryPoolMXBean b
     }
 
     private static void provokeEvents() throws NoSuchMethodException, InterruptedException {
+        System.out.println("provokeEvents()");
+        ProvocationEvent provocationEvent = new ProvocationEvent();
         // Prepare for later, since we don't want to trigger any compilation
         // setting this up.
         Method method = TestCodeSweeper.class.getDeclaredMethod(METHOD_NAME, new Class[] { RecordedEvent.class });
@@ -159,6 +180,7 @@ private static void provokeEvents() throws NoSuchMethodException, InterruptedExc
         for (Long blob : blobs) {
             WHITE_BOX.freeCodeBlob(blob);
         }
+        provocationEvent.commit();
     }
 
     private static void verifyFullEvent(RecordedEvent event) throws Throwable {

From 6a9a867d645b8fe86f4ca2b04a43bf5aa8f9d487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= <mgronlun@openjdk.org>
Date: Thu, 8 Aug 2024 14:38:46 +0000
Subject: [PATCH 351/401] 8337994: [REDO] Native memory leak when not recording
 any events

Reviewed-by: egahlin
---
 .../share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp   | 9 +++++++++
 .../share/jfr/recorder/service/jfrRecorderService.cpp    | 6 +-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
index 203ec3a3ec494..279b871d8181a 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
@@ -883,6 +883,15 @@ static void do_clds(CldWriter& cldw) {
   ModuleCldWriter mcw(&cldw);
   KlassAndModuleCldWriter kmcw(&kcw, &mcw);
   _artifacts->iterate_klasses(kmcw);
+  if (is_initial_typeset_for_chunk()) {
+    CldPtr bootloader = get_cld(Universe::boolArrayKlass());
+    assert(bootloader != nullptr, "invariant");
+    if (IS_NOT_SERIALIZED(bootloader)) {
+      write__cld(_writer, bootloader);
+      assert(IS_SERIALIZED(bootloader), "invariant");
+      cldw.add(1);
+    }
+  }
   _artifacts->tally(cldw);
 }
 
diff --git a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp
index fc2043a4d921d..0395b711c6521 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp
@@ -639,11 +639,7 @@ static void write_thread_local_buffer(JfrChunkWriter& chunkwriter, Thread* t) {
 
 size_t JfrRecorderService::flush() {
   size_t total_elements = flush_metadata(_chunkwriter);
-  const size_t storage_elements = flush_storage(_storage, _chunkwriter);
-  if (0 == storage_elements) {
-    return total_elements;
-  }
-  total_elements += storage_elements;
+  total_elements = flush_storage(_storage, _chunkwriter);
   if (_string_pool.is_modified()) {
     total_elements += flush_stringpool(_string_pool, _chunkwriter);
   }

From 78773b1769922611318243b6680d59518ed4e015 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Thu, 8 Aug 2024 15:52:17 +0000
Subject: [PATCH 352/401] 8338015: Fix "Java Java" typo in package info file of
 java.lang.classfile

Reviewed-by: jiefu, jpai, liach
---
 .../share/classes/java/lang/classfile/package-info.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/classfile/package-info.java b/src/java.base/share/classes/java/lang/classfile/package-info.java
index b5991b0e951b9..921cf9e1a3443 100644
--- a/src/java.base/share/classes/java/lang/classfile/package-info.java
+++ b/src/java.base/share/classes/java/lang/classfile/package-info.java
@@ -26,8 +26,8 @@
 /**
  * <h2>Provides classfile parsing, generation, and transformation library.</h2>
  * The {@code java.lang.classfile} package contains classes for reading, writing, and
- * modifying Java class files, as specified in Chapter {@jvms 4} of the <cite>Java
- * Java Virtual Machine Specification</cite>.
+ * modifying Java class files, as specified in Chapter {@jvms 4} of the
+ * <cite>Java Virtual Machine Specification</cite>.
  *
  * <h2>Reading classfiles</h2>
  * The main class for reading classfiles is {@link java.lang.classfile.ClassModel}; we

From 9695f09581bac856ad97943cca15c65dc21d2adf Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Thu, 8 Aug 2024 16:11:08 +0000
Subject: [PATCH 353/401] 8337683: Fix -Wconversion problem with arrayOop.hpp

Reviewed-by: stefank, dholmes
---
 src/hotspot/share/oops/arrayOop.hpp      | 18 +++++++++---------
 src/hotspot/share/runtime/atomic.hpp     |  5 +++--
 src/hotspot/share/utilities/byteswap.hpp |  3 ++-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/hotspot/share/oops/arrayOop.hpp b/src/hotspot/share/oops/arrayOop.hpp
index 0aa26500bd8d2..1ca8a9530a48c 100644
--- a/src/hotspot/share/oops/arrayOop.hpp
+++ b/src/hotspot/share/oops/arrayOop.hpp
@@ -68,10 +68,10 @@ class arrayOopDesc : public oopDesc {
   // The header is considered the oop part of this type plus the length.
   // This is not equivalent to sizeof(arrayOopDesc) which should not appear in the code.
   static int header_size_in_bytes() {
-    size_t hs = length_offset_in_bytes() + sizeof(int);
+    int hs = length_offset_in_bytes() + (int)sizeof(int);
 #ifdef ASSERT
     // make sure it isn't called before UseCompressedOops is initialized.
-    static size_t arrayoopdesc_hs = 0;
+    static int arrayoopdesc_hs = 0;
     if (arrayoopdesc_hs == 0) arrayoopdesc_hs = hs;
     assert(arrayoopdesc_hs == hs, "header size can't change");
 #endif // ASSERT
@@ -83,13 +83,13 @@ class arrayOopDesc : public oopDesc {
   // it occupies the second half of the _klass field in oopDesc.
   static int length_offset_in_bytes() {
     return UseCompressedClassPointers ? klass_gap_offset_in_bytes() :
-                               sizeof(arrayOopDesc);
+                               (int)sizeof(arrayOopDesc);
   }
 
   // Returns the offset of the first element.
   static int base_offset_in_bytes(BasicType type) {
-    size_t hs = header_size_in_bytes();
-    return (int)(element_type_should_be_aligned(type) ? align_up(hs, BytesPerLong) : hs);
+    int hs = header_size_in_bytes();
+    return element_type_should_be_aligned(type) ? align_up(hs, BytesPerLong) : hs;
   }
 
   // Returns the address of the first element. The elements in the array will not
@@ -134,14 +134,14 @@ class arrayOopDesc : public oopDesc {
     assert(type < T_CONFLICT, "wrong type");
     assert(type2aelembytes(type) != 0, "wrong type");
 
-    size_t hdr_size_in_bytes = base_offset_in_bytes(type);
+    int hdr_size_in_bytes = base_offset_in_bytes(type);
     // This is rounded-up and may overlap with the first array elements.
-    size_t hdr_size_in_words = align_up(hdr_size_in_bytes, HeapWordSize) / HeapWordSize;
+    int hdr_size_in_words = align_up(hdr_size_in_bytes, HeapWordSize) / HeapWordSize;
 
     const size_t max_element_words_per_size_t =
-      align_down((SIZE_MAX/HeapWordSize - hdr_size_in_words), MinObjAlignment);
+      align_down((SIZE_MAX/HeapWordSize - (size_t)hdr_size_in_words), MinObjAlignment);
     const size_t max_elements_per_size_t =
-      HeapWordSize * max_element_words_per_size_t / type2aelembytes(type);
+      HeapWordSize * max_element_words_per_size_t / (size_t)type2aelembytes(type);
     if ((size_t)max_jint < max_elements_per_size_t) {
       // It should be ok to return max_jint here, but parts of the code
       // (CollectedHeap, Klass::oop_oop_iterate(), and more) uses an int for
diff --git a/src/hotspot/share/runtime/atomic.hpp b/src/hotspot/share/runtime/atomic.hpp
index 399a78fd3fce1..bf198b5f5621f 100644
--- a/src/hotspot/share/runtime/atomic.hpp
+++ b/src/hotspot/share/runtime/atomic.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
 #include "runtime/orderAccess.hpp"
 #include "utilities/align.hpp"
 #include "utilities/bytes.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/macros.hpp"
 
 #include <type_traits>
@@ -1118,7 +1119,7 @@ inline T Atomic::CmpxchgByteUsingInt::operator()(T volatile* dest,
   uint8_t canon_compare_value = compare_value;
   volatile uint32_t* aligned_dest
     = reinterpret_cast<volatile uint32_t*>(align_down(dest, sizeof(uint32_t)));
-  size_t offset = pointer_delta(dest, aligned_dest, 1);
+  uint32_t offset = checked_cast<uint32_t>(pointer_delta(dest, aligned_dest, 1));
 
   uint32_t idx = (Endian::NATIVE == Endian::BIG)
                    ? (sizeof(uint32_t) - 1 - offset)
diff --git a/src/hotspot/share/utilities/byteswap.hpp b/src/hotspot/share/utilities/byteswap.hpp
index fba0775cf4992..9c3b53630b39b 100644
--- a/src/hotspot/share/utilities/byteswap.hpp
+++ b/src/hotspot/share/utilities/byteswap.hpp
@@ -26,6 +26,7 @@
 #define SHARE_UTILITIES_BYTESWAP_HPP
 
 #include "metaprogramming/enableIf.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 #include <cstddef>
@@ -63,7 +64,7 @@ struct ByteswapFallbackImpl;
 template <typename T>
 struct ByteswapFallbackImpl<T, 2> {
   inline constexpr uint16_t operator()(uint16_t x) const {
-    return (((x & UINT16_C(0x00ff)) << 8) | ((x & UINT16_C(0xff00)) >> 8));
+    return checked_cast<uint16_t>(((x & UINT16_C(0x00ff)) << 8) | ((x & UINT16_C(0xff00)) >> 8));
   }
 };
 

From 53c9f037fb2805aab5ab9729166ce7d5bc7a77f9 Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Thu, 8 Aug 2024 16:31:02 +0000
Subject: [PATCH 354/401] 8336849: Remove .llvm_addrsig section from JDK/VM
 static libraries (.a files)

Reviewed-by: ihse
---
 make/common/native/Link.gmk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/make/common/native/Link.gmk b/make/common/native/Link.gmk
index 2090218ffbb34..ca03c6ee6b12f 100644
--- a/make/common/native/Link.gmk
+++ b/make/common/native/Link.gmk
@@ -109,6 +109,11 @@ define CreateStaticLibrary
 	      $(if $$($1_LINK_OBJS_RELATIVE), $$(CD) $$(OUTPUTDIR) ; ) \
 	      $$($1_LD) $(LDFLAGS_CXX_PARTIAL_LINKING) $$($1_SYSROOT_LDFLAGS) \
 	          -o $$($1_TARGET_RELOCATABLE) $$($1_LD_OBJ_ARG))
+          # 'ld -r' might invalidate the .llvm_addrsig section, and this will cause subsequent
+          # calls to lld (with '-Wl,--icf=safe') to fail when linking with this library, so
+          # remove that section.
+	  $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_objcopy_remove_llvm_addrsig_section, \
+	      $$($1_OBJCOPY) --remove-section=.llvm_addrsig $$($1_TARGET_RELOCATABLE))
         endif
 	$$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_run_ar, \
 	    $(if $$($1_LINK_OBJS_RELATIVE), $$(CD) $$(OUTPUTDIR) ; ) \

From bfb75b96266f4c5840e2edea13f9aa2c801518cf Mon Sep 17 00:00:00 2001
From: Roger Riggs <rriggs@openjdk.org>
Date: Thu, 8 Aug 2024 16:53:38 +0000
Subject: [PATCH 355/401] 8336926: jdk/internal/util/ReferencedKeyTest.java can
 fail with ConcurrentModificationException

Reviewed-by: bpb, shade, dfuchs
---
 .../jdk/internal/util/ReferencedKeyMap.java        | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/util/ReferencedKeyMap.java b/src/java.base/share/classes/jdk/internal/util/ReferencedKeyMap.java
index 9c364cd781350..810d43ae38a3a 100644
--- a/src/java.base/share/classes/jdk/internal/util/ReferencedKeyMap.java
+++ b/src/java.base/share/classes/jdk/internal/util/ReferencedKeyMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -219,8 +219,14 @@ public boolean containsValue(Object value) {
 
     @Override
     public V get(Object key) {
-        Objects.requireNonNull(key, "key must not be null");
         removeStaleReferences();
+        return getNoCheckStale(key);
+    }
+
+    // Internal get(key) without removing stale references that would modify the keyset.
+    // Use when iterating or streaming over the keys to avoid ConcurrentModificationException.
+    private V getNoCheckStale(Object key) {
+        Objects.requireNonNull(key, "key must not be null");
         return map.get(lookupKey(key));
     }
 
@@ -291,7 +297,7 @@ public Collection<V> values() {
     public Set<Entry<K, V>> entrySet() {
         removeStaleReferences();
         return filterKeySet()
-                .map(k -> new AbstractMap.SimpleEntry<>(k, get(k)))
+                .map(k -> new AbstractMap.SimpleEntry<>(k, getNoCheckStale(k)))
                 .collect(Collectors.toSet());
     }
 
@@ -335,7 +341,7 @@ public V replace(K key, V value) {
     public String toString() {
         removeStaleReferences();
         return filterKeySet()
-                .map(k -> k + "=" + get(k))
+                .map(k -> k + "=" + getNoCheckStale(k))
                 .collect(Collectors.joining(", ", "{", "}"));
     }
 

From e7a0b5b09bcfcd8b09667e51ec588e206f0652ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= <mgronlun@openjdk.org>
Date: Thu, 8 Aug 2024 18:45:11 +0000
Subject: [PATCH 356/401] 8334780: Crash: assert(h_array_list.not_null())
 failed: invariant

Reviewed-by: egahlin, shade
---
 src/hotspot/share/jfr/support/jfrJdkJfrEvent.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/jfr/support/jfrJdkJfrEvent.cpp b/src/hotspot/share/jfr/support/jfrJdkJfrEvent.cpp
index cd47630228931..0c2fb0206ecee 100644
--- a/src/hotspot/share/jfr/support/jfrJdkJfrEvent.cpp
+++ b/src/hotspot/share/jfr/support/jfrJdkJfrEvent.cpp
@@ -136,7 +136,9 @@ jobject JdkJfrEvent::get_all_klasses(TRAPS) {
   transform_klasses_to_local_jni_handles(event_subklasses, THREAD);
 
   Handle h_array_list(THREAD, new_java_util_arraylist(THREAD));
-  assert(h_array_list.not_null(), "invariant");
+  if (h_array_list.is_null()) {
+    return empty_java_util_arraylist;
+  }
 
   static const char add_method_name[] = "add";
   static const char add_method_signature[] = "(Ljava/lang/Object;)Z";

From 9f08a01cb6ebb08f67749aabdff4efaedfaf3228 Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Thu, 8 Aug 2024 19:47:50 +0000
Subject: [PATCH 357/401] 8338010: WB_IsFrameDeoptimized miss ResourceMark

Reviewed-by: dholmes, shade
---
 src/hotspot/share/prims/whitebox.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index 6ee33a6107998..544eeabb5c212 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -799,6 +799,7 @@ WB_END
 WB_ENTRY(jboolean, WB_IsFrameDeoptimized(JNIEnv* env, jobject o, jint depth))
   bool result = false;
   if (thread->has_last_Java_frame()) {
+    ResourceMark rm(THREAD);
     RegisterMap reg_map(thread,
                         RegisterMap::UpdateMap::include,
                         RegisterMap::ProcessFrames::include,

From 55c509708e9b89a7609fd41b6e5a271f250bbacd Mon Sep 17 00:00:00 2001
From: Jiawei Tang <jwtang@openjdk.org>
Date: Fri, 9 Aug 2024 02:29:15 +0000
Subject: [PATCH 358/401] 8337331: crash: pinned virtual thread will lead to
 jvm crash when running with the javaagent option

Reviewed-by: dholmes, sspitsyn
---
 src/hotspot/share/prims/jvmtiExport.cpp       | 10 +--
 .../TestPinCaseWithCFLH.java                  | 77 +++++++++++++++++++
 2 files changed, 82 insertions(+), 5 deletions(-)
 create mode 100644 test/hotspot/jtreg/serviceability/jvmti/vthread/TestPinCaseWithCFLH/TestPinCaseWithCFLH.java

diff --git a/src/hotspot/share/prims/jvmtiExport.cpp b/src/hotspot/share/prims/jvmtiExport.cpp
index f79116f5ebeb0..95cc54d93134f 100644
--- a/src/hotspot/share/prims/jvmtiExport.cpp
+++ b/src/hotspot/share/prims/jvmtiExport.cpp
@@ -929,9 +929,8 @@ class JvmtiClassFileLoadHookPoster : public StackObj {
     _cached_class_file_ptr = cache_ptr;
     _has_been_modified = false;
 
-    if (_thread->is_in_any_VTMS_transition()) {
-      return; // no events should be posted if thread is in any VTMS transition
-    }
+    assert(!_thread->is_in_any_VTMS_transition(), "CFLH events are not allowed in any VTMS transition");
+
     _state = JvmtiExport::get_jvmti_thread_state(_thread);
     if (_state != nullptr) {
       _class_being_redefined = _state->get_class_being_redefined();
@@ -1091,8 +1090,9 @@ bool JvmtiExport::post_class_file_load_hook(Symbol* h_name,
   if (JvmtiEnv::get_phase() < JVMTI_PHASE_PRIMORDIAL) {
     return false;
   }
-  if (JavaThread::current()->is_in_tmp_VTMS_transition()) {
-    return false; // skip CFLH events in tmp VTMS transition
+
+  if (JavaThread::current()->is_in_any_VTMS_transition()) {
+    return false; // no events should be posted if thread is in any VTMS transition
   }
 
   JvmtiClassFileLoadHookPoster poster(h_name, class_loader,
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/TestPinCaseWithCFLH/TestPinCaseWithCFLH.java b/test/hotspot/jtreg/serviceability/jvmti/vthread/TestPinCaseWithCFLH/TestPinCaseWithCFLH.java
new file mode 100644
index 0000000000000..02755a0289fc1
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/TestPinCaseWithCFLH/TestPinCaseWithCFLH.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.lang.instrument.ClassFileTransformer;
+import java.lang.instrument.IllegalClassFormatException;
+import java.lang.instrument.Instrumentation;
+import java.security.ProtectionDomain;
+import jdk.test.lib.thread.VThreadPinner;
+
+/*
+ * @test
+ * @summary javaagent + tracePinnedThreads will cause jvm crash/ run into deadlock when the virtual thread is pinned
+ * @library /test/lib
+ * @requires vm.continuations
+ * @requires vm.jvmti
+ * @modules java.base/java.lang:+open
+ * @compile TestPinCaseWithCFLH.java
+ * @build jdk.test.lib.Utils
+ * @run driver jdk.test.lib.util.JavaAgentBuilder
+ *             TestPinCaseWithCFLH TestPinCaseWithCFLH.jar
+ * @run main/othervm/timeout=100  -Djdk.virtualThreadScheduler.maxPoolSize=1
+ *       -Djdk.tracePinnedThreads=full --enable-native-access=ALL-UNNAMED
+ *       -javaagent:TestPinCaseWithCFLH.jar TestPinCaseWithCFLH
+ */
+public class TestPinCaseWithCFLH {
+
+    public static class TestClassFileTransformer implements ClassFileTransformer {
+        public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined,
+                                ProtectionDomain protectionDomain, byte[] classfileBuffer)
+                                throws IllegalClassFormatException {
+            return classfileBuffer;
+        }
+    }
+
+    // Called when agent is loaded at startup
+    public static void premain(String agentArgs, Instrumentation instrumentation) throws Exception {
+        instrumentation.addTransformer(new TestClassFileTransformer());
+    }
+
+    private static int result = 0;
+
+    public static void main(String[] args) throws Exception{
+        Thread t1 = Thread.ofVirtual().name("vthread-1").start(() -> {
+            VThreadPinner.runPinned(() -> {
+                try {
+                    // try yield, will pin,
+                    // javaagent + tracePinnedThreads should not lead to crash
+                    // (because of the class `PinnedThreadPrinter`)
+                    Thread.sleep(500);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            });
+        });
+        t1.join();
+    }
+
+}
\ No newline at end of file

From 0c1e9111d226b601236b9826e27ecc67a8b625fb Mon Sep 17 00:00:00 2001
From: Gui Cao <gcao@openjdk.org>
Date: Fri, 9 Aug 2024 02:59:37 +0000
Subject: [PATCH 359/401] 8338019: Fix simple -Wzero-as-null-pointer-constant
 warnings in riscv code

Reviewed-by: fyang, mli, luhenry
---
 src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp | 2 +-
 src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp     | 2 +-
 src/hotspot/cpu/riscv/frame_riscv.cpp           | 2 +-
 src/hotspot/cpu/riscv/nativeInst_riscv.cpp      | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
index 798679185d3a2..3d146b87707aa 100644
--- a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
@@ -542,7 +542,7 @@ void LIR_Assembler::const2mem(LIR_Opr src, LIR_Opr dest, BasicType type, CodeEmi
       insn = &MacroAssembler::sw; break;
     case T_OBJECT:    // fall through
     case T_ARRAY:
-      assert(c->as_jobject() == 0, "should be");
+      assert(c->as_jobject() == nullptr, "should be");
       if (UseCompressedOops && !wide) {
         insn = &MacroAssembler::sw;
       } else {
diff --git a/src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp b/src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp
index 9fa8939837a85..e999b703b3e7b 100644
--- a/src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp
@@ -1066,4 +1066,4 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) {
 
 #undef __
 
-const char *Runtime1::pd_name_for_address(address entry) { Unimplemented(); return 0; }
+const char *Runtime1::pd_name_for_address(address entry) { Unimplemented(); }
diff --git a/src/hotspot/cpu/riscv/frame_riscv.cpp b/src/hotspot/cpu/riscv/frame_riscv.cpp
index 32825a02c5eac..96dca4704ad95 100644
--- a/src/hotspot/cpu/riscv/frame_riscv.cpp
+++ b/src/hotspot/cpu/riscv/frame_riscv.cpp
@@ -269,7 +269,7 @@ void frame::patch_pc(Thread* thread, address pc) {
 
   // Either the return address is the original one or we are going to
   // patch in the same address that's already there.
-  assert(_pc == pc_old || pc == pc_old || pc_old == 0, "must be");
+  assert(_pc == pc_old || pc == pc_old || pc_old == nullptr, "must be");
   DEBUG_ONLY(address old_pc = _pc;)
   *pc_addr = pc;
   _pc = pc; // must be set before call to get_deopt_original_pc
diff --git a/src/hotspot/cpu/riscv/nativeInst_riscv.cpp b/src/hotspot/cpu/riscv/nativeInst_riscv.cpp
index f0357f1cd3029..6c9e0986869b6 100644
--- a/src/hotspot/cpu/riscv/nativeInst_riscv.cpp
+++ b/src/hotspot/cpu/riscv/nativeInst_riscv.cpp
@@ -685,7 +685,7 @@ address NativeJump::jump_destination() const {
   // load
 
   // return -1 if jump to self or to 0
-  if ((dest == (address) this) || dest == 0) {
+  if ((dest == (address) this) || dest == nullptr) {
     dest = (address) -1;
   }
 
@@ -714,7 +714,7 @@ address NativeGeneralJump::jump_destination() const {
   // a general jump
 
   // return -1 if jump to self or to 0
-  if ((dest == (address) this) || dest == 0) {
+  if ((dest == (address) this) || dest == nullptr) {
     dest = (address) -1;
   }
 

From 9ab8c6b9ba90ffd12600a250c8704571e9feb78d Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhiscxk@openjdk.org>
Date: Fri, 9 Aug 2024 05:09:27 +0000
Subject: [PATCH 360/401] 8335130: The test
 "javax/swing/plaf/synth/ComponentsOrientationSupport/5033822/bug5033822.java"
 fails because the background color of the tabs is displayed incorrectly.

Reviewed-by: achung, psadhukhan
---
 .../sun/java/swing/plaf/gtk/GTKPainter.java   | 34 ++++++++--------
 .../swing/plaf/nimbus/SynthPainterImpl.java   | 39 ++++++++++---------
 .../swing/plaf/synth/SynthTabbedPaneUI.java   |  8 +---
 3 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java
index 4787696a367eb..ea27a2a6e0d9b 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java
@@ -935,25 +935,27 @@ public void paintTabbedPaneTabBackground(SynthContext context,
                                            Graphics g,
                                            int x, int y, int w, int h,
                                            int tabIndex) {
-        Region id = context.getRegion();
-        int state = context.getComponentState();
-        int gtkState = ((state & SynthConstants.SELECTED) != 0 ?
-            SynthConstants.ENABLED : SynthConstants.PRESSED);
         JTabbedPane pane = (JTabbedPane)context.getComponent();
-        int placement = pane.getTabPlacement();
+        if (UIManager.getBoolean("TabbedPane.tabsOpaque") || pane.isOpaque()) {
+            Region id = context.getRegion();
+            int state = context.getComponentState();
+            int gtkState = ((state & SynthConstants.SELECTED) != 0 ?
+                    SynthConstants.ENABLED : SynthConstants.PRESSED);
+            int placement = pane.getTabPlacement();
 
-        // Fill the tab rect area
-        g.fillRect(x, y, w, h);
+            // Fill the tab rect area
+            g.fillRect(x, y, w, h);
 
-        synchronized (UNIXToolkit.GTK_LOCK) {
-            if (! ENGINE.paintCachedImage(g, x, y, w, h,
-                    id, gtkState, placement, tabIndex)) {
-                PositionType side = POSITIONS[placement - 1];
-                ENGINE.startPainting(g, x, y, w, h,
-                        id, gtkState, placement, tabIndex);
-                ENGINE.paintExtension(g, context, id, gtkState,
-                        ShadowType.OUT, "tab", x, y, w, h, side, tabIndex);
-                ENGINE.finishPainting();
+            synchronized (UNIXToolkit.GTK_LOCK) {
+                if (!ENGINE.paintCachedImage(g, x, y, w, h,
+                        id, gtkState, placement, tabIndex)) {
+                    PositionType side = POSITIONS[placement - 1];
+                    ENGINE.startPainting(g, x, y, w, h,
+                            id, gtkState, placement, tabIndex);
+                    ENGINE.paintExtension(g, context, id, gtkState,
+                            ShadowType.OUT, "tab", x, y, w, h, side, tabIndex);
+                    ENGINE.finishPainting();
+                }
             }
         }
     }
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/SynthPainterImpl.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/SynthPainterImpl.java
index c990c968ff6fa..9dfd422f6dddb 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/SynthPainterImpl.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/SynthPainterImpl.java
@@ -2098,24 +2098,27 @@ public void paintTabbedPaneTabBackground(SynthContext context, Graphics g,
     public void paintTabbedPaneTabBackground(SynthContext context, Graphics g,
                                          int x, int y, int w, int h,
                                          int tabIndex, int orientation) {
-        if (orientation == JTabbedPane.LEFT) {
-            AffineTransform transform = new AffineTransform();
-            transform.scale(-1, 1);
-            transform.rotate(Math.toRadians(90));
-            paintBackground(context, g, y, x, h, w, transform);
-        } else if (orientation == JTabbedPane.RIGHT) {
-            AffineTransform transform = new AffineTransform();
-            transform.rotate(Math.toRadians(90));
-            transform.translate(0, -(x + w));
-            paintBackground(context, g, y, 0, h, w, transform);
-        } else if (orientation == JTabbedPane.BOTTOM) {
-            AffineTransform transform = new AffineTransform();
-            transform.translate(x,y);
-            transform.scale(1, -1);
-            transform.translate(0,-h);
-            paintBackground(context, g, 0, 0, w, h, transform);
-        } else {
-            paintBackground(context, g, x, y, w, h, null);
+        JTabbedPane pane = (JTabbedPane)context.getComponent();
+        if (UIManager.getBoolean("TabbedPane.tabsOpaque") || pane.isOpaque()) {
+            if (orientation == JTabbedPane.LEFT) {
+                AffineTransform transform = new AffineTransform();
+                transform.scale(-1, 1);
+                transform.rotate(Math.toRadians(90));
+                paintBackground(context, g, y, x, h, w, transform);
+            } else if (orientation == JTabbedPane.RIGHT) {
+                AffineTransform transform = new AffineTransform();
+                transform.rotate(Math.toRadians(90));
+                transform.translate(0, -(x + w));
+                paintBackground(context, g, y, 0, h, w, transform);
+            } else if (orientation == JTabbedPane.BOTTOM) {
+                AffineTransform transform = new AffineTransform();
+                transform.translate(x, y);
+                transform.scale(1, -1);
+                transform.translate(0, -h);
+                paintBackground(context, g, 0, 0, w, h, transform);
+            } else {
+                paintBackground(context, g, x, y, w, h, null);
+            }
         }
     }
 
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java
index 837c4d8298f9e..3378ef9e8b3de 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java
@@ -127,7 +127,6 @@ public class SynthTabbedPaneUI extends BasicTabbedPaneUI
     // Background color for unselected tabs
     private Color unselectedBackground;
     private boolean contentOpaque = true;
-    private boolean tabsOpaque = true;
 
     /**
      *
@@ -156,7 +155,6 @@ private boolean scrollableTabLayoutEnabled() {
     protected void installDefaults() {
         selectColor = UIManager.getColor("TabbedPane.selected");
         contentOpaque = UIManager.getBoolean("TabbedPane.contentOpaque");
-        tabsOpaque = UIManager.getBoolean("TabbedPane.tabsOpaque");
         unselectedBackground = UIManager.getColor("TabbedPane.unselectedBackground");
         updateStyle(tabPane);
     }
@@ -655,10 +653,8 @@ private void paintTab(SynthContext ss, Graphics g,
             g.setColor(getUnselectedBackgroundAt(tabIndex));
         }
 
-        if (tabsOpaque || tabPane.isOpaque()) {
-            tabContext.getPainter().paintTabbedPaneTabBackground(tabContext, g,
-                    x, y, width, height, tabIndex, placement);
-        }
+        tabContext.getPainter().paintTabbedPaneTabBackground(tabContext, g,
+                x, y, width, height, tabIndex, placement);
         tabContext.getPainter().paintTabbedPaneTabBorder(tabContext, g,
                 x, y, width, height, tabIndex, placement);
 

From 00aac4097abd3c5e6144734cfd44228bc31892fb Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Fri, 9 Aug 2024 06:26:22 +0000
Subject: [PATCH 361/401] 8338058: map_or_reserve_memory_aligned Windows
 enhance remap assertion

Reviewed-by: mdoerr, clanger
---
 src/hotspot/os/windows/os_windows.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index 1cc7d9aa33adf..65ba13b0d9e81 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -3463,6 +3463,7 @@ static char* map_or_reserve_memory_aligned(size_t size, size_t alignment, int fi
   }
 
   assert(aligned_base != nullptr, "Did not manage to re-map after %d attempts?", max_attempts);
+  assert(aligned_base != nullptr, "Did not manage to re-map after %d attempts (size %zu, alignment %zu, file descriptor %d)", max_attempts, size, alignment, file_desc);
 
   return aligned_base;
 }

From c01f53ac2dab1d4d2cd1e4d45a67f9373d4a9c7e Mon Sep 17 00:00:00 2001
From: Christian Hagedorn <chagedorn@openjdk.org>
Date: Fri, 9 Aug 2024 07:17:59 +0000
Subject: [PATCH 362/401] 8337876: [IR Framework] Add support for IR tests with
 @Stable

Reviewed-by: shade, kvn
---
 .../jtreg/compiler/lib/ir_framework/README.md | 11 ++-
 .../lib/ir_framework/TestFramework.java       | 13 +++-
 .../ir_framework/driver/TestVMProcess.java    | 15 ++--
 .../tests/TestPhaseIRMatching.java            |  2 +-
 .../tests/TestPrivilegedMode.java             | 69 +++++++++++++++++++
 5 files changed, 103 insertions(+), 7 deletions(-)
 create mode 100644 test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPrivilegedMode.java

diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/README.md b/test/hotspot/jtreg/compiler/lib/ir_framework/README.md
index 3f6e0d4163faa..55d9fcbaecead 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/README.md
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/README.md
@@ -157,7 +157,16 @@ The framework allows the use of additional compiler control annotations for help
 - [@ForceCompile](./ForceCompile.java)
 - [@ForceCompileClassInitializer](./ForceCompileClassInitializer.java)
 
-### 2.5 Framework Debug and Stress Flags
+### 2.5 IR Tests with Privileged Classes
+To run tests in a privileged mode (e.g. when using `@Stable`, `@Contended`, `@ReservedStackAccess` etc.), one need to add the test classes to the boot classpath. This can easily be achieved by calling `TestFramework.addTestClassesToBootClassPath()` on the test framework object:
+```
+TestFramework testFramework = new TestFramework();
+testFramework
+        .addTestClassesToBootClassPath()
+        .start();
+```
+
+### 2.6 Framework Debug and Stress Flags
 The framework provides various stress and debug flags. They should mainly be used as JTreg VM and/or Javaoptions (apart from `VerifyIR`). The following (property) flags are supported:
 
 - `-DVerifyIR=false`: Explicitly disable IR verification. This is useful, for example, if some scenarios use VM flags that let `@IR` annotation rules fail and the user does not want to provide separate IR rules or add flag preconditions to the already existing IR rules.
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java b/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java
index 67fadbc4eac31..d477aa44763fa 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java
@@ -172,6 +172,7 @@ public class TestFramework {
     private Set<Integer> scenarioIndices;
     private List<String> flags;
     private int defaultWarmup = -1;
+    private boolean testClassesOnBootClassPath;
 
     /*
      * Public interface methods
@@ -323,6 +324,15 @@ public TestFramework addScenarios(Scenario... scenarios) {
         return this;
     }
 
+    /**
+     * Add test classes to boot classpath. This adds all classes found on path {@link jdk.test.lib.Utils#TEST_CLASSES}
+     * to the boot classpath with "-Xbootclasspath/a". This is useful when trying to run tests in a privileged mode.
+     */
+    public TestFramework addTestClassesToBootClassPath() {
+        this.testClassesOnBootClassPath = true;
+        return this;
+    }
+
     /**
      * Start the testing of the implicitly (by {@link #TestFramework()}) or explicitly (by {@link #TestFramework(Class)})
      * set test class.
@@ -744,7 +754,8 @@ private boolean onlyWhitelistedJTregVMAndJavaOptsFlags() {
     }
 
     private void runTestVM(List<String> additionalFlags) {
-        TestVMProcess testVMProcess = new TestVMProcess(additionalFlags, testClass, helperClasses, defaultWarmup);
+        TestVMProcess testVMProcess = new TestVMProcess(additionalFlags, testClass, helperClasses, defaultWarmup,
+                                                        testClassesOnBootClassPath);
         if (shouldVerifyIR) {
             try {
                 TestClassParser testClassParser = new TestClassParser(testClass);
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/TestVMProcess.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/TestVMProcess.java
index 04f8096d96917..8c168b73260cf 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/TestVMProcess.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/TestVMProcess.java
@@ -34,6 +34,7 @@
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 
+import java.io.File;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -63,11 +64,12 @@ public class TestVMProcess {
     private OutputAnalyzer oa;
     private String irEncoding;
 
-    public TestVMProcess(List<String> additionalFlags, Class<?> testClass, Set<Class<?>> helperClasses, int defaultWarmup) {
+    public TestVMProcess(List<String> additionalFlags, Class<?> testClass, Set<Class<?>> helperClasses, int defaultWarmup,
+                         boolean testClassesOnBootClassPath) {
         this.cmds = new ArrayList<>();
         TestFrameworkSocket socket = new TestFrameworkSocket();
         try (socket) {
-            prepareTestVMFlags(additionalFlags, socket, testClass, helperClasses, defaultWarmup);
+            prepareTestVMFlags(additionalFlags, socket, testClass, helperClasses, defaultWarmup, testClassesOnBootClassPath);
             start();
         }
         processSocketOutput(socket);
@@ -91,11 +93,16 @@ public static String getLastTestVMOutput() {
     }
 
     private void prepareTestVMFlags(List<String> additionalFlags, TestFrameworkSocket socket, Class<?> testClass,
-                                    Set<Class<?>> helperClasses, int defaultWarmup) {
+                                    Set<Class<?>> helperClasses, int defaultWarmup, boolean testClassesOnBootClassPath) {
         // Set java.library.path so JNI tests which rely on jtreg nativepath setting work
         cmds.add("-Djava.library.path=" + Utils.TEST_NATIVE_PATH);
         // Need White Box access in test VM.
-        cmds.add("-Xbootclasspath/a:.");
+        String bootClassPath = "-Xbootclasspath/a:.";
+        if (testClassesOnBootClassPath) {
+            // Add test classes themselves to boot classpath to make them privileged.
+            bootClassPath += File.pathSeparator + Utils.TEST_CLASSES;
+        }
+        cmds.add(bootClassPath);
         cmds.add("-XX:+UnlockDiagnosticVMOptions");
         cmds.add("-XX:+WhiteBoxAPI");
         // Ignore CompileCommand flags which have an impact on the profiling information.
diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPhaseIRMatching.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPhaseIRMatching.java
index 9a39fb5310f35..f0056ebc79da9 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPhaseIRMatching.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPhaseIRMatching.java
@@ -66,7 +66,7 @@ private static void run(Class<?> testClass) {
         List<String> noAdditionalFlags = new ArrayList<>();
         FlagVMProcess flagVMProcess = new FlagVMProcess(testClass, noAdditionalFlags);
         List<String> testVMFlags = flagVMProcess.getTestVMFlags();
-        TestVMProcess testVMProcess = new TestVMProcess(testVMFlags, testClass, null, -1);
+        TestVMProcess testVMProcess = new TestVMProcess(testVMFlags, testClass, null, -1, false);
         TestClassParser testClassParser = new TestClassParser(testClass);
         Matchable testClassMatchable = testClassParser.parse(testVMProcess.getHotspotPidFileName(),
                                                              testVMProcess.getIrEncoding());
diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPrivilegedMode.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPrivilegedMode.java
new file mode 100644
index 0000000000000..347b2eb39fbfc
--- /dev/null
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPrivilegedMode.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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.
+ */
+
+package ir_framework.tests;
+
+import compiler.lib.ir_framework.*;
+import compiler.lib.ir_framework.driver.irmatching.IRViolationException;
+
+import jdk.internal.vm.annotation.Stable;
+import jdk.test.lib.Asserts;
+
+/*
+ * @test
+ * @requires vm.flagless
+ * @summary Test that IR framework successfully adds test class to boot classpath in order to run in privileged mode.
+ * @modules java.base/jdk.internal.vm.annotation
+ * @library /test/lib /
+ * @run driver ir_framework.tests.TestPrivilegedMode
+ */
+
+public class TestPrivilegedMode {
+    static @Stable int iFld; // Treated as constant after first being set.
+
+    public static void main(String[] args) {
+        try {
+            TestFramework.run();
+            Asserts.fail("should not reach");
+        } catch (IRViolationException e) {
+            // Without adding test class to boot classpath, we fail to replace the field load by a constant.
+            Asserts.assertTrue(e.getExceptionInfo().contains("Matched forbidden node"));
+            Asserts.assertTrue(e.getExceptionInfo().contains("LoadI"));
+        }
+
+        // When adding the test class to the boot classpath, we can replace the field load by a constant.
+        new TestFramework().addTestClassesToBootClassPath().start();
+    }
+
+    @Test
+    @Arguments(setup = "setup")
+    @IR(failOn = IRNode.LOAD_I)
+    public int test() {
+        return iFld;
+    }
+
+    @Setup
+    public void setup() {
+        iFld = 34;
+    }
+}

From 82d5768c1bdccfaf97a41f32a8bfcfd03a0fb378 Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Fri, 9 Aug 2024 07:20:01 +0000
Subject: [PATCH 363/401] 8337840: Remove redundant null check in
 ObjectOutputStream.writeProxyDesc

Reviewed-by: rriggs
---
 src/java.base/share/classes/java/io/ObjectOutputStream.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/io/ObjectOutputStream.java b/src/java.base/share/classes/java/io/ObjectOutputStream.java
index 2dcf174cf5399..3650b10135356 100644
--- a/src/java.base/share/classes/java/io/ObjectOutputStream.java
+++ b/src/java.base/share/classes/java/io/ObjectOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1272,7 +1272,7 @@ private void writeProxyDesc(ObjectStreamClass desc, boolean unshared)
         }
 
         bout.setBlockDataMode(true);
-        if (cl != null && isCustomSubclass()) {
+        if (isCustomSubclass()) {
             ReflectUtil.checkPackageAccess(cl);
         }
         annotateProxyClass(cl);

From f74109bd178c92a9dff1ca6fce03b25f51a0384f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <joel.sikstrom@oracle.com>
Date: Fri, 9 Aug 2024 07:29:56 +0000
Subject: [PATCH 364/401] 8337939: ZGC: Make assertions and checks less
 convoluted and explicit

Reviewed-by: stefank, ayang, eosterlund
---
 src/hotspot/share/gc/z/zAddress.cpp           |  6 ++--
 src/hotspot/share/gc/z/zAddress.inline.hpp    | 30 +++++++++++++++----
 src/hotspot/share/gc/z/zBarrier.inline.hpp    |  6 ++--
 src/hotspot/share/gc/z/zBarrierSet.inline.hpp |  4 +--
 src/hotspot/share/gc/z/zHeapIterator.cpp      |  2 +-
 src/hotspot/share/gc/z/zMark.cpp              |  4 +--
 src/hotspot/share/gc/z/zMark.inline.hpp       |  4 +--
 src/hotspot/share/gc/z/zPage.inline.hpp       |  2 +-
 .../share/gc/z/zReferenceProcessor.cpp        |  4 +--
 src/hotspot/share/gc/z/zVerify.cpp            | 24 +++++++++------
 10 files changed, 55 insertions(+), 31 deletions(-)

diff --git a/src/hotspot/share/gc/z/zAddress.cpp b/src/hotspot/share/gc/z/zAddress.cpp
index d1c199fad070c..1cd33e44a05d1 100644
--- a/src/hotspot/share/gc/z/zAddress.cpp
+++ b/src/hotspot/share/gc/z/zAddress.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -93,9 +93,7 @@ static void initialize_check_oop_function() {
 #ifdef CHECK_UNHANDLED_OOPS
   if (ZVerifyOops) {
     // Enable extra verification of usages of oops in oopsHierarchy.hpp
-    check_oop_function = [](oopDesc* obj) {
-      (void)to_zaddress(obj);
-    };
+    check_oop_function = &check_is_valid_zaddress;
   }
 #endif
 }
diff --git a/src/hotspot/share/gc/z/zAddress.inline.hpp b/src/hotspot/share/gc/z/zAddress.inline.hpp
index 4adbf50bc86c6..bbc92a7e2aaf3 100644
--- a/src/hotspot/share/gc/z/zAddress.inline.hpp
+++ b/src/hotspot/share/gc/z/zAddress.inline.hpp
@@ -333,10 +333,22 @@ inline void dereferenceable_test(zaddress addr) {
 }
 #endif
 
-inline zaddress to_zaddress(uintptr_t value) {
-  const zaddress addr = zaddress(value);
+inline void check_is_valid_zaddress(zaddress addr) {
   assert_is_valid(addr);
   DEBUG_ONLY(dereferenceable_test(addr));
+}
+
+inline void check_is_valid_zaddress(uintptr_t value) {
+  check_is_valid_zaddress(zaddress(value));
+}
+
+inline void check_is_valid_zaddress(oopDesc* o) {
+  check_is_valid_zaddress(uintptr_t(o));
+}
+
+inline zaddress to_zaddress(uintptr_t value) {
+  const zaddress addr = zaddress(value);
+  check_is_valid_zaddress(addr);
   return addr;
 }
 
@@ -344,7 +356,7 @@ inline zaddress to_zaddress(oopDesc* o) {
   return to_zaddress(uintptr_t(o));
 }
 
-inline oop to_oop(zaddress addr) {
+inline void assert_is_oop_or_null(zaddress addr) {
   const oop obj = cast_to_oop(addr);
   assert(!ZVerifyOops || oopDesc::is_oop_or_null(obj), "Broken oop: " PTR_FORMAT " [" PTR_FORMAT " " PTR_FORMAT " " PTR_FORMAT " " PTR_FORMAT "]",
          p2i(obj),
@@ -352,7 +364,16 @@ inline oop to_oop(zaddress addr) {
          *(uintptr_t*)(untype(addr) + 0x08),
          *(uintptr_t*)(untype(addr) + 0x10),
          *(uintptr_t*)(untype(addr) + 0x18));
-  return obj;
+}
+
+inline void assert_is_oop(zaddress addr) {
+  assert(!is_null(addr), "Should not be null");
+  assert_is_oop_or_null(addr);
+}
+
+inline oop to_oop(zaddress addr) {
+  assert_is_oop_or_null(addr);
+  return cast_to_oop(addr);
 }
 
 inline zaddress operator+(zaddress addr, size_t size) {
@@ -378,7 +399,6 @@ inline void assert_is_valid(zaddress_unsafe addr) {
   DEBUG_ONLY(is_valid(addr, true /* assert_on_failure */);)
 }
 
-
 inline uintptr_t untype(zaddress_unsafe addr) {
   return static_cast<uintptr_t>(addr);
 }
diff --git a/src/hotspot/share/gc/z/zBarrier.inline.hpp b/src/hotspot/share/gc/z/zBarrier.inline.hpp
index b3191e9ae3f7a..a3eb7a9ca67d6 100644
--- a/src/hotspot/share/gc/z/zBarrier.inline.hpp
+++ b/src/hotspot/share/gc/z/zBarrier.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -745,7 +745,7 @@ inline void ZBarrier::mark_and_remember(volatile zpointer* p, zaddress addr) {
 
 template <bool resurrect, bool gc_thread, bool follow, bool finalizable>
 inline void ZBarrier::mark(zaddress addr) {
-  assert(!ZVerifyOops || oopDesc::is_oop(to_oop(addr), false), "must be oop");
+  assert_is_oop(addr);
 
   if (ZHeap::heap()->is_old(addr)) {
     ZGeneration::old()->mark_object_if_active<resurrect, gc_thread, follow, finalizable>(addr);
@@ -757,7 +757,7 @@ inline void ZBarrier::mark(zaddress addr) {
 template <bool resurrect, bool gc_thread, bool follow>
 inline void ZBarrier::mark_young(zaddress addr) {
   assert(ZGeneration::young()->is_phase_mark(), "Should only be called during marking");
-  assert(!ZVerifyOops || oopDesc::is_oop(to_oop(addr), false), "must be oop");
+  assert_is_oop(addr);
   assert(ZHeap::heap()->is_young(addr), "Must be young");
 
   ZGeneration::young()->mark_object<resurrect, gc_thread, follow, ZMark::Strong>(addr);
diff --git a/src/hotspot/share/gc/z/zBarrierSet.inline.hpp b/src/hotspot/share/gc/z/zBarrierSet.inline.hpp
index d53b69345dd98..174cdfd9e909d 100644
--- a/src/hotspot/share/gc/z/zBarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/z/zBarrierSet.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -430,7 +430,7 @@ class ZLoadBarrierOopClosure : public BasicOopIterateClosure {
 
 template <DecoratorSet decorators, typename BarrierSetT>
 inline void ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::clone_in_heap(oop src, oop dst, size_t size) {
-  assert_is_valid(to_zaddress(src));
+  check_is_valid_zaddress(src);
 
   if (dst->is_objArray()) {
     // Cloning an object array is similar to performing array copy.
diff --git a/src/hotspot/share/gc/z/zHeapIterator.cpp b/src/hotspot/share/gc/z/zHeapIterator.cpp
index 50fc921131fe7..e149a976add92 100644
--- a/src/hotspot/share/gc/z/zHeapIterator.cpp
+++ b/src/hotspot/share/gc/z/zHeapIterator.cpp
@@ -146,7 +146,7 @@ class ZHeapIteratorUncoloredRootOopClosure : public OopClosure {
 
   oop load_oop(oop* p) {
     const oop o = Atomic::load(p);
-    assert_is_valid(to_zaddress(o));
+    check_is_valid_zaddress(o);
     return RawAccess<>::oop_load(p);
   }
 
diff --git a/src/hotspot/share/gc/z/zMark.cpp b/src/hotspot/share/gc/z/zMark.cpp
index eb342495f5799..d33b86c83e57c 100644
--- a/src/hotspot/share/gc/z/zMark.cpp
+++ b/src/hotspot/share/gc/z/zMark.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -365,7 +365,7 @@ void ZMark::follow_array_object(objArrayOop obj, bool finalizable) {
   }
 
   // Should be convertible to colorless oop
-  assert_is_valid(to_zaddress(obj));
+  check_is_valid_zaddress(obj);
 
   zpointer* const addr = (zpointer*)obj->base();
   const size_t length = (size_t)obj->length();
diff --git a/src/hotspot/share/gc/z/zMark.inline.hpp b/src/hotspot/share/gc/z/zMark.inline.hpp
index b530259361027..9edc57a60002e 100644
--- a/src/hotspot/share/gc/z/zMark.inline.hpp
+++ b/src/hotspot/share/gc/z/zMark.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@
 
 template <bool resurrect, bool gc_thread, bool follow, bool finalizable>
 inline void ZMark::mark_object(zaddress addr) {
-  assert(!ZVerifyOops || oopDesc::is_oop(to_oop(addr)), "Should be oop");
+  assert_is_oop(addr);
 
   ZPage* const page = _page_table->get(addr);
   if (page->is_allocating()) {
diff --git a/src/hotspot/share/gc/z/zPage.inline.hpp b/src/hotspot/share/gc/z/zPage.inline.hpp
index fcf69c685f7b6..d8ecad571907c 100644
--- a/src/hotspot/share/gc/z/zPage.inline.hpp
+++ b/src/hotspot/share/gc/z/zPage.inline.hpp
@@ -311,7 +311,7 @@ inline bool ZPage::mark_object(zaddress addr, bool finalizable, bool& inc_live)
   assert(is_in(addr), "Invalid address");
 
   // Verify oop
-  (void)to_oop(addr);
+  assert_is_oop(addr);
 
   // Set mark bit
   const BitMap::idx_t index = bit_index(addr);
diff --git a/src/hotspot/share/gc/z/zReferenceProcessor.cpp b/src/hotspot/share/gc/z/zReferenceProcessor.cpp
index df8cb2b0e959f..1252de2ac2723 100644
--- a/src/hotspot/share/gc/z/zReferenceProcessor.cpp
+++ b/src/hotspot/share/gc/z/zReferenceProcessor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -143,7 +143,7 @@ bool ZReferenceProcessor::is_inactive(zaddress reference, oop referent, Referenc
     return !is_null(reference_next(reference));
   } else {
     // Verification
-    (void)to_zaddress(referent);
+    check_is_valid_zaddress(referent);
 
     // A non-FinalReference is inactive if the referent is null. The referent can only
     // be null if the application called Reference.enqueue() or Reference.clear().
diff --git a/src/hotspot/share/gc/z/zVerify.cpp b/src/hotspot/share/gc/z/zVerify.cpp
index d47886ec7c2fc..b735965e9d49b 100644
--- a/src/hotspot/share/gc/z/zVerify.cpp
+++ b/src/hotspot/share/gc/z/zVerify.cpp
@@ -111,6 +111,16 @@ static bool z_is_null_relaxed(zpointer o) {
   return (untype(o) & ~color_mask) == 0;
 }
 
+static void z_verify_oop_object(zaddress addr, zpointer o, void* p) {
+  const oop obj = cast_to_oop(addr);
+  guarantee(oopDesc::is_oop(obj), BAD_OOP_ARG(o, p));
+}
+
+static void z_verify_root_oop_object(zaddress addr, void* p) {
+  const oop obj = cast_to_oop(addr);
+  guarantee(oopDesc::is_oop(obj), BAD_OOP_ARG(addr, p));
+}
+
 static void z_verify_old_oop(zpointer* p) {
   const zpointer o = *p;
   assert(o != zpointer::null, "Old should not contain raw null");
@@ -121,7 +131,7 @@ static void z_verify_old_oop(zpointer* p) {
       // safepoint after reference processing, where we hold the driver lock and
       // know there is no concurrent remembered set processing in the young generation.
       const zaddress addr = ZPointer::uncolor(o);
-      guarantee(oopDesc::is_oop(to_oop(addr)), BAD_OOP_ARG(o, p));
+      z_verify_oop_object(addr, o, p);
     } else {
       const zaddress addr = ZBarrier::load_barrier_on_oop_field_preloaded(nullptr, o);
       // Old to young pointers might not be mark good if the young
@@ -143,15 +153,11 @@ static void z_verify_young_oop(zpointer* p) {
     guarantee(ZPointer::is_marked_young(o),  BAD_OOP_ARG(o, p));
 
     if (ZPointer::is_load_good(o)) {
-      guarantee(oopDesc::is_oop(to_oop(ZPointer::uncolor(o))), BAD_OOP_ARG(o, p));
+      z_verify_oop_object(ZPointer::uncolor(o), o, p);
     }
   }
 }
 
-static void z_verify_root_oop_object(zaddress o, void* p) {
-  guarantee(oopDesc::is_oop(to_oop(o)), BAD_OOP_ARG(o, p));
-}
-
 static void z_verify_uncolored_root_oop(zaddress* p) {
   assert(!ZHeap::heap()->is_in((uintptr_t)p), "Roots shouldn't be in heap");
   const zaddress o = *p;
@@ -168,7 +174,7 @@ static void z_verify_possibly_weak_oop(zpointer* p) {
     const zaddress addr = ZBarrier::load_barrier_on_oop_field_preloaded(nullptr, o);
     guarantee(ZHeap::heap()->is_old(addr) || ZPointer::is_marked_young(o), BAD_OOP_ARG(o, p));
     guarantee(ZHeap::heap()->is_young(addr) || ZHeap::heap()->is_object_live(addr), BAD_OOP_ARG(o, p));
-    guarantee(oopDesc::is_oop(to_oop(addr)), BAD_OOP_ARG(o, p));
+    z_verify_oop_object(addr, o, p);
 
     // Verify no missing remset entries. We are holding the driver lock here and that
     // allows us to more precisely verify the remembered set, as there is no concurrent
@@ -211,14 +217,14 @@ class ZVerifyColoredRootClosure : public OopClosure {
       // Minor collections could have relocated the object;
       // use load barrier to find correct object.
       const zaddress addr = ZBarrier::load_barrier_on_oop_field_preloaded(nullptr, o);
-      z_verify_root_oop_object(addr, p);
+      z_verify_oop_object(addr, o, p);
     } else {
       // Don't know the state of the oop
       if (is_valid(o)) {
         // it looks like a valid colored oop;
         // use load barrier to find correct object.
         const zaddress addr = ZBarrier::load_barrier_on_oop_field_preloaded(nullptr, o);
-        z_verify_root_oop_object(addr, p);
+        z_verify_oop_object(addr, o, p);
       }
     }
   }

From 53fce38a3ff8700fef640fffc066efc21ff9c25f Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Fri, 9 Aug 2024 07:53:15 +0000
Subject: [PATCH 365/401] 8338062: JFR: Remove TestStartDuration.java and
 TestStartName.java from ProblemList.txt

Reviewed-by: mgronlun
---
 test/jdk/ProblemList.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 8aedbc7793116..293d9d108d32c 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -745,8 +745,6 @@ jdk/incubator/vector/LoadJsvmlTest.java                         8305390 windows-
 # jdk_jfr
 
 jdk/jfr/event/runtime/TestResidentSetSizeEvent.java             8309846 aix-ppc64
-jdk/jfr/startupargs/TestStartName.java                          8214685 windows-x64
-jdk/jfr/startupargs/TestStartDuration.java                      8214685 windows-x64
 jdk/jfr/jvm/TestWaste.java                                      8282427 generic-all
 
 ############################################################################

From 6ebd5d74d57b334e7cf0b1282d7bb469a56fb3d6 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Fri, 9 Aug 2024 08:23:44 +0000
Subject: [PATCH 366/401] 8338036: Serial: Remove Generation::update_counters

Reviewed-by: kbarrett
---
 src/hotspot/share/gc/serial/generation.hpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/hotspot/share/gc/serial/generation.hpp b/src/hotspot/share/gc/serial/generation.hpp
index beb29928f4826..c6a9f94a8703a 100644
--- a/src/hotspot/share/gc/serial/generation.hpp
+++ b/src/hotspot/share/gc/serial/generation.hpp
@@ -114,8 +114,7 @@ class Generation: public CHeapObj<mtGC> {
 
 public:
   // Performance Counter support
-  virtual void update_counters() = 0;
-  virtual CollectorCounters* counters() { return _gc_counters; }
+  CollectorCounters* counters() { return _gc_counters; }
 
   GCMemoryManager* gc_manager() const {
     assert(_gc_manager != nullptr, "not initialized yet");

From c37e8638c98cb4516569304e9a0ab477affb0641 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Fri, 9 Aug 2024 09:12:41 +0000
Subject: [PATCH 367/401] 8314125: RISC-V: implement Base64 intrinsic -
 encoding

Reviewed-by: fyang, luhenry
---
 src/hotspot/cpu/riscv/assembler_riscv.hpp     |  13 +
 src/hotspot/cpu/riscv/stubGenerator_riscv.cpp | 223 ++++++++++++++++++
 src/hotspot/cpu/riscv/vm_version_riscv.cpp    |   5 +
 3 files changed, 241 insertions(+)

diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp
index e4280ab34e1ce..79279be7acc1b 100644
--- a/src/hotspot/cpu/riscv/assembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp
@@ -1828,6 +1828,19 @@ enum Nf {
 
 #undef INSN
 
+#define INSN(NAME, op, width, umop, mop, mew, nf)                                               \
+  void NAME(VectorRegister Vd_or_Vs3, Register Rs1, VectorMask vm = unmasked) { \
+    patch_VLdSt(op, Vd_or_Vs3, width, Rs1, umop, vm, mop, mew, nf);                         \
+  }
+
+  // Vector Unit-Stride Segment Load Instructions
+  INSN(vlseg3e8_v, 0b0000111, 0b000, 0b00000, 0b00, 0b0, g3);
+
+  // Vector Unit-Stride Segment Store Instructions
+  INSN(vsseg4e8_v, 0b0100111, 0b000, 0b00000, 0b00, 0b0, g4);
+
+#undef INSN
+
 #define INSN(NAME, op, width, mop, mew)                                                                  \
   void NAME(VectorRegister Vd, Register Rs1, VectorRegister Vs2, VectorMask vm = unmasked, Nf nf = g1) { \
     patch_VLdSt(op, Vd, width, Rs1, Vs2->raw_encoding(), vm, mop, mew, nf);                              \
diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
index 198835d733f79..6a2c6c7d6c9bd 100644
--- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
@@ -5103,6 +5103,225 @@ class StubGenerator: public StubCodeGenerator {
     return (address) start;
   }
 
+  /**
+   * vector registers:
+   *   input VectorRegister's:  intputV1-V3, for m2 they could be v2, v4, v6, for m1 they could be v1, v2, v3
+   *   index VectorRegister's:  idxV1-V4, for m2 they could be v8, v10, v12, v14, for m1 they could be v4, v5, v6, v7
+   *   output VectorRegister's: outputV1-V4, for m2 they could be v16, v18, v20, v22, for m1 they could be v8, v9, v10, v11
+   *
+   * NOTE: each field will occupy a vector register group
+   */
+  void base64_vector_encode_round(Register src, Register dst, Register codec,
+                    Register size, Register stepSrc, Register stepDst,
+                    VectorRegister inputV1, VectorRegister inputV2, VectorRegister inputV3,
+                    VectorRegister idxV1, VectorRegister idxV2, VectorRegister idxV3, VectorRegister idxV4,
+                    VectorRegister outputV1, VectorRegister outputV2, VectorRegister outputV3, VectorRegister outputV4,
+                    Assembler::LMUL lmul) {
+    // set vector register type/len
+    __ vsetvli(x0, size, Assembler::e8, lmul);
+
+    // segmented load src into v registers: mem(src) => vr(3)
+    __ vlseg3e8_v(inputV1, src);
+
+    // src = src + register_group_len_bytes * 3
+    __ add(src, src, stepSrc);
+
+    // encoding
+    //   1. compute index into lookup table: vr(3) => vr(4)
+    __ vsrl_vi(idxV1, inputV1, 2);
+
+    __ vsrl_vi(idxV2, inputV2, 2);
+    __ vsll_vi(inputV1, inputV1, 6);
+    __ vor_vv(idxV2, idxV2, inputV1);
+    __ vsrl_vi(idxV2, idxV2, 2);
+
+    __ vsrl_vi(idxV3, inputV3, 4);
+    __ vsll_vi(inputV2, inputV2, 4);
+    __ vor_vv(idxV3, inputV2, idxV3);
+    __ vsrl_vi(idxV3, idxV3, 2);
+
+    __ vsll_vi(idxV4, inputV3, 2);
+    __ vsrl_vi(idxV4, idxV4, 2);
+
+    //   2. indexed load: vr(4) => vr(4)
+    __ vluxei8_v(outputV1, codec, idxV1);
+    __ vluxei8_v(outputV2, codec, idxV2);
+    __ vluxei8_v(outputV3, codec, idxV3);
+    __ vluxei8_v(outputV4, codec, idxV4);
+
+    // segmented store encoded data in v registers back to dst: vr(4) => mem(dst)
+    __ vsseg4e8_v(outputV1, dst);
+
+    // dst = dst + register_group_len_bytes * 4
+    __ add(dst, dst, stepDst);
+  }
+
+  /**
+   *  void j.u.Base64.Encoder.encodeBlock(byte[] src, int sp, int sl, byte[] dst, int dp, boolean isURL)
+   *
+   *  Input arguments:
+   *  c_rarg0   - src, source array
+   *  c_rarg1   - sp, src start offset
+   *  c_rarg2   - sl, src end offset
+   *  c_rarg3   - dst, dest array
+   *  c_rarg4   - dp, dst start offset
+   *  c_rarg5   - isURL, Base64 or URL character set
+   */
+  address generate_base64_encodeBlock() {
+    alignas(64) static const char toBase64[64] = {
+      'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+      'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+      'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+      'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+      '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/'
+    };
+
+    alignas(64) static const char toBase64URL[64] = {
+      'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+      'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+      'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+      'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+      '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '_'
+    };
+
+    __ align(CodeEntryAlignment);
+    StubCodeMark mark(this, "StubRoutines", "encodeBlock");
+    address start = __ pc();
+    __ enter();
+
+    Register src    = c_rarg0;
+    Register soff   = c_rarg1;
+    Register send   = c_rarg2;
+    Register dst    = c_rarg3;
+    Register doff   = c_rarg4;
+    Register isURL  = c_rarg5;
+
+    Register codec  = c_rarg6;
+    Register length = c_rarg7; // total length of src data in bytes
+
+    Label ProcessData, Exit;
+
+    // length should be multiple of 3
+    __ sub(length, send, soff);
+    // real src/dst to process data
+    __ add(src, src, soff);
+    __ add(dst, dst, doff);
+
+    // load the codec base address
+    __ la(codec, ExternalAddress((address) toBase64));
+    __ beqz(isURL, ProcessData);
+    __ la(codec, ExternalAddress((address) toBase64URL));
+    __ BIND(ProcessData);
+
+    // vector version
+    if (UseRVV) {
+      Label ProcessM2, ProcessM1, ProcessScalar;
+
+      Register size      = soff;
+      Register stepSrcM1 = send;
+      Register stepSrcM2 = doff;
+      Register stepDst   = isURL;
+
+      __ mv(size, MaxVectorSize * 2);
+      __ mv(stepSrcM1, MaxVectorSize * 3);
+      __ slli(stepSrcM2, stepSrcM1, 1);
+      __ mv(stepDst, MaxVectorSize * 2 * 4);
+
+      __ blt(length, stepSrcM2, ProcessM1);
+
+      __ BIND(ProcessM2);
+      base64_vector_encode_round(src, dst, codec,
+                    size, stepSrcM2, stepDst,
+                    v2, v4, v6,         // inputs
+                    v8, v10, v12, v14,  // indexes
+                    v16, v18, v20, v22, // outputs
+                    Assembler::m2);
+
+      __ sub(length, length, stepSrcM2);
+      __ bge(length, stepSrcM2, ProcessM2);
+
+      __ BIND(ProcessM1);
+      __ blt(length, stepSrcM1, ProcessScalar);
+
+      __ srli(size, size, 1);
+      __ srli(stepDst, stepDst, 1);
+      base64_vector_encode_round(src, dst, codec,
+                    size, stepSrcM1, stepDst,
+                    v1, v2, v3,         // inputs
+                    v4, v5, v6, v7,     // indexes
+                    v8, v9, v10, v11,   // outputs
+                    Assembler::m1);
+      __ sub(length, length, stepSrcM1);
+
+      __ BIND(ProcessScalar);
+    }
+
+    // scalar version
+    {
+      Register byte1 = soff, byte0 = send, byte2 = doff;
+      Register combined24Bits = isURL;
+
+      __ beqz(length, Exit);
+
+      Label ScalarLoop;
+      __ BIND(ScalarLoop);
+      {
+        // plain:   [byte0[7:0] : byte1[7:0] : byte2[7:0]] =>
+        // encoded: [byte0[7:2] : byte0[1:0]+byte1[7:4] : byte1[3:0]+byte2[7:6] : byte2[5:0]]
+
+        // load 3 bytes src data
+        __ lbu(byte0, Address(src, 0));
+        __ lbu(byte1, Address(src, 1));
+        __ lbu(byte2, Address(src, 2));
+        __ addi(src, src, 3);
+
+        // construct 24 bits from 3 bytes
+        __ slliw(byte0, byte0, 16);
+        __ slliw(byte1, byte1, 8);
+        __ orr(combined24Bits, byte0, byte1);
+        __ orr(combined24Bits, combined24Bits, byte2);
+
+        // get codec index and encode(ie. load from codec by index)
+        __ slliw(byte0, combined24Bits, 8);
+        __ srliw(byte0, byte0, 26);
+        __ add(byte0, codec, byte0);
+        __ lbu(byte0, byte0);
+
+        __ slliw(byte1, combined24Bits, 14);
+        __ srliw(byte1, byte1, 26);
+        __ add(byte1, codec, byte1);
+        __ lbu(byte1, byte1);
+
+        __ slliw(byte2, combined24Bits, 20);
+        __ srliw(byte2, byte2, 26);
+        __ add(byte2, codec, byte2);
+        __ lbu(byte2, byte2);
+
+        __ andi(combined24Bits, combined24Bits, 0x3f);
+        __ add(combined24Bits, codec, combined24Bits);
+        __ lbu(combined24Bits, combined24Bits);
+
+        // store 4 bytes encoded data
+        __ sb(byte0, Address(dst, 0));
+        __ sb(byte1, Address(dst, 1));
+        __ sb(byte2, Address(dst, 2));
+        __ sb(combined24Bits, Address(dst, 3));
+
+        __ sub(length, length, 3);
+        __ addi(dst, dst, 4);
+        // loop back
+        __ bnez(length, ScalarLoop);
+      }
+    }
+
+    __ BIND(Exit);
+
+    __ leave();
+    __ ret();
+
+    return (address) start;
+  }
+
   void adler32_process_bytes(Register buff, Register s1, Register s2, VectorRegister vtable,
     VectorRegister vzero, VectorRegister vbytes, VectorRegister vs1acc, VectorRegister vs2acc,
     Register temp0, Register temp1, Register temp2,  Register temp3,
@@ -5996,6 +6215,10 @@ static const int64_t right_3_bits = right_n_bits(3);
       StubRoutines::_sha1_implCompressMB   = generate_sha1_implCompress(true, "sha1_implCompressMB");
     }
 
+    if (UseBASE64Intrinsics) {
+      StubRoutines::_base64_encodeBlock = generate_base64_encodeBlock();
+    }
+
     if (UseAdler32Intrinsics) {
       StubRoutines::_updateBytesAdler32 = generate_updateBytesAdler32();
     }
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.cpp b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
index ac2d6cde1a227..e9c6226f44639 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.cpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
@@ -265,6 +265,11 @@ void VM_Version::c2_initialize() {
   //       as there are extra checks inside it which could disable UseRVV
   //       in some situations.
 
+  // Base64
+  if (FLAG_IS_DEFAULT(UseBASE64Intrinsics)) {
+    FLAG_SET_DEFAULT(UseBASE64Intrinsics, true);
+  }
+
   if (FLAG_IS_DEFAULT(UseVectorizedHashCodeIntrinsic)) {
     FLAG_SET_DEFAULT(UseVectorizedHashCodeIntrinsic, true);
   }

From 140716078694a338e2c2f837841761262cee5542 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Fri, 9 Aug 2024 09:24:50 +0000
Subject: [PATCH 368/401] 8313931: Javadoc: links to type parameters actually
 generate links to classes

Reviewed-by: jjg
---
 .../doclets/formats/html/ClassWriter.java     |  50 +++++--
 .../doclets/formats/html/HtmlIds.java         |  16 +++
 .../doclets/formats/html/HtmlLinkFactory.java |  13 +-
 .../formats/html/resources/script.js.template |  18 ++-
 .../formats/html/resources/stylesheet.css     |  22 +++-
 .../formats/html/taglets/LinkTaglet.java      |  24 +++-
 .../formats/html/taglets/ParamTaglet.java     |   6 +-
 .../doclets/toolkit/util/CommentHelper.java   |   6 +
 .../TestDeprecatedDocs.java                   |   8 +-
 .../TestDirectedInheritance.java              |   6 +-
 .../doclet/testErasure/TestErasure.java       |   8 +-
 .../TestGenericMethodLinkTaglet.java          |   6 +-
 .../jdk/javadoc/doclet/testHref/TestHref.java |   5 +-
 .../doclet/testInterface/TestInterface.java   |  36 ++---
 .../TestLinkTagletTypeParam.java              | 124 ++++++++++++++++++
 .../TestMemberInheritance.java                |   4 +-
 .../doclet/testModules/TestModules.java       |   2 +-
 .../TestNewLanguageFeatures.java              |  22 ++--
 .../testParamTaglet/TestParamTaglet.java      |   6 +-
 .../doclet/testProperty/TestProperty.java     |   4 +-
 .../testRecordTypes/TestRecordTypes.java      |   2 +-
 .../TestSerializedForm.java                   |   5 +-
 .../javadoc/doclet/testThrows/TestThrows.java |   4 +-
 .../testTypeParams/TestTypeParameters.java    |  20 ++-
 .../testTypeParams/pkg/CtorTypeParam.java     |   6 +
 .../doclet/testUnicode/TestUnicode.java       |   4 +-
 26 files changed, 336 insertions(+), 91 deletions(-)
 create mode 100644 test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTagletTypeParam.java

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java
index a1fd27fefdd58..8218e5128be3b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java
@@ -37,6 +37,7 @@
 import javax.lang.model.element.Name;
 import javax.lang.model.element.PackageElement;
 import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.TypeParameterElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.SimpleElementVisitor8;
@@ -155,7 +156,7 @@ protected void buildClassTree(Content classContent) {
      * @param target the content to which the documentation will be added
      */
     protected void buildClassInfo(Content target) {
-        Content c = HtmlTree.DIV(HtmlStyles.horizontalScroll);
+        var c = new ContentBuilder();
         buildParamInfo(c);
         buildSuperInterfacesInfo(c);
         buildImplementedInterfacesInfo(c);
@@ -164,11 +165,13 @@ protected void buildClassInfo(Content target) {
         buildInterfaceUsageInfo(c);
         buildNestedClassInfo(c);
         buildFunctionalInterfaceInfo(c);
-        buildClassSignature(c);
-        buildDeprecationInfo(c);
-        buildClassDescription(c);
-        buildClassTagInfo(c);
-
+        c.add(new HtmlTree(HtmlTag.HR));
+        var div = HtmlTree.DIV(HtmlStyles.horizontalScroll);
+        buildClassSignature(div);
+        buildDeprecationInfo(div);
+        buildClassDescription(div);
+        buildClassTagInfo(div);
+        c.add(div);
         target.add(getClassInfo(c));
     }
 
@@ -432,12 +435,9 @@ private void setRecordDocumentation(TypeElement elem) {
     protected Content getHeader(String header) {
         HtmlTree body = getBody(getWindowTitle(utils.getSimpleName(typeElement)));
         var div = HtmlTree.DIV(HtmlStyles.header);
-        HtmlLinkInfo linkInfo = new HtmlLinkInfo(configuration,
-                HtmlLinkInfo.Kind.SHOW_TYPE_PARAMS_AND_BOUNDS, typeElement)
-                .linkToSelf(false);  // Let's not link to ourselves in the header
         var heading = HtmlTree.HEADING_TITLE(Headings.PAGE_TITLE_HEADING,
                 HtmlStyles.title, Text.of(header));
-        heading.add(getTypeParameterLinks(linkInfo));
+        heading.add(getTypeParameters());
         div.add(heading);
         bodyContents.setHeader(getHeader(PageMode.CLASS, typeElement))
                 .addMainContent(MarkerComments.START_OF_CLASS_DATA)
@@ -445,6 +445,35 @@ protected Content getHeader(String header) {
         return body;
     }
 
+    // Renders type parameters for the class heading, creating id attributes
+    // if @param block tags are missing in doc comment.
+    private Content getTypeParameters() {
+        var content = new ContentBuilder();
+        var typeParams = typeElement.getTypeParameters();
+        if (!typeParams.isEmpty()) {
+            // Generate id attributes if @param tags are missing for type parameters.
+            // Note that this does not handle the case where some but not all @param tags are missing.
+            var needsId = !utils.hasBlockTag(typeElement, DocTree.Kind.PARAM);
+            var linkInfo = new HtmlLinkInfo(configuration,
+                    HtmlLinkInfo.Kind.SHOW_TYPE_PARAMS_AND_BOUNDS, typeElement)
+                    .linkToSelf(false);  // Let's not link to ourselves in the header
+            content.add("<");
+            var first = true;
+            for (TypeParameterElement t : typeParams) {
+                if (!first) {
+                    content.add(",").add(new HtmlTree(HtmlTag.WBR));
+                }
+                var typeParamLink = getLink(linkInfo.forType(t.asType()));
+                content.add(needsId
+                        ? HtmlTree.SPAN_ID(htmlIds.forTypeParam(t.getSimpleName().toString(), typeElement), typeParamLink)
+                        : typeParamLink);
+                first = false;
+            }
+            content.add(">");
+        }
+        return content;
+    }
+
     protected Content getClassContentHeader() {
         return getContentHeader();
     }
@@ -473,7 +502,6 @@ public TypeElement getCurrentPageElement() {
     }
 
     protected void addClassSignature(Content classInfo) {
-        classInfo.add(new HtmlTree(HtmlTag.HR));
         classInfo.add(new Signatures.TypeSignature(typeElement, this)
                 .toContent());
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlIds.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlIds.java
index 1b9896fafa006..8b48c7a6f2262 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlIds.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlIds.java
@@ -462,6 +462,22 @@ public static HtmlId forText(String text, Map<String, Integer> counts) {
         return HtmlId.of(count == 0 ? base : base + "-" + count);
     }
 
+    /**
+     * Returns an id for text documenting a type parameter of a class or method.
+     *
+     * @param paramName the name of the type parameter
+     * @param owner the enclosing element
+     *
+     * @return the id
+     */
+    public HtmlId forTypeParam(String paramName, Element owner) {
+        if (utils.isExecutableElement(owner)) {
+            return HtmlId.of(forMember((ExecutableElement) owner).getFirst().name()
+                    + "-type-param-" + paramName);
+        }
+        return HtmlId.of("type-param-" + paramName);
+    }
+
     /**
      * Returns an id for one of the kinds of section in the pages for item group summaries.
      *
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkFactory.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkFactory.java
index 22af1e4a0244c..8e0c010dd1ae4 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkFactory.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkFactory.java
@@ -162,9 +162,11 @@ public Content visitTypeVariable(TypeVariable type, HtmlLinkInfo linkInfo) {
                     Element owner = typevariable.asElement().getEnclosingElement();
                     if (linkInfo.linkTypeParameters() && utils.isTypeElement(owner)) {
                         linkInfo.setTypeElement((TypeElement) owner);
-                        Content label = newContent();
-                        label.add(utils.getTypeName(type, false));
-                        linkInfo.label(label).skipPreview(true);
+                        if (linkInfo.getLabel() == null || linkInfo.getLabel().isEmpty()) {
+                            Content label = newContent();
+                            label.add(utils.getTypeName(type, false));
+                            linkInfo.label(label).skipPreview(true);
+                        }
                         link.add(getClassLink(linkInfo));
                     } else {
                         // No need to link method type parameters.
@@ -242,6 +244,11 @@ protected Content getClassLink(HtmlLinkInfo linkInfo) {
             boolean isTypeLink = linkInfo.getType() != null &&
                      utils.isTypeVariable(utils.getComponentType(linkInfo.getType()));
             title = getClassToolTip(typeElement, isTypeLink);
+            if (isTypeLink) {
+                linkInfo.fragment(m_writer.configuration.htmlIds.forTypeParam(
+                        utils.getTypeName(utils.getComponentType(linkInfo.getType()), false),
+                        typeElement).name());
+            }
         }
         Content label = linkInfo.getClassLinkLabel(configuration);
         if (linkInfo.getContext() == HtmlLinkInfo.Kind.SHOW_TYPE_PARAMS_IN_LABEL) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js.template b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js.template
index ef09e6df90fd7..71ef847670822 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js.template
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js.template
@@ -232,6 +232,20 @@ document.addEventListener("readystatechange", (e) => {
 });
 document.addEventListener("DOMContentLoaded", function(e) {
     setTopMargin();
+    // Reset animation for type parameter target highlight
+    document.querySelectorAll("a").forEach((link) => {
+        link.addEventListener("click", (e) => {
+            const href = e.currentTarget.getAttribute("href");
+            if (href && href.startsWith("#") && href.indexOf("type-param-") > -1) {
+                const target = document.getElementById(decodeURI(href.substring(1)));
+                if (target) {
+                    target.style.animation = "none";
+                    void target.offsetHeight;
+                    target.style.removeProperty("animation");
+                }
+            }
+        })
+    });
     // Make sure current element is visible in breadcrumb navigation on small displays
     const subnav = document.querySelector("ol.sub-nav-list");
     if (subnav && subnav.lastElementChild) {
@@ -286,7 +300,7 @@ document.addEventListener("DOMContentLoaded", function(e) {
     });
     var expanded = false;
     var windowWidth;
-    function collapse() {
+    function collapse(e) {
         if (expanded) {
             mainnav.removeAttribute("style");
             if (toc) {
@@ -336,7 +350,7 @@ document.addEventListener("DOMContentLoaded", function(e) {
     document.querySelectorAll("h1, h2, h3, h4, h5, h6")
         .forEach((hdr, idx) => {
             // Create anchor links for headers with an associated id attribute
-            var id = hdr.getAttribute("id") || hdr.parentElement.getAttribute("id")
+            var id = hdr.parentElement.getAttribute("id") || hdr.getAttribute("id")
                 || (hdr.querySelector("a") && hdr.querySelector("a").getAttribute("id"));
             if (id) {
                 var template = document.createElement('template');
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
index 4e37588f6cda5..1130f14dc35b4 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
@@ -63,7 +63,7 @@
     --search-input-text-color: #000000;
     --search-input-placeholder-color: #909090;
     /* Highlight color for active search tag target */
-    --search-tag-highlight-color: #ffff00;
+    --search-tag-highlight-color: #ffff66;
     /* Adjustments for icon and active background colors of copy-to-clipboard buttons */
     --copy-icon-brightness: 100%;
     --copy-button-background-color-active: rgba(168, 168, 176, 0.3);
@@ -307,7 +307,7 @@ ol.sub-nav-list a.current-selection {
  */
 .title {
     color:var(--title-color);
-    margin:10px 0;
+    margin:10px 0 12px 0;
 }
 .sub-title {
     margin:5px 0 0 0;
@@ -988,6 +988,22 @@ input::placeholder {
 .search-tag-result:target {
     background-color:var(--search-tag-highlight-color);
 }
+dd > span:target,
+h1 > span:target {
+    animation: 2.4s ease-out highlight;
+}
+section.class-description dd > span:target,
+section.class-description h1 > span:target {
+    scroll-margin-top: 20em;
+}
+@keyframes highlight {
+    from {
+        background-color: var(--search-tag-highlight-color);
+    }
+    60% {
+        background-color: var(--search-tag-highlight-color);
+    }
+}
 details.page-search-details {
     display: inline-block;
 }
@@ -1040,7 +1056,7 @@ span#page-search-link {
     z-index: 5;
 }
 .inherited-list {
-    margin: 10px 0 10px 0;
+    margin: 10px 0;
 }
 .horizontal-scroll {
     overflow: auto hidden;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java
index e16acd0315ad7..b16a1490b6303 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/LinkTaglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -176,7 +176,7 @@ Content linkSeeReferenceOutput(Element holder,
                 return htmlWriter.getPackageLink(refPackage, labelContent, refFragment);
             } else {
                 // @see is not referencing an included class, module or package. Check for cross-links.
-                String refModuleName =  ch.getReferencedModuleName(refSignature);
+                String refModuleName = ch.getReferencedModuleName(refSignature);
                 DocLink elementCrossLink = (refPackage != null) ? htmlWriter.getCrossPackageLink(refPackage) :
                         (config.extern.isModule(refModuleName))
                                 ? htmlWriter.getCrossModuleLink(utils.elementUtils.getModuleElement(refModuleName))
@@ -190,12 +190,28 @@ Content linkSeeReferenceOutput(Element holder,
                     if (!config.isDocLintReferenceGroupEnabled()) {
                         reportWarning.accept(
                                 "doclet.link.see.reference_not_found",
-                                new Object[] { refSignature});
+                                new Object[] {refSignature});
                     }
                     return htmlWriter.invalidTagOutput(resources.getText("doclet.link.see.reference_invalid"),
-                            Optional.of(labelContent.isEmpty() ? text: labelContent));
+                            Optional.of(labelContent.isEmpty() ? text : labelContent));
                 }
             }
+        } else if (utils.isTypeParameterElement(ref)) {
+            // This is a type parameter of a generic class, method or constructor
+            if (labelContent.isEmpty()) {
+                labelContent = plainOrCode(isPlain, Text.of(utils.getSimpleName(ref)));
+            }
+            if (refMem == null) {
+                return htmlWriter.getLink(
+                        new HtmlLinkInfo(config, HtmlLinkInfo.Kind.LINK_TYPE_PARAMS, ref.asType())
+                                .label(labelContent));
+            } else {
+                // HtmlLinkFactory does not render type parameters of generic methods as links, so instead of
+                // teaching it how to do it (making the code even more complex) just create the link directly.
+                return htmlWriter.getLink(new HtmlLinkInfo(config, HtmlLinkInfo.Kind.PLAIN, refClass)
+                        .fragment(config.htmlIds.forTypeParam(ref.getSimpleName().toString(), refMem).name())
+                        .label((labelContent)));
+            }
         } else if (refFragment == null) {
             // Must be a class reference since refClass is not null and refFragment is null.
             if (labelContent.isEmpty() && refTree != null) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/ParamTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/ParamTaglet.java
index ed46e6c5c864f..8a3c47bbfd4b6 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/ParamTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/ParamTaglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -278,7 +278,9 @@ private Content paramTagOutput(Element element, ParamTree paramTag, String param
         body.add(" - ");
         List<? extends DocTree> description = ch.getDescription(paramTag);
         body.add(htmlWriter.commentTagsToContent(element, description, context.within(paramTag)));
-        return HtmlTree.DD(body);
+        return HtmlTree.DD(paramTag.isTypeParameter()
+                ? HtmlTree.SPAN_ID(config.htmlIds.forTypeParam(paramName, element), body)
+                : body);
     }
 
     private record Documentation(ParamTree paramTree, ExecutableElement method) { }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/CommentHelper.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/CommentHelper.java
index d7a0bd2d0a070..30aa86aea7196 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/CommentHelper.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/CommentHelper.java
@@ -188,6 +188,12 @@ public Element getReferencedMember(Element e) {
         Utils utils = configuration.utils;
         if (e == null) {
             return null;
+        } else if (utils.isTypeParameterElement(e)) {
+            // Return the enclosing member for type parameters of generic methods or constructors.
+            Element encl = e.getEnclosingElement();
+            if (utils.isExecutableElement(encl)) {
+                return encl;
+            }
         }
         return (utils.isExecutableElement(e) || utils.isVariableElement(e)) ? e : null;
     }
diff --git a/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java
index 2bd9da5957837..165fadc8e051f 100644
--- a/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java
+++ b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -102,7 +102,6 @@ public void test() {
 
         checkOutput("pkg/TestAnnotationType.html", true,
                 """
-                    <hr>
                     <div class="type-signature"><span class="annotations">@Deprecated(forRemoval=true)
                     @Documented
                     </span><span class="modifiers">public @interface </span><span class="element-name type-n\
@@ -135,7 +134,6 @@ public void test() {
 
         checkOutput("pkg/TestClass.html", true,
                 """
-                    <hr>
                     <div class="type-signature"><span class="annotations">@Deprecated(forRemoval=true)
                     </span><span class="modifiers">public class </span><span class="element-name type-name-label">TestClass</span>
                     <span class="extends-implements">extends java.lang.Object</span></div>
@@ -212,7 +210,6 @@ public void test() {
 
         checkOutput("pkg/TestEnum.html", true,
                 """
-                    <hr>
                     <div class="type-signature"><span class="annotations">@Deprecated(forRemoval=true)
                     </span><span class="modifiers">public enum </span><span class="element-name type-name-label">TestEnum</span>
                     <span class="extends-implements">extends java.lang.Enum&lt;<a href="TestEnum.htm\
@@ -233,7 +230,6 @@ public void test() {
 
         checkOutput("pkg/TestError.html", true,
                 """
-                    <hr>
                     <div class="type-signature"><span class="annotations">@Deprecated(forRemoval=true)
                     </span><span class="modifiers">public class </span><span class="element-name type-name-label">TestError</span>
                     <span class="extends-implements">extends java.lang.Error</span></div>
@@ -244,7 +240,6 @@ public void test() {
 
         checkOutput("pkg/TestException.html", true,
                 """
-                    <hr>
                     <div class="type-signature"><span class="annotations">@Deprecated(forRemoval=true)
                     </span><span class="modifiers">public class </span><span class="element-name type-name-label">TestException</span>
                     <span class="extends-implements">extends java.lang.Exception</span></div>
@@ -255,7 +250,6 @@ public void test() {
 
         checkOutput("pkg/TestInterface.html", true,
                 """
-                    <hr>
                     <div class="type-signature"><span class="annotations">@Deprecated(forRemoval=true)
                     </span><span class="modifiers">public class </span><span class="element-name type-name-label">TestInterface</span>
                     <span class="extends-implements">extends java.lang.Object</span></div>
diff --git a/test/langtools/jdk/javadoc/doclet/testDirectedInheritance/TestDirectedInheritance.java b/test/langtools/jdk/javadoc/doclet/testDirectedInheritance/TestDirectedInheritance.java
index 89eb68db1dfdc..0f2b398e626bc 100644
--- a/test/langtools/jdk/javadoc/doclet/testDirectedInheritance/TestDirectedInheritance.java
+++ b/test/langtools/jdk/javadoc/doclet/testDirectedInheritance/TestDirectedInheritance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -154,8 +154,8 @@ public interface E1 extends I1, I2 {
                 <div class="block">I2: main description</div>
                 """, """
                 <dt>Type Parameters:</dt>
-                <dd><code>E</code> - I2: first type parameter</dd>
-                <dd><code>F</code> - I2: second type parameter</dd>
+                <dd><span id="m(E)-type-param-E"><code>E</code> - I2: first type parameter</span></dd>
+                <dd><span id="m(E)-type-param-F"><code>F</code> - I2: second type parameter</span></dd>
                 <dt>Parameters:</dt>
                 <dd><code>eObj</code> - I2: parameter</dd>
                 <dt>Returns:</dt>
diff --git a/test/langtools/jdk/javadoc/doclet/testErasure/TestErasure.java b/test/langtools/jdk/javadoc/doclet/testErasure/TestErasure.java
index f80074c50e250..ee2ec08b884e6 100644
--- a/test/langtools/jdk/javadoc/doclet/testErasure/TestErasure.java
+++ b/test/langtools/jdk/javadoc/doclet/testErasure/TestErasure.java
@@ -199,7 +199,7 @@ class X { }
                 <div class="col-first even-row-color"><code>&nbsp;</code></div>
                 <div class="col-constructor-name even-row-color"><code>\
                 <a href="#%3Cinit%3E(T)" class="member-name-link">Foo</a>\
-                <wbr>(<a href="Foo.html" title="type parameter in Foo">T</a>&nbsp;arg)</code></div>
+                <wbr>(<a href="#type-param-T" title="type parameter in Foo">T</a>&nbsp;arg)</code></div>
                 <div class="col-last even-row-color">&nbsp;</div>
                 <div class="col-first odd-row-color"><code>&nbsp;&lt;T extends X&gt;<br></code></div>
                 <div class="col-constructor-name odd-row-color"><code>\
@@ -227,10 +227,10 @@ class X { }
         // methods
         checkOutput("Foo.html", true, """
                 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 \
-                method-summary-table-tab3"><code>abstract <a href="Foo.html" title="type parameter in Foo">T</a></code></div>
+                method-summary-table-tab3"><code>abstract <a href="#type-param-T" title="type parameter in Foo">T</a></code></div>
                 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 \
                 method-summary-table-tab3"><code><a href="#m(T)" class="member-name-link">m</a>\
-                <wbr>(<a href="Foo.html" title="type parameter in Foo">T</a>&nbsp;arg)</code></div>
+                <wbr>(<a href="#type-param-T" title="type parameter in Foo">T</a>&nbsp;arg)</code></div>
                 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 \
                 method-summary-table-tab3">&nbsp;</div>
                 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 \
@@ -385,4 +385,4 @@ class Y { }
                 <div class="col-second odd-row-color constructor constructor-tab1">Test Feature</div>
                 <div class="col-last odd-row-color constructor constructor-tab1"></div>""");
     }
-}
\ No newline at end of file
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testGenericMethodLinkTaglet/TestGenericMethodLinkTaglet.java b/test/langtools/jdk/javadoc/doclet/testGenericMethodLinkTaglet/TestGenericMethodLinkTaglet.java
index a9a4be1b262b9..db23064e9ca8d 100644
--- a/test/langtools/jdk/javadoc/doclet/testGenericMethodLinkTaglet/TestGenericMethodLinkTaglet.java
+++ b/test/langtools/jdk/javadoc/doclet/testGenericMethodLinkTaglet/TestGenericMethodLinkTaglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      8188248
+ * @bug      8188248 8313931
  * @summary  NullPointerException on generic methods
  * @library  /tools/lib ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -67,7 +67,7 @@ public void test(Path base) throws Exception {
 
         checkOutput("pkg/A.html", true,
                 """
-                    <a href="A.html" title="class in pkg"><code>A</code></a>""");
+                    param <a href="#m1(T)-type-param-T"><code>T</code></a>""");
     }
 
     void createTestClass(Path srcDir) throws Exception {
diff --git a/test/langtools/jdk/javadoc/doclet/testHref/TestHref.java b/test/langtools/jdk/javadoc/doclet/testHref/TestHref.java
index f21ad223fb459..b9dff5ff2a897 100644
--- a/test/langtools/jdk/javadoc/doclet/testHref/TestHref.java
+++ b/test/langtools/jdk/javadoc/doclet/testHref/TestHref.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -75,7 +75,8 @@ public void test() {
 
         checkOutput("pkg/C4.html", true,
                 //Header does not link to the page itself.
-                "Class C4&lt;E extends C4&lt;E&gt;&gt;</h1>",
+                """
+                    Class C4&lt;<span id="type-param-E">E extends C4&lt;E&gt;</span>&gt;</h1>""",
                 //Signature does not link to the page itself.
                 """
                     <span class="modifiers">public abstract class </span><span class="element-name type-name\
diff --git a/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java b/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java
index cdba068ea4d78..f213d393fdfd1 100644
--- a/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java
+++ b/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -99,12 +99,12 @@ public void test() {
                     <dt>Specified by:</dt>
                     <dd><code><a href="Interface.html#method()">method</a></code>&nbsp;in interface&\
                     nbsp;<code><a href="Interface.html" title="interface in pkg">Interface</a>&lt;<a\
-                     href="Child.html" title="type parameter in Child">CE</a>&gt;</code></dd>""",
+                     href="#type-param-CE" title="type parameter in Child">CE</a>&gt;</code></dd>""",
                 //Make sure "Overrides" has substituted type parameters.
                 """
                     <dt>Overrides:</dt>
                     <dd><code><a href="Parent.html#method()">method</a></code>&nbsp;in class&nbsp;<c\
-                    ode><a href="Parent.html" title="class in pkg">Parent</a>&lt;<a href="Child.html\
+                    ode><a href="Parent.html" title="class in pkg">Parent</a>&lt;<a href="#type-param-CE\
                     " title="type parameter in Child">CE</a>&gt;</code></dd>""");
 
         checkOutput("pkg/Parent.html", true,
@@ -190,7 +190,7 @@ public void test1() {
                 <dt>Overrides:</dt>
                 <dd><code><a href="GrandParent.html#method1()">method1</a></code>&nbsp;in class&\
                 nbsp;<code><a href="GrandParent.html" title="class in pkg1">GrandParent</a>&lt;<\
-                a href="Child.html" title="type parameter in Child">CE</a>&gt;</code>""");
+                a href="#type-param-CE" title="type parameter in Child">CE</a>&gt;</code>""");
     }
 
     @Test
@@ -209,17 +209,17 @@ public void test2() {
                 erface in pkg2">Spliterator</a></h3>
                 <code><a href="Spliterator.OfDouble.html" title="interface in pkg2">Spliterator.\
                 OfDouble</a>, <a href="Spliterator.OfInt.html" title="interface in pkg2">Spliter\
-                ator.OfInt</a>&lt;<a href="Spliterator.OfInt.html" title="type parameter in Spli\
+                ator.OfInt</a>&lt;<a href="Spliterator.OfInt.html#type-param-Integer" title="type parameter in Spli\
                 terator.OfInt">Integer</a>&gt;, <a href="Spliterator.OfPrimitive.html" title="in\
                 terface in pkg2">Spliterator.OfPrimitive</a>&lt;<a href="Spliterator.OfPrimitive\
-                .html" title="type parameter in Spliterator.OfPrimitive">T</a>,<wbr><a href="Spl\
-                iterator.OfPrimitive.html" title="type parameter in Spliterator.OfPrimitive">T_C\
-                ONS</a>,<wbr><a href="Spliterator.OfPrimitive.html" title="type parameter in Spl\
+                .html#type-param-T" title="type parameter in Spliterator.OfPrimitive">T</a>,<wbr><a href="Spl\
+                iterator.OfPrimitive.html#type-param-T_CONS" title="type parameter in Spliterator.OfPrimitive">T_C\
+                ONS</a>,<wbr><a href="Spliterator.OfPrimitive.html#type-param-T_SPLITR" title="type parameter in Spl\
                 iterator.OfPrimitive">T_SPLITR</a> extends <a href="Spliterator.OfPrimitive.html\
                 " title="interface in pkg2">Spliterator.OfPrimitive</a>&lt;<a href="Spliterator.\
-                OfPrimitive.html" title="type parameter in Spliterator.OfPrimitive">T</a>,<wbr><\
-                a href="Spliterator.OfPrimitive.html" title="type parameter in Spliterator.OfPri\
-                mitive">T_CONS</a>,<wbr><a href="Spliterator.OfPrimitive.html" title="type param\
+                OfPrimitive.html#type-param-T" title="type parameter in Spliterator.OfPrimitive">T</a>,<wbr><\
+                a href="Spliterator.OfPrimitive.html#type-param-T_CONS" title="type parameter in Spliterator.OfPri\
+                mitive">T_CONS</a>,<wbr><a href="Spliterator.OfPrimitive.html#type-param-T_SPLITR" title="type param\
                 eter in Spliterator.OfPrimitive">T_SPLITR</a>&gt;&gt;</code>""");
         checkOutput("pkg2/Spliterator.html", true,
             """
@@ -236,21 +236,21 @@ public void test2() {
                 <div class="col-first odd-row-color"><code>static interface&nbsp;</code></div>
                 <div class="col-second odd-row-color"><code><a href="Spliterator.OfInt.html" cla\
                 ss="type-name-link" title="interface in pkg2">Spliterator.OfInt</a>&lt;<a href="\
-                Spliterator.OfInt.html" title="type parameter in Spliterator.OfInt">Integer</a>&\
+                Spliterator.OfInt.html#type-param-Integer" title="type parameter in Spliterator.OfInt">Integer</a>&\
                 gt;</code></div>
                 <div class="col-last odd-row-color">&nbsp;</div>
                 <div class="col-first even-row-color"><code>static interface&nbsp;</code></div>
                 <div class="col-second even-row-color"><code><a href="Spliterator.OfPrimitive.ht\
                 ml" class="type-name-link" title="interface in pkg2">Spliterator.OfPrimitive</a>\
-                &lt;<a href="Spliterator.OfPrimitive.html" title="type parameter in Spliterator.\
-                OfPrimitive">T</a>,<wbr><a href="Spliterator.OfPrimitive.html" title="type param\
+                &lt;<a href="Spliterator.OfPrimitive.html#type-param-T" title="type parameter in Spliterator.\
+                OfPrimitive">T</a>,<wbr><a href="Spliterator.OfPrimitive.html#type-param-T_CONS" title="type param\
                 eter in Spliterator.OfPrimitive">T_CONS</a>,<wbr><a href="Spliterator.OfPrimitiv\
-                e.html" title="type parameter in Spliterator.OfPrimitive">T_SPLITR</a> extends <\
+                e.html#type-param-T_SPLITR" title="type parameter in Spliterator.OfPrimitive">T_SPLITR</a> extends <\
                 a href="Spliterator.OfPrimitive.html" title="interface in pkg2">Spliterator.OfPr\
-                imitive</a>&lt;<a href="Spliterator.OfPrimitive.html" title="type parameter in S\
-                pliterator.OfPrimitive">T</a>,<wbr><a href="Spliterator.OfPrimitive.html" title=\
+                imitive</a>&lt;<a href="Spliterator.OfPrimitive.html#type-param-T" title="type parameter in S\
+                pliterator.OfPrimitive">T</a>,<wbr><a href="Spliterator.OfPrimitive.html#type-param-T_CONS" title=\
                 "type parameter in Spliterator.OfPrimitive">T_CONS</a>,<wbr><a href="Spliterator\
-                .OfPrimitive.html" title="type parameter in Spliterator.OfPrimitive">T_SPLITR</a\
+                .OfPrimitive.html#type-param-T_SPLITR" title="type parameter in Spliterator.OfPrimitive">T_SPLITR</a\
                 >&gt;&gt;</code></div>
                 <div class="col-last even-row-color">&nbsp;</div>
                 </div>""");
diff --git a/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTagletTypeParam.java b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTagletTypeParam.java
new file mode 100644
index 0000000000000..5cb1f687d452f
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTagletTypeParam.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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      8313931
+ * @summary  Javadoc: links to type parameters actually generate links to classes
+ * @library  /tools/lib ../../lib
+ * @modules  jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestLinkTagletTypeParam
+ */
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+import java.io.IOException;
+import java.nio.file.Path;
+
+public class TestLinkTagletTypeParam extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        var tester = new TestLinkTagletTypeParam();
+        tester.runTests();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    @JavadocTester.Test
+    public void testClassTypeParameterLink(Path base) throws IOException {
+        Path src = base.resolve("src");
+
+        tb.writeJavaFiles(src,
+                """
+                    /**
+                     * Link to {@link F}.
+                     *
+                     * @param <F> the first type param
+                     * @param <APND> an Appendable
+                     *
+                     * @see APND the second type parameter
+                     */
+                    public class Test<F, APND extends Appendable> {
+                        private Test() {}
+                    }
+                    """);
+
+        javadoc("-Xdoclint:none",
+                "-d", base.resolve("api").toString(),
+                "-sourcepath", src.toString(),
+                src.resolve("Test.java").toString());
+        checkExit(JavadocTester.Exit.OK);
+
+        checkOrder("Test.html",
+                """
+                    <dt>Type Parameters:</dt>
+                    <dd><span id="type-param-F"><code>F</code> - the first type param</span></dd>
+                    <dd><span id="type-param-APND"><code>APND</code> - an Appendable</span></dd>""",
+                """
+                    Link to <a href="#type-param-F" title="type parameter in Test"><code>F</code></a>.""",
+                """
+                    <dt>See Also:</dt>
+                    <dd>
+                    <ul class="tag-list">
+                    <li><a href="#type-param-APND" title="type parameter in Test">the second type parameter</a></li>
+                    </ul>""");
+    }
+
+    @JavadocTester.Test
+    public void testMethodTypeParameterLink(Path base) throws IOException {
+        Path src = base.resolve("src");
+
+        tb.writeJavaFiles(src,
+               """
+                    /**
+                     * Class comment.
+                     */
+                    public class Test {
+                        /**
+                         * Link to {@link T} and {@linkplain T link with label}.
+                         *
+                         * @param <T> the T
+                         * @param appendable the appendable
+                         */
+                        public <T extends Appendable> T append(final T appendable) {
+                            return appendable;
+                        }
+                    }
+                    """);
+
+        javadoc("-Xdoclint:reference",
+                "-d", base.resolve("api").toString(),
+                "-sourcepath", src.toString(),
+                src.resolve("Test.java").toString());
+
+        checkOutput(JavadocTester.Output.OUT, true,
+                "");
+
+        checkOutput("Test.html", true,
+                """
+                    Link to <a href="#append(T)-type-param-T"><code>T</code></a> and <a href="#appe\
+                    nd(T)-type-param-T">link with label</a>.""");
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java b/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java
index 705cae327e3a3..559f7b08d3877 100644
--- a/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java
+++ b/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -120,8 +120,8 @@ interface in pkg">BaseInterface</a></code></dd>
         checkOutput("pkg2/DocumentedNonGenericChild.html", true,
                 """
                     <section class="class-description" id="class-description">
-                    <div class="horizontal-scroll">
                     <hr>
+                    <div class="horizontal-scroll">
                     <div class="type-signature"><span class="modifiers">public abstract class </span\
                     ><span class="element-name type-name-label">DocumentedNonGenericChild</span>
                     <span class="extends-implements">extends java.lang.Object</span></div>
diff --git a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
index 79bad12f95db2..4d3628544f81e 100644
--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
@@ -1360,8 +1360,8 @@ void checkLinkSource(boolean includePrivate) {
         checkOutput("moduleA/testpkgmdlA/TestClassInModuleA.html", true,
                 """
                     <section class="class-description" id="class-description">
-                    <div class="horizontal-scroll">
                     <hr>
+                    <div class="horizontal-scroll">
                     <div class="type-signature"><span class="modifiers">public class </span><span cl\
                     ass="element-name"><a href="../../src-html/moduleA/testpkgmdlA/TestClassInModule\
                     A.html#line-25">TestClassInModuleA</a></span>
diff --git a/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java
index a54fbbcff75f0..eafad8c3245f2 100644
--- a/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java
+++ b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -117,7 +117,7 @@ void checkTypeParameters() {
                 // Check class type parameters section.
                 """
                     <dt>Type Parameters:</dt>
-                    <dd><code>E</code> - the type parameter for this class.""",
+                    <dd><span id="type-param-E"><code>E</code> - the type parameter for this class.</span></dd>""",
                 // Type parameters in @see/@link
                 """
                     <dl class="notes">
@@ -130,12 +130,14 @@ void checkTypeParameters() {
                     </dl>""",
                 // Method that uses class type parameter.
                 """
-                    (<a href="TypeParameters.html" title="type parameter in TypeParameters">E</a>&nbsp;param)""",
+                    (<a href="#type-param-E" title="type parameter in TypeParameters">E</a>&nbsp;param)""",
                 // Method type parameter section.
                 """
                     <dt>Type Parameters:</dt>
-                    <dd><code>T</code> - This is the first type parameter.</dd>
-                    <dd><code>V</code> - This is the second type parameter.""",
+                    <dd><span id="methodThatHasTypeParameters(T,V)-type-param-T"><code>T</code> - Th\
+                    is is the first type parameter.</span></dd>
+                    <dd><span id="methodThatHasTypeParameters(T,V)-type-param-V"><code>V</code> - Th\
+                    is is the second type parameter.</span></dd>""",
                 // Signature of method with type parameters
                 """
                     <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span c\
@@ -147,18 +149,18 @@ void checkTypeParameters() {
                 // Method that returns TypeParameters
                 """
                     <div class="col-first even-row-color method-summary-table method-summary-table-t\
-                    ab2 method-summary-table-tab4"><code><a href="TypeParameters.html" title="type p\
+                    ab2 method-summary-table-tab4"><code><a href="#type-param-E" title="type p\
                     arameter in TypeParameters">E</a>[]</code></div>
                     <div class="col-second even-row-color method-summary-table method-summary-table-\
                     tab2 method-summary-table-tab4"><code><a href="#methodThatReturnsTypeParameterA(\
                     E%5B%5D)" class="member-name-link">methodThatReturnsTypeParameterA</a><wbr>(<a h\
-                    ref="TypeParameters.html" title="type parameter in TypeParameters">E</a>[]&nbsp;\
+                    ref="#type-param-E" title="type parameter in TypeParameters">E</a>[]&nbsp;\
                     e)</code>""",
                 """
                     <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span c\
-                    lass="return-type"><a href="TypeParameters.html" title="type parameter in TypePa\
+                    lass="return-type"><a href="#type-param-E" title="type parameter in TypePa\
                     rameters">E</a>[]</span>&nbsp;<span class="element-name">methodThatReturnsTypePa\
-                    rameterA</span><wbr><span class="parameters">(<a href="TypeParameters.html" titl\
+                    rameterA</span><wbr><span class="parameters">(<a href="#type-param-E" titl\
                     e="type parameter in TypeParameters">E</a>[]&nbsp;e)</span></div>
                     """,
                 """
@@ -176,7 +178,7 @@ void checkTypeParameters() {
                 """
                     <div class="col-first odd-row-color method-summary-table method-summary-table-ta\
                     b2 method-summary-table-tab4"><code>&lt;X extends java.lang.Throwable&gt;<br><a \
-                    href="TypeParameters.html" title="type parameter in TypeParameters">E</a></code>\
+                    href="#type-param-E" title="type parameter in TypeParameters">E</a></code>\
                     </div>
                     <div class="col-second odd-row-color method-summary-table method-summary-t\
                     able-tab2 method-summary-table-tab4"><code><a href="#orElseThrow(java.util.funct\
diff --git a/test/langtools/jdk/javadoc/doclet/testParamTaglet/TestParamTaglet.java b/test/langtools/jdk/javadoc/doclet/testParamTaglet/TestParamTaglet.java
index b2364aba20106..cff69e26f269c 100644
--- a/test/langtools/jdk/javadoc/doclet/testParamTaglet/TestParamTaglet.java
+++ b/test/langtools/jdk/javadoc/doclet/testParamTaglet/TestParamTaglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -79,7 +79,7 @@ public void test() {
                     </dl>""",
                 """
                     <dt>Type Parameters:</dt>
-                    <dd><code>T2</code> - type 2</dd>
+                    <dd><span id="genericMethod(T1,T2,T3)-type-param-T2"><code>T2</code> - type 2</span></dd>
                     <dt>Parameters:</dt>
                     <dd><code>t1</code> - param 1</dd>
                     <dd><code>t3</code> - param 3</dd>
@@ -92,7 +92,7 @@ public void test() {
         checkOutput("pkg/C.Nested.html", true,
                 """
                     <dt>Type Parameters:</dt>
-                    <dd><code>T1</code> - type 1</dd>
+                    <dd><span id="type-param-T1"><code>T1</code> - type 1</span></dd>
                     </dl>""");
     }
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testProperty/TestProperty.java b/test/langtools/jdk/javadoc/doclet/testProperty/TestProperty.java
index 7ce046c07575c..94ad1a8040f6a 100644
--- a/test/langtools/jdk/javadoc/doclet/testProperty/TestProperty.java
+++ b/test/langtools/jdk/javadoc/doclet/testProperty/TestProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -110,7 +110,7 @@ class in pkg">ObjectProperty</a><wbr>&lt;<a href="MyObj.html" title="class in pk
                 """
                     <div class="member-signature"><span class="modifiers">public final</span>&nbsp;<\
                     span class="return-type"><a href="ObjectProperty.html" title="class in pkg">Obje\
-                    ctProperty</a>&lt;java.util.List&lt;<a href="MyClassT.html" title="type paramete\
+                    ctProperty</a>&lt;java.util.List&lt;<a href="#type-param-T" title="type paramete\
                     r in MyClassT">T</a>&gt;&gt;</span>&nbsp;<span class="element-name">listProperty</span><\
                     /div>
                     <div class="block">This is an Object property where the Object is a single <code>List&lt;T&gt;</code>.</div>
diff --git a/test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java b/test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java
index f9aa3cfd6fa49..3b6a8a4fc72e4 100644
--- a/test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java
+++ b/test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java
@@ -175,7 +175,7 @@ public record R<T>(int r1) { }""");
                 """
                     <dl class="notes">
                     <dt>Type Parameters:</dt>
-                    <dd><code>T</code> - This is a type parameter.</dd>
+                    <dd><span id="type-param-T"><code>T</code> - This is a type parameter.</span></dd>
                     <dt>Record Components:</dt>
                     <dd><code><span id="param-r1">r1</span></code> - This is a component.</dd>
                     </dl>""",
diff --git a/test/langtools/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java b/test/langtools/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java
index 9bf2ac362c611..af3e36aa7d897 100644
--- a/test/langtools/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java
+++ b/test/langtools/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -219,6 +219,7 @@ public void test2() {
                 """
                     <a href="pkg2/Fields.html" title="class in pkg2">Fields</a>[] singleArray""",
                 """
-                    java.lang.Class&lt;<a href="pkg2/Fields.html" title="type parameter in Fields">E</a>&gt; someClass""");
+                    java.lang.Class&lt;<a href="pkg2/Fields.html#type-param-E" title="type paramete\
+                    r in Fields">E</a>&gt; someClass""");
     }
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testThrows/TestThrows.java b/test/langtools/jdk/javadoc/doclet/testThrows/TestThrows.java
index ca4592ea5f84c..e4c578578998f 100644
--- a/test/langtools/jdk/javadoc/doclet/testThrows/TestThrows.java
+++ b/test/langtools/jdk/javadoc/doclet/testThrows/TestThrows.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -83,7 +83,7 @@ public interface C {
                  """
                      <dl class="notes">
                      <dt>Type Parameters:</dt>
-                     <dd><code>T</code> - the throwable</dd>
+                     <dd><span id="m()-type-param-T"><code>T</code> - the throwable</span></dd>
                      <dt>Throws:</dt>
                      <dd><code>T</code> - if a specific error occurs</dd>
                      <dd><code>java.lang.Exception</code> - if an exception occurs</dd>
diff --git a/test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java b/test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java
index 0d95ee38cdc94..dad610acb302e 100644
--- a/test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java
+++ b/test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      4927167 4974929 6381729 7010344 8025633 8081854 8182765 8187288 8261976
+ * @bug      4927167 4974929 6381729 7010344 8025633 8081854 8182765 8187288 8261976 8313931
  * @summary  When the type parameters are more than 10 characters in length,
  *           make sure there is a line break between type params and return type
  *           in member summary. Also, test for type parameter links in package-summary and
@@ -110,10 +110,22 @@ public void test3() {
                     <div class="col-first even-row-color"><code>&nbsp;&lt;T extends java.lang.Runnable&gt;<br></code></div>
                     <div class="col-constructor-name even-row-color"><code>\
                     <a href="#%3Cinit%3E()" class="member-name-link">CtorTypeParam</a>()</code></div>
-                    <div class="col-last even-row-color">&nbsp;</div>""",
+                    <div class="col-last even-row-color">
+                    <div class="block">Generic constructor.</div>""",
                 """
                     <div class="member-signature"><span class="modifiers">public</span>\
                     &nbsp;<span class="type-parameters">&lt;T extends java.lang.Runnable&gt;</span>\
-                    &nbsp;<span class="element-name">CtorTypeParam</span>()</div>""");
+                    &nbsp;<span class="element-name">CtorTypeParam</span>()</div>""",
+                """
+                    <a href="#%3Cinit%3E()-type-param-T"><code>T</code></a>""",
+                """
+                    <dt>Type Parameters:</dt>
+                    <dd><span id="&lt;init&gt;()-type-param-T"><code>T</code> - the type parameter</span></dd>""",
+                """
+                    <dt>See Also:</dt>
+                    <dd>
+                    <ul class="tag-list">
+                    <li><a href="#%3Cinit%3E()-type-param-T">link to type parameter</a></li>
+                    </ul>""");
     }
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testTypeParams/pkg/CtorTypeParam.java b/test/langtools/jdk/javadoc/doclet/testTypeParams/pkg/CtorTypeParam.java
index a7f2309475d28..690471861dbd9 100644
--- a/test/langtools/jdk/javadoc/doclet/testTypeParams/pkg/CtorTypeParam.java
+++ b/test/langtools/jdk/javadoc/doclet/testTypeParams/pkg/CtorTypeParam.java
@@ -24,6 +24,12 @@
 package pkg;
 
 public class CtorTypeParam {
+    /**
+     * Generic constructor. {@link T}
+     *
+     * @param <T> the type parameter
+     * @see T link to type parameter
+     */
     public <T extends Runnable> CtorTypeParam() {
     }
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testUnicode/TestUnicode.java b/test/langtools/jdk/javadoc/doclet/testUnicode/TestUnicode.java
index 76008260343ca..cf30488ec7bc2 100644
--- a/test/langtools/jdk/javadoc/doclet/testUnicode/TestUnicode.java
+++ b/test/langtools/jdk/javadoc/doclet/testUnicode/TestUnicode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -101,7 +101,7 @@ public class Code<##> {
                 """
                     <dl class="notes">
                     <dt>Type Parameters:</dt>
-                    <dd><code>##</code> - the ##</dd>
+                    <dd><span id="type-param-##"><code>##</code> - the ##</span></dd>
                     </dl>
                     """.replaceAll("##", chineseElephant),
                 """

From 2b5aec2aad3883d4d407ec3a572f78755d60190d Mon Sep 17 00:00:00 2001
From: Alexander Zvegintsev <azvegint@openjdk.org>
Date: Fri, 9 Aug 2024 11:28:59 +0000
Subject: [PATCH 369/401] 8338109:
 java/awt/Mouse/EnterExitEvents/ResizingFrameTest.java duplicate in
 ProblemList

Reviewed-by: aivanov
---
 test/jdk/ProblemList.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 293d9d108d32c..6cde711138310 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -375,7 +375,7 @@ java/awt/Modal/MultipleDialogs/MultipleDialogs3Test.java 8198665 macosx-all
 java/awt/Modal/MultipleDialogs/MultipleDialogs4Test.java 8198665 macosx-all
 java/awt/Modal/MultipleDialogs/MultipleDialogs5Test.java 8198665 macosx-all
 java/awt/Mouse/EnterExitEvents/DragWindowOutOfFrameTest.java 8177326 macosx-all
-java/awt/Mouse/EnterExitEvents/ResizingFrameTest.java 8005021 macosx-all
+java/awt/Mouse/EnterExitEvents/ResizingFrameTest.java 8005021,8332158 macosx-all,linux-x64
 java/awt/Mouse/EnterExitEvents/FullscreenEnterEventTest.java 8051455 macosx-all
 java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Standard.java 7124407,8302787  macosx-all,windows-all
 java/awt/Mouse/RemovedComponentMouseListener/RemovedComponentMouseListener.java 8157170 macosx-all
@@ -475,7 +475,6 @@ java/awt/Choice/SelectNewItemTest/SelectNewItemTest.java 8324782 macosx-all
 
 # Wayland related
 
-java/awt/Mouse/EnterExitEvents/ResizingFrameTest.java 8332158 linux-x64
 java/awt/FullScreen/FullscreenWindowProps/FullscreenWindowProps.java 8280991 linux-x64
 java/awt/FullScreen/SetFullScreenTest.java 8332155 linux-x64
 

From 069e0ea69f43960164d3e077d2c7b950cde77927 Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Fri, 9 Aug 2024 12:00:15 +0000
Subject: [PATCH 370/401] 8338064: Give better error for ConcurrentHashTable
 corruption

Reviewed-by: dholmes, shade
---
 .../share/utilities/concurrentHashTable.hpp   |  5 ++
 .../utilities/concurrentHashTable.inline.hpp  |  6 +-
 .../StringTableCorruptionTest.java            | 59 +++++++++++++++++++
 3 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 test/hotspot/jtreg/runtime/stringtable/StringTableCorruptionTest.java

diff --git a/src/hotspot/share/utilities/concurrentHashTable.hpp b/src/hotspot/share/utilities/concurrentHashTable.hpp
index 991ea9fe3c609..4e506d5fe84f1 100644
--- a/src/hotspot/share/utilities/concurrentHashTable.hpp
+++ b/src/hotspot/share/utilities/concurrentHashTable.hpp
@@ -65,6 +65,7 @@ class ConcurrentHashTable : public CHeapObj<F> {
   // the InternalTable or user-defined memory.
   class Node {
    private:
+    DEBUG_ONLY(size_t _saved_hash);
     Node * volatile _next;
     VALUE _value;
    public:
@@ -77,6 +78,10 @@ class ConcurrentHashTable : public CHeapObj<F> {
     Node* next() const;
     void set_next(Node* node)         { _next = node; }
     Node* const volatile * next_ptr() { return &_next; }
+#ifdef ASSERT
+    size_t saved_hash() const         { return _saved_hash; }
+    void set_saved_hash(size_t hash)  { _saved_hash = hash; }
+#endif
 
     VALUE* value()                    { return &_value; }
 
diff --git a/src/hotspot/share/utilities/concurrentHashTable.inline.hpp b/src/hotspot/share/utilities/concurrentHashTable.inline.hpp
index 78c7e148bbb3c..f035aeae44847 100644
--- a/src/hotspot/share/utilities/concurrentHashTable.inline.hpp
+++ b/src/hotspot/share/utilities/concurrentHashTable.inline.hpp
@@ -679,7 +679,9 @@ inline bool ConcurrentHashTable<CONFIG, F>::
         // Keep in odd list
         odd = aux->next_ptr();
       } else {
-        fatal("aux_index does not match even or odd indices");
+        const char* msg = "Cannot resize table: Node hash code has changed possibly due to corruption of the contents.";
+        DEBUG_ONLY(fatal("%s Node hash code changed from " SIZE_FORMAT " to " SIZE_FORMAT, msg, aux->saved_hash(), aux_hash);)
+        NOT_DEBUG(fatal("%s", msg);)
       }
     }
     aux = aux_next;
@@ -892,6 +894,7 @@ inline bool ConcurrentHashTable<CONFIG, F>::
   size_t i = 0;
   uintx hash = lookup_f.get_hash();
   Node* new_node = Node::create_node(_context, value, nullptr);
+  DEBUG_ONLY(new_node->set_saved_hash(hash);)
 
   while (true) {
     {
@@ -1117,6 +1120,7 @@ inline bool ConcurrentHashTable<CONFIG, F>::
   Bucket* bucket = get_bucket_in(table, hash);
   assert(!bucket->have_redirect() && !bucket->is_locked(), "bad");
   Node* new_node = Node::create_node(_context, value, bucket->first());
+  DEBUG_ONLY(new_node->set_saved_hash(hash);)
   if (!bucket->cas_first(new_node, bucket->first())) {
     assert(false, "bad");
   }
diff --git a/test/hotspot/jtreg/runtime/stringtable/StringTableCorruptionTest.java b/test/hotspot/jtreg/runtime/stringtable/StringTableCorruptionTest.java
new file mode 100644
index 0000000000000..e4d6a2e5d0f95
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/stringtable/StringTableCorruptionTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 8333356
+ * @summary Verify new error message for corrupting string table contents.
+ * @requires vm.flagless
+ * @modules java.base/java.lang:open
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ * @run driver StringTableCorruptionTest test
+ */
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class StringTableCorruptionTest {
+    public static void main(String[] args) throws Exception {
+        if (args.length > 0) {
+            ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder("--add-opens", "java.base/java.lang=ALL-UNNAMED",
+                                                             "-XX:-CreateCoredumpOnCrash", "StringTableCorruptionTest");
+            OutputAnalyzer output = new OutputAnalyzer(pb.start());
+            output.shouldContain("Node hash code has changed possibly due to corruption of the contents.");
+            output.shouldNotHaveExitValue(0);
+            return;
+        }
+
+        Field f = String.class.getDeclaredField("value");
+        f.setAccessible(true);
+        f.set("s1".intern(), f.get("s2"));
+        for (int i = 0; i < 4_000_000; i++) {
+            ("s_" + i).intern();
+        }
+    }
+}

From 3cf3f300de1e9d2c8767877ed3a26679e34b7d22 Mon Sep 17 00:00:00 2001
From: Casper Norrbin <casper.norrbin@oracle.com>
Date: Fri, 9 Aug 2024 14:32:29 +0000
Subject: [PATCH 371/401] 8330191: Fix typo in precompiled.hpp

Reviewed-by: jsjolen, szaldana
---
 src/hotspot/share/precompiled/precompiled.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/precompiled/precompiled.hpp b/src/hotspot/share/precompiled/precompiled.hpp
index c53a78de87bca..07922d129697e 100644
--- a/src/hotspot/share/precompiled/precompiled.hpp
+++ b/src/hotspot/share/precompiled/precompiled.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
 
 // These header files are included in at least 130 C++ files, as of
 // measurements made in November 2018. This list excludes files named
-// *.include.hpp, since including them decreased build performance.
+// *.inline.hpp, since including them decreased build performance.
 
 #include "classfile/classLoaderData.hpp"
 #include "classfile/javaClasses.hpp"

From 60fa08fcfe5c6551ee3120330ade93e45df618c7 Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <kvn@openjdk.org>
Date: Fri, 9 Aug 2024 17:08:19 +0000
Subject: [PATCH 372/401] 8337797: Additional ExternalAddress cleanup

Reviewed-by: adinn, thartmann
---
 src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp    | 4 ++--
 src/hotspot/cpu/riscv/jniFastGetField_riscv.cpp        | 9 ++-------
 src/hotspot/cpu/x86/assembler_x86.cpp                  | 1 +
 src/hotspot/cpu/x86/jniFastGetField_x86_32.cpp         | 8 ++++----
 src/hotspot/cpu/x86/jniFastGetField_x86_64.cpp         | 6 +++---
 src/hotspot/cpu/x86/macroAssembler_x86.cpp             | 4 ++--
 src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp           | 4 ++--
 src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp           | 4 ++--
 src/hotspot/cpu/x86/stubGenerator_x86_64_arraycopy.cpp | 2 +-
 src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp      | 4 ++--
 10 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp b/src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp
index e79b93651b072..aea268ea94443 100644
--- a/src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -201,7 +201,7 @@ address JNI_FastGetField::generate_fast_get_int_field0(BasicType type) {
 
   {
     __ enter();
-    __ lea(rscratch1, ExternalAddress(slow_case_addr));
+    __ lea(rscratch1, RuntimeAddress(slow_case_addr));
     __ blr(rscratch1);
     __ leave();
     __ ret(lr);
diff --git a/src/hotspot/cpu/riscv/jniFastGetField_riscv.cpp b/src/hotspot/cpu/riscv/jniFastGetField_riscv.cpp
index 8423ecad8a3da..f7d702c631069 100644
--- a/src/hotspot/cpu/riscv/jniFastGetField_riscv.cpp
+++ b/src/hotspot/cpu/riscv/jniFastGetField_riscv.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
  * Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -173,12 +173,7 @@ address JNI_FastGetField::generate_fast_get_int_field0(BasicType type) {
 
   {
     __ enter();
-    ExternalAddress target(slow_case_addr);
-    __ relocate(target.rspec(), [&] {
-      int32_t offset;
-      __ la(t0, target.target(), offset);
-      __ jalr(t0, offset);
-    });
+    __ rt_call(slow_case_addr);
     __ leave();
     __ ret();
   }
diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp
index 001ff472f40bb..207d3fbb61eba 100644
--- a/src/hotspot/cpu/x86/assembler_x86.cpp
+++ b/src/hotspot/cpu/x86/assembler_x86.cpp
@@ -1780,6 +1780,7 @@ void Assembler::call(Register dst) {
 
 
 void Assembler::call(Address adr) {
+  assert(!adr._rspec.reloc()->is_data(), "should not use ExternalAddress for call");
   InstructionMark im(this);
   prefix(adr);
   emit_int8((unsigned char)0xFF);
diff --git a/src/hotspot/cpu/x86/jniFastGetField_x86_32.cpp b/src/hotspot/cpu/x86/jniFastGetField_x86_32.cpp
index 34be2a61b5a47..52e4388c5d249 100644
--- a/src/hotspot/cpu/x86/jniFastGetField_x86_32.cpp
+++ b/src/hotspot/cpu/x86/jniFastGetField_x86_32.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -138,7 +138,7 @@ address JNI_FastGetField::generate_fast_get_int_field0(BasicType type) {
     default:        ShouldNotReachHere();
   }
   // tail call
-  __ jump (ExternalAddress(slow_case_addr));
+  __ jump (RuntimeAddress(slow_case_addr));
 
   __ flush ();
 
@@ -251,7 +251,7 @@ address JNI_FastGetField::generate_fast_get_long_field() {
   __ pop  (rsi);
   address slow_case_addr = jni_GetLongField_addr();;
   // tail call
-  __ jump (ExternalAddress(slow_case_addr));
+  __ jump (RuntimeAddress(slow_case_addr));
 
   __ flush ();
 
@@ -350,7 +350,7 @@ address JNI_FastGetField::generate_fast_get_float_field0(BasicType type) {
     default:       ShouldNotReachHere();
   }
   // tail call
-  __ jump (ExternalAddress(slow_case_addr));
+  __ jump (RuntimeAddress(slow_case_addr));
 
   __ flush ();
 
diff --git a/src/hotspot/cpu/x86/jniFastGetField_x86_64.cpp b/src/hotspot/cpu/x86/jniFastGetField_x86_64.cpp
index 4506205c259fb..e94b7d12b0b3c 100644
--- a/src/hotspot/cpu/x86/jniFastGetField_x86_64.cpp
+++ b/src/hotspot/cpu/x86/jniFastGetField_x86_64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -118,7 +118,7 @@ address JNI_FastGetField::generate_fast_get_int_field0(BasicType type) {
     default:                                                     break;
   }
   // tail call
-  __ jump (ExternalAddress(slow_case_addr), rscratch1);
+  __ jump (RuntimeAddress(slow_case_addr), rscratch1);
 
   __ flush ();
 
@@ -206,7 +206,7 @@ address JNI_FastGetField::generate_fast_get_float_field0(BasicType type) {
     default:                                                      break;
   }
   // tail call
-  __ jump (ExternalAddress(slow_case_addr), rscratch1);
+  __ jump (RuntimeAddress(slow_case_addr), rscratch1);
 
   __ flush ();
 
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
index affd18f937ca8..c8234d6b9b88b 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
@@ -2329,7 +2329,7 @@ void MacroAssembler::incrementl(Address dst, int value) {
 
 void MacroAssembler::jump(AddressLiteral dst, Register rscratch) {
   assert(rscratch != noreg || always_reachable(dst), "missing");
-
+  assert(!dst.rspec().reloc()->is_data(), "should not use ExternalAddress for jump");
   if (reachable(dst)) {
     jmp_literal(dst.target(), dst.rspec());
   } else {
@@ -2340,7 +2340,7 @@ void MacroAssembler::jump(AddressLiteral dst, Register rscratch) {
 
 void MacroAssembler::jump_cc(Condition cc, AddressLiteral dst, Register rscratch) {
   assert(rscratch != noreg || always_reachable(dst), "missing");
-
+  assert(!dst.rspec().reloc()->is_data(), "should not use ExternalAddress for jump_cc");
   if (reachable(dst)) {
     InstructionMark im(this);
     relocate(dst.reloc());
diff --git a/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
index 80be7c7d5b642..d313c1b216a40 100644
--- a/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
@@ -704,10 +704,10 @@ static void range_check(MacroAssembler* masm, Register pc_reg, Register temp_reg
                         address code_start, address code_end,
                         Label& L_ok) {
   Label L_fail;
-  __ lea(temp_reg, ExternalAddress(code_start));
+  __ lea(temp_reg, AddressLiteral(code_start, relocInfo::none));
   __ cmpptr(pc_reg, temp_reg);
   __ jcc(Assembler::belowEqual, L_fail);
-  __ lea(temp_reg, ExternalAddress(code_end));
+  __ lea(temp_reg, AddressLiteral(code_end, relocInfo::none));
   __ cmpptr(pc_reg, temp_reg);
   __ jcc(Assembler::below, L_ok);
   __ bind(L_fail);
diff --git a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
index f2488ef4e7445..d27b1d141fc29 100644
--- a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
+++ b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp
@@ -824,10 +824,10 @@ static void range_check(MacroAssembler* masm, Register pc_reg, Register temp_reg
                         address code_start, address code_end,
                         Label& L_ok) {
   Label L_fail;
-  __ lea(temp_reg, ExternalAddress(code_start));
+  __ lea(temp_reg, AddressLiteral(code_start, relocInfo::none));
   __ cmpptr(pc_reg, temp_reg);
   __ jcc(Assembler::belowEqual, L_fail);
-  __ lea(temp_reg, ExternalAddress(code_end));
+  __ lea(temp_reg, AddressLiteral(code_end, relocInfo::none));
   __ cmpptr(pc_reg, temp_reg);
   __ jcc(Assembler::below, L_ok);
   __ bind(L_fail);
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_arraycopy.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_arraycopy.cpp
index d8f7a6b272bc9..5b316881d0346 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64_arraycopy.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_arraycopy.cpp
@@ -215,7 +215,7 @@ void StubGenerator::array_overlap_test(address no_overlap_target, Label* NOLp, A
   __ cmpptr(to, from);
   __ lea(end_from, Address(from, count, sf, 0));
   if (NOLp == nullptr) {
-    ExternalAddress no_overlap(no_overlap_target);
+    RuntimeAddress no_overlap(no_overlap_target);
     __ jump_cc(Assembler::belowEqual, no_overlap);
     __ cmpptr(to, end_from);
     __ jump_cc(Assembler::aboveEqual, no_overlap);
diff --git a/src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp b/src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp
index 7e0814c014bec..62022d780a20b 100644
--- a/src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp
+++ b/src/hotspot/os_cpu/windows_x86/os_windows_x86.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -180,7 +180,7 @@ bool os::win32::register_code_area(char *low, char *high) {
   MacroAssembler* masm = new MacroAssembler(&cb);
   pDCD = (pDynamicCodeData) masm->pc();
 
-  masm->jump(ExternalAddress((address)&HandleExceptionFromCodeCache), rscratch1);
+  masm->jump(RuntimeAddress((address)&HandleExceptionFromCodeCache), rscratch1);
   masm->flush();
 
   // Create an Unwind Structure specifying no unwind info

From 358d77dafbe0e35d5b20340fccddc0fb8f3db82a Mon Sep 17 00:00:00 2001
From: Dmitry Chuyko <dchuyko@openjdk.org>
Date: Fri, 9 Aug 2024 17:56:37 +0000
Subject: [PATCH 373/401] 8337657: AArch64: No need for acquire fence in
 safepoint poll during JNI calls

Reviewed-by: phh
---
 src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp    | 12 ++----------
 .../aarch64/templateInterpreterGenerator_aarch64.cpp | 11 ++---------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
index 65c026b95abbd..8ce4230baa2b4 100644
--- a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
@@ -1883,16 +1883,8 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
 
   // Check for safepoint operation in progress and/or pending suspend requests.
   {
-    // We need an acquire here to ensure that any subsequent load of the
-    // global SafepointSynchronize::_state flag is ordered after this load
-    // of the thread-local polling word.  We don't want this poll to
-    // return false (i.e. not safepointing) and a later poll of the global
-    // SafepointSynchronize::_state spuriously to return true.
-    //
-    // This is to avoid a race when we're in a native->Java transition
-    // racing the code which wakes up from a safepoint.
-
-    __ safepoint_poll(safepoint_in_progress, true /* at_return */, true /* acquire */, false /* in_nmethod */);
+    // No need for acquire as Java threads always disarm themselves.
+    __ safepoint_poll(safepoint_in_progress, true /* at_return */, false /* acquire */, false /* in_nmethod */);
     __ ldrw(rscratch1, Address(rthread, JavaThread::suspend_flags_offset()));
     __ cbnzw(rscratch1, safepoint_in_progress);
     __ bind(safepoint_in_progress_done);
diff --git a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
index d639d9cf17ee5..ed2450a9110e5 100644
--- a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
@@ -1413,15 +1413,8 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   {
     Label L, Continue;
 
-    // We need an acquire here to ensure that any subsequent load of the
-    // global SafepointSynchronize::_state flag is ordered after this load
-    // of the thread-local polling word.  We don't want this poll to
-    // return false (i.e. not safepointing) and a later poll of the global
-    // SafepointSynchronize::_state spuriously to return true.
-    //
-    // This is to avoid a race when we're in a native->Java transition
-    // racing the code which wakes up from a safepoint.
-    __ safepoint_poll(L, true /* at_return */, true /* acquire */, false /* in_nmethod */);
+    // No need for acquire as Java threads always disarm themselves.
+    __ safepoint_poll(L, true /* at_return */, false /* acquire */, false /* in_nmethod */);
     __ ldrw(rscratch2, Address(rthread, JavaThread::suspend_flags_offset()));
     __ cbz(rscratch2, Continue);
     __ bind(L);

From 6a3d045221c338fefec9bd59245324eae60b156b Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Sun, 11 Aug 2024 18:34:18 +0000
Subject: [PATCH 374/401] 8337709: Use allocated states for chunking large
 array processing

Reviewed-by: iwalulya, tschatzl
---
 .../share/gc/g1/g1ParScanThreadState.cpp      |  90 +++++++----
 .../share/gc/g1/g1ParScanThreadState.hpp      |  12 +-
 .../share/gc/shared/partialArrayState.cpp     | 152 ++++++++++++++++++
 .../share/gc/shared/partialArrayState.hpp     | 136 ++++++++++++++++
 .../gc/shared/partialArrayTaskStepper.cpp     |   6 +-
 .../gc/shared/partialArrayTaskStepper.hpp     |  59 ++++---
 .../shared/partialArrayTaskStepper.inline.hpp |  71 +++-----
 src/hotspot/share/gc/shared/taskqueue.hpp     |  21 ++-
 .../shared/test_partialArrayTaskStepper.cpp   |  42 ++---
 9 files changed, 444 insertions(+), 145 deletions(-)
 create mode 100644 src/hotspot/share/gc/shared/partialArrayState.cpp
 create mode 100644 src/hotspot/share/gc/shared/partialArrayState.hpp

diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
index e4ac20ca7ea92..f81c3241a1a90 100644
--- a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
+++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
@@ -35,6 +35,7 @@
 #include "gc/g1/g1Trace.hpp"
 #include "gc/g1/g1YoungGCAllocationFailureInjector.inline.hpp"
 #include "gc/shared/continuationGCSupport.inline.hpp"
+#include "gc/shared/partialArrayState.hpp"
 #include "gc/shared/partialArrayTaskStepper.inline.hpp"
 #include "gc/shared/preservedMarks.inline.hpp"
 #include "gc/shared/stringdedup/stringDedup.hpp"
@@ -43,6 +44,7 @@
 #include "oops/access.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
+#include "runtime/mutexLocker.hpp"
 #include "runtime/prefetch.inline.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -61,7 +63,8 @@ G1ParScanThreadState::G1ParScanThreadState(G1CollectedHeap* g1h,
                                            uint worker_id,
                                            uint num_workers,
                                            G1CollectionSet* collection_set,
-                                           G1EvacFailureRegions* evac_failure_regions)
+                                           G1EvacFailureRegions* evac_failure_regions,
+                                           PartialArrayStateAllocator* pas_allocator)
   : _g1h(g1h),
     _task_queue(g1h->task_queue(worker_id)),
     _rdc_local_qset(rdcqs),
@@ -80,8 +83,8 @@ G1ParScanThreadState::G1ParScanThreadState(G1CollectedHeap* g1h,
     _surviving_young_words(nullptr),
     _surviving_words_length(collection_set->young_region_length() + 1),
     _old_gen_is_full(false),
-    _partial_objarray_chunk_size(ParGCArrayScanChunk),
-    _partial_array_stepper(num_workers),
+    _partial_array_state_allocator(pas_allocator),
+    _partial_array_stepper(num_workers, ParGCArrayScanChunk),
     _string_dedup_requests(),
     _max_num_optional_regions(collection_set->optional_region_length()),
     _numa(g1h->numa()),
@@ -169,9 +172,9 @@ void G1ParScanThreadState::verify_task(oop* task) const {
          "task=" PTR_FORMAT " p=" PTR_FORMAT, p2i(task), p2i(p));
 }
 
-void G1ParScanThreadState::verify_task(PartialArrayScanTask task) const {
+void G1ParScanThreadState::verify_task(PartialArrayState* task) const {
   // Must be in the collection set--it's already been copied.
-  oop p = task.to_source_array();
+  oop p = task->source();
   assert(_g1h->is_in_cset(p), "p=" PTR_FORMAT, p2i(p));
 }
 
@@ -180,8 +183,8 @@ void G1ParScanThreadState::verify_task(ScannerTask task) const {
     verify_task(task.to_narrow_oop_ptr());
   } else if (task.is_oop_ptr()) {
     verify_task(task.to_oop_ptr());
-  } else if (task.is_partial_array_task()) {
-    verify_task(task.to_partial_array_task());
+  } else if (task.is_partial_array_state()) {
+    verify_task(task.to_partial_array_state());
   } else {
     ShouldNotReachHere();
   }
@@ -223,34 +226,39 @@ void G1ParScanThreadState::do_oop_evac(T* p) {
 }
 
 MAYBE_INLINE_EVACUATION
-void G1ParScanThreadState::do_partial_array(PartialArrayScanTask task) {
-  oop from_obj = task.to_source_array();
+void G1ParScanThreadState::do_partial_array(PartialArrayState* state) {
+  oop to_obj = state->destination();
 
+#ifdef ASSERT
+  oop from_obj = state->source();
   assert(_g1h->is_in_reserved(from_obj), "must be in heap.");
   assert(from_obj->is_objArray(), "must be obj array");
   assert(from_obj->is_forwarded(), "must be forwarded");
-
-  oop to_obj = from_obj->forwardee();
   assert(from_obj != to_obj, "should not be chunking self-forwarded objects");
   assert(to_obj->is_objArray(), "must be obj array");
+#endif // ASSERT
+
   objArrayOop to_array = objArrayOop(to_obj);
 
-  PartialArrayTaskStepper::Step step
-    = _partial_array_stepper.next(objArrayOop(from_obj),
-                                  to_array,
-                                  _partial_objarray_chunk_size);
-  for (uint i = 0; i < step._ncreate; ++i) {
-    push_on_queue(ScannerTask(PartialArrayScanTask(from_obj)));
+  // Claim a chunk and get number of additional tasks to enqueue.
+  PartialArrayTaskStepper::Step step = _partial_array_stepper.next(state);
+  // Push any additional partial scan tasks needed.  Pushed before processing
+  // the claimed chunk to allow other workers to steal while we're processing.
+  if (step._ncreate > 0) {
+    state->add_references(step._ncreate);
+    for (uint i = 0; i < step._ncreate; ++i) {
+      push_on_queue(ScannerTask(state));
+    }
   }
 
   G1HeapRegionAttr dest_attr = _g1h->region_attr(to_array);
   G1SkipCardEnqueueSetter x(&_scanner, dest_attr.is_new_survivor());
-  // Process claimed task.  The length of to_array is not correct, but
-  // fortunately the iteration ignores the length field and just relies
-  // on start/end.
+  // Process claimed task.
   to_array->oop_iterate_range(&_scanner,
-                              step._index,
-                              step._index + _partial_objarray_chunk_size);
+                              checked_cast<int>(step._index),
+                              checked_cast<int>(step._index + _partial_array_stepper.chunk_size()));
+  // Release reference to the state, now that we're done with it.
+  _partial_array_state_allocator->release(_worker_id, state);
 }
 
 MAYBE_INLINE_EVACUATION
@@ -260,20 +268,30 @@ void G1ParScanThreadState::start_partial_objarray(G1HeapRegionAttr dest_attr,
   assert(from_obj->is_objArray(), "precondition");
   assert(from_obj->is_forwarded(), "precondition");
   assert(from_obj->forwardee() == to_obj, "precondition");
-  assert(from_obj != to_obj, "should not be scanning self-forwarded objects");
   assert(to_obj->is_objArray(), "precondition");
 
   objArrayOop to_array = objArrayOop(to_obj);
 
-  PartialArrayTaskStepper::Step step
-    = _partial_array_stepper.start(objArrayOop(from_obj),
-                                   to_array,
-                                   _partial_objarray_chunk_size);
+  size_t array_length = to_array->length();
+  PartialArrayTaskStepper::Step step = _partial_array_stepper.start(array_length);
 
   // Push any needed partial scan tasks.  Pushed before processing the
   // initial chunk to allow other workers to steal while we're processing.
-  for (uint i = 0; i < step._ncreate; ++i) {
-    push_on_queue(ScannerTask(PartialArrayScanTask(from_obj)));
+  if (step._ncreate > 0) {
+    assert(step._index < array_length, "invariant");
+    assert(((array_length - step._index) % _partial_array_stepper.chunk_size()) == 0,
+           "invariant");
+    PartialArrayState* state =
+      _partial_array_state_allocator->allocate(_worker_id,
+                                               from_obj, to_obj,
+                                               step._index,
+                                               array_length,
+                                               step._ncreate);
+    for (uint i = 0; i < step._ncreate; ++i) {
+      push_on_queue(ScannerTask(state));
+    }
+  } else {
+    assert(step._index == array_length, "invariant");
   }
 
   // Skip the card enqueue iff the object (to_array) is in survivor region.
@@ -284,9 +302,8 @@ void G1ParScanThreadState::start_partial_objarray(G1HeapRegionAttr dest_attr,
   G1SkipCardEnqueueSetter x(&_scanner, dest_attr.is_young());
   // Process the initial chunk.  No need to process the type in the
   // klass, as it will already be handled by processing the built-in
-  // module. The length of to_array is not correct, but fortunately
-  // the iteration ignores that length field and relies on start/end.
-  to_array->oop_iterate_range(&_scanner, 0, step._index);
+  // module.
+  to_array->oop_iterate_range(&_scanner, 0, checked_cast<int>(step._index));
 }
 
 MAYBE_INLINE_EVACUATION
@@ -297,7 +314,7 @@ void G1ParScanThreadState::dispatch_task(ScannerTask task) {
   } else if (task.is_oop_ptr()) {
     do_oop_evac(task.to_oop_ptr());
   } else {
-    do_partial_array(task.to_partial_array_task());
+    do_partial_array(task.to_partial_array_state());
   }
 }
 
@@ -582,7 +599,8 @@ G1ParScanThreadState* G1ParScanThreadStateSet::state_for_worker(uint worker_id)
                                worker_id,
                                _num_workers,
                                _collection_set,
-                               _evac_failure_regions);
+                               _evac_failure_regions,
+                               &_partial_array_state_allocator);
   }
   return _states[worker_id];
 }
@@ -715,7 +733,9 @@ G1ParScanThreadStateSet::G1ParScanThreadStateSet(G1CollectedHeap* g1h,
     _surviving_young_words_total(NEW_C_HEAP_ARRAY(size_t, collection_set->young_region_length() + 1, mtGC)),
     _num_workers(num_workers),
     _flushed(false),
-    _evac_failure_regions(evac_failure_regions) {
+    _evac_failure_regions(evac_failure_regions),
+    _partial_array_state_allocator(num_workers)
+{
   _preserved_marks_set.init(num_workers);
   for (uint i = 0; i < num_workers; ++i) {
     _states[i] = nullptr;
diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp
index 24ca682e14118..1cfd6fca08a6f 100644
--- a/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp
+++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp
@@ -32,6 +32,7 @@
 #include "gc/shared/ageTable.hpp"
 #include "gc/shared/copyFailedInfo.hpp"
 #include "gc/shared/gc_globals.hpp"
+#include "gc/shared/partialArrayState.hpp"
 #include "gc/shared/partialArrayTaskStepper.hpp"
 #include "gc/shared/preservedMarks.hpp"
 #include "gc/shared/stringdedup/stringDedup.hpp"
@@ -87,7 +88,8 @@ class G1ParScanThreadState : public CHeapObj<mtGC> {
   // available for allocation.
   bool _old_gen_is_full;
   // Size (in elements) of a partial objArray task chunk.
-  int _partial_objarray_chunk_size;
+  size_t _partial_objarray_chunk_size;
+  PartialArrayStateAllocator* _partial_array_state_allocator;
   PartialArrayTaskStepper _partial_array_stepper;
   StringDedup::Requests _string_dedup_requests;
 
@@ -129,7 +131,8 @@ class G1ParScanThreadState : public CHeapObj<mtGC> {
                        uint worker_id,
                        uint num_workers,
                        G1CollectionSet* collection_set,
-                       G1EvacFailureRegions* evac_failure_regions);
+                       G1EvacFailureRegions* evac_failure_regions,
+                       PartialArrayStateAllocator* partial_array_state_allocator);
   virtual ~G1ParScanThreadState();
 
   void set_ref_discoverer(ReferenceDiscoverer* rd) { _scanner.set_ref_discoverer(rd); }
@@ -140,7 +143,7 @@ class G1ParScanThreadState : public CHeapObj<mtGC> {
 
   void verify_task(narrowOop* task) const NOT_DEBUG_RETURN;
   void verify_task(oop* task) const NOT_DEBUG_RETURN;
-  void verify_task(PartialArrayScanTask task) const NOT_DEBUG_RETURN;
+  void verify_task(PartialArrayState* task) const NOT_DEBUG_RETURN;
   void verify_task(ScannerTask task) const NOT_DEBUG_RETURN;
 
   void push_on_queue(ScannerTask task);
@@ -169,7 +172,7 @@ class G1ParScanThreadState : public CHeapObj<mtGC> {
   size_t flush_stats(size_t* surviving_young_words, uint num_workers, BufferNodeList* buffer_log);
 
 private:
-  void do_partial_array(PartialArrayScanTask task);
+  void do_partial_array(PartialArrayState* state);
   void start_partial_objarray(G1HeapRegionAttr dest_dir, oop from, oop to);
 
   HeapWord* allocate_copy_slow(G1HeapRegionAttr* dest_attr,
@@ -252,6 +255,7 @@ class G1ParScanThreadStateSet : public StackObj {
   uint _num_workers;
   bool _flushed;
   G1EvacFailureRegions* _evac_failure_regions;
+  PartialArrayStateAllocator _partial_array_state_allocator;
 
  public:
   G1ParScanThreadStateSet(G1CollectedHeap* g1h,
diff --git a/src/hotspot/share/gc/shared/partialArrayState.cpp b/src/hotspot/share/gc/shared/partialArrayState.cpp
new file mode 100644
index 0000000000000..583c5dede4026
--- /dev/null
+++ b/src/hotspot/share/gc/shared/partialArrayState.cpp
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 "gc/shared/partialArrayState.hpp"
+#include "memory/allocation.inline.hpp"
+#include "memory/arena.hpp"
+#include "nmt/memflags.hpp"
+#include "oops/oopsHierarchy.hpp"
+#include "runtime/atomic.hpp"
+#include "runtime/orderAccess.hpp"
+#include "utilities/debug.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/macros.hpp"
+#include <new>
+
+PartialArrayState::PartialArrayState(oop src, oop dst,
+                                     size_t index, size_t length,
+                                     size_t initial_refcount)
+  : _source(src),
+    _destination(dst),
+    _length(length),
+    _index(index),
+    _refcount(initial_refcount)
+{
+  assert(index <= length, "precondition");
+}
+
+void PartialArrayState::add_references(size_t count) {
+  size_t new_count = Atomic::add(&_refcount, count, memory_order_relaxed);
+  assert(new_count >= count, "reference count overflow");
+}
+
+class PartialArrayStateAllocator::Impl : public CHeapObj<mtGC> {
+  struct FreeListEntry;
+
+  Arena* _arenas;
+  FreeListEntry** _free_lists;
+  uint _num_workers;
+
+public:
+  Impl(uint num_workers);
+  ~Impl();
+
+  NONCOPYABLE(Impl);
+
+  PartialArrayState* allocate(uint worker_id,
+                              oop src, oop dst,
+                              size_t index, size_t length,
+                              size_t initial_refcount);
+  void release(uint worker_id, PartialArrayState* state);
+};
+
+struct PartialArrayStateAllocator::Impl::FreeListEntry {
+  FreeListEntry* _next;
+
+  FreeListEntry(FreeListEntry* next) : _next(next) {}
+  ~FreeListEntry() = default;
+
+  NONCOPYABLE(FreeListEntry);
+};
+
+PartialArrayStateAllocator::Impl::Impl(uint num_workers)
+  : _arenas(NEW_C_HEAP_ARRAY(Arena, num_workers, mtGC)),
+    _free_lists(NEW_C_HEAP_ARRAY(FreeListEntry*, num_workers, mtGC)),
+    _num_workers(num_workers)
+{
+  for (uint i = 0; i < _num_workers; ++i) {
+    ::new (&_arenas[i]) Arena(mtGC);
+    _free_lists[i] = nullptr;
+  }
+}
+
+PartialArrayStateAllocator::Impl::~Impl() {
+  // We don't need to clean up the free lists.  Deallocating the entries
+  // does nothing, since we're using arena allocation.  Instead, leave it
+  // to the arena destructor to release the memory.
+  FREE_C_HEAP_ARRAY(FreeListEntry*, _free_lists);
+  for (uint i = 0; i < _num_workers; ++i) {
+    _arenas[i].~Arena();
+  }
+}
+
+PartialArrayState* PartialArrayStateAllocator::Impl::allocate(uint worker_id,
+                                                              oop src, oop dst,
+                                                              size_t index,
+                                                              size_t length,
+                                                              size_t initial_refcount) {
+  void* p;
+  FreeListEntry* head = _free_lists[worker_id];
+  if (head == nullptr) {
+    p = NEW_ARENA_OBJ(&_arenas[worker_id], PartialArrayState);
+  } else {
+    _free_lists[worker_id] = head->_next;
+    head->~FreeListEntry();
+    p = head;
+  }
+  return ::new (p) PartialArrayState(src, dst, index, length, initial_refcount);
+}
+
+void PartialArrayStateAllocator::Impl::release(uint worker_id, PartialArrayState* state) {
+  size_t refcount = Atomic::sub(&state->_refcount, size_t(1), memory_order_release);
+  if (refcount != 0) {
+    assert(refcount + 1 != 0, "refcount underflow");
+  } else {
+    OrderAccess::acquire();
+    state->~PartialArrayState();
+    _free_lists[worker_id] = ::new (state) FreeListEntry(_free_lists[worker_id]);
+  }
+}
+
+PartialArrayStateAllocator::PartialArrayStateAllocator(uint num_workers)
+  : _impl(new Impl(num_workers))
+{}
+
+PartialArrayStateAllocator::~PartialArrayStateAllocator() {
+  delete _impl;
+}
+
+PartialArrayState* PartialArrayStateAllocator::allocate(uint worker_id,
+                                                        oop src, oop dst,
+                                                        size_t index,
+                                                        size_t length,
+                                                        size_t initial_refcount) {
+  return _impl->allocate(worker_id, src, dst, index, length, initial_refcount);
+}
+
+void PartialArrayStateAllocator::release(uint worker_id, PartialArrayState* state) {
+  _impl->release(worker_id, state);
+}
+
diff --git a/src/hotspot/share/gc/shared/partialArrayState.hpp b/src/hotspot/share/gc/shared/partialArrayState.hpp
new file mode 100644
index 0000000000000..f3bfc3ed8b859
--- /dev/null
+++ b/src/hotspot/share/gc/shared/partialArrayState.hpp
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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_GC_SHARED_PARTIALARRAYSTATE_HPP
+#define SHARE_GC_SHARED_PARTIALARRAYSTATE_HPP
+
+#include "oops/oopsHierarchy.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/macros.hpp"
+
+class PartialArrayStateAllocator;
+
+// Instances of this class are used to represent processing progress for an
+// array task in a taskqueue.  When a sufficiently large array needs to be
+// processed, such that it is desirable to split up the processing into
+// parallelizable subtasks, a state object is allocated for the array.
+// Multiple tasks referring to the state can then be added to the taskqueue
+// for later processing, either by the current thread or by some other thread
+// that steals one of those tasks.
+//
+// Processing a state involves using the state to claim a segment of the
+// array, and processing that segment.  Claiming is done by atomically
+// incrementing the index, thereby claiming the segment from the old to new
+// index values.  New tasks should also be added as needed to ensure the
+// entire array will be processed.  A PartialArrayTaskStepper can be used to
+// help with this.
+//
+// States are allocated and released using a PartialArrayStateAllocator.
+// States are reference counted to aid in that management.  Each task
+// referring to a given state that is added to a taskqueue must increase the
+// reference count by one.  When the processing of a task referring to a state
+// is complete, the reference count must be decreased by one.  When the
+// reference count reaches zero the state should be released to the allocator
+// for later reuse.
+class PartialArrayState {
+  oop _source;
+  oop _destination;
+  size_t _length;
+  volatile size_t _index;
+  volatile size_t _refcount;
+
+  friend class PartialArrayStateAllocator;
+
+  PartialArrayState(oop src, oop dst,
+                    size_t index, size_t length,
+                    size_t initial_refcount);
+  ~PartialArrayState() = default;
+
+  NONCOPYABLE(PartialArrayState);
+
+public:
+  // Add count references, one per referring task being added to a taskqueue.
+  void add_references(size_t count);
+
+  // The source array oop.
+  oop source() const { return _source; }
+
+  // The destination array oop.  In some circumstances the source and
+  // destination may be the same.
+  oop destination() const { return _destination; }
+
+  // The length of the array oop.
+  size_t length() const { return _length; }
+
+  // A pointer to the start index for the next segment to process, for atomic
+  // update.
+  volatile size_t* index_addr() { return &_index; }
+};
+
+// This class provides memory management for PartialArrayStates.
+//
+// States are initially allocated from a set of arenas owned by the allocator.
+// This allows the entire set of allocated states to be discarded without the
+// need to keep track of or find them under some circumstances.  For example,
+// if G1 concurrent marking is aborted and needs to restart because of a full
+// marking queue, the queue doesn't need to be searched for tasks referring to
+// states to allow releasing them.  Instead the queue contents can just be
+// discarded, and the memory for the no longer referenced states will
+// eventually be reclaimed when the arenas are reset.
+//
+// A set of free-lists is placed in front of the arena allocators.  This
+// causes the maximum number of allocated states to be based on the number of
+// in-progress arrays, rather than the total number of arrays that need to be
+// processed.  The use of free-list allocators is the reason for reference
+// counting states.
+//
+// The arena and free-list to use for an allocation operation is designated by
+// the worker_id used in the operation.  This avoids locking and such on those
+// data structures, at the cost of possibly doing more total arena allocation
+// that would be needed with a single shared arena and free-list.
+class PartialArrayStateAllocator {
+  class Impl;
+  Impl* _impl;
+
+public:
+  PartialArrayStateAllocator(uint num_workers);
+  ~PartialArrayStateAllocator();
+
+  NONCOPYABLE(PartialArrayStateAllocator);
+
+  // Create a new state, obtaining the memory for it from the free-list or
+  // arena associated with worker_id.
+  PartialArrayState* allocate(uint worker_id,
+                              oop src, oop dst,
+                              size_t index, size_t length,
+                              size_t initial_refcount);
+
+  // Decrement the state's refcount.  If the new refcount is zero, add the
+  // state to the free-list associated with worker_id.  The state must have
+  // been allocated by this allocator, but that allocation doesn't need to
+  // have been associated with worker_id.
+  void release(uint worker_id, PartialArrayState* state);
+};
+
+#endif // SHARE_GC_SHARED_PARTIALARRAYSTATE_HPP
diff --git a/src/hotspot/share/gc/shared/partialArrayTaskStepper.cpp b/src/hotspot/share/gc/shared/partialArrayTaskStepper.cpp
index ed52d7abff18c..6faa162ac7bed 100644
--- a/src/hotspot/share/gc/shared/partialArrayTaskStepper.cpp
+++ b/src/hotspot/share/gc/shared/partialArrayTaskStepper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "gc/shared/partialArrayTaskStepper.hpp"
 #include "oops/arrayOop.hpp"
+#include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/powerOfTwo.hpp"
 
@@ -48,7 +49,8 @@ static uint compute_task_fanout(uint task_limit) {
   return result;
 }
 
-PartialArrayTaskStepper::PartialArrayTaskStepper(uint n_workers) :
+PartialArrayTaskStepper::PartialArrayTaskStepper(uint n_workers, size_t chunk_size) :
+  _chunk_size(chunk_size),
   _task_limit(compute_task_limit(n_workers)),
   _task_fanout(compute_task_fanout(_task_limit))
 {}
diff --git a/src/hotspot/share/gc/shared/partialArrayTaskStepper.hpp b/src/hotspot/share/gc/shared/partialArrayTaskStepper.hpp
index aec993f907ce6..a68d9bd361209 100644
--- a/src/hotspot/share/gc/shared/partialArrayTaskStepper.hpp
+++ b/src/hotspot/share/gc/shared/partialArrayTaskStepper.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,55 +28,52 @@
 #include "oops/arrayOop.hpp"
 #include "utilities/globalDefinitions.hpp"
 
-// Helper for handling PartialArrayTasks.
+class PartialArrayState;
+
+// Helper for partial array chunking tasks.
 //
 // When an array is large, we want to split it up into chunks that can be
-// processed in parallel.  Each task (implicitly) represents such a chunk.
-// We can enqueue multiple tasks at the same time.  We want to enqueue
-// enough tasks to benefit from the available parallelism, while not so many
-// as to substantially expand the task queues.
-//
-// A task directly refers to the from-space array.  The from-space array's
-// forwarding pointer refers to the associated to-space array, and its
-// length is the actual length. The to-space array's length field is used to
-// indicate processing progress.  It is the starting index of the next chunk
-// to process, or equals the actual length when there are no more chunks to
-// be processed.
+// processed in parallel.  Each task (implicitly) represents such a chunk.  We
+// can enqueue multiple tasks at the same time.  We want to enqueue enough
+// tasks to benefit from the available parallelism, while not so many as to
+// substantially expand the task queues.
 class PartialArrayTaskStepper {
 public:
-  PartialArrayTaskStepper(uint n_workers);
+  PartialArrayTaskStepper(uint n_workers, size_t chunk_size);
 
   struct Step {
-    int _index;                 // Array index for the step.
+    size_t _index;              // Array index for the step.
     uint _ncreate;              // Number of new tasks to create.
   };
 
-  // Set to's length to the end of the initial chunk, which is the start of
-  // the first partial task if the array is large enough to need splitting.
-  // Returns a Step with _index being that index and _ncreate being the
-  // initial number of partial tasks to enqueue.
-  inline Step start(arrayOop from, arrayOop to, int chunk_size) const;
+  // Called with the length of the array to be processed.  Returns a Step with
+  // _index being the end of the initial chunk, which the caller should
+  // process.  This is also the starting index for the next chunk to process.
+  // The _ncreate is the number of tasks to enqueue to continue processing the
+  // array.  If _ncreate is zero then _index will be length.
+  inline Step start(size_t length) const;
+
+  // Atomically increment state's index by chunk_size() to claim the next
+  // chunk.  Returns a Step with _index being the starting index of the
+  // claimed chunk and _ncreate being the number of additional partial tasks
+  // to enqueue.
+  inline Step next(PartialArrayState* state) const;
 
-  // Increment to's length by chunk_size to claim the next chunk.  Returns a
-  // Step with _index being the starting index of the claimed chunk and
-  // _ncreate being the number of additional partial tasks to enqueue.
-  // precondition: chunk_size must be the same as used to start the task sequence.
-  inline Step next(arrayOop from, arrayOop to, int chunk_size) const;
+  // The size of chunks to claim for each task.
+  inline size_t chunk_size() const;
 
   class TestSupport;            // For unit tests
 
 private:
+  // Size (number of elements) of a chunk to process.
+  size_t _chunk_size;
   // Limit on the number of partial array tasks to create for a given array.
   uint _task_limit;
   // Maximum number of new tasks to create when processing an existing task.
   uint _task_fanout;
 
-  // Split start/next into public part dealing with oops and private
-  // impl dealing with lengths and pointers to lengths, for unit testing.
-  // length is the actual length obtained from the from-space object.
-  // to_length_addr is the address of the to-space object's length value.
-  inline Step start_impl(int length, int* to_length_addr, int chunk_size) const;
-  inline Step next_impl(int length, int* to_length_addr, int chunk_size) const;
+  // For unit tests.
+  inline Step next_impl(size_t length, volatile size_t* index_addr) const;
 };
 
 #endif // SHARE_GC_SHARED_PARTIALARRAYTASKSTEPPER_HPP
diff --git a/src/hotspot/share/gc/shared/partialArrayTaskStepper.inline.hpp b/src/hotspot/share/gc/shared/partialArrayTaskStepper.inline.hpp
index aa9a02c49025a..1d43578b5fea5 100644
--- a/src/hotspot/share/gc/shared/partialArrayTaskStepper.inline.hpp
+++ b/src/hotspot/share/gc/shared/partialArrayTaskStepper.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,66 +25,46 @@
 #ifndef SHARE_GC_SHARED_PARTIALARRAYTASKSTEPPER_INLINE_HPP
 #define SHARE_GC_SHARED_PARTIALARRAYTASKSTEPPER_INLINE_HPP
 
+#include "gc/shared/partialArrayState.hpp"
 #include "gc/shared/partialArrayTaskStepper.hpp"
-
-#include "oops/arrayOop.hpp"
 #include "runtime/atomic.hpp"
+#include "utilities/checkedCast.hpp"
+#include "utilities/debug.hpp"
 
-PartialArrayTaskStepper::Step
-PartialArrayTaskStepper::start_impl(int length,
-                                    int* to_length_addr,
-                                    int chunk_size) const {
-  assert(chunk_size > 0, "precondition");
-
-  int end = length % chunk_size; // End of initial chunk.
-  // Set to's length to end of initial chunk.  Partial tasks use that length
-  // field as the start of the next chunk to process.  Must be done before
-  // enqueuing partial scan tasks, in case other threads steal any of those
-  // tasks.
-  //
-  // The value of end can be 0, either because of a 0-length array or
-  // because length is a multiple of the chunk size.  Both of those are
-  // relatively rare and handled in the normal course of the iteration, so
-  // not worth doing anything special about here.
-  *to_length_addr = end;
+size_t PartialArrayTaskStepper::chunk_size() const {
+  return _chunk_size;
+}
 
+PartialArrayTaskStepper::Step
+PartialArrayTaskStepper::start(size_t length) const {
+  size_t end = length % _chunk_size; // End of initial chunk.
   // If the initial chunk is the complete array, then don't need any partial
   // tasks.  Otherwise, start with just one partial task; see new task
   // calculation in next().
-  Step result = { end, (length > end) ? 1u : 0u };
-  return result;
+  return Step{ end, (length > end) ? 1u : 0u };
 }
 
 PartialArrayTaskStepper::Step
-PartialArrayTaskStepper::start(arrayOop from, arrayOop to, int chunk_size) const {
-  return start_impl(from->length(), to->length_addr(), chunk_size);
-}
-
-PartialArrayTaskStepper::Step
-PartialArrayTaskStepper::next_impl(int length,
-                                   int* to_length_addr,
-                                   int chunk_size) const {
-  assert(chunk_size > 0, "precondition");
-
-  // The start of the next task is in the length field of the to-space object.
+PartialArrayTaskStepper::next_impl(size_t length, volatile size_t* index_addr) const {
+  // The start of the next task is in the state's index.
   // Atomically increment by the chunk size to claim the associated chunk.
   // Because we limit the number of enqueued tasks to being no more than the
   // number of remaining chunks to process, we can use an atomic add for the
   // claim, rather than a CAS loop.
-  int start = Atomic::fetch_then_add(to_length_addr,
-                                     chunk_size,
-                                     memory_order_relaxed);
+  size_t start = Atomic::fetch_then_add(index_addr,
+                                        _chunk_size,
+                                        memory_order_relaxed);
 
-  assert(start < length, "invariant: start %d, length %d", start, length);
-  assert(((length - start) % chunk_size) == 0,
-         "invariant: start %d, length %d, chunk size %d",
-         start, length, chunk_size);
+  assert(start < length, "invariant: start %zu, length %zu", start, length);
+  assert(((length - start) % _chunk_size) == 0,
+         "invariant: start %zu, length %zu, chunk size %zu",
+         start, length, _chunk_size);
 
   // Determine the number of new tasks to create.
   // Zero-based index for this partial task.  The initial task isn't counted.
-  uint task_num = (start / chunk_size);
+  uint task_num = checked_cast<uint>(start / _chunk_size);
   // Number of tasks left to process, including this one.
-  uint remaining_tasks = (length - start) / chunk_size;
+  uint remaining_tasks = checked_cast<uint>((length - start) / _chunk_size);
   assert(remaining_tasks > 0, "invariant");
   // Compute number of pending tasks, including this one.  The maximum number
   // of tasks is a function of task_num (N) and _task_fanout (F).
@@ -106,13 +86,12 @@ PartialArrayTaskStepper::next_impl(int length,
   // of tasks to add for this task.
   uint pending = MIN3(max_pending, remaining_tasks, _task_limit);
   uint ncreate = MIN2(_task_fanout, MIN2(remaining_tasks, _task_limit + 1) - pending);
-  Step result = { start, ncreate };
-  return result;
+  return Step{ start, ncreate };
 }
 
 PartialArrayTaskStepper::Step
-PartialArrayTaskStepper::next(arrayOop from, arrayOop to, int chunk_size) const {
-  return next_impl(from->length(), to->length_addr(), chunk_size);
+PartialArrayTaskStepper::next(PartialArrayState* state) const {
+  return next_impl(state->length(), state->index_addr());
 }
 
 #endif // SHARE_GC_SHARED_PARTIALARRAYTASKSTEPPER_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/taskqueue.hpp b/src/hotspot/share/gc/shared/taskqueue.hpp
index 2e21ba33b0bf7..2ea75e1457c48 100644
--- a/src/hotspot/share/gc/shared/taskqueue.hpp
+++ b/src/hotspot/share/gc/shared/taskqueue.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -576,6 +576,7 @@ class ObjArrayTask
 // Wrapper over an oop that is a partially scanned array.
 // Can be converted to a ScannerTask for placement in associated task queues.
 // Refers to the partially copied source array oop.
+// Temporarily retained to support ParallelGC until it adopts PartialArrayState.
 class PartialArrayScanTask {
   oop _src;
 
@@ -586,7 +587,9 @@ class PartialArrayScanTask {
   oop to_source_array() const { return _src; }
 };
 
-// Discriminated union over oop*, narrowOop*, and PartialArrayScanTask.
+class PartialArrayState;
+
+// Discriminated union over oop*, narrowOop*, and PartialArrayState.
 // Uses a low tag in the associated pointer to identify the category.
 // Used as a task queue element type.
 class ScannerTask {
@@ -624,9 +627,13 @@ class ScannerTask {
 
   explicit ScannerTask(narrowOop* p) : _p(encode(p, NarrowOopTag)) {}
 
+  // Temporarily retained to support ParallelGC until it adopts PartialArrayState.
   explicit ScannerTask(PartialArrayScanTask t) :
     _p(encode(t.to_source_array(), PartialArrayTag)) {}
 
+  explicit ScannerTask(PartialArrayState* state) :
+    _p(encode(state, PartialArrayTag)) {}
+
   // Trivially copyable.
 
   // Predicate implementations assume OopTag == 0, others are powers of 2.
@@ -639,10 +646,15 @@ class ScannerTask {
     return (raw_value() & NarrowOopTag) != 0;
   }
 
+  // Temporarily retained to support ParallelGC until it adopts PartialArrayState.
   bool is_partial_array_task() const {
     return (raw_value() & PartialArrayTag) != 0;
   }
 
+  bool is_partial_array_state() const {
+    return (raw_value() & PartialArrayTag) != 0;
+  }
+
   oop* to_oop_ptr() const {
     return static_cast<oop*>(decode(OopTag));
   }
@@ -651,9 +663,14 @@ class ScannerTask {
     return static_cast<narrowOop*>(decode(NarrowOopTag));
   }
 
+  // Temporarily retained to support ParallelGC until it adopts PartialArrayState.
   PartialArrayScanTask to_partial_array_task() const {
     return PartialArrayScanTask(cast_to_oop(decode(PartialArrayTag)));
   }
+
+  PartialArrayState* to_partial_array_state() const {
+    return static_cast<PartialArrayState*>(decode(PartialArrayTag));
+  }
 };
 
 #endif // SHARE_GC_SHARED_TASKQUEUE_HPP
diff --git a/test/hotspot/gtest/gc/shared/test_partialArrayTaskStepper.cpp b/test/hotspot/gtest/gc/shared/test_partialArrayTaskStepper.cpp
index fb797ba12c18f..3bb3a74437c8e 100644
--- a/test/hotspot/gtest/gc/shared/test_partialArrayTaskStepper.cpp
+++ b/test/hotspot/gtest/gc/shared/test_partialArrayTaskStepper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,50 +32,42 @@ using Stepper = PartialArrayTaskStepper;
 
 class PartialArrayTaskStepper::TestSupport : AllStatic {
 public:
-  static Step start(const Stepper* stepper,
-                    int length,
-                    int* to_length_addr,
-                    uint chunk_size) {
-    return stepper->start_impl(length, to_length_addr, chunk_size);
-  }
-
   static Step next(const Stepper* stepper,
-                   int length,
-                   int* to_length_addr,
-                   uint chunk_size) {
-    return stepper->next_impl(length, to_length_addr, chunk_size);
+                   size_t length,
+                   size_t* to_length_addr) {
+    return stepper->next_impl(length, to_length_addr);
   }
 };
 
 using StepperSupport = PartialArrayTaskStepper::TestSupport;
 
-static int simulate(const Stepper* stepper,
-                    int length,
-                    int* to_length_addr,
-                    uint chunk_size) {
-  Step init = StepperSupport::start(stepper, length, to_length_addr, chunk_size);
+static uint simulate(const Stepper* stepper,
+                     size_t length,
+                     size_t* to_length_addr) {
+  Step init = stepper->start(length);
+  *to_length_addr = init._index;
   uint queue_count = init._ncreate;
-  int task = 0;
+  uint task = 0;
   for ( ; queue_count > 0; ++task) {
     --queue_count;
-    Step step = StepperSupport::next(stepper, length, to_length_addr, chunk_size);
+    Step step = StepperSupport::next(stepper, length, to_length_addr);
     queue_count += step._ncreate;
   }
   return task;
 }
 
-static void run_test(int length, int chunk_size, uint n_workers) {
-  const PartialArrayTaskStepper stepper(n_workers);
-  int to_length;
-  int tasks = simulate(&stepper, length, &to_length, chunk_size);
+static void run_test(size_t length, size_t chunk_size, uint n_workers) {
+  const PartialArrayTaskStepper stepper(n_workers, chunk_size);
+  size_t to_length;
+  uint tasks = simulate(&stepper, length, &to_length);
   ASSERT_EQ(length, to_length);
   ASSERT_EQ(tasks, length / chunk_size);
 }
 
 TEST(PartialArrayTaskStepperTest, doit) {
-  for (int chunk_size = 50; chunk_size <= 500; chunk_size += 50) {
+  for (size_t chunk_size = 50; chunk_size <= 500; chunk_size += 50) {
     for (uint n_workers = 1; n_workers <= 256; n_workers = (n_workers * 3 / 2 + 1)) {
-      for (int length = 0; length <= 1000000; length = (length * 2 + 1)) {
+      for (size_t length = 0; length <= 1000000; length = (length * 2 + 1)) {
         run_test(length, chunk_size, n_workers);
       }
       // Ensure we hit boundary cases for length % chunk_size == 0.

From 0e7c1c1afeaba1c125b70cabe7b1b7a3193ee5c3 Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Mon, 12 Aug 2024 06:26:27 +0000
Subject: [PATCH 375/401] 8338112: Test
 testlibrary_tests/ir_framework/tests/TestPrivilegedMode.java fails with
 release build

Reviewed-by: chagedorn, thartmann
---
 .../ir_framework/tests/TestPrivilegedMode.java                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPrivilegedMode.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPrivilegedMode.java
index 347b2eb39fbfc..2122be83a0ff2 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPrivilegedMode.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPrivilegedMode.java
@@ -31,7 +31,7 @@
 
 /*
  * @test
- * @requires vm.flagless
+ * @requires vm.debug == true & vm.compiler2.enabled & vm.flagless
  * @summary Test that IR framework successfully adds test class to boot classpath in order to run in privileged mode.
  * @modules java.base/jdk.internal.vm.annotation
  * @library /test/lib /

From 692f5cbdb9bd94f03e5f18ddf07d56fbb5c0d456 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Mon, 12 Aug 2024 07:32:10 +0000
Subject: [PATCH 376/401] 8338101: remove old remap assertion in
 map_or_reserve_memory_aligned  after JDK-8338058

Reviewed-by: mdoerr, clanger
---
 src/hotspot/os/windows/os_windows.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index 65ba13b0d9e81..cb0fe95269b9f 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -3462,8 +3462,8 @@ static char* map_or_reserve_memory_aligned(size_t size, size_t alignment, int fi
                                      os::attempt_reserve_memory_at(aligned_base, size, false, flag);
   }
 
-  assert(aligned_base != nullptr, "Did not manage to re-map after %d attempts?", max_attempts);
-  assert(aligned_base != nullptr, "Did not manage to re-map after %d attempts (size %zu, alignment %zu, file descriptor %d)", max_attempts, size, alignment, file_desc);
+  assert(aligned_base != nullptr,
+      "Did not manage to re-map after %d attempts (size %zu, alignment %zu, file descriptor %d)", max_attempts, size, alignment, file_desc);
 
   return aligned_base;
 }

From 03204600c596214895ef86581eba9722f76d39b3 Mon Sep 17 00:00:00 2001
From: Andrew Haley <aph@openjdk.org>
Date: Mon, 12 Aug 2024 07:38:43 +0000
Subject: [PATCH 377/401] 8337958: Out-of-bounds array access in
 secondary_super_cache

Reviewed-by: vlivanov, shade
---
 src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp |  4 ++--
 src/hotspot/cpu/riscv/macroAssembler_riscv.cpp     |  4 ++--
 src/hotspot/cpu/x86/macroAssembler_x86.cpp         |  5 ++---
 src/hotspot/share/oops/klass.cpp                   | 13 ++++++++-----
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index 25dfaca6dca20..9dd4371cf69e2 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -1730,8 +1730,8 @@ void MacroAssembler::lookup_secondary_supers_table_slow_path(Register r_super_kl
   // The bitmap is full to bursting.
   // Implicit invariant: BITMAP_FULL implies (length > 0)
   assert(Klass::SECONDARY_SUPERS_BITMAP_FULL == ~uintx(0), "");
-  cmn(r_bitmap, (u1)1);
-  br(EQ, L_huge);
+  cmpw(r_array_length, (u1)(Klass::SECONDARY_SUPERS_TABLE_SIZE - 2));
+  br(GT, L_huge);
 
   // NB! Our caller has checked bits 0 and 1 in the bitmap. The
   // current slot (at secondary_supers[r_array_index]) has not yet
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index e0b24b7fd66ca..c6624cb45bb4e 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -3973,8 +3973,8 @@ void MacroAssembler::lookup_secondary_supers_table_slow_path(Register r_super_kl
 
   // Check if bitmap is SECONDARY_SUPERS_BITMAP_FULL
   assert(Klass::SECONDARY_SUPERS_BITMAP_FULL == ~uintx(0), "Adjust this code");
-  addi(t0, r_bitmap, (u1)1);
-  beqz(t0, L_bitmap_full);
+  subw(t0, r_array_length, Klass::SECONDARY_SUPERS_TABLE_SIZE - 2);
+  bgtz(t0, L_bitmap_full);
 
   // NB! Our caller has checked bits 0 and 1 in the bitmap. The
   // current slot (at secondary_supers[r_array_index]) has not yet
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
index c8234d6b9b88b..78bcabb2000b3 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
@@ -4945,9 +4945,8 @@ void MacroAssembler::lookup_secondary_supers_table_slow_path(Register r_super_kl
 
   // The bitmap is full to bursting.
   // Implicit invariant: BITMAP_FULL implies (length > 0)
-  assert(Klass::SECONDARY_SUPERS_BITMAP_FULL == ~uintx(0), "");
-  cmpq(r_bitmap, (int32_t)-1); // sign-extends immediate to 64-bit value
-  jcc(Assembler::equal, L_huge);
+  cmpl(r_array_length, (int32_t)Klass::SECONDARY_SUPERS_TABLE_SIZE - 2);
+  jcc(Assembler::greater, L_huge);
 
   // NB! Our caller has checked bits 0 and 1 in the bitmap. The
   // current slot (at secondary_supers[r_array_index]) has not yet
diff --git a/src/hotspot/share/oops/klass.cpp b/src/hotspot/share/oops/klass.cpp
index 1fed317a86016..964bb030b960e 100644
--- a/src/hotspot/share/oops/klass.cpp
+++ b/src/hotspot/share/oops/klass.cpp
@@ -306,6 +306,7 @@ void Klass::set_secondary_supers(Array<Klass*>* secondaries, uintx bitmap) {
   if (UseSecondarySupersTable && secondaries != nullptr) {
     uintx real_bitmap = compute_secondary_supers_bitmap(secondaries);
     assert(bitmap == real_bitmap, "must be");
+    assert(secondaries->length() >= (int)population_count(bitmap), "must be");
   }
 #endif
   _bitmap = bitmap;
@@ -344,11 +345,12 @@ uintx Klass::hash_secondary_supers(Array<Klass*>* secondaries, bool rewrite) {
     return uintx(1) << hash_slot;
   }
 
-  // For performance reasons we don't use a hashed table unless there
-  // are at least two empty slots in it. If there were only one empty
-  // slot it'd take a long time to create the table and the resulting
-  // search would be no faster than linear probing.
-  if (length > SECONDARY_SUPERS_TABLE_SIZE - 2) {
+  // Invariant: _secondary_supers.length >= population_count(_secondary_supers_bitmap)
+
+  // Don't attempt to hash a table that's completely full, because in
+  // the case of an absent interface linear probing would not
+  // terminate.
+  if (length >= SECONDARY_SUPERS_TABLE_SIZE) {
     return SECONDARY_SUPERS_BITMAP_FULL;
   }
 
@@ -788,6 +790,7 @@ void Klass::remove_java_mirror() {
 void Klass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protection_domain, TRAPS) {
   assert(is_klass(), "ensure C++ vtable is restored");
   assert(is_shared(), "must be set");
+  assert(secondary_supers()->length() >= (int)population_count(_bitmap), "must be");
   JFR_ONLY(RESTORE_ID(this);)
   if (log_is_enabled(Trace, cds, unshareable)) {
     ResourceMark rm(THREAD);

From a6c0630737bbf2f2e6c64863ff9b43c50c4742b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <joel.sikstrom@oracle.com>
Date: Mon, 12 Aug 2024 10:58:05 +0000
Subject: [PATCH 378/401] 8337938: ZUtils::alloc_aligned allocates without
 reporting to NMT

Reviewed-by: stefank, kbarrett
---
 src/hotspot/os/posix/gc/z/zUtils_posix.cpp    | 43 -------------------
 .../os/windows/gc/z/zUtils_windows.cpp        | 40 -----------------
 src/hotspot/share/gc/z/zStat.cpp              |  4 +-
 src/hotspot/share/gc/z/zUtils.hpp             |  4 +-
 src/hotspot/share/gc/z/zUtils.inline.hpp      | 15 ++++++-
 src/hotspot/share/gc/z/zValue.inline.hpp      |  6 +--
 6 files changed, 21 insertions(+), 91 deletions(-)
 delete mode 100644 src/hotspot/os/posix/gc/z/zUtils_posix.cpp
 delete mode 100644 src/hotspot/os/windows/gc/z/zUtils_windows.cpp

diff --git a/src/hotspot/os/posix/gc/z/zUtils_posix.cpp b/src/hotspot/os/posix/gc/z/zUtils_posix.cpp
deleted file mode 100644
index dc5af2b973a25..0000000000000
--- a/src/hotspot/os/posix/gc/z/zUtils_posix.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2015, 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 "gc/z/zUtils.hpp"
-#include "utilities/debug.hpp"
-#include "utilities/globalDefinitions.hpp"
-
-#include <stdlib.h>
-
-uintptr_t ZUtils::alloc_aligned(size_t alignment, size_t size) {
-  void* res = nullptr;
-
-  // Use raw posix_memalign as long as we have no wrapper for it
-  ALLOW_C_FUNCTION(::posix_memalign, int rc = posix_memalign(&res, alignment, size);)
-  if (rc != 0) {
-    fatal("posix_memalign() failed");
-  }
-
-  memset(res, 0, size);
-
-  return (uintptr_t)res;
-}
diff --git a/src/hotspot/os/windows/gc/z/zUtils_windows.cpp b/src/hotspot/os/windows/gc/z/zUtils_windows.cpp
deleted file mode 100644
index 29f7f55e2d145..0000000000000
--- a/src/hotspot/os/windows/gc/z/zUtils_windows.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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 "gc/z/zUtils.hpp"
-#include "utilities/debug.hpp"
-
-#include <malloc.h>
-
-uintptr_t ZUtils::alloc_aligned(size_t alignment, size_t size) {
-  void* const res = _aligned_malloc(size, alignment);
-
-  if (res == nullptr) {
-    fatal("_aligned_malloc failed");
-  }
-
-  memset(res, 0, size);
-
-  return (uintptr_t)res;
-}
diff --git a/src/hotspot/share/gc/z/zStat.cpp b/src/hotspot/share/gc/z/zStat.cpp
index 613f7b2740b43..c2a7a23c04f53 100644
--- a/src/hotspot/share/gc/z/zStat.cpp
+++ b/src/hotspot/share/gc/z/zStat.cpp
@@ -35,7 +35,7 @@
 #include "gc/z/zRelocationSetSelector.inline.hpp"
 #include "gc/z/zStat.hpp"
 #include "gc/z/zTracer.inline.hpp"
-#include "gc/z/zUtils.hpp"
+#include "gc/z/zUtils.inline.hpp"
 #include "memory/metaspaceUtils.hpp"
 #include "memory/resourceArea.hpp"
 #include "runtime/atomic.hpp"
@@ -364,7 +364,7 @@ void ZStatValue::initialize() {
 
   // Allocation aligned memory
   const size_t size = _cpu_offset * ZCPU::count();
-  _base = ZUtils::alloc_aligned(ZCacheLineSize, size);
+  _base = ZUtils::alloc_aligned_unfreeable(ZCacheLineSize, size);
 }
 
 const char* ZStatValue::group() const {
diff --git a/src/hotspot/share/gc/z/zUtils.hpp b/src/hotspot/share/gc/z/zUtils.hpp
index f82ef06235c82..59e789d5b380f 100644
--- a/src/hotspot/share/gc/z/zUtils.hpp
+++ b/src/hotspot/share/gc/z/zUtils.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@ class ZUtils : public AllStatic {
   static const char* thread_name();
 
   // Allocation
-  static uintptr_t alloc_aligned(size_t alignment, size_t size);
+  static uintptr_t alloc_aligned_unfreeable(size_t alignment, size_t size);
 
   // Size conversion
   static size_t bytes_to_words(size_t size_in_words);
diff --git a/src/hotspot/share/gc/z/zUtils.inline.hpp b/src/hotspot/share/gc/z/zUtils.inline.hpp
index eda9fca9398a7..b6acf12df3020 100644
--- a/src/hotspot/share/gc/z/zUtils.inline.hpp
+++ b/src/hotspot/share/gc/z/zUtils.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,11 +28,24 @@
 
 #include "gc/z/zAddress.inline.hpp"
 #include "oops/oop.inline.hpp"
+#include "runtime/os.hpp"
 #include "utilities/align.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 
+inline uintptr_t ZUtils::alloc_aligned_unfreeable(size_t alignment, size_t size) {
+  const size_t padded_size = size + (alignment - 1);
+  void* const addr = os::malloc(padded_size, mtGC);
+  void* const aligned_addr = align_up(addr, alignment);
+
+  memset(aligned_addr, 0, size);
+
+  // Since free expects pointers returned by malloc, aligned_addr cannot be
+  // freed since it is most likely not the same as addr after alignment.
+  return (uintptr_t)aligned_addr;
+}
+
 inline size_t ZUtils::bytes_to_words(size_t size_in_bytes) {
   assert(is_aligned(size_in_bytes, BytesPerWord), "Size not word aligned");
   return size_in_bytes >> LogBytesPerWord;
diff --git a/src/hotspot/share/gc/z/zValue.inline.hpp b/src/hotspot/share/gc/z/zValue.inline.hpp
index b8c86cdd5c540..2367bac0f0aab 100644
--- a/src/hotspot/share/gc/z/zValue.inline.hpp
+++ b/src/hotspot/share/gc/z/zValue.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
 #include "gc/z/zCPU.inline.hpp"
 #include "gc/z/zGlobals.hpp"
 #include "gc/z/zNUMA.hpp"
-#include "gc/z/zUtils.hpp"
+#include "gc/z/zUtils.inline.hpp"
 #include "runtime/globals.hpp"
 #include "utilities/align.hpp"
 
@@ -58,7 +58,7 @@ uintptr_t ZValueStorage<S>::alloc(size_t size) {
   // Allocate new block of memory
   const size_t block_alignment = offset;
   const size_t block_size = offset * S::count();
-  _top = ZUtils::alloc_aligned(block_alignment, block_size);
+  _top = ZUtils::alloc_aligned_unfreeable(block_alignment, block_size);
   _end = _top + offset;
 
   // Retry allocation

From 89a15f1414f89d2dd32eac791e9155fcb4207e56 Mon Sep 17 00:00:00 2001
From: Daniel Gredler <daniel.gredler@gmail.com>
Date: Mon, 12 Aug 2024 12:09:22 +0000
Subject: [PATCH 379/401] 8337681: PNGImageWriter uses much more memory than
 necessary

Reviewed-by: prr, lbourges
---
 .../imageio/plugins/png/PNGImageWriter.java   |  22 ++-
 .../plugins/png/RasterReuseWriteTest.java     | 182 ++++++++++++++++++
 2 files changed, 199 insertions(+), 5 deletions(-)
 create mode 100644 test/jdk/javax/imageio/plugins/png/RasterReuseWriteTest.java

diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java
index 27707613f76ee..ca9ba7631ca03 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java
@@ -26,6 +26,7 @@
 package com.sun.imageio.plugins.png;
 
 import java.awt.Rectangle;
+import java.awt.image.BufferedImage;
 import java.awt.image.IndexColorModel;
 import java.awt.image.Raster;
 import java.awt.image.RenderedImage;
@@ -919,17 +920,28 @@ private void encodePass(ImageOutputStream os,
 
         int bitDepth = metadata.IHDR_bitDepth;
         for (int row = minY + yOffset; row < minY + height; row += ySkip) {
-            Rectangle rect = new Rectangle(minX, row, width, 1);
-            Raster ras = image.getData(rect);
+            Raster ras;
+            if (image instanceof BufferedImage bi) {
+                // Use the raster directly (no copy).
+                ras = bi.getRaster();
+            } else if (image.getNumXTiles() == 1 && image.getNumYTiles() == 1 &&
+                       image.getTileWidth() == width && image.getTileHeight() == height) {
+                // Use the single tile directly (no copy).
+                ras = image.getTile(image.getMinTileX(), image.getMinTileY());
+            } else {
+                // Make a copy of the raster data.
+                Rectangle rect = new Rectangle(minX, row, width, 1);
+                ras = image.getData(rect);
+            }
+
             if (sourceBands != null) {
-                ras = ras.createChild(minX, row, width, 1, minX, row,
-                                      sourceBands);
+                ras = ras.createChild(minX, row, width, 1, minX, row, sourceBands);
             }
 
             ras.getPixels(minX, row, width, 1, samples);
 
             if (image.getColorModel().isAlphaPremultiplied()) {
-                WritableRaster wr = ras.createCompatibleWritableRaster();
+                WritableRaster wr = ras.createCompatibleWritableRaster(minX, row, width, 1);
                 wr.setPixels(wr.getMinX(), wr.getMinY(),
                              wr.getWidth(), wr.getHeight(),
                              samples);
diff --git a/test/jdk/javax/imageio/plugins/png/RasterReuseWriteTest.java b/test/jdk/javax/imageio/plugins/png/RasterReuseWriteTest.java
new file mode 100644
index 0000000000000..64adaa6d196d2
--- /dev/null
+++ b/test/jdk/javax/imageio/plugins/png/RasterReuseWriteTest.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 8337681
+ * @summary Test that raster use optimization does not cause any regressions.
+ */
+
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.geom.AffineTransform;
+import java.awt.image.BufferedImage;
+import java.awt.image.RenderedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import javax.imageio.IIOImage;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.ImageWriteParam;
+import javax.imageio.ImageWriter;
+import javax.imageio.stream.ImageInputStream;
+import javax.imageio.stream.ImageOutputStream;
+import javax.imageio.stream.MemoryCacheImageOutputStream;
+
+public class RasterReuseWriteTest {
+
+    public static void main(String[] args) throws Exception {
+        test(BufferedImage.TYPE_INT_RGB);
+        test(BufferedImage.TYPE_INT_ARGB);
+        test(BufferedImage.TYPE_INT_ARGB_PRE);
+        test(BufferedImage.TYPE_4BYTE_ABGR);
+        test(BufferedImage.TYPE_4BYTE_ABGR_PRE);
+    }
+
+    private static void test(int type) throws Exception {
+
+        // swaps blue and red
+        int bands = (type == BufferedImage.TYPE_INT_RGB ? 3 : 4);
+        int[] sourceBands = bands == 3 ? new int[] { 2, 1, 0 } :
+                                         new int[] { 2, 1, 0, 3 };
+
+        // test writing a BufferedImage without source bands
+        BufferedImage img1 = createImage(256, 256, type);
+        byte[] bytes1 = writePng(img1, null);
+        BufferedImage img2 = ImageIO.read(new ByteArrayInputStream(bytes1));
+        compare(img1, img2, false);
+
+        // test writing a BufferedImage with source bands
+        BufferedImage img3 = createImage(256, 256, type);
+        byte[] bytes3 = writePng(img3, sourceBands);
+        BufferedImage img4 = ImageIO.read(new ByteArrayInputStream(bytes3));
+        compare(img3, img4, true);
+
+        // test writing a non-BufferedImage with source bands and one tile
+        RenderedImage img5 = toTiledImage(img1, 256);
+        byte[] bytes5 = writePng(img5, sourceBands);
+        BufferedImage img6 = ImageIO.read(new ByteArrayInputStream(bytes5));
+        compare(img5, img6, true);
+
+        // test writing a non-BufferedImage with source bands and multiple tiles
+        RenderedImage img7 = toTiledImage(img1, 128);
+        byte[] bytes7 = writePng(img7, sourceBands);
+        BufferedImage img8 = ImageIO.read(new ByteArrayInputStream(bytes7));
+        compare(img7, img8, true);
+    }
+
+    private static BufferedImage createImage(int w, int h, int type) throws Exception {
+        BufferedImage img = new BufferedImage(w, h, type);
+        Graphics2D g2d = img.createGraphics();
+        g2d.setColor(Color.WHITE);
+        g2d.fillRect(0, 0, w, h);
+        g2d.setColor(Color.GREEN);
+        g2d.drawRect(20, 20, 100, 50);
+        g2d.setColor(Color.RED);
+        g2d.drawRect(80, 10, 100, 40);
+        g2d.setColor(Color.BLUE);
+        g2d.fillRect(40, 60, 120, 30);
+        g2d.dispose();
+        return img;
+    }
+
+    private static byte[] writePng(RenderedImage img, int[] sourceBands) throws Exception {
+        ImageWriter writer = ImageIO.getImageWritersByFormatName("png").next();
+        ImageWriteParam param = writer.getDefaultWriteParam();
+        param.setSourceBands(sourceBands);
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        ImageOutputStream stream = new MemoryCacheImageOutputStream(baos);
+        writer.setOutput(stream);
+        writer.write(null, new IIOImage(img, null, null), param);
+        writer.dispose();
+        stream.flush();
+        return baos.toByteArray();
+    }
+
+    private static void compare(RenderedImage img1, RenderedImage img2, boolean blueAndRedSwapped) {
+        int[] pixels1 = getRgbPixels(img1);
+        int[] pixels2 = getRgbPixels(img2);
+        for (int i = 0; i < pixels1.length; i++) {
+            int expected;
+            if (blueAndRedSwapped && pixels1[i] == 0xFFFF0000) {
+                expected = 0xFF0000FF; // red -> blue
+            } else if (blueAndRedSwapped && pixels1[i] == 0xFF0000FF) {
+                expected = 0xFFFF0000; // blue -> red
+            } else {
+                expected = pixels1[i]; // no change
+            }
+            int actual = pixels2[i];
+            if (actual != expected) {
+                throw new RuntimeException("Pixel " + i + ": expected " +
+                    Integer.toHexString(expected) + ", but got " +
+                    Integer.toHexString(actual));
+            }
+        }
+    }
+
+    private static int[] getRgbPixels(RenderedImage img) {
+        int w = img.getWidth();
+        int h = img.getHeight();
+        if (img instanceof BufferedImage bi) {
+            return bi.getRGB(0, 0, w, h, null, 0, w);
+        } else {
+            BufferedImage bi = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
+            Graphics2D g2d = bi.createGraphics();
+            g2d.drawRenderedImage(img, new AffineTransform());
+            g2d.dispose();
+            return bi.getRGB(0, 0, w, h, null, 0, w);
+        }
+    }
+
+    private static RenderedImage toTiledImage(BufferedImage img, int tileSize) throws Exception {
+
+        // write to TIFF
+        ImageWriter writer = ImageIO.getImageWritersByFormatName("tiff").next();
+        ImageWriteParam param = writer.getDefaultWriteParam();
+        param.setTilingMode(ImageWriteParam.MODE_EXPLICIT);
+        param.setTiling(tileSize, tileSize, 0, 0);
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        ImageOutputStream stream = new MemoryCacheImageOutputStream(baos);
+        writer.setOutput(stream);
+        writer.write(null, new IIOImage(img, null, null), param);
+        writer.dispose();
+        stream.flush();
+        byte[] bytes = baos.toByteArray();
+
+        // read from TIFF
+        ImageReader reader = ImageIO.getImageReadersByFormatName("tiff").next();
+        ImageInputStream input = ImageIO.createImageInputStream(new ByteArrayInputStream(bytes));
+        reader.setInput(input);
+        RenderedImage ri = reader.readAsRenderedImage(0, null);
+        if (ri instanceof BufferedImage) {
+            throw new RuntimeException("Unexpected BufferedImage");
+        }
+        int tw = ri.getTileWidth();
+        int th = ri.getTileHeight();
+        if (tw != tileSize || th != tileSize) {
+            throw new RuntimeException("Expected tile size " + tileSize +
+                ", but found " + tw + "x" + th);
+        }
+        return ri;
+    }
+}

From 61d1dc59535a3dc186bc1986a04efdb4e5a8fa18 Mon Sep 17 00:00:00 2001
From: Vicente Romero <vromero@openjdk.org>
Date: Mon, 12 Aug 2024 13:52:57 +0000
Subject: [PATCH 380/401] 8334466: Ambiguous method call with generics may
 cause FunctionDescriptorLookupError

Reviewed-by: jlahoda
---
 .../com/sun/tools/javac/comp/Resolve.java     | 14 ++++++++---
 ...WithFunctionDescriptorLookupErrorTest.java | 25 +++++++++++++++++++
 ...hWithFunctionDescriptorLookupErrorTest.out |  2 ++
 3 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 test/langtools/tools/javac/lambda/CrashWithFunctionDescriptorLookupErrorTest.java
 create mode 100644 test/langtools/tools/javac/lambda/CrashWithFunctionDescriptorLookupErrorTest.out

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
index c71b6d341dc12..5bf1bc0ead149 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
@@ -1219,9 +1219,17 @@ private boolean unrelatedInterfaces(Type t, Type s) {
 
             /** Parameters {@code t} and {@code s} are unrelated functional interface types. */
             private boolean functionalInterfaceMostSpecific(Type t, Type s, JCTree tree) {
-                Type tDesc = types.findDescriptorType(types.capture(t));
-                Type tDescNoCapture = types.findDescriptorType(t);
-                Type sDesc = types.findDescriptorType(s);
+                Type tDesc;
+                Type tDescNoCapture;
+                Type sDesc;
+                try {
+                    tDesc = types.findDescriptorType(types.capture(t));
+                    tDescNoCapture = types.findDescriptorType(t);
+                    sDesc = types.findDescriptorType(s);
+                } catch (Types.FunctionDescriptorLookupError ex) {
+                    // don't report, a more meaningful error should be reported upstream
+                    return false;
+                }
                 final List<Type> tTypeParams = tDesc.getTypeArguments();
                 final List<Type> tTypeParamsNoCapture = tDescNoCapture.getTypeArguments();
                 final List<Type> sTypeParams = sDesc.getTypeArguments();
diff --git a/test/langtools/tools/javac/lambda/CrashWithFunctionDescriptorLookupErrorTest.java b/test/langtools/tools/javac/lambda/CrashWithFunctionDescriptorLookupErrorTest.java
new file mode 100644
index 0000000000000..bfdfc30609de4
--- /dev/null
+++ b/test/langtools/tools/javac/lambda/CrashWithFunctionDescriptorLookupErrorTest.java
@@ -0,0 +1,25 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8334466
+ * @summary Ambiguous method call with generics may cause FunctionDescriptorLookupError
+ * @compile/fail/ref=CrashWithFunctionDescriptorLookupErrorTest.out -XDrawDiagnostics CrashWithFunctionDescriptorLookupErrorTest.java
+ */
+
+import java.util.List;
+
+class CrashWithFunctionDescriptorLookupErrorTest {
+    void m() {
+        List<X> list = List.of(new X());
+        test(list.get(0));
+    }
+
+    void test(A<?> a) { }
+    void test(B<?> b) { }
+
+    interface A<T extends A<T>> { T a(); }
+    interface B<T extends B<T>> { T b(); }
+    class X implements A<X>, B<X> {
+        public X a() { return null; }
+        public X b() { return null; }
+    }
+}
diff --git a/test/langtools/tools/javac/lambda/CrashWithFunctionDescriptorLookupErrorTest.out b/test/langtools/tools/javac/lambda/CrashWithFunctionDescriptorLookupErrorTest.out
new file mode 100644
index 0000000000000..06afbc8bc18a6
--- /dev/null
+++ b/test/langtools/tools/javac/lambda/CrashWithFunctionDescriptorLookupErrorTest.out
@@ -0,0 +1,2 @@
+CrashWithFunctionDescriptorLookupErrorTest.java:13:9: compiler.err.ref.ambiguous: test, kindname.method, test(CrashWithFunctionDescriptorLookupErrorTest.A<?>), CrashWithFunctionDescriptorLookupErrorTest, kindname.method, test(CrashWithFunctionDescriptorLookupErrorTest.B<?>), CrashWithFunctionDescriptorLookupErrorTest
+1 error

From a36fb368e1a3630d32908884f4abdc3382eb9aaa Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Mon, 12 Aug 2024 15:33:31 +0000
Subject: [PATCH 381/401] 8338108: Give better error message in configure if a
 full XCode is missing

Reviewed-by: jwaters, erikj, shade
---
 make/autoconf/toolchain.m4 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4
index 57064df1ed75f..12d450cc708cd 100644
--- a/make/autoconf/toolchain.m4
+++ b/make/autoconf/toolchain.m4
@@ -678,6 +678,9 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_EXTRA],
       test_metal=`$METAL --version 2>&1`
       if test $? -ne 0; then
         AC_MSG_RESULT([no])
+        AC_MSG_NOTICE([A full XCode is required to build the JDK (not only command line tools)])
+        AC_MSG_NOTICE([If you have XCode installed, you might need to reset the Xcode active developer directory])
+        AC_MSG_NOTICE([using 'sudo xcode-select -r'])
         AC_MSG_ERROR([XCode tool 'metal' neither found in path nor with xcrun])
       else
         AC_MSG_RESULT([yes, will be using '$METAL'])

From 04b146a31f55825e2c8e3c8e42310b3b3337ae95 Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Mon, 12 Aug 2024 15:43:40 +0000
Subject: [PATCH 382/401] 8337334: Test tools/javac/7142086/T7142086.java
 timeout with fastdebug binary

Reviewed-by: vromero
---
 test/langtools/TEST.ROOT                         |  3 ++-
 test/langtools/tools/javac/7142086/T7142086.java | 12 ++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/test/langtools/TEST.ROOT b/test/langtools/TEST.ROOT
index 11daad5244f31..d816d5b096b79 100644
--- a/test/langtools/TEST.ROOT
+++ b/test/langtools/TEST.ROOT
@@ -42,4 +42,5 @@ requires.extraPropDefns.vmOpts = \
     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI \
     --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED
 requires.properties= \
-    vm.continuations
+    vm.continuations \
+    vm.debug
diff --git a/test/langtools/tools/javac/7142086/T7142086.java b/test/langtools/tools/javac/7142086/T7142086.java
index bc8260bd486f6..b6521b7ffbc05 100644
--- a/test/langtools/tools/javac/7142086/T7142086.java
+++ b/test/langtools/tools/javac/7142086/T7142086.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,12 +23,20 @@
 
 /*
  * @test
- * @bug 7142086
+ * @bug 7142086 8337334
+ * @requires vm.debug == false
  * @summary performance problem in Check.checkOverrideClashes(...)
  * @modules jdk.compiler
  * @run main/timeout=10 T7142086
  */
 
+/*
+ * @test
+ * @requires vm.debug == true
+ * @modules jdk.compiler
+ * @run main/timeout=20 T7142086
+ */
+
 import com.sun.source.util.JavacTask;
 import java.net.URI;
 import java.util.List;

From f84240bca80d2ff01e198bb67931ad4725a5b334 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Mon, 12 Aug 2024 16:03:41 +0000
Subject: [PATCH 383/401] 8338011: CDS archived heap object support for 64-bit
 Windows

Reviewed-by: stuefe, shade, ccheung
---
 src/hotspot/share/cds/filemap.cpp      | 42 +++++++++++++++++---------
 src/hotspot/share/cds/heapShared.cpp   |  1 -
 src/hotspot/share/utilities/macros.hpp |  4 +--
 3 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index 96c826fb67e82..c5a9d5cceed53 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -2178,21 +2178,35 @@ bool FileMapInfo::map_heap_region_impl() {
   // Map the archived heap data. No need to call MemTracker::record_virtual_memory_type()
   // for mapped region as it is part of the reserved java heap, which is already recorded.
   char* addr = (char*)_mapped_heap_memregion.start();
-  char* base = map_memory(_fd, _full_path, r->file_offset(),
-                          addr, _mapped_heap_memregion.byte_size(), r->read_only(),
-                          r->allow_exec());
-  if (base == nullptr || base != addr) {
-    dealloc_heap_region();
-    log_info(cds)("UseSharedSpaces: Unable to map at required address in java heap. "
-                  INTPTR_FORMAT ", size = " SIZE_FORMAT " bytes",
-                  p2i(addr), _mapped_heap_memregion.byte_size());
-    return false;
-  }
+  char* base;
 
-  if (VerifySharedSpaces && !r->check_region_crc(base)) {
-    dealloc_heap_region();
-    log_info(cds)("UseSharedSpaces: mapped heap region is corrupt");
-    return false;
+  if (MetaspaceShared::use_windows_memory_mapping()) {
+    if (!read_region(MetaspaceShared::hp, addr,
+                     align_up(_mapped_heap_memregion.byte_size(), os::vm_page_size()),
+                     /* do_commit = */ true)) {
+      dealloc_heap_region();
+      log_error(cds)("Failed to read archived heap region into " INTPTR_FORMAT, p2i(addr));
+      return false;
+    }
+    // Checks for VerifySharedSpaces is already done inside read_region()
+    base = addr;
+  } else {
+    base = map_memory(_fd, _full_path, r->file_offset(),
+                      addr, _mapped_heap_memregion.byte_size(), r->read_only(),
+                      r->allow_exec());
+    if (base == nullptr || base != addr) {
+      dealloc_heap_region();
+      log_info(cds)("UseSharedSpaces: Unable to map at required address in java heap. "
+                    INTPTR_FORMAT ", size = " SIZE_FORMAT " bytes",
+                    p2i(addr), _mapped_heap_memregion.byte_size());
+      return false;
+    }
+
+    if (VerifySharedSpaces && !r->check_region_crc(base)) {
+      dealloc_heap_region();
+      log_info(cds)("UseSharedSpaces: mapped heap region is corrupt");
+      return false;
+    }
   }
 
   r->set_mapped_base(base);
diff --git a/src/hotspot/share/cds/heapShared.cpp b/src/hotspot/share/cds/heapShared.cpp
index ff84ddc13fc6c..0a0dc56c894a4 100644
--- a/src/hotspot/share/cds/heapShared.cpp
+++ b/src/hotspot/share/cds/heapShared.cpp
@@ -1554,7 +1554,6 @@ void HeapShared::archive_object_subgraphs(ArchivableStaticFieldInfo fields[],
   //     by any of these static fields.
   //     At runtime, these classes are initialized before X's archived fields
   //     are restored by HeapShared::initialize_from_archived_subgraph().
-  int i;
   for (int i = 0; fields[i].valid(); ) {
     ArchivableStaticFieldInfo* info = &fields[i];
     const char* klass_name = info->klass_name;
diff --git a/src/hotspot/share/utilities/macros.hpp b/src/hotspot/share/utilities/macros.hpp
index 244b18ecdd422..1034dec0d9aaa 100644
--- a/src/hotspot/share/utilities/macros.hpp
+++ b/src/hotspot/share/utilities/macros.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -621,7 +621,7 @@
 #define COMPILER_HEADER(basename)        XSTR(COMPILER_HEADER_STEM(basename).hpp)
 #define COMPILER_HEADER_INLINE(basename) XSTR(COMPILER_HEADER_STEM(basename).inline.hpp)
 
-#if INCLUDE_CDS && INCLUDE_G1GC && defined(_LP64) && !defined(_WINDOWS)
+#if INCLUDE_CDS && INCLUDE_G1GC && defined(_LP64)
 #define INCLUDE_CDS_JAVA_HEAP 1
 #define CDS_JAVA_HEAP_ONLY(x) x
 #define NOT_CDS_JAVA_HEAP(x)

From 8d0831478338e9b084b2c47f46eba9faae3a5eb6 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@openjdk.org>
Date: Mon, 12 Aug 2024 17:15:39 +0000
Subject: [PATCH 384/401] 8337795: Type annotation attached to incorrect type
 during class reading

Reviewed-by: vromero
---
 .../com/sun/tools/javac/jvm/ClassReader.java  | 145 ++++++++----------
 .../processing/model/type/BasicAnnoTests.java |   4 +
 2 files changed, 65 insertions(+), 84 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
index dba5fb6a1975c..fcc1efda8dcc0 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
@@ -36,9 +36,9 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.BiFunction;
 import java.util.function.IntFunction;
 import java.util.function.Predicate;
+import java.util.stream.IntStream;
 
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.NestingKind;
@@ -2461,13 +2461,8 @@ private Type addTypeAnnotations(Type type, Predicate<TypeAnnotationPosition> fil
                         .add(attribute);
             }
 
-            // Search the structure of the type to find the contained types at each type path
-            Map<Type, List<Attribute.TypeCompound>> attributesByType = new HashMap<>();
-            new TypeAnnotationLocator(attributesByPath, attributesByType).visit(type, List.nil());
-
             // Rewrite the type and add the annotations
-            type = new TypeAnnotationTypeMapping(attributesByType).visit(type, null);
-            Assert.check(attributesByType.isEmpty(), "Failed to apply annotations to types");
+            type = new TypeAnnotationStructuralTypeMapping(attributesByPath).visit(type, List.nil());
 
             return type;
         }
@@ -2495,120 +2490,102 @@ private static Predicate<TypeAnnotationPosition> classExtends(int index) {
     }
 
     /**
-     * Visit all contained types, assembling a type path to represent the current location, and
-     * record the types at each type path that need to be annotated.
+     * A type mapping that rewrites the type to include type annotations.
+     *
+     * <p>This logic is similar to {@link Type.StructuralTypeMapping}, but also tracks the path to
+     * the contained types being rewritten, and so cannot easily share the existing logic.
      */
-    private static class TypeAnnotationLocator
-            extends Types.DefaultTypeVisitor<Void, List<TypeAnnotationPosition.TypePathEntry>> {
+    private static final class TypeAnnotationStructuralTypeMapping
+            extends Types.TypeMapping<List<TypeAnnotationPosition.TypePathEntry>> {
+
         private final Map<List<TypeAnnotationPosition.TypePathEntry>,
-                          ListBuffer<Attribute.TypeCompound>> attributesByPath;
-        private final Map<Type, List<Attribute.TypeCompound>> attributesByType;
+                ListBuffer<Attribute.TypeCompound>> attributesByPath;
 
-        private TypeAnnotationLocator(
+        private TypeAnnotationStructuralTypeMapping(
                 Map<List<TypeAnnotationPosition.TypePathEntry>, ListBuffer<Attribute.TypeCompound>>
-                        attributesByPath,
-                Map<Type, List<Attribute.TypeCompound>> attributesByType) {
+                    attributesByPath) {
             this.attributesByPath = attributesByPath;
-            this.attributesByType = attributesByType;
         }
 
+
         @Override
-        public Void visitClassType(ClassType t, List<TypeAnnotationPosition.TypePathEntry> path) {
+        public Type visitClassType(ClassType t, List<TypeAnnotationPosition.TypePathEntry> path) {
             // As described in JVMS 4.7.20.2, type annotations on nested types are located with
             // 'left-to-right' steps starting on 'the outermost part of the type for which a type
             // annotation is admissible'. So the current path represents the outermost containing
             // type of the type being visited, and we add type path steps for every contained nested
             // type.
-            List<ClassType> enclosing = List.nil();
-            for (Type curr = t;
-                    curr != null && curr != Type.noType;
+            Type outer = t.getEnclosingType();
+            Type outer1 = outer != Type.noType ? visit(outer, path) : outer;
+            for (Type curr = t.getEnclosingType();
+                    curr != Type.noType;
                     curr = curr.getEnclosingType()) {
-                enclosing = enclosing.prepend((ClassType) curr);
-            }
-            for (ClassType te : enclosing) {
-                if (te.typarams_field != null) {
-                    int i = 0;
-                    for (Type typaram : te.typarams_field) {
-                        visit(typaram, path.append(new TypeAnnotationPosition.TypePathEntry(
-                                TypeAnnotationPosition.TypePathEntryKind.TYPE_ARGUMENT, i++)));
-                    }
-                }
-                visitType(te, path);
                 path = path.append(TypeAnnotationPosition.TypePathEntry.INNER_TYPE);
             }
-            return null;
+            List<Type> typarams = t.getTypeArguments();
+            List<Type> typarams1 = rewriteTypeParams(path, typarams);
+            if (outer1 != outer || typarams != typarams1) {
+                t = new ClassType(outer1, typarams1, t.tsym, t.getMetadata());
+            }
+            return reannotate(t, path);
         }
 
-        @Override
-        public Void visitWildcardType(
-                WildcardType t, List<TypeAnnotationPosition.TypePathEntry> path) {
-            visit(t.type, path.append(TypeAnnotationPosition.TypePathEntry.WILDCARD));
-            return super.visitWildcardType(t, path);
+        private List<Type> rewriteTypeParams(
+                List<TypeAnnotationPosition.TypePathEntry> path, List<Type> typarams) {
+            var i = IntStream.iterate(0, x -> x + 1).iterator();
+            return typarams.map(typaram -> visit(typaram,
+                    path.append(new TypeAnnotationPosition.TypePathEntry(
+                            TypeAnnotationPosition.TypePathEntryKind.TYPE_ARGUMENT, i.nextInt()))));
         }
 
         @Override
-        public Void visitArrayType(ArrayType t, List<TypeAnnotationPosition.TypePathEntry> path) {
-            visit(t.elemtype, path.append(TypeAnnotationPosition.TypePathEntry.ARRAY));
-            return super.visitArrayType(t, path);
+        public Type visitWildcardType(
+                WildcardType wt, List<TypeAnnotationPosition.TypePathEntry> path) {
+            Type t = wt.type;
+            if (t != null) {
+                t = visit(t, path.append(TypeAnnotationPosition.TypePathEntry.WILDCARD));
+            }
+            if (t != wt.type) {
+                wt = new WildcardType(t, wt.kind, wt.tsym, wt.bound, wt.getMetadata());
+            }
+            return reannotate(wt, path);
         }
 
         @Override
-        public Void visitType(Type t, List<TypeAnnotationPosition.TypePathEntry> path) {
-            ListBuffer<Attribute.TypeCompound> attributes = attributesByPath.remove(path);
-            if (attributes != null) {
-                attributesByType.put(t, attributes.toList());
+        public Type visitArrayType(ArrayType t, List<TypeAnnotationPosition.TypePathEntry> path) {
+            Type elemtype = t.elemtype;
+            Type elemtype1 =
+                    visit(elemtype, path.append(TypeAnnotationPosition.TypePathEntry.ARRAY));
+            if (elemtype1 != elemtype)  {
+                t = new ArrayType(elemtype1, t.tsym, t.getMetadata());
             }
-            return null;
+            return reannotate(t, path);
         }
-    }
-
-    /** A type mapping that rewrites the type to include type annotations. */
-    private static class TypeAnnotationTypeMapping extends Type.StructuralTypeMapping<Void> {
 
-        private final Map<Type, List<Attribute.TypeCompound>> attributesByType;
-
-        private TypeAnnotationTypeMapping(
-                Map<Type, List<Attribute.TypeCompound>> attributesByType) {
-            this.attributesByType = attributesByType;
+        @Override
+        public Type visitType(Type t, List<TypeAnnotationPosition.TypePathEntry> path) {
+            return reannotate(t, path);
         }
 
-        private <T extends Type> Type reannotate(T t, BiFunction<T, Void, Type> f) {
-            // We're relying on object identify of Type instances to record where the annotations
-            // need to be added, so we have to retrieve the annotations for each type before
-            // rewriting it, and then add them after its contained types have been rewritten.
-            List<Attribute.TypeCompound> attributes = attributesByType.remove(t);
-            Type mapped = f.apply(t, null);
-            if (attributes == null) {
-                return mapped;
+        Type reannotate(Type type, List<TypeAnnotationPosition.TypePathEntry> path) {
+            List<Attribute.TypeCompound> attributes = attributesForPath(path);
+            if (attributes.isEmpty()) {
+                return type;
             }
             // Runtime-visible and -invisible annotations are completed separately, so if the same
             // type has annotations from both it will get annotated twice.
-            TypeMetadata.Annotations existing = mapped.getMetadata(TypeMetadata.Annotations.class);
+            TypeMetadata.Annotations existing = type.getMetadata(TypeMetadata.Annotations.class);
             if (existing != null) {
                 existing.annotationBuffer().addAll(attributes);
-                return mapped;
+                return type;
             }
-            return mapped.annotatedType(attributes);
+            return type.annotatedType(attributes);
         }
 
-        @Override
-        public Type visitClassType(ClassType t, Void unused) {
-            return reannotate(t, super::visitClassType);
-        }
-
-        @Override
-        public Type visitWildcardType(WildcardType t, Void unused) {
-            return reannotate(t, super::visitWildcardType);
-        }
-
-        @Override
-        public Type visitArrayType(ArrayType t, Void unused) {
-            return reannotate(t, super::visitArrayType);
-        }
-
-        @Override
-        public Type visitType(Type t, Void unused) {
-            return reannotate(t, (x, u) -> x);
+        List<Attribute.TypeCompound> attributesForPath(
+                List<TypeAnnotationPosition.TypePathEntry> path) {
+            ListBuffer<Attribute.TypeCompound> attributes = attributesByPath.remove(path);
+            return attributes != null ? attributes.toList() : List.nil();
         }
     }
 
diff --git a/test/langtools/tools/javac/processing/model/type/BasicAnnoTests.java b/test/langtools/tools/javac/processing/model/type/BasicAnnoTests.java
index d45edc8e3d6e3..acd91eac8c785 100644
--- a/test/langtools/tools/javac/processing/model/type/BasicAnnoTests.java
+++ b/test/langtools/tools/javac/processing/model/type/BasicAnnoTests.java
@@ -717,4 +717,8 @@ private class GenericNested<Y> {
             GenericNested(@TA(120) GenericInner120<X> GenericInner120.this) {}
         }
     }
+
+    @Test(posn=1, annoType=TA.class, expect="130")
+    @Test(posn=23, annoType=TA.class, expect="131")
+    public Map<@TA(130) String, @TA(131) String> f130;
 }

From 99edb4a45d6a4a871dec9c07b41b3ab66b89a4b6 Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <kvn@openjdk.org>
Date: Mon, 12 Aug 2024 17:20:20 +0000
Subject: [PATCH 385/401] 8337702: Use new ForwardExceptionNode to call
 StubRoutines::forward_exception_entry()

Reviewed-by: thartmann
---
 src/hotspot/cpu/aarch64/aarch64.ad          | 13 ++++++++
 src/hotspot/cpu/arm/arm.ad                  | 14 +++++++++
 src/hotspot/cpu/ppc/ppc.ad                  | 15 +++++++++
 src/hotspot/cpu/riscv/riscv.ad              | 16 ++++++++++
 src/hotspot/cpu/s390/s390.ad                | 14 +++++++++
 src/hotspot/cpu/x86/x86_32.ad               | 12 ++++++++
 src/hotspot/cpu/x86/x86_64.ad               | 12 ++++++++
 src/hotspot/share/adlc/formssel.cpp         | 34 ++++++++++++---------
 src/hotspot/share/opto/callnode.hpp         | 11 +++++++
 src/hotspot/share/opto/classes.hpp          |  1 +
 src/hotspot/share/opto/domgraph.cpp         |  1 +
 src/hotspot/share/opto/gcm.cpp              |  5 ++-
 src/hotspot/share/opto/generateOptoStub.cpp | 14 ++++-----
 src/hotspot/share/opto/matcher.cpp          | 15 ++++++++-
 src/hotspot/share/runtime/vmStructs.cpp     |  1 +
 15 files changed, 153 insertions(+), 25 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index d8db75961d8af..66a24a61f29c2 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -16184,6 +16184,19 @@ instruct TailjmpInd(iRegPNoSpNoRfp jump_target, iRegP_R0 ex_oop)
   ins_pipe(pipe_class_call);
 %}
 
+// Forward exception.
+instruct ForwardExceptionjmp()
+%{
+  match(ForwardException);
+  ins_cost(CALL_COST);
+
+  format %{ "b forward_exception_stub" %}
+  ins_encode %{
+    __ far_jump(RuntimeAddress(StubRoutines::forward_exception_entry()));
+  %}
+  ins_pipe(pipe_class_call);
+%}
+
 // Create exception oop: created by stack-crawling runtime code.
 // Created exception is now available to this handler, and is setup
 // just prior to jumping to this handler. No code emitted.
diff --git a/src/hotspot/cpu/arm/arm.ad b/src/hotspot/cpu/arm/arm.ad
index 638c48ad5aa31..2c7de0a58a204 100644
--- a/src/hotspot/cpu/arm/arm.ad
+++ b/src/hotspot/cpu/arm/arm.ad
@@ -8953,6 +8953,20 @@ instruct tailjmpInd(IPRegP jump_target, RExceptionRegP ex_oop) %{
   ins_pipe(tail_call);
 %}
 
+// Forward exception.
+instruct ForwardExceptionjmp()
+%{
+  match(ForwardException);
+  ins_cost(CALL_COST);
+
+  format %{ "b    forward_exception_stub" %}
+  ins_encode %{
+    // OK to trash Rtemp, because Rtemp is used by stub
+    __ jump(StubRoutines::forward_exception_entry(), relocInfo::runtime_call_type, Rtemp);
+  %}
+  ins_pipe(tail_call);
+%}
+
 // Create exception oop: created by stack-crawling runtime code.
 // Created exception is now available to this handler, and is setup
 // just prior to jumping to this handler.  No code emitted.
diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad
index 38485da958132..b34d3ef150140 100644
--- a/src/hotspot/cpu/ppc/ppc.ad
+++ b/src/hotspot/cpu/ppc/ppc.ad
@@ -14534,6 +14534,21 @@ instruct tailjmpInd(iRegPdstNoScratch jump_target, rarg1RegP ex_oop) %{
   ins_pipe(pipe_class_call);
 %}
 
+// Forward exception.
+instruct ForwardExceptionjmp()
+%{
+  match(ForwardException);
+  ins_cost(CALL_COST);
+
+  format %{ "Jmp     forward_exception_stub" %}
+  ins_encode %{
+    __ set_inst_mark();
+    __ b64_patchable(StubRoutines::forward_exception_entry(), relocInfo::runtime_call_type);
+    __ clear_inst_mark();
+  %}
+  ins_pipe(pipe_class_call);
+%}
+
 // Create exception oop: created by stack-crawling runtime code.
 // Created exception is now available to this handler, and is setup
 // just prior to jumping to this handler. No code emitted.
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index 1e26c2bf14202..d3e2b0549e9ea 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -10617,6 +10617,22 @@ instruct TailjmpInd(iRegPNoSpNoFp jump_target, iRegP_R10 ex_oop)
   ins_pipe(pipe_class_call);
 %}
 
+// Forward exception.
+instruct ForwardExceptionjmp()
+%{
+  match(ForwardException);
+
+  ins_cost(BRANCH_COST);
+
+  format %{ "j forward_exception_stub\t#@ForwardException" %}
+
+  ins_encode %{
+    __ far_jump(RuntimeAddress(StubRoutines::forward_exception_entry()));
+  %}
+
+  ins_pipe(pipe_class_call);
+%}
+
 // Create exception oop: created by stack-crawling runtime code.
 // Created exception is now available to this handler, and is setup
 // just prior to jumping to this handler. No code emitted.
diff --git a/src/hotspot/cpu/s390/s390.ad b/src/hotspot/cpu/s390/s390.ad
index e3dcfdb8759da..4de1a4e7b7f35 100644
--- a/src/hotspot/cpu/s390/s390.ad
+++ b/src/hotspot/cpu/s390/s390.ad
@@ -9517,6 +9517,20 @@ instruct tailjmpInd(iRegP jump_target, rarg1RegP ex_oop) %{
   ins_pipe(pipe_class_dummy);
 %}
 
+// Forward exception.
+instruct ForwardExceptionjmp() %{
+  match(ForwardException);
+  ins_cost(CALL_COST);
+  format %{ "Jmp    forward_exception_stub" %}
+  ins_encode %{
+    __ set_inst_mark();
+    __ load_const_optimized(Z_R1_scratch, (address)StubRoutines::forward_exception_entry());
+    __ z_br(Z_R1_scratch);
+    __ clear_inst_mark();
+  %}
+  ins_pipe(pipe_class_dummy);
+%}
+
 // Create exception oop: created by stack-crawling runtime code.
 // Created exception is now available to this handler, and is setup
 // just prior to jumping to this handler. No code emitted.
diff --git a/src/hotspot/cpu/x86/x86_32.ad b/src/hotspot/cpu/x86/x86_32.ad
index 49a3cad37df2f..7aa4f6a29a116 100644
--- a/src/hotspot/cpu/x86/x86_32.ad
+++ b/src/hotspot/cpu/x86/x86_32.ad
@@ -13583,6 +13583,18 @@ instruct tailjmpInd(eRegP_no_EBP jump_target, eAXRegP ex_oop) %{
   ins_pipe( pipe_jmp );
 %}
 
+// Forward exception.
+instruct ForwardExceptionjmp()
+%{
+  match(ForwardException);
+
+  format %{ "JMP    forward_exception_stub" %}
+  ins_encode %{
+    __ jump(RuntimeAddress(StubRoutines::forward_exception_entry()), noreg);
+  %}
+  ins_pipe(pipe_jmp);
+%}
+
 // Create exception oop: created by stack-crawling runtime code.
 // Created exception is now available to this handler, and is setup
 // just prior to jumping to this handler.  No code emitted.
diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad
index 1490cfa60b34f..3bc4cac2f06a7 100644
--- a/src/hotspot/cpu/x86/x86_64.ad
+++ b/src/hotspot/cpu/x86/x86_64.ad
@@ -12592,6 +12592,18 @@ instruct tailjmpInd(no_rbp_RegP jump_target, rax_RegP ex_oop)
   ins_pipe(pipe_jmp);
 %}
 
+// Forward exception.
+instruct ForwardExceptionjmp()
+%{
+  match(ForwardException);
+
+  format %{ "jmp     forward_exception_stub" %}
+  ins_encode %{
+    __ jump(RuntimeAddress(StubRoutines::forward_exception_entry()), noreg);
+  %}
+  ins_pipe(pipe_jmp);
+%}
+
 // Create exception oop: created by stack-crawling runtime code.
 // Created exception is now available to this handler, and is setup
 // just prior to jumping to this handler.  No code emitted.
diff --git a/src/hotspot/share/adlc/formssel.cpp b/src/hotspot/share/adlc/formssel.cpp
index be97547f8ce11..e7df38ff221a9 100644
--- a/src/hotspot/share/adlc/formssel.cpp
+++ b/src/hotspot/share/adlc/formssel.cpp
@@ -210,15 +210,16 @@ bool InstructForm::is_pinned(FormDict &globals) {
   if ( ! _matrule)  return false;
 
   int  index   = 0;
-  if (_matrule->find_type("Goto",          index)) return true;
-  if (_matrule->find_type("If",            index)) return true;
-  if (_matrule->find_type("CountedLoopEnd",index)) return true;
-  if (_matrule->find_type("Return",        index)) return true;
-  if (_matrule->find_type("Rethrow",       index)) return true;
-  if (_matrule->find_type("TailCall",      index)) return true;
-  if (_matrule->find_type("TailJump",      index)) return true;
-  if (_matrule->find_type("Halt",          index)) return true;
-  if (_matrule->find_type("Jump",          index)) return true;
+  if (_matrule->find_type("Goto",             index)) return true;
+  if (_matrule->find_type("If",               index)) return true;
+  if (_matrule->find_type("CountedLoopEnd",   index)) return true;
+  if (_matrule->find_type("Return",           index)) return true;
+  if (_matrule->find_type("Rethrow",          index)) return true;
+  if (_matrule->find_type("TailCall",         index)) return true;
+  if (_matrule->find_type("TailJump",         index)) return true;
+  if (_matrule->find_type("ForwardException", index)) return true;
+  if (_matrule->find_type("Halt",             index)) return true;
+  if (_matrule->find_type("Jump",             index)) return true;
 
   return is_parm(globals);
 }
@@ -228,12 +229,13 @@ bool InstructForm::is_projection(FormDict &globals) {
   if ( ! _matrule)  return false;
 
   int  index   = 0;
-  if (_matrule->find_type("Goto",    index)) return true;
-  if (_matrule->find_type("Return",  index)) return true;
-  if (_matrule->find_type("Rethrow", index)) return true;
-  if (_matrule->find_type("TailCall",index)) return true;
-  if (_matrule->find_type("TailJump",index)) return true;
-  if (_matrule->find_type("Halt",    index)) return true;
+  if (_matrule->find_type("Goto",             index)) return true;
+  if (_matrule->find_type("Return",           index)) return true;
+  if (_matrule->find_type("Rethrow",          index)) return true;
+  if (_matrule->find_type("TailCall",         index)) return true;
+  if (_matrule->find_type("TailJump",         index)) return true;
+  if (_matrule->find_type("ForwardException", index)) return true;
+  if (_matrule->find_type("Halt",             index)) return true;
 
   return false;
 }
@@ -376,6 +378,7 @@ bool InstructForm::is_ideal_return() const {
   if (_matrule->find_type("Rethrow",index)) return true;
   if (_matrule->find_type("TailCall",index)) return true;
   if (_matrule->find_type("TailJump",index)) return true;
+  if (_matrule->find_type("ForwardException", index)) return true;
 
   return false;
 }
@@ -894,6 +897,7 @@ uint InstructForm::oper_input_base(FormDict &globals) {
       strcmp(_matrule->_opType,"Rethrow"   )==0 ||
       strcmp(_matrule->_opType,"TailCall"  )==0 ||
       strcmp(_matrule->_opType,"TailJump"  )==0 ||
+      strcmp(_matrule->_opType,"ForwardException")==0 ||
       strcmp(_matrule->_opType,"SafePoint" )==0 ||
       strcmp(_matrule->_opType,"Halt"      )==0 )
     return AdlcVMDeps::Parms;   // Skip the machine-state edges
diff --git a/src/hotspot/share/opto/callnode.hpp b/src/hotspot/share/opto/callnode.hpp
index 120bb112ec56b..2d3835b71ad42 100644
--- a/src/hotspot/share/opto/callnode.hpp
+++ b/src/hotspot/share/opto/callnode.hpp
@@ -152,6 +152,17 @@ class RethrowNode : public Node {
 };
 
 
+//------------------------------ForwardExceptionNode---------------------------
+// Pop stack frame and jump to StubRoutines::forward_exception_entry()
+class ForwardExceptionNode : public ReturnNode {
+public:
+  ForwardExceptionNode(Node* cntrl, Node* i_o, Node* memory, Node* frameptr, Node* retadr)
+    : ReturnNode(TypeFunc::Parms, cntrl, i_o, memory, frameptr, retadr) {
+  }
+
+  virtual int Opcode() const;
+};
+
 //------------------------------TailCallNode-----------------------------------
 // Pop stack frame and jump indirect
 class TailCallNode : public ReturnNode {
diff --git a/src/hotspot/share/opto/classes.hpp b/src/hotspot/share/opto/classes.hpp
index dc61377687302..8bee6279446ef 100644
--- a/src/hotspot/share/opto/classes.hpp
+++ b/src/hotspot/share/opto/classes.hpp
@@ -184,6 +184,7 @@ macro(FastLock)
 macro(FastUnlock)
 macro(FmaD)
 macro(FmaF)
+macro(ForwardException)
 macro(Goto)
 macro(Halt)
 macro(CountPositives)
diff --git a/src/hotspot/share/opto/domgraph.cpp b/src/hotspot/share/opto/domgraph.cpp
index 363005d1181c2..84f83ef131bbd 100644
--- a/src/hotspot/share/opto/domgraph.cpp
+++ b/src/hotspot/share/opto/domgraph.cpp
@@ -239,6 +239,7 @@ uint Block_Stack::most_frequent_successor( Block *b ) {
     break;
   case Op_TailCall:
   case Op_TailJump:
+  case Op_ForwardException:
   case Op_Return:
   case Op_Halt:
   case Op_Rethrow:
diff --git a/src/hotspot/share/opto/gcm.cpp b/src/hotspot/share/opto/gcm.cpp
index 23ae8cbcb6b08..3880bea07d711 100644
--- a/src/hotspot/share/opto/gcm.cpp
+++ b/src/hotspot/share/opto/gcm.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2031,6 +2031,7 @@ float Block::succ_prob(uint i) {
 
   case Op_TailCall:
   case Op_TailJump:
+  case Op_ForwardException:
   case Op_Return:
   case Op_Halt:
   case Op_Rethrow:
@@ -2084,6 +2085,7 @@ int Block::num_fall_throughs() {
   case Op_NeverBranch:
   case Op_TailCall:
   case Op_TailJump:
+  case Op_ForwardException:
   case Op_Return:
   case Op_Halt:
   case Op_Rethrow:
@@ -2129,6 +2131,7 @@ bool Block::succ_fall_through(uint i) {
   case Op_NeverBranch:
   case Op_TailCall:
   case Op_TailJump:
+  case Op_ForwardException:
   case Op_Return:
   case Op_Halt:
   case Op_Rethrow:
diff --git a/src/hotspot/share/opto/generateOptoStub.cpp b/src/hotspot/share/opto/generateOptoStub.cpp
index 9bd7d42a3f9d7..e22f484c17955 100644
--- a/src/hotspot/share/opto/generateOptoStub.cpp
+++ b/src/hotspot/share/opto/generateOptoStub.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -255,13 +255,11 @@ void GraphKit::gen_stub(address C_function,
   Node* if_not_null = _gvn.transform( new IfTrueNode(iff)  );
 
   assert (StubRoutines::forward_exception_entry() != nullptr, "must be generated before");
-  Node *exc_target = makecon(TypeRawPtr::make( StubRoutines::forward_exception_entry() ));
-  Node *to_exc = new TailCallNode(if_not_null,
-                                  i_o(),
-                                  exit_memory,
-                                  frameptr(),
-                                  returnadr(),
-                                  exc_target, null());
+  Node *to_exc = new ForwardExceptionNode(if_not_null,
+                                          i_o(),
+                                          exit_memory,
+                                          frameptr(),
+                                          returnadr());
   root()->add_req(_gvn.transform(to_exc));  // bind to root to keep live
   C->init_start(start);
 
diff --git a/src/hotspot/share/opto/matcher.cpp b/src/hotspot/share/opto/matcher.cpp
index 4e2306602e6f7..bf773d43d3d39 100644
--- a/src/hotspot/share/opto/matcher.cpp
+++ b/src/hotspot/share/opto/matcher.cpp
@@ -804,6 +804,10 @@ void Matcher::Fixup_Save_On_Entry( ) {
   if (ret_edge_cnt > TypeFunc::Parms)
     ret_rms[TypeFunc::Parms+0] = _return_value_mask;
 
+  // Input RegMask array shared by all ForwardExceptions
+  uint forw_exc_edge_cnt = TypeFunc::Parms;
+  RegMask* forw_exc_rms  = init_input_masks( forw_exc_edge_cnt + soe_cnt, _return_addr_mask, c_frame_ptr_mask );
+
   // Input RegMask array shared by all Rethrows.
   uint reth_edge_cnt = TypeFunc::Parms+1;
   RegMask *reth_rms  = init_input_masks( reth_edge_cnt + soe_cnt, _return_addr_mask, c_frame_ptr_mask );
@@ -863,6 +867,7 @@ void Matcher::Fixup_Save_On_Entry( ) {
       case Op_Rethrow  : exit->_in_rms = reth_rms; break;
       case Op_TailCall : exit->_in_rms = tail_call_rms; break;
       case Op_TailJump : exit->_in_rms = tail_jump_rms; break;
+      case Op_ForwardException: exit->_in_rms = forw_exc_rms; break;
       case Op_Halt     : exit->_in_rms = halt_rms; break;
       default          : ShouldNotReachHere();
     }
@@ -882,6 +887,7 @@ void Matcher::Fixup_Save_On_Entry( ) {
       reth_rms     [     reth_edge_cnt] = mreg2regmask[i];
       tail_call_rms[tail_call_edge_cnt] = mreg2regmask[i];
       tail_jump_rms[tail_jump_edge_cnt] = mreg2regmask[i];
+      forw_exc_rms [ forw_exc_edge_cnt] = mreg2regmask[i];
       // Halts need the SOE registers, but only in the stack as debug info.
       // A just-prior uncommon-trap or deoptimization will use the SOE regs.
       halt_rms     [     halt_edge_cnt] = *idealreg2spillmask[_register_save_type[i]];
@@ -899,6 +905,7 @@ void Matcher::Fixup_Save_On_Entry( ) {
         reth_rms     [     reth_edge_cnt].Insert(OptoReg::Name(i+1));
         tail_call_rms[tail_call_edge_cnt].Insert(OptoReg::Name(i+1));
         tail_jump_rms[tail_jump_edge_cnt].Insert(OptoReg::Name(i+1));
+        forw_exc_rms [ forw_exc_edge_cnt].Insert(OptoReg::Name(i+1));
         halt_rms     [     halt_edge_cnt].Insert(OptoReg::Name(i+1));
         mproj = new MachProjNode( start, proj_cnt, ret_rms[ret_edge_cnt], Op_RegD );
         proj_cnt += 2;          // Skip 2 for doubles
@@ -911,6 +918,7 @@ void Matcher::Fixup_Save_On_Entry( ) {
         reth_rms     [     reth_edge_cnt] = RegMask::Empty;
         tail_call_rms[tail_call_edge_cnt] = RegMask::Empty;
         tail_jump_rms[tail_jump_edge_cnt] = RegMask::Empty;
+        forw_exc_rms [ forw_exc_edge_cnt] = RegMask::Empty;
         halt_rms     [     halt_edge_cnt] = RegMask::Empty;
         mproj = C->top();
       }
@@ -925,6 +933,7 @@ void Matcher::Fixup_Save_On_Entry( ) {
         reth_rms     [     reth_edge_cnt].Insert(OptoReg::Name(i+1));
         tail_call_rms[tail_call_edge_cnt].Insert(OptoReg::Name(i+1));
         tail_jump_rms[tail_jump_edge_cnt].Insert(OptoReg::Name(i+1));
+        forw_exc_rms [ forw_exc_edge_cnt].Insert(OptoReg::Name(i+1));
         halt_rms     [     halt_edge_cnt].Insert(OptoReg::Name(i+1));
         mproj = new MachProjNode( start, proj_cnt, ret_rms[ret_edge_cnt], Op_RegL );
         proj_cnt += 2;          // Skip 2 for longs
@@ -937,6 +946,7 @@ void Matcher::Fixup_Save_On_Entry( ) {
         reth_rms     [     reth_edge_cnt] = RegMask::Empty;
         tail_call_rms[tail_call_edge_cnt] = RegMask::Empty;
         tail_jump_rms[tail_jump_edge_cnt] = RegMask::Empty;
+        forw_exc_rms [ forw_exc_edge_cnt] = RegMask::Empty;
         halt_rms     [     halt_edge_cnt] = RegMask::Empty;
         mproj = C->top();
       } else {
@@ -948,11 +958,13 @@ void Matcher::Fixup_Save_On_Entry( ) {
       reth_edge_cnt ++;
       tail_call_edge_cnt ++;
       tail_jump_edge_cnt ++;
+      forw_exc_edge_cnt++;
       halt_edge_cnt ++;
 
       // Add a use of the SOE register to all exit paths
-      for( uint j=1; j < root->req(); j++ )
+      for (uint j=1; j < root->req(); j++) {
         root->in(j)->add_req(mproj);
+      }
     } // End of if a save-on-entry register
   } // End of for all machine registers
 }
@@ -1070,6 +1082,7 @@ static void match_alias_type(Compile* C, Node* n, Node* m) {
     case Op_Halt:
     case Op_TailCall:
     case Op_TailJump:
+    case Op_ForwardException:
       nidx = Compile::AliasIdxBot;
       nat = TypePtr::BOTTOM;
       break;
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index 4b6381bd05ebd..27dc10d2adb17 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -1422,6 +1422,7 @@
   declare_c2_type(RethrowNode, Node)                                      \
   declare_c2_type(TailCallNode, ReturnNode)                               \
   declare_c2_type(TailJumpNode, ReturnNode)                               \
+  declare_c2_type(ForwardExceptionNode, ReturnNode)                       \
   declare_c2_type(SafePointNode, MultiNode)                               \
   declare_c2_type(CallNode, SafePointNode)                                \
   declare_c2_type(CallJavaNode, CallNode)                                 \

From 2ca136a7adb6defaea3b7a69d30e6c36bda66e6a Mon Sep 17 00:00:00 2001
From: Ben Taylor <btaylor@openjdk.org>
Date: Mon, 12 Aug 2024 17:26:51 +0000
Subject: [PATCH 386/401] 8337815: Relax G1EvacStats atomic operations

Reviewed-by: kbarrett, tschatzl, shade
---
 src/hotspot/share/gc/g1/g1EvacStats.inline.hpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1EvacStats.inline.hpp b/src/hotspot/share/gc/g1/g1EvacStats.inline.hpp
index 4b4c6e104b7e3..d4cae1f983652 100644
--- a/src/hotspot/share/gc/g1/g1EvacStats.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1EvacStats.inline.hpp
@@ -30,25 +30,25 @@
 #include "runtime/atomic.hpp"
 
 inline void G1EvacStats::add_direct_allocated(size_t value) {
-  Atomic::add(&_direct_allocated, value);
+  Atomic::add(&_direct_allocated, value, memory_order_relaxed);
 }
 
 inline void G1EvacStats::add_num_plab_filled(size_t value) {
-  Atomic::add(&_num_plab_filled, value);
+  Atomic::add(&_num_plab_filled, value, memory_order_relaxed);
 }
 
 inline void G1EvacStats::add_num_direct_allocated(size_t value) {
-  Atomic::add(&_num_direct_allocated, value);
+  Atomic::add(&_num_direct_allocated, value, memory_order_relaxed);
 }
 
 inline void G1EvacStats::add_region_end_waste(size_t value) {
-  Atomic::add(&_region_end_waste, value);
-  Atomic::inc(&_regions_filled);
+  Atomic::add(&_region_end_waste, value, memory_order_relaxed);
+  Atomic::inc(&_regions_filled, memory_order_relaxed);
 }
 
 inline void G1EvacStats::add_failure_used_and_waste(size_t used, size_t waste) {
-  Atomic::add(&_failure_used, used);
-  Atomic::add(&_failure_waste, waste);
+  Atomic::add(&_failure_used, used, memory_order_relaxed);
+  Atomic::add(&_failure_waste, waste, memory_order_relaxed);
 }
 
 #endif // SHARE_GC_G1_G1EVACSTATS_INLINE_HPP

From 41e31d6b0ae00d70b6fb20c89318fde2bc605edb Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Mon, 12 Aug 2024 17:56:46 +0000
Subject: [PATCH 387/401] 8337622: IllegalArgumentException in
 java.lang.reflect.Field.get

Reviewed-by: dholmes, shade
---
 src/hotspot/share/classfile/javaClasses.cpp   |  7 ---
 src/hotspot/share/classfile/javaClasses.hpp   |  1 +
 .../reflect/ComponentTypeFieldTest.java       | 50 +++++++++++++++++++
 3 files changed, 51 insertions(+), 7 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/reflect/ComponentTypeFieldTest.java

diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index ab9460e2b9b01..8a6c8a8ce0b36 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -1452,19 +1452,12 @@ void java_lang_Class::compute_offsets() {
 
   InstanceKlass* k = vmClasses::Class_klass();
   CLASS_FIELDS_DO(FIELD_COMPUTE_OFFSET);
-
-  // Init lock is a C union with component_mirror.  Only instanceKlass mirrors have
-  // init_lock and only ArrayKlass mirrors have component_mirror.  Since both are oops
-  // GC treats them the same.
-  _init_lock_offset = _component_mirror_offset;
-
   CLASS_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET);
 }
 
 #if INCLUDE_CDS
 void java_lang_Class::serialize_offsets(SerializeClosure* f) {
   f->do_bool(&_offsets_computed);
-  f->do_u4((u4*)&_init_lock_offset);
 
   CLASS_FIELDS_DO(FIELD_SERIALIZE_OFFSET);
 
diff --git a/src/hotspot/share/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp
index 57914e189b75d..eb3c5e29fdb11 100644
--- a/src/hotspot/share/classfile/javaClasses.hpp
+++ b/src/hotspot/share/classfile/javaClasses.hpp
@@ -209,6 +209,7 @@ class java_lang_String : AllStatic {
   macro(java_lang_Class, static_oop_field_count, int_signature,     false) \
   macro(java_lang_Class, protection_domain,      object_signature,  false) \
   macro(java_lang_Class, source_file,            object_signature,  false) \
+  macro(java_lang_Class, init_lock,              object_signature,  false)
 
 class java_lang_Class : AllStatic {
   friend class VMStructs;
diff --git a/test/hotspot/jtreg/runtime/reflect/ComponentTypeFieldTest.java b/test/hotspot/jtreg/runtime/reflect/ComponentTypeFieldTest.java
new file mode 100644
index 0000000000000..6296a7f970e74
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/reflect/ComponentTypeFieldTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * 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 8337622
+ * @summary (reflect) java.lang.Class componentType field not found.
+ * @library /test/lib
+ * @modules java.base/java.lang:open
+ * @run main ComponentTypeFieldTest
+ */
+
+import java.lang.reflect.Field;
+import static jdk.test.lib.Asserts.*;
+
+public class ComponentTypeFieldTest {
+
+    public static void main(String[] args) throws Exception {
+        Field f = Class.class.getDeclaredField("componentType");
+        f.setAccessible(true);
+        Object val = f.get(Runnable.class);
+        assertTrue(val == null);
+        System.out.println("val is " + val);
+
+        Object arrayVal = f.get(Integer[].class);
+        System.out.println("val is " + arrayVal);
+        String arrayValString = arrayVal.toString();
+        assertTrue(arrayValString.equals("class java.lang.Integer"));
+    }
+}

From b93b74e3ebd220e94fb5e33d2ebc62181db97bb0 Mon Sep 17 00:00:00 2001
From: Roger Riggs <rriggs@openjdk.org>
Date: Mon, 12 Aug 2024 19:28:46 +0000
Subject: [PATCH 388/401] 8338060: jdk/internal/util/ReferencedKeyTest should
 be more robust

Reviewed-by: never
---
 .../jdk/internal/util/ReferencedKeyTest.java  | 130 ++++++++++--------
 1 file changed, 76 insertions(+), 54 deletions(-)

diff --git a/test/jdk/jdk/internal/util/ReferencedKeyTest.java b/test/jdk/jdk/internal/util/ReferencedKeyTest.java
index 75690fa6e258a..c68908a8d5a42 100644
--- a/test/jdk/jdk/internal/util/ReferencedKeyTest.java
+++ b/test/jdk/jdk/internal/util/ReferencedKeyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8285932 8310913
+ * @bug 8285932 8310913 8336390 8338060
  * @summary Test features provided by the ReferencedKeyMap/ReferencedKeySet classes.
  * @modules java.base/jdk.internal.util
  * @compile --patch-module java.base=${test.src} ReferencedKeyTest.java
@@ -36,14 +36,27 @@
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BooleanSupplier;
+import java.util.function.Function;
 import java.util.function.Supplier;
+import java.util.stream.IntStream;
 
 public class ReferencedKeyTest {
-    static long BASE_KEY = 10_000_000L;
+    private static String BASE_KEY = "BASEKEY-";
+
+    // Return a String (identity object) that can be a key in WeakHashMap.
+    private static String genKey(int i) {
+        return BASE_KEY + i;
+    }
+
+    // Return a String of the letter 'a' plus the integer (0..0xffff)
+    private static String genValue(int i) {
+        return String.valueOf((char) ('a' + i));
+    }
 
     public static void main(String[] args) {
         mapTest(false, HashMap::new);
@@ -63,73 +76,77 @@ static void assertTrue(boolean test, String message) {
         }
     }
 
-    static void mapTest(boolean isSoft, Supplier<Map<ReferenceKey<Long>, String>> supplier) {
-        Map<Long, String> map = ReferencedKeyMap.create(isSoft, supplier);
-        populate(map);
+    static void mapTest(boolean isSoft, Supplier<Map<ReferenceKey<String>, String>> supplier) {
+        Map<String, String> map = ReferencedKeyMap.create(isSoft, supplier);
+        var strongKeys = populate(map);      // Retain references to the keys
+        methods(map);
+        Reference.reachabilityFence(strongKeys);
+
+        strongKeys = null;      // drop strong key references
         if (!isSoft) {
             if (!collect(() -> map.isEmpty())) {
                 throw new RuntimeException("WeakReference map not collecting!");
             }
         }
-        populate(map);
-        methods(map);
     }
 
-    static void setTest(boolean isSoft, Supplier<Map<ReferenceKey<Long>, ReferenceKey<Long>>> supplier) {
-        ReferencedKeySet<Long> set = ReferencedKeySet.create(isSoft, supplier);
-        populate(set);
+    static void setTest(boolean isSoft, Supplier<Map<ReferenceKey<String>, ReferenceKey<String>>> supplier) {
+        ReferencedKeySet<String> set = ReferencedKeySet.create(isSoft, supplier);
+        var strongKeys = populate(set);      // Retain references to the keys
+        methods(set);
+        Reference.reachabilityFence(strongKeys);
+
+        strongKeys = null;          // drop strong key references
         if (!isSoft) {
             if (!collect(() -> set.isEmpty())) {
                 throw new RuntimeException("WeakReference set not collecting!");
             }
         }
-        populate(set);
-        methods(set);
     }
 
-    static void methods(Map<Long, String> map) {
+    static void methods(Map<String, String> map) {
         assertTrue(map.size() == 26, "missing key");
-        assertTrue(map.containsKey(BASE_KEY + 'a' -'a'), "missing key");
-        assertTrue(map.get(BASE_KEY + 'b' -'a').equals("b"), "wrong key");
+        assertTrue(map.containsKey(genKey('a' -'a')), "missing key");
+        assertTrue(map.get(genKey('b' -'a')).equals("b"), "wrong key");
         assertTrue(map.containsValue("c"), "missing value");
-        map.remove(BASE_KEY + 'd' -'a');
-        assertTrue(map.get(BASE_KEY + 'd' -'a') == null, "not removed");
-        map.putAll(Map.of(1L, "A", 2L, "B"));
-        assertTrue(map.get(2L).equals("B"), "collection not added");
-        assertTrue(map.containsKey(1L), "key missing");
+        map.remove(genKey('d' -'a'));
+        assertTrue(map.get(genKey('d' -'a')) == null, "not removed");
+        map.putAll(Map.of(genKey(1), "A", genKey(2), "B"));
+        assertTrue(map.get(genKey(2)).equals("B"), "collection not added");
+        assertTrue(map.containsKey(genKey(1)), "key missing");
         assertTrue(map.containsValue("A"), "key missing");
-        assertTrue(map.entrySet().contains(Map.entry(1L, "A")), "key missing");
-        map.putIfAbsent(3L, "C");
-        assertTrue(map.get(3L).equals("C"), "key missing");
-        map.putIfAbsent(2L, "D");
-        assertTrue(map.get(2L).equals("B"), "key replaced");
-        map.remove(3L);
-        assertTrue(map.get(3L) == null, "key not removed");
-        map.replace(2L, "D");
-        assertTrue(map.get(2L).equals("D"), "key not replaced");
-        map.replace(2L, "B", "E");
-        assertTrue(map.get(2L).equals("D"), "key replaced");
+        assertTrue(map.entrySet().contains(Map.entry(genKey(1), "A")), "key missing");
+        map.putIfAbsent(genKey(3), "C");
+        assertTrue(map.get(genKey(3)).equals("C"), "key missing");
+        map.putIfAbsent(genKey(2), "D");
+        assertTrue(map.get(genKey(2)).equals("B"), "key replaced");
+        map.remove(genKey(3));
+        assertTrue(map.get(genKey(3)) == null, "key not removed");
+        map.replace(genKey(2), "D");
+        assertTrue(map.get(genKey(2)).equals("D"), "key not replaced");
+        map.replace(genKey(2), "B", "E");
+        assertTrue(map.get(genKey(2)).equals("D"), "key replaced");
     }
 
-    static void methods(ReferencedKeySet<Long> set) {
+    static void methods(ReferencedKeySet<String> set) {
         assertTrue(set.size() == 26, "missing key");
-        assertTrue(set.contains(BASE_KEY + 3), "missing key");
-        set.remove(BASE_KEY + 3);
-        assertTrue(!set.contains(BASE_KEY + 3), "not removed");
-        Long element1 = set.get(BASE_KEY + 2);
-        Long element2 = set.get(BASE_KEY + 3);
-        Long element3 = set.get(BASE_KEY + 4);
-        Long intern1 = set.intern(BASE_KEY + 2);
-        Long intern2 = set.intern(BASE_KEY + 3);
-        Long intern3 = set.intern(BASE_KEY + 4, e -> e);
+        assertTrue(set.contains(genKey(3)), "missing key");
+        set.remove(genKey(3));
+        assertTrue(!set.contains(genKey(3)), "not removed");
+        String element1 = set.get(genKey(2));
+        String element2 = set.get(genKey(3));
+        String element3 = set.get(genKey(4));
+        String intern1 = set.intern(genKey(2));
+        String intern2 = set.intern(genKey(3));
+        String intern3 = set.intern(genKey(4), e -> e);
         assertTrue(element1 != null, "missing key");
         assertTrue(element2 == null, "not removed");
         assertTrue(element1 == intern1, "intern failed"); // must be same object
         assertTrue(intern2 != null, "intern failed");
         assertTrue(element3 == intern3, "intern failed");
 
-        Long value1 = Long.valueOf(BASE_KEY + 999);
-        Long value2 = Long.valueOf(BASE_KEY + 999);
+        String value1 = genKey(999);
+        String value2 = genKey(999);
         assertTrue(set.add(value1), "key not added");
         assertTrue(!set.add(value1), "key added after second attempt");
         assertTrue(!set.add(value2), "key should not have been added");
@@ -164,18 +181,23 @@ static boolean collect(BooleanSupplier booleanSupplier) {
         return booleanSupplier.getAsBoolean();
     }
 
-    static void populate(Map<Long, String> map) {
-        for (int i = 0; i < 26; i++) {
-            Long key = BASE_KEY + i;
-            String value = String.valueOf((char) ('a' + i));
-            map.put(key, value);
+    static List<String> populate(Map<String, String> map) {
+        var keyRefs = genStrings(0, 26, ReferencedKeyTest::genKey);
+        var valueRefs = genStrings(0, 26, ReferencedKeyTest::genValue);
+        for (int i = 0; i < keyRefs.size(); i++) {
+            map.put(keyRefs.get(i), valueRefs.get(i));
         }
+        return keyRefs;
     }
 
-    static void populate(Set<Long> set) {
-        for (int i = 0; i < 26; i++) {
-            Long value = BASE_KEY + i;
-            set.add(value);
-        }
+    static List<String> populate(Set<String> set) {
+        var keyRefs = genStrings(0, 26, ReferencedKeyTest::genKey);
+        set.addAll(keyRefs);
+        return keyRefs;
+    }
+
+    // Generate a List of consecutive strings using a function int -> String
+    static List<String> genStrings(int min, int maxExclusive, Function<Integer, String> genString) {
+        return IntStream.range(min, maxExclusive).mapToObj(i -> genString.apply(i)).toList();
     }
 }

From 4417c276e484c1fe137ed7f4a7c28709d0c99af2 Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Mon, 12 Aug 2024 19:43:36 +0000
Subject: [PATCH 389/401] 8330535: Update nsk/jdb tests to use driver instead
 of othervm

Reviewed-by: cjplummer
---
 .../caught_exception002/caught_exception002.java    | 10 +++-------
 .../nsk/jdb/classes/classes001/classes001.java      | 10 +++-------
 .../jdb/classpath/classpath001/classpath001.java    | 10 +++-------
 .../vmTestbase/nsk/jdb/clear/clear002/clear002.java | 10 +++-------
 .../vmTestbase/nsk/jdb/clear/clear003/clear003.java | 10 +++-------
 .../vmTestbase/nsk/jdb/clear/clear004/clear004.java |  8 ++------
 .../vmTestbase/nsk/jdb/down/down002/down002.java    | 10 +++-------
 .../vmTestbase/nsk/jdb/dump/dump002/dump002.java    | 10 +++-------
 .../vmTestbase/nsk/jdb/eval/eval001/eval001.java    | 10 +++-------
 .../nsk/jdb/exclude/exclude001/exclude001.java      | 10 +++-------
 .../nsk/jdb/fields/fields001/fields001.java         | 10 +++-------
 .../nsk/jdb/hidden_class/hc001/hc001.java           | 10 +++-------
 .../nsk/jdb/ignore/ignore001/ignore001.java         | 10 +++-------
 .../jdb/interrupt/interrupt001/interrupt001.java    | 10 +++-------
 .../vmTestbase/nsk/jdb/kill/kill001/kill001.java    | 10 +++-------
 .../vmTestbase/nsk/jdb/kill/kill002/kill002.java    | 10 +++-------
 .../vmTestbase/nsk/jdb/klass/class001/class001.java | 10 +++-------
 .../vmTestbase/nsk/jdb/list/list002/list002.java    | 10 +++-------
 .../vmTestbase/nsk/jdb/list/list003/list003.java    | 11 ++++-------
 .../nsk/jdb/locals/locals002/locals002.java         | 10 +++-------
 .../nsk/jdb/methods/methods002/methods002.java      | 10 +++-------
 .../nsk/jdb/monitor/monitor001/monitor001.java      | 10 +++-------
 .../nsk/jdb/monitor/monitor002/monitor002.java      | 10 +++-------
 .../vmTestbase/nsk/jdb/next/next001/next001.java    | 10 +++-------
 .../jdb/options/connect/connect001/connect001.java  | 10 +++-------
 .../jdb/options/connect/connect002/connect002.java  | 10 +++-------
 .../jdb/options/connect/connect003/connect003.java  | 10 +++-------
 .../jdb/options/connect/connect004/connect004.java  | 10 +++-------
 .../jdb/options/connect/connect005/connect005.java  | 13 ++++---------
 .../listconnectors001/listconnectors001.java        | 10 +++-------
 .../jtreg/vmTestbase/nsk/jdb/pop/pop001/pop001.java | 10 +++-------
 .../pop_exception001/pop_exception001.java          | 10 +++-------
 .../vmTestbase/nsk/jdb/print/print002/print002.java | 10 +++-------
 .../vmTestbase/nsk/jdb/read/read001/read001.java    | 10 +++-------
 .../nsk/jdb/redefine/redefine001/redefine001.java   | 10 +++-------
 .../nsk/jdb/reenter/reenter001/reenter001.java      | 10 +++-------
 .../nsk/jdb/regression/b4689395/b4689395.java       | 10 +++-------
 .../nsk/jdb/repeat/repeat001/repeat001.java         | 10 +++-------
 .../nsk/jdb/resume/resume002/resume002.java         | 10 +++-------
 .../jtreg/vmTestbase/nsk/jdb/run/run002/run002.java | 10 +++-------
 .../jtreg/vmTestbase/nsk/jdb/set/set001/set001.java | 10 +++-------
 .../jtreg/vmTestbase/nsk/jdb/set/set002/set002.java | 10 +++-------
 .../vmTestbase/nsk/jdb/step/step002/step002.java    | 10 +++-------
 .../nsk/jdb/step_up/step_up001/step_up001.java      | 10 +++-------
 .../nsk/jdb/stop_at/stop_at002/stop_at002.java      |  8 ++------
 .../nsk/jdb/stop_at/stop_at003/stop_at003.java      | 10 +++-------
 .../nsk/jdb/stop_in/stop_in002/stop_in002.java      | 10 +++-------
 .../nsk/jdb/suspend/suspend001/suspend001.java      | 10 +++-------
 .../nsk/jdb/thread/thread002/thread002.java         | 10 +++-------
 .../threadgroup/threadgroup002/threadgroup002.java  | 10 +++-------
 .../threadgroups002/threadgroups002.java            | 10 +++-------
 .../nsk/jdb/threads/threads002/threads002.java      | 10 +++-------
 .../nsk/jdb/threads/threads003/threads003.java      | 10 +++-------
 .../vmTestbase/nsk/jdb/trace/trace001/trace001.java | 10 +++-------
 .../uncaught_exception002.java                      | 10 +++-------
 .../jdb/unmonitor/unmonitor001/unmonitor001.java    | 10 +++-------
 .../nsk/jdb/untrace/untrace001/untrace001.java      | 10 +++-------
 .../nsk/jdb/unwatch/unwatch001/unwatch001.java      | 10 +++-------
 .../nsk/jdb/unwatch/unwatch002/unwatch002.java      | 10 +++-------
 .../jtreg/vmTestbase/nsk/jdb/up/up002/up002.java    | 10 +++-------
 .../jtreg/vmTestbase/nsk/jdb/use/use001/use001.java | 10 +++-------
 .../vmTestbase/nsk/jdb/watch/watch001/watch001.java | 10 +++-------
 .../vmTestbase/nsk/jdb/watch/watch002/watch002.java | 10 +++-------
 .../vmTestbase/nsk/jdb/where/where004/where004.java | 10 +++-------
 .../vmTestbase/nsk/jdb/where/where005/where005.java | 10 +++-------
 .../vmTestbase/nsk/jdb/where/where006/where006.java | 10 +++-------
 .../nsk/jdb/wherei/wherei001/wherei001.java         | 10 +++-------
 .../jtreg/vmTestbase/nsk/share/jdb/JdbTest.java     | 11 +++++------
 .../jtreg/vmTestbase/nsk/share/jdb/Launcher.java    |  6 ++++--
 69 files changed, 210 insertions(+), 477 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/caught_exception/caught_exception002/caught_exception002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/caught_exception/caught_exception002/caught_exception002.java
index 4eef7900d4231..04ace5ba49c5d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/caught_exception/caught_exception002/caught_exception002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/caught_exception/caught_exception002/caught_exception002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.caught_exception.caught_exception002.caught_exception002a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.caught_exception.caught_exception002.caught_exception002
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -69,14 +69,10 @@
 public class caught_exception002 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new caught_exception002().runTest(argv, out);
+        new caught_exception002().runTest(argv);
     }
 
     static final String PACKAGE_NAME       = "nsk.jdb.caught_exception.caught_exception002";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/classes/classes001/classes001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/classes/classes001/classes001.java
index 40a5ebaa9393c..8543c7c6f1e1d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/classes/classes001/classes001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/classes/classes001/classes001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.classes.classes001.classes001a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.classes.classes001.classes001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -60,14 +60,10 @@
 public class classes001 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new classes001().runTest(argv, out);
+        new classes001().runTest(argv);
     }
 
     static final String PACKAGE_NAME       = "nsk.jdb.classes.classes001";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/classpath/classpath001/classpath001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/classpath/classpath001/classpath001.java
index 0eea9a92ab26f..25a86fe64cbd9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/classpath/classpath001/classpath001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/classpath/classpath001/classpath001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.classpath.classpath001.classpath001a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.classpath.classpath001.classpath001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -59,14 +59,10 @@
 public class classpath001 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new classpath001().runTest(argv, out);
+        new classpath001().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.classpath.classpath001";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/clear/clear002/clear002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/clear/clear002/clear002.java
index 7869a1340a7cd..cca80dad46502 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/clear/clear002/clear002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/clear/clear002/clear002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.clear.clear002.clear002a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.clear.clear002.clear002
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -61,14 +61,10 @@
 public class clear002 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new clear002().runTest(argv, out);
+        new clear002().runTest(argv);
     }
 
     static final String PACKAGE_NAME     = "nsk.jdb.clear.clear002";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/clear/clear003/clear003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/clear/clear003/clear003.java
index cbbc851f29a6f..003b1f36eddb7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/clear/clear003/clear003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/clear/clear003/clear003.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -39,7 +39,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.clear.clear003.clear003a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.clear.clear003.clear003
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -62,14 +62,10 @@
 public class clear003 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new clear003().runTest(argv, out);
+        new clear003().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.clear.clear003";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/clear/clear004/clear004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/clear/clear004/clear004.java
index c0ec8d2037095..5dfd33430e38c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/clear/clear004/clear004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/clear/clear004/clear004.java
@@ -40,7 +40,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.clear.clear004.clear004a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.clear.clear004.clear004
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -63,14 +63,10 @@
 public class clear004 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new clear004().runTest(argv, out);
+        new clear004().runTest(argv);
     }
 
     static final String PACKAGE_NAME     = "nsk.jdb.clear.clear004";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/down/down002/down002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/down/down002/down002.java
index 29a40d9471d67..99f4254891d1e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/down/down002/down002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/down/down002/down002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.down.down002.down002a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.down.down002.down002
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -66,14 +66,10 @@
 public class down002 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new down002().runTest(argv, out);
+        new down002().runTest(argv);
     }
 
     static final String PACKAGE_NAME     = "nsk.jdb.down.down002";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/dump/dump002/dump002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/dump/dump002/dump002.java
index 3e3b5b9b85872..66a26e69f7769 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/dump/dump002/dump002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/dump/dump002/dump002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.dump.dump002.dump002a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.dump.dump002.dump002
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -70,15 +70,11 @@
 public class dump002 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
         compoundPromptIdent = COMPOUND_PROMPT_IDENT;
-        return new dump002().runTest(argv, out);
+        new dump002().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.dump.dump002";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/eval/eval001/eval001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/eval/eval001/eval001.java
index 98848ced90bc7..fc4fb14dd2db6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/eval/eval001/eval001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/eval/eval001/eval001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,7 @@
  * @clean nsk.jdb.eval.eval001.eval001a
  * @compile -g:lines,source,vars eval001a.java
  *
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.eval.eval001.eval001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -75,14 +75,10 @@
 public class eval001 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new eval001().runTest(argv, out);
+        new eval001().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.eval.eval001";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/exclude/exclude001/exclude001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/exclude/exclude001/exclude001.java
index cee8ca44d585b..c7805cc6c95de 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/exclude/exclude001/exclude001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/exclude/exclude001/exclude001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,7 +59,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.exclude.exclude001.exclude001a
- * @run main/othervm/timeout=600
+ * @run driver/timeout=600
  *      nsk.jdb.exclude.exclude001.exclude001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=10
@@ -82,14 +82,10 @@
 public class exclude001 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new exclude001().runTest(argv, out);
+        new exclude001().runTest(argv);
     }
 
     static final String PACKAGE_NAME    = "nsk.jdb.exclude.exclude001";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/fields/fields001/fields001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/fields/fields001/fields001.java
index b5e2ccb58e566..c1cbba3232a84 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/fields/fields001/fields001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/fields/fields001/fields001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.fields.fields001.fields001a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.fields.fields001.fields001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -64,14 +64,10 @@
 public class fields001 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new fields001().runTest(argv, out);
+        new fields001().runTest(argv);
     }
 
     static final String PACKAGE_NAME       = "nsk.jdb.fields.fields001";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/hidden_class/hc001/hc001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/hidden_class/hc001/hc001.java
index 5040eef9cefb2..a7c74e28aaece 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/hidden_class/hc001/hc001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/hidden_class/hc001/hc001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
  *          jdk.jdwp.agent
  * @build nsk.jdb.hidden_class.hc001.hc001a
  *
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.hidden_class.hc001.hc001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -60,13 +60,9 @@ public class hc001 extends JdbTest {
     static final int    MAX_SLEEP_CNT     = 3;
 
     public static void main(String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass = DEBUGGEE_CLASS; // needed for JdbTest.runTest
         firstBreak = MAIN_METHOD_NAME;  // needed for JdbTest.runTest
-        return new hc001().runTest(argv, out);
+        new hc001().runTest(argv);
     }
 
     static boolean checkPattern(String[] arr, String pattern) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/ignore/ignore001/ignore001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/ignore/ignore001/ignore001.java
index 6eb8c91e1eb78..48d256d22fc7e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/ignore/ignore001/ignore001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/ignore/ignore001/ignore001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.ignore.ignore001.ignore001a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.ignore.ignore001.ignore001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -63,14 +63,10 @@
 public class ignore001 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new ignore001().runTest(argv, out);
+        new ignore001().runTest(argv);
     }
 
     static final String PACKAGE_NAME       = "nsk.jdb.ignore.ignore001";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/interrupt/interrupt001/interrupt001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/interrupt/interrupt001/interrupt001.java
index 73f251b71e998..51bbdf6757a2d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/interrupt/interrupt001/interrupt001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/interrupt/interrupt001/interrupt001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.interrupt.interrupt001.interrupt001a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.interrupt.interrupt001.interrupt001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -73,13 +73,9 @@
 public class interrupt001 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
-        return new interrupt001().runTest(argv, out);
+        new interrupt001().runTest(argv);
     }
 
     static final String PACKAGE_NAME    = "nsk.jdb.interrupt.interrupt001";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/kill/kill001/kill001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/kill/kill001/kill001.java
index b770aafc510db..a96498954b69b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/kill/kill001/kill001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/kill/kill001/kill001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.kill.kill001.kill001a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.kill.kill001.kill001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -74,13 +74,9 @@
 public class kill001 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
-        return new kill001().runTest(argv, out);
+        new kill001().runTest(argv);
     }
 
     static final String PACKAGE_NAME    = "nsk.jdb.kill.kill001";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/kill/kill002/kill002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/kill/kill002/kill002.java
index 230dcdf12baaf..ed5306346dc3c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/kill/kill002/kill002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/kill/kill002/kill002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.kill.kill002.kill002a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.kill.kill002.kill002
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -66,13 +66,9 @@
 public class kill002 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
-        return new kill002().runTest(argv, out);
+        new kill002().runTest(argv);
     }
 
     static final String PACKAGE_NAME    = "nsk.jdb.kill.kill002";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/klass/class001/class001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/klass/class001/class001.java
index 4c548348dc356..ee37e393f702d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/klass/class001/class001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/klass/class001/class001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.klass.class001.class001a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.klass.class001.class001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -63,14 +63,10 @@
 public class class001 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new class001().runTest(argv, out);
+        new class001().runTest(argv);
     }
 
     static final String PACKAGE_NAME       = "nsk.jdb.klass.class001";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/list/list002/list002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/list/list002/list002.java
index 4180ea3bb453b..38282a425ecd4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/list/list002/list002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/list/list002/list002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@
  *          /test/lib
  * @build nsk.jdb.list.list002.list002a
  * @run driver jdk.test.lib.FileInstaller list002a.java src/nsk/jdb/list/list002/list002a.java
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.list.list002.list002
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -68,14 +68,10 @@
 public class list002 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new list002().runTest(argv, out);
+        new list002().runTest(argv);
     }
 
     static final String PACKAGE_NAME    = "nsk.jdb.list.list002";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/list/list003/list003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/list/list003/list003.java
index d06bf38bd8527..e7d773486eedb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/list/list003/list003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/list/list003/list003.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.list.list003.list003a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.list.list003.list003
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -47,6 +47,7 @@
  *      -jdb.option="-J-Duser.language=en -J-Duser.country=US"
  *      -java.options="${test.vm.opts} ${test.java.opts}"
  *      -workdir=.
+ *      -jdb.option="-sourcepath ${test.src}/../../../.."
  *      -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
  */
 
@@ -98,13 +99,9 @@ protected List<ListLine> parseListOutput(String[] lines) {
     }
 
     public static void main(String[] args) {
-        System.exit(run(args, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String[] args, PrintStream out) {
         debuggeeClass = DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
-        return new list003().runTest(args, out);
+        new list003().runTest(args);
     }
 
     @Override
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/locals/locals002/locals002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/locals/locals002/locals002.java
index 793cdc0460876..09a97ff83a528 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/locals/locals002/locals002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/locals/locals002/locals002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,7 @@
  * @clean nsk.jdb.locals.locals002.locals002a
  * @compile -g:lines,source,vars locals002a.java
  *
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.locals.locals002.locals002
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -75,15 +75,11 @@
 public class locals002 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
         compoundPromptIdent = COMPOUND_PROMPT_IDENT;
-        return new locals002().runTest(argv, out);
+        new locals002().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.locals.locals002";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/methods/methods002/methods002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/methods/methods002/methods002.java
index 2bacbab101bd4..ef480d52c037c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/methods/methods002/methods002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/methods/methods002/methods002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.methods.methods002.methods002a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.methods.methods002.methods002
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -73,14 +73,10 @@
 public class methods002 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new methods002().runTest(argv, out);
+        new methods002().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.methods.methods002";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/monitor/monitor001/monitor001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/monitor/monitor001/monitor001.java
index 1fd1f8c328b87..94cac5ca787a9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/monitor/monitor001/monitor001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/monitor/monitor001/monitor001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.monitor.monitor001.monitor001a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.monitor.monitor001.monitor001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -69,14 +69,10 @@
 public class monitor001 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new monitor001().runTest(argv, out);
+        new monitor001().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.monitor.monitor001";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/monitor/monitor002/monitor002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/monitor/monitor002/monitor002.java
index 53c856128ce7b..790eb7469168d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/monitor/monitor002/monitor002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/monitor/monitor002/monitor002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.monitor.monitor002.monitor002a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.monitor.monitor002.monitor002
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -65,14 +65,10 @@
 public class monitor002 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new monitor002().runTest(argv, out);
+        new monitor002().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.monitor.monitor002";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/next/next001/next001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/next/next001/next001.java
index 206199f0bb325..3d0c810b5c4a4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/next/next001/next001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/next/next001/next001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.next.next001.next001a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.next.next001.next001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -69,14 +69,10 @@
 public class next001 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new next001().runTest(argv, out);
+        new next001().runTest(argv);
     }
 
     static final String PACKAGE_NAME    = "nsk.jdb.next.next001";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect001/connect001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect001/connect001.java
index a78f3a96db421..85cdbb279974e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect001/connect001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect001/connect001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.options.connect.connect001.connect001a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.options.connect.connect001.connect001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -71,14 +71,10 @@
 public class connect001 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new connect001().runTest(argv, out);
+        new connect001().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.options.connect.connect001";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect002/connect002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect002/connect002.java
index 78bcf2fb9737e..a3219de0cc4e3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect002/connect002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect002/connect002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.options.connect.connect002.connect002a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.options.connect.connect002.connect002
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -71,14 +71,10 @@
 public class connect002 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new connect002().runTest(argv, out);
+        new connect002().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.options.connect.connect002";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect003/connect003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect003/connect003.java
index 701f611d2ff39..465e3c9deb241 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect003/connect003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect003/connect003.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.options.connect.connect003.connect003a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.options.connect.connect003.connect003
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -71,14 +71,10 @@
 public class connect003 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new connect003().runTest(argv, out);
+        new connect003().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.options.connect.connect003";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect004/connect004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect004/connect004.java
index adaa58627dd47..075e9c30268ef 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect004/connect004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect004/connect004.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.options.connect.connect004.connect004a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.options.connect.connect004.connect004
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -71,14 +71,10 @@
 public class connect004 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new connect004().runTest(argv, out);
+        new connect004().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.options.connect.connect004";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect005/connect005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect005/connect005.java
index 8a67039246605..7bd44a5927cc7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect005/connect005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/options/connect/connect005/connect005.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.options.connect.connect005.connect005a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.options.connect.connect005.connect005
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -70,15 +70,10 @@
 
 public class connect005 extends JdbTest {
 
-    public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
-        debuggeeClass =  DEBUGGEE_CLASS;
+    public static void main (String argv[]) {    debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new connect005().runTest(argv, out);
+        new connect005().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.options.connect.connect005";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/options/listconnectors/listconnectors001/listconnectors001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/options/listconnectors/listconnectors001/listconnectors001.java
index d814df91cc693..b4961be11eeee 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/options/listconnectors/listconnectors001/listconnectors001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/options/listconnectors/listconnectors001/listconnectors001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,7 +51,7 @@
  *
  * @library /vmTestbase
  *          /test/lib
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.options.listconnectors.listconnectors001.listconnectors001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -75,14 +75,10 @@
 public class listconnectors001 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new listconnectors001().runTest(argv, out);
+        new listconnectors001().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.options.connect";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/pop/pop001/pop001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/pop/pop001/pop001.java
index e449a5771f27c..c508538fa1e66 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/pop/pop001/pop001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/pop/pop001/pop001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.pop.pop001.pop001a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.pop.pop001.pop001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -70,14 +70,10 @@
 public class pop001 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new pop001().runTest(argv, out);
+        new pop001().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.pop.pop001";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/pop_exception/pop_exception001/pop_exception001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/pop_exception/pop_exception001/pop_exception001.java
index f70a5ffb96023..49921cd26cc0e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/pop_exception/pop_exception001/pop_exception001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/pop_exception/pop_exception001/pop_exception001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.pop_exception.pop_exception001.pop_exception001a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.pop_exception.pop_exception001.pop_exception001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -63,14 +63,10 @@ public class pop_exception001 extends JdbTest {
     static final String LAST_BREAK      = DEBUGGEE_CLASS + ".lastBreak";
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new pop_exception001().runTest(argv, out);
+        new pop_exception001().runTest(argv);
     }
 
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/print/print002/print002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/print/print002/print002.java
index e339a0a321b97..1993c1f4d95fc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/print/print002/print002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/print/print002/print002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,7 @@
  * @clean nsk.jdb.print.print002.print002a
  * @compile -g:lines,source,vars print002a.java
  *
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.print.print002.print002
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -75,14 +75,10 @@
 public class print002 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new print002().runTest(argv, out);
+        new print002().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.print.print002";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/read/read001/read001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/read/read001/read001.java
index b5ca64334d775..60c80139a651f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/read/read001/read001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/read/read001/read001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,7 @@
  * @clean nsk.jdb.read.read001.read001a
  * @compile -g:lines,source,vars read001a.java
  *
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.read.read001.read001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -76,14 +76,10 @@
 public class read001 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new read001().runTest(argv, out);
+        new read001().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.read.read001";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/redefine/redefine001/redefine001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/redefine/redefine001/redefine001.java
index 80ff33889a410..d3988ac443ca8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/redefine/redefine001/redefine001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/redefine/redefine001/redefine001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,7 +56,7 @@
  *      -cp ${test.class.path}
  *      ${test.src}/newclass_g/RedefinedClass.java
  *
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.redefine.redefine001.redefine001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -80,14 +80,10 @@
 public class redefine001 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new redefine001().runTest(argv, out);
+        new redefine001().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.redefine.redefine001";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/reenter/reenter001/reenter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/reenter/reenter001/reenter001.java
index ebc063942c608..4013d85ab7527 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/reenter/reenter001/reenter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/reenter/reenter001/reenter001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.reenter.reenter001.reenter001a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.reenter.reenter001.reenter001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -69,14 +69,10 @@
 public class reenter001 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new reenter001().runTest(argv, out);
+        new reenter001().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.reenter.reenter001";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/regression/b4689395/b4689395.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/regression/b4689395/b4689395.java
index 82d8235fee724..2cb3cc0eccfc4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/regression/b4689395/b4689395.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/regression/b4689395/b4689395.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -101,7 +101,7 @@
  *      -cp ${test.class.path}
  *      ${test.src}/newclass/b4689395a.java
  *
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.regression.b4689395.b4689395
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -131,13 +131,9 @@ public class b4689395 extends JdbTest {
         private String classFile;
 
         public static void main (String argv[]) {
-                System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-        }
-
-        public static int run(String argv[], PrintStream out) {
                 debuggeeClass =  DEBUGGEE_CLASS;
                 firstBreak = FIRST_BREAK;
-                return new b4689395().runTest(argv, out);
+                new b4689395().runTest(argv);
         }
 
         public b4689395() {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/repeat/repeat001/repeat001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/repeat/repeat001/repeat001.java
index e0489db28291e..67ce5ea4e7498 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/repeat/repeat001/repeat001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/repeat/repeat001/repeat001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.repeat.repeat001.repeat001a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.repeat.repeat001.repeat001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -68,13 +68,9 @@ public class repeat001 extends JdbTest {
     static final String FIRST_BREAK = DEBUGGEE_CLASS + ".main";
 
     public static void main(String[] args) {
-        System.exit(run(args, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String[] args, PrintStream out) {
         debuggeeClass = DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
-        return new repeat001().runTest(args, out);
+        new repeat001().runTest(args);
     }
 
     protected static boolean isPrompt(String line) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/resume/resume002/resume002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/resume/resume002/resume002.java
index ab4df2625fe21..9607413036c88 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/resume/resume002/resume002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/resume/resume002/resume002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.resume.resume002.resume002a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.resume.resume002.resume002
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -73,14 +73,10 @@
 public class resume002 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new resume002().runTest(argv, out);
+        new resume002().runTest(argv);
     }
 
     static final String PACKAGE_NAME     = "nsk.jdb.resume.resume002";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/run/run002/run002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/run/run002/run002.java
index da837ab0f8bce..9b23ac4de25a9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/run/run002/run002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/run/run002/run002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.run.run002.run002a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.run.run002.run002
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -67,14 +67,10 @@
 public class run002 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new run002().runTest(argv, out);
+        new run002().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.run.run002";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/set/set001/set001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/set/set001/set001.java
index d00362b228cbf..7b97f47b5294a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/set/set001/set001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/set/set001/set001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@
  * @clean nsk.jdb.set.set001.set001a
  * @compile -g:lines,source,vars set001a.java
  *
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.set.set001.set001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -76,14 +76,10 @@
 public class set001 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new set001().runTest(argv, out);
+        new set001().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.set.set001";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/set/set002/set002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/set/set002/set002.java
index dca4e554afaf9..91d8482104045 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/set/set002/set002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/set/set002/set002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@
  * @clean nsk.jdb.set.set002.set002a
  * @compile -g:lines,source,vars set002a.java
  *
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.set.set002.set002
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -76,15 +76,11 @@
 public class set002 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
 
-        return new set002().runTest(argv, out);
+        new set002().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.set.set002";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/step/step002/step002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/step/step002/step002.java
index 4df163ca1a92c..c9cc342783e3f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/step/step002/step002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/step/step002/step002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,7 +56,7 @@
  * @clean nsk.jdb.step.step002.step002a
  * @compile -g:lines,source,vars step002a.java
  *
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.step.step002.step002
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -79,14 +79,10 @@
 public class step002 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new step002().runTest(argv, out);
+        new step002().runTest(argv);
     }
 
     static final String PACKAGE_NAME    = "nsk.jdb.step.step002";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/step_up/step_up001/step_up001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/step_up/step_up001/step_up001.java
index 590a476dbbe60..d4c60f937fa2e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/step_up/step_up001/step_up001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/step_up/step_up001/step_up001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.step_up.step_up001.step_up001a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.step_up.step_up001.step_up001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -68,14 +68,10 @@
 public class step_up001 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new step_up001().runTest(argv, out);
+        new step_up001().runTest(argv);
     }
 
     static final String PACKAGE_NAME    = "nsk.jdb.step_up.step_up001";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/stop_at/stop_at002/stop_at002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/stop_at/stop_at002/stop_at002.java
index 9dae8c17cfc36..30cb6ed2c68af 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/stop_at/stop_at002/stop_at002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/stop_at/stop_at002/stop_at002.java
@@ -37,7 +37,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.stop_at.stop_at002.stop_at002a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.stop_at.stop_at002.stop_at002
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -67,14 +67,10 @@
 public class stop_at002 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new stop_at002().runTest(argv, out);
+        new stop_at002().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.stop_at.stop_at002";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/stop_at/stop_at003/stop_at003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/stop_at/stop_at003/stop_at003.java
index ecd66ca7c9573..06eacea58b913 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/stop_at/stop_at003/stop_at003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/stop_at/stop_at003/stop_at003.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.stop_at.stop_at003.stop_at003a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.stop_at.stop_at003.stop_at003
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -79,14 +79,10 @@
 public class stop_at003 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new stop_at003().runTest(argv, out);
+        new stop_at003().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.stop_at.stop_at003";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/stop_in/stop_in002/stop_in002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/stop_in/stop_in002/stop_in002.java
index e4c2058fd97a3..710f05c078c46 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/stop_in/stop_in002/stop_in002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/stop_in/stop_in002/stop_in002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.stop_in.stop_in002.stop_in002a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.stop_in.stop_in002.stop_in002
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -80,14 +80,10 @@
 public class stop_in002 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new stop_in002().runTest(argv, out);
+        new stop_in002().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.stop_in.stop_in002";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/suspend/suspend001/suspend001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/suspend/suspend001/suspend001.java
index 18e5c27d31c6c..20c9778f25109 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/suspend/suspend001/suspend001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/suspend/suspend001/suspend001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.suspend.suspend001.suspend001a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.suspend.suspend001.suspend001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -69,14 +69,10 @@
 public class suspend001 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new suspend001().runTest(argv, out);
+        new suspend001().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.suspend.suspend001";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/thread/thread002/thread002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/thread/thread002/thread002.java
index 487ac49e66ec9..c8b55b0beee56 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/thread/thread002/thread002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/thread/thread002/thread002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.thread.thread002.thread002a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.thread.thread002.thread002
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -66,14 +66,10 @@
 public class thread002 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new thread002().runTest(argv, out);
+        new thread002().runTest(argv);
     }
 
     static final String PACKAGE_NAME     = "nsk.jdb.thread.thread002";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/threadgroup/threadgroup002/threadgroup002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/threadgroup/threadgroup002/threadgroup002.java
index 72bbf3584741d..8ff58b11bec19 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/threadgroup/threadgroup002/threadgroup002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/threadgroup/threadgroup002/threadgroup002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.threadgroup.threadgroup002.threadgroup002a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.threadgroup.threadgroup002.threadgroup002
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -69,14 +69,10 @@
 public class threadgroup002 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new threadgroup002().runTest(argv, out);
+        new threadgroup002().runTest(argv);
     }
 
     static final String PACKAGE_NAME     = "nsk.jdb.threadgroup.threadgroup002";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/threadgroups/threadgroups002/threadgroups002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/threadgroups/threadgroups002/threadgroups002.java
index 67ee29006b474..56f4dceda9e2d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/threadgroups/threadgroups002/threadgroups002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/threadgroups/threadgroups002/threadgroups002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.threadgroups.threadgroups002.threadgroups002a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.threadgroups.threadgroups002.threadgroups002
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -64,14 +64,10 @@
 public class threadgroups002 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new threadgroups002().runTest(argv, out);
+        new threadgroups002().runTest(argv);
     }
 
     static final String PACKAGE_NAME     = "nsk.jdb.threadgroups.threadgroups002";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/threads/threads002/threads002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/threads/threads002/threads002.java
index e9afd794d812a..fdc52ad7a2ab5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/threads/threads002/threads002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/threads/threads002/threads002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.threads.threads002.threads002a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.threads.threads002.threads002
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -65,14 +65,10 @@
 public class threads002 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new threads002().runTest(argv, out);
+        new threads002().runTest(argv);
     }
 
     static final String PACKAGE_NAME     = "nsk.jdb.threads.threads002";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/threads/threads003/threads003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/threads/threads003/threads003.java
index 4332eb69cf94b..f290cc71bb598 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/threads/threads003/threads003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/threads/threads003/threads003.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.threads.threads003.threads003a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.threads.threads003.threads003
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -65,14 +65,10 @@
 public class threads003 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new threads003().runTest(argv, out);
+        new threads003().runTest(argv);
     }
 
     static final String PACKAGE_NAME     = "nsk.jdb.threads.threads003";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/trace/trace001/trace001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/trace/trace001/trace001.java
index 0e289f93aee20..492d5b438c893 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/trace/trace001/trace001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/trace/trace001/trace001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.trace.trace001.trace001a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.trace.trace001.trace001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -71,14 +71,10 @@
 public class trace001 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new trace001().runTest(argv, out);
+        new trace001().runTest(argv);
     }
 
     static final String PACKAGE_NAME    = "nsk.jdb.trace.trace001";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/uncaught_exception/uncaught_exception002/uncaught_exception002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/uncaught_exception/uncaught_exception002/uncaught_exception002.java
index dd1d0748c0ff2..32f7750cdb5ec 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/uncaught_exception/uncaught_exception002/uncaught_exception002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/uncaught_exception/uncaught_exception002/uncaught_exception002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,7 @@
  * @clean nsk.jdb.uncaught_exception.uncaught_exception002.uncaught_exception002a
  * @compile -g:lines,source,vars uncaught_exception002a.java
  *
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.uncaught_exception.uncaught_exception002.uncaught_exception002
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -75,14 +75,10 @@
 public class uncaught_exception002 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new uncaught_exception002(true).runTest(argv, out);
+        new uncaught_exception002(true).runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.uncaught_exception.uncaught_exception002";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/unmonitor/unmonitor001/unmonitor001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/unmonitor/unmonitor001/unmonitor001.java
index 7d98824be73c4..195b2427ae58e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/unmonitor/unmonitor001/unmonitor001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/unmonitor/unmonitor001/unmonitor001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,7 +56,7 @@
  * @clean nsk.jdb.unmonitor.unmonitor001.unmonitor001a
  * @compile -g:lines,source,vars unmonitor001a.java
  *
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.unmonitor.unmonitor001.unmonitor001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -79,14 +79,10 @@
 public class unmonitor001 extends JdbTest {
 
     public static void main (String argv[])  {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new unmonitor001().runTest(argv, out);
+        new unmonitor001().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.unmonitor.unmonitor001";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/untrace/untrace001/untrace001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/untrace/untrace001/untrace001.java
index daad477dbb439..0891e5b931cc4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/untrace/untrace001/untrace001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/untrace/untrace001/untrace001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.untrace.untrace001.untrace001a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.untrace.untrace001.untrace001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -77,14 +77,10 @@
 public class untrace001 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new untrace001().runTest(argv, out);
+        new untrace001().runTest(argv);
     }
 
     static final String PACKAGE_NAME    = "nsk.jdb.untrace.untrace001";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/unwatch/unwatch001/unwatch001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/unwatch/unwatch001/unwatch001.java
index b8c71645edb47..aff9890e58d8b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/unwatch/unwatch001/unwatch001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/unwatch/unwatch001/unwatch001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.unwatch.unwatch001.unwatch001a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.unwatch.unwatch001.unwatch001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -73,14 +73,10 @@
 public class unwatch001 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new unwatch001().runTest(argv, out);
+        new unwatch001().runTest(argv);
     }
 
     static final String PACKAGE_NAME       = "nsk.jdb.unwatch.unwatch001";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/unwatch/unwatch002/unwatch002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/unwatch/unwatch002/unwatch002.java
index e32cc0b8e5dc6..1078e2b3da358 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/unwatch/unwatch002/unwatch002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/unwatch/unwatch002/unwatch002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,7 +51,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.unwatch.unwatch002.unwatch002a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.unwatch.unwatch002.unwatch002
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -74,14 +74,10 @@
 public class unwatch002 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new unwatch002().runTest(argv, out);
+        new unwatch002().runTest(argv);
     }
 
     static final String PACKAGE_NAME       = "nsk.jdb.unwatch.unwatch002";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/up/up002/up002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/up/up002/up002.java
index 5b2cb393df4e8..78c01074abb1a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/up/up002/up002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/up/up002/up002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.up.up002.up002a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.up.up002.up002
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -66,14 +66,10 @@
 public class up002 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new up002().runTest(argv, out);
+        new up002().runTest(argv);
     }
 
     static final String PACKAGE_NAME     = "nsk.jdb.up.up002";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/use/use001/use001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/use/use001/use001.java
index 1454b39b2bf8e..81ad1dd48accb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/use/use001/use001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/use/use001/use001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -43,7 +43,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.use.use001.use001a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.use.use001.use001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -67,14 +67,10 @@
 public class use001 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new use001().runTest(argv, out);
+        new use001().runTest(argv);
     }
 
     static final String PACKAGE_NAME = "nsk.jdb.use.use001";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/watch/watch001/watch001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/watch/watch001/watch001.java
index 8d434fcfc7444..dfc154d1b4186 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/watch/watch001/watch001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/watch/watch001/watch001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.watch.watch001.watch001a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.watch.watch001.watch001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -71,15 +71,11 @@
 public class watch001 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
         compoundPromptIdent = COMPOUND_PROMPT_IDENT;
-        return new watch001().runTest(argv, out);
+        new watch001().runTest(argv);
     }
 
     static final String PACKAGE_NAME       = "nsk.jdb.watch.watch001";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/watch/watch002/watch002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/watch/watch002/watch002.java
index cb0535117d9fd..84c80a59ebf73 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/watch/watch002/watch002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/watch/watch002/watch002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.watch.watch002.watch002a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.watch.watch002.watch002
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -71,15 +71,11 @@
 public class watch002 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
         compoundPromptIdent = COMPOUND_PROMPT_IDENT;
-        return new watch002().runTest(argv, out);
+        new watch002().runTest(argv);
     }
 
     static final String PACKAGE_NAME       = "nsk.jdb.watch.watch002";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/where/where004/where004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/where/where004/where004.java
index e4cbf50e62f68..9002c35e16e5a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/where/where004/where004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/where/where004/where004.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.where.where004.where004a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.where.where004.where004
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -64,14 +64,10 @@
 public class where004 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new where004().runTest(argv, out);
+        new where004().runTest(argv);
     }
 
     static final String PACKAGE_NAME     = "nsk.jdb.where.where004";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/where/where005/where005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/where/where005/where005.java
index b949916aae74e..2fded98727291 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/where/where005/where005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/where/where005/where005.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.where.where005.where005a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.where.where005.where005
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -65,14 +65,10 @@
 public class where005 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new where005(true).runTest(argv, out);
+        new where005(true).runTest(argv);
     }
 
     public where005 (boolean debuggeeShouldFail) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/where/where006/where006.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/where/where006/where006.java
index bf7622c48b345..11dc185238f07 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/where/where006/where006.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/where/where006/where006.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.where.where006.where006a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.where.where006.where006
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -65,14 +65,10 @@
 public class where006 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new where006().runTest(argv, out);
+        new where006().runTest(argv);
     }
 
     static final String PACKAGE_NAME     = "nsk.jdb.where.where006";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/wherei/wherei001/wherei001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/wherei/wherei001/wherei001.java
index 431206b55510e..e4d75620f0b49 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/wherei/wherei001/wherei001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/wherei/wherei001/wherei001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@
  * @library /vmTestbase
  *          /test/lib
  * @build nsk.jdb.wherei.wherei001.wherei001a
- * @run main/othervm
+ * @run driver
  *      nsk.jdb.wherei.wherei001.wherei001
  *      -arch=${os.family}-${os.simpleArch}
  *      -waittime=5
@@ -60,14 +60,10 @@
 public class wherei001 extends JdbTest {
 
     public static void main (String argv[]) {
-        System.exit(run(argv, System.out) + JCK_STATUS_BASE);
-    }
-
-    public static int run(String argv[], PrintStream out) {
         debuggeeClass =  DEBUGGEE_CLASS;
         firstBreak = FIRST_BREAK;
         lastBreak = LAST_BREAK;
-        return new wherei001().runTest(argv, out);
+        new wherei001().runTest(argv);
     }
 
     static final String PACKAGE_NAME    = "nsk.jdb.wherei.wherei001";
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdb/JdbTest.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdb/JdbTest.java
index 349216f4329c4..aa7ad833b53dc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdb/JdbTest.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdb/JdbTest.java
@@ -125,14 +125,15 @@ protected void initJdb() {
     protected void afterJdbExit() {
     }
 
-    protected int runTest(String argv[], PrintStream out) {
+    protected void runTest(String argv[]) {
+        PrintStream out = System.out;
         try {
             argumentHandler = new JdbArgumentHandler(argv);
             log = new Log(out, argumentHandler);
 
             if (shouldPass()) {
                 log.println("TEST PASSED");
-                return PASSED;
+                return;
             }
 
             try {
@@ -226,16 +227,14 @@ protected int runTest(String argv[], PrintStream out) {
 
             if (!success) {
                 log.complain("TEST FAILED");
-                return FAILED;
+                throw new RuntimeException("TEST FAILED");
             }
 
         } catch (Throwable t) {
             out.println("Caught unexpected exception while starting the test: " + t);
             t.printStackTrace(out);
-            out.println("TEST FAILED");
-            return FAILED;
+            throw new RuntimeException("TEST FAILED", t);
         }
         out.println("TEST PASSED");
-        return PASSED;
     }
 }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdb/Launcher.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdb/Launcher.java
index 35df95b2d6f8a..d443741349560 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdb/Launcher.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdb/Launcher.java
@@ -180,10 +180,12 @@ private String[] makeJdbCmdLine (String classToExecute) {
             } else /* LaunchingConnector or DefaultConnector */ {
 
                 connect.append("vmexec=" + argumentHandler.getLaunchExecName().trim());
+                connect.append(",options=");
+                connect.append(" \"-cp\"");
+                connect.append(" \"" + System.getProperty("test.class.path") + "\"");
+
                 String debuggeeOpts = argumentHandler.getDebuggeeOptions();
                 if (debuggeeOpts.trim().length() > 0) {
-                    //connect.append(",options=" + debuggeeOpts.trim());
-                    connect.append(",options=");
                     for (String arg : debuggeeOpts.split("\\s+")) {
                        connect.append(" \"");
                        connect.append(arg);

From 5079c38ddf345b21d8cb1c959bc36c4341e11da6 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Mon, 12 Aug 2024 22:12:01 +0000
Subject: [PATCH 390/401] 8338160: Fix -Wzero-as-null-pointer-constant warnings
 in management.cpp

Reviewed-by: dholmes
---
 src/hotspot/share/services/management.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/share/services/management.cpp b/src/hotspot/share/services/management.cpp
index 2c9f36c098d07..ac7e1daf39706 100644
--- a/src/hotspot/share/services/management.cpp
+++ b/src/hotspot/share/services/management.cpp
@@ -1820,7 +1820,7 @@ JVM_END
 // of a given length and return the objArrayOop
 static objArrayOop get_memory_usage_objArray(jobjectArray array, int length, TRAPS) {
   if (array == nullptr) {
-    THROW_(vmSymbols::java_lang_NullPointerException(), 0);
+    THROW_NULL(vmSymbols::java_lang_NullPointerException());
   }
 
   objArrayOop oa = objArrayOop(JNIHandles::resolve_non_null(array));
@@ -1828,16 +1828,16 @@ static objArrayOop get_memory_usage_objArray(jobjectArray array, int length, TRA
 
   // array must be of the given length
   if (length != array_h->length()) {
-    THROW_MSG_(vmSymbols::java_lang_IllegalArgumentException(),
-               "The length of the given MemoryUsage array does not match the number of memory pools.", 0);
+    THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(),
+                   "The length of the given MemoryUsage array does not match the number of memory pools.");
   }
 
   // check if the element of array is of type MemoryUsage class
   Klass* usage_klass = Management::java_lang_management_MemoryUsage_klass(CHECK_NULL);
   Klass* element_klass = ObjArrayKlass::cast(array_h->klass())->element_klass();
   if (element_klass != usage_klass) {
-    THROW_MSG_(vmSymbols::java_lang_IllegalArgumentException(),
-               "The element type is not MemoryUsage class", 0);
+    THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(),
+                   "The element type is not MemoryUsage class");
   }
 
   return array_h();

From e70c9bccaae375be1ee6812dabc9fbaff01a6ab0 Mon Sep 17 00:00:00 2001
From: Zhengyu Gu <zgu@openjdk.org>
Date: Mon, 12 Aug 2024 23:00:04 +0000
Subject: [PATCH 391/401] 8338248: PartialArrayStateAllocator::Impl leaks Arena
 array

Reviewed-by: kbarrett, shade
---
 src/hotspot/share/gc/shared/partialArrayState.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hotspot/share/gc/shared/partialArrayState.cpp b/src/hotspot/share/gc/shared/partialArrayState.cpp
index 583c5dede4026..fd23a32022208 100644
--- a/src/hotspot/share/gc/shared/partialArrayState.cpp
+++ b/src/hotspot/share/gc/shared/partialArrayState.cpp
@@ -100,6 +100,7 @@ PartialArrayStateAllocator::Impl::~Impl() {
   for (uint i = 0; i < _num_workers; ++i) {
     _arenas[i].~Arena();
   }
+  FREE_C_HEAP_ARRAY(Arena*, _arenas);
 }
 
 PartialArrayState* PartialArrayStateAllocator::Impl::allocate(uint worker_id,

From d77e6fe45c7b834db457a772ce0bea514d2e44f3 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Tue, 13 Aug 2024 05:46:38 +0000
Subject: [PATCH 392/401] 8338154: Fix -Wzero-as-null-pointer-constant warnings
 in gtest framework

Reviewed-by: ihse, dholmes, jwaters
---
 make/hotspot/lib/CompileGtest.gmk | 3 ++-
 test/hotspot/gtest/gtestMain.cpp  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/make/hotspot/lib/CompileGtest.gmk b/make/hotspot/lib/CompileGtest.gmk
index 696adb0c95f10..424743ba27976 100644
--- a/make/hotspot/lib/CompileGtest.gmk
+++ b/make/hotspot/lib/CompileGtest.gmk
@@ -57,7 +57,8 @@ $(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBGTEST, \
         $(GTEST_FRAMEWORK_SRC)/googletest/src \
         $(GTEST_FRAMEWORK_SRC)/googlemock/src, \
     INCLUDE_FILES := gtest-all.cc gmock-all.cc, \
-    DISABLED_WARNINGS_gcc := undef unused-result format-nonliteral maybe-uninitialized, \
+    DISABLED_WARNINGS_gcc := undef unused-result format-nonliteral \
+        maybe-uninitialized zero-as-null-pointer-constant, \
     DISABLED_WARNINGS_clang := undef unused-result format-nonliteral, \
     DEFAULT_CFLAGS := false, \
     CFLAGS := $(JVM_CFLAGS) \
diff --git a/test/hotspot/gtest/gtestMain.cpp b/test/hotspot/gtest/gtestMain.cpp
index bc8ca29f72d45..0bd251e8094b3 100644
--- a/test/hotspot/gtest/gtestMain.cpp
+++ b/test/hotspot/gtest/gtestMain.cpp
@@ -336,7 +336,7 @@ static void run_in_new_thread(const args_t* args) {
 extern "C" void* thread_wrapper(void* p) {
   const args_t* const p_args = (const args_t*) p;
   runUnitTestsInner(p_args->argc, p_args->argv);
-  return 0;
+  return nullptr;
 }
 
 static void run_in_new_thread(const args_t* args) {

From 73ddb7deab26c526337ec6e7cd5f528f698a552c Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Tue, 13 Aug 2024 05:52:44 +0000
Subject: [PATCH 393/401] 8335628: C2 SuperWord: cleanup: remove
 SuperWord::longer_type_for_conversion

Reviewed-by: chagedorn, kvn
---
 src/hotspot/share/opto/superword.cpp | 25 +------------------------
 src/hotspot/share/opto/superword.hpp |  3 ---
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/src/hotspot/share/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp
index 0e1328a448577..2a43d2ec0af4a 100644
--- a/src/hotspot/share/opto/superword.cpp
+++ b/src/hotspot/share/opto/superword.cpp
@@ -691,9 +691,7 @@ bool SuperWord::can_pack_into_pair(Node* s1, Node* s2) {
   BasicType bt2 = velt_basic_type(s2);
   if(!is_java_primitive(bt1) || !is_java_primitive(bt2))
     return false;
-  BasicType longer_bt = longer_type_for_conversion(s1);
-  if (Matcher::max_vector_size_auto_vectorization(bt1) < 2 ||
-      (longer_bt != T_ILLEGAL && Matcher::max_vector_size_auto_vectorization(longer_bt) < 2)) {
+  if (Matcher::max_vector_size_auto_vectorization(bt1) < 2) {
     return false; // No vectors for this type
   }
 
@@ -2442,27 +2440,6 @@ VStatus VLoopBody::construct() {
   return VStatus::make_success();
 }
 
-BasicType SuperWord::longer_type_for_conversion(Node* n) const {
-  if (!(VectorNode::is_convert_opcode(n->Opcode()) ||
-        VectorNode::is_scalar_op_that_returns_int_but_vector_op_returns_long(n->Opcode())) ||
-      !in_bb(n->in(1))) {
-    return T_ILLEGAL;
-  }
-  assert(in_bb(n), "must be in the bb");
-  BasicType src_t = velt_basic_type(n->in(1));
-  BasicType dst_t = velt_basic_type(n);
-  // Do not use superword for non-primitives.
-  // Superword does not support casting involving unsigned types.
-  if (!is_java_primitive(src_t) || is_unsigned_subword_type(src_t) ||
-      !is_java_primitive(dst_t) || is_unsigned_subword_type(dst_t)) {
-    return T_ILLEGAL;
-  }
-  int src_size = type2aelembytes(src_t);
-  int dst_size = type2aelembytes(dst_t);
-  return src_size == dst_size ? T_ILLEGAL
-                              : (src_size > dst_size ? src_t : dst_t);
-}
-
 void VLoopTypes::compute_vector_element_type() {
 #ifndef PRODUCT
   if (_vloop.is_trace_vector_element_type()) {
diff --git a/src/hotspot/share/opto/superword.hpp b/src/hotspot/share/opto/superword.hpp
index 65f870825251f..8b24e0cf3a11a 100644
--- a/src/hotspot/share/opto/superword.hpp
+++ b/src/hotspot/share/opto/superword.hpp
@@ -623,9 +623,6 @@ class SuperWord : public ResourceObj {
   // Is use->in(u_idx) a vector use?
   bool is_vector_use(Node* use, int u_idx) const;
 
-  // Return the longer type for vectorizable type-conversion node or illegal type for other nodes.
-  BasicType longer_type_for_conversion(Node* n) const;
-
   bool is_velt_basic_type_compatible_use_def(Node* use, Node* def) const;
 
   bool schedule_and_apply() const;

From c27a8c8c8b867e6812b905f6154762802a498dbd Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Tue, 13 Aug 2024 05:52:58 +0000
Subject: [PATCH 394/401] 8338124: C2 SuperWord: MulAddS2I input permutation
 still partially broken after JDK-8333840

Reviewed-by: chagedorn, thartmann, kvn
---
 src/hotspot/share/opto/superword.cpp           |  2 +-
 .../loopopts/superword/TestMulAddS2I.java      | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp
index 2a43d2ec0af4a..bb5fed78b0274 100644
--- a/src/hotspot/share/opto/superword.cpp
+++ b/src/hotspot/share/opto/superword.cpp
@@ -2270,7 +2270,7 @@ Node_List* PackSet::strided_pack_input_at_index_or_null(const Node_List* pack, c
     return nullptr; // size mismatch
   }
 
-  for (uint i = 1; i < pack->size(); i++) {
+  for (uint i = 0; i < pack->size(); i++) {
     if (pack->at(i)->in(index) != pack_in->at(i * stride + offset)) {
       return nullptr; // use-def mismatch
     }
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestMulAddS2I.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestMulAddS2I.java
index e0f073c7f8f7d..fb99fc5983a16 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestMulAddS2I.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestMulAddS2I.java
@@ -53,6 +53,7 @@ public class TestMulAddS2I {
     static final int[] GOLDEN_J;
     static final int[] GOLDEN_K;
     static final int[] GOLDEN_L;
+    static final int[] GOLDEN_M;
 
     static {
         for (int i = 0; i < RANGE; i++) {
@@ -71,6 +72,7 @@ public class TestMulAddS2I {
         GOLDEN_J = testj(new int[ITER]);
         GOLDEN_K = testk(new int[ITER]);
         GOLDEN_L = testl(new int[ITER]);
+        GOLDEN_M = testm(new int[ITER]);
     }
 
 
@@ -80,7 +82,7 @@ public static void main(String[] args) {
     }
 
     @Run(test = {"testa", "testb", "testc", "testd", "teste", "testf", "testg", "testh",
-                 "testi", "testj", "testk", "testl"})
+                 "testi", "testj", "testk", "testl", "testm"})
     @Warmup(0)
     public static void run() {
         compare(testa(), GOLDEN_A, "testa");
@@ -95,6 +97,7 @@ public static void run() {
         compare(testj(new int[ITER]), GOLDEN_J, "testj");
         compare(testk(new int[ITER]), GOLDEN_K, "testk");
         compare(testl(new int[ITER]), GOLDEN_L, "testl");
+        compare(testm(new int[ITER]), GOLDEN_M, "testm");
     }
 
     public static void compare(int[] out, int[] golden, String name) {
@@ -299,4 +302,17 @@ public static int[] testl(int[] out) {
         return out;
     }
 
+    @Test
+    @IR(counts = {IRNode.MUL_ADD_S2I, "> 0"},
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+    @IR(counts = {IRNode.MUL_ADD_VS2VI, "= 0"})
+    public static int[] testm(int[] out) {
+        for (int i = 0; i < ITER-4; i+=4) {
+            // Unrolled, with some swaps that prevent vectorization.
+            out[i+0] += ((sArr1[2*i+0] * sArr2[2*i+1]) + (sArr1[2*i+1] * sArr2[2*i+0])); // bad
+            out[i+1] += ((sArr1[2*i+2] * sArr2[2*i+2]) + (sArr1[2*i+3] * sArr2[2*i+3])); // ok
+            // 2-element gap
+        }
+        return out;
+    }
 }

From 73f7a5f15dbba54a98f3916ff1190520ac07874d Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Tue, 13 Aug 2024 07:27:49 +0000
Subject: [PATCH 395/401] 8338155: Fix -Wzero-as-null-pointer-constant warnings
 involving PTHREAD_MUTEX_INITIALIZER

Reviewed-by: dholmes, dlong
---
 src/hotspot/os/linux/os_perf_linux.cpp               | 5 ++++-
 src/hotspot/os/posix/threadCritical_posix.cpp        | 8 +++++++-
 src/hotspot/share/utilities/compilerWarnings.hpp     | 6 +++++-
 src/hotspot/share/utilities/compilerWarnings_gcc.hpp | 5 ++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/os/linux/os_perf_linux.cpp b/src/hotspot/os/linux/os_perf_linux.cpp
index 87abbebe25faf..a31a58e55af93 100644
--- a/src/hotspot/os/linux/os_perf_linux.cpp
+++ b/src/hotspot/os/linux/os_perf_linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -430,7 +430,10 @@ static int get_boot_time(uint64_t* time) {
 }
 
 static int perf_context_switch_rate(double* rate) {
+  PRAGMA_DIAG_PUSH
+  PRAGMA_ZERO_AS_NULL_POINTER_CONSTANT_IGNORED
   static pthread_mutex_t contextSwitchLock = PTHREAD_MUTEX_INITIALIZER;
+  PRAGMA_DIAG_POP
   static uint64_t      bootTime;
   static uint64_t      lastTimeNanos;
   static uint64_t      lastSwitches;
diff --git a/src/hotspot/os/posix/threadCritical_posix.cpp b/src/hotspot/os/posix/threadCritical_posix.cpp
index 45eba4c15852c..cd3b42e71ba8b 100644
--- a/src/hotspot/os/posix/threadCritical_posix.cpp
+++ b/src/hotspot/os/posix/threadCritical_posix.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2014 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -26,6 +26,7 @@
 #include "precompiled.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/threadCritical.hpp"
+#include "utilities/compilerWarnings.hpp"
 
 // put OS-includes here
 # include <pthread.h>
@@ -35,7 +36,12 @@
 //
 
 static pthread_t             tc_owner = 0;
+
+PRAGMA_DIAG_PUSH
+PRAGMA_ZERO_AS_NULL_POINTER_CONSTANT_IGNORED
 static pthread_mutex_t       tc_mutex = PTHREAD_MUTEX_INITIALIZER;
+PRAGMA_DIAG_POP
+
 static int                   tc_count = 0;
 
 ThreadCritical::ThreadCritical() {
diff --git a/src/hotspot/share/utilities/compilerWarnings.hpp b/src/hotspot/share/utilities/compilerWarnings.hpp
index 28954843dc323..ddcaf022fa690 100644
--- a/src/hotspot/share/utilities/compilerWarnings.hpp
+++ b/src/hotspot/share/utilities/compilerWarnings.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -82,6 +82,10 @@
 #define PRAGMA_NONNULL_IGNORED
 #endif
 
+#ifndef PRAGMA_ZERO_AS_NULL_POINTER_CONSTANT_IGNORED
+#define PRAGMA_ZERO_AS_NULL_POINTER_CONSTANT_IGNORED
+#endif
+
 // Support warnings for use of certain C functions, except where explicitly
 // permitted.
 //
diff --git a/src/hotspot/share/utilities/compilerWarnings_gcc.hpp b/src/hotspot/share/utilities/compilerWarnings_gcc.hpp
index 53373ec628a46..1dd5892e4c348 100644
--- a/src/hotspot/share/utilities/compilerWarnings_gcc.hpp
+++ b/src/hotspot/share/utilities/compilerWarnings_gcc.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,6 +67,9 @@
 
 #define PRAGMA_NONNULL_IGNORED PRAGMA_DISABLE_GCC_WARNING("-Wnonnull")
 
+#define PRAGMA_ZERO_AS_NULL_POINTER_CONSTANT_IGNORED \
+  PRAGMA_DISABLE_GCC_WARNING("-Wzero-as-null-pointer-constant")
+
 #if (__GNUC__ >= 10)
 // TODO: Re-enable warning attribute for Clang once
 // https://github.com/llvm/llvm-project/issues/56519 is fixed and released.

From 5bf27098e22172ed5d3ec0c43fe0553f8322c4b1 Mon Sep 17 00:00:00 2001
From: Saint Wesonga <saint.wesonga@microsoft.com>
Date: Tue, 13 Aug 2024 08:10:29 +0000
Subject: [PATCH 396/401] 8334475: UnsafeIntrinsicsTest.java#ZGenerationalDebug
 assert(!assert_on_failure) failed: Has low-order bits set

Reviewed-by: stefank, eosterlund, aboldtch
---
 .../windows_aarch64/copy_windows_aarch64.hpp  | 63 +++++++------------
 1 file changed, 23 insertions(+), 40 deletions(-)

diff --git a/src/hotspot/os_cpu/windows_aarch64/copy_windows_aarch64.hpp b/src/hotspot/os_cpu/windows_aarch64/copy_windows_aarch64.hpp
index ce2ad2d046f88..96a34fe967b64 100644
--- a/src/hotspot/os_cpu/windows_aarch64/copy_windows_aarch64.hpp
+++ b/src/hotspot/os_cpu/windows_aarch64/copy_windows_aarch64.hpp
@@ -26,8 +26,27 @@
 #ifndef OS_CPU_WINDOWS_AARCH64_COPY_WINDOWS_AARCH64_HPP
 #define OS_CPU_WINDOWS_AARCH64_COPY_WINDOWS_AARCH64_HPP
 
+#include "runtime/atomic.hpp"
+
 #include <string.h>
 
+template <typename T>
+static void pd_conjoint_atomic_helper(const T* from, T* to, size_t count) {
+  if (from > to) {
+    while (count-- > 0) {
+      // Copy forwards
+      Atomic::store(to++, Atomic::load(from++));
+    }
+  } else {
+    from += count - 1;
+    to   += count - 1;
+    while (count-- > 0) {
+      // Copy backwards
+      Atomic::store(to--, Atomic::load(from--));
+    }
+  }
+}
+
 static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) {
   (void)memmove(to, from, count * HeapWordSize);
 }
@@ -71,55 +90,19 @@ static void pd_conjoint_bytes_atomic(const void* from, void* to, size_t count) {
 }
 
 static void pd_conjoint_jshorts_atomic(const jshort* from, jshort* to, size_t count) {
-  if (from > to) {
-    while (count-- > 0) {
-      // Copy forwards
-      *to++ = *from++;
-    }
-  } else {
-    from += count - 1;
-    to   += count - 1;
-    while (count-- > 0) {
-      // Copy backwards
-      *to-- = *from--;
-    }
-  }
+  pd_conjoint_atomic_helper(from, to, count);
 }
 
 static void pd_conjoint_jints_atomic(const jint* from, jint* to, size_t count) {
-  if (from > to) {
-    while (count-- > 0) {
-      // Copy forwards
-      *to++ = *from++;
-    }
-  } else {
-    from += count - 1;
-    to   += count - 1;
-    while (count-- > 0) {
-      // Copy backwards
-      *to-- = *from--;
-    }
-  }
+  pd_conjoint_atomic_helper(from, to, count);
 }
 
 static void pd_conjoint_jlongs_atomic(const jlong* from, jlong* to, size_t count) {
-  pd_conjoint_oops_atomic((const oop*)from, (oop*)to, count);
+  pd_conjoint_atomic_helper(from, to, count);
 }
 
 static void pd_conjoint_oops_atomic(const oop* from, oop* to, size_t count) {
- if (from > to) {
-    while (count-- > 0) {
-      // Copy forwards
-      *to++ = *from++;
-    }
-  } else {
-    from += count - 1;
-    to   += count - 1;
-    while (count-- > 0) {
-      // Copy backwards
-      *to-- = *from--;
-    }
-  }
+ pd_conjoint_atomic_helper(from, to, count);
 }
 
 static void pd_arrayof_conjoint_bytes(const HeapWord* from, HeapWord* to, size_t count) {

From ba69ed7c58fcf99ed18dfd8840125ddcac9460bb Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 13 Aug 2024 08:11:47 +0000
Subject: [PATCH 397/401] 8338202: Shenandoah: Improve handshake closure labels

Reviewed-by: rkennke, ysr, wkemper
---
 src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp  | 2 +-
 .../share/gc/shenandoah/shenandoahConcurrentMark.cpp        | 2 +-
 src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp          | 6 +++---
 src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp          | 2 +-
 src/hotspot/share/gc/shenandoah/shenandoahUnload.cpp        | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
index ac2e732052a28..86d6d91f72c9a 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
@@ -823,7 +823,7 @@ void ShenandoahConcurrentGC::op_weak_roots() {
   // Perform handshake to flush out dead oops
   {
     ShenandoahTimingsTracker t(ShenandoahPhaseTimings::conc_weak_roots_rendezvous);
-    heap->rendezvous_threads();
+    heap->rendezvous_threads("Shenandoah Concurrent Weak Roots");
   }
 }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
index 31157616e0ef8..dde446d824b77 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
@@ -179,7 +179,7 @@ class ShenandoahFlushSATBHandshakeClosure : public HandshakeClosure {
   SATBMarkQueueSet& _qset;
 public:
   ShenandoahFlushSATBHandshakeClosure(SATBMarkQueueSet& qset) :
-    HandshakeClosure("Shenandoah Flush SATB Handshake"),
+    HandshakeClosure("Shenandoah Flush SATB"),
     _qset(qset) {}
 
   void do_thread(Thread* thread) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index eb6de9719dc62..0a20307abcbbf 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -1744,12 +1744,12 @@ void ShenandoahHeap::parallel_heap_region_iterate(ShenandoahHeapRegionClosure* b
 
 class ShenandoahRendezvousClosure : public HandshakeClosure {
 public:
-  inline ShenandoahRendezvousClosure() : HandshakeClosure("ShenandoahRendezvous") {}
+  inline ShenandoahRendezvousClosure(const char* name) : HandshakeClosure(name) {}
   inline void do_thread(Thread* thread) {}
 };
 
-void ShenandoahHeap::rendezvous_threads() {
-  ShenandoahRendezvousClosure cl;
+void ShenandoahHeap::rendezvous_threads(const char* name) {
+  ShenandoahRendezvousClosure cl(name);
   Handshake::execute(&cl);
 }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
index f3625da218cf2..86bd7b83bbe1b 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
@@ -400,7 +400,7 @@ class ShenandoahHeap : public CollectedHeap, public ShenandoahSpaceInfo {
   void update_heap_region_states(bool concurrent);
   void rebuild_free_set(bool concurrent);
 
-  void rendezvous_threads();
+  void rendezvous_threads(const char* name);
   void recycle_trash();
 public:
   void notify_gc_progress();
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahUnload.cpp b/src/hotspot/share/gc/shenandoah/shenandoahUnload.cpp
index 02a7fbeb8b5be..f33b76bcd4e1c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahUnload.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahUnload.cpp
@@ -168,7 +168,7 @@ void ShenandoahUnload::unload() {
   // Make sure stale metadata and nmethods are no longer observable
   {
     ShenandoahTimingsTracker t(ShenandoahPhaseTimings::conc_class_unload_rendezvous);
-    heap->rendezvous_threads();
+    heap->rendezvous_threads("Shenandoah Class Unloading");
   }
 
   // Purge stale metadata and nmethods that were unlinked

From fbe4cc96e223882a18c7ff666fe6f68b3fa2cfe4 Mon Sep 17 00:00:00 2001
From: Viktor Klang <vklang@openjdk.org>
Date: Tue, 13 Aug 2024 09:51:08 +0000
Subject: [PATCH 398/401] 8336384: AbstractQueuedSynchronizer.acquire should
 cancel acquire when failing due to a LinkageError or other errors

Reviewed-by: alanb
---
 .../locks/AbstractQueuedLongSynchronizer.java | 19 ++++++++++++-------
 .../locks/AbstractQueuedSynchronizer.java     | 19 ++++++++++++-------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java b/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
index f4d7d0c08c0c9..2de1d17e7c18c 100644
--- a/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
+++ b/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
@@ -369,14 +369,19 @@ final int acquire(Node node, long arg, boolean shared,
             } else if (node.status == 0) {
                 node.status = WAITING;          // enable signal and recheck
             } else {
-                long nanos;
                 spins = postSpins = (byte)((postSpins << 1) | 1);
-                if (!timed)
-                    LockSupport.park(this);
-                else if ((nanos = time - System.nanoTime()) > 0L)
-                    LockSupport.parkNanos(this, nanos);
-                else
-                    break;
+                try {
+                    long nanos;
+                    if (!timed)
+                        LockSupport.park(this);
+                    else if ((nanos = time - System.nanoTime()) > 0L)
+                        LockSupport.parkNanos(this, nanos);
+                    else
+                        break;
+                } catch (Error | RuntimeException ex) {
+                    cancelAcquire(node, interrupted, interruptible); // cancel & rethrow
+                    throw ex;
+                }
                 node.clearStatus();
                 if ((interrupted |= Thread.interrupted()) && interruptible)
                     break;
diff --git a/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java b/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
index 1f51419f94c18..2ea0d3ed3b091 100644
--- a/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
+++ b/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
@@ -748,14 +748,19 @@ final int acquire(Node node, int arg, boolean shared,
             } else if (node.status == 0) {
                 node.status = WAITING;          // enable signal and recheck
             } else {
-                long nanos;
                 spins = postSpins = (byte)((postSpins << 1) | 1);
-                if (!timed)
-                    LockSupport.park(this);
-                else if ((nanos = time - System.nanoTime()) > 0L)
-                    LockSupport.parkNanos(this, nanos);
-                else
-                    break;
+                try {
+                    long nanos;
+                    if (!timed)
+                        LockSupport.park(this);
+                    else if ((nanos = time - System.nanoTime()) > 0L)
+                        LockSupport.parkNanos(this, nanos);
+                    else
+                        break;
+                } catch (Error | RuntimeException ex) {
+                    cancelAcquire(node, interrupted, interruptible); // cancel & rethrow
+                    throw ex;
+                }
                 node.clearStatus();
                 if ((interrupted |= Thread.interrupted()) && interruptible)
                     break;

From ff8a9f9267c480fe0be8470cda870fd77763fb31 Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Tue, 13 Aug 2024 11:48:50 +0000
Subject: [PATCH 399/401] 8337318: Deoptimization::relock_objects fails
 assert(monitor->owner() == Thread::current()) failed: must be

Co-authored-by: Richard Reingruber <rrich@openjdk.org>
Reviewed-by: rrich, dholmes, shade, pchilanomate
---
 src/hotspot/share/runtime/synchronizer.cpp |  4 +-
 test/jdk/com/sun/jdi/EATests.java          | 83 +++++++++++++++++++++-
 2 files changed, 84 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/runtime/synchronizer.cpp b/src/hotspot/share/runtime/synchronizer.cpp
index 2d45163d0f4a2..b4ff263d455b4 100644
--- a/src/hotspot/share/runtime/synchronizer.cpp
+++ b/src/hotspot/share/runtime/synchronizer.cpp
@@ -596,8 +596,8 @@ bool ObjectSynchronizer::enter_fast_impl(Handle obj, BasicLock* lock, JavaThread
 
         log_info(monitorinflation)("LockStack capacity exceeded, inflating.");
         ObjectMonitor* monitor = inflate_for(locking_thread, lock_stack.bottom(), inflate_cause_vm_internal);
-        assert(monitor->owner() == Thread::current(), "must be owner=" PTR_FORMAT " current=" PTR_FORMAT " mark=" PTR_FORMAT,
-               p2i(monitor->owner()), p2i(Thread::current()), monitor->object()->mark_acquire().value());
+        assert(monitor->owner() == locking_thread, "must be owner=" PTR_FORMAT " locking_thread=" PTR_FORMAT " mark=" PTR_FORMAT,
+               p2i(monitor->owner()), p2i(locking_thread), monitor->object()->mark_acquire().value());
         assert(!lock_stack.is_full(), "must have made room here");
       }
 
diff --git a/test/jdk/com/sun/jdi/EATests.java b/test/jdk/com/sun/jdi/EATests.java
index 7285948165989..adeb21741438f 100644
--- a/test/jdk/com/sun/jdi/EATests.java
+++ b/test/jdk/com/sun/jdi/EATests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 SAP SE. All rights reserved.
+ * Copyright (c) 2020, 2024 SAP SE. 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
@@ -288,6 +288,7 @@ public static void main(String[] args) {
 
         // Relocking test cases
         new EARelockingSimpleTarget()                                                       .run();
+        new EARelockingWithManyLightweightLocksTarget()                                     .run();
         new EARelockingSimpleWithAccessInOtherThreadTarget()                                .run();
         new EARelockingSimpleWithAccessInOtherThread_02_DynamicCall_Target()                .run();
         new EARelockingRecursiveTarget()                                                    .run();
@@ -413,6 +414,7 @@ protected void runTests() throws Exception {
 
         // Relocking test cases
         new EARelockingSimple()                                                       .run(this);
+        new EARelockingWithManyLightweightLocks()                                     .run(this);
         new EARelockingSimpleWithAccessInOtherThread()                                .run(this);
         new EARelockingSimpleWithAccessInOtherThread_02_DynamicCall()                 .run(this);
         new EARelockingRecursive()                                                    .run(this);
@@ -1797,6 +1799,85 @@ public void dontinline_testMethod() {
 
 /////////////////////////////////////////////////////////////////////////////
 
+/**
+ * Like {@link EARelockingSimple}. The difference is that there are many
+ * lightweight locked objects when the relocking is done. With
+ * <code>-XX:LockingMode=2</code> the lock stack of the thread will be full
+ * because of this.
+ */
+
+class EARelockingWithManyLightweightLocks extends EATestCaseBaseDebugger {
+
+    public void runTestCase() throws Exception {
+        BreakpointEvent bpe = resumeTo(TARGET_TESTCASE_BASE_NAME, "dontinline_brkpt", "()V");
+        printStack(bpe.thread());
+        @SuppressWarnings("unused")
+        ObjectReference o = getLocalRef(bpe.thread().frame(1), XYVAL_NAME, "l1");
+    }
+}
+
+class EARelockingWithManyLightweightLocksTarget extends EATestCaseBaseTarget {
+
+    static class Lock {
+    }
+
+    public static Lock L0, L1, L2, L3, L4, L5, L6, L7, L8, L9;
+
+    void allocateLocks() {
+        L0 = new Lock();
+        L1 = new Lock();
+        L2 = new Lock();
+        L3 = new Lock();
+        L4 = new Lock();
+        L5 = new Lock();
+        L6 = new Lock();
+        L7 = new Lock();
+        L8 = new Lock();
+        L9 = new Lock();
+    }
+
+    @Override
+    public void setUp() {
+        super.setUp();
+        allocateLocks();
+    }
+
+    @Override
+    public void warmupDone() {
+        super.warmupDone();
+        allocateLocks();    // get rid of already inflated ones
+    }
+
+    public void dontinline_testMethod() {
+        XYVal l1 = new XYVal(4, 2);
+        synchronized(L0) {
+            synchronized(L1) {
+                synchronized(L2) {
+                    synchronized(L3) {
+                        synchronized(L4) {
+                            synchronized(L5) {
+                                synchronized(L6) {
+                                    synchronized(L7) {
+                                        synchronized(L8) {
+                                            synchronized(L9) {
+                                                synchronized (l1) {
+                                                    dontinline_brkpt();
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
 // The debugger reads and publishes an object with eliminated locking to an instance field.
 // A 2nd thread in the debuggee finds it there and changes its state using a synchronized method.
 // Without eager relocking the accesses are unsynchronized which can be observed.

From 76e33b6c1517599e14ee34371c945aafcd752e4e Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Tue, 13 Aug 2024 13:13:14 +0000
Subject: [PATCH 400/401] 8336148: Test
 runtime/locking/TestRecursiveMonitorChurn.java failed: Unexpected Inflation

Reviewed-by: dholmes, eosterlund
---
 .../runtime/locking/TestRecursiveMonitorChurn.java   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/test/hotspot/jtreg/runtime/locking/TestRecursiveMonitorChurn.java b/test/hotspot/jtreg/runtime/locking/TestRecursiveMonitorChurn.java
index 19dd90015bf1c..806f32aad882b 100644
--- a/test/hotspot/jtreg/runtime/locking/TestRecursiveMonitorChurn.java
+++ b/test/hotspot/jtreg/runtime/locking/TestRecursiveMonitorChurn.java
@@ -70,6 +70,18 @@ public static void main(String[] args) {
         if (pre_monitor_count != post_monitor_count) {
             final long monitor_count_change = post_monitor_count - pre_monitor_count;
             System.out.println("Unexpected change in monitor count: " + monitor_count_change);
+
+            // Intermittent deflation and inflation may occur due to running the test
+            // with stress flags (like DeoptimizeALot) or with added instrumentation
+            // which runs in the same VM.
+            // An arbitrary fuzzy max difference of 10 (= 0.01% of COUNT) is chosen to
+            // allow for these occurrences to be skipped while still catching regressions.
+            final long fuzzy_max_difference = 10;
+            if (Math.abs(monitor_count_change) < fuzzy_max_difference) {
+                final String type = monitor_count_change < 0 ? "deflation" : "inflation";
+                throw new SkippedException("Intermittent " + type + " detected. Invalid test.");
+            }
+
             if (monitor_count_change < 0) {
                 throw new RuntimeException("Unexpected Deflation");
             }

From 877fd5a768647790d0a43aaca247043bae70d708 Mon Sep 17 00:00:00 2001
From: Casper Norrbin <casper.norrbin@oracle.com>
Date: Tue, 13 Aug 2024 14:43:44 +0000
Subject: [PATCH 401/401] 8337595: Remove empty statements in
 src/hotspot/share/memory/metaspace

Reviewed-by: stefank, dholmes, jwaters
---
 src/hotspot/share/memory/metaspace/metaspaceCommon.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/memory/metaspace/metaspaceCommon.hpp b/src/hotspot/share/memory/metaspace/metaspaceCommon.hpp
index eae75e8194cc4..511f4e6e09244 100644
--- a/src/hotspot/share/memory/metaspace/metaspaceCommon.hpp
+++ b/src/hotspot/share/memory/metaspace/metaspaceCommon.hpp
@@ -85,7 +85,7 @@ void print_percentage(outputStream* st, size_t total, size_t part);
          SIZE_FORMAT_X " is not aligned to "                 \
          SIZE_FORMAT_X, (size_t)(uintptr_t)value, (size_t)(alignment))
 #define assert_is_aligned_metaspace_pointer(p) \
-  assert_is_aligned((p), metaspace::AllocationAlignmentByteSize);
+  assert_is_aligned((p), metaspace::AllocationAlignmentByteSize)
 #else
 #define assert_is_aligned(value, alignment)
 #define assert_is_aligned_metaspace_pointer(pointer)
@@ -141,8 +141,8 @@ void print_number_of_classes(outputStream* out, uintx classes, uintx classes_sha
 #define HAVE_UL
 
 #ifdef HAVE_UL
-#define UL(level, message)        log_##level(metaspace)(LOGFMT ": " message, LOGFMT_ARGS);
-#define UL2(level, message, ...)  log_##level(metaspace)(LOGFMT ": " message, LOGFMT_ARGS, __VA_ARGS__);
+#define UL(level, message)        log_##level(metaspace)(LOGFMT ": " message, LOGFMT_ARGS)
+#define UL2(level, message, ...)  log_##level(metaspace)(LOGFMT ": " message, LOGFMT_ARGS, __VA_ARGS__)
 #else
 #define UL(level, ...)
 #define UL2(level, ...)