diff --git a/bin/idea.sh b/bin/idea.sh
index a184884b61a..d9a18956e3b 100644
--- a/bin/idea.sh
+++ b/bin/idea.sh
@@ -187,14 +187,18 @@ fi
SOURCE_PREFIX=""
+# SOURCES is a single string containing embeded newlines.
for root in $MODULE_ROOTS; do
if [ "x$CYGPATH" != "x" ]; then
root=`$CYGPATH -am $root`
elif [ "x$WSL_DISTRO_NAME" != "x" ]; then
root=`wslpath -am $root`
fi
-
- SOURCES=$SOURCES" $SOURCE_PREFIX""$root""$SOURCE_POSTFIX"
+ # Add line termination/indentation for everything after the first entry.
+ if [ "x$SOURCES" != "x" ]; then
+ SOURCES="${SOURCES}\n "
+ fi
+ SOURCES="${SOURCES}${SOURCE_PREFIX}${root}${SOURCE_POSTFIX}"
done
add_replacement "###SOURCE_ROOTS###" "$SOURCES"
diff --git a/make/Docs.gmk b/make/Docs.gmk
index a8d40e078e2..9cee8cd40c1 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -1,4 +1,4 @@
-# Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
# 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,19 +93,16 @@ JAVADOC_DISABLED_DOCLINT_WARNINGS := missing
JAVADOC_DISABLED_DOCLINT_PACKAGES := org.w3c.* javax.smartcardio
# The initial set of options for javadoc
-# -XDaccessInternalAPI is a temporary workaround, see 8373909
JAVADOC_OPTIONS := -use -keywords -notimestamp \
-serialwarn -encoding utf-8 -docencoding utf-8 -breakiterator \
-splitIndex --system none -javafx --expand-requires transitive \
- --override-methods=summary \
- -XDaccessInternalAPI
+ --override-methods=summary
# The reference options must stay stable to allow for comparisons across the
# development cycle.
REFERENCE_OPTIONS := -XDignore.symbol.file=true -use -keywords -notimestamp \
-serialwarn -encoding utf-8 -breakiterator -splitIndex --system none \
- -html5 -javafx --expand-requires transitive \
- -XDaccessInternalAPI
+ -html5 -javafx --expand-requires transitive
# Should we add DRAFT stamps to the generated javadoc?
ifeq ($(VERSION_IS_GA), true)
diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 02ea632e3ec..d4be5936c41 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -1020,6 +1020,9 @@ define SetupRunJtregTestBody
VM_OPTIONS := $$(JTREG_ALL_OPTIONS) ))
$$(call LogWarn, AOT_JDK_CACHE=$$($1_AOT_JDK_CACHE))
$1_JTREG_BASIC_OPTIONS += -vmoption:-XX:AOTCache="$$($1_AOT_JDK_CACHE)"
+ $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \
+ $$(addprefix $$($1_TEST_ROOT)/, ProblemList-AotJdk.txt) \
+ ))
endif
diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
index ab9cd8be19b..423654cd50a 100644
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -544,12 +544,9 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -fstack-protector"
TOOLCHAIN_CFLAGS_JDK="-fvisibility=hidden -pipe -fstack-protector"
# reduce lib size on linux in link step, this needs also special compile flags
- # do this on s390x also for libjvm (where serviceability agent is not supported)
if test "x$ENABLE_LINKTIME_GC" = xtrue; then
TOOLCHAIN_CFLAGS_JDK="$TOOLCHAIN_CFLAGS_JDK -ffunction-sections -fdata-sections"
- if test "x$OPENJDK_TARGET_CPU" = xs390x && test "x$DEBUG_LEVEL" == xrelease; then
- TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -ffunction-sections -fdata-sections"
- fi
+ TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -ffunction-sections -fdata-sections"
fi
# technically NOT for CXX (but since this gives *worse* performance, use
# no-strict-aliasing everywhere!)
diff --git a/make/autoconf/flags-ldflags.m4 b/make/autoconf/flags-ldflags.m4
index 7782735be25..ff10828731e 100644
--- a/make/autoconf/flags-ldflags.m4
+++ b/make/autoconf/flags-ldflags.m4
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
# 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,16 +53,15 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
# add --icf=all (Identical Code Folding — merges identical functions)
BASIC_LDFLAGS="-Wl,-z,defs -Wl,-z,relro -Wl,-z,now -Wl,--no-as-needed -Wl,--exclude-libs,ALL"
+ BASIC_LDFLAGS_JVM_ONLY=""
# Linux : remove unused code+data in link step
if test "x$ENABLE_LINKTIME_GC" = xtrue; then
- if test "x$OPENJDK_TARGET_CPU" = xs390x; then
- BASIC_LDFLAGS="$BASIC_LDFLAGS -Wl,--gc-sections"
- else
- BASIC_LDFLAGS_JDK_ONLY="$BASIC_LDFLAGS_JDK_ONLY -Wl,--gc-sections"
- fi
+ # keep vtables : -Wl,--undefined-glob=_ZTV* (but this seems not to work with gold ld)
+ # so keep at least the Metadata vtable that is used in the serviceability agent
+ BASIC_LDFLAGS_JVM_ONLY="$BASIC_LDFLAGS_JVM_ONLY -Wl,--gc-sections -Wl,--undefined=_ZTV8Metadata"
+ BASIC_LDFLAGS_JDK_ONLY="$BASIC_LDFLAGS_JDK_ONLY -Wl,--gc-sections"
fi
- BASIC_LDFLAGS_JVM_ONLY=""
LDFLAGS_LTO="-flto=auto -fuse-linker-plugin -fno-strict-aliasing $DEBUG_PREFIX_CFLAGS"
LDFLAGS_CXX_PARTIAL_LINKING="$MACHINE_FLAG -r"
diff --git a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
index de496b3f606..9f42326ef09 100644
--- a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
+++ b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
@@ -801,10 +801,7 @@ public class CLDRConverter {
String tzKey = Optional.ofNullable((String)handlerSupplMeta.get(tzid))
.orElse(tzid);
// Follow link, if needed
- String tzLink = null;
- for (var k = tzKey; tzdbLinks.containsKey(k);) {
- k = tzLink = tzdbLinks.get(k);
- }
+ String tzLink = getTZDBLink(tzKey);
if (tzLink == null && tzdbLinks.containsValue(tzKey)) {
// reverse link search
// this is needed as in tzdb, "America/Buenos_Aires" links to
@@ -833,7 +830,7 @@ public class CLDRConverter {
} else {
// TZDB short names
tznames = Arrays.copyOf(tznames, tznames.length);
- fillTZDBShortNames(tzid, tznames);
+ fillTZDBShortNames(tzKey, tznames);
names.put(tzid, tznames);
}
} else {
@@ -846,11 +843,13 @@ public class CLDRConverter {
String metaKey = METAZONE_ID_PREFIX + meta;
data = map.get(metaKey);
if (data instanceof String[] tznames) {
- // TZDB short names
- tznames = Arrays.copyOf((String[])names.getOrDefault(metaKey, tznames), 6);
- fillTZDBShortNames(tzid, tznames);
- // Keep the metazone prefix here.
- names.putIfAbsent(metaKey, tznames);
+ if (isDefaultZone(meta, tzKey)) {
+ // Record the metazone names only from the default
+ // (001) zone, with short names filled from TZDB
+ tznames = Arrays.copyOf(tznames, tznames.length);
+ fillTZDBShortNames(tzKey, tznames);
+ names.put(metaKey, tznames);
+ }
names.put(tzid, meta);
if (tzLink != null && availableIds.contains(tzLink)) {
names.put(tzLink, meta);
@@ -1504,12 +1503,12 @@ public class CLDRConverter {
* Fill the TZDB short names if there is no name provided by the CLDR
*/
private static void fillTZDBShortNames(String tzid, String[] names) {
- var val = tzdbShortNamesMap.get(tzdbLinks.getOrDefault(tzid, tzid));
+ var val = tzdbShortNamesMap.getOrDefault(tzid, tzdbShortNamesMap.get(getTZDBLink(tzid)));
if (val != null) {
var format = val.split(NBSP)[0];
var rule = val.split(NBSP)[1];
IntStream.of(1, 3, 5).forEach(i -> {
- if (names[i] == null) {
+ if (names[i] == null || names[i].isEmpty()) {
if (format.contains("%s")) {
names[i] = switch (i) {
case 1 -> format.formatted(tzdbSubstLetters.get(rule + NBSP + STD));
@@ -1531,6 +1530,21 @@ public class CLDRConverter {
}
}
+ private static boolean isDefaultZone(String meta, String tzid) {
+ String zone001 = handlerMetaZones.zidMap().get(meta);
+ var tzLink = getTZDBLink(tzid);
+ return canonicalTZMap.getOrDefault(tzid, tzid).equals(zone001) ||
+ tzLink != null && canonicalTZMap.getOrDefault(tzLink, tzLink).equals(zone001);
+ }
+
+ private static String getTZDBLink(String tzid) {
+ String tzLink = null;
+ for (var k = tzid; tzdbLinks.containsKey(k);) {
+ k = tzLink = tzdbLinks.get(k);
+ }
+ return tzLink;
+ }
+
/*
* Convert TZDB offsets to JDK's offsets, eg, "-08" to "GMT-08:00".
* If it cannot recognize the pattern, return the argument as is.
diff --git a/make/jdk/src/classes/build/tools/taglet/JSpec.java b/make/jdk/src/classes/build/tools/taglet/JSpec.java
index 7e1e0ca215e..196aaccb32b 100644
--- a/make/jdk/src/classes/build/tools/taglet/JSpec.java
+++ b/make/jdk/src/classes/build/tools/taglet/JSpec.java
@@ -25,13 +25,13 @@
package build.tools.taglet;
+import java.net.URI;
import java.util.EnumSet;
import java.util.List;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
-import java.lang.reflect.Field;
import javax.lang.model.element.Element;
@@ -141,6 +141,11 @@ public class JSpec implements Taglet {
@Override
public String toString(List tags, Element elem) {
+ throw new UnsupportedOperationException();
+ }
+
+ // @Override - requires JDK-8373922 in build JDK
+ public String toString(List tags, Element elem, URI docRoot) {
if (tags.isEmpty())
return "";
@@ -177,7 +182,7 @@ public class JSpec implements Taglet {
String preview = m.group("preview"); // null if no preview feature
String chapter = m.group("chapter");
String section = m.group("section");
- String rootParent = currentPath().replaceAll("[^/]+", "..");
+ String rootParent = docRoot.resolve("..").toString();
String url = preview == null ?
String.format("%1$s/specs/%2$s/%2$s-%3$s.html#%2$s-%3$s%4$s",
@@ -230,23 +235,6 @@ public class JSpec implements Taglet {
return sb.toString();
}
- private static ThreadLocal CURRENT_PATH = null;
-
- private String currentPath() {
- if (CURRENT_PATH == null) {
- try {
- Field f = Class.forName("jdk.javadoc.internal.doclets.formats.html.HtmlDocletWriter")
- .getField("CURRENT_PATH");
- @SuppressWarnings("unchecked")
- ThreadLocal tl = (ThreadLocal) f.get(null);
- CURRENT_PATH = tl;
- } catch (ReflectiveOperationException e) {
- throw new RuntimeException("Cannot determine current path", e);
- }
- }
- return CURRENT_PATH.get();
- }
-
private String expand(List trees) {
return (new SimpleDocTreeVisitor() {
public StringBuilder defaultAction(DocTree tree, StringBuilder sb) {
diff --git a/make/jdk/src/classes/build/tools/taglet/SealedGraph.java b/make/jdk/src/classes/build/tools/taglet/SealedGraph.java
index 2ffd92e3409..300999b77c0 100644
--- a/make/jdk/src/classes/build/tools/taglet/SealedGraph.java
+++ b/make/jdk/src/classes/build/tools/taglet/SealedGraph.java
@@ -32,7 +32,9 @@ import jdk.javadoc.doclet.Taglet;
import javax.lang.model.element.*;
import javax.lang.model.type.DeclaredType;
+import javax.lang.model.util.Elements;
import java.io.IOException;
+import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.*;
@@ -78,6 +80,11 @@ public final class SealedGraph implements Taglet {
@Override
public String toString(List tags, Element element) {
+ throw new UnsupportedOperationException();
+ }
+
+ // @Override - requires JDK-8373922 in build JDK
+ public String toString(List tags, Element element, URI docRoot) {
if (sealedDotOutputDir == null || sealedDotOutputDir.isEmpty()) {
return "";
}
@@ -85,9 +92,15 @@ public final class SealedGraph implements Taglet {
return "";
}
- ModuleElement module = docletEnvironment.getElementUtils().getModuleOf(element);
+ Elements util = docletEnvironment.getElementUtils();
+ ModuleElement module = util.getModuleOf(element);
+
+ // '.' in .DOT file name is converted to '/' in .SVG path, so we use '-' as separator for nested classes.
+ // module_package.subpackage.Outer-Inner.dot => module/package/subpackage/Outer-Inner-sealed-graph.svg
Path dotFile = Path.of(sealedDotOutputDir,
- module.getQualifiedName() + "_" + typeElement.getQualifiedName() + ".dot");
+ module.getQualifiedName() + "_"
+ + util.getPackageOf(element).getQualifiedName() + "."
+ + packagelessCanonicalName(typeElement).replace(".", "-") + ".dot");
Set exports = module.getDirectives().stream()
.filter(ModuleElement.ExportsDirective.class::isInstance)
@@ -99,7 +112,7 @@ public final class SealedGraph implements Taglet {
.map(Objects::toString)
.collect(Collectors.toUnmodifiableSet());
- String dotContent = new Renderer().graph(typeElement, exports);
+ String dotContent = new Renderer().graph(typeElement, exports, docRoot);
try {
Files.writeString(dotFile, dotContent, WRITE, CREATE, TRUNCATE_EXISTING);
@@ -107,8 +120,8 @@ public final class SealedGraph implements Taglet {
throw new RuntimeException(e);
}
- String simpleTypeName = packagelessCanonicalName(typeElement).replace('.', '/');
- String imageFile = simpleTypeName + "-sealed-graph.svg";
+ String simpleTypeName = packagelessCanonicalName(typeElement);
+ String imageFile = simpleTypeName.replace(".", "-") + "-sealed-graph.svg";
int thumbnailHeight = 100; // also appears in the stylesheet
String hoverImage = ""
+ getImage(simpleTypeName, imageFile, -1, true)
@@ -137,12 +150,12 @@ public final class SealedGraph implements Taglet {
private final class Renderer {
// Generates a graph in DOT format
- String graph(TypeElement rootClass, Set exports) {
+ String graph(TypeElement rootClass, Set exports, URI pathToRoot) {
if (!isInPublicApi(rootClass, exports)) {
// Alternatively we can return "" for the graph since there is no single root to render
throw new IllegalArgumentException("Root not in public API: " + rootClass.getQualifiedName());
}
- final State state = new State(rootClass);
+ final State state = new State(pathToRoot);
traverse(state, rootClass, exports);
return state.render();
}
@@ -168,7 +181,7 @@ public final class SealedGraph implements Taglet {
private static final String TOOLTIP = "tooltip";
private static final String LINK = "href";
- private final TypeElement rootNode;
+ private final URI pathToRoot;
private final StringBuilder builder;
@@ -193,8 +206,8 @@ public final class SealedGraph implements Taglet {
}
}
- public State(TypeElement rootNode) {
- this.rootNode = rootNode;
+ public State(URI pathToRoot) {
+ this.pathToRoot = pathToRoot;
nodeStyleMap = new LinkedHashMap<>();
builder = new StringBuilder()
.append("digraph G {")
@@ -217,24 +230,15 @@ public final class SealedGraph implements Taglet {
var styles = nodeStyleMap.computeIfAbsent(id(node), n -> new LinkedHashMap<>());
styles.put(LABEL, new StyleItem.PlainString(node.getSimpleName().toString()));
styles.put(TOOLTIP, new StyleItem.PlainString(node.getQualifiedName().toString()));
- styles.put(LINK, new StyleItem.PlainString(relativeLink(node)));
+ styles.put(LINK, new StyleItem.PlainString(pathToRoot.resolve(relativeLink(node)).toString()));
}
- // A permitted class must be in the same package or in the same module.
- // This implies the module is always the same.
private String relativeLink(TypeElement node) {
var util = SealedGraph.this.docletEnvironment.getElementUtils();
- var nodePackage = util.getPackageOf(node);
- // Note: SVG files for nested types use the simple names of containing types as parent directories.
- // We therefore need to convert all dots in the qualified name to "../" below.
- var backNavigator = rootNode.getQualifiedName().toString().chars()
- .filter(c -> c == '.')
- .mapToObj(c -> "../")
- .collect(joining());
- var forwardNavigator = nodePackage.getQualifiedName().toString()
- .replace(".", "/");
+ var path = util.getModuleOf(node).getQualifiedName().toString() + "/"
+ + util.getPackageOf(node).getQualifiedName().toString().replace(".", "/");
- return backNavigator + forwardNavigator + "/" + packagelessCanonicalName(node) + ".html";
+ return path + "/" + packagelessCanonicalName(node) + ".html";
}
public void addEdge(TypeElement node, TypeElement subNode) {
@@ -286,14 +290,6 @@ public final class SealedGraph implements Taglet {
private String quotedId(TypeElement node) {
return "\"" + id(node) + "\"";
}
-
- private String simpleName(String name) {
- int lastDot = name.lastIndexOf('.');
- return lastDot < 0
- ? name
- : name.substring(lastDot);
- }
-
}
private static List permittedSubclasses(TypeElement node, Set exports) {
diff --git a/make/jdk/src/classes/build/tools/taglet/ToolGuide.java b/make/jdk/src/classes/build/tools/taglet/ToolGuide.java
index 8db2aee3092..7ad4f6b9b9f 100644
--- a/make/jdk/src/classes/build/tools/taglet/ToolGuide.java
+++ b/make/jdk/src/classes/build/tools/taglet/ToolGuide.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,13 +25,13 @@
package build.tools.taglet;
+import java.net.URI;
import java.util.EnumSet;
import java.util.List;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
-import java.lang.reflect.Field;
import javax.lang.model.element.Element;
@@ -91,6 +91,11 @@ public class ToolGuide implements Taglet {
@Override
public String toString(List tags, Element elem) {
+ throw new UnsupportedOperationException();
+ }
+
+ // @Override - requires JDK-8373922 in build JDK
+ public String toString(List tags, Element elem, URI docRoot) {
if (tags.isEmpty())
return "";
@@ -118,7 +123,7 @@ public class ToolGuide implements Taglet {
if (label.isEmpty()) {
label = name;
}
- String rootParent = currentPath().replaceAll("[^/]+", "..");
+ String rootParent = docRoot.resolve("..").toString();
String url = String.format("%s/%s/%s.html",
rootParent, BASE_URL, name);
@@ -141,22 +146,4 @@ public class ToolGuide implements Taglet {
return sb.toString();
}
-
- private static ThreadLocal CURRENT_PATH = null;
-
- private String currentPath() {
- if (CURRENT_PATH == null) {
- try {
- Field f = Class.forName("jdk.javadoc.internal.doclets.formats.html.HtmlDocletWriter")
- .getField("CURRENT_PATH");
- @SuppressWarnings("unchecked")
- ThreadLocal tl = (ThreadLocal) f.get(null);
- CURRENT_PATH = tl;
- } catch (ReflectiveOperationException e) {
- throw new RuntimeException("Cannot determine current path", e);
- }
- }
- return CURRENT_PATH.get();
- }
-
}
diff --git a/src/hotspot/cpu/aarch64/aarch64_vector.ad b/src/hotspot/cpu/aarch64/aarch64_vector.ad
index 19f03d97a72..4c854913e63 100644
--- a/src/hotspot/cpu/aarch64/aarch64_vector.ad
+++ b/src/hotspot/cpu/aarch64/aarch64_vector.ad
@@ -1,6 +1,6 @@
//
// Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
-// Copyright (c) 2020, 2025, Arm Limited. All rights reserved.
+// Copyright (c) 2020, 2026, 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
@@ -247,10 +247,39 @@ source %{
case Op_MinVHF:
case Op_MaxVHF:
case Op_SqrtVHF:
+ if (UseSVE == 0 && !is_feat_fp16_supported()) {
+ return false;
+ }
+ break;
+ // At the time of writing this, the Vector API has no half-float (FP16) species.
+ // Consequently, AddReductionVHF and MulReductionVHF are only produced by the
+ // auto-vectorizer, which requires strictly ordered semantics for FP reductions.
+ //
+ // There is no direct Neon instruction that performs strictly ordered floating
+ // point add reduction. Hence, on Neon only machines, the add reduction operation
+ // is implemented as a scalarized sequence using half-precision scalar instruction
+ // FADD which requires FEAT_FP16 and ASIMDHP to be available on the target.
+ // On SVE machines (UseSVE > 0) however, there is a direct instruction (FADDA) which
+ // implements strictly ordered floating point add reduction which does not require
+ // the FEAT_FP16 and ASIMDHP checks as SVE supports half-precision floats by default.
+ case Op_AddReductionVHF:
// FEAT_FP16 is enabled if both "fphp" and "asimdhp" features are supported.
// Only the Neon instructions need this check. SVE supports half-precision floats
// by default.
- if (UseSVE == 0 && !is_feat_fp16_supported()) {
+ if (length_in_bytes < 8 || (UseSVE == 0 && !is_feat_fp16_supported())) {
+ return false;
+ }
+ break;
+ case Op_MulReductionVHF:
+ // There are no direct Neon/SVE instructions that perform strictly ordered
+ // floating point multiply reduction.
+ // For vector length ≤ 16 bytes, the reduction is implemented as a scalarized
+ // sequence using half-precision scalar instruction FMUL. This path requires
+ // FEAT_FP16 and ASIMDHP to be available on the target.
+ // For vector length > 16 bytes, this operation is disabled because there is no
+ // direct SVE instruction that performs a strictly ordered FP16 multiply
+ // reduction.
+ if (length_in_bytes < 8 || length_in_bytes > 16 || !is_feat_fp16_supported()) {
return false;
}
break;
@@ -300,6 +329,7 @@ source %{
case Op_VectorRearrange:
case Op_MulReductionVD:
case Op_MulReductionVF:
+ case Op_MulReductionVHF:
case Op_MulReductionVI:
case Op_MulReductionVL:
case Op_CompressBitsV:
@@ -364,6 +394,7 @@ source %{
case Op_VectorMaskCmp:
case Op_LoadVectorGather:
case Op_StoreVectorScatter:
+ case Op_AddReductionVHF:
case Op_AddReductionVF:
case Op_AddReductionVD:
case Op_AndReductionV:
@@ -597,13 +628,9 @@ instruct vloadcon(vReg dst, immI0 src) %{
BasicType bt = Matcher::vector_element_basic_type(this);
if (UseSVE == 0) {
uint length_in_bytes = Matcher::vector_length_in_bytes(this);
+ int entry_idx = __ vector_iota_entry_index(bt);
assert(length_in_bytes <= 16, "must be");
- // The iota indices are ordered by type B/S/I/L/F/D, and the offset between two types is 16.
- int offset = exact_log2(type2aelembytes(bt)) << 4;
- if (is_floating_point_type(bt)) {
- offset += 32;
- }
- __ lea(rscratch1, ExternalAddress(StubRoutines::aarch64::vector_iota_indices() + offset));
+ __ lea(rscratch1, ExternalAddress(StubRoutines::aarch64::vector_iota_indices(entry_idx)));
if (length_in_bytes == 16) {
__ ldrq($dst$$FloatRegister, rscratch1);
} else {
@@ -3406,6 +3433,44 @@ instruct reduce_non_strict_order_add4F_neon(vRegF dst, vRegF fsrc, vReg vsrc, vR
ins_pipe(pipe_slow);
%}
+// Add Reduction for Half floats (FP16).
+// Neon does not provide direct instructions for strictly ordered floating-point add reductions.
+// On Neon-only targets (UseSVE = 0), this operation is implemented as a sequence of scalar additions:
+// values equal to the vector width are loaded into a vector register, each lane is extracted,
+// and its value is accumulated into the running sum, producing a final scalar result.
+instruct reduce_addHF_neon(vRegF dst, vRegF fsrc, vReg vsrc, vReg tmp) %{
+ predicate(UseSVE == 0);
+ match(Set dst (AddReductionVHF fsrc vsrc));
+ effect(TEMP_DEF dst, TEMP tmp);
+ format %{ "reduce_addHF $dst, $fsrc, $vsrc\t# 4HF/8HF. KILL $tmp" %}
+ ins_encode %{
+ uint length_in_bytes = Matcher::vector_length_in_bytes(this, $vsrc);
+ __ neon_reduce_add_fp16($dst$$FloatRegister, $fsrc$$FloatRegister,
+ $vsrc$$FloatRegister, length_in_bytes, $tmp$$FloatRegister);
+ %}
+ ins_pipe(pipe_slow);
+%}
+
+// This rule calculates the reduction result in strict order. Two cases will
+// reach here:
+// 1. Non strictly-ordered AddReductionVHF when vector size > 128-bits. For example -
+// AddReductionVHF generated by Vector API. For vector size > 128-bits, it is more
+// beneficial performance-wise to generate direct SVE instruction even if it is
+// strictly ordered.
+// 2. Strictly-ordered AddReductionVHF. For example - AddReductionVHF generated by
+// auto-vectorization on SVE machine.
+instruct reduce_addHF_sve(vRegF dst_src1, vReg src2) %{
+ predicate(UseSVE > 0);
+ match(Set dst_src1 (AddReductionVHF dst_src1 src2));
+ format %{ "reduce_addHF_sve $dst_src1, $dst_src1, $src2" %}
+ ins_encode %{
+ uint length_in_bytes = Matcher::vector_length_in_bytes(this, $src2);
+ assert(length_in_bytes == MaxVectorSize, "invalid vector length");
+ __ sve_fadda($dst_src1$$FloatRegister, __ H, ptrue, $src2$$FloatRegister);
+ %}
+ ins_pipe(pipe_slow);
+%}
+
// This rule calculates the reduction result in strict order. Two cases will
// reach here:
// 1. Non strictly-ordered AddReductionVF when vector size > 128-bits. For example -
@@ -3496,12 +3561,14 @@ instruct reduce_addL_masked(iRegLNoSp dst, iRegL isrc, vReg vsrc, pRegGov pg, vR
ins_pipe(pipe_slow);
%}
-instruct reduce_addF_masked(vRegF dst_src1, vReg src2, pRegGov pg) %{
+instruct reduce_addFHF_masked(vRegF dst_src1, vReg src2, pRegGov pg) %{
predicate(UseSVE > 0);
+ match(Set dst_src1 (AddReductionVHF (Binary dst_src1 src2) pg));
match(Set dst_src1 (AddReductionVF (Binary dst_src1 src2) pg));
- format %{ "reduce_addF_masked $dst_src1, $pg, $dst_src1, $src2" %}
+ format %{ "reduce_addFHF_masked $dst_src1, $pg, $dst_src1, $src2" %}
ins_encode %{
- __ sve_fadda($dst_src1$$FloatRegister, __ S,
+ BasicType bt = Matcher::vector_element_basic_type(this, $src2);
+ __ sve_fadda($dst_src1$$FloatRegister, __ elemType_to_regVariant(bt),
$pg$$PRegister, $src2$$FloatRegister);
%}
ins_pipe(pipe_slow);
@@ -3549,14 +3616,17 @@ instruct reduce_mulL(iRegLNoSp dst, iRegL isrc, vReg vsrc) %{
ins_pipe(pipe_slow);
%}
-instruct reduce_mulF(vRegF dst, vRegF fsrc, vReg vsrc, vReg tmp) %{
+
+instruct reduce_mulFHF(vRegF dst, vRegF fsrc, vReg vsrc, vReg tmp) %{
predicate(Matcher::vector_length_in_bytes(n->in(2)) <= 16);
+ match(Set dst (MulReductionVHF fsrc vsrc));
match(Set dst (MulReductionVF fsrc vsrc));
effect(TEMP_DEF dst, TEMP tmp);
- format %{ "reduce_mulF $dst, $fsrc, $vsrc\t# 2F/4F. KILL $tmp" %}
+ format %{ "reduce_mulFHF $dst, $fsrc, $vsrc\t# 2F/4F/4HF/8HF. KILL $tmp" %}
ins_encode %{
uint length_in_bytes = Matcher::vector_length_in_bytes(this, $vsrc);
- __ neon_reduce_mul_fp($dst$$FloatRegister, T_FLOAT, $fsrc$$FloatRegister,
+ BasicType bt = Matcher::vector_element_basic_type(this, $vsrc);
+ __ neon_reduce_mul_fp($dst$$FloatRegister, bt, $fsrc$$FloatRegister,
$vsrc$$FloatRegister, length_in_bytes, $tmp$$FloatRegister);
%}
ins_pipe(pipe_slow);
diff --git a/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4 b/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
index 48bffb3cf35..58ed234194a 100644
--- a/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
+++ b/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
@@ -1,6 +1,6 @@
//
// Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
-// Copyright (c) 2020, 2025, Arm Limited. All rights reserved.
+// Copyright (c) 2020, 2026, 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
@@ -237,10 +237,39 @@ source %{
case Op_MinVHF:
case Op_MaxVHF:
case Op_SqrtVHF:
+ if (UseSVE == 0 && !is_feat_fp16_supported()) {
+ return false;
+ }
+ break;
+ // At the time of writing this, the Vector API has no half-float (FP16) species.
+ // Consequently, AddReductionVHF and MulReductionVHF are only produced by the
+ // auto-vectorizer, which requires strictly ordered semantics for FP reductions.
+ //
+ // There is no direct Neon instruction that performs strictly ordered floating
+ // point add reduction. Hence, on Neon only machines, the add reduction operation
+ // is implemented as a scalarized sequence using half-precision scalar instruction
+ // FADD which requires FEAT_FP16 and ASIMDHP to be available on the target.
+ // On SVE machines (UseSVE > 0) however, there is a direct instruction (FADDA) which
+ // implements strictly ordered floating point add reduction which does not require
+ // the FEAT_FP16 and ASIMDHP checks as SVE supports half-precision floats by default.
+ case Op_AddReductionVHF:
// FEAT_FP16 is enabled if both "fphp" and "asimdhp" features are supported.
// Only the Neon instructions need this check. SVE supports half-precision floats
// by default.
- if (UseSVE == 0 && !is_feat_fp16_supported()) {
+ if (length_in_bytes < 8 || (UseSVE == 0 && !is_feat_fp16_supported())) {
+ return false;
+ }
+ break;
+ case Op_MulReductionVHF:
+ // There are no direct Neon/SVE instructions that perform strictly ordered
+ // floating point multiply reduction.
+ // For vector length ≤ 16 bytes, the reduction is implemented as a scalarized
+ // sequence using half-precision scalar instruction FMUL. This path requires
+ // FEAT_FP16 and ASIMDHP to be available on the target.
+ // For vector length > 16 bytes, this operation is disabled because there is no
+ // direct SVE instruction that performs a strictly ordered FP16 multiply
+ // reduction.
+ if (length_in_bytes < 8 || length_in_bytes > 16 || !is_feat_fp16_supported()) {
return false;
}
break;
@@ -290,6 +319,7 @@ source %{
case Op_VectorRearrange:
case Op_MulReductionVD:
case Op_MulReductionVF:
+ case Op_MulReductionVHF:
case Op_MulReductionVI:
case Op_MulReductionVL:
case Op_CompressBitsV:
@@ -354,6 +384,7 @@ source %{
case Op_VectorMaskCmp:
case Op_LoadVectorGather:
case Op_StoreVectorScatter:
+ case Op_AddReductionVHF:
case Op_AddReductionVF:
case Op_AddReductionVD:
case Op_AndReductionV:
@@ -2063,6 +2094,25 @@ instruct reduce_non_strict_order_add4F_neon(vRegF dst, vRegF fsrc, vReg vsrc, vR
ins_pipe(pipe_slow);
%}
dnl
+
+// Add Reduction for Half floats (FP16).
+// Neon does not provide direct instructions for strictly ordered floating-point add reductions.
+// On Neon-only targets (UseSVE = 0), this operation is implemented as a sequence of scalar additions:
+// values equal to the vector width are loaded into a vector register, each lane is extracted,
+// and its value is accumulated into the running sum, producing a final scalar result.
+instruct reduce_addHF_neon(vRegF dst, vRegF fsrc, vReg vsrc, vReg tmp) %{
+ predicate(UseSVE == 0);
+ match(Set dst (AddReductionVHF fsrc vsrc));
+ effect(TEMP_DEF dst, TEMP tmp);
+ format %{ "reduce_addHF $dst, $fsrc, $vsrc\t# 4HF/8HF. KILL $tmp" %}
+ ins_encode %{
+ uint length_in_bytes = Matcher::vector_length_in_bytes(this, $vsrc);
+ __ neon_reduce_add_fp16($dst$$FloatRegister, $fsrc$$FloatRegister,
+ $vsrc$$FloatRegister, length_in_bytes, $tmp$$FloatRegister);
+ %}
+ ins_pipe(pipe_slow);
+%}
+dnl
dnl REDUCE_ADD_FP_SVE($1, $2 )
dnl REDUCE_ADD_FP_SVE(type, size)
define(`REDUCE_ADD_FP_SVE', `
@@ -2074,21 +2124,26 @@ define(`REDUCE_ADD_FP_SVE', `
// strictly ordered.
// 2. Strictly-ordered AddReductionV$1. For example - AddReductionV$1 generated by
// auto-vectorization on SVE machine.
-instruct reduce_add$1_sve(vReg$1 dst_src1, vReg src2) %{
- predicate(!VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n->in(2))) ||
- n->as_Reduction()->requires_strict_order());
+instruct reduce_add$1_sve(vReg`'ifelse($1, HF, F, $1) dst_src1, vReg src2) %{
+ ifelse($1, HF,
+ `predicate(UseSVE > 0);',
+ `predicate(!VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n->in(2))) ||
+ n->as_Reduction()->requires_strict_order());')
match(Set dst_src1 (AddReductionV$1 dst_src1 src2));
format %{ "reduce_add$1_sve $dst_src1, $dst_src1, $src2" %}
ins_encode %{
- assert(UseSVE > 0, "must be sve");
- uint length_in_bytes = Matcher::vector_length_in_bytes(this, $src2);
+ ifelse($1, HF, `',
+ `assert(UseSVE > 0, "must be sve");
+ ')dnl
+uint length_in_bytes = Matcher::vector_length_in_bytes(this, $src2);
assert(length_in_bytes == MaxVectorSize, "invalid vector length");
__ sve_fadda($dst_src1$$FloatRegister, __ $2, ptrue, $src2$$FloatRegister);
%}
ins_pipe(pipe_slow);
%}')dnl
dnl
-REDUCE_ADD_FP_SVE(F, S)
+REDUCE_ADD_FP_SVE(HF, H)
+REDUCE_ADD_FP_SVE(F, S)
// reduction addD
@@ -2129,21 +2184,30 @@ dnl
dnl REDUCE_ADD_FP_PREDICATE($1, $2 )
dnl REDUCE_ADD_FP_PREDICATE(insn_name, op_name)
define(`REDUCE_ADD_FP_PREDICATE', `
-instruct reduce_add$1_masked(vReg$1 dst_src1, vReg src2, pRegGov pg) %{
+instruct reduce_add$1_masked(vReg$2 dst_src1, vReg src2, pRegGov pg) %{
predicate(UseSVE > 0);
- match(Set dst_src1 (AddReductionV$1 (Binary dst_src1 src2) pg));
+ ifelse($2, F,
+ `match(Set dst_src1 (AddReductionVHF (Binary dst_src1 src2) pg));
+ match(Set dst_src1 (AddReductionV$2 (Binary dst_src1 src2) pg));',
+ `match(Set dst_src1 (AddReductionV$2 (Binary dst_src1 src2) pg));')
format %{ "reduce_add$1_masked $dst_src1, $pg, $dst_src1, $src2" %}
ins_encode %{
- __ sve_fadda($dst_src1$$FloatRegister, __ $2,
- $pg$$PRegister, $src2$$FloatRegister);
+ ifelse($2, F,
+ `BasicType bt = Matcher::vector_element_basic_type(this, $src2);
+ ',)dnl
+ifelse($2, F,
+ `__ sve_fadda($dst_src1$$FloatRegister, __ elemType_to_regVariant(bt),
+ $pg$$PRegister, $src2$$FloatRegister);',
+ `__ sve_fadda($dst_src1$$FloatRegister, __ $2,
+ $pg$$PRegister, $src2$$FloatRegister);')
%}
ins_pipe(pipe_slow);
%}')dnl
dnl
REDUCE_ADD_INT_PREDICATE(I, iRegIorL2I)
REDUCE_ADD_INT_PREDICATE(L, iRegL)
-REDUCE_ADD_FP_PREDICATE(F, S)
-REDUCE_ADD_FP_PREDICATE(D, D)
+REDUCE_ADD_FP_PREDICATE(FHF, F)
+REDUCE_ADD_FP_PREDICATE(D, D)
// ------------------------------ Vector reduction mul -------------------------
@@ -2176,30 +2240,37 @@ instruct reduce_mulL(iRegLNoSp dst, iRegL isrc, vReg vsrc) %{
ins_pipe(pipe_slow);
%}
-instruct reduce_mulF(vRegF dst, vRegF fsrc, vReg vsrc, vReg tmp) %{
- predicate(Matcher::vector_length_in_bytes(n->in(2)) <= 16);
- match(Set dst (MulReductionVF fsrc vsrc));
+dnl REDUCE_MUL_FP($1, $2 )
+dnl REDUCE_MUL_FP(insn_name, op_name)
+define(`REDUCE_MUL_FP', `
+instruct reduce_mul$1(vReg$2 dst, vReg$2 ifelse($2, F, fsrc, dsrc), vReg vsrc, vReg tmp) %{
+ predicate(Matcher::vector_length_in_bytes(n->in(2)) ifelse($2, F, <=, ==) 16);
+ ifelse($2, F,
+ `match(Set dst (MulReductionVHF fsrc vsrc));
+ match(Set dst (MulReductionV$2 fsrc vsrc));',
+ `match(Set dst (MulReductionV$2 dsrc vsrc));')
effect(TEMP_DEF dst, TEMP tmp);
- format %{ "reduce_mulF $dst, $fsrc, $vsrc\t# 2F/4F. KILL $tmp" %}
+ ifelse($2, F,
+ `format %{ "reduce_mul$1 $dst, $fsrc, $vsrc\t# 2F/4F/4HF/8HF. KILL $tmp" %}',
+ `format %{ "reduce_mul$1 $dst, $dsrc, $vsrc\t# 2D. KILL $tmp" %}')
ins_encode %{
- uint length_in_bytes = Matcher::vector_length_in_bytes(this, $vsrc);
- __ neon_reduce_mul_fp($dst$$FloatRegister, T_FLOAT, $fsrc$$FloatRegister,
- $vsrc$$FloatRegister, length_in_bytes, $tmp$$FloatRegister);
+ ifelse($2, F,
+ `uint length_in_bytes = Matcher::vector_length_in_bytes(this, $vsrc);
+ ',)dnl
+ifelse($2, F,
+ `BasicType bt = Matcher::vector_element_basic_type(this, $vsrc);
+ ',)dnl
+ifelse($2, F,
+ `__ neon_reduce_mul_fp($dst$$FloatRegister, bt, $fsrc$$FloatRegister,
+ $vsrc$$FloatRegister, length_in_bytes, $tmp$$FloatRegister);',
+ `__ neon_reduce_mul_fp($dst$$FloatRegister, T_DOUBLE, $dsrc$$FloatRegister,
+ $vsrc$$FloatRegister, 16, $tmp$$FloatRegister);')
%}
ins_pipe(pipe_slow);
-%}
-
-instruct reduce_mulD(vRegD dst, vRegD dsrc, vReg vsrc, vReg tmp) %{
- predicate(Matcher::vector_length_in_bytes(n->in(2)) == 16);
- match(Set dst (MulReductionVD dsrc vsrc));
- effect(TEMP_DEF dst, TEMP tmp);
- format %{ "reduce_mulD $dst, $dsrc, $vsrc\t# 2D. KILL $tmp" %}
- ins_encode %{
- __ neon_reduce_mul_fp($dst$$FloatRegister, T_DOUBLE, $dsrc$$FloatRegister,
- $vsrc$$FloatRegister, 16, $tmp$$FloatRegister);
- %}
- ins_pipe(pipe_slow);
-%}
+%}')dnl
+dnl
+REDUCE_MUL_FP(FHF, F)
+REDUCE_MUL_FP(D, D)
dnl
dnl REDUCE_BITWISE_OP_NEON($1, $2 $3 $4 )
diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
index ebd8f3a9e03..4c1c8d9bbc8 100644
--- a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
@@ -1000,30 +1000,6 @@ public:
f(0b0101010, 31, 25), f(0, 24), sf(offset, 23, 5), f(0, 4), f(cond, 3, 0);
}
-#define INSN(NAME, cond) \
- void NAME(address dest) { \
- br(cond, dest); \
- }
-
- INSN(beq, EQ);
- INSN(bne, NE);
- INSN(bhs, HS);
- INSN(bcs, CS);
- INSN(blo, LO);
- INSN(bcc, CC);
- INSN(bmi, MI);
- INSN(bpl, PL);
- INSN(bvs, VS);
- INSN(bvc, VC);
- INSN(bhi, HI);
- INSN(bls, LS);
- INSN(bge, GE);
- INSN(blt, LT);
- INSN(bgt, GT);
- INSN(ble, LE);
- INSN(bal, AL);
- INSN(bnv, NV);
-
void br(Condition cc, Label &L);
#undef INSN
diff --git a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
index 7aab7d389e1..3c179f21c14 100644
--- a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2026 Arm Limited and/or its affiliates.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1883,6 +1884,27 @@ void C2_MacroAssembler::neon_reduce_mul_fp(FloatRegister dst, BasicType bt,
BLOCK_COMMENT("neon_reduce_mul_fp {");
switch(bt) {
+ // The T_SHORT type below is for Float16 type which also uses floating-point
+ // instructions.
+ case T_SHORT:
+ fmulh(dst, fsrc, vsrc);
+ ext(vtmp, T8B, vsrc, vsrc, 2);
+ fmulh(dst, dst, vtmp);
+ ext(vtmp, T8B, vsrc, vsrc, 4);
+ fmulh(dst, dst, vtmp);
+ ext(vtmp, T8B, vsrc, vsrc, 6);
+ fmulh(dst, dst, vtmp);
+ if (isQ) {
+ ext(vtmp, T16B, vsrc, vsrc, 8);
+ fmulh(dst, dst, vtmp);
+ ext(vtmp, T16B, vsrc, vsrc, 10);
+ fmulh(dst, dst, vtmp);
+ ext(vtmp, T16B, vsrc, vsrc, 12);
+ fmulh(dst, dst, vtmp);
+ ext(vtmp, T16B, vsrc, vsrc, 14);
+ fmulh(dst, dst, vtmp);
+ }
+ break;
case T_FLOAT:
fmuls(dst, fsrc, vsrc);
ins(vtmp, S, vsrc, 0, 1);
@@ -1907,6 +1929,33 @@ void C2_MacroAssembler::neon_reduce_mul_fp(FloatRegister dst, BasicType bt,
BLOCK_COMMENT("} neon_reduce_mul_fp");
}
+// Vector reduction add for half float type with ASIMD instructions.
+void C2_MacroAssembler::neon_reduce_add_fp16(FloatRegister dst, FloatRegister fsrc, FloatRegister vsrc,
+ unsigned vector_length_in_bytes, FloatRegister vtmp) {
+ assert(vector_length_in_bytes == 8 || vector_length_in_bytes == 16, "unsupported");
+ bool isQ = vector_length_in_bytes == 16;
+
+ BLOCK_COMMENT("neon_reduce_add_fp16 {");
+ faddh(dst, fsrc, vsrc);
+ ext(vtmp, T8B, vsrc, vsrc, 2);
+ faddh(dst, dst, vtmp);
+ ext(vtmp, T8B, vsrc, vsrc, 4);
+ faddh(dst, dst, vtmp);
+ ext(vtmp, T8B, vsrc, vsrc, 6);
+ faddh(dst, dst, vtmp);
+ if (isQ) {
+ ext(vtmp, T16B, vsrc, vsrc, 8);
+ faddh(dst, dst, vtmp);
+ ext(vtmp, T16B, vsrc, vsrc, 10);
+ faddh(dst, dst, vtmp);
+ ext(vtmp, T16B, vsrc, vsrc, 12);
+ faddh(dst, dst, vtmp);
+ ext(vtmp, T16B, vsrc, vsrc, 14);
+ faddh(dst, dst, vtmp);
+ }
+ BLOCK_COMMENT("} neon_reduce_add_fp16");
+}
+
// Helper to select logical instruction
void C2_MacroAssembler::neon_reduce_logical_helper(int opc, bool is64, Register Rd,
Register Rn, Register Rm,
@@ -2414,17 +2463,17 @@ void C2_MacroAssembler::neon_rearrange_hsd(FloatRegister dst, FloatRegister src,
break;
case T_LONG:
case T_DOUBLE:
- // Load the iota indices for Long type. The indices are ordered by
- // type B/S/I/L/F/D, and the offset between two types is 16; Hence
- // the offset for L is 48.
- lea(rscratch1,
- ExternalAddress(StubRoutines::aarch64::vector_iota_indices() + 48));
- ldrq(tmp, rscratch1);
- // Check whether the input "shuffle" is the same with iota indices.
- // Return "src" if true, otherwise swap the two elements of "src".
- cm(EQ, dst, size2, shuffle, tmp);
- ext(tmp, size1, src, src, 8);
- bsl(dst, size1, src, tmp);
+ {
+ int idx = vector_iota_entry_index(T_LONG);
+ lea(rscratch1,
+ ExternalAddress(StubRoutines::aarch64::vector_iota_indices(idx)));
+ ldrq(tmp, rscratch1);
+ // Check whether the input "shuffle" is the same with iota indices.
+ // Return "src" if true, otherwise swap the two elements of "src".
+ cm(EQ, dst, size2, shuffle, tmp);
+ ext(tmp, size1, src, src, 8);
+ bsl(dst, size1, src, tmp);
+ }
break;
default:
assert(false, "unsupported element type");
@@ -2896,3 +2945,24 @@ void C2_MacroAssembler::sve_cpy(FloatRegister dst, SIMD_RegVariant T,
}
Assembler::sve_cpy(dst, T, pg, imm8, isMerge);
}
+
+int C2_MacroAssembler::vector_iota_entry_index(BasicType bt) {
+ // The vector iota entries array is ordered by type B/S/I/L/F/D, and
+ // the offset between two types is 16.
+ switch(bt) {
+ case T_BYTE:
+ return 0;
+ case T_SHORT:
+ return 1;
+ case T_INT:
+ return 2;
+ case T_LONG:
+ return 3;
+ case T_FLOAT:
+ return 4;
+ case T_DOUBLE:
+ return 5;
+ default:
+ ShouldNotReachHere();
+ }
+}
diff --git a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
index 5c05832afbe..f96d3ffb863 100644
--- a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
@@ -177,6 +177,9 @@
FloatRegister fsrc, FloatRegister vsrc,
unsigned vector_length_in_bytes, FloatRegister vtmp);
+ void neon_reduce_add_fp16(FloatRegister dst, FloatRegister fsrc, FloatRegister vsrc,
+ unsigned vector_length_in_bytes, FloatRegister vtmp);
+
void neon_reduce_logical(int opc, Register dst, BasicType bt, Register isrc,
FloatRegister vsrc, unsigned vector_length_in_bytes);
@@ -249,4 +252,5 @@
void sve_cpy(FloatRegister dst, SIMD_RegVariant T, PRegister pg, int imm8,
bool isMerge);
+ int vector_iota_entry_index(BasicType bt);
#endif // CPU_AARCH64_C2_MACROASSEMBLER_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp
index a9c320912cb..7ce4e0f8aed 100644
--- a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
* 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 @@ void CardTableBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet d
}
}
-void CardTableBarrierSetAssembler::store_check(MacroAssembler* masm, Register obj, Address dst, Register tmp1, Register tmp2) {
+void CardTableBarrierSetAssembler::store_check(MacroAssembler* masm, Register obj, Register tmp1, Register tmp2) {
precond(tmp1 != noreg);
precond(tmp2 != noreg);
assert_different_registers(obj, tmp1, tmp2);
@@ -114,10 +114,10 @@ void CardTableBarrierSetAssembler::oop_store_at(MacroAssembler* masm, DecoratorS
if (needs_post_barrier) {
// flatten object address if needed
if (!precise || (dst.index() == noreg && dst.offset() == 0)) {
- store_check(masm, dst.base(), dst, tmp1, tmp2);
+ store_check(masm, dst.base(), tmp1, tmp2);
} else {
__ lea(tmp3, dst);
- store_check(masm, tmp3, dst, tmp1, tmp2);
+ store_check(masm, tmp3, tmp1, tmp2);
}
}
}
diff --git a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp
index e05e9e90e5d..07016381f78 100644
--- a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
* 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 @@ protected:
virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
Address dst, Register val, Register tmp1, Register tmp2, Register tmp3);
- void store_check(MacroAssembler* masm, Register obj, Address dst, Register tmp1, Register tmp2);
+ void store_check(MacroAssembler* masm, Register obj, Register tmp1, Register tmp2);
};
#endif // CPU_AARCH64_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
index 7fa2e8086ad..7bec0a3c0ca 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -55,6 +55,7 @@
#include "runtime/sharedRuntime.hpp"
#include "runtime/stubRoutines.hpp"
#include "utilities/globalDefinitions.hpp"
+#include "utilities/integerCast.hpp"
#include "utilities/powerOfTwo.hpp"
#ifdef COMPILER1
#include "c1/c1_LIRAssembler.hpp"
@@ -2916,7 +2917,11 @@ void MacroAssembler::increment(Address dst, int value)
// Push lots of registers in the bit set supplied. Don't push sp.
// Return the number of words pushed
-int MacroAssembler::push(unsigned int bitset, Register stack) {
+int MacroAssembler::push(RegSet regset, Register stack) {
+ if (regset.bits() == 0) {
+ return 0;
+ }
+ auto bitset = integer_cast(regset.bits());
int words_pushed = 0;
// Scan bitset to accumulate register pairs
@@ -2946,7 +2951,11 @@ int MacroAssembler::push(unsigned int bitset, Register stack) {
return count;
}
-int MacroAssembler::pop(unsigned int bitset, Register stack) {
+int MacroAssembler::pop(RegSet regset, Register stack) {
+ if (regset.bits() == 0) {
+ return 0;
+ }
+ auto bitset = integer_cast(regset.bits());
int words_pushed = 0;
// Scan bitset to accumulate register pairs
@@ -2978,7 +2987,11 @@ int MacroAssembler::pop(unsigned int bitset, Register stack) {
// Push lots of registers in the bit set supplied. Don't push sp.
// Return the number of dwords pushed
-int MacroAssembler::push_fp(unsigned int bitset, Register stack, FpPushPopMode mode) {
+int MacroAssembler::push_fp(FloatRegSet regset, Register stack, FpPushPopMode mode) {
+ if (regset.bits() == 0) {
+ return 0;
+ }
+ auto bitset = integer_cast(regset.bits());
int words_pushed = 0;
bool use_sve = false;
int sve_vector_size_in_bytes = 0;
@@ -3091,7 +3104,11 @@ int MacroAssembler::push_fp(unsigned int bitset, Register stack, FpPushPopMode m
}
// Return the number of dwords popped
-int MacroAssembler::pop_fp(unsigned int bitset, Register stack, FpPushPopMode mode) {
+int MacroAssembler::pop_fp(FloatRegSet regset, Register stack, FpPushPopMode mode) {
+ if (regset.bits() == 0) {
+ return 0;
+ }
+ auto bitset = integer_cast(regset.bits());
int words_pushed = 0;
bool use_sve = false;
int sve_vector_size_in_bytes = 0;
@@ -3201,7 +3218,11 @@ int MacroAssembler::pop_fp(unsigned int bitset, Register stack, FpPushPopMode mo
}
// Return the number of dwords pushed
-int MacroAssembler::push_p(unsigned int bitset, Register stack) {
+int MacroAssembler::push_p(PRegSet regset, Register stack) {
+ if (regset.bits() == 0) {
+ return 0;
+ }
+ auto bitset = integer_cast(regset.bits());
bool use_sve = false;
int sve_predicate_size_in_slots = 0;
@@ -3238,7 +3259,11 @@ int MacroAssembler::push_p(unsigned int bitset, Register stack) {
}
// Return the number of dwords popped
-int MacroAssembler::pop_p(unsigned int bitset, Register stack) {
+int MacroAssembler::pop_p(PRegSet regset, Register stack) {
+ if (regset.bits() == 0) {
+ return 0;
+ }
+ auto bitset = integer_cast(regset.bits());
bool use_sve = false;
int sve_predicate_size_in_slots = 0;
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
index 994fbe3c80f..a6cc862d05c 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
@@ -499,29 +499,20 @@ private:
void mov_immediate64(Register dst, uint64_t imm64);
void mov_immediate32(Register dst, uint32_t imm32);
- int push(unsigned int bitset, Register stack);
- int pop(unsigned int bitset, Register stack);
-
- int push_fp(unsigned int bitset, Register stack, FpPushPopMode mode);
- int pop_fp(unsigned int bitset, Register stack, FpPushPopMode mode);
-
- int push_p(unsigned int bitset, Register stack);
- int pop_p(unsigned int bitset, Register stack);
-
void mov(Register dst, Address a);
public:
- void push(RegSet regs, Register stack) { if (regs.bits()) push(regs.bits(), stack); }
- void pop(RegSet regs, Register stack) { if (regs.bits()) pop(regs.bits(), stack); }
+ int push(RegSet regset, Register stack);
+ int pop(RegSet regset, Register stack);
- void push_fp(FloatRegSet regs, Register stack, FpPushPopMode mode = PushPopFull) { if (regs.bits()) push_fp(regs.bits(), stack, mode); }
- void pop_fp(FloatRegSet regs, Register stack, FpPushPopMode mode = PushPopFull) { if (regs.bits()) pop_fp(regs.bits(), stack, mode); }
+ int push_fp(FloatRegSet regset, Register stack, FpPushPopMode mode = PushPopFull);
+ int pop_fp(FloatRegSet regset, Register stack, FpPushPopMode mode = PushPopFull);
static RegSet call_clobbered_gp_registers();
- void push_p(PRegSet regs, Register stack) { if (regs.bits()) push_p(regs.bits(), stack); }
- void pop_p(PRegSet regs, Register stack) { if (regs.bits()) pop_p(regs.bits(), stack); }
+ int push_p(PRegSet regset, Register stack);
+ int pop_p(PRegSet regset, Register stack);
// Push and pop everything that might be clobbered by a native
// runtime call except rscratch1 and rscratch2. (They are always
@@ -899,10 +890,6 @@ public:
// thread in the default location (rthread)
void reset_last_Java_frame(bool clear_fp);
- // Stores
- void store_check(Register obj); // store check for obj - register is destroyed afterwards
- void store_check(Register obj, Address dst); // same as above, dst is exact store location (reg. is destroyed)
-
void resolve_jobject(Register value, Register tmp1, Register tmp2);
void resolve_global_jobject(Register value, Register tmp1, Register tmp2);
diff --git a/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp b/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
index fc7274714ad..ab9896fa426 100644
--- a/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
@@ -97,7 +97,7 @@ protected:
#define MACOS_WX_WRITE MACOS_AARCH64_ONLY(os::thread_wx_enable_write())
void set_char_at(int offset, char c) { MACOS_WX_WRITE; *addr_at(offset) = (u_char)c; }
void set_int_at(int offset, jint i) { MACOS_WX_WRITE; *(jint*)addr_at(offset) = i; }
- void set_uint_at(int offset, jint i) { MACOS_WX_WRITE; *(juint*)addr_at(offset) = i; }
+ void set_uint_at(int offset, juint i) { MACOS_WX_WRITE; *(juint*)addr_at(offset) = i; }
void set_ptr_at(int offset, address ptr) { MACOS_WX_WRITE; *(address*)addr_at(offset) = ptr; }
void set_oop_at(int offset, oop o) { MACOS_WX_WRITE; *(oop*)addr_at(offset) = o; }
#undef MACOS_WX_WRITE
@@ -178,13 +178,11 @@ public:
address destination() const;
void set_destination(address dest) {
- int offset = dest - instruction_address();
- unsigned int insn = 0b100101 << 26;
+ int64_t offset = dest - instruction_address();
+ juint insn = 0b100101u << 26u;
assert((offset & 3) == 0, "should be");
- offset >>= 2;
- offset &= (1 << 26) - 1; // mask off insn part
- insn |= offset;
- set_int_at(displacement_offset, insn);
+ Instruction_aarch64::spatch(reinterpret_cast(&insn), 25, 0, offset >> 2);
+ set_uint_at(displacement_offset, insn);
}
void verify_alignment() { ; }
diff --git a/src/hotspot/cpu/aarch64/stubDeclarations_aarch64.hpp b/src/hotspot/cpu/aarch64/stubDeclarations_aarch64.hpp
index 9dac6a39b82..d1f59e479db 100644
--- a/src/hotspot/cpu/aarch64/stubDeclarations_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/stubDeclarations_aarch64.hpp
@@ -29,32 +29,39 @@
#define STUBGEN_PREUNIVERSE_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(preuniverse, 0) \
#define STUBGEN_INITIAL_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(initial, 10000) \
#define STUBGEN_CONTINUATION_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(continuation, 2000) \
+// count needed for declaration of vector_iota_indices stub
+#define VECTOR_IOTA_COUNT 6
#define STUBGEN_COMPILER_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(compiler, 70000) \
do_stub(compiler, vector_iota_indices) \
- do_arch_entry(aarch64, compiler, vector_iota_indices, \
- vector_iota_indices, vector_iota_indices) \
+ do_arch_entry_array(aarch64, compiler, vector_iota_indices, \
+ vector_iota_indices, vector_iota_indices, \
+ VECTOR_IOTA_COUNT) \
do_stub(compiler, large_array_equals) \
do_arch_entry(aarch64, compiler, large_array_equals, \
large_array_equals, large_array_equals) \
@@ -115,7 +122,8 @@
#define STUBGEN_FINAL_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(final, 20000 ZGC_ONLY(+85000)) \
do_stub(final, copy_byte_f) \
do_arch_entry(aarch64, final, copy_byte_f, copy_byte_f, \
diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
index 32fd8afb268..fddb37b7b8d 100644
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
@@ -819,12 +819,19 @@ class StubGenerator: public StubCodeGenerator {
}
// Generate indices for iota vector.
- address generate_iota_indices(StubId stub_id) {
+ void generate_iota_indices(StubId stub_id) {
+ GrowableArray entries;
int entry_count = StubInfo::entry_count(stub_id);
- assert(entry_count == 1, "sanity check");
- address start = load_archive_data(stub_id);
+ assert(entry_count == VECTOR_IOTA_COUNT, "sanity check");
+ address start = load_archive_data(stub_id, &entries);
if (start != nullptr) {
- return start;
+ assert(entries.length() == entry_count - 1,
+ "unexpected entries count %d", entries.length());
+ StubRoutines::aarch64::_vector_iota_indices[0] = start;
+ for (int i = 1; i < VECTOR_IOTA_COUNT; i++) {
+ StubRoutines::aarch64::_vector_iota_indices[i] = entries.at(i - 1);
+ }
+ return;
}
__ align(CodeEntryAlignment);
StubCodeMark mark(this, stub_id);
@@ -832,26 +839,37 @@ class StubGenerator: public StubCodeGenerator {
// B
__ emit_data64(0x0706050403020100, relocInfo::none);
__ emit_data64(0x0F0E0D0C0B0A0908, relocInfo::none);
+ entries.append(__ pc());
// H
__ emit_data64(0x0003000200010000, relocInfo::none);
__ emit_data64(0x0007000600050004, relocInfo::none);
+ entries.append(__ pc());
// S
__ emit_data64(0x0000000100000000, relocInfo::none);
__ emit_data64(0x0000000300000002, relocInfo::none);
+ entries.append(__ pc());
// D
__ emit_data64(0x0000000000000000, relocInfo::none);
__ emit_data64(0x0000000000000001, relocInfo::none);
+ entries.append(__ pc());
// S - FP
__ emit_data64(0x3F80000000000000, relocInfo::none); // 0.0f, 1.0f
__ emit_data64(0x4040000040000000, relocInfo::none); // 2.0f, 3.0f
+ entries.append(__ pc());
// D - FP
__ emit_data64(0x0000000000000000, relocInfo::none); // 0.0d
__ emit_data64(0x3FF0000000000000, relocInfo::none); // 1.0d
// record the stub entry and end
- store_archive_data(stub_id, start, __ pc());
+ store_archive_data(stub_id, start, __ pc(), &entries);
- return start;
+ // install the entry addresses in the entry array
+ assert(entries.length() == entry_count - 1,
+ "unexpected entries count %d", entries.length());
+ StubRoutines::aarch64::_vector_iota_indices[0] = start;
+ for (int i = 1; i < VECTOR_IOTA_COUNT; i++) {
+ StubRoutines::aarch64::_vector_iota_indices[i] = entries.at(i - 1);
+ }
}
// The inner part of zero_words(). This is the bulk operation,
@@ -12621,7 +12639,7 @@ class StubGenerator: public StubCodeGenerator {
#if COMPILER2_OR_JVMCI
if (UseSVE == 0) {
- StubRoutines::aarch64::_vector_iota_indices = generate_iota_indices(StubId::stubgen_vector_iota_indices_id);
+ generate_iota_indices(StubId::stubgen_vector_iota_indices_id);
}
// array equals stub for large arrays.
@@ -12807,7 +12825,7 @@ class StubGenerator: public StubCodeGenerator {
#if INCLUDE_CDS
static void init_AOTAddressTable(GrowableArray& external_addresses) {
// external data defined in this file
-#define ADD(addr) external_addresses.append((address)addr);
+#define ADD(addr) external_addresses.append((address)(addr));
ADD(_sha256_round_consts);
ADD(_sha512_round_consts);
ADD(_sha3_round_consts);
diff --git a/src/hotspot/cpu/aarch64/stubRoutines_aarch64.cpp b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.cpp
index 35ec22b0897..f02b681ca10 100644
--- a/src/hotspot/cpu/aarch64/stubRoutines_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.cpp
@@ -41,8 +41,12 @@ static void empty_spin_wait() { }
#define DEFINE_ARCH_ENTRY_INIT(arch, blob_name, stub_name, field_name, getter_name, init_function) \
address StubRoutines:: arch :: STUB_FIELD_NAME(field_name) = CAST_FROM_FN_PTR(address, init_function);
-STUBGEN_ARCH_ENTRIES_DO(DEFINE_ARCH_ENTRY, DEFINE_ARCH_ENTRY_INIT)
+#define DEFINE_ARCH_ENTRY_ARRAY(arch, blob_name, stub_name, field_name, getter_name, count) \
+ address StubRoutines:: arch :: STUB_FIELD_NAME(field_name) [count];
+STUBGEN_ARCH_ENTRIES_DO(DEFINE_ARCH_ENTRY, DEFINE_ARCH_ENTRY_INIT, DEFINE_ARCH_ENTRY_ARRAY)
+
+#undef DEFINE_ARCH_ENTRY_ARARAY
#undef DEFINE_ARCH_ENTRY_INIT
#undef DEFINE_ARCH_ENTRY
@@ -431,10 +435,8 @@ void StubRoutines::init_AOTAddressTable() {
AOTCodeCache::publish_external_addresses(external_addresses);
}
-
-#define ADD(addr) external_addresses.append((address)addr);
-
void StubRoutines::aarch64::init_AOTAddressTable(GrowableArray& external_addresses) {
+#define ADD(addr) external_addresses.append((address)(addr));
ADD(_kyberConsts);
ADD(_dilithiumConsts);
// this is added in generic code
@@ -445,7 +447,6 @@ void StubRoutines::aarch64::init_AOTAddressTable(GrowableArray& externa
ADD(_dcos_coef);
ADD(_two_over_pi);
ADD(_pio2);
-}
-
#undef ADD
+}
#endif // INCLUDE_CDS
diff --git a/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp
index f77192a3741..6067408ef13 100644
--- a/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp
@@ -60,9 +60,13 @@ class aarch64 {
#define DECLARE_ARCH_ENTRY_INIT(arch, blob_name, stub_name, field_name, getter_name, init_function) \
DECLARE_ARCH_ENTRY(arch, blob_name, stub_name, field_name, getter_name)
-private:
- STUBGEN_ARCH_ENTRIES_DO(DECLARE_ARCH_ENTRY, DECLARE_ARCH_ENTRY_INIT)
+#define DECLARE_ARCH_ENTRY_ARRAY(arch, blob_name, stub_name, field_name, getter_name, count) \
+ static address STUB_FIELD_NAME(field_name) [count];
+private:
+ STUBGEN_ARCH_ENTRIES_DO(DECLARE_ARCH_ENTRY, DECLARE_ARCH_ENTRY_INIT, DECLARE_ARCH_ENTRY_ARRAY)
+
+#undef DECLARE_ARCH_ENTRY_ARRAY
#undef DECLARE_ARCH_ENTRY_INIT
#undef DECLARE_ARCH_ENTRY
@@ -78,8 +82,15 @@ private:
#define DEFINE_ARCH_ENTRY_GETTER_INIT(arch, blob_name, stub_name, field_name, getter_name, init_function) \
DEFINE_ARCH_ENTRY_GETTER(arch, blob_name, stub_name, field_name, getter_name)
- STUBGEN_ARCH_ENTRIES_DO(DEFINE_ARCH_ENTRY_GETTER, DEFINE_ARCH_ENTRY_GETTER_INIT)
+#define DEFINE_ARCH_ENTRY_GETTER_ARRAY(arch, blob_name, stub_name, field_name, getter_name, count) \
+ static address getter_name(int idx) { \
+ assert(0 <= idx && idx < count, "entry array index out of range"); \
+ return STUB_FIELD_NAME(field_name) [idx]; \
+ }
+ STUBGEN_ARCH_ENTRIES_DO(DEFINE_ARCH_ENTRY_GETTER, DEFINE_ARCH_ENTRY_GETTER_INIT, DEFINE_ARCH_ENTRY_GETTER_ARRAY)
+
+#undef DEFINE_ARCH_ENTRY_GETTER_ARRAY
#undef DEFINE_ARCH_ENTRY_GETTER_INIT
#undef DEFINE_ARCH_ENTRY_GETTER
diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
index 15af2d5c4e2..441bd4859fe 100644
--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
@@ -437,10 +437,6 @@ void VM_Version::initialize() {
FLAG_SET_DEFAULT(UseSHA512Intrinsics, false);
}
- if (!(UseSHA1Intrinsics || UseSHA256Intrinsics || UseSHA3Intrinsics || UseSHA512Intrinsics)) {
- FLAG_SET_DEFAULT(UseSHA, false);
- }
-
if (supports_pmull()) {
if (FLAG_IS_DEFAULT(UseGHASHIntrinsics)) {
FLAG_SET_DEFAULT(UseGHASHIntrinsics, true);
diff --git a/src/hotspot/cpu/arm/stubDeclarations_arm.hpp b/src/hotspot/cpu/arm/stubDeclarations_arm.hpp
index 5f768a205a5..5fb0d4e901f 100644
--- a/src/hotspot/cpu/arm/stubDeclarations_arm.hpp
+++ b/src/hotspot/cpu/arm/stubDeclarations_arm.hpp
@@ -29,7 +29,8 @@
#define STUBGEN_PREUNIVERSE_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(preuniverse, 500) \
do_stub(preuniverse, atomic_load_long) \
do_arch_entry(Arm, preuniverse, atomic_load_long, \
@@ -42,7 +43,8 @@
#define STUBGEN_INITIAL_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(initial, 9000) \
do_stub(initial, idiv_irem) \
do_arch_entry(Arm, initial, idiv_irem, \
@@ -51,14 +53,16 @@
#define STUBGEN_CONTINUATION_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(continuation, 2000) \
#define STUBGEN_COMPILER_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(compiler, 22000) \
do_stub(compiler, partial_subtype_check) \
do_arch_entry(Arm, compiler, partial_subtype_check, \
@@ -68,7 +72,8 @@
#define STUBGEN_FINAL_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(final, 22000) \
diff --git a/src/hotspot/cpu/arm/stubRoutines_arm.cpp b/src/hotspot/cpu/arm/stubRoutines_arm.cpp
index 3ed747ea11a..38a9b298562 100644
--- a/src/hotspot/cpu/arm/stubRoutines_arm.cpp
+++ b/src/hotspot/cpu/arm/stubRoutines_arm.cpp
@@ -32,7 +32,7 @@
#define DEFINE_ARCH_ENTRY_INIT(arch, blob_name, stub_name, field_name, getter_name, init_function) \
address StubRoutines:: arch :: STUB_FIELD_NAME(field_name) = CAST_FROM_FN_PTR(address, init_function);
-STUBGEN_ARCH_ENTRIES_DO(DEFINE_ARCH_ENTRY, DEFINE_ARCH_ENTRY_INIT)
+STUBGEN_ARCH_ENTRIES_DO(DEFINE_ARCH_ENTRY, DEFINE_ARCH_ENTRY_INIT, DEFINE_ARCH_ENTRY_ARRAY)
#undef DEFINE_ARCH_ENTRY_INIT
#undef DEFINE_ARCH_ENTRY
diff --git a/src/hotspot/cpu/arm/stubRoutines_arm.hpp b/src/hotspot/cpu/arm/stubRoutines_arm.hpp
index 45ab10d14f9..29d96d0e653 100644
--- a/src/hotspot/cpu/arm/stubRoutines_arm.hpp
+++ b/src/hotspot/cpu/arm/stubRoutines_arm.hpp
@@ -55,9 +55,13 @@ class Arm {
#define DECLARE_ARCH_ENTRY_INIT(arch, blob_name, stub_name, field_name, getter_name, init_function) \
DECLARE_ARCH_ENTRY(arch, blob_name, stub_name, field_name, getter_name)
-private:
- STUBGEN_ARCH_ENTRIES_DO(DECLARE_ARCH_ENTRY, DECLARE_ARCH_ENTRY_INIT)
+#define DECLARE_ARCH_ENTRY_ARRAY(arch, blob_name, stub_name, field_name, getter_name, count) \
+ static address STUB_FIELD_NAME(field_name) [count] ;
+private:
+ STUBGEN_ARCH_ENTRIES_DO(DECLARE_ARCH_ENTRY, DECLARE_ARCH_ENTRY_INIT, DECLARE_ARCH_ENTRY_ARRAY)
+
+#undef DECLARE_ARCH_ENTRY_ARRAY
#undef DECLARE_ARCH_ENTRY_INIT
#undef DECLARE_ARCH_ENTRY
@@ -71,8 +75,12 @@ public:
#define DEFINE_ARCH_ENTRY_GETTER_INIT(arch, blob_name, stub_name, field_name, getter_name, init_function) \
DEFINE_ARCH_ENTRY_GETTER(arch, blob_name, stub_name, field_name, getter_name)
- STUBGEN_ARCH_ENTRIES_DO(DEFINE_ARCH_ENTRY_GETTER, DEFINE_ARCH_ENTRY_GETTER_INIT)
+#define DEFINE_ARCH_ENTRY_GETTER_ARRAY(arch, blob_name, stub_name, field_name, getter_name, count) \
+ static address getter_name(int idx) { return STUB_FIELD_NAME(field_name) [idx] ; }
+ STUBGEN_ARCH_ENTRIES_DO(DEFINE_ARCH_ENTRY_GETTER, DEFINE_ARCH_ENTRY_GETTER_INIT, DEFINE_ARCH_ENTRY_GETTER_ARRAY)
+
+#undef DEFINE_ARCH_ENTRY_GETTER_ARRAY
#undef DEFINE_ARCH_ENTRY_GETTER_INIT
#undef DEFINE_ARCH_ENTRY_GETTER
diff --git a/src/hotspot/cpu/ppc/stubDeclarations_ppc.hpp b/src/hotspot/cpu/ppc/stubDeclarations_ppc.hpp
index be51afe42a4..41b8b71486d 100644
--- a/src/hotspot/cpu/ppc/stubDeclarations_ppc.hpp
+++ b/src/hotspot/cpu/ppc/stubDeclarations_ppc.hpp
@@ -29,35 +29,40 @@
#define STUBGEN_PREUNIVERSE_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(preuniverse, 0) \
#define STUBGEN_INITIAL_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(initial, 20000) \
#define STUBGEN_CONTINUATION_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(continuation, 2000) \
#define STUBGEN_COMPILER_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(compiler, 24000) \
#define STUBGEN_FINAL_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(final, 24000) \
diff --git a/src/hotspot/cpu/ppc/vm_version_ppc.cpp b/src/hotspot/cpu/ppc/vm_version_ppc.cpp
index 0b69ef7d25a..3e3b1103c86 100644
--- a/src/hotspot/cpu/ppc/vm_version_ppc.cpp
+++ b/src/hotspot/cpu/ppc/vm_version_ppc.cpp
@@ -311,11 +311,6 @@ void VM_Version::initialize() {
FLAG_SET_DEFAULT(UseSHA3Intrinsics, false);
}
- if (!(UseSHA1Intrinsics || UseSHA256Intrinsics || UseSHA512Intrinsics)) {
- FLAG_SET_DEFAULT(UseSHA, false);
- }
-
-
#ifdef COMPILER2
if (FLAG_IS_DEFAULT(UseSquareToLenIntrinsic)) {
UseSquareToLenIntrinsic = true;
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index a2b7970f9f6..0e32c602d95 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -49,6 +49,7 @@
#include "runtime/sharedRuntime.hpp"
#include "runtime/stubRoutines.hpp"
#include "utilities/globalDefinitions.hpp"
+#include "utilities/integerCast.hpp"
#include "utilities/powerOfTwo.hpp"
#ifdef COMPILER2
#include "opto/compile.hpp"
@@ -1947,14 +1948,12 @@ void MacroAssembler::restore_cpu_control_state_after_jni(Register tmp) {
}
}
-void MacroAssembler::push_reg(Register Rs)
-{
+void MacroAssembler::push_reg(Register Rs) {
subi(esp, esp, wordSize);
sd(Rs, Address(esp, 0));
}
-void MacroAssembler::pop_reg(Register Rd)
-{
+void MacroAssembler::pop_reg(Register Rd) {
ld(Rd, Address(esp, 0));
addi(esp, esp, wordSize);
}
@@ -1973,7 +1972,11 @@ int MacroAssembler::bitset_to_regs(unsigned int bitset, unsigned char* regs) {
// Push integer registers in the bitset supplied. Don't push sp.
// Return the number of words pushed
-int MacroAssembler::push_reg(unsigned int bitset, Register stack) {
+int MacroAssembler::push_reg(RegSet regset, Register stack) {
+ if (regset.bits() == 0) {
+ return 0;
+ }
+ auto bitset = integer_cast(regset.bits());
DEBUG_ONLY(int words_pushed = 0;)
unsigned char regs[32];
int count = bitset_to_regs(bitset, regs);
@@ -1993,7 +1996,11 @@ int MacroAssembler::push_reg(unsigned int bitset, Register stack) {
return count;
}
-int MacroAssembler::pop_reg(unsigned int bitset, Register stack) {
+int MacroAssembler::pop_reg(RegSet regset, Register stack) {
+ if (regset.bits() == 0) {
+ return 0;
+ }
+ auto bitset = integer_cast(regset.bits());
DEBUG_ONLY(int words_popped = 0;)
unsigned char regs[32];
int count = bitset_to_regs(bitset, regs);
@@ -2015,7 +2022,11 @@ int MacroAssembler::pop_reg(unsigned int bitset, Register stack) {
// Push floating-point registers in the bitset supplied.
// Return the number of words pushed
-int MacroAssembler::push_fp(unsigned int bitset, Register stack) {
+int MacroAssembler::push_fp(FloatRegSet regset, Register stack) {
+ if (regset.bits() == 0) {
+ return 0;
+ }
+ auto bitset = integer_cast(regset.bits());
DEBUG_ONLY(int words_pushed = 0;)
unsigned char regs[32];
int count = bitset_to_regs(bitset, regs);
@@ -2035,7 +2046,11 @@ int MacroAssembler::push_fp(unsigned int bitset, Register stack) {
return count;
}
-int MacroAssembler::pop_fp(unsigned int bitset, Register stack) {
+int MacroAssembler::pop_fp(FloatRegSet regset, Register stack) {
+ if (regset.bits() == 0) {
+ return 0;
+ }
+ auto bitset = integer_cast(regset.bits());
DEBUG_ONLY(int words_popped = 0;)
unsigned char regs[32];
int count = bitset_to_regs(bitset, regs);
@@ -2721,7 +2736,11 @@ void MacroAssembler::kernel_crc32(Register crc, Register buf, Register len,
#ifdef COMPILER2
// Push vector registers in the bitset supplied.
// Return the number of words pushed
-int MacroAssembler::push_v(unsigned int bitset, Register stack) {
+int MacroAssembler::push_v(VectorRegSet regset, Register stack) {
+ if (regset.bits() == 0) {
+ return 0;
+ }
+ auto bitset = integer_cast(regset.bits());
int vector_size_in_bytes = Matcher::scalable_vector_reg_size(T_BYTE);
// Scan bitset to accumulate register pairs
@@ -2736,7 +2755,11 @@ int MacroAssembler::push_v(unsigned int bitset, Register stack) {
return count * vector_size_in_bytes / wordSize;
}
-int MacroAssembler::pop_v(unsigned int bitset, Register stack) {
+int MacroAssembler::pop_v(VectorRegSet regset, Register stack) {
+ if (regset.bits() == 0) {
+ return 0;
+ }
+ auto bitset = integer_cast(regset.bits());
int vector_size_in_bytes = Matcher::scalable_vector_reg_size(T_BYTE);
// Scan bitset to accumulate register pairs
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
index a51a6aea468..4cc55e7ae23 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
@@ -818,15 +818,6 @@ class MacroAssembler: public Assembler {
void double_bgt(FloatRegister Rs1, FloatRegister Rs2, Label &l, bool is_far = false, bool is_unordered = false);
private:
- int push_reg(unsigned int bitset, Register stack);
- int pop_reg(unsigned int bitset, Register stack);
- int push_fp(unsigned int bitset, Register stack);
- int pop_fp(unsigned int bitset, Register stack);
-#ifdef COMPILER2
- int push_v(unsigned int bitset, Register stack);
- int pop_v(unsigned int bitset, Register stack);
-#endif // COMPILER2
-
// The signed 20-bit upper imm can materialize at most negative 0xF...F80000000, two G.
// The following signed 12-bit imm can at max subtract 0x800, two K, from that previously loaded two G.
bool is_valid_32bit_offset(int64_t x) {
@@ -844,15 +835,19 @@ private:
}
public:
+ // Stack push and pop individual 64 bit registers
void push_reg(Register Rs);
void pop_reg(Register Rd);
- void push_reg(RegSet regs, Register stack) { if (regs.bits()) push_reg(regs.bits(), stack); }
- void pop_reg(RegSet regs, Register stack) { if (regs.bits()) pop_reg(regs.bits(), stack); }
- void push_fp(FloatRegSet regs, Register stack) { if (regs.bits()) push_fp(regs.bits(), stack); }
- void pop_fp(FloatRegSet regs, Register stack) { if (regs.bits()) pop_fp(regs.bits(), stack); }
+
+ int push_reg(RegSet regset, Register stack);
+ int pop_reg(RegSet regset, Register stack);
+
+ int push_fp(FloatRegSet regset, Register stack);
+ int pop_fp(FloatRegSet regset, Register stack);
+
#ifdef COMPILER2
- void push_v(VectorRegSet regs, Register stack) { if (regs.bits()) push_v(regs.bits(), stack); }
- void pop_v(VectorRegSet regs, Register stack) { if (regs.bits()) pop_v(regs.bits(), stack); }
+ int push_v(VectorRegSet regset, Register stack);
+ int pop_v(VectorRegSet regset, Register stack);
#endif // COMPILER2
// Push and pop everything that might be clobbered by a native
diff --git a/src/hotspot/cpu/riscv/stubDeclarations_riscv.hpp b/src/hotspot/cpu/riscv/stubDeclarations_riscv.hpp
index f977d759d20..890e354fd27 100644
--- a/src/hotspot/cpu/riscv/stubDeclarations_riscv.hpp
+++ b/src/hotspot/cpu/riscv/stubDeclarations_riscv.hpp
@@ -29,28 +29,32 @@
#define STUBGEN_PREUNIVERSE_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(preuniverse, 0) \
#define STUBGEN_INITIAL_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(initial, 10000) \
#define STUBGEN_CONTINUATION_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(continuation, 2000) \
#define STUBGEN_COMPILER_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(compiler, 45000) \
do_stub(compiler, compare_long_string_LL) \
do_arch_entry(riscv, compiler, compare_long_string_LL, \
@@ -81,7 +85,8 @@
#define STUBGEN_FINAL_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(final, 20000 ZGC_ONLY(+10000)) \
do_stub(final, copy_byte_f) \
do_arch_entry(riscv, final, copy_byte_f, copy_byte_f, \
diff --git a/src/hotspot/cpu/riscv/stubRoutines_riscv.cpp b/src/hotspot/cpu/riscv/stubRoutines_riscv.cpp
index 51e31aa3672..b7f69eff9fa 100644
--- a/src/hotspot/cpu/riscv/stubRoutines_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubRoutines_riscv.cpp
@@ -42,8 +42,12 @@
#define DEFINE_ARCH_ENTRY_INIT(arch, blob_name, stub_name, field_name, getter_name, init_function) \
address StubRoutines:: arch :: STUB_FIELD_NAME(field_name) = CAST_FROM_FN_PTR(address, init_function);
-STUBGEN_ARCH_ENTRIES_DO(DEFINE_ARCH_ENTRY, DEFINE_ARCH_ENTRY_INIT)
+#define DEFINE_ARCH_ENTRY_ARRAY(arch, blob_name, stub_name, field_name, getter_name, count) \
+ address StubRoutines:: arch :: STUB_FIELD_NAME(field_name) [count] ;
+STUBGEN_ARCH_ENTRIES_DO(DEFINE_ARCH_ENTRY, DEFINE_ARCH_ENTRY_INIT, DEFINE_ARCH_ENTRY_ARRAY)
+
+#undef DEFINE_ARCH_ENTRY_ARRAY
#undef DEFINE_ARCH_ENTRY_INIT
#undef DEFINE_ARCH_ENTRY
diff --git a/src/hotspot/cpu/riscv/stubRoutines_riscv.hpp b/src/hotspot/cpu/riscv/stubRoutines_riscv.hpp
index 2c4e7210413..ec67a338052 100644
--- a/src/hotspot/cpu/riscv/stubRoutines_riscv.hpp
+++ b/src/hotspot/cpu/riscv/stubRoutines_riscv.hpp
@@ -61,9 +61,13 @@ class riscv {
#define DECLARE_ARCH_ENTRY_INIT(arch, blob_name, stub_name, field_name, getter_name, init_function) \
DECLARE_ARCH_ENTRY(arch, blob_name, stub_name, field_name, getter_name)
-private:
- STUBGEN_ARCH_ENTRIES_DO(DECLARE_ARCH_ENTRY, DECLARE_ARCH_ENTRY_INIT)
+#define DECLARE_ARCH_ENTRY_ARRAY(arch, blob_name, stub_name, field_name, getter_name, count) \
+ static address STUB_FIELD_NAME(field_name) [count] ;
+private:
+ STUBGEN_ARCH_ENTRIES_DO(DECLARE_ARCH_ENTRY, DECLARE_ARCH_ENTRY_INIT, DECLARE_ARCH_ENTRY_ARRAY)
+
+#undef DECLARE_ARCH_ENTRY_ARRAY
#undef DECLARE_ARCH_ENTRY_INIT
#undef DECLARE_ARCH_ENTRY
@@ -79,8 +83,12 @@ private:
#define DEFINE_ARCH_ENTRY_GETTER_INIT(arch, blob_name, stub_name, field_name, getter_name, init_function) \
DEFINE_ARCH_ENTRY_GETTER(arch, blob_name, stub_name, field_name, getter_name)
- STUBGEN_ARCH_ENTRIES_DO(DEFINE_ARCH_ENTRY_GETTER, DEFINE_ARCH_ENTRY_GETTER_INIT)
+#define DEFINE_ARCH_ENTRY_GETTER_ARRAY(arch, blob_name, stub_name, field_name, getter_name, count) \
+ static address getter_name(int idx) { return STUB_FIELD_NAME(field_name) [idx] ; }
+ STUBGEN_ARCH_ENTRIES_DO(DEFINE_ARCH_ENTRY_GETTER, DEFINE_ARCH_ENTRY_GETTER_INIT, DEFINE_ARCH_ENTRY_GETTER_ARRAY)
+
+#undef DEFINE_ARCH_ENTRY_GETTER_ARRAY
#undef DEFINE_ARCH_ENTRY_GETTER_INIT
#undef DEFINE_ARCH_ENTRY_GETTER
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.cpp b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
index 36f0864da0b..3a6415d52bd 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.cpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
@@ -420,11 +420,6 @@ void VM_Version::c2_initialize() {
FLAG_SET_DEFAULT(UseSHA3Intrinsics, false);
}
- // UseSHA
- if (!(UseSHA1Intrinsics || UseSHA256Intrinsics || UseSHA3Intrinsics || UseSHA512Intrinsics)) {
- FLAG_SET_DEFAULT(UseSHA, false);
- }
-
// AES
if (UseZvkn) {
UseAES = UseAES || FLAG_IS_DEFAULT(UseAES);
diff --git a/src/hotspot/cpu/s390/stubDeclarations_s390.hpp b/src/hotspot/cpu/s390/stubDeclarations_s390.hpp
index c3ad3cefeb9..d0e26beedab 100644
--- a/src/hotspot/cpu/s390/stubDeclarations_s390.hpp
+++ b/src/hotspot/cpu/s390/stubDeclarations_s390.hpp
@@ -29,28 +29,32 @@
#define STUBGEN_PREUNIVERSE_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(preuniverse, 0) \
#define STUBGEN_INITIAL_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(initial, 20000) \
#define STUBGEN_CONTINUATION_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(continuation, 2000) \
#define STUBGEN_COMPILER_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(compiler, 20000 ) \
do_stub(compiler, partial_subtype_check) \
do_arch_entry(zarch, compiler, partial_subtype_check, \
@@ -60,7 +64,8 @@
#define STUBGEN_FINAL_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(final, 20000) \
diff --git a/src/hotspot/cpu/s390/stubRoutines_s390.cpp b/src/hotspot/cpu/s390/stubRoutines_s390.cpp
index 3db4995338d..eda0ebfdecc 100644
--- a/src/hotspot/cpu/s390/stubRoutines_s390.cpp
+++ b/src/hotspot/cpu/s390/stubRoutines_s390.cpp
@@ -40,8 +40,12 @@
#define DEFINE_ARCH_ENTRY_INIT(arch, blob_name, stub_name, field_name, getter_name, init_function) \
address StubRoutines:: arch :: STUB_FIELD_NAME(field_name) = CAST_FROM_FN_PTR(address, init_function);
-STUBGEN_ARCH_ENTRIES_DO(DEFINE_ARCH_ENTRY, DEFINE_ARCH_ENTRY_INIT)
+#define DEFINE_ARCH_ENTRY_ARRAY(arch, blob_name, stub_name, field_name, getter_name, count) \
+ address StubRoutines:: arch :: STUB_FIELD_NAME(field_name) [idx] ;
+STUBGEN_ARCH_ENTRIES_DO(DEFINE_ARCH_ENTRY, DEFINE_ARCH_ENTRY_INIT, DEFINE_ARCH_ENTRY_ARRAY)
+
+#undef DEFINE_ARCH_ENTRY_ARRAY
#undef DEFINE_ARCH_ENTRY_INIT
#undef DEFINE_ARCH_ENTRY
diff --git a/src/hotspot/cpu/s390/stubRoutines_s390.hpp b/src/hotspot/cpu/s390/stubRoutines_s390.hpp
index 0a07efae46c..e575115b731 100644
--- a/src/hotspot/cpu/s390/stubRoutines_s390.hpp
+++ b/src/hotspot/cpu/s390/stubRoutines_s390.hpp
@@ -81,9 +81,13 @@ class zarch {
#define DECLARE_ARCH_ENTRY_INIT(arch, blob_name, stub_name, field_name, getter_name, init_function) \
DECLARE_ARCH_ENTRY(arch, blob_name, stub_name, field_name, getter_name)
-private:
- STUBGEN_ARCH_ENTRIES_DO(DECLARE_ARCH_ENTRY, DECLARE_ARCH_ENTRY_INIT)
+#define DECLARE_ARCH_ENTRY_ARRAY(arch, blob_name, stub_name, field_name, getter_name, count) \
+ static address STUB_FIELD_NAME(field_name) [count] ;
+private:
+ STUBGEN_ARCH_ENTRIES_DO(DECLARE_ARCH_ENTRY, DECLARE_ARCH_ENTRY_INIT, DECLARE_ARCH_ENTRY_ARRAY)
+
+#undef DECLARE_ARCH_ENTRY_ARRAY
#undef DECLARE_ARCH_ENTRY_INIT
#undef DECLARE_ARCH_ENTRY
@@ -108,8 +112,12 @@ private:
#define DEFINE_ARCH_ENTRY_GETTER_INIT(arch, blob_name, stub_name, field_name, getter_name, init_function) \
DEFINE_ARCH_ENTRY_GETTER(arch, blob_name, stub_name, field_name, getter_name)
- STUBGEN_ARCH_ENTRIES_DO(DEFINE_ARCH_ENTRY_GETTER, DEFINE_ARCH_ENTRY_GETTER_INIT)
+#define DEFINE_ARCH_ENTRY_GETTER_ARRAY(arch, blob_name, stub_name, field_name, getter_name, count) \
+ static address getter_name(int idx) { return STUB_FIELD_NAME(field_name) [idx] ; }
+ STUBGEN_ARCH_ENTRIES_DO(DEFINE_ARCH_ENTRY_GETTER, DEFINE_ARCH_ENTRY_GETTER_INIT, DEFINE_ARCH_ENTRY_GETTER_ARRAY)
+
+#undef DEFINE_ARCH_ENTRY_GETTER_ARRAY
#undef DEFINE_ARCH_ENTRY_GETTER_INIT
#undef DEFINE_ARCH_ENTRY_GETTER
diff --git a/src/hotspot/cpu/s390/vm_version_s390.cpp b/src/hotspot/cpu/s390/vm_version_s390.cpp
index 7f5b4870aab..7e9000991ca 100644
--- a/src/hotspot/cpu/s390/vm_version_s390.cpp
+++ b/src/hotspot/cpu/s390/vm_version_s390.cpp
@@ -289,10 +289,6 @@ void VM_Version::initialize() {
FLAG_SET_DEFAULT(UseSHA3Intrinsics, false);
}
- if (!(UseSHA1Intrinsics || UseSHA256Intrinsics || UseSHA512Intrinsics)) {
- 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.");
diff --git a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
index 29925e71aaf..5c05b3702bb 100644
--- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
@@ -74,7 +74,7 @@ static jlong *double_signflip_pool = double_quadword(&fp_signmask_pool[4*2], (jl
#if INCLUDE_CDS
// publish external addresses defined in this file
void LIR_Assembler::init_AOTAddressTable(GrowableArray& external_addresses) {
-#define ADD(addr) external_addresses.append((address)addr);
+#define ADD(addr) external_addresses.append((address)(addr));
ADD(float_signmask_pool);
ADD(double_signmask_pool);
ADD(float_signflip_pool);
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
index f36c816dd5e..b4d8aa10de2 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
@@ -1706,12 +1706,8 @@ void C2_MacroAssembler::load_constant_vector(BasicType bt, XMMRegister dst, Inte
}
void C2_MacroAssembler::load_iota_indices(XMMRegister dst, int vlen_in_bytes, BasicType bt) {
- // The iota indices are ordered by type B/S/I/L/F/D, and the offset between two types is 64.
- int offset = exact_log2(type2aelembytes(bt)) << 6;
- if (is_floating_point_type(bt)) {
- offset += 128;
- }
- ExternalAddress addr(StubRoutines::x86::vector_iota_indices() + offset);
+ int entry_idx = vector_iota_entry_index(bt);
+ ExternalAddress addr(StubRoutines::x86::vector_iota_indices(entry_idx));
load_vector(T_BYTE, dst, addr, vlen_in_bytes);
}
@@ -7164,3 +7160,24 @@ void C2_MacroAssembler::vminmax_fp16_avx10_2(int opcode, XMMRegister dst, XMMReg
evminmaxph(dst, ktmp, src1, src2, true, AVX10_2_MINMAX_MIN_COMPARE_SIGN, vlen_enc);
}
}
+
+int C2_MacroAssembler::vector_iota_entry_index(BasicType bt) {
+ // The vector iota entries array is ordered by type B/S/I/L/F/D, and
+ // the offset between two types is 16.
+ switch(bt) {
+ case T_BYTE:
+ return 0;
+ case T_SHORT:
+ return 1;
+ case T_INT:
+ return 2;
+ case T_LONG:
+ return 3;
+ case T_FLOAT:
+ return 4;
+ case T_DOUBLE:
+ return 5;
+ default:
+ ShouldNotReachHere();
+ }
+}
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
index 4e77f8a5f6f..9b229ad7221 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
@@ -596,4 +596,5 @@ public:
void reconstruct_frame_pointer(Register rtmp);
+ int vector_iota_entry_index(BasicType bt);
#endif // CPU_X86_C2_MACROASSEMBLER_X86_HPP
diff --git a/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp
index 1de147926bb..c05f37a3bea 100644
--- a/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
* 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 @@ __ BIND(L_loop);
__ BIND(L_done);
}
-void CardTableBarrierSetAssembler::store_check(MacroAssembler* masm, Register obj, Address dst, Register rscratch) {
+void CardTableBarrierSetAssembler::store_check(MacroAssembler* masm, Register obj, Register rscratch) {
// Does a store check for the oop in register obj. The content of
// register obj is destroyed afterwards.
CardTableBarrierSet* ctbs = CardTableBarrierSet::barrier_set();
@@ -192,10 +192,10 @@ void CardTableBarrierSetAssembler::oop_store_at(MacroAssembler* masm, DecoratorS
if (needs_post_barrier) {
// flatten object address if needed
if (!precise || (dst.index() == noreg && dst.disp() == 0)) {
- store_check(masm, dst.base(), dst, tmp2);
+ store_check(masm, dst.base(), tmp2);
} else {
__ lea(tmp1, dst);
- store_check(masm, tmp1, dst, tmp2);
+ store_check(masm, tmp1, tmp2);
}
}
}
diff --git a/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.hpp
index 201c11062f2..c38e16d4d5f 100644
--- a/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
* 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 @@ protected:
virtual void gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
Register addr, Register count) {}
- void store_check(MacroAssembler* masm, Register obj, Address dst, Register rscratch);
+ void store_check(MacroAssembler* masm, Register obj, Register rscratch);
virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators, Register addr, Register count, Register tmp);
diff --git a/src/hotspot/cpu/x86/stubDeclarations_x86.hpp b/src/hotspot/cpu/x86/stubDeclarations_x86.hpp
index 07a1ab622ed..24886deb3c5 100644
--- a/src/hotspot/cpu/x86/stubDeclarations_x86.hpp
+++ b/src/hotspot/cpu/x86/stubDeclarations_x86.hpp
@@ -29,14 +29,16 @@
#define STUBGEN_PREUNIVERSE_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(preuniverse, 500) \
#define STUBGEN_INITIAL_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(initial, PRODUCT_ONLY(20000) NOT_PRODUCT(21000) WINDOWS_ONLY(+1000)) \
do_stub(initial, verify_mxcsr) \
do_arch_entry(x86, initial, verify_mxcsr, verify_mxcsr_entry, \
@@ -65,14 +67,18 @@
#define STUBGEN_CONTINUATION_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(continuation, 3000) \
+// count needed for declaration of vector_iota_indices stub
+#define VECTOR_IOTA_COUNT 6
#define STUBGEN_COMPILER_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(compiler, 120000 WINDOWS_ONLY(+2000)) \
do_stub(compiler, vector_float_sign_mask) \
do_arch_entry(x86, compiler, vector_float_sign_mask, \
@@ -126,8 +132,9 @@
do_arch_entry(x86, compiler, vector_long_sign_mask, \
vector_long_sign_mask, vector_long_sign_mask) \
do_stub(compiler, vector_iota_indices) \
- do_arch_entry(x86, compiler, vector_iota_indices, \
- vector_iota_indices, vector_iota_indices) \
+ do_arch_entry_array(x86, compiler, vector_iota_indices, \
+ vector_iota_indices, vector_iota_indices, \
+ VECTOR_IOTA_COUNT) \
do_stub(compiler, vector_count_leading_zeros_lut) \
do_arch_entry(x86, compiler, vector_count_leading_zeros_lut, \
vector_count_leading_zeros_lut, \
@@ -250,7 +257,8 @@
#define STUBGEN_FINAL_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(final, 33000 \
WINDOWS_ONLY(+22000) ZGC_ONLY(+20000)) \
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
index 40be816fbf0..993d1964034 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
@@ -893,13 +893,20 @@ address StubGenerator::generate_popcount_avx_lut() {
return start;
}
-address StubGenerator::generate_iota_indices() {
+void StubGenerator::generate_iota_indices() {
StubId stub_id = StubId::stubgen_vector_iota_indices_id;
+ GrowableArray entries;
int entry_count = StubInfo::entry_count(stub_id);
- assert(entry_count == 1, "sanity check");
- address start = load_archive_data(stub_id);
+ assert(entry_count == VECTOR_IOTA_COUNT, "sanity check");
+ address start = load_archive_data(stub_id, &entries);
if (start != nullptr) {
- return start;
+ assert(entries.length() == VECTOR_IOTA_COUNT - 1,
+ "unexpected extra entry count %d", entries.length());
+ StubRoutines::x86::_vector_iota_indices[0] = start;
+ for (int i = 1; i < VECTOR_IOTA_COUNT; i++) {
+ StubRoutines::x86::_vector_iota_indices[i] = entries.at(i - 1);
+ }
+ return;
}
__ align(CodeEntryAlignment);
StubCodeMark mark(this, stub_id);
@@ -913,6 +920,7 @@ address StubGenerator::generate_iota_indices() {
__ emit_data64(0x2F2E2D2C2B2A2928, relocInfo::none);
__ emit_data64(0x3736353433323130, relocInfo::none);
__ emit_data64(0x3F3E3D3C3B3A3938, relocInfo::none);
+ entries.append(__ pc());
// W
__ emit_data64(0x0003000200010000, relocInfo::none);
__ emit_data64(0x0007000600050004, relocInfo::none);
@@ -922,6 +930,7 @@ address StubGenerator::generate_iota_indices() {
__ emit_data64(0x0017001600150014, relocInfo::none);
__ emit_data64(0x001B001A00190018, relocInfo::none);
__ emit_data64(0x001F001E001D001C, relocInfo::none);
+ entries.append(__ pc());
// D
__ emit_data64(0x0000000100000000, relocInfo::none);
__ emit_data64(0x0000000300000002, relocInfo::none);
@@ -931,6 +940,7 @@ address StubGenerator::generate_iota_indices() {
__ emit_data64(0x0000000B0000000A, relocInfo::none);
__ emit_data64(0x0000000D0000000C, relocInfo::none);
__ emit_data64(0x0000000F0000000E, relocInfo::none);
+ entries.append(__ pc());
// Q
__ emit_data64(0x0000000000000000, relocInfo::none);
__ emit_data64(0x0000000000000001, relocInfo::none);
@@ -940,6 +950,7 @@ address StubGenerator::generate_iota_indices() {
__ emit_data64(0x0000000000000005, relocInfo::none);
__ emit_data64(0x0000000000000006, relocInfo::none);
__ emit_data64(0x0000000000000007, relocInfo::none);
+ entries.append(__ pc());
// D - FP
__ emit_data64(0x3F80000000000000, relocInfo::none); // 0.0f, 1.0f
__ emit_data64(0x4040000040000000, relocInfo::none); // 2.0f, 3.0f
@@ -949,6 +960,7 @@ address StubGenerator::generate_iota_indices() {
__ emit_data64(0x4130000041200000, relocInfo::none); // 10.0f, 11.0f
__ emit_data64(0x4150000041400000, relocInfo::none); // 12.0f, 13.0f
__ emit_data64(0x4170000041600000, relocInfo::none); // 14.0f, 15.0f
+ entries.append(__ pc());
// Q - FP
__ emit_data64(0x0000000000000000, relocInfo::none); // 0.0d
__ emit_data64(0x3FF0000000000000, relocInfo::none); // 1.0d
@@ -960,9 +972,15 @@ address StubGenerator::generate_iota_indices() {
__ emit_data64(0x401c000000000000, relocInfo::none); // 7.0d
// record the stub entry and end
- store_archive_data(stub_id, start, __ pc());
+ store_archive_data(stub_id, start, __ pc(), &entries);
- return start;
+ // install the entry addresses in the entry array
+ assert(entries.length() == entry_count - 1,
+ "unexpected entries count %d", entries.length());
+ StubRoutines::x86::_vector_iota_indices[0] = start;
+ for (int i = 1; i < VECTOR_IOTA_COUNT; i++) {
+ StubRoutines::x86::_vector_iota_indices[i] = entries.at(i - 1);
+ }
}
address StubGenerator::generate_vector_reverse_bit_lut() {
@@ -4837,7 +4855,7 @@ void StubGenerator::generate_compiler_stubs() {
StubRoutines::x86::_vector_short_shuffle_mask = generate_vector_mask(StubId::stubgen_vector_short_shuffle_mask_id, 0x0100010001000100);
StubRoutines::x86::_vector_long_shuffle_mask = generate_vector_mask(StubId::stubgen_vector_long_shuffle_mask_id, 0x0000000100000000);
StubRoutines::x86::_vector_long_sign_mask = generate_vector_mask(StubId::stubgen_vector_long_sign_mask_id, 0x8000000000000000);
- StubRoutines::x86::_vector_iota_indices = generate_iota_indices();
+ generate_iota_indices();
StubRoutines::x86::_vector_count_leading_zeros_lut = generate_count_leading_zeros_lut();
StubRoutines::x86::_vector_reverse_bit_lut = generate_vector_reverse_bit_lut();
StubRoutines::x86::_vector_reverse_byte_perm_mask_long = generate_vector_reverse_byte_perm_mask_long();
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp
index 05e8384d636..d3823cb559f 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.hpp
@@ -84,7 +84,7 @@ class StubGenerator: public StubCodeGenerator {
address generate_count_leading_zeros_lut();
address generate_popcount_avx_lut();
- address generate_iota_indices();
+ void generate_iota_indices();
address generate_vector_reverse_bit_lut();
address generate_vector_reverse_byte_perm_mask_long();
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_constants.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_constants.cpp
index 45c13b7b397..19e1ca680b3 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64_constants.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_constants.cpp
@@ -247,8 +247,9 @@ void StubGenerator::init_AOTAddressTable_constants(GrowableArray& exter
ADD(_SC_2);
ADD(_SC_3);
ADD(_SC_4);
- ADD(_PI_4);
- ADD(((address)_PI_4+8));
+ // Use value which was already cast to (address): StubGenerator::PI_4;
+ ADD(PI_4);
+ ADD(PI_4 + 8);
ADD(_PI32INV);
ADD(_NEG_ZERO);
ADD(_P_1);
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_exp.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_exp.cpp
index 2ed9858bf0c..3c8babcbecf 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64_exp.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_exp.cpp
@@ -397,13 +397,14 @@ address StubGenerator::generate_libmExp() {
#if INCLUDE_CDS
void StubGenerator::init_AOTAddressTable_exp(GrowableArray& external_addresses) {
-#define ADD(addr) external_addresses.append((address)addr);
- ADD(_cv);
- ADD(((address)_cv+16));
- ADD(((address)_cv+32));
- ADD(((address)_cv+48));
- ADD(((address)_cv+64));
- ADD(((address)_cv+80));
+#define ADD(addr) external_addresses.append((address)(addr));
+ address cv = (address)_cv;
+ ADD(cv);
+ ADD(cv + 16);
+ ADD(cv + 32);
+ ADD(cv + 48);
+ ADD(cv + 64);
+ ADD(cv + 80);
ADD(_mmask);
ADD(_bias);
ADD(_Tbl_addr);
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_fmod.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_fmod.cpp
index f73c8ed459e..f53985a13b7 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64_fmod.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_fmod.cpp
@@ -537,7 +537,7 @@ address StubGenerator::generate_libmFmod() {
#if INCLUDE_CDS
void StubGenerator::init_AOTAddressTable_fmod(GrowableArray& external_addresses) {
-#define ADD(addr) external_addresses.append((address)addr);
+#define ADD(addr) external_addresses.append((address)(addr));
ADD(CONST_NaN);
ADD(CONST_1p260);
ADD(CONST_MAX);
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_ghash.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_ghash.cpp
index 557fe623351..9ebab07589e 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64_ghash.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_ghash.cpp
@@ -558,7 +558,7 @@ void StubGenerator::generateHtbl_eight_blocks(Register htbl) {
#if INCLUDE_CDS
void StubGenerator::init_AOTAddressTable_ghash(GrowableArray& external_addresses) {
-#define ADD(addr) external_addresses.append((address)addr);
+#define ADD(addr) external_addresses.append((address)(addr));
ADD(GHASH_SHUFFLE_MASK);
ADD(GHASH_LONG_SWAP_MASK);
ADD(GHASH_BYTE_SWAP_MASK);
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_log.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_log.cpp
index 8849597c94b..07683a51e3d 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64_log.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_log.cpp
@@ -729,22 +729,28 @@ address StubGenerator::generate_libmLog10() {
#if INCLUDE_CDS
void StubGenerator::init_AOTAddressTable_log(GrowableArray& external_addresses) {
-#define ADD(addr) external_addresses.append((address)addr);
+#define ADD(addr) external_addresses.append((address)(addr));
+ address log2 = (address)_log2;
+ address coeff = (address)_coeff;
+ address LOG10_E = (address)_LOG10_E;
+ address log2_log10 = (address)_log2_log10;
+ address coeff_log10 = (address)_coeff_log10;
+
ADD(_L_tbl);
- ADD(_log2);
- ADD(((address)_log2+8));
- ADD(_coeff);
- ADD(((address)_coeff+16));
- ADD(((address)_coeff+32));
+ ADD(log2);
+ ADD(log2 + 8);
+ ADD(coeff);
+ ADD(coeff + 16);
+ ADD(coeff + 32);
ADD(_HIGHSIGMASK_log10);
- ADD(_LOG10_E);
- ADD(((address)_LOG10_E+8));
+ ADD(LOG10_E);
+ ADD(LOG10_E + 8);
ADD(_L_tbl_log10);
- ADD(_log2_log10);
- ADD(((address)_log2_log10+8));
- ADD(_coeff_log10);
- ADD(((address)_coeff_log10+16));
- ADD(((address)_coeff_log10+32));
+ ADD(log2_log10);
+ ADD(log2_log10 + 8);
+ ADD(coeff_log10);
+ ADD(coeff_log10 + 16);
+ ADD(coeff_log10 + 32);
#undef ADD
}
#endif // INCLUDE_CDS
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_poly1305.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_poly1305.cpp
index 1d0e961c82d..ea7e6d64254 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64_poly1305.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_poly1305.cpp
@@ -1709,7 +1709,7 @@ void StubGenerator::poly1305_msg_mul_reduce_vec4_avx2(
#if INCLUDE_CDS
void StubGenerator::init_AOTAddressTable_poly1305(GrowableArray& external_addresses) {
-#define ADD(addr) external_addresses.append((address)addr);
+#define ADD(addr) external_addresses.append((address)(addr));
ADD(POLY1305_PAD_MSG);
ADD(POLY1305_MASK42);
ADD(POLY1305_MASK44);
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_poly_mont.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_poly_mont.cpp
index 4648fe03aa0..308a8042993 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64_poly_mont.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_poly_mont.cpp
@@ -788,7 +788,7 @@ address StubGenerator::generate_intpoly_assign() {
#if INCLUDE_CDS
void StubGenerator::init_AOTAddressTable_poly_mont(GrowableArray& external_addresses) {
-#define ADD(addr) external_addresses.append((address)addr);
+#define ADD(addr) external_addresses.append((address)(addr));
// use accessors to retrieve all correct addresses
ADD(shift_1L());
ADD(shift_1R());
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_pow.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_pow.cpp
index 5ff09e2b377..a9a6dc10da4 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64_pow.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_pow.cpp
@@ -1875,25 +1875,30 @@ address StubGenerator::generate_libmPow() {
#if INCLUDE_CDS
void StubGenerator::init_AOTAddressTable_pow(GrowableArray& external_addresses) {
-#define ADD(addr) external_addresses.append((address)addr);
+#define ADD(addr) external_addresses.append((address)(addr));
+ address HIGHMASK_Y = (address)_HIGHMASK_Y;
+ address e_coeff = (address)_e_coeff;
+ address coeff_h = (address)_coeff_h;
+ address coeff_pow = (address)_coeff_pow;
+
ADD(_HIGHSIGMASK);
ADD(_LOG2_E);
- ADD(_HIGHMASK_Y);
- ADD((address)_HIGHMASK_Y+8);
+ ADD(HIGHMASK_Y);
+ ADD(HIGHMASK_Y + 8);
ADD(_T_exp);
- ADD(_e_coeff);
- ADD((address)_e_coeff+16);
- ADD((address)_e_coeff+32);
- ADD(_coeff_h);
- ADD((address)_coeff_h+8);
+ ADD(e_coeff);
+ ADD(e_coeff + 16);
+ ADD(e_coeff + 32);
+ ADD(coeff_h);
+ ADD(coeff_h + 8);
ADD(_HIGHMASK_LOG_X);
ADD(_HALFMASK);
- ADD(_coeff_pow);
- ADD((address)_coeff_pow+16);
- ADD((address)_coeff_pow+32);
- ADD((address)_coeff_pow+48);
- ADD((address)_coeff_pow+64);
- ADD((address)_coeff_pow+80);
+ ADD(coeff_pow);
+ ADD(coeff_pow + 16);
+ ADD(coeff_pow + 32);
+ ADD(coeff_pow + 48);
+ ADD(coeff_pow + 64);
+ ADD(coeff_pow + 80);
ADD(_L_tbl_pow);
ADD(_log2_pow);
ADD(_DOUBLE2);
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_sha3.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_sha3.cpp
index 075d25dcac8..58f81652a0c 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64_sha3.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_sha3.cpp
@@ -530,7 +530,7 @@ void StubGenerator::generate_sha3_stubs() {
#if INCLUDE_CDS
void StubGenerator::init_AOTAddressTable_sha3(GrowableArray& external_addresses) {
-#define ADD(addr) external_addresses.append((address)addr);
+#define ADD(addr) external_addresses.append((address)(addr));
ADD(round_constsAddr());
ADD(permsAndRotsAddr());
#undef ADD
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_sin.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_sin.cpp
index eaeaea2c566..00c759a369b 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64_sin.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_sin.cpp
@@ -661,7 +661,7 @@ address StubGenerator::generate_libmSin() {
#if INCLUDE_CDS
void StubGenerator::init_AOTAddressTable_sin(GrowableArray& external_addresses) {
-#define ADD(addr) external_addresses.append((address)addr);
+#define ADD(addr) external_addresses.append((address)(addr));
ADD(_ALL_ONES);
#undef ADD
}
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_sinh.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_sinh.cpp
index f6e1d241948..9969866cfc7 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64_sinh.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_sinh.cpp
@@ -535,21 +535,25 @@ address StubGenerator::generate_libmSinh() {
#if INCLUDE_CDS
void StubGenerator::init_AOTAddressTable_sinh(GrowableArray& external_addresses) {
-#define ADD(addr) external_addresses.append((address)addr);
- ADD(_L2E);
- ADD(_L2E + 8);
+#define ADD(addr) external_addresses.append((address)(addr));
+ address L2E = (address)_L2E;
+ address cv = (address)_cv;
+ address pv = (address)_pv;
+
+ ADD(L2E);
+ ADD(L2E + 8);
ADD(_HALFMASK);
ADD(_Shifter);
- ADD(_cv);
- ADD(_cv + 16);
- ADD(_cv + 32);
- ADD(_cv + 48);
- ADD(_cv + 64);
+ ADD(cv);
+ ADD(cv + 16);
+ ADD(cv + 32);
+ ADD(cv + 48);
+ ADD(cv + 64);
ADD(_T2f);
ADD(_T2_neg_f);
- ADD(_pv);
- ADD(_pv + 16);
- ADD(_pv + 32);
+ ADD(pv);
+ ADD(pv + 16);
+ ADD(pv + 32);
ADD(_MASK3);
#undef ADD
}
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_tan.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_tan.cpp
index 3bfa5a7277f..9f91b9e8f84 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64_tan.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_tan.cpp
@@ -1041,7 +1041,9 @@ address StubGenerator::generate_libmTan() {
#if INCLUDE_CDS
void StubGenerator::init_AOTAddressTable_tan(GrowableArray& external_addresses) {
-#define ADD(addr) external_addresses.append((address)addr);
+#define ADD(addr) external_addresses.append((address)(addr));
+ address PI_4_tan = (address)_PI_4_tan;
+
ADD(_MUL16);
ADD(_sign_mask_tan);
ADD(_PI32INV_tan);
@@ -1055,8 +1057,8 @@ void StubGenerator::init_AOTAddressTable_tan(GrowableArray& external_ad
ADD(_Q_7_tan);
ADD(_Q_5_tan);
ADD(_Q_3_tan);
- ADD(_PI_4_tan);
- ADD(((address)_PI_4_tan+8));
+ ADD(PI_4_tan);
+ ADD(PI_4_tan + 8);
ADD(_QQ_2_tan);
#undef ADD
}
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_tanh.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_tanh.cpp
index dcf5f3eb824..4f2fe8a460b 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64_tanh.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_tanh.cpp
@@ -511,20 +511,24 @@ address StubGenerator::generate_libmTanh() {
#if INCLUDE_CDS
void StubGenerator::init_AOTAddressTable_tanh(GrowableArray& external_addresses) {
-#define ADD(addr) external_addresses.append((address)addr);
- ADD(_L2E);
- ADD(_L2E + 8);
+#define ADD(addr) external_addresses.append((address)(addr));
+ address L2E = (address)_L2E;
+ address cv = (address)_cv;
+ address pv = (address)_pv;
+
+ ADD(L2E);
+ ADD(L2E + 8);
ADD(_HALFMASK);
ADD(_ONEMASK);
ADD(_TWOMASK);
ADD(_Shifter);
- ADD(_cv);
- ADD(_cv + 16);
- ADD(_cv + 32);
+ ADD(cv);
+ ADD(cv + 16);
+ ADD(cv + 32);
ADD(_T2_neg_f);
- ADD(_pv);
- ADD(_pv + 16);
- ADD(_pv + 32);
+ ADD(pv);
+ ADD(pv + 16);
+ ADD(pv + 32);
ADD(_MASK3);
ADD(_RMASK);
#undef ADD
diff --git a/src/hotspot/cpu/x86/stubRoutines_x86.cpp b/src/hotspot/cpu/x86/stubRoutines_x86.cpp
index 8696180c512..ce11925dde2 100644
--- a/src/hotspot/cpu/x86/stubRoutines_x86.cpp
+++ b/src/hotspot/cpu/x86/stubRoutines_x86.cpp
@@ -44,8 +44,12 @@
#define DEFINE_ARCH_ENTRY_INIT(arch, blob_name, stub_name, field_name, getter_name, init_function) \
address StubRoutines:: arch :: STUB_FIELD_NAME(field_name) = CAST_FROM_FN_PTR(address, init_function);
-STUBGEN_ARCH_ENTRIES_DO(DEFINE_ARCH_ENTRY, DEFINE_ARCH_ENTRY_INIT)
+#define DEFINE_ARCH_ENTRY_ARRAY(arch, blob_name, stub_name, field_name, getter_name, count) \
+ address StubRoutines:: arch :: STUB_FIELD_NAME(field_name) [count];
+STUBGEN_ARCH_ENTRIES_DO(DEFINE_ARCH_ENTRY, DEFINE_ARCH_ENTRY_INIT, DEFINE_ARCH_ENTRY_ARRAY)
+
+#undef DEFINE_ARCH_ENTRY_ARRAY
#undef DEFINE_ARCH_ENTRY_INIT
#undef DEFINE_ARCH_ENTRY
@@ -435,7 +439,7 @@ void StubRoutines::init_AOTAddressTable() {
// publish addresses of external data defined in this file which may
// be referenced from stub or code
void StubRoutines::x86::init_AOTAddressTable(GrowableArray& external_addresses) {
-#define ADD(addr) external_addresses.append((address)addr);
+#define ADD(addr) external_addresses.append((address)(addr));
ADD(&_mxcsr_std);
ADD(&_mxcsr_rz);
ADD(crc_by128_masks_addr());
diff --git a/src/hotspot/cpu/x86/stubRoutines_x86.hpp b/src/hotspot/cpu/x86/stubRoutines_x86.hpp
index 3c6d75c1d4e..7283798888b 100644
--- a/src/hotspot/cpu/x86/stubRoutines_x86.hpp
+++ b/src/hotspot/cpu/x86/stubRoutines_x86.hpp
@@ -55,9 +55,13 @@ class x86 {
#define DECLARE_ARCH_ENTRY_INIT(arch, blob_name, stub_name, field_name, getter_name, init_function) \
DECLARE_ARCH_ENTRY(arch, blob_name, stub_name, field_name, getter_name)
-private:
- STUBGEN_ARCH_ENTRIES_DO(DECLARE_ARCH_ENTRY, DECLARE_ARCH_ENTRY_INIT)
+#define DECLARE_ARCH_ENTRY_ARRAY(arch, blob_name, stub_name, field_name, getter_name, count) \
+ static address STUB_FIELD_NAME(field_name) [count] ;
+private:
+ STUBGEN_ARCH_ENTRIES_DO(DECLARE_ARCH_ENTRY, DECLARE_ARCH_ENTRY_INIT, DECLARE_ARCH_ENTRY_ARRAY)
+
+#undef DECLARE_ARCH_ENTRY_ARRAY
#undef DECLARE_ARCH_ENTRY_INIT
#undef DECLARE_ARCH_ENTRY
@@ -70,9 +74,13 @@ private:
#define DEFINE_ARCH_ENTRY_GETTER_INIT(arch, blob_name, stub_name, field_name, getter_name, init_function) \
DEFINE_ARCH_ENTRY_GETTER(arch, blob_name, stub_name, field_name, getter_name)
-public:
- STUBGEN_ARCH_ENTRIES_DO(DEFINE_ARCH_ENTRY_GETTER, DEFINE_ARCH_ENTRY_GETTER_INIT)
+#define DEFINE_ARCH_ENTRY_GETTER_ARRAY(arch, blob_name, stub_name, field_name, getter_name, count) \
+ static address getter_name(int idx) { return STUB_FIELD_NAME(field_name) [idx]; }
+public:
+ STUBGEN_ARCH_ENTRIES_DO(DEFINE_ARCH_ENTRY_GETTER, DEFINE_ARCH_ENTRY_GETTER_INIT, DEFINE_ARCH_ENTRY_GETTER_ARRAY)
+
+#undef DEFINE_ARCH_ENTRY_GETTER_ARRAY
#undef DEFINE_ARCH_ENTRY_GETTER_INIT
#undef DEFINE_ARCH_GETTER_ENTRY
diff --git a/src/hotspot/cpu/x86/vm_version_x86.cpp b/src/hotspot/cpu/x86/vm_version_x86.cpp
index 39a9c618350..cf9de40a237 100644
--- a/src/hotspot/cpu/x86/vm_version_x86.cpp
+++ b/src/hotspot/cpu/x86/vm_version_x86.cpp
@@ -1187,7 +1187,7 @@ void VM_Version::get_processor_features() {
}
if (!UseAESIntrinsics) {
if (UseAESCTRIntrinsics) {
- if (FLAG_IS_DEFAULT(UseAESCTRIntrinsics)) {
+ if (!FLAG_IS_DEFAULT(UseAESCTRIntrinsics)) {
warning("AES-CTR intrinsics require UseAESIntrinsics flag to be enabled. Intrinsics will be disabled.");
}
FLAG_SET_DEFAULT(UseAESCTRIntrinsics, false);
@@ -1373,10 +1373,6 @@ void VM_Version::get_processor_features() {
FLAG_SET_DEFAULT(UseSHA3Intrinsics, false);
}
- if (!(UseSHA1Intrinsics || UseSHA256Intrinsics || UseSHA512Intrinsics || UseSHA3Intrinsics)) {
- FLAG_SET_DEFAULT(UseSHA, false);
- }
-
#if COMPILER2_OR_JVMCI
int max_vector_size = 0;
if (UseAVX == 0 || !os_supports_avx_vectors()) {
diff --git a/src/hotspot/cpu/zero/stubDeclarations_zero.hpp b/src/hotspot/cpu/zero/stubDeclarations_zero.hpp
index 2357bbb5169..9abe313b3a7 100644
--- a/src/hotspot/cpu/zero/stubDeclarations_zero.hpp
+++ b/src/hotspot/cpu/zero/stubDeclarations_zero.hpp
@@ -29,35 +29,40 @@
#define STUBGEN_PREUNIVERSE_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(preuniverse, 0) \
#define STUBGEN_INITIAL_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(initial, 0) \
#define STUBGEN_CONTINUATION_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(continuation, 0) \
#define STUBGEN_COMPILER_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(compiler, 0) \
#define STUBGEN_FINAL_BLOBS_ARCH_DO(do_stub, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_arch_blob(final, 0) \
diff --git a/src/hotspot/os/linux/cgroupSubsystem_linux.cpp b/src/hotspot/os/linux/cgroupSubsystem_linux.cpp
index 13a005591fb..4a2d75ecdf3 100644
--- a/src/hotspot/os/linux/cgroupSubsystem_linux.cpp
+++ b/src/hotspot/os/linux/cgroupSubsystem_linux.cpp
@@ -40,6 +40,8 @@
// Inlined from for portability.
#ifndef CGROUP2_SUPER_MAGIC
# define CGROUP2_SUPER_MAGIC 0x63677270
+#else
+ STATIC_ASSERT(CGROUP2_SUPER_MAGIC == 0x63677270);
#endif
// controller names have to match the *_IDX indices
diff --git a/src/hotspot/share/adlc/formssel.cpp b/src/hotspot/share/adlc/formssel.cpp
index 4dd2bff7c89..5802217c1c1 100644
--- a/src/hotspot/share/adlc/formssel.cpp
+++ b/src/hotspot/share/adlc/formssel.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -4233,11 +4233,13 @@ int MatchRule::is_expensive() const {
strcmp(opType,"PopulateIndex")==0 ||
strcmp(opType,"AddReductionVI")==0 ||
strcmp(opType,"AddReductionVL")==0 ||
+ strcmp(opType,"AddReductionVHF")==0 ||
strcmp(opType,"AddReductionVF")==0 ||
strcmp(opType,"AddReductionVD")==0 ||
strcmp(opType,"MulReductionVI")==0 ||
strcmp(opType,"MulReductionVL")==0 ||
strcmp(opType,"MulReductionVF")==0 ||
+ strcmp(opType,"MulReductionVHF")==0 ||
strcmp(opType,"MulReductionVD")==0 ||
strcmp(opType,"MinReductionV")==0 ||
strcmp(opType,"MaxReductionV")==0 ||
@@ -4348,9 +4350,9 @@ bool MatchRule::is_vector() const {
"MaxV", "MinV", "MinVHF", "MaxVHF", "UMinV", "UMaxV",
"CompressV", "ExpandV", "CompressM", "CompressBitsV", "ExpandBitsV",
"AddReductionVI", "AddReductionVL",
- "AddReductionVF", "AddReductionVD",
+ "AddReductionVHF", "AddReductionVF", "AddReductionVD",
"MulReductionVI", "MulReductionVL",
- "MulReductionVF", "MulReductionVD",
+ "MulReductionVHF", "MulReductionVF", "MulReductionVD",
"MaxReductionV", "MinReductionV",
"AndReductionV", "OrReductionV", "XorReductionV",
"MulAddVS2VI", "MacroLogicV",
diff --git a/src/hotspot/share/asm/codeBuffer.cpp b/src/hotspot/share/asm/codeBuffer.cpp
index 6a288e0dad0..854cf73049b 100644
--- a/src/hotspot/share/asm/codeBuffer.cpp
+++ b/src/hotspot/share/asm/codeBuffer.cpp
@@ -858,6 +858,13 @@ csize_t CodeBuffer::figure_expanded_capacities(CodeSection* which_cs,
}
void CodeBuffer::expand(CodeSection* which_cs, csize_t amount) {
+#ifdef ASSERT
+ // The code below copies contents across temp buffers. The following
+ // sizes relate to buffer contents, and should not be changed by buffer
+ // expansion.
+ int old_total_skipped = total_skipped_instructions_size();
+#endif
+
#ifndef PRODUCT
if (PrintNMethods && (WizardMode || Verbose)) {
tty->print("expanding CodeBuffer:");
@@ -916,6 +923,7 @@ void CodeBuffer::expand(CodeSection* which_cs, csize_t amount) {
assert(cb_sect->capacity() >= new_capacity[n], "big enough");
address cb_start = cb_sect->start();
cb_sect->set_end(cb_start + this_sect->size());
+ cb_sect->register_skipped(this_sect->_skipped_instructions_size);
if (this_sect->mark() == nullptr) {
cb_sect->clear_mark();
} else {
@@ -952,6 +960,9 @@ void CodeBuffer::expand(CodeSection* which_cs, csize_t amount) {
this->print_on(tty);
}
#endif //PRODUCT
+
+ assert(old_total_skipped == total_skipped_instructions_size(),
+ "Should match: %d == %d", old_total_skipped, total_skipped_instructions_size());
}
void CodeBuffer::adjust_internal_address(address from, address to) {
diff --git a/src/hotspot/share/cds/aotGrowableArray.hpp b/src/hotspot/share/cds/aotGrowableArray.hpp
deleted file mode 100644
index 0a0c137ed07..00000000000
--- a/src/hotspot/share/cds/aotGrowableArray.hpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
- * 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_AOT_AOTGROWABLEARRAY_HPP
-#define SHARE_AOT_AOTGROWABLEARRAY_HPP
-
-#include
-#include
-
-class AOTGrowableArrayHelper {
-public:
- static void deallocate(void* mem);
-};
-
-// An AOTGrowableArray provides the same functionality as a GrowableArray that
-// uses the C heap allocator. In addition, AOTGrowableArray can be iterated with
-// MetaspaceClosure. This type should be used for growable arrays that need to be
-// stored in the AOT cache. See ModuleEntry::_reads for an example.
-template
-class AOTGrowableArray : public GrowableArrayWithAllocator> {
- friend class VMStructs;
- friend class GrowableArrayWithAllocator;
-
- static E* allocate(int max, MemTag mem_tag) {
- return (E*)GrowableArrayCHeapAllocator::allocate(max, sizeof(E), mem_tag);
- }
-
- E* allocate() {
- return allocate(this->_capacity, mtClass);
- }
-
- void deallocate(E* mem) {
-#if INCLUDE_CDS
- AOTGrowableArrayHelper::deallocate(mem);
-#else
- GrowableArrayCHeapAllocator::deallocate(mem);
-#endif
- }
-
-public:
- AOTGrowableArray(int initial_capacity, MemTag mem_tag) :
- GrowableArrayWithAllocator(
- allocate(initial_capacity, mem_tag),
- initial_capacity) {}
-
- AOTGrowableArray() : AOTGrowableArray(0, mtClassShared) {}
-
- // methods required by MetaspaceClosure
- void metaspace_pointers_do(MetaspaceClosure* it);
- int size_in_heapwords() const { return (int)heap_word_size(sizeof(*this)); }
- MetaspaceClosureType type() const { return MetaspaceClosureType::GrowableArrayType; }
- static bool is_read_only_by_default() { return false; }
-};
-
-#endif // SHARE_AOT_AOTGROWABLEARRAY_HPP
diff --git a/src/hotspot/share/cds/cppVtables.cpp b/src/hotspot/share/cds/cppVtables.cpp
index dc5a777d7b1..57da12dee48 100644
--- a/src/hotspot/share/cds/cppVtables.cpp
+++ b/src/hotspot/share/cds/cppVtables.cpp
@@ -22,7 +22,6 @@
*
*/
-#include "cds/aotGrowableArray.hpp"
#include "cds/aotMetaspace.hpp"
#include "cds/archiveBuilder.hpp"
#include "cds/archiveUtils.hpp"
@@ -41,6 +40,7 @@
#include "oops/typeArrayKlass.hpp"
#include "runtime/arguments.hpp"
#include "utilities/globalDefinitions.hpp"
+#include "utilities/growableArray.hpp"
// Objects of the Metadata types (such as Klass and ConstantPool) have C++ vtables.
// (In GCC this is the field ::_vptr, i.e., first word in the object.)
@@ -58,10 +58,10 @@
#ifndef PRODUCT
-// AOTGrowableArray has a vtable only when in non-product builds (due to
+// GrowableArray has a vtable only when in non-product builds (due to
// the virtual printing functions in AnyObj).
-using GrowableArray_ModuleEntry_ptr = AOTGrowableArray;
+using GrowableArray_ModuleEntry_ptr = GrowableArray;
#define DEBUG_CPP_VTABLE_TYPES_DO(f) \
f(GrowableArray_ModuleEntry_ptr) \
diff --git a/src/hotspot/share/cds/lambdaProxyClassDictionary.hpp b/src/hotspot/share/cds/lambdaProxyClassDictionary.hpp
index dfb75532917..b20e998bba6 100644
--- a/src/hotspot/share/cds/lambdaProxyClassDictionary.hpp
+++ b/src/hotspot/share/cds/lambdaProxyClassDictionary.hpp
@@ -22,8 +22,8 @@
*
*/
-#ifndef SHARE_CDS_LAMBDAPROXYCLASSINFO_HPP
-#define SHARE_CDS_LAMBDAPROXYCLASSINFO_HPP
+#ifndef SHARE_CDS_LAMBDAPROXYCLASSDICTIONARY_HPP
+#define SHARE_CDS_LAMBDAPROXYCLASSDICTIONARY_HPP
#include "cds/aotCompressedPointers.hpp"
#include "cds/aotMetaspace.hpp"
@@ -331,4 +331,4 @@ public:
static void print_statistics(outputStream* st, bool is_static_archive);
};
-#endif // SHARE_CDS_LAMBDAPROXYCLASSINFO_HPP
+#endif // SHARE_CDS_LAMBDAPROXYCLASSDICTIONARY_HPP
diff --git a/src/hotspot/share/ci/ciMethodData.cpp b/src/hotspot/share/ci/ciMethodData.cpp
index 533e8659968..5e623e2b965 100644
--- a/src/hotspot/share/ci/ciMethodData.cpp
+++ b/src/hotspot/share/ci/ciMethodData.cpp
@@ -537,8 +537,8 @@ void ciMethodData::clear_escape_info() {
if (mdo != nullptr) {
mdo->clear_escape_info();
ArgInfoData *aid = arg_info();
- int arg_count = (aid == nullptr) ? 0 : aid->number_of_args();
- for (int i = 0; i < arg_count; i++) {
+ int arg_size = (aid == nullptr) ? 0 : aid->size_of_args();
+ for (int i = 0; i < arg_size; i++) {
set_arg_modified(i, 0);
}
}
@@ -554,8 +554,8 @@ void ciMethodData::update_escape_info() {
mdo->set_arg_local(_arg_local);
mdo->set_arg_stack(_arg_stack);
mdo->set_arg_returned(_arg_returned);
- int arg_count = mdo->method()->size_of_parameters();
- for (int i = 0; i < arg_count; i++) {
+ int arg_size = mdo->method()->size_of_parameters();
+ for (int i = 0; i < arg_size; i++) {
mdo->set_arg_modified(i, arg_modified(i));
}
}
@@ -652,7 +652,7 @@ void ciMethodData::set_arg_modified(int arg, uint val) {
ArgInfoData *aid = arg_info();
if (aid == nullptr)
return;
- assert(arg >= 0 && arg < aid->number_of_args(), "valid argument number");
+ assert(arg >= 0 && arg < aid->size_of_args(), "valid argument number");
aid->set_arg_modified(arg, val);
}
@@ -672,7 +672,7 @@ uint ciMethodData::arg_modified(int arg) const {
ArgInfoData *aid = arg_info();
if (aid == nullptr)
return 0;
- assert(arg >= 0 && arg < aid->number_of_args(), "valid argument number");
+ assert(arg >= 0 && arg < aid->size_of_args(), "valid argument number");
return aid->arg_modified(arg);
}
diff --git a/src/hotspot/share/classfile/compactHashtable.hpp b/src/hotspot/share/classfile/compactHashtable.hpp
index 81f2951289d..1711c5f8cd3 100644
--- a/src/hotspot/share/classfile/compactHashtable.hpp
+++ b/src/hotspot/share/classfile/compactHashtable.hpp
@@ -307,14 +307,9 @@ public:
template
inline void iterate(ITER* iter) const { iterate([&](V v) { iter->do_value(v); }); }
- template
- inline void iterate(const Function& function) const { // lambda enabled API
- iterate(const_cast(function));
- }
-
// Iterate through the values in the table, stopping when the lambda returns false.
template
- inline void iterate(Function& function) const { // lambda enabled API
+ inline void iterate(Function function) const { // lambda enabled API
for (u4 i = 0; i < _bucket_count; i++) {
u4 bucket_info = _buckets[i];
u4 bucket_offset = BUCKET_OFFSET(bucket_info);
diff --git a/src/hotspot/share/classfile/moduleEntry.cpp b/src/hotspot/share/classfile/moduleEntry.cpp
index b5b8aa4ef55..c7fadeaea9b 100644
--- a/src/hotspot/share/classfile/moduleEntry.cpp
+++ b/src/hotspot/share/classfile/moduleEntry.cpp
@@ -23,7 +23,6 @@
*/
#include "cds/aotClassLocation.hpp"
-#include "cds/aotGrowableArray.inline.hpp"
#include "cds/archiveBuilder.hpp"
#include "cds/archiveUtils.hpp"
#include "cds/cdsConfig.hpp"
@@ -168,7 +167,7 @@ void ModuleEntry::add_read(ModuleEntry* m) {
} else {
if (reads() == nullptr) {
// Lazily create a module's reads list
- AOTGrowableArray* new_reads = new (mtModule) AOTGrowableArray(MODULE_READS_SIZE, mtModule);
+ GrowableArray* new_reads = new (mtModule) GrowableArray(MODULE_READS_SIZE, mtModule);
set_reads(new_reads);
}
diff --git a/src/hotspot/share/classfile/moduleEntry.hpp b/src/hotspot/share/classfile/moduleEntry.hpp
index 1a0251a2c2a..10dec73e9fa 100644
--- a/src/hotspot/share/classfile/moduleEntry.hpp
+++ b/src/hotspot/share/classfile/moduleEntry.hpp
@@ -25,7 +25,6 @@
#ifndef SHARE_CLASSFILE_MODULEENTRY_HPP
#define SHARE_CLASSFILE_MODULEENTRY_HPP
-#include "cds/aotGrowableArray.hpp"
#include "jni.h"
#include "memory/metaspaceClosureType.hpp"
#include "oops/oopHandle.hpp"
@@ -70,7 +69,7 @@ private:
// for shared classes from this module
Symbol* _name; // name of this module
ClassLoaderData* _loader_data;
- AOTGrowableArray* _reads; // list of modules that are readable by this module
+ GrowableArray* _reads; // list of modules that are readable by this module
Symbol* _version; // module version number
Symbol* _location; // module location
@@ -118,10 +117,10 @@ public:
bool can_read(ModuleEntry* m) const;
bool has_reads_list() const;
- AOTGrowableArray* reads() const {
+ GrowableArray* reads() const {
return _reads;
}
- void set_reads(AOTGrowableArray* r) {
+ void set_reads(GrowableArray* r) {
_reads = r;
}
void pack_reads() {
diff --git a/src/hotspot/share/classfile/packageEntry.cpp b/src/hotspot/share/classfile/packageEntry.cpp
index 3e61f2e3a3e..3eb50fcb5a7 100644
--- a/src/hotspot/share/classfile/packageEntry.cpp
+++ b/src/hotspot/share/classfile/packageEntry.cpp
@@ -22,7 +22,6 @@
*
*/
-#include "cds/aotGrowableArray.inline.hpp"
#include "cds/aotMetaspace.hpp"
#include "cds/archiveBuilder.hpp"
#include "cds/archiveUtils.hpp"
@@ -83,7 +82,7 @@ void PackageEntry::add_qexport(ModuleEntry* m) {
if (!has_qual_exports_list()) {
// Lazily create a package's qualified exports list.
// Initial size is small, do not anticipate export lists to be large.
- _qualified_exports = new (mtModule) AOTGrowableArray(QUAL_EXP_SIZE, mtModule);
+ _qualified_exports = new (mtModule) GrowableArray(QUAL_EXP_SIZE, mtModule);
}
// Determine, based on this newly established export to module m,
diff --git a/src/hotspot/share/classfile/packageEntry.hpp b/src/hotspot/share/classfile/packageEntry.hpp
index 7b174a92287..e064e53b263 100644
--- a/src/hotspot/share/classfile/packageEntry.hpp
+++ b/src/hotspot/share/classfile/packageEntry.hpp
@@ -25,7 +25,6 @@
#ifndef SHARE_CLASSFILE_PACKAGEENTRY_HPP
#define SHARE_CLASSFILE_PACKAGEENTRY_HPP
-#include "cds/aotGrowableArray.hpp"
#include "classfile/moduleEntry.hpp"
#include "memory/metaspaceClosureType.hpp"
#include "oops/symbol.hpp"
@@ -116,7 +115,7 @@ private:
bool _must_walk_exports;
// Contains list of modules this package is qualifiedly exported to. Access
// to this list is protected by the Module_lock.
- AOTGrowableArray* _qualified_exports;
+ GrowableArray* _qualified_exports;
JFR_ONLY(DEFINE_TRACE_ID_FIELD;)
// Initial size of a package entry's list of qualified exports.
diff --git a/src/hotspot/share/classfile/vmIntrinsics.hpp b/src/hotspot/share/classfile/vmIntrinsics.hpp
index e84acd62284..3f85fd16b61 100644
--- a/src/hotspot/share/classfile/vmIntrinsics.hpp
+++ b/src/hotspot/share/classfile/vmIntrinsics.hpp
@@ -469,6 +469,9 @@ class methodHandle;
do_intrinsic(_Reference_clear0, java_lang_ref_Reference, clear0_name, void_method_signature, F_RN) \
do_intrinsic(_PhantomReference_clear0, java_lang_ref_PhantomReference, clear0_name, void_method_signature, F_RN) \
\
+ do_intrinsic(_Reference_reachabilityFence, java_lang_ref_Reference, reachabilityFence_name, object_void_signature, F_S) \
+ do_name(reachabilityFence_name, "reachabilityFence") \
+ \
/* support for com.sun.crypto.provider.AES_Crypt and some of its callers */ \
do_class(com_sun_crypto_provider_aescrypt, "com/sun/crypto/provider/AES_Crypt") \
do_intrinsic(_aescrypt_encryptBlock, com_sun_crypto_provider_aescrypt, encryptBlock_name, byteArray_int_byteArray_int_signature, F_R) \
diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
index 2ae42bebcfd..33d00b93365 100644
--- a/src/hotspot/share/classfile/vmSymbols.hpp
+++ b/src/hotspot/share/classfile/vmSymbols.hpp
@@ -702,6 +702,7 @@ class SerializeClosure;
template(appendToClassPathForInstrumentation_name, "appendToClassPathForInstrumentation") \
do_alias(appendToClassPathForInstrumentation_signature, string_void_signature) \
template(serializePropertiesToByteArray_name, "serializePropertiesToByteArray") \
+ template(serializeSecurityPropertiesToByteArray_name, "serializeSecurityPropertiesToByteArray") \
template(serializeAgentPropertiesToByteArray_name, "serializeAgentPropertiesToByteArray") \
template(encodeThrowable_name, "encodeThrowable") \
template(encodeThrowable_signature, "(Ljava/lang/Throwable;JI)I") \
diff --git a/src/hotspot/share/code/aotCodeCache.cpp b/src/hotspot/share/code/aotCodeCache.cpp
index 6594d94fa91..d4f12936e96 100644
--- a/src/hotspot/share/code/aotCodeCache.cpp
+++ b/src/hotspot/share/code/aotCodeCache.cpp
@@ -1093,11 +1093,13 @@ bool AOTCodeCache::store_code_blob(CodeBlob& blob, AOTCodeEntry::Kind entry_kind
// now we have added all the other data we can write details of any
// extra the AOT relocations
- bool write_ok;
+ bool write_ok = true;
if (AOTCodeEntry::is_multi_stub_blob(entry_kind)) {
- CodeSection* cs = code_buffer->code_section(CodeBuffer::SECT_INSTS);
- RelocIterator iter(cs);
- write_ok = cache->write_relocations(blob, iter);
+ if (reloc_count > 0) {
+ CodeSection* cs = code_buffer->code_section(CodeBuffer::SECT_INSTS);
+ RelocIterator iter(cs);
+ write_ok = cache->write_relocations(blob, iter);
+ }
} else {
RelocIterator iter(&blob);
write_ok = cache->write_relocations(blob, iter);
@@ -1403,13 +1405,15 @@ void AOTCodeReader::restore(CodeBlob* code_blob) {
// reinstate the AOT-load time relocs we saved from the code
// buffer that generated this blob in a new code buffer and use
// the latter to iterate over them
- CodeBuffer code_buffer(code_blob);
- relocInfo* locs = (relocInfo*)_reloc_data;
- code_buffer.insts()->initialize_shared_locs(locs, _reloc_count);
- code_buffer.insts()->set_locs_end(locs + _reloc_count);
- CodeSection *cs = code_buffer.code_section(CodeBuffer::SECT_INSTS);
- RelocIterator reloc_iter(cs);
- fix_relocations(code_blob, reloc_iter);
+ if (_reloc_count > 0) {
+ CodeBuffer code_buffer(code_blob);
+ relocInfo* locs = (relocInfo*)_reloc_data;
+ code_buffer.insts()->initialize_shared_locs(locs, _reloc_count);
+ code_buffer.insts()->set_locs_end(locs + _reloc_count);
+ CodeSection *cs = code_buffer.code_section(CodeBuffer::SECT_INSTS);
+ RelocIterator reloc_iter(cs);
+ fix_relocations(code_blob, reloc_iter);
+ }
} else {
// the AOT-load time relocs will be in the blob's restored relocs
RelocIterator reloc_iter(code_blob);
@@ -1858,11 +1862,8 @@ void AOTCodeReader::read_dbg_strings(DbgStrings& dbg_strings) {
// addresses, respectively, keyed by the relevant address
void AOTCodeAddressTable::hash_address(address addr, int idx) {
- // only do this if we are caching stubs and we have a non-null
- // address to record
- if (!AOTStubCaching) {
- return;
- }
+ // only do this if we have a non-null address to record and the
+ // cache is open for dumping
if (addr == nullptr) {
return;
}
@@ -2183,7 +2184,7 @@ void AOTCodeAddressTable::set_stubgen_stubs_complete() {
#ifdef PRODUCT
#define MAX_STR_COUNT 200
#else
-#define MAX_STR_COUNT 500
+#define MAX_STR_COUNT 2000
#endif
#define _c_str_max MAX_STR_COUNT
static const int _c_str_base = _all_max;
@@ -2200,6 +2201,10 @@ void AOTCodeCache::load_strings() {
if (strings_count == 0) {
return;
}
+ if (strings_count > MAX_STR_COUNT) {
+ fatal("Invalid strings_count loaded from AOT Code Cache: %d > MAX_STR_COUNT [%d]", strings_count, MAX_STR_COUNT);
+ return;
+ }
uint strings_offset = _load_header->strings_offset();
uint* string_lengths = (uint*)addr(strings_offset);
strings_offset += (strings_count * sizeof(uint));
@@ -2210,7 +2215,6 @@ void AOTCodeCache::load_strings() {
char* p = NEW_C_HEAP_ARRAY(char, strings_size+1, mtCode);
memcpy(p, addr(strings_offset), strings_size);
_C_strings_buf = p;
- assert(strings_count <= MAX_STR_COUNT, "sanity");
for (uint i = 0; i < strings_count; i++) {
_C_strings[i] = p;
uint len = string_lengths[i];
@@ -2292,7 +2296,7 @@ const char* AOTCodeAddressTable::add_C_string(const char* str) {
int AOTCodeAddressTable::id_for_C_string(address str) {
if (str == nullptr) {
- return -1;
+ return BAD_ADDRESS_ID;
}
MutexLocker ml(AOTCodeCStrings_lock, Mutex::_no_safepoint_check_flag);
for (int i = 0; i < _C_strings_count; i++) {
@@ -2310,7 +2314,7 @@ int AOTCodeAddressTable::id_for_C_string(address str) {
return id;
}
}
- return -1;
+ return BAD_ADDRESS_ID;
}
address AOTCodeAddressTable::address_for_C_string(int idx) {
@@ -2377,13 +2381,13 @@ int AOTCodeAddressTable::id_for_address(address addr, RelocIterator reloc, CodeB
}
// Seach for C string
id = id_for_C_string(addr);
- if (id >= 0) {
+ if (id != BAD_ADDRESS_ID) {
return id + _c_str_base;
}
if (StubRoutines::contains(addr) || CodeCache::find_blob(addr) != nullptr) {
// Search for a matching stub entry
id = search_address(addr, _stubs_addr, _stubs_max);
- if (id < 0) {
+ if (id == BAD_ADDRESS_ID) {
StubCodeDesc* desc = StubCodeDesc::desc_for(addr);
if (desc == nullptr) {
desc = StubCodeDesc::desc_for(addr + frame::pc_return_offset);
@@ -2396,7 +2400,7 @@ int AOTCodeAddressTable::id_for_address(address addr, RelocIterator reloc, CodeB
} else {
// Search in runtime functions
id = search_address(addr, _extrs_addr, _extrs_length);
- if (id < 0) {
+ if (id == BAD_ADDRESS_ID) {
ResourceMark rm;
const int buflen = 1024;
char* func_name = NEW_RESOURCE_ARRAY(char, buflen);
@@ -2511,10 +2515,11 @@ AOTStubData::AOTStubData(BlobId blob_id) :
// cannot be accessed before initialising the universe
if (blob_id == BlobId::stubgen_preuniverse_id) {
// invalidate any attempt to use this
- _flags |= INVALID;
+ _flags = INVALID;
return;
}
if (AOTCodeCache::is_on()) {
+ _flags = OPEN;
// allow update of stub entry addresses
if (AOTCodeCache::is_using_stub()) {
// allow stub loading
diff --git a/src/hotspot/share/code/aotCodeCache.hpp b/src/hotspot/share/code/aotCodeCache.hpp
index c4ebe271767..5b773a986f1 100644
--- a/src/hotspot/share/code/aotCodeCache.hpp
+++ b/src/hotspot/share/code/aotCodeCache.hpp
@@ -236,9 +236,10 @@ private:
// whether we are loading or storing stubs or have encountered any
// invalid stubs.
enum Flags {
- USING = 1 << 0, // open and loading stubs
- DUMPING = 1 << 1, // open and storing stubs
- INVALID = 1 << 2, // found invalid stub when loading
+ OPEN = 1 << 0, // cache is open
+ USING = 1 << 1, // open and loading stubs
+ DUMPING = 1 << 2, // open and storing stubs
+ INVALID = 1 << 3, // found invalid stub when loading
};
uint32_t _flags;
@@ -253,6 +254,7 @@ public:
~AOTStubData() CDS_ONLY({FREE_C_HEAP_ARRAY(StubAddrRange, _ranges);}) NOT_CDS({})
+ bool is_open() CDS_ONLY({ return (_flags & OPEN) != 0; }) NOT_CDS_RETURN_(false);
bool is_using() CDS_ONLY({ return (_flags & USING) != 0; }) NOT_CDS_RETURN_(false);
bool is_dumping() CDS_ONLY({ return (_flags & DUMPING) != 0; }) NOT_CDS_RETURN_(false);
bool is_invalid() CDS_ONLY({ return (_flags & INVALID) != 0; }) NOT_CDS_RETURN_(false);
diff --git a/src/hotspot/share/code/codeBlob.hpp b/src/hotspot/share/code/codeBlob.hpp
index 1c6904e7446..709623de308 100644
--- a/src/hotspot/share/code/codeBlob.hpp
+++ b/src/hotspot/share/code/codeBlob.hpp
@@ -226,7 +226,7 @@ public:
nmethod* as_nmethod() const { assert(is_nmethod(), "must be nmethod"); return (nmethod*) this; }
CodeBlob* as_codeblob() const { return (CodeBlob*) this; }
// we may want to force an actual buffer blob or subtype instance
- BufferBlob* as_buffer_blob(bool strict = true) const { assert(is_buffer_blob(), "must be %sbuffer blob", (strict ? "strict " : "")); return (BufferBlob*) this; }
+ BufferBlob* as_buffer_blob(bool strict = true) const { assert(is_buffer_blob(strict), "must be %sbuffer blob", (strict ? "strict " : "")); return (BufferBlob*) this; }
AdapterBlob* as_adapter_blob() const { assert(is_adapter_blob(), "must be adapter blob"); return (AdapterBlob*) this; }
ExceptionBlob* as_exception_blob() const { assert(is_exception_stub(), "must be exception stub"); return (ExceptionBlob*) this; }
// this will always return a subtype instance
@@ -604,7 +604,7 @@ class DeoptimizationBlob: public SingletonBlob {
);
public:
- static const int ENTRY_COUNT = 4 JVMTI_ONLY(+ 2);
+ static const int ENTRY_COUNT = 4 JVMCI_ONLY(+ 2);
// Creation
static DeoptimizationBlob* create(
CodeBuffer* cb,
diff --git a/src/hotspot/share/gc/g1/g1CardSetMemory.cpp b/src/hotspot/share/gc/g1/g1CardSetMemory.cpp
index 60602ef942b..0da2f90da3f 100644
--- a/src/hotspot/share/gc/g1/g1CardSetMemory.cpp
+++ b/src/hotspot/share/gc/g1/g1CardSetMemory.cpp
@@ -90,7 +90,7 @@ G1CardSetMemoryManager::~G1CardSetMemoryManager() {
for (uint i = 0; i < num_mem_object_types(); i++) {
_allocators[i].~G1CardSetAllocator();
}
- FREE_C_HEAP_ARRAY(G1CardSetAllocator, _allocators);
+ FREE_C_HEAP_ARRAY(G1CardSetAllocator, _allocators);
}
void G1CardSetMemoryManager::free(uint type, void* value) {
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index fe286793ae7..2709e6b3008 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -3219,7 +3219,7 @@ void G1CollectedHeap::retire_gc_alloc_region(G1HeapRegion* alloc_region,
G1HeapRegionPrinter::retire(alloc_region);
}
-void G1CollectedHeap::mark_evac_failure_object(uint worker_id, const oop obj, size_t obj_size) const {
+void G1CollectedHeap::mark_evac_failure_object(const oop obj) const {
assert(!_cm->is_marked_in_bitmap(obj), "must be");
_cm->raw_mark_in_bitmap(obj);
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
index b5cb9167d92..3a47453819e 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -1275,7 +1275,7 @@ public:
inline bool is_obj_dead_full(const oop obj) const;
// Mark the live object that failed evacuation in the bitmap.
- void mark_evac_failure_object(uint worker_id, oop obj, size_t obj_size) const;
+ void mark_evac_failure_object(oop obj) const;
G1ConcurrentMark* concurrent_mark() const { return _cm; }
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
index a72d5fc5cf9..dbb5ba509a2 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
@@ -2173,8 +2173,7 @@ void G1CMTask::reset_for_restart() {
void G1CMTask::register_partial_array_splitter() {
::new (&_partial_array_splitter) PartialArraySplitter(_cm->partial_array_state_manager(),
- _cm->max_num_tasks(),
- ObjArrayMarkingStride);
+ _cm->max_num_tasks());
}
void G1CMTask::unregister_partial_array_splitter() {
@@ -2359,7 +2358,7 @@ size_t G1CMTask::start_partial_array_processing(objArrayOop obj) {
process_klass(obj->klass());
size_t array_length = obj->length();
- size_t initial_chunk_size = _partial_array_splitter.start(_task_queue, obj, nullptr, array_length);
+ size_t initial_chunk_size = _partial_array_splitter.start(_task_queue, obj, nullptr, array_length, ObjArrayMarkingStride);
process_array_chunk(obj, 0, initial_chunk_size);
@@ -2917,7 +2916,7 @@ G1CMTask::G1CMTask(uint worker_id,
_cm(cm),
_mark_bitmap(nullptr),
_task_queue(task_queue),
- _partial_array_splitter(_cm->partial_array_state_manager(), _cm->max_num_tasks(), ObjArrayMarkingStride),
+ _partial_array_splitter(_cm->partial_array_state_manager(), _cm->max_num_tasks()),
_mark_stats_cache(mark_stats, G1RegionMarkStatsCache::RegionMarkStatsCacheSize),
_calls(0),
_time_target_ms(0.0),
diff --git a/src/hotspot/share/gc/g1/g1FullGCMarker.cpp b/src/hotspot/share/gc/g1/g1FullGCMarker.cpp
index 2b0b78ac1ce..3be4ab8d839 100644
--- a/src/hotspot/share/gc/g1/g1FullGCMarker.cpp
+++ b/src/hotspot/share/gc/g1/g1FullGCMarker.cpp
@@ -39,7 +39,7 @@ G1FullGCMarker::G1FullGCMarker(G1FullCollector* collector,
_worker_id(worker_id),
_bitmap(collector->mark_bitmap()),
_task_queue(),
- _partial_array_splitter(collector->partial_array_state_manager(), collector->workers(), ObjArrayMarkingStride),
+ _partial_array_splitter(collector->partial_array_state_manager(), collector->workers()),
_mark_closure(worker_id, this, ClassLoaderData::_claim_stw_fullgc_mark, G1CollectedHeap::heap()->ref_processor_stw()),
_stack_closure(this),
_cld_closure(mark_closure(), ClassLoaderData::_claim_stw_fullgc_mark),
@@ -60,14 +60,26 @@ void G1FullGCMarker::process_partial_array(PartialArrayState* state, bool stolen
process_array_chunk(obj_array, claim._start, claim._end);
}
+static uintx calc_array_stride(uint array_len, uint num_threads) {
+ precond(num_threads > 0);
+
+ const size_t stride = (array_len + num_threads - 1) / num_threads;
+ return clamp(stride, ArrayMarkingMinStride, ObjArrayMarkingStride);
+}
+
void G1FullGCMarker::start_partial_array_processing(objArrayOop obj) {
mark_closure()->do_klass(obj->klass());
// Don't push empty arrays to avoid unnecessary work.
- size_t array_length = obj->length();
- if (array_length > 0) {
- size_t initial_chunk_size = _partial_array_splitter.start(task_queue(), obj, nullptr, array_length);
- process_array_chunk(obj, 0, initial_chunk_size);
+ const int array_length = obj->length();
+
+ if (array_length == 0) {
+ return;
}
+
+ const uintx stride = calc_array_stride(array_length, _collector->workers());
+ const size_t initial_chunk_size = _partial_array_splitter.start(task_queue(), obj, nullptr, array_length, stride);
+
+ process_array_chunk(obj, 0, initial_chunk_size);
}
void G1FullGCMarker::complete_marking(G1ScannerTasksQueueSet* task_queues,
diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
index cb857dc6eab..52c8d4d4389 100644
--- a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
+++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
@@ -78,7 +78,7 @@ G1ParScanThreadState::G1ParScanThreadState(G1CollectedHeap* g1h,
_surviving_young_words(nullptr),
_surviving_words_length(collection_set->young_region_length() + 1),
_old_gen_is_full(false),
- _partial_array_splitter(g1h->partial_array_state_manager(), num_workers, ParGCArrayScanChunk),
+ _partial_array_splitter(g1h->partial_array_state_manager(), num_workers),
_string_dedup_requests(),
_max_num_optional_regions(collection_set->num_optional_regions()),
_numa(g1h->numa()),
@@ -253,7 +253,7 @@ void G1ParScanThreadState::start_partial_objarray(oop from_obj,
size_t array_length = to_array->length();
size_t initial_chunk_size =
// The source array is unused when processing states.
- _partial_array_splitter.start(_task_queue, nullptr, to_array, array_length);
+ _partial_array_splitter.start(_task_queue, nullptr, to_array, array_length, ParGCArrayScanChunk);
assert(_scanner.skip_card_mark_set(), "must be");
// Process the initial chunk. No need to process the type in the
@@ -650,7 +650,7 @@ oop G1ParScanThreadState::handle_evacuation_failure_par(oop old, markWord m, Kla
// Mark the failing object in the marking bitmap and later use the bitmap to handle
// evacuation failure recovery.
- _g1h->mark_evac_failure_object(_worker_id, old, word_sz);
+ _g1h->mark_evac_failure_object(old);
_evacuation_failed_info.register_copy_failure(word_sz);
diff --git a/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.cpp b/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.cpp
index b56e82fac3c..df6adeb8041 100644
--- a/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.cpp
+++ b/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.cpp
@@ -70,7 +70,7 @@ JVMFlag::Error G1RemSetHowlMaxNumBucketsConstraintFunc(uint value, bool verbose)
}
if (!is_power_of_2(G1RemSetHowlMaxNumBuckets)) {
JVMFlag::printError(verbose,
- "G1RemSetMaxHowlNumBuckets (%u) must be a power of two.\n",
+ "G1RemSetHowlMaxNumBuckets (%u) must be a power of two.\n",
value);
return JVMFlag::VIOLATES_CONSTRAINT;
}
diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.cpp b/src/hotspot/share/gc/parallel/psCompactionManager.cpp
index 0108f1a9762..048355bfad3 100644
--- a/src/hotspot/share/gc/parallel/psCompactionManager.cpp
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -58,7 +58,7 @@ PreservedMarksSet* ParCompactionManager::_preserved_marks_set = nullptr;
ParCompactionManager::ParCompactionManager(PreservedMarks* preserved_marks,
ReferenceProcessor* ref_processor,
uint parallel_gc_threads)
- :_partial_array_splitter(_partial_array_state_manager, parallel_gc_threads, ObjArrayMarkingStride),
+ :_partial_array_splitter(_partial_array_state_manager, parallel_gc_threads),
_mark_and_push_closure(this, ref_processor) {
ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
@@ -126,7 +126,7 @@ void ParCompactionManager::push_objArray(oop obj) {
objArrayOop obj_array = objArrayOop(obj);
size_t array_length = obj_array->length();
size_t initial_chunk_size =
- _partial_array_splitter.start(&_marking_stack, obj_array, nullptr, array_length);
+ _partial_array_splitter.start(&_marking_stack, obj_array, nullptr, array_length, ObjArrayMarkingStride);
follow_array(obj_array, 0, initial_chunk_size);
}
diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.cpp b/src/hotspot/share/gc/parallel/psPromotionManager.cpp
index 39fcc5556c6..ac22430aa4c 100644
--- a/src/hotspot/share/gc/parallel/psPromotionManager.cpp
+++ b/src/hotspot/share/gc/parallel/psPromotionManager.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,7 +158,7 @@ PartialArrayTaskStats* PSPromotionManager::partial_array_task_stats() {
// Most members are initialized either by initialize() or reset().
PSPromotionManager::PSPromotionManager()
- : _partial_array_splitter(_partial_array_state_manager, ParallelGCThreads, ParGCArrayScanChunk)
+ : _partial_array_splitter(_partial_array_state_manager, ParallelGCThreads)
{
// We set the old lab's start array.
_old_lab.set_start_array(old_gen()->start_array());
@@ -273,7 +273,7 @@ void PSPromotionManager::push_objArray(oop old_obj, oop new_obj) {
size_t array_length = to_array->length();
size_t initial_chunk_size =
// The source array is unused when processing states.
- _partial_array_splitter.start(&_claimed_stack_depth, nullptr, to_array, array_length);
+ _partial_array_splitter.start(&_claimed_stack_depth, nullptr, to_array, array_length, ParGCArrayScanChunk);
process_array_chunk(to_array, 0, initial_chunk_size);
}
diff --git a/src/hotspot/share/gc/shared/gc_globals.hpp b/src/hotspot/share/gc/shared/gc_globals.hpp
index 66ca10f1fb6..c9102944197 100644
--- a/src/hotspot/share/gc/shared/gc_globals.hpp
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,6 +256,12 @@
"before pushing a continuation entry") \
range(1, INT_MAX/2) \
\
+ product(uintx, ArrayMarkingMinStride, 64, DIAGNOSTIC, \
+ "Minimum chunk size for split array processing during marking; " \
+ "the effective stride is clamped between this value " \
+ "and ObjArrayMarkingStride.") \
+ constraint(ArrayMarkingMinStrideConstraintFunc,AfterErgo) \
+ \
product(bool, AggressiveHeap, false, \
"(Deprecated) Optimize heap options for long-running memory " \
"intensive apps") \
diff --git a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp
index ea3d644d105..4d7ffce3a5d 100644
--- a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp
+++ b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,3 +414,15 @@ JVMFlag::Error GCCardSizeInBytesConstraintFunc(uint value, bool verbose) {
return JVMFlag::SUCCESS;
}
}
+
+JVMFlag::Error ArrayMarkingMinStrideConstraintFunc(uintx value, bool verbose) {
+ if (value > ObjArrayMarkingStride) {
+ JVMFlag::printError(verbose,
+ "ArrayMarkingMinStride (%zu) must be "
+ "less than or equal to ObjArrayMarkingStride (%zu)\n",
+ value, ObjArrayMarkingStride);
+ return JVMFlag::VIOLATES_CONSTRAINT;
+ } else {
+ return JVMFlag::SUCCESS;
+ }
+}
diff --git a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp
index a89f42959e1..1d2f45397aa 100644
--- a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp
+++ b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -66,7 +66,8 @@
f(uintx, SurvivorRatioConstraintFunc) \
f(size_t, MetaspaceSizeConstraintFunc) \
f(size_t, MaxMetaspaceSizeConstraintFunc) \
- f(uint, GCCardSizeInBytesConstraintFunc)
+ f(uint, GCCardSizeInBytesConstraintFunc) \
+ f(uintx, ArrayMarkingMinStrideConstraintFunc)
SHARED_GC_CONSTRAINTS(DECLARE_CONSTRAINT)
diff --git a/src/hotspot/share/gc/shared/partialArraySplitter.cpp b/src/hotspot/share/gc/shared/partialArraySplitter.cpp
index d1833872683..04884d5e666 100644
--- a/src/hotspot/share/gc/shared/partialArraySplitter.cpp
+++ b/src/hotspot/share/gc/shared/partialArraySplitter.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,10 +28,9 @@
#include "utilities/macros.hpp"
PartialArraySplitter::PartialArraySplitter(PartialArrayStateManager* manager,
- uint num_workers,
- size_t chunk_size)
+ uint num_workers)
: _allocator(manager),
- _stepper(num_workers, chunk_size)
+ _stepper(num_workers)
TASKQUEUE_STATS_ONLY(COMMA _stats())
{}
diff --git a/src/hotspot/share/gc/shared/partialArraySplitter.hpp b/src/hotspot/share/gc/shared/partialArraySplitter.hpp
index 87cc137e797..340f370d1d5 100644
--- a/src/hotspot/share/gc/shared/partialArraySplitter.hpp
+++ b/src/hotspot/share/gc/shared/partialArraySplitter.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,7 @@ class PartialArraySplitter {
public:
PartialArraySplitter(PartialArrayStateManager* manager,
- uint num_workers,
- size_t chunk_size);
+ uint num_workers);
~PartialArraySplitter() = default;
NONCOPYABLE(PartialArraySplitter);
@@ -60,6 +59,8 @@ public:
//
// length is their length in elements.
//
+ // chunk_size the size of a single chunk.
+ //
// If t is a ScannerTask, queue->push(t) must be a valid expression. The
// result of that expression is ignored.
//
@@ -76,7 +77,8 @@ public:
size_t start(Queue* queue,
objArrayOop from_array,
objArrayOop to_array,
- size_t length);
+ size_t length,
+ size_t chunk_size);
// Result type for claim(), carrying multiple values. Provides the claimed
// chunk's start and end array indices.
diff --git a/src/hotspot/share/gc/shared/partialArraySplitter.inline.hpp b/src/hotspot/share/gc/shared/partialArraySplitter.inline.hpp
index abb0cf13101..7679358e218 100644
--- a/src/hotspot/share/gc/shared/partialArraySplitter.inline.hpp
+++ b/src/hotspot/share/gc/shared/partialArraySplitter.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,16 @@ template
size_t PartialArraySplitter::start(Queue* queue,
objArrayOop source,
objArrayOop destination,
- size_t length) {
- PartialArrayTaskStepper::Step step = _stepper.start(length);
+ size_t length,
+ size_t chunk_size) {
+ precond(chunk_size > 0);
+ PartialArrayTaskStepper::Step step = _stepper.start(length, chunk_size);
// Push initial partial scan tasks.
if (step._ncreate > 0) {
TASKQUEUE_STATS_ONLY(_stats.inc_split(););
TASKQUEUE_STATS_ONLY(_stats.inc_pushed(step._ncreate);)
PartialArrayState* state =
- _allocator.allocate(source, destination, step._index, length, step._ncreate);
+ _allocator.allocate(source, destination, step._index, length, chunk_size, step._ncreate);
for (uint i = 0; i < step._ncreate; ++i) {
queue->push(ScannerTask(state));
}
@@ -75,9 +77,10 @@ PartialArraySplitter::claim(PartialArrayState* state, Queue* queue, bool stolen)
queue->push(ScannerTask(state));
}
}
+ size_t chunk_size = state->chunk_size();
// Release state, decrementing refcount, now that we're done with it.
_allocator.release(state);
- return Claim{step._index, step._index + _stepper.chunk_size()};
+ return Claim{step._index, step._index + chunk_size};
}
#endif // SHARE_GC_SHARED_PARTIALARRAYSPLITTER_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/partialArrayState.cpp b/src/hotspot/share/gc/shared/partialArrayState.cpp
index aadbc46b7c1..d3b21c2fdaa 100644
--- a/src/hotspot/share/gc/shared/partialArrayState.cpp
+++ b/src/hotspot/share/gc/shared/partialArrayState.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,10 +35,12 @@
PartialArrayState::PartialArrayState(oop src, oop dst,
size_t index, size_t length,
+ size_t chunk_size,
size_t initial_refcount)
: _source(src),
_destination(dst),
_length(length),
+ _chunk_size(chunk_size),
_index(index),
_refcount(initial_refcount)
{
@@ -77,6 +79,7 @@ PartialArrayStateAllocator::~PartialArrayStateAllocator() {
PartialArrayState* PartialArrayStateAllocator::allocate(oop src, oop dst,
size_t index,
size_t length,
+ size_t chunk_size,
size_t initial_refcount) {
void* p;
FreeListEntry* head = _free_list;
@@ -87,7 +90,7 @@ PartialArrayState* PartialArrayStateAllocator::allocate(oop src, oop dst,
head->~FreeListEntry();
p = head;
}
- return ::new (p) PartialArrayState(src, dst, index, length, initial_refcount);
+ return ::new (p) PartialArrayState(src, dst, index, length, chunk_size, initial_refcount);
}
void PartialArrayStateAllocator::release(PartialArrayState* state) {
diff --git a/src/hotspot/share/gc/shared/partialArrayState.hpp b/src/hotspot/share/gc/shared/partialArrayState.hpp
index 3dafeb0f14c..75e297526ae 100644
--- a/src/hotspot/share/gc/shared/partialArrayState.hpp
+++ b/src/hotspot/share/gc/shared/partialArrayState.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,7 @@ class PartialArrayState {
oop _source;
oop _destination;
size_t _length;
+ size_t _chunk_size;
Atomic _index;
Atomic _refcount;
@@ -68,7 +69,7 @@ class PartialArrayState {
PartialArrayState(oop src, oop dst,
size_t index, size_t length,
- size_t initial_refcount);
+ size_t chunk_size, size_t initial_refcount);
public:
// Deleted to require management by allocator object.
@@ -89,6 +90,8 @@ public:
// The length of the array oop.
size_t length() const { return _length; }
+ size_t chunk_size() const { return _chunk_size; }
+
// A pointer to the start index for the next segment to process, for atomic
// update.
Atomic* index_addr() { return &_index; }
@@ -130,6 +133,7 @@ public:
// from the associated manager.
PartialArrayState* allocate(oop src, oop dst,
size_t index, size_t length,
+ size_t chunk_size,
size_t initial_refcount);
// Decrement the state's refcount. If the new refcount is zero, add the
diff --git a/src/hotspot/share/gc/shared/partialArrayTaskStepper.cpp b/src/hotspot/share/gc/shared/partialArrayTaskStepper.cpp
index d91ba347d6c..f7d53c9348a 100644
--- a/src/hotspot/share/gc/shared/partialArrayTaskStepper.cpp
+++ b/src/hotspot/share/gc/shared/partialArrayTaskStepper.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,7 @@ static uint compute_task_fanout(uint task_limit) {
return result;
}
-PartialArrayTaskStepper::PartialArrayTaskStepper(uint n_workers, size_t chunk_size) :
- _chunk_size(chunk_size),
+PartialArrayTaskStepper::PartialArrayTaskStepper(uint n_workers) :
_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 11499ca2ffe..594cc7b245a 100644
--- a/src/hotspot/share/gc/shared/partialArrayTaskStepper.hpp
+++ b/src/hotspot/share/gc/shared/partialArrayTaskStepper.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,19 +40,19 @@ class PartialArrayState;
// substantially expand the task queues.
class PartialArrayTaskStepper {
public:
- PartialArrayTaskStepper(uint n_workers, size_t chunk_size);
+ PartialArrayTaskStepper(uint n_workers);
struct Step {
size_t _index; // Array index for the step.
uint _ncreate; // Number of new tasks to create.
};
- // 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.
+ // Called with the length of the array to be processed and chunk size.
+ // 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;
+ inline Step start(size_t length, size_t chunk_size) 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
@@ -60,21 +60,16 @@ public:
// to enqueue.
inline Step next(PartialArrayState* state) 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;
// For unit tests.
- inline Step next_impl(size_t length, Atomic* index_addr) const;
+ inline Step next_impl(size_t length, size_t chunk_size, Atomic* 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 6946f7c69ff..538815698f2 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, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,13 +31,9 @@
#include "utilities/checkedCast.hpp"
#include "utilities/debug.hpp"
-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.
+PartialArrayTaskStepper::start(size_t length, size_t chunk_size) 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().
@@ -45,24 +41,24 @@ PartialArrayTaskStepper::start(size_t length) const {
}
PartialArrayTaskStepper::Step
-PartialArrayTaskStepper::next_impl(size_t length, Atomic* index_addr) const {
+PartialArrayTaskStepper::next_impl(size_t length, size_t chunk_size, Atomic* 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.
- size_t start = index_addr->fetch_then_add(_chunk_size, memory_order_relaxed);
+ size_t start = index_addr->fetch_then_add(chunk_size, memory_order_relaxed);
assert(start < length, "invariant: start %zu, length %zu", start, length);
- assert(((length - start) % _chunk_size) == 0,
+ assert(((length - start) % chunk_size) == 0,
"invariant: start %zu, length %zu, chunk size %zu",
- start, length, _chunk_size);
+ 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 = checked_cast(start / _chunk_size);
+ uint task_num = checked_cast(start / chunk_size);
// Number of tasks left to process, including this one.
- uint remaining_tasks = checked_cast((length - start) / _chunk_size);
+ uint remaining_tasks = checked_cast((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).
@@ -89,7 +85,7 @@ PartialArrayTaskStepper::next_impl(size_t length, Atomic* index_addr) co
PartialArrayTaskStepper::Step
PartialArrayTaskStepper::next(PartialArrayState* state) const {
- return next_impl(state->length(), state->index_addr());
+ return next_impl(state->length(), state->chunk_size(), state->index_addr());
}
#endif // SHARE_GC_SHARED_PARTIALARRAYTASKSTEPPER_INLINE_HPP
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp
index 6b327d7e4af..c595d1fd9cd 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp
@@ -209,14 +209,14 @@ void ShenandoahAdaptiveHeuristics::choose_collection_set_from_regiondata(Shenand
}
}
-void ShenandoahAdaptiveHeuristics::add_degenerated_gc_time(double timestamp, double gc_time) {
+void ShenandoahAdaptiveHeuristics::add_degenerated_gc_time(double time_at_start, double gc_time) {
// Conservatively add sample into linear model If this time is above the predicted concurrent gc time
- if (predict_gc_time(timestamp) < gc_time) {
- add_gc_time(timestamp, gc_time);
+ if (predict_gc_time(time_at_start) < gc_time) {
+ add_gc_time(time_at_start, gc_time);
}
}
-void ShenandoahAdaptiveHeuristics::add_gc_time(double timestamp, double gc_time) {
+void ShenandoahAdaptiveHeuristics::add_gc_time(double time_at_start, double gc_time) {
// Update best-fit linear predictor of GC time
uint index = (_gc_time_first_sample_index + _gc_time_num_samples) % GC_TIME_SAMPLE_SIZE;
if (_gc_time_num_samples == GC_TIME_SAMPLE_SIZE) {
@@ -225,10 +225,10 @@ void ShenandoahAdaptiveHeuristics::add_gc_time(double timestamp, double gc_time)
_gc_time_sum_of_xy -= _gc_time_xy[index];
_gc_time_sum_of_xx -= _gc_time_xx[index];
}
- _gc_time_timestamps[index] = timestamp;
+ _gc_time_timestamps[index] = time_at_start;
_gc_time_samples[index] = gc_time;
- _gc_time_xy[index] = timestamp * gc_time;
- _gc_time_xx[index] = timestamp * timestamp;
+ _gc_time_xy[index] = time_at_start * gc_time;
+ _gc_time_xx[index] = time_at_start * time_at_start;
_gc_time_sum_of_timestamps += _gc_time_timestamps[index];
_gc_time_sum_of_samples += _gc_time_samples[index];
@@ -247,18 +247,26 @@ void ShenandoahAdaptiveHeuristics::add_gc_time(double timestamp, double gc_time)
_gc_time_b = gc_time;
_gc_time_sd = 0.0;
} else if (_gc_time_num_samples == 2) {
- // Two points define a line
- double delta_y = gc_time - _gc_time_samples[_gc_time_first_sample_index];
- double delta_x = timestamp - _gc_time_timestamps[_gc_time_first_sample_index];
- _gc_time_m = delta_y / delta_x;
+ assert(time_at_start > _gc_time_timestamps[_gc_time_first_sample_index],
+ "Two GC cycles cannot finish at same time: %.6f vs %.6f, with GC times %.6f and %.6f", time_at_start,
+ _gc_time_timestamps[_gc_time_first_sample_index], gc_time, _gc_time_samples[_gc_time_first_sample_index]);
+
+ // Two points define a line
+ double delta_x = time_at_start - _gc_time_timestamps[_gc_time_first_sample_index];
+ double delta_y = gc_time - _gc_time_samples[_gc_time_first_sample_index];
+ _gc_time_m = delta_y / delta_x;
// y = mx + b
// so b = y0 - mx0
- _gc_time_b = gc_time - _gc_time_m * timestamp;
+ _gc_time_b = gc_time - _gc_time_m * time_at_start;
_gc_time_sd = 0.0;
} else {
+ // Since timestamps are monotonically increasing, denominator does not equal zero.
+ double denominator = _gc_time_num_samples * _gc_time_sum_of_xx - _gc_time_sum_of_timestamps * _gc_time_sum_of_timestamps;
+ assert(denominator != 0.0, "Invariant: samples: %u, sum_of_xx: %.6f, sum_of_timestamps: %.6f",
+ _gc_time_num_samples, _gc_time_sum_of_xx, _gc_time_sum_of_timestamps);
_gc_time_m = ((_gc_time_num_samples * _gc_time_sum_of_xy - _gc_time_sum_of_timestamps * _gc_time_sum_of_samples) /
- (_gc_time_num_samples * _gc_time_sum_of_xx - _gc_time_sum_of_timestamps * _gc_time_sum_of_timestamps));
+ denominator);
_gc_time_b = (_gc_time_sum_of_samples - _gc_time_m * _gc_time_sum_of_timestamps) / _gc_time_num_samples;
double sum_of_squared_deviations = 0.0;
for (size_t i = 0; i < _gc_time_num_samples; i++) {
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.cpp
index 45ba2740ea5..594367e2972 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.cpp
@@ -38,11 +38,6 @@
using idx_t = ShenandoahSimpleBitMap::idx_t;
-typedef struct {
- ShenandoahHeapRegion* _region;
- size_t _live_data;
-} AgedRegionData;
-
static int compare_by_aged_live(AgedRegionData a, AgedRegionData b) {
if (a._live_data < b._live_data)
return -1;
@@ -74,15 +69,27 @@ ShenandoahGenerationalHeuristics::ShenandoahGenerationalHeuristics(ShenandoahGen
: ShenandoahAdaptiveHeuristics(generation), _generation(generation), _add_regions_to_old(0) {
}
-void ShenandoahGenerationalHeuristics::choose_collection_set(ShenandoahCollectionSet* collection_set) {
+void ShenandoahGenerationalHeuristics::choose_collection_set_from_regiondata(ShenandoahCollectionSet* collection_set,
+ RegionData* data, size_t data_size,
+ size_t free) {
ShenandoahGenerationalHeap* heap = ShenandoahGenerationalHeap::heap();
- assert(collection_set->is_empty(), "Collection set must be empty here");
-
_add_regions_to_old = 0;
- // Choose the collection set
- filter_regions(collection_set);
+ // Find the amount that will be promoted, regions that will be promoted in
+ // place, and preselected older regions that will be promoted by evacuation.
+ ShenandoahInPlacePromotionPlanner in_place_promotions(heap);
+ compute_evacuation_budgets(in_place_promotions, heap);
+
+ // Call the subclasses to add regions into the collection set.
+ select_collection_set_regions(collection_set, data, data_size, free);
+
+ // Even if collection_set->is_empty(), we want to adjust budgets, making reserves available to mutator.
+ adjust_evacuation_budgets(heap, collection_set);
+
+ if (collection_set->has_old_regions()) {
+ heap->shenandoah_policy()->record_mixed_cycle();
+ }
if (_generation->is_global()) {
// We have just chosen a collection set for a global cycle. The mark bitmap covering old regions is complete, so
@@ -96,6 +103,14 @@ void ShenandoahGenerationalHeuristics::choose_collection_set(ShenandoahCollectio
// after a global cycle for old regions that were not included in this collection set.
heap->old_generation()->transition_old_generation_after_global_gc();
}
+
+ ShenandoahTracer::report_promotion_info(collection_set,
+ in_place_promotions.humongous_region_stats().count,
+ in_place_promotions.humongous_region_stats().garbage,
+ in_place_promotions.humongous_region_stats().free,
+ in_place_promotions.regular_region_stats().count,
+ in_place_promotions.regular_region_stats().garbage,
+ in_place_promotions.regular_region_stats().free);
}
void ShenandoahGenerationalHeuristics::compute_evacuation_budgets(ShenandoahInPlacePromotionPlanner& in_place_promotions,
@@ -221,112 +236,48 @@ void ShenandoahGenerationalHeuristics::compute_evacuation_budgets(ShenandoahInPl
// case of a GLOBAL gc. During choose_collection_set() of GLOBAL, old will be expanded on demand.
}
-void ShenandoahGenerationalHeuristics::filter_regions(ShenandoahCollectionSet* collection_set) {
- auto heap = ShenandoahGenerationalHeap::heap();
- const size_t region_size_bytes = ShenandoahHeapRegion::region_size_bytes();
+void ShenandoahGenerationalHeuristics::add_tenured_regions_to_collection_set(const size_t old_promotion_reserve,
+ ShenandoahGenerationalHeap *const heap,
+ size_t candidates, AgedRegionData* sorted_regions) {
+ size_t old_consumed = 0;
+ if (candidates > 0) {
+ // Sort in increasing order according to live data bytes. Note that
+ // candidates represents the number of regions that qualify to be promoted
+ // by evacuation.
+ QuickSort::sort(sorted_regions, candidates,
+ compare_by_aged_live);
- // Check all pinned regions have updated status before choosing the collection set.
- heap->assert_pinned_region_status(_generation);
-
- // Step 1. Build up the region candidates we care about, rejecting losers and accepting winners right away.
-
- const size_t num_regions = heap->num_regions();
-
- RegionData* candidates = _region_data;
-
- size_t cand_idx = 0;
-
- size_t total_garbage = 0;
-
- size_t immediate_garbage = 0;
- size_t immediate_regions = 0;
-
- size_t free = 0;
- size_t free_regions = 0;
-
- for (size_t i = 0; i < num_regions; i++) {
- ShenandoahHeapRegion* region = heap->get_region(i);
- if (!_generation->contains(region)) {
- continue;
- }
- const size_t garbage = region->garbage();
- total_garbage += garbage;
- if (region->is_empty()) {
- free_regions++;
- free += region_size_bytes;
- } else if (region->is_regular()) {
- if (!region->has_live()) {
- // We can recycle it right away and put it in the free set.
- immediate_regions++;
- immediate_garbage += garbage;
- region->make_trash_immediate();
- } else {
- // This is our candidate for later consideration. Note that this region
- // could still be promoted in place and may not necessarily end up in the
- // collection set.
- assert(region->get_top_before_promote() == nullptr, "Cannot add region %zu scheduled for in-place-promotion to the collection set", i);
- candidates[cand_idx].set_region_and_garbage(region, garbage);
- cand_idx++;
+ size_t selected_regions = 0;
+ size_t selected_live = 0;
+ for (size_t i = 0; i < candidates; i++) {
+ ShenandoahHeapRegion *const region = sorted_regions[i]._region;
+ const size_t region_live_data = sorted_regions[i]._live_data;
+ const size_t promotion_need = (size_t)(region_live_data * ShenandoahPromoEvacWaste);
+ if (old_consumed + promotion_need > old_promotion_reserve) {
+ // We rejected the remaining promotable regions from the collection set
+ // because we have no room to hold their evacuees. We do not need to
+ // iterate the remaining regions to estimate the amount we expect to
+ // promote because we know it directly form the census we computed
+ // during the preceding mark phase.
+ break;
}
- } else if (region->is_humongous_start()) {
- // Reclaim humongous regions here, and count them as the immediate garbage
- DEBUG_ONLY(assert_humongous_mark_consistency(region));
- if (!region->has_live()) {
- heap->trash_humongous_region_at(region);
- // Count only the start. Continuations would be counted on "trash" path
- immediate_regions++;
- immediate_garbage += garbage;
- }
- } else if (region->is_trash()) {
- // Count in just trashed humongous continuation regions
- immediate_regions++;
- immediate_garbage += garbage;
+ old_consumed += promotion_need;
+ heap->collection_set()->add_region(region);
+ selected_regions++;
+ selected_live += region_live_data;
}
+ log_debug(gc, ergo)( "Preselected %zu regions containing " PROPERFMT " live data,"
+ " consuming: " PROPERFMT " of budgeted: " PROPERFMT,
+ selected_regions, PROPERFMTARGS(selected_live),
+ PROPERFMTARGS(old_consumed), PROPERFMTARGS(old_promotion_reserve));
}
-
- // Step 2. Look back at garbage statistics, and decide if we want to collect anything,
- // given the amount of immediately reclaimable garbage. If we do, figure out the collection set.
- assert(immediate_garbage <= total_garbage,
- "Cannot have more immediate garbage than total garbage: " PROPERFMT " vs " PROPERFMT,
- PROPERFMTARGS(immediate_garbage), PROPERFMTARGS(total_garbage));
-
- const size_t immediate_percent = (total_garbage == 0) ? 0 : (immediate_garbage * 100 / total_garbage);
- ShenandoahInPlacePromotionPlanner in_place_promotions(heap);
- if (immediate_percent <= ShenandoahImmediateThreshold) {
-
- // Find the amount that will be promoted, regions that will be promoted in
- // place, and preselected older regions that will be promoted by evacuation.
- compute_evacuation_budgets(in_place_promotions, heap);
-
- // Call the subclasses to add young-gen regions into the collection set.
- choose_collection_set_from_regiondata(collection_set, candidates, cand_idx, immediate_garbage + free);
-
- // Even if collection_set->is_empty(), we want to adjust budgets, making reserves available to mutator.
- adjust_evacuation_budgets(heap, collection_set);
-
- if (collection_set->has_old_regions()) {
- heap->shenandoah_policy()->record_mixed_cycle();
- }
- }
-
- collection_set->summarize(total_garbage, immediate_garbage, immediate_regions);
- ShenandoahTracer::report_evacuation_info(collection_set,
- free_regions,
- in_place_promotions.humongous_region_stats().count,
- in_place_promotions.regular_region_stats().count,
- in_place_promotions.regular_region_stats().garbage,
- in_place_promotions.regular_region_stats().free,
- immediate_regions,
- immediate_garbage);
}
-// Select for inclusion into the collection set all regions whose age is at or above tenure age and for which the
-// garbage percentage exceeds a dynamically adjusted threshold (known as the old-garbage threshold percentage). We
-// identify these regions by setting the appropriate entry of the collection set's preselected regions array to true.
-// All entries are initialized to false before calling this function.
+// Select for inclusion into the collection set all regions whose age is at or
+// above tenure age and for which the
+// garbage percentage exceeds a dynamically adjusted threshold (known as the old-garbage threshold percentage).
//
-// During the subsequent selection of the collection set, we give priority to these promotion set candidates.
// Without this prioritization, we found that the aged regions tend to be ignored because they typically have
// much less garbage and much more live data than the recently allocated "eden" regions. When aged regions are
// repeatedly excluded from the collection set, the amount of live memory within the young generation tends to
@@ -334,8 +285,8 @@ void ShenandoahGenerationalHeuristics::filter_regions(ShenandoahCollectionSet* c
// CPU and wall-clock time.
//
// A second benefit of treating aged regions differently than other regions during collection set selection is
-// that this allows us to more accurately budget memory to hold the results of evacuation. Memory for evacuation
-// of aged regions must be reserved in the old generation. Memory for evacuation of all other regions must be
+// that this allows us to more accurately budget memory to hold the results of evacuation. Memory for evacuation
+// of aged regions must be reserved in the old generation. Memory for evacuation of all other regions must be
// reserved in the young generation.
size_t ShenandoahGenerationalHeuristics::select_aged_regions(ShenandoahInPlacePromotionPlanner& in_place_promotions,
const size_t old_promotion_reserve) {
@@ -345,7 +296,6 @@ size_t ShenandoahGenerationalHeuristics::select_aged_regions(ShenandoahInPlacePr
auto const heap = ShenandoahGenerationalHeap::heap();
- size_t promo_potential = 0;
size_t candidates = 0;
// Sort the promotion-eligible regions in order of increasing live-data-bytes so that we can first reclaim regions that require
@@ -386,66 +336,28 @@ size_t ShenandoahGenerationalHeuristics::select_aged_regions(ShenandoahInPlacePr
sorted_regions[candidates]._live_data = r->get_live_data_bytes();
candidates++;
}
- } else {
- // We only evacuate & promote objects from regular regions whose garbage() is above old-garbage-threshold.
- // Objects in tenure-worthy regions with less garbage are promoted in place. These take a different path to
- // old-gen. Regions excluded from promotion because their garbage content is too low (causing us to anticipate that
- // the region would be promoted in place) may be eligible for evacuation promotion by the time promotion takes
- // place during a subsequent GC pass because more garbage is found within the region between now and then. This
- // should not happen if we are properly adapting the tenure age. The theory behind adaptive tenuring threshold
- // is to choose the youngest age that demonstrates no "significant" further loss of population since the previous
- // age. If not this, we expect the tenure age to demonstrate linear population decay for at least two population
- // samples, whereas we expect to observe exponential population decay for ages younger than the tenure age.
- //
- // In the case that certain regions which were anticipated to be promoted in place need to be promoted by
- // evacuation, it may be the case that there is not sufficient reserve within old-gen to hold evacuation of
- // these regions. The likely outcome is that these regions will not be selected for evacuation or promotion
- // in the current cycle and we will anticipate that they will be promoted in the next cycle. This will cause
- // us to reserve more old-gen memory so that these objects can be promoted in the subsequent cycle.
- if (heap->is_aging_cycle() && heap->age_census()->is_tenurable(r->age() + 1)) {
- if (r->garbage() >= in_place_promotions.old_garbage_threshold()) {
- promo_potential += r->get_live_data_bytes();
- }
- }
}
- // Note that we keep going even if one region is excluded from selection.
- // Subsequent regions may be selected if they have smaller live data.
}
in_place_promotions.complete_planning();
- // Sort in increasing order according to live data bytes. Note that candidates represents the number of regions
- // that qualify to be promoted by evacuation.
- size_t old_consumed = 0;
- if (candidates > 0) {
- size_t selected_regions = 0;
- size_t selected_live = 0;
- QuickSort::sort(sorted_regions, candidates, compare_by_aged_live);
- for (size_t i = 0; i < candidates; i++) {
- ShenandoahHeapRegion* const region = sorted_regions[i]._region;
- const size_t region_live_data = sorted_regions[i]._live_data;
- const size_t promotion_need = (size_t) (region_live_data * ShenandoahPromoEvacWaste);
- if (old_consumed + promotion_need <= old_promotion_reserve) {
- old_consumed += promotion_need;
- heap->collection_set()->add_region(region);
- selected_regions++;
- selected_live += region_live_data;
- } else {
- // We rejected this promotable region from the collection set because we had no room to hold its copy.
- // Add this region to promo potential for next GC.
- promo_potential += region_live_data;
- assert(!heap->collection_set()->is_in(region), "Region %zu shouldn't be in the collection set", region->index());
- }
- // We keep going even if one region is excluded from selection because we need to accumulate all eligible
- // regions that are not preselected into promo_potential
- }
- log_debug(gc, ergo)("Preselected %zu regions containing " PROPERFMT " live data,"
- " consuming: " PROPERFMT " of budgeted: " PROPERFMT,
- selected_regions, PROPERFMTARGS(selected_live), PROPERFMTARGS(old_consumed), PROPERFMTARGS(old_promotion_reserve));
- }
+ add_tenured_regions_to_collection_set(old_promotion_reserve, heap, candidates, sorted_regions);
- log_info(gc, ergo)("Promotion potential of aged regions with sufficient garbage: " PROPERFMT, PROPERFMTARGS(promo_potential));
+ const uint tenuring_threshold = heap->age_census()->tenuring_threshold();
+ const size_t tenurable_this_cycle = heap->age_census()->get_tenurable_bytes(tenuring_threshold);
+ const size_t tenurable_next_cycle = heap->age_census()->get_tenurable_bytes(tenuring_threshold - 1);
+ assert(tenurable_next_cycle >= tenurable_this_cycle,
+ "Tenurable next cycle (" PROPERFMT ") should include tenurable this cycle (" PROPERFMT ")",
+ PROPERFMTARGS(tenurable_next_cycle), PROPERFMTARGS(tenurable_this_cycle));
+
+ const size_t max_promotions = tenurable_this_cycle * ShenandoahPromoEvacWaste;
+ const size_t old_consumed = MIN2(max_promotions, old_promotion_reserve);
+
+ // Don't include the bytes we expect to promote in this cycle in the next cycle
+ const size_t promo_potential = (tenurable_next_cycle - tenurable_this_cycle) * ShenandoahPromoEvacWaste;
heap->old_generation()->set_promotion_potential(promo_potential);
+ log_info(gc, ergo)("Promotion potential of aged regions with sufficient garbage: " PROPERFMT, PROPERFMTARGS(promo_potential));
+
return old_consumed;
}
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.hpp
index d6551cffb73..8ea5cdb36c8 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.hpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGenerationalHeuristics.hpp
@@ -34,6 +34,11 @@ class ShenandoahHeap;
class ShenandoahCollectionSet;
class RegionData;
+typedef struct {
+ ShenandoahHeapRegion* _region;
+ size_t _live_data;
+} AgedRegionData;
+
/*
* This class serves as the base class for heuristics used to trigger and
* choose the collection sets for young and global collections. It leans
@@ -48,9 +53,12 @@ class ShenandoahGenerationalHeuristics : public ShenandoahAdaptiveHeuristics {
public:
explicit ShenandoahGenerationalHeuristics(ShenandoahGeneration* generation);
- void choose_collection_set(ShenandoahCollectionSet* collection_set) override;
+ void post_initialize() override;
- virtual void post_initialize() override;
+ // Wraps budget computation, subclass region selection, budget adjustment, and tracing.
+ void choose_collection_set_from_regiondata(ShenandoahCollectionSet* set,
+ RegionData* data, size_t data_size,
+ size_t free) override;
private:
// Compute evacuation budgets prior to choosing collection set.
@@ -73,8 +81,11 @@ private:
// to false.
size_t select_aged_regions(ShenandoahInPlacePromotionPlanner& in_place_promotions, const size_t old_promotion_reserve);
- // Filter and sort remaining regions before adding to collection set.
- void filter_regions(ShenandoahCollectionSet* collection_set);
+ // Select regions for inclusion in the collection set that are tenured, but do
+ // not hold enough live data to warrant promotion in place.
+ void add_tenured_regions_to_collection_set(size_t old_promotion_reserve,
+ ShenandoahGenerationalHeap *const heap,
+ size_t candidates, AgedRegionData* sorted_regions);
// Adjust evacuation budgets after choosing collection set. On entry, the instance variable _regions_to_xfer
// represents regions to be transferred to old based on decisions made in top_off_collection_set()
@@ -82,6 +93,11 @@ private:
ShenandoahCollectionSet* const collection_set);
protected:
+ // Subclasses override this to perform generation-specific region selection.
+ virtual void select_collection_set_regions(ShenandoahCollectionSet* set,
+ RegionData* data, size_t data_size,
+ size_t free) = 0;
+
ShenandoahGeneration* _generation;
size_t _add_regions_to_old;
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGlobalHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGlobalHeuristics.cpp
index ed25cd2e1a9..9452e8b28cb 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGlobalHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGlobalHeuristics.cpp
@@ -112,9 +112,9 @@ ShenandoahGlobalHeuristics::ShenandoahGlobalHeuristics(ShenandoahGlobalGeneratio
: ShenandoahGenerationalHeuristics(generation) {
}
-void ShenandoahGlobalHeuristics::choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
- RegionData* data, size_t size,
- size_t actual_free) {
+void ShenandoahGlobalHeuristics::select_collection_set_regions(ShenandoahCollectionSet* cset,
+ RegionData* data, size_t size,
+ size_t actual_free) {
QuickSort::sort(data, size, compare_by_garbage);
choose_global_collection_set(cset, data, size, actual_free, 0);
}
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGlobalHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGlobalHeuristics.hpp
index 8102fa24d14..1e96a665704 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGlobalHeuristics.hpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahGlobalHeuristics.hpp
@@ -161,9 +161,9 @@ class ShenandoahGlobalHeuristics : public ShenandoahGenerationalHeuristics {
public:
ShenandoahGlobalHeuristics(ShenandoahGlobalGeneration* generation);
- void choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
- RegionData* data, size_t size,
- size_t actual_free) override;
+ void select_collection_set_regions(ShenandoahCollectionSet* cset,
+ RegionData* data, size_t size,
+ size_t actual_free) override;
private:
void choose_global_collection_set(ShenandoahCollectionSet* cset,
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.cpp
index 895088381ee..3091b19b600 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.cpp
@@ -29,6 +29,7 @@
#include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
#include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
#include "gc/shenandoah/shenandoahMarkingContext.inline.hpp"
+#include "gc/shenandoah/shenandoahTrace.hpp"
#include "logging/log.hpp"
#include "logging/logTag.hpp"
#include "runtime/globals_extension.hpp"
@@ -79,10 +80,6 @@ void ShenandoahHeuristics::choose_collection_set(ShenandoahCollectionSet* collec
ShenandoahHeap* heap = ShenandoahHeap::heap();
assert(collection_set->is_empty(), "Must be empty");
- assert(!heap->mode()->is_generational(), "Wrong heuristic for heap mode");
-
- // Check all pinned regions have updated status before choosing the collection set.
- heap->assert_pinned_region_status();
// Step 1. Build up the region candidates we care about, rejecting losers and accepting winners right away.
@@ -103,6 +100,10 @@ void ShenandoahHeuristics::choose_collection_set(ShenandoahCollectionSet* collec
for (size_t i = 0; i < num_regions; i++) {
ShenandoahHeapRegion* region = heap->get_region(i);
+ if (!_space_info->contains(region)) {
+ continue;
+ }
+
size_t garbage = region->garbage();
total_garbage += garbage;
@@ -117,6 +118,8 @@ void ShenandoahHeuristics::choose_collection_set(ShenandoahCollectionSet* collec
region->make_trash_immediate();
} else {
// This is our candidate for later consideration.
+ assert(region->get_top_before_promote() == nullptr,
+ "Cannot add region %zu scheduled for in-place-promotion to the collection set", i);
candidates[cand_idx].set_region_and_garbage(region, garbage);
cand_idx++;
}
@@ -149,6 +152,7 @@ void ShenandoahHeuristics::choose_collection_set(ShenandoahCollectionSet* collec
choose_collection_set_from_regiondata(collection_set, candidates, cand_idx, immediate_garbage + free);
}
collection_set->summarize(total_garbage, immediate_garbage, immediate_regions);
+ ShenandoahTracer::report_evacuation_info(collection_set, free_regions, immediate_regions, immediate_garbage);
}
void ShenandoahHeuristics::start_idle_span() {
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahSpaceInfo.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahSpaceInfo.hpp
index 6ed05abf0b1..765061a43ed 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahSpaceInfo.hpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahSpaceInfo.hpp
@@ -27,6 +27,8 @@
#include "utilities/globalDefinitions.hpp"
+class ShenandoahHeapRegion;
+
/*
* The purpose of this interface is to decouple the heuristics from a
* direct dependency on the ShenandoahHeap singleton instance. This is
@@ -46,6 +48,9 @@ public:
// in time within each GC cycle. For certain GC cycles, the value returned may include some bytes allocated before
// the start of the current GC cycle.
virtual size_t bytes_allocated_since_gc_start() const = 0;
+
+ // Return true if this region belongs to this space.
+ virtual bool contains(ShenandoahHeapRegion* region) const = 0;
};
#endif //SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHSPACEINFO_HPP
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahYoungHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahYoungHeuristics.cpp
index 68ffb6592db..27aa9a47510 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahYoungHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahYoungHeuristics.cpp
@@ -37,9 +37,9 @@ ShenandoahYoungHeuristics::ShenandoahYoungHeuristics(ShenandoahYoungGeneration*
}
-void ShenandoahYoungHeuristics::choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
- RegionData* data, size_t size,
- size_t actual_free) {
+void ShenandoahYoungHeuristics::select_collection_set_regions(ShenandoahCollectionSet* cset,
+ RegionData* data, size_t size,
+ size_t actual_free) {
// See comments in ShenandoahAdaptiveHeuristics::choose_collection_set_from_regiondata():
// we do the same here, but with the following adjustments for generational mode:
//
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahYoungHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahYoungHeuristics.hpp
index 806cef673d5..8fabc40693c 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahYoungHeuristics.hpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahYoungHeuristics.hpp
@@ -38,9 +38,9 @@ public:
explicit ShenandoahYoungHeuristics(ShenandoahYoungGeneration* generation);
- void choose_collection_set_from_regiondata(ShenandoahCollectionSet* cset,
- RegionData* data, size_t size,
- size_t actual_free) override;
+ void select_collection_set_regions(ShenandoahCollectionSet* cset,
+ RegionData* data, size_t size,
+ size_t actual_free) override;
bool should_start_gc() override;
diff --git a/src/hotspot/share/gc/shenandoah/mode/shenandoahMode.cpp b/src/hotspot/share/gc/shenandoah/mode/shenandoahMode.cpp
index 5ef21719ed4..1c2c15c40dc 100644
--- a/src/hotspot/share/gc/shenandoah/mode/shenandoahMode.cpp
+++ b/src/hotspot/share/gc/shenandoah/mode/shenandoahMode.cpp
@@ -26,7 +26,6 @@
#include "gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp"
#include "gc/shenandoah/heuristics/shenandoahAggressiveHeuristics.hpp"
#include "gc/shenandoah/heuristics/shenandoahCompactHeuristics.hpp"
-#include "gc/shenandoah/heuristics/shenandoahSpaceInfo.hpp"
#include "gc/shenandoah/heuristics/shenandoahStaticHeuristics.hpp"
#include "gc/shenandoah/mode/shenandoahMode.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/mode/shenandoahPassiveMode.cpp b/src/hotspot/share/gc/shenandoah/mode/shenandoahPassiveMode.cpp
index 41b2703730b..cc098bc5a21 100644
--- a/src/hotspot/share/gc/shenandoah/mode/shenandoahPassiveMode.cpp
+++ b/src/hotspot/share/gc/shenandoah/mode/shenandoahPassiveMode.cpp
@@ -50,7 +50,6 @@ void ShenandoahPassiveMode::initialize_flags() const {
SHENANDOAH_ERGO_DISABLE_FLAG(ShenandoahSATBBarrier);
SHENANDOAH_ERGO_DISABLE_FLAG(ShenandoahCASBarrier);
SHENANDOAH_ERGO_DISABLE_FLAG(ShenandoahCloneBarrier);
- SHENANDOAH_ERGO_DISABLE_FLAG(ShenandoahStackWatermarkBarrier);
SHENANDOAH_ERGO_DISABLE_FLAG(ShenandoahCardBarrier);
}
diff --git a/src/hotspot/share/gc/shenandoah/mode/shenandoahSATBMode.cpp b/src/hotspot/share/gc/shenandoah/mode/shenandoahSATBMode.cpp
index 7ac2d7b818f..e27aa90542d 100644
--- a/src/hotspot/share/gc/shenandoah/mode/shenandoahSATBMode.cpp
+++ b/src/hotspot/share/gc/shenandoah/mode/shenandoahSATBMode.cpp
@@ -42,6 +42,5 @@ void ShenandoahSATBMode::initialize_flags() const {
SHENANDOAH_CHECK_FLAG_SET(ShenandoahSATBBarrier);
SHENANDOAH_CHECK_FLAG_SET(ShenandoahCASBarrier);
SHENANDOAH_CHECK_FLAG_SET(ShenandoahCloneBarrier);
- SHENANDOAH_CHECK_FLAG_SET(ShenandoahStackWatermarkBarrier);
SHENANDOAH_CHECK_FLAG_UNSET(ShenandoahCardBarrier);
}
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahAgeCensus.cpp b/src/hotspot/share/gc/shenandoah/shenandoahAgeCensus.cpp
index 71fd6e37614..a81efa99d70 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahAgeCensus.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahAgeCensus.cpp
@@ -171,6 +171,15 @@ void ShenandoahAgeCensus::update_census(size_t age0_pop) {
NOT_PRODUCT(update_total();)
}
+size_t ShenandoahAgeCensus::get_tenurable_bytes(const uint tenuring_threshold) const {
+ assert(_epoch < MAX_SNAPSHOTS, "Out of bounds");
+ size_t total = 0;
+ const AgeTable* pv = _global_age_tables[_epoch];
+ for (uint i = tenuring_threshold; i < MAX_COHORTS; i++) {
+ total += pv->sizes[i];
+ }
+ return total * HeapWordSize;
+}
// Reset the epoch for the global age tables,
// clearing all history.
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahAgeCensus.hpp b/src/hotspot/share/gc/shenandoah/shenandoahAgeCensus.hpp
index 9c5baaedcd6..c140f445e21 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahAgeCensus.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahAgeCensus.hpp
@@ -216,6 +216,12 @@ class ShenandoahAgeCensus: public CHeapObj {
// allocated when the concurrent marking was in progress.
void update_census(size_t age0_pop);
+ // Return the total size of the population at or above the given threshold for the current epoch
+ size_t get_tenurable_bytes(uint tenuring_threshold) const;
+
+ // As above, but use the current tenuring threshold
+ size_t get_tenurable_bytes() const { return get_tenurable_bytes(tenuring_threshold()); }
+
// Reset the epoch, clearing accumulated census history
// Note: this isn't currently used, but reserved for planned
// future usage.
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp b/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp
index c1fa4b964b7..e9d6a686694 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp
@@ -200,6 +200,7 @@ void ShenandoahArguments::initialize() {
&& strcmp(ShenandoahGCHeuristics, "adaptive") != 0) {
log_warning(gc)("Ignoring -XX:ShenandoahGCHeuristics input: %s, because generational shenandoah only"
" supports adaptive heuristics", ShenandoahGCHeuristics);
+ FLAG_SET_ERGO(ShenandoahGCHeuristics, "adaptive");
}
FullGCForwarding::initialize_flags(MaxHeapSize);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
index cb6ff795c07..0949959b042 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
@@ -149,11 +149,9 @@ void ShenandoahBarrierSet::on_thread_attach(Thread *thread) {
BarrierSetNMethod* bs_nm = barrier_set_nmethod();
thread->set_nmethod_disarmed_guard_value(bs_nm->disarmed_guard_value());
- if (ShenandoahStackWatermarkBarrier) {
- JavaThread* const jt = JavaThread::cast(thread);
- StackWatermark* const watermark = new ShenandoahStackWatermark(jt);
- StackWatermarkSet::add_watermark(jt, watermark);
- }
+ JavaThread* const jt = JavaThread::cast(thread);
+ StackWatermark* const watermark = new ShenandoahStackWatermark(jt);
+ StackWatermarkSet::add_watermark(jt, watermark);
}
}
@@ -172,14 +170,12 @@ void ShenandoahBarrierSet::on_thread_detach(Thread *thread) {
}
// SATB protocol requires to keep alive reachable oops from roots at the beginning of GC
- if (ShenandoahStackWatermarkBarrier) {
- if (_heap->is_concurrent_mark_in_progress()) {
- ShenandoahKeepAliveClosure oops;
- StackWatermarkSet::finish_processing(JavaThread::cast(thread), &oops, StackWatermarkKind::gc);
- } else if (_heap->is_concurrent_weak_root_in_progress() && _heap->is_evacuation_in_progress()) {
- ShenandoahContextEvacuateUpdateRootsClosure oops;
- StackWatermarkSet::finish_processing(JavaThread::cast(thread), &oops, StackWatermarkKind::gc);
- }
+ if (_heap->is_concurrent_mark_in_progress()) {
+ ShenandoahKeepAliveClosure oops;
+ StackWatermarkSet::finish_processing(JavaThread::cast(thread), &oops, StackWatermarkKind::gc);
+ } else if (_heap->is_concurrent_weak_root_in_progress() && _heap->is_evacuation_in_progress()) {
+ ShenandoahContextEvacuateUpdateRootsClosure oops;
+ StackWatermarkSet::finish_processing(JavaThread::cast(thread), &oops, StackWatermarkKind::gc);
}
}
}
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahClosures.hpp b/src/hotspot/share/gc/shenandoah/shenandoahClosures.hpp
index fefed0340c4..9ab45380c61 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahClosures.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahClosures.hpp
@@ -180,9 +180,6 @@ public:
};
class ShenandoahNMethodAndDisarmClosure : public NMethodToOopClosure {
-private:
- BarrierSetNMethod* const _bs;
-
public:
inline ShenandoahNMethodAndDisarmClosure(OopClosure* cl);
inline void do_nmethod(nmethod* nm);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp
index e8d25b1e5a9..96ecbad1145 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp
@@ -209,15 +209,13 @@ void ShenandoahCleanUpdateWeakOopsClosure::do_oo
}
ShenandoahNMethodAndDisarmClosure::ShenandoahNMethodAndDisarmClosure(OopClosure* cl) :
- NMethodToOopClosure(cl, true /* fix_relocations */),
- _bs(BarrierSet::barrier_set()->barrier_set_nmethod()) {
-}
+ NMethodToOopClosure(cl, true /* fix_relocations */) {}
void ShenandoahNMethodAndDisarmClosure::do_nmethod(nmethod* nm) {
assert(nm != nullptr, "Sanity");
assert(!ShenandoahNMethod::gc_data(nm)->is_unregistered(), "Should not be here");
NMethodToOopClosure::do_nmethod(nm);
- _bs->disarm(nm);
+ ShenandoahNMethod::disarm_nmethod(nm);
}
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp
index 64e135e9a4e..7cf60cdf65c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp
@@ -40,20 +40,6 @@
ShenandoahNMethodTable* ShenandoahCodeRoots::_nmethod_table;
int ShenandoahCodeRoots::_disarmed_value = 1;
-bool ShenandoahCodeRoots::use_nmethod_barriers_for_mark() {
- // Continuations need nmethod barriers for scanning stack chunk nmethods.
- if (Continuations::enabled()) return true;
-
- // Concurrent class unloading needs nmethod barriers.
- // When a nmethod is about to be executed, we need to make sure that all its
- // metadata are marked. The alternative is to remark thread roots at final mark
- // pause, which would cause latency issues.
- if (ShenandoahHeap::heap()->unload_classes()) return true;
-
- // Otherwise, we can go without nmethod barriers.
- return false;
-}
-
void ShenandoahCodeRoots::initialize() {
_nmethod_table = new ShenandoahNMethodTable();
}
@@ -68,27 +54,14 @@ void ShenandoahCodeRoots::unregister_nmethod(nmethod* nm) {
_nmethod_table->unregister_nmethod(nm);
}
-void ShenandoahCodeRoots::arm_nmethods_for_mark() {
- if (use_nmethod_barriers_for_mark()) {
- BarrierSet::barrier_set()->barrier_set_nmethod()->arm_all_nmethods();
- }
-}
-
-void ShenandoahCodeRoots::arm_nmethods_for_evac() {
+void ShenandoahCodeRoots::arm_nmethods() {
BarrierSet::barrier_set()->barrier_set_nmethod()->arm_all_nmethods();
}
class ShenandoahDisarmNMethodClosure : public NMethodClosure {
-private:
- BarrierSetNMethod* const _bs;
-
public:
- ShenandoahDisarmNMethodClosure() :
- _bs(BarrierSet::barrier_set()->barrier_set_nmethod()) {
- }
-
virtual void do_nmethod(nmethod* nm) {
- _bs->disarm(nm);
+ ShenandoahNMethod::disarm_nmethod(nm);
}
};
@@ -111,10 +84,8 @@ public:
};
void ShenandoahCodeRoots::disarm_nmethods() {
- if (use_nmethod_barriers_for_mark()) {
- ShenandoahDisarmNMethodsTask task;
- ShenandoahHeap::heap()->workers()->run_task(&task);
- }
+ ShenandoahDisarmNMethodsTask task;
+ ShenandoahHeap::heap()->workers()->run_task(&task);
}
class ShenandoahNMethodUnlinkClosure : public NMethodClosure {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp
index d29c446f210..d395b4516f4 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp
@@ -67,14 +67,11 @@ public:
// Concurrent nmethod unloading support
static void unlink(WorkerThreads* workers, bool unloading_occurred);
static void purge();
- static void arm_nmethods_for_mark();
- static void arm_nmethods_for_evac();
+ static void arm_nmethods();
static void disarm_nmethods();
static int disarmed_value() { return _disarmed_value; }
static int* disarmed_value_address() { return &_disarmed_value; }
- static bool use_nmethod_barriers_for_mark();
-
private:
static ShenandoahNMethodTable* _nmethod_table;
static int _disarmed_value;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.cpp b/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.cpp
index bbd9dca1513..cfa79fc055e 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.cpp
@@ -257,10 +257,10 @@ void ShenandoahCollectorPolicy::print_gc_stats(outputStream* out) const {
out->print_cr("%5zu Full GCs (%.2f%%)", _success_full_gcs, percent_of(_success_full_gcs, completed_gcs));
if (!ExplicitGCInvokesConcurrent) {
- out->print_cr(" %5zu invoked explicitly (%.2f%%)", explicit_requests, percent_of(explicit_requests, _success_concurrent_gcs));
+ out->print_cr(" %5zu invoked explicitly (%.2f%%)", explicit_requests, percent_of(explicit_requests, _success_full_gcs));
}
if (!ShenandoahImplicitGCInvokesConcurrent) {
- out->print_cr(" %5zu invoked implicitly (%.2f%%)", implicit_requests, percent_of(implicit_requests, _success_concurrent_gcs));
+ out->print_cr(" %5zu invoked implicitly (%.2f%%)", implicit_requests, percent_of(implicit_requests, _success_full_gcs));
}
out->print_cr(" %5zu caused by allocation failure (%.2f%%)", _alloc_failure_full, percent_of(_alloc_failure_full, _success_full_gcs));
out->print_cr(" %5zu upgraded from Degenerated GC (%.2f%%)", _alloc_failure_degenerated_upgrade_to_full, percent_of(_alloc_failure_degenerated_upgrade_to_full, _success_full_gcs));
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
index f0125c38cae..6723bb89021 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
@@ -112,6 +112,24 @@ void ShenandoahConcurrentGC::entry_concurrent_update_refs_prepare(ShenandoahHeap
heap->concurrent_prepare_for_update_refs();
}
+void ShenandoahConcurrentGC::entry_update_card_table() {
+ ShenandoahHeap* const heap = ShenandoahHeap::heap();
+ TraceCollectorStats tcs(heap->monitoring_support()->concurrent_collection_counters());
+
+ static const char* msg = "Concurrent update cards";
+ ShenandoahConcurrentPhase gc_phase(msg, ShenandoahPhaseTimings::conc_update_card_table);
+ EventMark em("%s", msg);
+
+ ShenandoahWorkerScope scope(heap->workers(),
+ ShenandoahWorkerPolicy::calc_workers_for_conc_evac(),
+ "concurrent update cards");
+
+ // Heap needs to be parsable here.
+ // Also, parallel heap region iterate must have a phase set.
+ assert(ShenandoahTimingsTracker::is_current_phase_valid(), "Current phase must be set");
+ ShenandoahGenerationalHeap::heap()->old_generation()->update_card_table();
+}
+
bool ShenandoahConcurrentGC::collect(GCCause::Cause cause) {
ShenandoahHeap* const heap = ShenandoahHeap::heap();
_generation->ref_processor()->set_soft_reference_policy(
@@ -206,6 +224,11 @@ bool ShenandoahConcurrentGC::collect(GCCause::Cause cause) {
// Perform update-refs phase.
entry_concurrent_update_refs_prepare(heap);
+
+ if (ShenandoahHeap::heap()->mode()->is_generational()) {
+ entry_update_card_table();
+ }
+
if (ShenandoahVerify) {
vmop_entry_init_update_refs();
}
@@ -232,8 +255,10 @@ bool ShenandoahConcurrentGC::collect(GCCause::Cause cause) {
return false;
}
- if (VerifyAfterGC) {
- vmop_entry_verify_final_roots();
+ // In normal cycle, final-update-refs would verify at the end of the cycle.
+ // In abbreviated cycle, we need to verify separately.
+ if (ShenandoahVerify) {
+ vmop_entry_final_verify();
}
}
@@ -321,14 +346,14 @@ void ShenandoahConcurrentGC::vmop_entry_final_update_refs() {
VMThread::execute(&op);
}
-void ShenandoahConcurrentGC::vmop_entry_verify_final_roots() {
+void ShenandoahConcurrentGC::vmop_entry_final_verify() {
ShenandoahHeap* const heap = ShenandoahHeap::heap();
TraceCollectorStats tcs(heap->monitoring_support()->stw_collection_counters());
- ShenandoahTimingsTracker timing(ShenandoahPhaseTimings::final_roots_gross);
+ ShenandoahTimingsTracker timing(ShenandoahPhaseTimings::final_verify_gross);
// This phase does not use workers, no need for setup
heap->try_inject_alloc_failure();
- VM_ShenandoahFinalRoots op(this);
+ VM_ShenandoahFinalVerify op(this);
VMThread::execute(&op);
}
@@ -377,12 +402,12 @@ void ShenandoahConcurrentGC::entry_final_update_refs() {
op_final_update_refs();
}
-void ShenandoahConcurrentGC::entry_verify_final_roots() {
- const char* msg = verify_final_roots_event_message();
- ShenandoahPausePhase gc_phase(msg, ShenandoahPhaseTimings::final_roots);
+void ShenandoahConcurrentGC::entry_final_verify() {
+ const char* msg = verify_final_event_message();
+ ShenandoahPausePhase gc_phase(msg, ShenandoahPhaseTimings::final_verify);
EventMark em("%s", msg);
- op_verify_final_roots();
+ op_verify_final();
}
void ShenandoahConcurrentGC::entry_reset() {
@@ -721,9 +746,8 @@ void ShenandoahConcurrentGC::op_init_mark() {
// Make above changes visible to worker threads
OrderAccess::fence();
- // Arm nmethods for concurrent mark
- ShenandoahCodeRoots::arm_nmethods_for_mark();
-
+ // Arm nmethods/stack for concurrent processing
+ ShenandoahCodeRoots::arm_nmethods();
ShenandoahStackWatermark::change_epoch_id();
{
@@ -782,7 +806,7 @@ void ShenandoahConcurrentGC::op_final_mark() {
heap->set_has_forwarded_objects(true);
// Arm nmethods/stack for concurrent processing
- ShenandoahCodeRoots::arm_nmethods_for_evac();
+ ShenandoahCodeRoots::arm_nmethods();
ShenandoahStackWatermark::change_epoch_id();
} else {
@@ -1012,14 +1036,10 @@ void ShenandoahConcurrentGC::op_class_unloading() {
class ShenandoahEvacUpdateCodeCacheClosure : public NMethodClosure {
private:
- BarrierSetNMethod* const _bs;
ShenandoahEvacuateUpdateMetadataClosure _cl;
public:
- ShenandoahEvacUpdateCodeCacheClosure() :
- _bs(BarrierSet::barrier_set()->barrier_set_nmethod()),
- _cl() {
- }
+ ShenandoahEvacUpdateCodeCacheClosure() : _cl() {}
void do_nmethod(nmethod* n) {
ShenandoahNMethod* data = ShenandoahNMethod::gc_data(n);
@@ -1027,8 +1047,8 @@ public:
// Setup EvacOOM scope below reentrant lock to avoid deadlock with
// nmethod_entry_barrier
ShenandoahEvacOOMScope oom;
- data->oops_do(&_cl, true/*fix relocation*/);
- _bs->disarm(n);
+ data->oops_do(&_cl, /* fix_relocations = */ true);
+ ShenandoahNMethod::disarm_nmethod(n);
}
};
@@ -1245,10 +1265,10 @@ bool ShenandoahConcurrentGC::entry_final_roots() {
return true;
}
-void ShenandoahConcurrentGC::op_verify_final_roots() {
- if (VerifyAfterGC) {
- Universe::verify();
- }
+void ShenandoahConcurrentGC::op_verify_final() {
+ assert(ShenandoahVerify, "Should have been checked before");
+ ShenandoahHeap* const heap = ShenandoahHeap::heap();
+ heap->verifier()->verify_after_gc(_generation);
}
void ShenandoahConcurrentGC::op_cleanup_complete() {
@@ -1333,11 +1353,11 @@ const char* ShenandoahConcurrentGC::conc_reset_after_collect_event_message() con
}
}
-const char* ShenandoahConcurrentGC::verify_final_roots_event_message() const {
+const char* ShenandoahConcurrentGC::verify_final_event_message() const {
if (ShenandoahHeap::heap()->unload_classes()) {
- SHENANDOAH_RETURN_EVENT_MESSAGE(_generation->type(), "Pause Verify Final Roots", " (unload classes)");
+ SHENANDOAH_RETURN_EVENT_MESSAGE(_generation->type(), "Pause Verify Final", " (unload classes)");
} else {
- SHENANDOAH_RETURN_EVENT_MESSAGE(_generation->type(), "Pause Verify Final Roots", "");
+ SHENANDOAH_RETURN_EVENT_MESSAGE(_generation->type(), "Pause Verify Final", "");
}
}
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.hpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.hpp
index 54d43416fdb..fde585b4aa9 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.hpp
@@ -43,7 +43,7 @@ class ShenandoahConcurrentGC : public ShenandoahGC {
friend class VM_ShenandoahFinalMarkStartEvac;
friend class VM_ShenandoahInitUpdateRefs;
friend class VM_ShenandoahFinalUpdateRefs;
- friend class VM_ShenandoahFinalRoots;
+ friend class VM_ShenandoahFinalVerify;
protected:
ShenandoahConcurrentMark _mark;
@@ -59,8 +59,6 @@ public:
bool collect(GCCause::Cause cause) override;
ShenandoahDegenPoint degen_point() const;
- void entry_concurrent_update_refs_prepare(ShenandoahHeap* heap);
-
// Return true if this cycle found enough immediate garbage to skip evacuation
bool abbreviated() const { return _abbreviated; }
@@ -71,7 +69,7 @@ protected:
void vmop_entry_final_mark();
void vmop_entry_init_update_refs();
void vmop_entry_final_update_refs();
- void vmop_entry_verify_final_roots();
+ void vmop_entry_final_verify();
// Entry methods to normally STW GC operations. These set up logging, monitoring
// and workers for next VM operation
@@ -79,7 +77,7 @@ protected:
void entry_final_mark();
void entry_init_update_refs();
void entry_final_update_refs();
- void entry_verify_final_roots();
+ void entry_final_verify();
// Entry methods to normally concurrent GC operations. These set up logging, monitoring
// for concurrent operation.
@@ -95,6 +93,8 @@ protected:
void entry_cleanup_early();
void entry_evacuate();
void entry_update_thread_roots();
+ void entry_update_card_table();
+ void entry_concurrent_update_refs_prepare(ShenandoahHeap* heap);
void entry_update_refs();
void entry_cleanup_complete();
@@ -122,7 +122,7 @@ protected:
void op_update_thread_roots();
void op_final_update_refs();
- void op_verify_final_roots();
+ void op_verify_final();
void op_cleanup_complete();
void op_reset_after_collect();
@@ -143,7 +143,7 @@ private:
// passing around the logging/tracing systems
const char* init_mark_event_message() const;
const char* final_mark_event_message() const;
- const char* verify_final_roots_event_message() const;
+ const char* verify_final_event_message() const;
const char* conc_final_roots_event_message() const;
const char* conc_mark_event_message() const;
const char* conc_reset_event_message() const;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
index 4c6e82c86a5..6175f15676c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
@@ -346,7 +346,8 @@ void ShenandoahControlThread::service_stw_full_cycle(GCCause::Cause cause) {
void ShenandoahControlThread::service_stw_degenerated_cycle(GCCause::Cause cause, ShenandoahGC::ShenandoahDegenPoint point) {
assert (point != ShenandoahGC::_degenerated_unset, "Degenerated point should be set");
ShenandoahHeap* const heap = ShenandoahHeap::heap();
- ShenandoahGCSession session(cause, heap->global_generation());
+ ShenandoahGCSession session(cause, heap->global_generation(), true,
+ point == ShenandoahGC::ShenandoahDegenPoint::_degenerated_outside_cycle);
heap->increment_total_collections(false);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahController.cpp b/src/hotspot/share/gc/shenandoah/shenandoahController.cpp
index 50aabad7d42..0096aad2570 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahController.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahController.cpp
@@ -23,13 +23,13 @@
*
*/
+#include "gc/shared/allocTracer.hpp"
#include "gc/shared/gc_globals.hpp"
#include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
#include "gc/shenandoah/shenandoahController.hpp"
#include "gc/shenandoah/shenandoahHeap.hpp"
#include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
-
void ShenandoahController::update_gc_id() {
_gc_id.add_then_fetch((size_t)1);
}
@@ -45,10 +45,12 @@ void ShenandoahController::handle_alloc_failure(const ShenandoahAllocRequest& re
const GCCause::Cause cause = is_humongous ? GCCause::_shenandoah_humongous_allocation_failure : GCCause::_allocation_failure;
ShenandoahHeap* const heap = ShenandoahHeap::heap();
+ size_t req_byte = req.size() * HeapWordSize;
if (heap->cancel_gc(cause)) {
- log_info(gc)("Failed to allocate %s, " PROPERFMT, req.type_string(), PROPERFMTARGS(req.size() * HeapWordSize));
+ log_info(gc)("Failed to allocate %s, " PROPERFMT, req.type_string(), PROPERFMTARGS(req_byte));
request_gc(cause);
}
+ AllocTracer::send_allocation_requiring_gc_event(req_byte, checked_cast(get_gc_id()));
if (block) {
MonitorLocker ml(&_alloc_failure_waiters_lock);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
index 1873d818093..84b22f13d47 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
@@ -277,6 +277,11 @@ void ShenandoahDegenGC::op_degenerated() {
_abbreviated = true;
}
+ // labs are retired, walk the old regions and update remembered set
+ if (ShenandoahHeap::heap()->mode()->is_generational()) {
+ ShenandoahGenerationalHeap::heap()->old_generation()->update_card_table();
+ }
+
case _degenerated_update_refs:
if (heap->has_forwarded_objects()) {
op_update_refs();
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
index a579d6d3694..1807383123b 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
@@ -1569,7 +1569,7 @@ HeapWord* ShenandoahFreeSet::try_allocate_in(ShenandoahHeapRegion* r, Shenandoah
// We must call try_recycle_under_lock() even if !r->is_trash(). The reason is that if r is being recycled at this
// moment by a GC worker thread, it may appear to be not trash even though it has not yet been fully recycled. If
// we proceed without waiting for the worker to finish recycling the region, the worker thread may overwrite the
- // region's affiliation with FREE after we set the region's affiliation to req.afiliation() below
+ // region's affiliation with FREE after we set the region's affiliation to req.affiliation() below
r->try_recycle_under_lock();
in_new_region = r->is_empty();
if (in_new_region) {
@@ -1585,7 +1585,6 @@ HeapWord* ShenandoahFreeSet::try_allocate_in(ShenandoahHeapRegion* r, Shenandoah
// concurrent preparations for mixed evacuations are completed), we mark this region as not requiring any
// coalesce-and-fill processing.
r->end_preemptible_coalesce_and_fill();
- _heap->old_generation()->clear_cards_for(r);
}
#ifdef ASSERT
ShenandoahMarkingContext* const ctx = _heap->marking_context();
@@ -2679,8 +2678,11 @@ void ShenandoahFreeSet::reduce_young_reserve(size_t adjusted_young_reserve, size
* 1. Memory currently available within old and young
* 2. Trashed regions currently residing in young and old, which will become available momentarily
* 3. The value of old_generation->get_region_balance() which represents the number of regions that we plan
- * to transfer from old generation to young generation. Prior to each invocation of compute_young_and_old_reserves(),
- * this value should computed by ShenandoahGenerationalHeap::compute_old_generation_balance().
+ * to transfer from old generation to young generation. At the end of each GC cycle, we reset region_balance
+ * to zero. As we prepare to rebuild free set at the end of update-refs, we call
+ * ShenandoahGenerationalHeap::compute_old_generation_balance() to compute a new value of region_balance.
+ * This allows us to expand or shrink the size of the Old Collector reserves based on anticipated needs of
+ * the next GC cycle.
*/
void ShenandoahFreeSet::compute_young_and_old_reserves(size_t young_trashed_regions, size_t old_trashed_regions,
size_t& young_reserve_result, size_t& old_reserve_result) const {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
index 3d592e9f9be..5b26ee67653 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
@@ -301,6 +301,7 @@ void ShenandoahGeneration::prepare_regions_and_collection_set(bool concurrent) {
collection_set->clear();
ShenandoahHeapLocker locker(heap->lock());
+ heap->assert_pinned_region_status(this);
_heuristics->choose_collection_set(collection_set);
}
@@ -309,16 +310,9 @@ void ShenandoahGeneration::prepare_regions_and_collection_set(bool concurrent) {
ShenandoahGCPhase phase(concurrent ? ShenandoahPhaseTimings::final_rebuild_freeset :
ShenandoahPhaseTimings::degen_gc_final_rebuild_freeset);
ShenandoahHeapLocker locker(heap->lock());
-
- // We are preparing for evacuation.
+ // At start of evacation, we do NOT compute_old_generation_balance()
size_t young_trashed_regions, old_trashed_regions, first_old, last_old, num_old;
_free_set->prepare_to_rebuild(young_trashed_regions, old_trashed_regions, first_old, last_old, num_old);
- if (heap->mode()->is_generational()) {
- ShenandoahGenerationalHeap* gen_heap = ShenandoahGenerationalHeap::heap();
- size_t allocation_runway =
- gen_heap->young_generation()->heuristics()->bytes_of_allocation_runway_before_gc_trigger(young_trashed_regions);
- gen_heap->compute_old_generation_balance(allocation_runway, old_trashed_regions, young_trashed_regions);
- }
_free_set->finish_rebuild(young_trashed_regions, old_trashed_regions, num_old);
}
}
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp
index 6f32d101152..9f8944127c0 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp
@@ -143,7 +143,7 @@ public:
virtual bool contains(ShenandoahAffiliation affiliation) const = 0;
// Return true if this region is affiliated with this generation.
- virtual bool contains(ShenandoahHeapRegion* region) const = 0;
+ virtual bool contains(ShenandoahHeapRegion* region) const override = 0;
// Return true if this object is affiliated with this generation.
virtual bool contains(oop obj) const = 0;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
index aa6a4a9bab2..bbad82de1dc 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
@@ -628,11 +628,10 @@ void ShenandoahGenerationalControlThread::service_stw_full_cycle(GCCause::Cause
void ShenandoahGenerationalControlThread::service_stw_degenerated_cycle(const ShenandoahGCRequest& request) {
assert(_degen_point != ShenandoahGC::_degenerated_unset, "Degenerated point should be set");
- request.generation->heuristics()->record_degenerated_cycle_start(ShenandoahGC::ShenandoahDegenPoint::_degenerated_outside_cycle
- == _degen_point);
_heap->increment_total_collections(false);
- ShenandoahGCSession session(request.cause, request.generation);
+ ShenandoahGCSession session(request.cause, request.generation, true,
+ _degen_point == ShenandoahGC::ShenandoahDegenPoint::_degenerated_outside_cycle);
ShenandoahDegenGC gc(_degen_point, request.generation);
gc.collect(request.cause);
_degen_point = ShenandoahGC::_degenerated_unset;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalEvacuationTask.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalEvacuationTask.cpp
index 6912750378e..ca15c6db443 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalEvacuationTask.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalEvacuationTask.cpp
@@ -133,3 +133,4 @@ void ShenandoahGenerationalEvacuationTask::evacuate_and_promote_regions() {
}
}
}
+
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp
index d5cfa4b7fb9..1694121b955 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalHeap.cpp
@@ -363,10 +363,6 @@ oop ShenandoahGenerationalHeap::try_evacuate_object(oop p, Thread* thread, uint
// Record that the evacuation succeeded
evac_tracker()->end_evacuation(thread, size * HeapWordSize, FROM_GENERATION, TO_GENERATION);
}
-
- if (TO_GENERATION == OLD_GENERATION) {
- old_generation()->handle_evacuation(copy, size);
- }
} else {
// Failed to evacuate. We need to deal with the object that is left behind. Since this
// new allocation is certainly after TAMS, it will be considered live in the next cycle.
@@ -410,11 +406,14 @@ template oop ShenandoahGenerationalHeap::try_evacuate_object(oop p, Thread* thread, uint from_region_age);
template oop ShenandoahGenerationalHeap::try_evacuate_object(oop p, Thread* thread, uint from_region_age);
+// Call this function at the end of a GC cycle in order to establish proper sizes of young and old reserves,
+// setting the old-generation balance so that GC can perform the anticipated evacuations.
+//
// Make sure old-generation is large enough, but no larger than is necessary, to hold mixed evacuations
// and promotions, if we anticipate either. Any deficit is provided by the young generation, subject to
// mutator_xfer_limit, and any surplus is transferred to the young generation. mutator_xfer_limit is
-// the maximum we're able to transfer from young to old. This is called at the end of GC, as we prepare
-// for the idle span that precedes the next GC.
+// the maximum we're able to transfer from young to old. The mutator_xfer_limit constrains the transfer
+// of memory from young to old. It does not limit young reserves.
void ShenandoahGenerationalHeap::compute_old_generation_balance(size_t mutator_xfer_limit,
size_t old_trashed_regions, size_t young_trashed_regions) {
shenandoah_assert_heaplocked();
@@ -466,11 +465,17 @@ void ShenandoahGenerationalHeap::compute_old_generation_balance(size_t mutator_x
bound_on_old_reserve));
assert(mutator_xfer_limit <= young_available,
"Cannot transfer (%zu) memory that is not available (%zu)", mutator_xfer_limit, young_available);
- // Young reserves are to be taken out of the mutator_xfer_limit.
- if (young_reserve > mutator_xfer_limit) {
- young_reserve = mutator_xfer_limit;
+
+ if (young_reserve > young_available) {
+ young_reserve = young_available;
+ }
+ // We allow young_reserve to exceed mutator_xfer_limit. Essentially, this means the GC is already behind the pace
+ // of mutator allocations, and we'll need to trigger the next GC as soon as possible.
+ if (mutator_xfer_limit > young_reserve) {
+ mutator_xfer_limit -= young_reserve;
+ } else {
+ mutator_xfer_limit = 0;
}
- mutator_xfer_limit -= young_reserve;
// Decide how much old space we should reserve for a mixed collection
size_t proposed_reserve_for_mixed = 0;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index 5bf76505506..4b01ea1cd52 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -1650,7 +1650,8 @@ void ShenandoahHeap::set_active_generation(ShenandoahGeneration* generation) {
_active_generation = generation;
}
-void ShenandoahHeap::on_cycle_start(GCCause::Cause cause, ShenandoahGeneration* generation) {
+void ShenandoahHeap::on_cycle_start(GCCause::Cause cause, ShenandoahGeneration* generation,
+ bool is_degenerated, bool is_out_of_cycle) {
shenandoah_policy()->record_collection_cause(cause);
const GCCause::Cause current = gc_cause();
@@ -1659,7 +1660,11 @@ void ShenandoahHeap::on_cycle_start(GCCause::Cause cause, ShenandoahGeneration*
set_gc_cause(cause);
- generation->heuristics()->record_cycle_start();
+ if (is_degenerated) {
+ generation->heuristics()->record_degenerated_cycle_start(is_out_of_cycle);
+ } else {
+ generation->heuristics()->record_cycle_start();
+ }
}
void ShenandoahHeap::on_cycle_end(ShenandoahGeneration* generation) {
@@ -1955,6 +1960,26 @@ void ShenandoahHeap::heap_region_iterate(ShenandoahHeapRegionClosure* blk) const
}
}
+class ShenandoahHeapRegionIteratorTask : public WorkerTask {
+private:
+ ShenandoahRegionIterator _regions;
+ ShenandoahHeapRegionClosure* _closure;
+
+public:
+ ShenandoahHeapRegionIteratorTask(ShenandoahHeapRegionClosure* closure)
+ : WorkerTask("Shenandoah Heap Region Iterator")
+ , _closure(closure) {}
+
+ void work(uint worker_id) override {
+ ShenandoahParallelWorkerSession worker_session(worker_id);
+ ShenandoahHeapRegion* region = _regions.next();
+ while (region != nullptr) {
+ _closure->heap_region_do(region);
+ region = _regions.next();
+ }
+ }
+};
+
class ShenandoahParallelHeapRegionTask : public WorkerTask {
private:
ShenandoahHeap* const _heap;
@@ -2011,6 +2036,11 @@ void ShenandoahHeap::parallel_heap_region_iterate(ShenandoahHeapRegionClosure* b
}
}
+void ShenandoahHeap::heap_region_iterator(ShenandoahHeapRegionClosure* closure) const {
+ ShenandoahHeapRegionIteratorTask task(closure);
+ workers()->run_task(&task);
+}
+
class ShenandoahRendezvousHandshakeClosure : public HandshakeClosure {
public:
inline ShenandoahRendezvousHandshakeClosure(const char* name) : HandshakeClosure(name) {}
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
index d4604be0aec..bed26a093d0 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
@@ -298,6 +298,7 @@ public:
void heap_region_iterate(ShenandoahHeapRegionClosure* blk) const;
void parallel_heap_region_iterate(ShenandoahHeapRegionClosure* blk) const;
+ void heap_region_iterator(ShenandoahHeapRegionClosure* blk) const;
inline ShenandoahMmuTracker* mmu_tracker() { return &_mmu_tracker; };
@@ -563,7 +564,7 @@ public:
return _evac_tracker;
}
- void on_cycle_start(GCCause::Cause cause, ShenandoahGeneration* generation);
+ void on_cycle_start(GCCause::Cause cause, ShenandoahGeneration* generation, bool is_degenerated, bool is_out_of_cycle);
void on_cycle_end(ShenandoahGeneration* generation);
ShenandoahVerifier* verifier();
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
index afc6b24e168..c031569b7c6 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
@@ -67,6 +67,7 @@ ShenandoahHeapRegion::ShenandoahHeapRegion(HeapWord* start, size_t index, bool c
_new_top(nullptr),
_empty_time(os::elapsedTime()),
_top_before_promoted(nullptr),
+ _top_at_evac_start(start),
_state(committed ? _empty_committed : _empty_uncommitted),
_top(start),
_tlab_allocs(0),
@@ -565,25 +566,34 @@ void ShenandoahHeapRegion::recycle_internal() {
assert(_recycling.is_set() && is_trash(), "Wrong state");
ShenandoahHeap* heap = ShenandoahHeap::heap();
+ _top_at_evac_start = _bottom;
_mixed_candidate_garbage_words = 0;
- set_top(bottom());
clear_live_data();
reset_alloc_metadata();
heap->marking_context()->reset_top_at_mark_start(this);
set_update_watermark(bottom());
+ if (is_old()) {
+ heap->old_generation()->clear_cards_for(this);
+ }
+
if (ZapUnusedHeapArea) {
SpaceMangler::mangle_region(MemRegion(bottom(), end()));
}
-
- make_empty();
+ set_top(bottom());
set_affiliation(FREE);
+
+ // Lastly, set region state to empty
+ make_empty();
}
// Upon return, this region has been recycled. We try to recycle it.
// We may fail if some other thread recycled it before we do.
void ShenandoahHeapRegion::try_recycle_under_lock() {
shenandoah_assert_heaplocked();
- if (is_trash() && _recycling.try_set()) {
+ if (!is_trash()) {
+ return;
+ }
+ if (_recycling.try_set()) {
if (is_trash()) {
// At freeset rebuild time, which precedes recycling of collection set, we treat all cset regions as
// part of capacity, as empty, as fully available, and as unaffiliated. This provides short-lived optimism
@@ -603,6 +613,7 @@ void ShenandoahHeapRegion::try_recycle_under_lock() {
os::naked_yield();
}
}
+ assert(!is_trash(), "Must not");
}
}
@@ -610,7 +621,10 @@ void ShenandoahHeapRegion::try_recycle_under_lock() {
// some GC worker thread has taken responsibility to recycle the region, eventually.
void ShenandoahHeapRegion::try_recycle() {
shenandoah_assert_not_heaplocked();
- if (is_trash() && _recycling.try_set()) {
+ if (!is_trash()) {
+ return;
+ }
+ if (_recycling.try_set()) {
// Double check region state after win the race to set recycling flag
if (is_trash()) {
// At freeset rebuild time, which precedes recycling of collection set, we treat all cset regions as
@@ -834,7 +848,7 @@ void ShenandoahHeapRegion::set_state(RegionState to) {
evt.set_to(to);
evt.commit();
}
- _state.store_relaxed(to);
+ _state.release_store(to);
}
void ShenandoahHeapRegion::record_pin() {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp
index 3a0ac042f57..e27bbbb737d 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp
@@ -218,7 +218,7 @@ public:
bool is_alloc_allowed() const { auto cur_state = state(); return is_empty_state(cur_state) || cur_state == _regular || cur_state == _pinned; }
bool is_stw_move_allowed() const { auto cur_state = state(); return cur_state == _regular || cur_state == _cset || (ShenandoahHumongousMoves && cur_state == _humongous_start); }
- RegionState state() const { return _state.load_relaxed(); }
+ RegionState state() const { return _state.load_acquire(); }
int state_ordinal() const { return region_state_to_ordinal(state()); }
void record_pin();
@@ -246,6 +246,7 @@ private:
double _empty_time;
HeapWord* _top_before_promoted;
+ HeapWord* _top_at_evac_start;
// Seldom updated fields
Atomic _state;
@@ -365,12 +366,15 @@ public:
}
// Returns true iff this region was promoted in place subsequent to the most recent start of concurrent old marking.
- inline bool was_promoted_in_place() {
+ bool was_promoted_in_place() const {
return _promoted_in_place;
}
inline void restore_top_before_promote();
inline size_t garbage_before_padded_for_promote() const;
+ HeapWord* get_top_at_evac_start() const { return _top_at_evac_start; }
+ void record_top_at_evac_start() { _top_at_evac_start = _top; }
+
// If next available memory is not aligned on address that is multiple of alignment, fill the empty space
// so that returned object is aligned on an address that is a multiple of alignment_in_bytes. Requested
// size is in words. It is assumed that this->is_old(). A pad object is allocated, filled, and registered
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionClosures.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionClosures.cpp
index 3c6fe1a3df1..7554a9c9a2c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionClosures.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionClosures.cpp
@@ -80,6 +80,11 @@ void ShenandoahFinalMarkUpdateRegionStateClosure::heap_region_do(ShenandoahHeapR
// Remember limit for updating refs. It's guaranteed that we get no
// from-space-refs written from here on.
r->set_update_watermark_at_safepoint(r->top());
+
+ if (r->is_old()) {
+ // Record where we need to start updating the remembered set
+ r->record_top_at_evac_start();
+ }
} else {
assert(!r->has_live(), "Region %zu should have no live data", r->index());
assert(_ctx == nullptr || _ctx->top_at_mark_start(r) == r->top(),
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.cpp
index ff1e3368e87..aaf152e2890 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.cpp
@@ -78,6 +78,7 @@ ShenandoahHeapRegionCounters::ShenandoahHeapRegionCounters() :
ShenandoahHeapRegionCounters::~ShenandoahHeapRegionCounters() {
if (_name_space != nullptr) FREE_C_HEAP_ARRAY(char, _name_space);
+ if (_regions_data != nullptr) FREE_C_HEAP_ARRAY(PerfVariable*, _regions_data);
}
void ShenandoahHeapRegionCounters::write_snapshot(PerfLongVariable** regions,
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahInPlacePromoter.cpp b/src/hotspot/share/gc/shenandoah/shenandoahInPlacePromoter.cpp
index 10d61221e87..153193fa3a3 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahInPlacePromoter.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahInPlacePromoter.cpp
@@ -238,6 +238,9 @@ void ShenandoahInPlacePromoter::promote(ShenandoahHeapRegion* region) const {
// is_collector_free range. We'll add it to that range below.
region->restore_top_before_promote();
+ // We also need to record where those allocations begin so that we can later update the remembered set.
+ region->record_top_at_evac_start();
+
assert(region->used() + pip_pad_bytes + pip_unpadded == region_size_bytes, "invariant");
// The update_watermark was likely established while we had the artificially high value of top. Make it sane now.
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahLock.hpp b/src/hotspot/share/gc/shenandoah/shenandoahLock.hpp
index 7c91df191e5..5041419b2c7 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahLock.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahLock.hpp
@@ -38,15 +38,19 @@ private:
shenandoah_padding(0);
Atomic _state;
shenandoah_padding(1);
+#ifdef ASSERT
Atomic _owner;
shenandoah_padding(2);
+#endif
template
void contended_lock_internal(JavaThread* java_thread);
static void yield_or_sleep(int &yields);
public:
- ShenandoahLock() : _state(unlocked), _owner(nullptr) {};
+ ShenandoahLock() : _state(unlocked) {
+ DEBUG_ONLY(_owner.store_relaxed(nullptr);)
+ };
void lock(bool allow_block_for_safepoint = false) {
assert(_owner.load_relaxed() != Thread::current(), "reentrant locking attempt, would deadlock");
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp
index 4ad7d2a1ae5..37de5966554 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp
@@ -318,6 +318,11 @@ void ShenandoahOldGeneration::heap_region_iterate(ShenandoahHeapRegionClosure* c
ShenandoahHeap::heap()->heap_region_iterate(&old_regions_cl);
}
+void ShenandoahOldGeneration::heap_region_iterator(ShenandoahHeapRegionClosure* cl) {
+ ShenandoahIncludeRegionClosure old_regions_cl(cl);
+ ShenandoahHeap::heap()->heap_region_iterator(&old_regions_cl);
+}
+
void ShenandoahOldGeneration::set_concurrent_mark_in_progress(bool in_progress) {
ShenandoahHeap::heap()->set_concurrent_old_mark_in_progress(in_progress);
}
@@ -326,6 +331,12 @@ bool ShenandoahOldGeneration::is_concurrent_mark_in_progress() {
return ShenandoahHeap::heap()->is_concurrent_old_mark_in_progress();
}
+void ShenandoahOldGeneration::record_tops_at_evac_start() {
+ for_each_region([](ShenandoahHeapRegion* region) {
+ region->record_top_at_evac_start();
+ });
+}
+
void ShenandoahOldGeneration::cancel_marking() {
if (is_concurrent_mark_in_progress()) {
log_debug(gc)("Abandon SATB buffers");
@@ -662,15 +673,19 @@ void ShenandoahOldGeneration::log_failed_promotion(LogStream& ls, Thread* thread
}
}
-void ShenandoahOldGeneration::handle_evacuation(HeapWord* obj, size_t words) const {
- // Only register the copy of the object that won the evacuation race.
- _card_scan->register_object_without_lock(obj);
-
- // Mark the entire range of the evacuated object as dirty. At next remembered set scan,
- // we will clear dirty bits that do not hold interesting pointers. It's more efficient to
- // do this in batch, in a background GC thread than to try to carefully dirty only cards
- // that hold interesting pointers right now.
- _card_scan->mark_range_as_dirty(obj, words);
+void ShenandoahOldGeneration::update_card_table() {
+ for_each_region([this](ShenandoahHeapRegion* region) {
+ if (region->is_regular()) {
+ // Humongous regions are promoted in place, remembered set maintenance is handled there
+ // Regular regions that are promoted in place have their rset maintenance handled for
+ // the objects in the region when it was promoted. We record TEAS for such a region
+ // when the in-place-promotion is completed. Such a region may be used for additional
+ // promotions in the same cycle it was itself promoted.
+ if (region->top() > region->get_top_at_evac_start()) {
+ _card_scan->update_card_table(region->get_top_at_evac_start(), region->top());
+ }
+ }
+ });
}
bool ShenandoahOldGeneration::has_unprocessed_collection_candidates() {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.hpp b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.hpp
index 630736190f0..942f93c5c68 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.hpp
@@ -172,8 +172,8 @@ public:
void handle_failed_promotion(Thread* thread, size_t size) const;
void log_failed_promotion(LogStream& ls, Thread* thread, size_t size) const;
- // A successful evacuation re-dirties the cards and registers the object with the remembered set
- void handle_evacuation(HeapWord* obj, size_t words) const;
+ // Iterate over recently promoted objects to update card table and object registrations
+ void update_card_table();
// Clear the flag after it is consumed by the control thread
bool clear_failed_evacuation() {
@@ -199,11 +199,36 @@ public:
// Mark card for this location as dirty
void mark_card_as_dirty(void* location);
+ template
+ class ShenandoahHeapRegionLambda : public ShenandoahHeapRegionClosure {
+ T _region_lambda;
+ public:
+ explicit ShenandoahHeapRegionLambda(T region_lambda) : _region_lambda(region_lambda) {}
+
+ void heap_region_do(ShenandoahHeapRegion* r) override {
+ _region_lambda(r);
+ }
+
+ bool is_thread_safe() override {
+ return true;
+ }
+
+ size_t parallel_region_stride() override {
+ // Temporarily override to force parallelism when updating card table
+ return 8;
+ }
+ };
+
+ template
+ void for_each_region(LambdaT lambda) {
+ ShenandoahHeapRegionLambda l(lambda);
+ heap_region_iterator(&l);
+ }
+
void parallel_heap_region_iterate(ShenandoahHeapRegionClosure* cl) override;
-
void parallel_heap_region_iterate_free(ShenandoahHeapRegionClosure* cl) override;
-
void heap_region_iterate(ShenandoahHeapRegionClosure* cl) override;
+ void heap_region_iterator(ShenandoahHeapRegionClosure* cl);
bool contains(ShenandoahAffiliation affiliation) const override;
bool contains(ShenandoahHeapRegion* region) const override;
@@ -212,8 +237,17 @@ public:
void set_concurrent_mark_in_progress(bool in_progress) override;
bool is_concurrent_mark_in_progress() override;
+ // For old regions, objects between top at evac start and top represent promoted objects.
+ // These objects will need to have their cards dirtied and their offsets within the cards registered.
+ void record_tops_at_evac_start();
+
bool entry_coalesce_and_fill();
+
+ // Global collections touch old regions, so the old generation needs to be informed of this.
+ // The old generation may decide to schedule additional mixed collections, or may decide to
+ // immediately coalesce-and-fill old objects in regions that were not collected.
void transition_old_generation_after_global_gc();
+
void prepare_gc() override;
void prepare_regions_and_collection_set(bool concurrent) override;
void record_success_concurrent(bool abbreviated) override;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahPLAB.cpp b/src/hotspot/share/gc/shenandoah/shenandoahPLAB.cpp
index 412cfa9447e..5049113b665 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahPLAB.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahPLAB.cpp
@@ -210,12 +210,4 @@ void ShenandoahPLAB::retire() {
// plab->retire() overwrites unused memory between plab->top() and plab->hard_end() with a dummy object to make memory parsable.
// It adds the size of this unused memory, in words, to plab->waste().
_plab->retire();
- if (top != nullptr && _plab->waste() > original_waste && _heap->is_in_old(top)) {
- // If retiring the plab created a filler object, then we need to register it with our card scanner so it can
- // safely walk the region backing the plab.
- log_debug(gc, plab)("retire_plab() is registering remnant of size %zu at " PTR_FORMAT,
- (_plab->waste() - original_waste) * HeapWordSize, p2i(top));
- // No lock is necessary because the PLAB memory is aligned on card boundaries.
- _heap->old_generation()->card_scan()->register_object_without_lock(top);
- }
}
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp
index e890008b916..6a316e2265a 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp
@@ -109,10 +109,11 @@ class outputStream;
f(conc_strong_roots, "Concurrent Strong Roots") \
SHENANDOAH_PAR_PHASE_DO(conc_strong_roots_, " CSR: ", f) \
f(conc_evac, "Concurrent Evacuation") \
+ f(conc_update_card_table, "Concurrent Update Cards") \
f(conc_final_roots, "Concurrent Final Roots") \
f(promote_in_place, " Promote Regions") \
- f(final_roots_gross, "Pause Verify Final Roots (G)") \
- f(final_roots, "Pause Verify Final Roots (N)") \
+ f(final_verify_gross, "Pause Final Verify (G)") \
+ f(final_verify, "Pause Final Verify (N)") \
\
f(init_update_refs_gross, "Pause Init Update Refs (G)") \
f(init_update_refs, "Pause Init Update Refs (N)") \
@@ -254,7 +255,7 @@ public:
void flush_cycle_to_global();
static const char* phase_name(Phase phase) {
- assert(phase >= 0 && phase < _num_phases, "Out of bound");
+ assert(phase >= 0 && phase < _num_phases, "Out of bounds: %d", phase);
return _phase_names[phase];
}
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp
index 7b68e6ac625..80825ac43ad 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp
@@ -200,9 +200,6 @@ ShenandoahRootAdjuster::ShenandoahRootAdjuster(uint n_workers, ShenandoahPhaseTi
void ShenandoahRootAdjuster::roots_do(uint worker_id, OopClosure* oops) {
NMethodToOopClosure code_blob_cl(oops, NMethodToOopClosure::FixRelocations);
ShenandoahNMethodAndDisarmClosure nmethods_and_disarm_Cl(oops);
- NMethodToOopClosure* adjust_code_closure = ShenandoahCodeRoots::use_nmethod_barriers_for_mark() ?
- static_cast(&nmethods_and_disarm_Cl) :
- static_cast(&code_blob_cl);
CLDToOopClosure adjust_cld_closure(oops, ClassLoaderData::_claim_strong);
// Process light-weight/limited parallel roots then
@@ -211,7 +208,7 @@ void ShenandoahRootAdjuster::roots_do(uint worker_id, OopClosure* oops) {
_cld_roots.cld_do(&adjust_cld_closure, worker_id);
// Process heavy-weight/fully parallel roots the last
- _code_roots.nmethods_do(adjust_code_closure, worker_id);
+ _code_roots.nmethods_do(&nmethods_and_disarm_Cl, worker_id);
_thread_roots.oops_do(oops, nullptr, worker_id);
}
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp
index 6aebec28163..4504ac96819 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp
@@ -172,10 +172,6 @@ template
void ShenandoahRootUpdater::roots_do(uint worker_id, IsAlive* is_alive, KeepAlive* keep_alive) {
NMethodToOopClosure update_nmethods(keep_alive, NMethodToOopClosure::FixRelocations);
ShenandoahNMethodAndDisarmClosure nmethods_and_disarm_Cl(keep_alive);
- NMethodToOopClosure* codes_cl = ShenandoahCodeRoots::use_nmethod_barriers_for_mark() ?
- static_cast(&nmethods_and_disarm_Cl) :
- static_cast(&update_nmethods);
-
CLDToOopClosure clds(keep_alive, ClassLoaderData::_claim_strong);
// Process light-weight/limited parallel roots then
@@ -184,7 +180,7 @@ void ShenandoahRootUpdater::roots_do(uint worker_id, IsAlive* is_alive, KeepAliv
_cld_roots.cld_do(&clds, worker_id);
// Process heavy-weight/fully parallel roots the last
- _code_roots.nmethods_do(codes_cl, worker_id);
+ _code_roots.nmethods_do(&nmethods_and_disarm_Cl, worker_id);
_thread_roots.oops_do(keep_alive, nullptr, worker_id);
}
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahSTWMark.cpp b/src/hotspot/share/gc/shenandoah/shenandoahSTWMark.cpp
index 117984a6d41..5b4ce6d0bc9 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahSTWMark.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahSTWMark.cpp
@@ -74,7 +74,7 @@ void ShenandoahSTWMark::mark() {
// Arm all nmethods. Even though this is STW mark, some marking code
// piggybacks on nmethod barriers for special instances.
- ShenandoahCodeRoots::arm_nmethods_for_mark();
+ ShenandoahCodeRoots::arm_nmethods();
// Weak reference processing
ShenandoahReferenceProcessor* rp = _generation->ref_processor();
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
index 9e160d5b294..8d7ba2dc46f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
@@ -31,6 +31,33 @@
#include "logging/log.hpp"
#include "runtime/threads.hpp"
+// A closure that takes an oop in the old generation and, if it's pointing
+// into the young generation, dirties the corresponding remembered set entry.
+class ShenandoahDirtyRememberedSetClosure : public BasicOopIterateClosure {
+protected:
+ ShenandoahGenerationalHeap* const _heap;
+ ShenandoahScanRemembered* const _scanner;
+
+public:
+ ShenandoahDirtyRememberedSetClosure() :
+ _heap(ShenandoahGenerationalHeap::heap()),
+ _scanner(_heap->old_generation()->card_scan()) {}
+
+ template
+ void work(T* p) {
+ assert(_heap->is_in_old(p), "Expecting to get an old gen address");
+ if (T o = RawAccess<>::oop_load(p); !CompressedOops::is_null(o)) {
+ if (const oop obj = CompressedOops::decode_not_null(o); _heap->is_in_young(obj)) {
+ // Dirty the card containing the cross-generational pointer.
+ _scanner->mark_card_as_dirty((HeapWord*) p);
+ }
+ }
+ }
+
+ void do_oop(narrowOop* p) override { work(p); }
+ void do_oop(oop* p) override { work(p); }
+};
+
size_t ShenandoahDirectCardMarkRememberedSet::last_valid_index() const {
return _card_table->last_valid_index();
}
@@ -161,7 +188,6 @@ void ShenandoahCardCluster::register_object_without_lock(HeapWord* address) {
uint8_t offset_in_card = checked_cast(pointer_delta(address, card_start_address));
if (!starts_object(card_at_start)) {
- set_starts_object_bit(card_at_start);
set_first_start(card_at_start, offset_in_card);
set_last_start(card_at_start, offset_in_card);
} else {
@@ -172,6 +198,49 @@ void ShenandoahCardCluster::register_object_without_lock(HeapWord* address) {
}
}
+void ShenandoahCardCluster::update_card_table(HeapWord* start, HeapWord* end) {
+ HeapWord* address = start;
+ HeapWord* previous_address = nullptr;
+ uint8_t previous_offset = 0;
+ size_t previous_card_index = -1;
+ ShenandoahDirtyRememberedSetClosure make_cards_dirty;
+
+ log_debug(gc, remset)("Update remembered set from " PTR_FORMAT ", to " PTR_FORMAT, p2i(start), p2i(end));
+ _rs->mark_range_as_dirty(start, pointer_delta(end, start));
+
+ while (address < end) {
+
+ // Compute card and offset in card for this object
+ const size_t object_card_index = _rs->card_index_for_addr(address);
+ const HeapWord* card_start_address = _rs->addr_for_card_index(object_card_index);
+ const uint8_t offset_in_card = checked_cast(pointer_delta(address, card_start_address));
+
+ if (object_card_index != previous_card_index) {
+ if (previous_address != nullptr) {
+ // Register the previous object on the previous card, we are starting a new card here
+ set_last_start(previous_card_index, previous_offset);
+ }
+
+ previous_card_index = object_card_index;
+ if (!starts_object(object_card_index)) {
+ // The previous cycle may have recorded an earlier start in this card. Do not overwrite it.
+ set_first_start(object_card_index, offset_in_card);
+ }
+ }
+
+ previous_offset = offset_in_card;
+ previous_address = address;
+
+ const oop obj = cast_to_oop(address);
+ address += obj->size();
+ }
+
+ // Register the last object seen in this range.
+ if (previous_address != nullptr) {
+ set_last_start(previous_card_index, previous_offset);
+ }
+}
+
void ShenandoahCardCluster::coalesce_objects(HeapWord* address, size_t length_in_words) {
size_t card_at_start = _rs->card_index_for_addr(address);
@@ -641,36 +710,6 @@ void ShenandoahScanRemembered::merge_worker_card_stats_cumulative(
}
#endif
-// A closure that takes an oop in the old generation and, if it's pointing
-// into the young generation, dirties the corresponding remembered set entry.
-// This is only used to rebuild the remembered set after a full GC.
-class ShenandoahDirtyRememberedSetClosure : public BasicOopIterateClosure {
-protected:
- ShenandoahGenerationalHeap* const _heap;
- ShenandoahScanRemembered* const _scanner;
-
-public:
- ShenandoahDirtyRememberedSetClosure() :
- _heap(ShenandoahGenerationalHeap::heap()),
- _scanner(_heap->old_generation()->card_scan()) {}
-
- template
- inline void work(T* p) {
- assert(_heap->is_in_old(p), "Expecting to get an old gen address");
- T o = RawAccess<>::oop_load(p);
- if (!CompressedOops::is_null(o)) {
- oop obj = CompressedOops::decode_not_null(o);
- if (_heap->is_in_young(obj)) {
- // Dirty the card containing the cross-generational pointer.
- _scanner->mark_card_as_dirty((HeapWord*) p);
- }
- }
- }
-
- virtual void do_oop(narrowOop* p) { work(p); }
- virtual void do_oop(oop* p) { work(p); }
-};
-
ShenandoahDirectCardMarkRememberedSet::ShenandoahDirectCardMarkRememberedSet(ShenandoahCardTable* card_table, size_t total_card_count) :
LogCardValsPerIntPtr(log2i_exact(sizeof(intptr_t)) - log2i_exact(sizeof(CardValue))),
LogCardSizeInWords(log2i_exact(CardTable::card_size_in_words())) {
@@ -1039,38 +1078,44 @@ void ShenandoahReconstructRememberedSetTask::work(uint worker_id) {
ShenandoahDirtyRememberedSetClosure dirty_cards_for_cross_generational_pointers;
while (r != nullptr) {
- if (r->is_old() && r->is_active()) {
- HeapWord* obj_addr = r->bottom();
- if (r->is_humongous_start()) {
- // First, clear the remembered set
- oop obj = cast_to_oop(obj_addr);
- size_t size = obj->size();
-
- size_t num_regions = ShenandoahHeapRegion::required_regions(size * HeapWordSize);
- size_t region_index = r->index();
- ShenandoahHeapRegion* humongous_region = heap->get_region(region_index);
- while (num_regions-- != 0) {
- scanner->reset_object_range(humongous_region->bottom(), humongous_region->end());
- region_index++;
- humongous_region = heap->get_region(region_index);
- }
-
- // Then register the humongous object and DIRTY relevant remembered set cards
- scanner->register_object_without_lock(obj_addr);
- obj->oop_iterate(&dirty_cards_for_cross_generational_pointers);
- } else if (!r->is_humongous()) {
- scanner->reset_object_range(r->bottom(), r->end());
-
- // Then iterate over all objects, registering object and DIRTYing relevant remembered set cards
- HeapWord* t = r->top();
- while (obj_addr < t) {
+ if (r->is_active()) {
+ if (r->is_old()) {
+ HeapWord* obj_addr = r->bottom();
+ if (r->is_humongous_start()) {
+ // First, clear the remembered set
oop obj = cast_to_oop(obj_addr);
+ size_t size = obj->size();
+
+ size_t num_regions = ShenandoahHeapRegion::required_regions(size * HeapWordSize);
+ size_t region_index = r->index();
+ ShenandoahHeapRegion* humongous_region = heap->get_region(region_index);
+ while (num_regions-- != 0) {
+ scanner->reset_object_range(humongous_region->bottom(), humongous_region->end());
+ region_index++;
+ humongous_region = heap->get_region(region_index);
+ }
+
+ // Then register the humongous object and DIRTY relevant remembered set cards
scanner->register_object_without_lock(obj_addr);
- obj_addr += obj->oop_iterate_size(&dirty_cards_for_cross_generational_pointers);
- }
- } // else, ignore humongous continuation region
+ obj->oop_iterate(&dirty_cards_for_cross_generational_pointers);
+ } else if (!r->is_humongous()) {
+ scanner->reset_object_range(r->bottom(), r->end());
+
+ // Then iterate over all objects, registering object and DIRTYing relevant remembered set cards
+ HeapWord* t = r->top();
+ while (obj_addr < t) {
+ oop obj = cast_to_oop(obj_addr);
+ scanner->register_object_without_lock(obj_addr);
+ obj_addr += obj->oop_iterate_size(&dirty_cards_for_cross_generational_pointers);
+ }
+ } // else, ignore humongous continuation region
+ } else {
+ // The region is young, but it may become old again and we don't want stale remembered set data.
+ assert(r->is_young(), "Region: %zu, is active but free", r->index());
+ heap->old_generation()->clear_cards_for(r);
+ }
}
- // else, this region is FREE or YOUNG or inactive and we can ignore it.
+ // else, this region is FREE or inactive and we can ignore it.
r = _regions->next();
}
}
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.hpp b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.hpp
index c2c117e86e6..53f00e64a03 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.hpp
@@ -603,6 +603,9 @@ public:
// as address.
void register_object_without_lock(HeapWord* address);
+ // Dirty cards and register objects for the given range in memory.
+ void update_card_table(HeapWord* start, HeapWord* end);
+
// During the reference updates phase of GC, we walk through each old-gen memory region that was
// not part of the collection set and we invalidate all unmarked objects. As part of this effort,
// we coalesce neighboring dead objects in order to make future remembered set scanning more
@@ -814,6 +817,10 @@ public:
}
}
+ void update_card_table(HeapWord* start, HeapWord* end) const {
+ _scc->update_card_table(start, end);
+ }
+
// Return true iff this object is "properly" registered.
bool verify_registration(HeapWord* address, ShenandoahMarkingContext* ctx);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTrace.cpp b/src/hotspot/share/gc/shenandoah/shenandoahTrace.cpp
index bbb44348355..c28e572dd6b 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahTrace.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahTrace.cpp
@@ -27,9 +27,7 @@
#include "jfr/jfrEvents.hpp"
void ShenandoahTracer::report_evacuation_info(const ShenandoahCollectionSet* cset,
- size_t free_regions, size_t regions_promoted_humongous, size_t regions_promoted_regular,
- size_t regular_promoted_garbage, size_t regular_promoted_free, size_t regions_immediate,
- size_t immediate_size) {
+ size_t free_regions, size_t regions_immediate, size_t immediate_size) {
EventShenandoahEvacuationInformation e;
if (e.should_commit()) {
@@ -37,13 +35,6 @@ void ShenandoahTracer::report_evacuation_info(const ShenandoahCollectionSet* cse
e.set_cSetRegions(cset->count());
e.set_cSetUsedBefore(cset->used());
e.set_cSetUsedAfter(cset->live());
- e.set_collectedOld(cset->get_live_bytes_in_old_regions());
- e.set_collectedPromoted(cset->get_live_bytes_in_tenurable_regions());
- e.set_collectedYoung(cset->get_live_bytes_in_untenurable_regions());
- e.set_regionsPromotedHumongous(regions_promoted_humongous);
- e.set_regionsPromotedRegular(regions_promoted_regular);
- e.set_regularPromotedGarbage(regular_promoted_garbage);
- e.set_regularPromotedFree(regular_promoted_free);
e.set_freeRegions(free_regions);
e.set_regionsImmediate(regions_immediate);
e.set_immediateBytes(immediate_size);
@@ -51,3 +42,24 @@ void ShenandoahTracer::report_evacuation_info(const ShenandoahCollectionSet* cse
e.commit();
}
}
+
+void ShenandoahTracer::report_promotion_info(const ShenandoahCollectionSet* cset,
+ size_t regions_promoted_humongous, size_t humongous_promoted_garbage, size_t humongous_promoted_free,
+ size_t regions_promoted_regular, size_t regular_promoted_garbage, size_t regular_promoted_free) {
+
+ EventShenandoahPromotionInformation e;
+ if (e.should_commit()) {
+ e.set_gcId(GCId::current());
+ e.set_collectedOld(cset->get_live_bytes_in_old_regions());
+ e.set_collectedPromoted(cset->get_live_bytes_in_tenurable_regions());
+ e.set_collectedYoung(cset->get_live_bytes_in_untenurable_regions());
+ e.set_regionsPromotedHumongous(regions_promoted_humongous);
+ e.set_humongousPromotedGarbage(humongous_promoted_garbage);
+ e.set_humongousPromotedFree(humongous_promoted_free);
+ e.set_regionsPromotedRegular(regions_promoted_regular);
+ e.set_regularPromotedGarbage(regular_promoted_garbage);
+ e.set_regularPromotedFree(regular_promoted_free);
+
+ e.commit();
+ }
+}
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTrace.hpp b/src/hotspot/share/gc/shenandoah/shenandoahTrace.hpp
index 116968103de..e5c80e0705f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahTrace.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahTrace.hpp
@@ -34,11 +34,14 @@ class ShenandoahTracer : public GCTracer, public CHeapObj {
public:
ShenandoahTracer() : GCTracer(Shenandoah) {}
- // Sends a JFR event (if enabled) summarizing the composition of the collection set
+ // Sends a JFR event summarizing the composition of the collection set
static void report_evacuation_info(const ShenandoahCollectionSet* cset,
- size_t free_regions, size_t regions_promoted_humongous, size_t regions_promoted_regular,
- size_t regular_promoted_garbage, size_t regular_promoted_free, size_t regions_immediate,
- size_t immediate_size);
+ size_t free_regions, size_t regions_immediate, size_t immediate_size);
+
+ // Sends a JFR event summarizing in-place promotion activity (generational mode only)
+ static void report_promotion_info(const ShenandoahCollectionSet* cset,
+ size_t regions_promoted_humongous, size_t humongous_promoted_garbage, size_t humongous_promoted_free,
+ size_t regions_promoted_regular, size_t regular_promoted_garbage, size_t regular_promoted_free);
};
#endif
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahUtils.cpp b/src/hotspot/share/gc/shenandoah/shenandoahUtils.cpp
index dea47fcbf4f..5af2e274833 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahUtils.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahUtils.cpp
@@ -56,15 +56,14 @@ const char* ShenandoahGCSession::cycle_end_message(ShenandoahGenerationType type
}
}
-ShenandoahGCSession::ShenandoahGCSession(GCCause::Cause cause, ShenandoahGeneration* generation) :
+ShenandoahGCSession::ShenandoahGCSession(GCCause::Cause cause, ShenandoahGeneration* generation,
+ bool is_degenerated, bool is_out_of_cycle) :
_heap(ShenandoahHeap::heap()),
_generation(generation),
_timer(_heap->gc_timer()),
_tracer(_heap->tracer()) {
assert(!ShenandoahGCPhase::is_current_phase_valid(), "No current GC phase");
-
- _heap->on_cycle_start(cause, _generation);
-
+ _heap->on_cycle_start(cause, _generation, is_degenerated, is_out_of_cycle);
_timer->register_gc_start();
_tracer->report_gc_start(cause, _timer->gc_start());
_heap->trace_heap_before_gc(_tracer);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp b/src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp
index 6ef4cd7c702..1ed6e43e3e1 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp
@@ -70,7 +70,8 @@ private:
static const char* cycle_end_message(ShenandoahGenerationType type);
public:
- ShenandoahGCSession(GCCause::Cause cause, ShenandoahGeneration* generation);
+ ShenandoahGCSession(GCCause::Cause cause, ShenandoahGeneration* generation,
+ bool is_degenerated = false, bool is_out_of_cycle = false);
~ShenandoahGCSession();
};
@@ -187,7 +188,7 @@ public:
type == VM_Operation::VMOp_ShenandoahFinalMarkStartEvac ||
type == VM_Operation::VMOp_ShenandoahInitUpdateRefs ||
type == VM_Operation::VMOp_ShenandoahFinalUpdateRefs ||
- type == VM_Operation::VMOp_ShenandoahFinalRoots ||
+ type == VM_Operation::VMOp_ShenandoahFinalVerify ||
type == VM_Operation::VMOp_ShenandoahFullGC ||
type == VM_Operation::VMOp_ShenandoahDegeneratedGC;
}
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.cpp b/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.cpp
index 6b45842f781..97dd7e5cda1 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.cpp
@@ -135,12 +135,12 @@ void VM_ShenandoahFinalUpdateRefs::doit() {
_gc->entry_final_update_refs();
}
-VM_ShenandoahFinalRoots::VM_ShenandoahFinalRoots(ShenandoahConcurrentGC* gc)
+VM_ShenandoahFinalVerify::VM_ShenandoahFinalVerify(ShenandoahConcurrentGC* gc)
: VM_ShenandoahOperation(gc->generation()), _gc(gc) {
}
-void VM_ShenandoahFinalRoots::doit() {
- ShenandoahGCPauseMark mark(_gc_id, "Final Roots", SvcGCMarker::CONCURRENT);
+void VM_ShenandoahFinalVerify::doit() {
+ ShenandoahGCPauseMark mark(_gc_id, "Final Verify", SvcGCMarker::CONCURRENT);
set_active_generation();
- _gc->entry_verify_final_roots();
+ _gc->entry_final_verify();
}
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.hpp b/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.hpp
index d565a3df22c..f8b99c71b14 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.hpp
@@ -38,7 +38,7 @@ class ShenandoahFullGC;
// - VM_ShenandoahFinalMarkStartEvac: finish up concurrent marking, and start evacuation
// - VM_ShenandoahInitUpdateRefs: initiate update references
// - VM_ShenandoahFinalUpdateRefs: finish up update references
-// - VM_ShenandoahFinalRoots: finish up roots on a non-evacuating cycle
+// - VM_ShenandoahFinalVerify: final verification at the end of the cycle
// - VM_ShenandoahReferenceOperation:
// - VM_ShenandoahFullGC: do full GC
// - VM_ShenandoahDegeneratedGC: do STW degenerated GC
@@ -127,12 +127,12 @@ public:
void doit() override;
};
-class VM_ShenandoahFinalRoots: public VM_ShenandoahOperation {
+class VM_ShenandoahFinalVerify: public VM_ShenandoahOperation {
ShenandoahConcurrentGC* const _gc;
public:
- explicit VM_ShenandoahFinalRoots(ShenandoahConcurrentGC* gc);
- VM_Operation::VMOp_Type type() const override { return VMOp_ShenandoahFinalRoots; }
- const char* name() const override { return "Shenandoah Final Roots"; }
+ explicit VM_ShenandoahFinalVerify(ShenandoahConcurrentGC* gc);
+ VM_Operation::VMOp_Type type() const override { return VMOp_ShenandoahFinalVerify; }
+ const char* name() const override { return "Shenandoah Final Verify"; }
void doit() override;
};
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
index afef11640c9..8299cbe62c6 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
@@ -1180,7 +1180,7 @@ void ShenandoahVerifier::verify_before_update_refs(ShenandoahGeneration* generat
);
}
-// We have not yet cleanup (reclaimed) the collection set
+// We have not yet cleaned up (reclaimed) the collection set
void ShenandoahVerifier::verify_after_update_refs(ShenandoahGeneration* generation) {
verify_at_safepoint(
generation,
@@ -1197,6 +1197,23 @@ void ShenandoahVerifier::verify_after_update_refs(ShenandoahGeneration* generati
);
}
+// We have not yet cleaned up (reclaimed) the collection set
+void ShenandoahVerifier::verify_after_gc(ShenandoahGeneration* generation) {
+ verify_at_safepoint(
+ generation,
+ "After GC",
+ _verify_remembered_disable, // do not verify remembered set
+ _verify_forwarded_none, // no forwarded references
+ _verify_marked_complete, // bitmaps might be stale, but alloc-after-mark should be well
+ _verify_cset_none, // no cset references, all updated
+ _verify_liveness_disable, // no reliable liveness data anymore
+ _verify_regions_nocset, // no cset regions, trash regions have appeared
+ // expect generation and heap sizes to match exactly, including trash
+ _verify_size_exact_including_trash,
+ _verify_gcstate_stable // GC state was turned off
+ );
+}
+
void ShenandoahVerifier::verify_after_degenerated(ShenandoahGeneration* generation) {
verify_at_safepoint(
generation,
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.hpp b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.hpp
index 7e683cf7af8..0479d5f67ce 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.hpp
@@ -220,6 +220,7 @@ public:
void verify_before_evacuation(ShenandoahGeneration* generation);
void verify_before_update_refs(ShenandoahGeneration* generation);
void verify_after_update_refs(ShenandoahGeneration* generation);
+ void verify_after_gc(ShenandoahGeneration* generation);
void verify_before_fullgc(ShenandoahGeneration* generation);
void verify_after_fullgc(ShenandoahGeneration* generation);
void verify_after_degenerated(ShenandoahGeneration* generation);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp b/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
index bbfa19934d9..2c5ba726ef2 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
@@ -560,9 +560,6 @@
product(bool, ShenandoahLoadRefBarrier, true, DIAGNOSTIC, \
"Turn on/off load-reference barriers in Shenandoah") \
\
- product(bool, ShenandoahStackWatermarkBarrier, true, DIAGNOSTIC, \
- "Turn on/off stack watermark barriers in Shenandoah") \
- \
develop(bool, ShenandoahVerifyOptoBarriers, trueInDebug, \
"Verify no missing barriers in C2.") \
\
diff --git a/src/hotspot/share/interpreter/interpreterRuntime.cpp b/src/hotspot/share/interpreter/interpreterRuntime.cpp
index e7b35b121a2..cd0a062ebc8 100644
--- a/src/hotspot/share/interpreter/interpreterRuntime.cpp
+++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp
@@ -36,6 +36,7 @@
#include "interpreter/interpreter.hpp"
#include "interpreter/interpreterRuntime.hpp"
#include "interpreter/linkResolver.hpp"
+#include "interpreter/oopMapCache.hpp"
#include "interpreter/templateTable.hpp"
#include "jvm_io.h"
#include "logging/log.hpp"
@@ -1527,4 +1528,17 @@ bool InterpreterRuntime::is_preemptable_call(address entry_point) {
entry_point == CAST_FROM_FN_PTR(address, InterpreterRuntime::resolve_from_cache) ||
entry_point == CAST_FROM_FN_PTR(address, InterpreterRuntime::_new);
}
+
+void InterpreterRuntime::generate_oop_map_alot() {
+ JavaThread* current = JavaThread::current();
+ LastFrameAccessor last_frame(current);
+ if (last_frame.is_interpreted_frame()) {
+ ResourceMark rm(current);
+ InterpreterOopMap mask;
+ methodHandle mh(current, last_frame.method());
+ int bci = last_frame.bci();
+ log_info(generateoopmap)("Generating oopmap for method %s at bci %d", mh->name_and_sig_as_C_string(), bci);
+ OopMapCache::compute_one_oop_map(mh, bci, &mask);
+ }
+}
#endif // ASSERT
diff --git a/src/hotspot/share/interpreter/interpreterRuntime.hpp b/src/hotspot/share/interpreter/interpreterRuntime.hpp
index 70ceeb0b2af..3228027fa93 100644
--- a/src/hotspot/share/interpreter/interpreterRuntime.hpp
+++ b/src/hotspot/share/interpreter/interpreterRuntime.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -173,6 +173,8 @@ private:
// Virtual Thread Preemption
DEBUG_ONLY(static bool is_preemptable_call(address entry_point);)
+
+ DEBUG_ONLY(static void generate_oop_map_alot();)
};
diff --git a/src/hotspot/share/interpreter/oopMapCache.cpp b/src/hotspot/share/interpreter/oopMapCache.cpp
index 5a1ad7b7883..af45f7f9bed 100644
--- a/src/hotspot/share/interpreter/oopMapCache.cpp
+++ b/src/hotspot/share/interpreter/oopMapCache.cpp
@@ -92,11 +92,8 @@ class OopMapForCacheEntry: public GenerateOopMap {
};
-OopMapForCacheEntry::OopMapForCacheEntry(const methodHandle& method, int bci, OopMapCacheEntry* entry) : GenerateOopMap(method) {
- _bci = bci;
- _entry = entry;
- _stack_top = -1;
-}
+OopMapForCacheEntry::OopMapForCacheEntry(const methodHandle& method, int bci, OopMapCacheEntry* entry) :
+ GenerateOopMap(method, /*all_exception_edges*/ true), _entry(entry), _bci(bci), _stack_top(-1) { }
bool OopMapForCacheEntry::compute_map(Thread* current) {
@@ -107,6 +104,11 @@ bool OopMapForCacheEntry::compute_map(Thread* current) {
} else {
ResourceMark rm;
if (!GenerateOopMap::compute_map(current)) {
+ // If compute_map fails, print the exception message, which is generated if
+ // this is a JavaThread, otherwise compute_map calls fatal so we don't get here.
+ if (exception() != nullptr) {
+ exception()->print();
+ }
fatal("Unrecoverable verification or out-of-memory error");
return false;
}
@@ -315,6 +317,9 @@ void OopMapCacheEntry::fill(const methodHandle& method, int bci) {
} else {
OopMapForCacheEntry gen(method, bci, this);
if (!gen.compute_map(Thread::current())) {
+ if (gen.exception() != nullptr) {
+ gen.exception()->print();
+ }
fatal("Unrecoverable verification or out-of-memory error");
}
}
diff --git a/src/hotspot/share/jfr/metadata/metadata.xml b/src/hotspot/share/jfr/metadata/metadata.xml
index 2b082165005..09d9e0ccabf 100644
--- a/src/hotspot/share/jfr/metadata/metadata.xml
+++ b/src/hotspot/share/jfr/metadata/metadata.xml
@@ -1273,16 +1273,22 @@
+
+
+
+
+
+
+
+
+
-
-
-
diff --git a/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp b/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp
index 426ba4e7650..969c9ca60c1 100644
--- a/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp
+++ b/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -281,7 +281,9 @@ TRACE_REQUEST_FUNC(SystemProcess) {
#if INCLUDE_JVMTI
template
-static void send_agent_event(AgentEvent& event, const JvmtiAgent* agent) {
+static void send_agent_event(AgentEvent& event, const JvmtiAgent* agent, Ticks& timestamp) {
+ event.set_starttime(timestamp);
+ event.set_endtime(timestamp);
event.set_name(agent->name());
event.set_options(agent->options());
event.set_dynamic(agent->is_dynamic());
@@ -292,29 +294,31 @@ static void send_agent_event(AgentEvent& event, const JvmtiAgent* agent) {
TRACE_REQUEST_FUNC(JavaAgent) {
JvmtiAgentList::Iterator it = JvmtiAgentList::java_agents();
+ Ticks ticks = timestamp();
while (it.has_next()) {
const JvmtiAgent* agent = it.next();
assert(agent->is_jplis(), "invariant");
EventJavaAgent event;
- send_agent_event(event, agent);
+ send_agent_event(event, agent, ticks);
}
}
-static void send_native_agent_events(JvmtiAgentList::Iterator& it) {
+static void send_native_agent_events(JvmtiAgentList::Iterator& it, Ticks& timestamp) {
while (it.has_next()) {
const JvmtiAgent* agent = it.next();
assert(!agent->is_jplis(), "invariant");
EventNativeAgent event;
event.set_path(agent->os_lib_path());
- send_agent_event(event, agent);
+ send_agent_event(event, agent, timestamp);
}
}
TRACE_REQUEST_FUNC(NativeAgent) {
+ Ticks ticks = timestamp();
JvmtiAgentList::Iterator native_agents_it = JvmtiAgentList::native_agents();
- send_native_agent_events(native_agents_it);
+ send_native_agent_events(native_agents_it, ticks);
JvmtiAgentList::Iterator xrun_agents_it = JvmtiAgentList::xrun_agents();
- send_native_agent_events(xrun_agents_it);
+ send_native_agent_events(xrun_agents_it, ticks);
}
#else // INCLUDE_JVMTI
TRACE_REQUEST_FUNC(JavaAgent) {}
diff --git a/src/hotspot/share/memory/metaspaceClosure.cpp b/src/hotspot/share/memory/metaspaceClosure.cpp
index 0239eadf692..0926b55b9a3 100644
--- a/src/hotspot/share/memory/metaspaceClosure.cpp
+++ b/src/hotspot/share/memory/metaspaceClosure.cpp
@@ -22,11 +22,11 @@
*
*/
-#include "cds/aotGrowableArray.hpp"
#include "classfile/packageEntry.hpp"
#include "memory/metaspaceClosure.hpp"
#include "oops/array.hpp"
#include "oops/instanceKlass.hpp"
+#include "utilities/growableArray.hpp"
// Sanity checks
static_assert(!HAS_METASPACE_POINTERS_DO(int));
@@ -35,8 +35,6 @@ static_assert(HAS_METASPACE_POINTERS_DO(Array));
static_assert(HAS_METASPACE_POINTERS_DO(Array));
static_assert(HAS_METASPACE_POINTERS_DO(InstanceKlass));
static_assert(HAS_METASPACE_POINTERS_DO(PackageEntry));
-static_assert(HAS_METASPACE_POINTERS_DO(AOTGrowableArray));
-static_assert(HAS_METASPACE_POINTERS_DO(AOTGrowableArray));
void MetaspaceClosure::push_impl(MetaspaceClosure::Ref* ref) {
if (_enclosing_ref != nullptr) {
diff --git a/src/hotspot/share/memory/metaspaceClosure.hpp b/src/hotspot/share/memory/metaspaceClosure.hpp
index b6ba69d6f63..ac42dd13c6c 100644
--- a/src/hotspot/share/memory/metaspaceClosure.hpp
+++ b/src/hotspot/share/memory/metaspaceClosure.hpp
@@ -25,7 +25,6 @@
#ifndef SHARE_MEMORY_METASPACECLOSURE_HPP
#define SHARE_MEMORY_METASPACECLOSURE_HPP
-#include "cds/aotGrowableArray.hpp"
#include "cppstdlib/type_traits.hpp"
#include "logging/log.hpp"
#include "memory/allocation.hpp"
@@ -90,7 +89,9 @@ public:
// int size_in_heapwords() const;
//
// Currently, the iterable types include all subtypes of MetsapceObj, as well
- // as GrowableArray, ModuleEntry and PackageEntry.
+ // as GrowableArray (C-heap allocated only), ModuleEntry, and PackageEntry.
+ //
+ // (Note that GrowableArray is supported specially and does not require the above functions.)
//
// Calling these functions would be trivial if these were virtual functions.
// However, to save space, MetaspaceObj has NO vtable. The vtable is introduced
@@ -303,11 +304,38 @@ private:
};
//--------------------------------
- // Support for AOTGrowableArray
+ // Support for GrowableArray
//--------------------------------
+ // GrowableArrayRef -- iterate an instance of GrowableArray.
+ template class GrowableArrayRef : public Ref {
+ GrowableArray** _mpp;
+ GrowableArray* dereference() const {
+ return *_mpp;
+ }
+
+ public:
+ GrowableArrayRef(GrowableArray** mpp, Writability w) : Ref(w), _mpp(mpp) {}
+
+ virtual void** mpp() const {
+ return (void**)_mpp;
+ }
+
+ virtual void metaspace_pointers_do(MetaspaceClosure *it) const {
+ GrowableArray* array = dereference();
+ log_trace(aot)("Iter(GrowableArray): %p [%d]", array, array->length());
+ array->assert_on_C_heap();
+ it->push_c_array(array->data_addr(), array->capacity());
+ }
+
+ virtual bool is_read_only_by_default() const { return false; }
+ virtual bool not_null() const { return dereference() != nullptr; }
+ virtual int size() const { return (int)heap_word_size(sizeof(*dereference())); }
+ virtual MetaspaceClosureType type() const { return MetaspaceClosureType::GrowableArrayType; }
+ };
+
// Abstract base class for MSOCArrayRef, MSOPointerCArrayRef and OtherCArrayRef.
- // These are used for iterating the buffer held by AOTGrowableArray.
+ // These are used for iterating the buffer held by GrowableArray.
template class CArrayRef : public Ref {
T** _mpp;
int _num_elems; // Number of elements
@@ -354,7 +382,7 @@ private:
// MSOCArrayRef -- iterate a C array of type T, where T has metaspace_pointer_do().
// We recursively call T::metaspace_pointers_do() for each element in this array.
- // This is for supporting AOTGrowableArray.
+ // This is for supporting GrowableArray.
//
// E.g., PackageEntry* _pkg_entry_pointers[2]; // a buffer that has 2 PackageEntry objects
// ...
@@ -377,7 +405,7 @@ private:
// MSOPointerCArrayRef -- iterate a C array of type T*, where T has metaspace_pointer_do().
// We recursively call MetaspaceClosure::push() for each pointer in this array.
- // This is for supporting AOTGrowableArray.
+ // This is for supporting GrowableArray.
//
// E.g., PackageEntry** _pkg_entry_pointers[2]; // a buffer that has 2 PackageEntry pointers
// ...
@@ -440,11 +468,11 @@ public:
// Array*>* a4 = ...; it->push(&a4); => MSOPointerArrayRef
// Array* a5 = ...; it->push(&a5); => MSOPointerArrayRef
//
- // AOTGrowableArrays have a separate "C array" buffer, so they are scanned in two steps:
+ // GrowableArrays have a separate "C array" buffer, so they are scanned in two steps:
//
- // AOTGrowableArray* ga1 = ...; it->push(&ga1); => MSORef => OtherCArrayRef
- // AOTGrowableArray* ga2 = ...; it->push(&ga2); => MSORef => MSOCArrayRef
- // AOTGrowableArray* ga3 = ...; it->push(&ga3); => MSORef => MSOPointerCArrayRef
+ // GrowableArray* ga1 = ...; it->push(&ga1); => GrowableArrayRef => OtherCArrayRef
+ // GrowableArray* ga2 = ...; it->push(&ga2); => GrowableArrayRef => MSOCArrayRef
+ // GrowableArray* ga3 = ...; it->push(&ga3); => GrowableArrayRef => MSOPointerCArrayRef
//
// Note that the following will fail to compile:
//
@@ -476,7 +504,12 @@ public:
push_with_ref>(mpp, w);
}
- // --- The buffer of AOTGrowableArray
+ template
+ void push(GrowableArray** mpp, Writability w = _default) {
+ push_with_ref>(mpp, w);
+ }
+
+ // --- The buffer of GrowableArray
template
void push_c_array(T** mpp, int num_elems, Writability w = _default) {
push_impl(new OtherCArrayRef(mpp, num_elems, w));
diff --git a/src/hotspot/share/oops/generateOopMap.cpp b/src/hotspot/share/oops/generateOopMap.cpp
index 09912aeaf63..56f3e7e0325 100644
--- a/src/hotspot/share/oops/generateOopMap.cpp
+++ b/src/hotspot/share/oops/generateOopMap.cpp
@@ -1168,42 +1168,46 @@ void GenerateOopMap::interp_bb(BasicBlock *bb) {
}
void GenerateOopMap::do_exception_edge(BytecodeStream* itr) {
- // Only check exception edge, if bytecode can trap
- if (!Bytecodes::can_trap(itr->code())) return;
- switch (itr->code()) {
- case Bytecodes::_aload_0:
- // These bytecodes can trap for rewriting. We need to assume that
- // they do not throw exceptions to make the monitor analysis work.
- return;
- case Bytecodes::_ireturn:
- case Bytecodes::_lreturn:
- case Bytecodes::_freturn:
- case Bytecodes::_dreturn:
- case Bytecodes::_areturn:
- case Bytecodes::_return:
- // If the monitor stack height is not zero when we leave the method,
- // then we are either exiting with a non-empty stack or we have
- // found monitor trouble earlier in our analysis. In either case,
- // assume an exception could be taken here.
- if (_monitor_top == 0) {
+ // Only check exception edge, if bytecode can trap or if async exceptions can be thrown
+ // from any bytecode in the interpreter when single stepping.
+ if (!_all_exception_edges) {
+ if (!Bytecodes::can_trap(itr->code())) return;
+ switch (itr->code()) {
+ case Bytecodes::_aload_0:
+ // These bytecodes can trap for rewriting. We need to assume that
+ // they do not throw exceptions to make the monitor analysis work.
return;
- }
- break;
- case Bytecodes::_monitorexit:
- // If the monitor stack height is bad_monitors, then we have detected a
- // monitor matching problem earlier in the analysis. If the
- // monitor stack height is 0, we are about to pop a monitor
- // off of an empty stack. In either case, the bytecode
- // could throw an exception.
- if (_monitor_top != bad_monitors && _monitor_top != 0) {
- return;
- }
- break;
+ case Bytecodes::_ireturn:
+ case Bytecodes::_lreturn:
+ case Bytecodes::_freturn:
+ case Bytecodes::_dreturn:
+ case Bytecodes::_areturn:
+ case Bytecodes::_return:
+ // If the monitor stack height is not zero when we leave the method,
+ // then we are either exiting with a non-empty stack or we have
+ // found monitor trouble earlier in our analysis. In either case,
+ // assume an exception could be taken here.
+ if (_monitor_top == 0) {
+ return;
+ }
+ break;
- default:
- break;
+ case Bytecodes::_monitorexit:
+ // If the monitor stack height is bad_monitors, then we have detected a
+ // monitor matching problem earlier in the analysis. If the
+ // monitor stack height is 0, we are about to pop a monitor
+ // off of an empty stack. In either case, the bytecode
+ // could throw an exception.
+ if (_monitor_top != bad_monitors && _monitor_top != 0) {
+ return;
+ }
+ break;
+
+ default:
+ break;
+ }
}
if (_has_exceptions) {
@@ -2055,12 +2059,12 @@ void GenerateOopMap::print_time() {
//
// ============ Main Entry Point ===========
//
-GenerateOopMap::GenerateOopMap(const methodHandle& method) {
+GenerateOopMap::GenerateOopMap(const methodHandle& method, bool all_exception_edges) :
// We have to initialize all variables here, that can be queried directly
- _method = method;
- _max_locals=0;
- _init_vars = nullptr;
-}
+ _method(method),
+ _max_locals(0),
+ _all_exception_edges(all_exception_edges),
+ _init_vars(nullptr) {}
bool GenerateOopMap::compute_map(Thread* current) {
#ifndef PRODUCT
@@ -2187,7 +2191,7 @@ void GenerateOopMap::result_for_basicblock(int bci) {
// Find basicblock and report results
BasicBlock* bb = get_basic_block_containing(bci);
guarantee(bb != nullptr, "no basic block for bci");
- assert(bb->is_reachable(), "getting result from unreachable basicblock %d", bci);
+ assert(bb->is_reachable(), "getting result from unreachable basicblock at bci %d", bci);
bb->set_changed(true);
interp_bb(bb);
}
diff --git a/src/hotspot/share/oops/generateOopMap.hpp b/src/hotspot/share/oops/generateOopMap.hpp
index 783e295f08a..f0fdfeda57f 100644
--- a/src/hotspot/share/oops/generateOopMap.hpp
+++ b/src/hotspot/share/oops/generateOopMap.hpp
@@ -307,6 +307,7 @@ class GenerateOopMap {
bool _did_relocation; // was relocation necessary
bool _monitor_safe; // The monitors in this method have been determined
// to be safe.
+ bool _all_exception_edges; // All bytecodes can reach containing exception handler.
// Working Cell type state
int _state_len; // Size of states
@@ -455,7 +456,7 @@ class GenerateOopMap {
friend class RelocCallback;
public:
- GenerateOopMap(const methodHandle& method);
+ GenerateOopMap(const methodHandle& method, bool all_exception_edges);
// Compute the map - returns true on success and false on error.
bool compute_map(Thread* current);
@@ -516,7 +517,7 @@ class ResolveOopMapConflicts: public GenerateOopMap {
#endif
public:
- ResolveOopMapConflicts(const methodHandle& method) : GenerateOopMap(method) { }
+ ResolveOopMapConflicts(const methodHandle& method) : GenerateOopMap(method, true) { }
methodHandle do_potential_rewrite(TRAPS);
};
@@ -535,7 +536,7 @@ class GeneratePairingInfo: public GenerateOopMap {
CellTypeState* stack,
int stack_top) {}
public:
- GeneratePairingInfo(const methodHandle& method) : GenerateOopMap(method) {};
+ GeneratePairingInfo(const methodHandle& method) : GenerateOopMap(method, false) {};
// Call compute_map() to generate info.
};
diff --git a/src/hotspot/share/oops/methodData.cpp b/src/hotspot/share/oops/methodData.cpp
index ad1049ffa34..dc0b8fa9f81 100644
--- a/src/hotspot/share/oops/methodData.cpp
+++ b/src/hotspot/share/oops/methodData.cpp
@@ -667,8 +667,8 @@ void MultiBranchData::print_data_on(outputStream* st, const char* extra) const {
void ArgInfoData::print_data_on(outputStream* st, const char* extra) const {
print_shared(st, "ArgInfoData", extra);
- int nargs = number_of_args();
- for (int i = 0; i < nargs; i++) {
+ int args_size = size_of_args();
+ for (int i = 0; i < args_size; i++) {
st->print(" 0x%x", arg_modified(i));
}
st->cr();
diff --git a/src/hotspot/share/oops/methodData.hpp b/src/hotspot/share/oops/methodData.hpp
index 196537359b5..45529618afb 100644
--- a/src/hotspot/share/oops/methodData.hpp
+++ b/src/hotspot/share/oops/methodData.hpp
@@ -1751,7 +1751,7 @@ public:
virtual bool is_ArgInfoData() const { return true; }
- int number_of_args() const {
+ int size_of_args() const {
return array_len();
}
diff --git a/src/hotspot/share/oops/methodData.inline.hpp b/src/hotspot/share/oops/methodData.inline.hpp
index dee14d49253..b417ba867fc 100644
--- a/src/hotspot/share/oops/methodData.inline.hpp
+++ b/src/hotspot/share/oops/methodData.inline.hpp
@@ -59,7 +59,7 @@ inline uint MethodData::arg_modified(int a) {
MutexLocker ml(extra_data_lock(), Mutex::_no_safepoint_check_flag);
ArgInfoData* aid = arg_info();
assert(aid != nullptr, "arg_info must be not null");
- assert(a >= 0 && a < aid->number_of_args(), "valid argument number");
+ assert(a >= 0 && a < aid->size_of_args(), "valid argument number");
return aid->arg_modified(a);
}
@@ -68,7 +68,7 @@ inline void MethodData::set_arg_modified(int a, uint v) {
MutexLocker ml(extra_data_lock(), Mutex::_no_safepoint_check_flag);
ArgInfoData* aid = arg_info();
assert(aid != nullptr, "arg_info must be not null");
- assert(a >= 0 && a < aid->number_of_args(), "valid argument number");
+ assert(a >= 0 && a < aid->size_of_args(), "valid argument number");
aid->set_arg_modified(a, v);
}
diff --git a/src/hotspot/share/oops/trainingData.hpp b/src/hotspot/share/oops/trainingData.hpp
index bd696f52a8b..a6decdce7f0 100644
--- a/src/hotspot/share/oops/trainingData.hpp
+++ b/src/hotspot/share/oops/trainingData.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -217,11 +217,7 @@ public:
return *prior;
}
template
- void iterate(const Function& fn) const { // lambda enabled API
- iterate(const_cast(fn));
- }
- template
- void iterate(Function& fn) const { // lambda enabled API
+ void iterate(Function fn) const { // lambda enabled API
return _table.iterate_all([&](const TrainingData::Key* k, TrainingData* td) { fn(td); });
}
int size() const { return _table.number_of_entries(); }
@@ -304,10 +300,7 @@ private:
}
template
- static void iterate(const Function& fn) { iterate(const_cast(fn)); }
-
- template
- static void iterate(Function& fn) { // lambda enabled API
+ static void iterate(Function fn) { // lambda enabled API
TrainingDataLocker l;
if (have_data()) {
archived_training_data_dictionary()->iterate_all(fn);
diff --git a/src/hotspot/share/opto/block.cpp b/src/hotspot/share/opto/block.cpp
index 7d3d4ec16f4..a93e2e43a29 100644
--- a/src/hotspot/share/opto/block.cpp
+++ b/src/hotspot/share/opto/block.cpp
@@ -179,9 +179,11 @@ int Block::is_Empty() const {
// Ideal nodes (except BoxLock) are allowable in empty blocks: skip them. Only
// Mach and BoxLock nodes turn directly into code via emit().
+ // Keep ReachabilityFence for diagnostic purposes.
while ((end_idx > 0) &&
!get_node(end_idx)->is_Mach() &&
- !get_node(end_idx)->is_BoxLock()) {
+ !get_node(end_idx)->is_BoxLock() &&
+ !get_node(end_idx)->is_ReachabilityFence()) {
end_idx--;
}
diff --git a/src/hotspot/share/opto/c2_globals.hpp b/src/hotspot/share/opto/c2_globals.hpp
index 6974d50741e..dacc8ce9c26 100644
--- a/src/hotspot/share/opto/c2_globals.hpp
+++ b/src/hotspot/share/opto/c2_globals.hpp
@@ -76,6 +76,17 @@
develop(bool, StressBailout, false, \
"Perform bailouts randomly at C2 failing() checks") \
\
+ product(bool, OptimizeReachabilityFences, true, DIAGNOSTIC, \
+ "Optimize reachability fences " \
+ "(leave reachability fence nodes intact when turned off)") \
+ \
+ product(bool, PreserveReachabilityFencesOnConstants, false, DIAGNOSTIC, \
+ "Keep reachability fences on compile-time constants") \
+ \
+ product(bool, StressReachabilityFences, false, DIAGNOSTIC, \
+ "Aggressively insert reachability fences " \
+ "for all oop method arguments") \
+ \
develop(uint, StressBailoutMean, 100000, \
"The expected number of failing() checks made until " \
"a random bailout.") \
diff --git a/src/hotspot/share/opto/c2compiler.cpp b/src/hotspot/share/opto/c2compiler.cpp
index ead1b78cdea..5d170f919c8 100644
--- a/src/hotspot/share/opto/c2compiler.cpp
+++ b/src/hotspot/share/opto/c2compiler.cpp
@@ -775,6 +775,7 @@ bool C2Compiler::is_intrinsic_supported(vmIntrinsics::ID id) {
case vmIntrinsics::_longBitsToDouble:
case vmIntrinsics::_Reference_get0:
case vmIntrinsics::_Reference_refersTo0:
+ case vmIntrinsics::_Reference_reachabilityFence:
case vmIntrinsics::_PhantomReference_refersTo0:
case vmIntrinsics::_Reference_clear0:
case vmIntrinsics::_PhantomReference_clear0:
diff --git a/src/hotspot/share/opto/callGenerator.cpp b/src/hotspot/share/opto/callGenerator.cpp
index 1465da02ac8..49897ca3c17 100644
--- a/src/hotspot/share/opto/callGenerator.cpp
+++ b/src/hotspot/share/opto/callGenerator.cpp
@@ -611,6 +611,20 @@ void CallGenerator::do_late_inline_helper() {
}
Compile* C = Compile::current();
+
+ uint endoff = call->jvms()->endoff();
+ if (C->inlining_incrementally()) {
+ // No reachability edges should be present when incremental inlining takes place.
+ // Inlining logic doesn't expect any extra edges past debug info and fails with
+ // an assert in SafePointNode::grow_stack.
+ assert(endoff == call->req(), "reachability edges not supported");
+ } else {
+ if (call->req() > endoff) { // reachability edges present
+ assert(OptimizeReachabilityFences, "required");
+ return; // keep the original call node as the holder of reachability info
+ }
+ }
+
// Remove inlined methods from Compiler's lists.
if (call->is_macro()) {
C->remove_macro_node(call);
diff --git a/src/hotspot/share/opto/callnode.cpp b/src/hotspot/share/opto/callnode.cpp
index b2b01079379..eb4f506d14f 100644
--- a/src/hotspot/share/opto/callnode.cpp
+++ b/src/hotspot/share/opto/callnode.cpp
@@ -898,7 +898,7 @@ bool CallNode::may_modify(const TypeOopPtr* t_oop, PhaseValues* phase) const {
}
// Does this call have a direct reference to n other than debug information?
-bool CallNode::has_non_debug_use(Node *n) {
+bool CallNode::has_non_debug_use(const Node *n) {
const TypeTuple * d = tf()->domain();
for (uint i = TypeFunc::Parms; i < d->cnt(); i++) {
Node *arg = in(i);
@@ -940,7 +940,7 @@ Node *CallNode::result_cast() {
}
-void CallNode::extract_projections(CallProjections* projs, bool separate_io_proj, bool do_asserts) const {
+void CallNode::extract_projections(CallProjections* projs, bool separate_io_proj, bool do_asserts, bool allow_handlers) const {
projs->fallthrough_proj = nullptr;
projs->fallthrough_catchproj = nullptr;
projs->fallthrough_ioproj = nullptr;
@@ -961,14 +961,13 @@ void CallNode::extract_projections(CallProjections* projs, bool separate_io_proj
projs->fallthrough_proj = pn;
const Node* cn = pn->unique_ctrl_out_or_null();
if (cn != nullptr && cn->is_Catch()) {
- ProjNode *cpn = nullptr;
for (DUIterator_Fast kmax, k = cn->fast_outs(kmax); k < kmax; k++) {
- cpn = cn->fast_out(k)->as_Proj();
- assert(cpn->is_CatchProj(), "must be a CatchProjNode");
- if (cpn->_con == CatchProjNode::fall_through_index)
+ CatchProjNode* cpn = cn->fast_out(k)->as_CatchProj();
+ assert(allow_handlers || !cpn->is_handler_proj(), "not allowed");
+ if (cpn->_con == CatchProjNode::fall_through_index) {
+ assert(cpn->handler_bci() == CatchProjNode::no_handler_bci, "");
projs->fallthrough_catchproj = cpn;
- else {
- assert(cpn->_con == CatchProjNode::catch_all_index, "must be correct index.");
+ } else if (!cpn->is_handler_proj()) {
projs->catchall_catchproj = cpn;
}
}
@@ -976,15 +975,20 @@ void CallNode::extract_projections(CallProjections* projs, bool separate_io_proj
break;
}
case TypeFunc::I_O:
- if (pn->_is_io_use)
+ if (pn->_is_io_use) {
projs->catchall_ioproj = pn;
- else
+ } else {
projs->fallthrough_ioproj = pn;
+ }
for (DUIterator j = pn->outs(); pn->has_out(j); j++) {
Node* e = pn->out(j);
- if (e->Opcode() == Op_CreateEx && e->in(0)->is_CatchProj() && e->outcnt() > 0) {
- assert(projs->exobj == nullptr, "only one");
- projs->exobj = e;
+ if (e->Opcode() == Op_CreateEx && e->outcnt() > 0) {
+ CatchProjNode* ecpn = e->in(0)->isa_CatchProj();
+ assert(allow_handlers || ecpn == nullptr || !ecpn->is_handler_proj(), "not allowed");
+ if (ecpn != nullptr && ecpn->_con != CatchProjNode::fall_through_index && !ecpn->is_handler_proj()) {
+ assert(projs->exobj == nullptr, "only one");
+ projs->exobj = e;
+ }
}
}
break;
@@ -1609,6 +1613,33 @@ void SafePointNode::disconnect_from_root(PhaseIterGVN *igvn) {
}
}
+void SafePointNode::remove_non_debug_edges(NodeEdgeTempStorage& non_debug_edges) {
+ assert(non_debug_edges._state == NodeEdgeTempStorage::state_initial, "not processed");
+ assert(non_debug_edges.is_empty(), "edges not processed");
+
+ while (req() > jvms()->endoff()) {
+ uint last = req() - 1;
+ non_debug_edges.push(in(last));
+ del_req(last);
+ }
+
+ assert(jvms()->endoff() == req(), "no extra edges past debug info allowed");
+ DEBUG_ONLY(non_debug_edges._state = NodeEdgeTempStorage::state_populated);
+}
+
+void SafePointNode::restore_non_debug_edges(NodeEdgeTempStorage& non_debug_edges) {
+ assert(non_debug_edges._state == NodeEdgeTempStorage::state_populated, "not populated");
+ assert(jvms()->endoff() == req(), "no extra edges past debug info allowed");
+
+ while (!non_debug_edges.is_empty()) {
+ Node* non_debug_edge = non_debug_edges.pop();
+ add_req(non_debug_edge);
+ }
+
+ assert(non_debug_edges.is_empty(), "edges not processed");
+ DEBUG_ONLY(non_debug_edges._state = NodeEdgeTempStorage::state_processed);
+}
+
//============== SafePointScalarObjectNode ==============
SafePointScalarObjectNode::SafePointScalarObjectNode(const TypeOopPtr* tp, Node* alloc, uint first_index, uint depth, uint n_fields) :
diff --git a/src/hotspot/share/opto/callnode.hpp b/src/hotspot/share/opto/callnode.hpp
index 5241ae6cd2b..e4c548fc744 100644
--- a/src/hotspot/share/opto/callnode.hpp
+++ b/src/hotspot/share/opto/callnode.hpp
@@ -503,6 +503,66 @@ public:
return _has_ea_local_in_scope;
}
+ // A temporary storge for node edges.
+ // Intended for a single use.
+ class NodeEdgeTempStorage : public StackObj {
+ friend class SafePointNode;
+
+ PhaseIterGVN& _igvn;
+ Node* _node_hook;
+
+#ifdef ASSERT
+ enum State { state_initial, state_populated, state_processed };
+
+ State _state; // monotonically transitions from initial to processed state.
+#endif // ASSERT
+
+ bool is_empty() const {
+ return _node_hook == nullptr || _node_hook->req() == 1;
+ }
+ void push(Node* n) {
+ assert(n != nullptr, "");
+ if (_node_hook == nullptr) {
+ _node_hook = new Node(nullptr);
+ }
+ _node_hook->add_req(n);
+ }
+ Node* pop() {
+ assert(!is_empty(), "");
+ int idx = _node_hook->req()-1;
+ Node* r = _node_hook->in(idx);
+ _node_hook->del_req(idx);
+ assert(r != nullptr, "");
+ return r;
+ }
+
+ public:
+ NodeEdgeTempStorage(PhaseIterGVN &igvn) : _igvn(igvn), _node_hook(nullptr)
+ DEBUG_ONLY(COMMA _state(state_initial)) {
+ assert(is_empty(), "");
+ }
+
+ ~NodeEdgeTempStorage() {
+ assert(_state == state_processed, "not processed");
+ assert(is_empty(), "");
+ if (_node_hook != nullptr) {
+ _node_hook->destruct(&_igvn);
+ }
+ }
+
+ void remove_edge_if_present(Node* n) {
+ if (!is_empty()) {
+ int idx = _node_hook->find_edge(n);
+ if (idx > 0) {
+ _node_hook->del_req(idx);
+ }
+ }
+ }
+ };
+
+ void remove_non_debug_edges(NodeEdgeTempStorage& non_debug_edges);
+ void restore_non_debug_edges(NodeEdgeTempStorage& non_debug_edges);
+
void disconnect_from_root(PhaseIterGVN *igvn);
// Standard Node stuff
@@ -736,7 +796,7 @@ public:
// Returns true if the call may modify n
virtual bool may_modify(const TypeOopPtr* t_oop, PhaseValues* phase) const;
// Does this node have a use of n other than in debug information?
- bool has_non_debug_use(Node* n);
+ bool has_non_debug_use(const Node* n);
// Returns the unique CheckCastPP of a call
// or result projection is there are several CheckCastPP
// or returns null if there is no one.
@@ -751,7 +811,10 @@ public:
// Collect all the interesting edges from a call for use in
// replacing the call by something else. Used by macro expansion
// and the late inlining support.
- void extract_projections(CallProjections* projs, bool separate_io_proj, bool do_asserts = true) const;
+ void extract_projections(CallProjections* projs,
+ bool separate_io_proj,
+ bool do_asserts = true,
+ bool allow_handlers = false) const;
virtual uint match_edge(uint idx) const;
diff --git a/src/hotspot/share/opto/castnode.cpp b/src/hotspot/share/opto/castnode.cpp
index 54269a56c19..7bb6b1dcb77 100644
--- a/src/hotspot/share/opto/castnode.cpp
+++ b/src/hotspot/share/opto/castnode.cpp
@@ -413,6 +413,43 @@ Node* CastLLNode::Ideal(PhaseGVN* phase, bool can_reshape) {
return nullptr;
}
+// CastPPNodes are removed before matching, while alias classes are needed in global code motion.
+// As a result, it is not valid for a CastPPNode to change the oop such that the derived pointers
+// lie in different alias classes with and without the node. For example, a CastPPNode c may not
+// cast an Object to a Bottom[], because later removal of c would affect the alias class of c's
+// array length field (c + arrayOopDesc::length_offset_in_bytes()).
+//
+// This function verifies that a CastPPNode on an oop does not violate the aforementioned property.
+//
+// TODO 8382147: Currently, this verification only applies during the construction of a CastPPNode,
+// we may want to apply the same verification during IGVN transformations, as well as final graph
+// reshaping.
+void CastPPNode::verify_type(const Type* in_type, const Type* out_type) {
+#ifdef ASSERT
+ out_type = out_type->join(in_type);
+ if (in_type->empty() || out_type->empty()) {
+ return;
+ }
+ if (in_type == TypePtr::NULL_PTR || out_type == TypePtr::NULL_PTR) {
+ return;
+ }
+ if (!in_type->isa_oopptr() && !out_type->isa_oopptr()) {
+ return;
+ }
+
+ assert(in_type->isa_oopptr() && out_type->isa_oopptr(), "must be both oops or both non-oops");
+ if (in_type->isa_aryptr() && out_type->isa_aryptr()) {
+ const Type* e1 = in_type->is_aryptr()->elem();
+ const Type* e2 = out_type->is_aryptr()->elem();
+ assert(e1->basic_type() == e2->basic_type(), "must both be arrays of the same primitive type or both be oops arrays");
+ return;
+ }
+
+ assert(in_type->isa_instptr() && out_type->isa_instptr(), "must be both array oops or both non-array oops");
+ assert(in_type->is_instptr()->instance_klass() == out_type->is_instptr()->instance_klass(), "must not cast to a different type");
+#endif // ASSERT
+}
+
//------------------------------Value------------------------------------------
// Take 'join' of input and cast-up type, unless working with an Interface
const Type* CheckCastPPNode::Value(PhaseGVN* phase) const {
@@ -440,6 +477,11 @@ const Type* CheckCastPPNode::Value(PhaseGVN* phase) const {
return result;
}
+Node* CheckCastPPNode::pin_node_under_control_impl() const {
+ assert(_dependency.is_floating(), "already pinned");
+ return new CheckCastPPNode(in(0), in(1), bottom_type(), _dependency.with_pinned_dependency(), _extra_types);
+}
+
//=============================================================================
//------------------------------Value------------------------------------------
const Type* CastX2PNode::Value(PhaseGVN* phase) const {
diff --git a/src/hotspot/share/opto/castnode.hpp b/src/hotspot/share/opto/castnode.hpp
index 38545fd6f41..dce54eb73c0 100644
--- a/src/hotspot/share/opto/castnode.hpp
+++ b/src/hotspot/share/opto/castnode.hpp
@@ -303,14 +303,18 @@ public:
//------------------------------CastPPNode-------------------------------------
// cast pointer to pointer (different type)
-class CastPPNode: public ConstraintCastNode {
- public:
- CastPPNode (Node* ctrl, Node* n, const Type* t, const DependencyType& dependency = DependencyType::FloatingNarrowing, const TypeTuple* types = nullptr)
+class CastPPNode : public ConstraintCastNode {
+public:
+ CastPPNode(Node* ctrl, Node* n, const Type* t, const DependencyType& dependency = DependencyType::FloatingNarrowing, const TypeTuple* types = nullptr)
: ConstraintCastNode(ctrl, n, t, dependency, types) {
init_class_id(Class_CastPP);
+ verify_type(n->bottom_type(), t);
}
virtual int Opcode() const;
virtual uint ideal_reg() const { return Op_RegP; }
+
+private:
+ static void verify_type(const Type* in_type, const Type* out_type);
};
//------------------------------CheckCastPPNode--------------------------------
@@ -329,6 +333,7 @@ class CheckCastPPNode: public ConstraintCastNode {
private:
virtual bool depends_only_on_test_impl() const { return !type()->isa_rawptr() && ConstraintCastNode::depends_only_on_test_impl(); }
+ virtual Node* pin_node_under_control_impl() const;
};
diff --git a/src/hotspot/share/opto/classes.cpp b/src/hotspot/share/opto/classes.cpp
index b760a179b57..1cd6c52393b 100644
--- a/src/hotspot/share/opto/classes.cpp
+++ b/src/hotspot/share/opto/classes.cpp
@@ -43,6 +43,7 @@
#include "opto/narrowptrnode.hpp"
#include "opto/node.hpp"
#include "opto/opaquenode.hpp"
+#include "opto/reachability.hpp"
#include "opto/rootnode.hpp"
#include "opto/subnode.hpp"
#include "opto/subtypenode.hpp"
diff --git a/src/hotspot/share/opto/classes.hpp b/src/hotspot/share/opto/classes.hpp
index d9290492337..0f67cf90183 100644
--- a/src/hotspot/share/opto/classes.hpp
+++ b/src/hotspot/share/opto/classes.hpp
@@ -396,6 +396,7 @@ macro(AddVL)
macro(AddReductionVL)
macro(AddVF)
macro(AddVHF)
+macro(AddReductionVHF)
macro(AddReductionVF)
macro(AddVD)
macro(AddReductionVD)
@@ -413,6 +414,7 @@ macro(MulReductionVI)
macro(MulVL)
macro(MulReductionVL)
macro(MulVF)
+macro(MulReductionVHF)
macro(MulReductionVF)
macro(MulVD)
macro(MulReductionVD)
@@ -547,3 +549,4 @@ macro(MaskAll)
macro(AndVMask)
macro(OrVMask)
macro(XorVMask)
+macro(ReachabilityFence)
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index 7b5f78a8ad3..e05df8ea716 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -74,6 +74,7 @@
#include "opto/output.hpp"
#include "opto/parse.hpp"
#include "opto/phaseX.hpp"
+#include "opto/reachability.hpp"
#include "opto/rootnode.hpp"
#include "opto/runtime.hpp"
#include "opto/stringopts.hpp"
@@ -396,6 +397,9 @@ void Compile::remove_useless_node(Node* dead) {
if (dead->is_expensive()) {
remove_expensive_node(dead);
}
+ if (dead->is_ReachabilityFence()) {
+ remove_reachability_fence(dead->as_ReachabilityFence());
+ }
if (dead->is_OpaqueTemplateAssertionPredicate()) {
remove_template_assertion_predicate_opaque(dead->as_OpaqueTemplateAssertionPredicate());
}
@@ -459,6 +463,7 @@ void Compile::disconnect_useless_nodes(Unique_Node_List& useful, Unique_Node_Lis
// Remove useless Template Assertion Predicate opaque nodes
remove_useless_nodes(_template_assertion_predicate_opaques, useful);
remove_useless_nodes(_expensive_nodes, useful); // remove useless expensive nodes
+ remove_useless_nodes(_reachability_fences, useful); // remove useless node recorded for post loop opts IGVN pass
remove_useless_nodes(_for_post_loop_igvn, useful); // remove useless node recorded for post loop opts IGVN pass
remove_useless_nodes(_for_merge_stores_igvn, useful); // remove useless node recorded for merge stores IGVN pass
remove_useless_unstable_if_traps(useful); // remove useless unstable_if traps
@@ -665,6 +670,7 @@ Compile::Compile(ciEnv* ci_env, ciMethod* target, int osr_bci,
_parse_predicates(comp_arena(), 8, 0, nullptr),
_template_assertion_predicate_opaques(comp_arena(), 8, 0, nullptr),
_expensive_nodes(comp_arena(), 8, 0, nullptr),
+ _reachability_fences(comp_arena(), 8, 0, nullptr),
_for_post_loop_igvn(comp_arena(), 8, 0, nullptr),
_for_merge_stores_igvn(comp_arena(), 8, 0, nullptr),
_unstable_if_traps(comp_arena(), 8, 0, nullptr),
@@ -934,6 +940,7 @@ Compile::Compile(ciEnv* ci_env,
_directive(directive),
_log(ci_env->log()),
_first_failure_details(nullptr),
+ _reachability_fences(comp_arena(), 8, 0, nullptr),
_for_post_loop_igvn(comp_arena(), 8, 0, nullptr),
_for_merge_stores_igvn(comp_arena(), 8, 0, nullptr),
_congraph(nullptr),
@@ -2510,12 +2517,23 @@ void Compile::Optimize() {
return;
}
- if (failing()) return;
-
C->clear_major_progress(); // ensure that major progress is now clear
process_for_post_loop_opts_igvn(igvn);
+ if (failing()) return;
+
+ // Once loop optimizations are over, it is safe to get rid of all reachability fence nodes and
+ // migrate reachability edges to safepoints.
+ if (OptimizeReachabilityFences && _reachability_fences.length() > 0) {
+ TracePhase tp1(_t_idealLoop);
+ TracePhase tp2(_t_reachability);
+ PhaseIdealLoop::optimize(igvn, PostLoopOptsExpandReachabilityFences);
+ print_method(PHASE_EXPAND_REACHABILITY_FENCES, 2);
+ if (failing()) return;
+ assert(_reachability_fences.length() == 0 || PreserveReachabilityFencesOnConstants, "no RF nodes allowed");
+ }
+
process_for_merge_stores_igvn(igvn);
if (failing()) return;
@@ -3182,10 +3200,10 @@ void Compile::final_graph_reshaping_impl(Node *n, Final_Reshape_Counts& frc, Uni
!n->in(2)->is_Con() ) { // right use is not a constant
// Check for commutative opcode
switch( nop ) {
- case Op_AddI: case Op_AddF: case Op_AddD: case Op_AddL:
+ case Op_AddI: case Op_AddF: case Op_AddD: case Op_AddHF: case Op_AddL:
case Op_MaxI: case Op_MaxL: case Op_MaxF: case Op_MaxD:
case Op_MinI: case Op_MinL: case Op_MinF: case Op_MinD:
- case Op_MulI: case Op_MulF: case Op_MulD: case Op_MulL:
+ case Op_MulI: case Op_MulF: case Op_MulD: case Op_MulHF: case Op_MulL:
case Op_AndL: case Op_XorL: case Op_OrL:
case Op_AndI: case Op_XorI: case Op_OrI: {
// Move "last use" input to left by swapping inputs
@@ -3264,6 +3282,8 @@ void Compile::handle_div_mod_op(Node* n, BasicType bt, bool is_unsigned) {
void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& frc, uint nop, Unique_Node_List& dead_nodes) {
switch( nop ) {
// Count all float operations that may use FPU
+ case Op_AddHF:
+ case Op_MulHF:
case Op_AddF:
case Op_SubF:
case Op_MulF:
@@ -3770,10 +3790,12 @@ void Compile::final_graph_reshaping_main_switch(Node* n, Final_Reshape_Counts& f
case Op_AddReductionVI:
case Op_AddReductionVL:
+ case Op_AddReductionVHF:
case Op_AddReductionVF:
case Op_AddReductionVD:
case Op_MulReductionVI:
case Op_MulReductionVL:
+ case Op_MulReductionVHF:
case Op_MulReductionVF:
case Op_MulReductionVD:
case Op_MinReductionV:
@@ -3973,10 +3995,28 @@ void Compile::final_graph_reshaping_walk(Node_Stack& nstack, Node* root, Final_R
}
}
+ expand_reachability_edges(sfpt);
+
// Skip next transformation if compressed oops are not used.
if (UseCompressedOops && !Matcher::gen_narrow_oop_implicit_null_checks())
return;
+ // Go over ReachabilityFence nodes to skip DecodeN nodes for referents.
+ // The sole purpose of RF node is to keep the referent oop alive and
+ // decoding the oop for that is not needed.
+ for (int i = 0; i < C->reachability_fences_count(); i++) {
+ ReachabilityFenceNode* rf = C->reachability_fence(i);
+ DecodeNNode* dn = rf->in(1)->isa_DecodeN();
+ if (dn != nullptr) {
+ if (!dn->has_non_debug_uses() || Matcher::narrow_oop_use_complex_address()) {
+ rf->set_req(1, dn->in(1));
+ if (dn->outcnt() == 0) {
+ dn->disconnect_inputs(this);
+ }
+ }
+ }
+ }
+
// Go over safepoints nodes to skip DecodeN/DecodeNKlass nodes for debug edges.
// It could be done for an uncommon traps or any safepoints/calls
// if the DecodeN/DecodeNKlass node is referenced only in a debug info.
@@ -3990,21 +4030,8 @@ void Compile::final_graph_reshaping_walk(Node_Stack& nstack, Node* root, Final_R
n->as_CallStaticJava()->uncommon_trap_request() != 0);
for (int j = start; j < end; j++) {
Node* in = n->in(j);
- if (in->is_DecodeNarrowPtr()) {
- bool safe_to_skip = true;
- if (!is_uncommon ) {
- // Is it safe to skip?
- for (uint i = 0; i < in->outcnt(); i++) {
- Node* u = in->raw_out(i);
- if (!u->is_SafePoint() ||
- (u->is_Call() && u->as_Call()->has_non_debug_use(n))) {
- safe_to_skip = false;
- }
- }
- }
- if (safe_to_skip) {
- n->set_req(j, in->in(1));
- }
+ if (in->is_DecodeNarrowPtr() && (is_uncommon || !in->has_non_debug_uses())) {
+ n->set_req(j, in->in(1));
if (in->outcnt() == 0) {
in->disconnect_inputs(this);
}
diff --git a/src/hotspot/share/opto/compile.hpp b/src/hotspot/share/opto/compile.hpp
index eb6be669f24..ff0085d79de 100644
--- a/src/hotspot/share/opto/compile.hpp
+++ b/src/hotspot/share/opto/compile.hpp
@@ -80,6 +80,7 @@ class PhaseIterGVN;
class PhaseRegAlloc;
class PhaseCCP;
class PhaseOutput;
+class ReachabilityFenceNode;
class RootNode;
class relocInfo;
class StartNode;
@@ -107,7 +108,8 @@ enum LoopOptsMode {
LoopOptsMaxUnroll,
LoopOptsShenandoahExpand,
LoopOptsSkipSplitIf,
- LoopOptsVerify
+ LoopOptsVerify,
+ PostLoopOptsExpandReachabilityFences
};
// The type of all node counts and indexes.
@@ -385,6 +387,7 @@ class Compile : public Phase {
// of Template Assertion Predicates themselves.
GrowableArray _template_assertion_predicate_opaques;
GrowableArray _expensive_nodes; // List of nodes that are expensive to compute and that we'd better not let the GVN freely common
+ GrowableArray _reachability_fences; // List of reachability fences
GrowableArray _for_post_loop_igvn; // List of nodes for IGVN after loop opts are over
GrowableArray _for_merge_stores_igvn; // List of nodes for IGVN merge stores
GrowableArray _unstable_if_traps; // List of ifnodes after IGVN
@@ -714,11 +717,13 @@ public:
int template_assertion_predicate_count() const { return _template_assertion_predicate_opaques.length(); }
int expensive_count() const { return _expensive_nodes.length(); }
int coarsened_count() const { return _coarsened_locks.length(); }
-
Node* macro_node(int idx) const { return _macro_nodes.at(idx); }
Node* expensive_node(int idx) const { return _expensive_nodes.at(idx); }
+ ReachabilityFenceNode* reachability_fence(int idx) const { return _reachability_fences.at(idx); }
+ int reachability_fences_count() const { return _reachability_fences.length(); }
+
ConnectionGraph* congraph() { return _congraph;}
void set_congraph(ConnectionGraph* congraph) { _congraph = congraph;}
void add_macro_node(Node * n) {
@@ -740,6 +745,14 @@ public:
_expensive_nodes.remove_if_existing(n);
}
+ void add_reachability_fence(ReachabilityFenceNode* rf) {
+ _reachability_fences.append(rf);
+ }
+
+ void remove_reachability_fence(ReachabilityFenceNode* n) {
+ _reachability_fences.remove_if_existing(n);
+ }
+
void add_parse_predicate(ParsePredicateNode* n) {
assert(!_parse_predicates.contains(n), "duplicate entry in Parse Predicate list");
_parse_predicates.append(n);
@@ -1300,6 +1313,9 @@ public:
// Definitions of pd methods
static void pd_compiler2_init();
+ // Materialize reachability fences from reachability edges on safepoints.
+ void expand_reachability_edges(Unique_Node_List& safepoints);
+
// Static parse-time type checking logic for gen_subtype_check:
enum SubTypeCheckResult { SSC_always_false, SSC_always_true, SSC_easy_test, SSC_full_test };
SubTypeCheckResult static_subtype_check(const TypeKlassPtr* superk, const TypeKlassPtr* subk, bool skip = StressReflectiveCode);
diff --git a/src/hotspot/share/opto/doCall.cpp b/src/hotspot/share/opto/doCall.cpp
index 9a1da726f00..d6e75f17f50 100644
--- a/src/hotspot/share/opto/doCall.cpp
+++ b/src/hotspot/share/opto/doCall.cpp
@@ -1081,13 +1081,13 @@ void Parse::catch_inline_exceptions(SafePointNode* ex_map) {
#ifndef PRODUCT
void Parse::count_compiled_calls(bool at_method_entry, bool is_inline) {
- if( CountCompiledCalls ) {
- if( at_method_entry ) {
+ if (CountCompiledCalls) {
+ if (at_method_entry) {
// bump invocation counter if top method (for statistics)
if (CountCompiledCalls && depth() == 1) {
const TypePtr* addr_type = TypeMetadataPtr::make(method());
Node* adr1 = makecon(addr_type);
- Node* adr2 = basic_plus_adr(adr1, adr1, in_bytes(Method::compiled_invocation_counter_offset()));
+ Node* adr2 = off_heap_plus_addr(adr1, in_bytes(Method::compiled_invocation_counter_offset()));
increment_counter(adr2);
}
} else if (is_inline) {
diff --git a/src/hotspot/share/opto/escape.cpp b/src/hotspot/share/opto/escape.cpp
index 64ee60037d6..a05ad0ef99a 100644
--- a/src/hotspot/share/opto/escape.cpp
+++ b/src/hotspot/share/opto/escape.cpp
@@ -1273,21 +1273,33 @@ bool ConnectionGraph::reduce_phi_on_safepoints_helper(Node* ophi, Node* cast, No
for (uint spi = 0; spi < safepoints.size(); spi++) {
SafePointNode* sfpt = safepoints.at(spi)->as_SafePoint();
- JVMState *jvms = sfpt->jvms();
- uint merge_idx = (sfpt->req() - jvms->scloff());
- int debug_start = jvms->debug_start();
+
+ SafePointNode::NodeEdgeTempStorage non_debug_edges_worklist(*_igvn);
+
+ // All sfpt inputs are implicitly included into debug info during the scalarization process below.
+ // Keep non-debug inputs separately, so they stay non-debug.
+ sfpt->remove_non_debug_edges(non_debug_edges_worklist);
+
+ JVMState* jvms = sfpt->jvms();
+ uint merge_idx = (sfpt->req() - jvms->scloff());
+ int debug_start = jvms->debug_start();
SafePointScalarMergeNode* smerge = new SafePointScalarMergeNode(merge_t, merge_idx);
smerge->init_req(0, _compile->root());
_igvn->register_new_node_with_optimizer(smerge);
+ assert(sfpt->jvms()->endoff() == sfpt->req(), "no extra edges past debug info allowed");
+
// The next two inputs are:
// (1) A copy of the original pointer to NSR objects.
// (2) A selector, used to decide if we need to rematerialize an object
// or use the pointer to a NSR object.
- // See more details of these fields in the declaration of SafePointScalarMergeNode
+ // See more details of these fields in the declaration of SafePointScalarMergeNode.
+ // It is safe to include them into debug info straight away since create_scalarized_object_description()
+ // will include all newly added inputs into debug info anyway.
sfpt->add_req(nsr_merge_pointer);
sfpt->add_req(selector);
+ sfpt->jvms()->set_endoff(sfpt->req());
for (uint i = 1; i < ophi->req(); i++) {
Node* base = ophi->in(i);
@@ -1302,13 +1314,15 @@ bool ConnectionGraph::reduce_phi_on_safepoints_helper(Node* ophi, Node* cast, No
AllocateNode* alloc = ptn->ideal_node()->as_Allocate();
SafePointScalarObjectNode* sobj = mexp.create_scalarized_object_description(alloc, sfpt);
if (sobj == nullptr) {
- return false;
+ sfpt->restore_non_debug_edges(non_debug_edges_worklist);
+ return false; // non-recoverable failure; recompile
}
// Now make a pass over the debug information replacing any references
// to the allocated object with "sobj"
Node* ccpp = alloc->result_cast();
sfpt->replace_edges_in_range(ccpp, sobj, debug_start, jvms->debug_end(), _igvn);
+ non_debug_edges_worklist.remove_edge_if_present(ccpp); // drop scalarized input from non-debug info
// Register the scalarized object as a candidate for reallocation
smerge->add_req(sobj);
@@ -1316,11 +1330,15 @@ bool ConnectionGraph::reduce_phi_on_safepoints_helper(Node* ophi, Node* cast, No
// Replaces debug information references to "original_sfpt_parent" in "sfpt" with references to "smerge"
sfpt->replace_edges_in_range(original_sfpt_parent, smerge, debug_start, jvms->debug_end(), _igvn);
+ non_debug_edges_worklist.remove_edge_if_present(original_sfpt_parent); // drop scalarized input from non-debug info
// The call to 'replace_edges_in_range' above might have removed the
// reference to ophi that we need at _merge_pointer_idx. The line below make
// sure the reference is maintained.
sfpt->set_req(smerge->merge_pointer_idx(jvms), nsr_merge_pointer);
+
+ sfpt->restore_non_debug_edges(non_debug_edges_worklist);
+
_igvn->_worklist.push(sfpt);
}
@@ -4712,6 +4730,7 @@ void ConnectionGraph::split_unique_types(GrowableArray &alloc_worklist,
op == Op_StrIndexOf || op == Op_StrIndexOfChar ||
op == Op_SubTypeCheck ||
op == Op_ReinterpretS2HF ||
+ op == Op_ReachabilityFence ||
BarrierSet::barrier_set()->barrier_set_c2()->is_gc_barrier_node(use))) {
n->dump();
use->dump();
diff --git a/src/hotspot/share/opto/gcm.cpp b/src/hotspot/share/opto/gcm.cpp
index 4a1553b1e00..e3d3108a22e 100644
--- a/src/hotspot/share/opto/gcm.cpp
+++ b/src/hotspot/share/opto/gcm.cpp
@@ -152,9 +152,12 @@ bool PhaseCFG::is_CFG(Node* n) {
}
bool PhaseCFG::is_control_proj_or_safepoint(Node* n) const {
- bool result = (n->is_Mach() && n->as_Mach()->ideal_Opcode() == Op_SafePoint) || (n->is_Proj() && n->as_Proj()->bottom_type() == Type::CONTROL);
- assert(!result || (n->is_Mach() && n->as_Mach()->ideal_Opcode() == Op_SafePoint)
- || (n->is_Proj() && n->as_Proj()->_con == 0), "If control projection, it must be projection 0");
+ bool result = n->is_ReachabilityFence() ||
+ (n->is_Mach() && n->as_Mach()->ideal_Opcode() == Op_SafePoint) ||
+ (n->is_Proj() && n->as_Proj()->bottom_type() == Type::CONTROL);
+ assert(!n->is_Proj() ||
+ n->as_Proj()->bottom_type() != Type::CONTROL ||
+ n->as_Proj()->_con == 0, "If control projection, it must be projection 0");
return result;
}
diff --git a/src/hotspot/share/opto/graphKit.cpp b/src/hotspot/share/opto/graphKit.cpp
index 8d32694e9a5..bbd00d111f7 100644
--- a/src/hotspot/share/opto/graphKit.cpp
+++ b/src/hotspot/share/opto/graphKit.cpp
@@ -41,6 +41,7 @@
#include "opto/machnode.hpp"
#include "opto/opaquenode.hpp"
#include "opto/parse.hpp"
+#include "opto/reachability.hpp"
#include "opto/rootnode.hpp"
#include "opto/runtime.hpp"
#include "opto/subtypenode.hpp"
@@ -3541,6 +3542,15 @@ Node* GraphKit::insert_mem_bar_volatile(int opcode, int alias_idx, Node* precede
return membar;
}
+//------------------------------insert_reachability_fence----------------------
+Node* GraphKit::insert_reachability_fence(Node* referent) {
+ assert(!referent->is_top(), "");
+ Node* rf = _gvn.transform(new ReachabilityFenceNode(C, control(), referent));
+ set_control(rf);
+ C->record_for_igvn(rf);
+ return rf;
+}
+
//------------------------------shared_lock------------------------------------
// Emit locking code.
FastLockNode* GraphKit::shared_lock(Node* obj) {
diff --git a/src/hotspot/share/opto/graphKit.hpp b/src/hotspot/share/opto/graphKit.hpp
index 273009ca7ce..f53f73d0978 100644
--- a/src/hotspot/share/opto/graphKit.hpp
+++ b/src/hotspot/share/opto/graphKit.hpp
@@ -805,6 +805,7 @@ class GraphKit : public Phase {
int next_monitor();
Node* insert_mem_bar(int opcode, Node* precedent = nullptr);
Node* insert_mem_bar_volatile(int opcode, int alias_idx, Node* precedent = nullptr);
+ Node* insert_reachability_fence(Node* referent);
// Optional 'precedent' is appended as an extra edge, to force ordering.
FastLockNode* shared_lock(Node* obj);
void shared_unlock(Node* box, Node* obj);
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index e0f95377cde..ff7bc2c10d3 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -568,6 +568,7 @@ bool LibraryCallKit::try_to_inline(int predicate) {
case vmIntrinsics::_Reference_get0: return inline_reference_get0();
case vmIntrinsics::_Reference_refersTo0: return inline_reference_refersTo0(false);
+ case vmIntrinsics::_Reference_reachabilityFence: return inline_reference_reachabilityFence();
case vmIntrinsics::_PhantomReference_refersTo0: return inline_reference_refersTo0(true);
case vmIntrinsics::_Reference_clear0: return inline_reference_clear0(false);
case vmIntrinsics::_PhantomReference_clear0: return inline_reference_clear0(true);
@@ -4310,7 +4311,7 @@ Node* LibraryCallKit::generate_array_guard_common(Node* kls, RegionNode* region,
if (obj != nullptr && is_array_ctrl != nullptr && is_array_ctrl != top()) {
// Keep track of the fact that 'obj' is an array to prevent
// array specific accesses from floating above the guard.
- *obj = _gvn.transform(new CastPPNode(is_array_ctrl, *obj, TypeAryPtr::BOTTOM));
+ *obj = _gvn.transform(new CheckCastPPNode(is_array_ctrl, *obj, TypeAryPtr::BOTTOM));
}
return ctrl;
}
@@ -7025,6 +7026,14 @@ bool LibraryCallKit::inline_reference_clear0(bool is_phantom) {
return true;
}
+//-----------------------inline_reference_reachabilityFence-----------------
+// bool java.lang.ref.Reference.reachabilityFence();
+bool LibraryCallKit::inline_reference_reachabilityFence() {
+ Node* referent = argument(0);
+ insert_reachability_fence(referent);
+ return true;
+}
+
Node* LibraryCallKit::load_field_from_object(Node* fromObj, const char* fieldName, const char* fieldTypeString,
DecoratorSet decorators, bool is_static,
ciInstanceKlass* fromKls) {
diff --git a/src/hotspot/share/opto/library_call.hpp b/src/hotspot/share/opto/library_call.hpp
index 9b87df645e1..9aae48302cf 100644
--- a/src/hotspot/share/opto/library_call.hpp
+++ b/src/hotspot/share/opto/library_call.hpp
@@ -312,6 +312,7 @@ class LibraryCallKit : public GraphKit {
bool inline_divmod_methods(vmIntrinsics::ID id);
bool inline_reference_get0();
bool inline_reference_refersTo0(bool is_phantom);
+ bool inline_reference_reachabilityFence();
bool inline_reference_clear0(bool is_phantom);
bool inline_Class_cast();
bool inline_aescrypt_Block(vmIntrinsics::ID id);
diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index 80b17efb998..b65f90093ab 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -35,7 +35,9 @@
#include "opto/loopnode.hpp"
#include "opto/movenode.hpp"
#include "opto/mulnode.hpp"
+#include "opto/node.hpp"
#include "opto/opaquenode.hpp"
+#include "opto/opcodes.hpp"
#include "opto/phase.hpp"
#include "opto/predicates.hpp"
#include "opto/rootnode.hpp"
@@ -50,17 +52,70 @@
// Given an IfNode, return the loop-exiting projection or null if both
// arms remain in the loop.
Node *IdealLoopTree::is_loop_exit(Node *iff) const {
- if (iff->outcnt() != 2) return nullptr; // Ignore partially dead tests
- PhaseIdealLoop *phase = _phase;
+ assert(iff->is_If(), "not an If: %s", iff->Name());
+ assert(is_member(_phase->get_loop(iff)), "not related");
+
+ if (iff->outcnt() != 2) {
+ return nullptr; // Ignore partially dead tests
+ }
// Test is an IfNode, has 2 projections. If BOTH are in the loop
// we need loop unswitching instead of peeling.
- if (!is_member(phase->get_loop(iff->raw_out(0))))
+ if (!is_member(_phase->get_loop(iff->raw_out(0)))) {
return iff->raw_out(0);
- if (!is_member(phase->get_loop(iff->raw_out(1))))
+ }
+ if (!is_member(_phase->get_loop(iff->raw_out(1)))) {
return iff->raw_out(1);
+ }
return nullptr;
}
+//------------------------------unique_loop_exit_or_null----------------------
+// Return the loop-exit projection if loop exit is unique.
+IfFalseNode* IdealLoopTree::unique_loop_exit_proj_or_null() {
+ if (is_loop() && head()->is_BaseCountedLoop()) {
+ IfNode* loop_end = head()->as_BaseCountedLoop()->loopexit_or_null();
+ if (loop_end == nullptr) {
+ return nullptr; // malformed loop shape
+ }
+ // Look for other loop exits.
+ assert(_phase->is_dominator(head(), tail()), "sanity");
+ for (Node* ctrl = tail(); ctrl != head(); ctrl = ctrl->in(0)) {
+ assert(is_member(_phase->get_loop(ctrl)), "sanity");
+ if (ctrl->is_If()) {
+ if (!is_loop_exit(ctrl->as_If())) {
+ continue; // local branch
+ } else if (ctrl != loop_end) {
+ return nullptr; // multiple loop exits
+ }
+ } else if (ctrl->is_Region()) {
+ return nullptr; // give up on control flow merges
+ } else if (ctrl->is_ReachabilityFence() ||
+ ctrl->is_SafePoint() ||
+ ctrl->is_MemBar() ||
+ ctrl->Opcode() == Op_Blackhole) {
+ continue; // skip
+ } else if (ctrl->is_Proj()) {
+ if (ctrl->is_IfProj() ||
+ ctrl->Opcode() == Op_SCMemProj ||
+ ctrl->Opcode() == Op_Proj) {
+ continue; // skip simple control projections
+ } else if (ctrl->is_CatchProj() ||
+ ctrl->is_JumpProj()) {
+ return nullptr; // give up on control flow splits
+ } else {
+ assert(false, "unknown control projection: %s", ctrl->Name());
+ return nullptr; // stop on unknown control node
+ }
+ } else {
+ assert(false, "unknown CFG node: %s", ctrl->Name());
+ return nullptr; // stop on unknown control node
+ }
+ }
+ assert(is_loop_exit(loop_end), "not a loop exit?");
+ return loop_end->false_proj_or_null();
+ }
+ return nullptr; // not found or multiple loop exits
+}
//=============================================================================
@@ -1774,13 +1829,39 @@ Node *PhaseIdealLoop::insert_post_loop(IdealLoopTree* loop, Node_List& old_new,
for (DUIterator i = main_head->outs(); main_head->has_out(i); i++) {
Node* main_phi = main_head->out(i);
if (main_phi->is_Phi() && main_phi->in(0) == main_head && main_phi->outcnt() > 0) {
- Node* cur_phi = old_new[main_phi->_idx];
+ Node* post_phi = old_new[main_phi->_idx];
+ Node* loopback_input = main_phi->in(LoopNode::LoopBackControl);
Node* fallnew = clone_up_backedge_goo(main_head->back_control(),
post_head->init_control(),
- main_phi->in(LoopNode::LoopBackControl),
+ loopback_input,
visited, clones);
- _igvn.hash_delete(cur_phi);
- cur_phi->set_req(LoopNode::EntryControl, fallnew);
+ // Technically, the entry value of post_phi must be the loop back input of the corresponding
+ // Phi of the outer loop, not the Phi of the inner loop (i.e. main_phi). However, we have not
+ // constructed the Phis for the OuterStripMinedLoop yet, so the input must be inferred from
+ // the loop back input of main_phi.
+ // - If post_phi is a data Phi, then we can use the loop back input of main_phi.
+ // - If post_phi is a memory Phi, since Stores can be sunk below the inner loop, but still
+ // inside the outer loop, we have 2 cases:
+ // + If the loop back input of main_phi is on the backedge, then the entry input of
+ // post_phi is the clone of the node on the entry of post_head, similar to when post_phi
+ // is a data Phi.
+ // + If the loop back input of main_phi is not on the backedge, we need to find whether
+ // there is a sunk Store corresponding to post_phi, if there is any, the latest such
+ // store will be the entry input of post_phi. Fortunately, the safepoint at the exit of
+ // the outer loop captures all memory states, so we can use it as the entry input of
+ // post_phi.
+ // Another way to see it is that, the memory phi should capture the latest state at the
+ // post-loop entry. If loopback_input is cloned by clone_up_backedge_goo, it is pinned at
+ // the post-loop entry, and is surely the latest state. Otherwise, the latest memory state
+ // corresponding to post_phi is the memory state at the exit of the outer main-loop, which
+ // is captured by the safepoint there.
+ if (main_head->is_strip_mined() && fallnew == loopback_input && post_phi->is_memory_phi()) {
+ SafePointNode* main_safepoint = main_head->outer_safepoint();
+ assert(main_safepoint != nullptr, "outer loop must have a safepoint");
+ fallnew = main_safepoint->memory();
+ }
+ _igvn.hash_delete(post_phi);
+ post_phi->set_req(LoopNode::EntryControl, fallnew);
}
}
// Store nodes that were moved to the outer loop by PhaseIdealLoop::try_move_store_after_loop
@@ -3107,9 +3188,13 @@ static CountedLoopNode* locate_pre_from_main(CountedLoopNode* main_loop) {
Node* ctrl = main_loop->skip_assertion_predicates_with_halt();
assert(ctrl->Opcode() == Op_IfTrue || ctrl->Opcode() == Op_IfFalse, "");
Node* iffm = ctrl->in(0);
- assert(iffm->Opcode() == Op_If, "");
+ assert(iffm->Opcode() == Op_If, "%s", iffm->Name());
Node* p_f = iffm->in(0);
- assert(p_f->Opcode() == Op_IfFalse, "");
+ // Skip ReachabilityFences hoisted out of pre-loop.
+ while (p_f->is_ReachabilityFence()) {
+ p_f = p_f->in(0);
+ }
+ assert(p_f->Opcode() == Op_IfFalse, "%s", p_f->Name());
CountedLoopNode* pre_loop = p_f->in(0)->as_CountedLoopEnd()->loopnode();
assert(pre_loop->is_pre_loop(), "No pre loop found");
return pre_loop;
diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index 6963a67118f..35a9108892c 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -44,6 +44,7 @@
#include "opto/opaquenode.hpp"
#include "opto/opcodes.hpp"
#include "opto/predicates.hpp"
+#include "opto/reachability.hpp"
#include "opto/rootnode.hpp"
#include "opto/runtime.hpp"
#include "opto/vectorization.hpp"
@@ -3934,6 +3935,7 @@ IdealLoopTree::IdealLoopTree(PhaseIdealLoop* phase, Node* head, Node* tail): _pa
_has_range_checks(0), _has_range_checks_computed(0),
_safepts(nullptr),
_required_safept(nullptr),
+ _reachability_fences(nullptr),
_allow_optimizations(true) {
precond(_head != nullptr);
precond(_tail != nullptr);
@@ -4855,6 +4857,15 @@ uint IdealLoopTree::est_loop_flow_merge_sz() const {
return 0;
}
+void IdealLoopTree::register_reachability_fence(ReachabilityFenceNode* rf) {
+ if (_reachability_fences == nullptr) {
+ _reachability_fences = new Node_List();
+ }
+ if (!_reachability_fences->contains(rf)) {
+ _reachability_fences->push(rf);
+ }
+}
+
#ifndef PRODUCT
//------------------------------dump_head--------------------------------------
// Dump 1 liner for loop header info
@@ -4914,6 +4925,9 @@ void IdealLoopTree::dump_head() {
if (_has_call) tty->print(" has_call");
if (_has_sfpt) tty->print(" has_sfpt");
if (_rce_candidate) tty->print(" rce");
+ if (_reachability_fences != nullptr && _reachability_fences->size() > 0) {
+ tty->print(" has_rf");
+ }
if (_safepts != nullptr && _safepts->size() > 0) {
tty->print(" sfpts={"); _safepts->dump_simple(); tty->print(" }");
}
@@ -4921,6 +4935,9 @@ void IdealLoopTree::dump_head() {
tty->print(" req={"); _required_safept->dump_simple(); tty->print(" }");
}
if (Verbose) {
+ if (_reachability_fences != nullptr && _reachability_fences->size() > 0) {
+ tty->print(" rfs={"); _reachability_fences->dump_simple(); tty->print(" }");
+ }
tty->print(" body={"); _body.dump_simple(); tty->print(" }");
}
if (_head->is_Loop() && _head->as_Loop()->is_strip_mined()) {
@@ -5179,12 +5196,14 @@ bool PhaseIdealLoop::process_expensive_nodes() {
// Create a PhaseLoop. Build the ideal Loop tree. Map each Ideal Node to
// its corresponding LoopNode. If 'optimize' is true, do some loop cleanups.
void PhaseIdealLoop::build_and_optimize() {
- assert(!C->post_loop_opts_phase(), "no loop opts allowed");
-
bool do_split_ifs = (_mode == LoopOptsDefault);
bool skip_loop_opts = (_mode == LoopOptsNone);
bool do_max_unroll = (_mode == LoopOptsMaxUnroll);
+ bool do_verify = (_mode == LoopOptsVerify);
+ bool do_expand_reachability_fences = (_mode == PostLoopOptsExpandReachabilityFences);
+ assert(!C->post_loop_opts_phase() || do_expand_reachability_fences || do_verify,
+ "no loop opts allowed");
bool old_progress = C->major_progress();
uint orig_worklist_size = _igvn._worklist.size();
@@ -5251,11 +5270,13 @@ void PhaseIdealLoop::build_and_optimize() {
BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
// Nothing to do, so get out
- bool stop_early = !C->has_loops() && !skip_loop_opts && !do_split_ifs && !do_max_unroll && !_verify_me &&
- !_verify_only && !bs->is_gc_specific_loop_opts_pass(_mode);
+ bool stop_early = !C->has_loops() && !skip_loop_opts && !do_split_ifs && !do_max_unroll &&
+ !do_expand_reachability_fences && !_verify_me && !_verify_only &&
+ !bs->is_gc_specific_loop_opts_pass(_mode) ;
bool do_expensive_nodes = C->should_optimize_expensive_nodes(_igvn);
+ bool do_optimize_reachability_fences = OptimizeReachabilityFences && (C->reachability_fences_count() > 0);
bool strip_mined_loops_expanded = bs->strip_mined_loops_expanded(_mode);
- if (stop_early && !do_expensive_nodes) {
+ if (stop_early && !do_expensive_nodes && !do_optimize_reachability_fences) {
return;
}
@@ -5331,7 +5352,7 @@ void PhaseIdealLoop::build_and_optimize() {
// Given early legal placement, try finding counted loops. This placement
// is good enough to discover most loop invariants.
- if (!_verify_me && !_verify_only && !strip_mined_loops_expanded) {
+ if (!_verify_me && !_verify_only && !strip_mined_loops_expanded && !do_expand_reachability_fences) {
_ltree_root->counted_loop( this );
}
@@ -5361,8 +5382,14 @@ void PhaseIdealLoop::build_and_optimize() {
eliminate_useless_multiversion_if();
if (stop_early) {
- assert(do_expensive_nodes, "why are we here?");
- if (process_expensive_nodes()) {
+ assert(do_expensive_nodes || do_optimize_reachability_fences, "why are we here?");
+ // Use the opportunity to optimize reachability fence nodes irrespective of
+ // whether loop optimizations are performed or not.
+ if (do_optimize_reachability_fences && optimize_reachability_fences()) {
+ recompute_dom_depth();
+ DEBUG_ONLY( if (VerifyLoopOptimizations) { verify(); } );
+ }
+ if (do_expensive_nodes && process_expensive_nodes()) {
// If we made some progress when processing expensive nodes then
// the IGVN may modify the graph in a way that will allow us to
// make some more progress: we need to try processing expensive
@@ -5390,6 +5417,22 @@ void PhaseIdealLoop::build_and_optimize() {
}
#endif
+ if (do_optimize_reachability_fences && optimize_reachability_fences()) {
+ recompute_dom_depth();
+ DEBUG_ONLY( if (VerifyLoopOptimizations) { verify(); } );
+ }
+
+ if (do_expand_reachability_fences) {
+ assert(C->post_loop_opts_phase(), "required");
+ if (expand_reachability_fences()) {
+ recompute_dom_depth();
+ DEBUG_ONLY( if (VerifyLoopOptimizations) { verify(); } );
+ }
+ return;
+ }
+
+ assert(!C->post_loop_opts_phase(), "required");
+
if (skip_loop_opts) {
C->restore_major_progress(old_progress);
return;
@@ -6286,6 +6329,8 @@ int PhaseIdealLoop::build_loop_tree_impl(Node* n, int pre_order) {
// Record all safepoints in this loop.
if (innermost->_safepts == nullptr) innermost->_safepts = new Node_List();
innermost->_safepts->push(n);
+ } else if (n->is_ReachabilityFence()) {
+ innermost->register_reachability_fence(n->as_ReachabilityFence());
}
}
}
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index 6667c71511c..26b82259327 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -44,6 +44,7 @@ class PredicateBlock;
class PathFrequency;
class PhaseIdealLoop;
class LoopSelector;
+class ReachabilityFenceNode;
class UnswitchedLoopSelector;
class VectorSet;
class VSharedData;
@@ -662,6 +663,7 @@ public:
Node_List* _safepts; // List of safepoints in this loop
Node_List* _required_safept; // A inner loop cannot delete these safepts;
+ Node_List* _reachability_fences; // List of reachability fences in this loop
bool _allow_optimizations; // Allow loop optimizations
IdealLoopTree(PhaseIdealLoop* phase, Node* head, Node* tail);
@@ -720,6 +722,9 @@ public:
// Check for Node being a loop-breaking test
Node *is_loop_exit(Node *iff) const;
+ // Return unique loop-exit projection or null if the loop has multiple exits.
+ IfFalseNode* unique_loop_exit_proj_or_null();
+
// Remove simplistic dead code from loop body
void DCE_loop_body();
@@ -825,6 +830,9 @@ public:
return _head->as_Loop()->is_strip_mined() ? _parent : this;
}
+ // Registers a reachability fence node in the loop.
+ void register_reachability_fence(ReachabilityFenceNode* rf);
+
#ifndef PRODUCT
void dump_head(); // Dump loop head only
void dump(); // Dump this loop recursively
@@ -1167,6 +1175,16 @@ public:
forward_ctrl(old_node, new_node);
}
+ void remove_dead_data_node(Node* dead) {
+ assert(dead->outcnt() == 0 && !dead->is_top(), "must be dead");
+ assert(!dead->is_CFG(), "not a data node");
+ Node* c = get_ctrl(dead);
+ IdealLoopTree* lpt = get_loop(c);
+ _loop_or_ctrl.map(dead->_idx, nullptr); // This node is useless
+ lpt->_body.yank(dead);
+ igvn().remove_dead_node(dead, PhaseIterGVN::NodeOrigin::Graph);
+ }
+
private:
// Place 'n' in some loop nest, where 'n' is a CFG node
@@ -1599,6 +1617,15 @@ public:
// Implementation of the loop predication to promote checks outside the loop
bool loop_predication_impl(IdealLoopTree *loop);
+ // Reachability Fence (RF) support.
+ private:
+ void insert_rf(Node* ctrl, Node* referent);
+ void replace_rf(Node* old_node, Node* new_node);
+ void remove_rf(ReachabilityFenceNode* rf);
+ public:
+ bool optimize_reachability_fences();
+ bool expand_reachability_fences();
+
private:
bool loop_predication_impl_helper(IdealLoopTree* loop, IfProjNode* if_success_proj,
ParsePredicateSuccessProj* parse_predicate_proj, CountedLoopNode* cl, ConNode* zero,
diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp
index 11b23d7c365..ccd53129a87 100644
--- a/src/hotspot/share/opto/loopopts.cpp
+++ b/src/hotspot/share/opto/loopopts.cpp
@@ -1307,7 +1307,14 @@ Node* PhaseIdealLoop::place_outside_loop(Node* useblock, IdealLoopTree* loop) co
bool PhaseIdealLoop::identical_backtoback_ifs(Node *n) {
- if (!n->is_If() || n->is_BaseCountedLoopEnd()) {
+ if (!n->is_If()) {
+ return false;
+ }
+ if (n->outcnt() != n->as_If()->required_outcnt()) {
+ assert(false, "malformed IfNode with %d outputs", n->outcnt());
+ return false;
+ }
+ if (n->is_BaseCountedLoopEnd()) {
return false;
}
if (!n->in(0)->is_Region()) {
@@ -1433,7 +1440,10 @@ void PhaseIdealLoop::split_if_with_blocks_post(Node *n) {
// Check some safety conditions
if (iff->is_If()) { // Classic split-if?
- if (iff->in(0) != n_ctrl) {
+ if (iff->outcnt() != iff->as_If()->required_outcnt()) {
+ assert(false, "malformed IfNode with %d outputs", iff->outcnt());
+ return;
+ } else if (iff->in(0) != n_ctrl) {
return; // Compare must be in same blk as if
}
} else if (iff->is_CMove()) { // Trying to split-up a CMOVE
diff --git a/src/hotspot/share/opto/macro.cpp b/src/hotspot/share/opto/macro.cpp
index 01c67187883..8c5dbe7fb48 100644
--- a/src/hotspot/share/opto/macro.cpp
+++ b/src/hotspot/share/opto/macro.cpp
@@ -44,6 +44,7 @@
#include "opto/node.hpp"
#include "opto/opaquenode.hpp"
#include "opto/phaseX.hpp"
+#include "opto/reachability.hpp"
#include "opto/rootnode.hpp"
#include "opto/runtime.hpp"
#include "opto/subnode.hpp"
@@ -683,6 +684,8 @@ bool PhaseMacroExpand::can_eliminate_allocation(PhaseIterGVN* igvn, AllocateNode
use->as_ArrayCopy()->is_copyofrange_validated()) &&
use->in(ArrayCopyNode::Dest) == res) {
// ok to eliminate
+ } else if (use->is_ReachabilityFence() && OptimizeReachabilityFences) {
+ // ok to eliminate
} else if (use->is_SafePoint()) {
SafePointNode* sfpt = use->as_SafePoint();
if (sfpt->is_Call() && sfpt->as_Call()->has_non_debug_use(res)) {
@@ -778,7 +781,13 @@ void PhaseMacroExpand::undo_previous_scalarizations(GrowableArray 0) {
SafePointNode* sfpt_done = safepoints_done.pop();
+
+ SafePointNode::NodeEdgeTempStorage non_debug_edges_worklist(igvn());
+
+ sfpt_done->remove_non_debug_edges(non_debug_edges_worklist);
+
// remove any extra entries we added to the safepoint
+ assert(sfpt_done->jvms()->endoff() == sfpt_done->req(), "no extra edges past debug info allowed");
uint last = sfpt_done->req() - 1;
for (int k = 0; k < nfields; k++) {
sfpt_done->del_req(last--);
@@ -799,6 +808,9 @@ void PhaseMacroExpand::undo_previous_scalarizations(GrowableArray restore_non_debug_edges(non_debug_edges_worklist);
+
_igvn._worklist.push(sfpt_done);
}
}
@@ -839,6 +851,8 @@ void PhaseMacroExpand::undo_previous_scalarizations(GrowableArray jvms()->endoff() == sfpt->req(), "no extra edges past debug info allowed");
+
// Fields of scalar objs are referenced only at the end
// of regular debuginfo at the last (youngest) JVMS.
// Record relative start index.
@@ -964,17 +978,25 @@ SafePointScalarObjectNode* PhaseMacroExpand::create_scalarized_object_descriptio
}
// Do scalar replacement.
-bool PhaseMacroExpand::scalar_replacement(AllocateNode *alloc, GrowableArray & safepoints) {
- GrowableArray safepoints_done;
+bool PhaseMacroExpand::scalar_replacement(AllocateNode* alloc, GrowableArray& safepoints) {
+ GrowableArray safepoints_done;
Node* res = alloc->result_cast();
assert(res == nullptr || res->is_CheckCastPP(), "unexpected AllocateNode result");
// Process the safepoint uses
while (safepoints.length() > 0) {
SafePointNode* sfpt = safepoints.pop();
+
+ SafePointNode::NodeEdgeTempStorage non_debug_edges_worklist(igvn());
+
+ // All sfpt inputs are implicitly included into debug info during the scalarization process below.
+ // Keep non-debug inputs separately, so they stay non-debug.
+ sfpt->remove_non_debug_edges(non_debug_edges_worklist);
+
SafePointScalarObjectNode* sobj = create_scalarized_object_description(alloc, sfpt);
if (sobj == nullptr) {
+ sfpt->restore_non_debug_edges(non_debug_edges_worklist);
undo_previous_scalarizations(safepoints_done, alloc);
return false;
}
@@ -983,6 +1005,8 @@ bool PhaseMacroExpand::scalar_replacement(AllocateNode *alloc, GrowableArray jvms();
sfpt->replace_edges_in_range(res, sobj, jvms->debug_start(), jvms->debug_end(), &_igvn);
+ non_debug_edges_worklist.remove_edge_if_present(res); // drop scalarized input from non-debug info
+ sfpt->restore_non_debug_edges(non_debug_edges_worklist);
_igvn._worklist.push(sfpt);
// keep it for rollback
@@ -1073,6 +1097,8 @@ void PhaseMacroExpand::process_users_of_allocation(CallNode *alloc) {
}
}
_igvn._worklist.push(ac);
+ } else if (use->is_ReachabilityFence() && OptimizeReachabilityFences) {
+ use->as_ReachabilityFence()->clear_referent(_igvn); // redundant fence; will be removed during IGVN
} else {
eliminate_gc_barrier(use);
}
diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp
index 9ec3402c701..a49d4708d32 100644
--- a/src/hotspot/share/opto/memnode.cpp
+++ b/src/hotspot/share/opto/memnode.cpp
@@ -1671,11 +1671,15 @@ bool LoadNode::can_split_through_phi_base(PhaseGVN* phase) {
intptr_t ignore = 0;
Node* base = AddPNode::Ideal_base_and_offset(address, phase, ignore);
+ if (base == nullptr) {
+ return false;
+ }
+
if (base->is_CastPP()) {
base = base->in(1);
}
- if (req() > 3 || base == nullptr || !base->is_Phi()) {
+ if (req() > 3 || !base->is_Phi()) {
return false;
}
@@ -4081,7 +4085,7 @@ uint LoadStoreNode::ideal_reg() const {
bool LoadStoreNode::result_not_used() const {
for (DUIterator_Fast imax, i = fast_outs(imax); i < imax; i++) {
Node *x = fast_out(i);
- if (x->Opcode() == Op_SCMemProj) {
+ if (x->Opcode() == Op_SCMemProj || x->is_ReachabilityFence()) {
continue;
}
if (x->bottom_type() == TypeTuple::MEMBAR &&
diff --git a/src/hotspot/share/opto/node.cpp b/src/hotspot/share/opto/node.cpp
index cb5795a1250..3eafd97d7c1 100644
--- a/src/hotspot/share/opto/node.cpp
+++ b/src/hotspot/share/opto/node.cpp
@@ -38,6 +38,7 @@
#include "opto/matcher.hpp"
#include "opto/node.hpp"
#include "opto/opcodes.hpp"
+#include "opto/reachability.hpp"
#include "opto/regmask.hpp"
#include "opto/rootnode.hpp"
#include "opto/type.hpp"
@@ -503,6 +504,9 @@ Node *Node::clone() const {
if (is_expensive()) {
C->add_expensive_node(n);
}
+ if (is_ReachabilityFence()) {
+ C->add_reachability_fence(n->as_ReachabilityFence());
+ }
if (for_post_loop_opts_igvn()) {
// Don't add cloned node to Compile::_for_post_loop_opts_igvn list automatically.
// If it is applicable, it will happen anyway when the cloned node is registered with IGVN.
@@ -622,6 +626,9 @@ void Node::destruct(PhaseValues* phase) {
if (is_expensive()) {
compile->remove_expensive_node(this);
}
+ if (is_ReachabilityFence()) {
+ compile->remove_reachability_fence(as_ReachabilityFence());
+ }
if (is_OpaqueTemplateAssertionPredicate()) {
compile->remove_template_assertion_predicate_opaque(as_OpaqueTemplateAssertionPredicate());
}
@@ -2994,6 +3001,25 @@ bool Node::is_data_proj_of_pure_function(const Node* maybe_pure_function) const
return Opcode() == Op_Proj && as_Proj()->_con == TypeFunc::Parms && maybe_pure_function->is_CallLeafPure();
}
+//--------------------------has_non_debug_uses------------------------------
+// Checks whether the node has any non-debug uses or not.
+bool Node::has_non_debug_uses() const {
+ for (DUIterator_Fast imax, i = fast_outs(imax); i < imax; i++) {
+ Node* u = fast_out(i);
+ if (u->is_SafePoint()) {
+ if (u->is_Call() && u->as_Call()->has_non_debug_use(this)) {
+ return true;
+ }
+ // Non-call safepoints have only debug uses.
+ } else if (u->is_ReachabilityFence()) {
+ // Reachability fence is treated as debug use.
+ } else {
+ return true; // everything else is conservatively treated as non-debug use
+ }
+ }
+ return false; // no non-debug uses found
+}
+
//=============================================================================
//------------------------------yank-------------------------------------------
// Find and remove
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index 46b89aa2c5f..8c6622e643e 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -168,6 +168,7 @@ class Pipeline;
class PopulateIndexNode;
class ProjNode;
class RangeCheckNode;
+class ReachabilityFenceNode;
class ReductionNode;
class RegMask;
class RegionNode;
@@ -452,6 +453,9 @@ public:
// Check whether node has become unreachable
bool is_unreachable(PhaseIterGVN &igvn) const;
+ // Does the node have any immediate non-debug uses?
+ bool has_non_debug_uses() const;
+
// Set a required input edge, also updates corresponding output edge
void add_req( Node *n ); // Append a NEW required input
void add_req( Node *n0, Node *n1 ) {
@@ -824,6 +828,7 @@ public:
DEFINE_CLASS_ID(Move, Node, 20)
DEFINE_CLASS_ID(LShift, Node, 21)
DEFINE_CLASS_ID(Neg, Node, 22)
+ DEFINE_CLASS_ID(ReachabilityFence, Node, 23)
_max_classes = ClassMask_Neg
};
@@ -1013,6 +1018,7 @@ public:
DEFINE_CLASS_QUERY(PCTable)
DEFINE_CLASS_QUERY(Phi)
DEFINE_CLASS_QUERY(Proj)
+ DEFINE_CLASS_QUERY(ReachabilityFence)
DEFINE_CLASS_QUERY(Reduction)
DEFINE_CLASS_QUERY(Region)
DEFINE_CLASS_QUERY(Root)
@@ -1180,6 +1186,7 @@ public:
return nullptr;
}
assert(!res->depends_only_on_test(), "the result must not depends_only_on_test");
+ assert(Opcode() == res->Opcode(), "pinning must result in the same kind of node %s - %s", Name(), res->Name());
return res;
}
diff --git a/src/hotspot/share/opto/parse.hpp b/src/hotspot/share/opto/parse.hpp
index 42f44f0f7ea..5118019fc31 100644
--- a/src/hotspot/share/opto/parse.hpp
+++ b/src/hotspot/share/opto/parse.hpp
@@ -356,6 +356,7 @@ class Parse : public GraphKit {
bool _wrote_stable; // Did we write a @Stable field?
bool _wrote_fields; // Did we write any field?
Node* _alloc_with_final_or_stable; // An allocation node with final or @Stable field
+ Node* _stress_rf_hook; // StressReachabilityFences support
// Variables which track Java semantics during bytecode parsing:
diff --git a/src/hotspot/share/opto/parse1.cpp b/src/hotspot/share/opto/parse1.cpp
index 683633f6355..6a400631bff 100644
--- a/src/hotspot/share/opto/parse1.cpp
+++ b/src/hotspot/share/opto/parse1.cpp
@@ -369,6 +369,15 @@ void Parse::load_interpreter_state(Node* osr_buf) {
continue;
}
set_local(index, check_interpreter_type(l, type, bad_type_exit));
+ if (StressReachabilityFences && type->isa_oopptr() != nullptr) {
+ // Keep all oop locals alive until the method returns as if there are
+ // reachability fences for them at the end of the method.
+ Node* loc = local(index);
+ if (loc->bottom_type() != TypePtr::NULL_PTR) {
+ assert(loc->bottom_type()->isa_oopptr() != nullptr, "%s", Type::str(loc->bottom_type()));
+ _stress_rf_hook->add_req(loc);
+ }
+ }
}
for (index = 0; index < sp(); index++) {
@@ -377,6 +386,15 @@ void Parse::load_interpreter_state(Node* osr_buf) {
if (l->is_top()) continue; // nothing here
const Type *type = osr_block->stack_type_at(index);
set_stack(index, check_interpreter_type(l, type, bad_type_exit));
+ if (StressReachabilityFences && type->isa_oopptr() != nullptr) {
+ // Keep all oops on stack alive until the method returns as if there are
+ // reachability fences for them at the end of the method.
+ Node* stk = stack(index);
+ if (stk->bottom_type() != TypePtr::NULL_PTR) {
+ assert(stk->bottom_type()->isa_oopptr() != nullptr, "%s", Type::str(stk->bottom_type()));
+ _stress_rf_hook->add_req(stk);
+ }
+ }
}
if (bad_type_exit->control()->req() > 1) {
@@ -411,6 +429,7 @@ Parse::Parse(JVMState* caller, ciMethod* parse_method, float expected_uses)
_wrote_stable = false;
_wrote_fields = false;
_alloc_with_final_or_stable = nullptr;
+ _stress_rf_hook = (StressReachabilityFences ? new Node(1) : nullptr);
_block = nullptr;
_first_return = true;
_replaced_nodes_for_exceptions = false;
@@ -642,6 +661,11 @@ Parse::Parse(JVMState* caller, ciMethod* parse_method, float expected_uses)
if (log) log->done("parse nodes='%d' live='%d' memory='%zu'",
C->unique(), C->live_nodes(), C->node_arena()->used());
+
+ if (StressReachabilityFences) {
+ _stress_rf_hook->destruct(&_gvn);
+ _stress_rf_hook = nullptr;
+ }
}
//---------------------------do_all_blocks-------------------------------------
@@ -1194,6 +1218,14 @@ SafePointNode* Parse::create_entry_map() {
return entry_map;
}
+//-----------------------is_auto_boxed_primitive------------------------------
+// Helper method to detect auto-boxed primitives (result of valueOf() call).
+static bool is_auto_boxed_primitive(Node* n) {
+ return (n->is_Proj() && n->as_Proj()->_con == TypeFunc::Parms &&
+ n->in(0)->is_CallJava() &&
+ n->in(0)->as_CallJava()->method()->is_boxing_method());
+}
+
//-----------------------------do_method_entry--------------------------------
// Emit any code needed in the pseudo-block before BCI zero.
// The main thing to do is lock the receiver of a synchronized method.
@@ -1207,6 +1239,19 @@ void Parse::do_method_entry() {
make_dtrace_method_entry(method());
}
+ if (StressReachabilityFences) {
+ // Keep all oop arguments alive until the method returns as if there are
+ // reachability fences for them at the end of the method.
+ int max_locals = jvms()->loc_size();
+ for (int idx = 0; idx < max_locals; idx++) {
+ Node* loc = local(idx);
+ if (loc->bottom_type()->isa_oopptr() != nullptr &&
+ !is_auto_boxed_primitive(loc)) { // ignore auto-boxed primitives
+ _stress_rf_hook->add_req(loc);
+ }
+ }
+ }
+
#ifdef ASSERT
// Narrow receiver type when it is too broad for the method being parsed.
if (!method()->is_static()) {
@@ -2197,6 +2242,15 @@ void Parse::return_current(Node* value) {
call_register_finalizer();
}
+ if (StressReachabilityFences) {
+ // Insert reachability fences for all oop arguments at the end of the method.
+ for (uint i = 1; i < _stress_rf_hook->req(); i++) {
+ Node* referent = _stress_rf_hook->in(i);
+ assert(referent->bottom_type()->isa_oopptr(), "%s", Type::str(referent->bottom_type()));
+ insert_reachability_fence(referent);
+ }
+ }
+
// Do not set_parse_bci, so that return goo is credited to the return insn.
set_bci(InvocationEntryBci);
if (method()->is_synchronized()) {
diff --git a/src/hotspot/share/opto/parse2.cpp b/src/hotspot/share/opto/parse2.cpp
index a7c5398171b..d732e6f04e1 100644
--- a/src/hotspot/share/opto/parse2.cpp
+++ b/src/hotspot/share/opto/parse2.cpp
@@ -1803,8 +1803,8 @@ static bool match_type_check(PhaseGVN& gvn,
assert(idx == 1 || idx == 2, "");
Node* vcon = val->in(idx);
- assert(val->find_edge(con) > 0, "");
if ((btest == BoolTest::eq && vcon == con) || (btest == BoolTest::ne && vcon != con)) {
+ assert(val->find_edge(con) > 0, "mismatch");
SubTypeCheckNode* sub = b1->in(1)->as_SubTypeCheck();
Node* obj_or_subklass = sub->in(SubTypeCheckNode::ObjOrSubKlass);
Node* superklass = sub->in(SubTypeCheckNode::SuperKlass);
@@ -1833,17 +1833,21 @@ void Parse::sharpen_type_after_if(BoolTest::mask btest,
&obj, &cast_type)) {
assert(obj != nullptr && cast_type != nullptr, "missing type check info");
const Type* obj_type = _gvn.type(obj);
- const TypeOopPtr* tboth = obj_type->join_speculative(cast_type)->isa_oopptr();
- if (tboth != nullptr && tboth != obj_type && tboth->higher_equal(obj_type)) {
+ const Type* tboth = obj_type->filter_speculative(cast_type);
+ assert(tboth->higher_equal(obj_type) && tboth->higher_equal(cast_type), "sanity");
+ if (tboth == Type::TOP && KillPathsReachableByDeadTypeNode) {
+ // Let dead type node cleaning logic prune effectively dead path for us.
+ // CheckCastPP::Value() == TOP and it will trigger the cleanup during GVN.
+ // Don't materialize the cast when cleanup is disabled, because
+ // it kills data and control leaving IR in broken state.
+ tboth = cast_type;
+ }
+ if (tboth != Type::TOP && tboth != obj_type) {
int obj_in_map = map()->find_edge(obj);
- JVMState* jvms = this->jvms();
if (obj_in_map >= 0 &&
- (jvms->is_loc(obj_in_map) || jvms->is_stk(obj_in_map))) {
+ (jvms()->is_loc(obj_in_map) || jvms()->is_stk(obj_in_map))) {
TypeNode* ccast = new CheckCastPPNode(control(), obj, tboth);
- const Type* tcc = ccast->as_Type()->type();
- assert(tcc != obj_type && tcc->higher_equal(obj_type), "must improve");
- // Delay transform() call to allow recovery of pre-cast value
- // at the control merge.
+ // Delay transform() call to allow recovery of pre-cast value at the control merge.
_gvn.set_type_bottom(ccast);
record_for_igvn(ccast);
// Here's the payoff.
diff --git a/src/hotspot/share/opto/phase.cpp b/src/hotspot/share/opto/phase.cpp
index 5603033ce69..3f1866990e2 100644
--- a/src/hotspot/share/opto/phase.cpp
+++ b/src/hotspot/share/opto/phase.cpp
@@ -90,6 +90,9 @@ void Phase::print_timers() {
tty->print_cr (" Prune Useless: %7.3f s", timers[_t_vector_pru].seconds());
tty->print_cr (" Renumber Live: %7.3f s", timers[_t_renumberLive].seconds());
tty->print_cr (" IdealLoop: %7.3f s", timers[_t_idealLoop].seconds());
+ tty->print_cr (" ReachabilityFence: %7.3f s", timers[_t_reachability].seconds());
+ tty->print_cr (" Optimize: %7.3f s", timers[_t_reachability_optimize].seconds());
+ tty->print_cr (" Expand: %7.3f s", timers[_t_reachability_expand].seconds());
tty->print_cr (" AutoVectorize: %7.3f s", timers[_t_autoVectorize].seconds());
tty->print_cr (" IdealLoop Verify: %7.3f s", timers[_t_idealLoopVerify].seconds());
tty->print_cr (" Cond Const Prop: %7.3f s", timers[_t_ccp].seconds());
diff --git a/src/hotspot/share/opto/phase.hpp b/src/hotspot/share/opto/phase.hpp
index 6700df6ec17..5bd3c34f15f 100644
--- a/src/hotspot/share/opto/phase.hpp
+++ b/src/hotspot/share/opto/phase.hpp
@@ -85,6 +85,9 @@ public:
f( _t_vector_pru, "vector_pru") \
f( _t_renumberLive, "") \
f( _t_idealLoop, "idealLoop") \
+ f( _t_reachability, "reachabilityFence") \
+ f( _t_reachability_optimize, "reachabilityFence_optimize") \
+ f( _t_reachability_expand, "reachabilityFence_expand") \
f( _t_autoVectorize, "autoVectorize") \
f( _t_idealLoopVerify, "idealLoopVerify") \
f( _t_ccp, "ccp") \
diff --git a/src/hotspot/share/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp
index 0fecc14f31a..a4d6a6c33d0 100644
--- a/src/hotspot/share/opto/phaseX.cpp
+++ b/src/hotspot/share/opto/phaseX.cpp
@@ -2123,7 +2123,12 @@ void PhaseIterGVN::verify_Identity_for(Node* n) {
if (n->is_Vector()) {
// Found with tier1-3. Not investigated yet.
- // The observed issue was with AndVNode::Identity
+ // The observed issue was with AndVNode::Identity and
+ // VectorStoreMaskNode::Identity (see JDK-8370863).
+ //
+ // Found with:
+ // compiler/vectorapi/VectorStoreMaskIdentityTest.java
+ // -XX:CompileThreshold=100 -XX:-TieredCompilation -XX:VerifyIterativeGVN=1110
return;
}
diff --git a/src/hotspot/share/opto/phasetype.hpp b/src/hotspot/share/opto/phasetype.hpp
index ce432fbfc01..2b599ace03a 100644
--- a/src/hotspot/share/opto/phasetype.hpp
+++ b/src/hotspot/share/opto/phasetype.hpp
@@ -106,6 +106,7 @@
flags(PHASEIDEALLOOP1, "PhaseIdealLoop 1") \
flags(PHASEIDEALLOOP2, "PhaseIdealLoop 2") \
flags(PHASEIDEALLOOP3, "PhaseIdealLoop 3") \
+ flags(EXPAND_REACHABILITY_FENCES, "Expand Reachability Fences") \
flags(AUTO_VECTORIZATION1_BEFORE_APPLY, "AutoVectorization 1, before Apply") \
flags(AUTO_VECTORIZATION3_AFTER_ADJUST_LIMIT, "AutoVectorization 2, after Adjusting Pre-loop Limit") \
flags(AUTO_VECTORIZATION4_AFTER_SPECULATIVE_RUNTIME_CHECKS, "AutoVectorization 3, after Adding Speculative Runtime Checks") \
diff --git a/src/hotspot/share/opto/reachability.cpp b/src/hotspot/share/opto/reachability.cpp
new file mode 100644
index 00000000000..b45b340ab85
--- /dev/null
+++ b/src/hotspot/share/opto/reachability.cpp
@@ -0,0 +1,512 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * 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/c2_MacroAssembler.hpp"
+#include "opto/callnode.hpp"
+#include "opto/compile.hpp"
+#include "opto/loopnode.hpp"
+#include "opto/phaseX.hpp"
+#include "opto/reachability.hpp"
+#include "opto/regalloc.hpp"
+#include "opto/runtime.hpp"
+#include "utilities/pair.hpp"
+
+/*
+ * java.lang.ref.Reference::reachabilityFence support.
+ *
+ * Reachability Fence (RF) ensures that the given object (referent) remains strongly reachable
+ * regardless of any optimizing transformations the virtual machine may perform that might otherwise
+ * allow the object to become unreachable.
+ *
+ * RFs are intended to be used in performance-critical code, so the primary goal for C2 support is
+ * to reduce their runtime overhead as much as possible.
+ *
+ * Reference::reachabilityFence() calls are intrinsified into ReachabilityFence CFG nodes. RF node keeps
+ * its referent alive, so the referent's location is recorded at every safepoint (in its oop map) which
+ * interferes with referent's live range.
+ *
+ * It is tempting to directly attach referents to interfering safepoints right from the beginning, but it
+ * doesn't play well with some optimizations C2 does (e.g., during loop-invariant code motion a safepoint
+ * can become interfering once a load is hoisted).
+ *
+ * Instead, reachability representation transitions through multiple phases:
+ * (0) initial set of RFs is materialized during parsing (as a result of
+ * Reference.reachabilityFence intrinsification);
+ * (1) optimization pass during loop opts eliminates redundant RF nodes and
+ * moves the ones with loop-invariant referents outside (after) loops;
+ * (2) after loop opts are over, RF nodes are eliminated and their referents are transferred to
+ * safepoint nodes (appended as edges after debug info);
+ * (3) during final graph reshaping, referent edges are removed from safepoints and materialized as RF nodes
+ * attached to their safepoint node (closely following it in CFG graph).
+ *
+ * Some implementation considerations.
+ *
+ * (a) It looks attractive to get rid of RF nodes early and transfer to safepoint-attached representation,
+ * but it is not correct until loop opts are done.
+ *
+ * Live ranges of values are routinely extended during loop opts. And it can break the invariant that
+ * all interfering safepoints contain the referent in their oop map. (If an interfering safepoint doesn't
+ * keep the referent alive, then it becomes possible for the referent to be prematurely GCed.)
+ *
+ * compiler/c2/TestReachabilityFence.java demonstrates a situation where a load is hoisted out of a loop thus
+ * extending the live range of the value it produces beyond the safepoint on loop-back edge.
+ *
+ * After loop opts are over, it becomes possible to reliably enumerate all interfering safepoints and
+ * to ensure that the referent is present in their oop maps. Current assumption is that after loop opts the IR graph
+ * is stable enough, so relative order of memory operations and safepoints is preserved and only safepoints between
+ * a referent and it's uses are taken into account. A more conservative analysis can be employed -- any safepoint dominated
+ * by a referent is treated as interfering with it -- if it turns out that the assumption doesn't hold.
+ *
+ * (b) RF nodes may interfere with Register Allocator (RA). If a safepoint is pruned during macro expansion,
+ * it can make some RF nodes redundant, but we don't have information about their relations anymore to detect that.
+ * Redundant RF node unnecessarily extends referent's live range and increases register pressure.
+ *
+ * Hence, we eliminate RF nodes and transfer their referents to corresponding safepoints (phase #2).
+ * When safepoints are pruned, corresponding reachability edges also go away.
+ *
+ * (c) Unfortunately, it's not straightforward to stay with safepoint-attached representation till the very end,
+ * because information about derived oops is attached to safepoints in a similar way. So, for now RFs are
+ * rematerialized at safepoints before RA (phase #3).
+ */
+
+bool ReachabilityFenceNode::is_redundant(PhaseGVN& gvn) {
+ const Type* referent_t = gvn.type(referent());
+ if (referent_t == TypePtr::NULL_PTR) {
+ return true; // no-op fence: null referent
+ }
+ if (!OptimizeReachabilityFences) {
+ return false; // keep reachability fence nodes intact
+ }
+ if (!PreserveReachabilityFencesOnConstants && referent_t->singleton()) {
+ return true; // no-op fence: constants are strongly reachable
+ }
+ return false;
+}
+
+Node* ReachabilityFenceNode::Ideal(PhaseGVN* phase, bool can_reshape) {
+ return (remove_dead_region(phase, can_reshape) ? this : nullptr);
+}
+
+Node* ReachabilityFenceNode::Identity(PhaseGVN* phase) {
+ if (is_redundant(*phase)) {
+ return in(0);
+ }
+ return this;
+}
+
+// Turn the RF node into a no-op by setting its referent to null.
+// Subsequent IGVN pass removes cleared nodes.
+bool ReachabilityFenceNode::clear_referent(PhaseIterGVN& phase) {
+ if (phase.type(referent()) == TypePtr::NULL_PTR) {
+ return false;
+ } else {
+ phase.replace_input_of(this, 1, phase.makecon(TypePtr::NULL_PTR));
+ return true;
+ }
+}
+
+#ifndef PRODUCT
+static void rf_desc(outputStream* st, const ReachabilityFenceNode* rf, PhaseRegAlloc* ra) {
+ char buf[50];
+ ra->dump_register(rf->referent(), buf, sizeof(buf));
+ st->print("reachability fence [%s]", buf);
+}
+
+void ReachabilityFenceNode::format(PhaseRegAlloc* ra, outputStream* st) const {
+ rf_desc(st, this, ra);
+}
+
+void ReachabilityFenceNode::emit(C2_MacroAssembler* masm, PhaseRegAlloc* ra) const {
+ ResourceMark rm;
+ stringStream ss;
+ rf_desc(&ss, this, ra);
+ const char* desc = masm->code_string(ss.freeze());
+ masm->block_comment(desc);
+}
+#endif
+
+// Detect safepoint nodes which are important for reachability tracking purposes.
+// Some SafePoint nodes can't affect referent's reachability in any noticeable way and
+// can be safely ignored during the analysis.
+static bool is_interfering_sfpt_candidate(SafePointNode* sfpt) {
+ if (sfpt->jvms() == nullptr) {
+ return false; // not a real safepoint
+ } else if (sfpt->is_CallStaticJava() && sfpt->as_CallStaticJava()->is_uncommon_trap()) {
+ return false; // uncommon traps are exit points
+ }
+ return true; // a full-blown safepoint can interfere with a reachability fence and its referent
+}
+
+void PhaseIdealLoop::insert_rf(Node* ctrl, Node* referent) {
+ IdealLoopTree* lpt = get_loop(ctrl);
+ Node* ctrl_end = ctrl->unique_ctrl_out();
+
+ auto new_rf = new ReachabilityFenceNode(C, ctrl, referent);
+
+ register_control(new_rf, lpt, ctrl);
+ set_idom(new_rf, ctrl, dom_depth(ctrl) + 1);
+ lpt->register_reachability_fence(new_rf);
+
+ igvn().rehash_node_delayed(ctrl_end);
+ ctrl_end->replace_edge(ctrl, new_rf);
+
+ if (idom(ctrl_end) == ctrl) {
+ set_idom(ctrl_end, new_rf, dom_depth(new_rf) + 1);
+ } else {
+ assert(ctrl_end->is_Region(), "");
+ }
+}
+
+void PhaseIdealLoop::replace_rf(Node* old_node, Node* new_node) {
+ assert(old_node->is_ReachabilityFence() ||
+ (old_node->is_Proj() && old_node->in(0)->is_ReachabilityFence()),
+ "%s", NodeClassNames[old_node->Opcode()]);
+
+ IdealLoopTree* lpt = get_loop(old_node);
+ lpt->_body.yank(old_node);
+ assert(lpt->_reachability_fences != nullptr, "missing");
+ assert(lpt->_reachability_fences->contains(old_node), "missing");
+ lpt->_reachability_fences->yank(old_node);
+ replace_node_and_forward_ctrl(old_node, new_node);
+}
+
+void PhaseIdealLoop::remove_rf(ReachabilityFenceNode* rf) {
+ Node* rf_ctrl_in = rf->in(0);
+ Node* referent = rf->referent();
+ if (rf->clear_referent(igvn()) && referent->outcnt() == 0) {
+ remove_dead_data_node(referent);
+ }
+ replace_rf(rf, rf_ctrl_in);
+}
+
+//======================================================================
+//---------------------------- Phase 1 ---------------------------------
+// Optimization pass over reachability fences during loop opts.
+// Moves RFs with loop-invariant referents out of the loop.
+bool PhaseIdealLoop::optimize_reachability_fences() {
+ Compile::TracePhase tp(_t_reachability_optimize);
+
+ assert(OptimizeReachabilityFences, "required");
+
+ // ResourceMark rm; // NB! not safe because insert_rf may trigger _idom reallocation
+ Unique_Node_List redundant_rfs;
+ typedef Pair LoopExit;
+ GrowableArray worklist;
+
+ for (int i = 0; i < C->reachability_fences_count(); i++) {
+ ReachabilityFenceNode* rf = C->reachability_fence(i);
+ assert(!rf->is_redundant(igvn()), "required");
+ // Move RFs out of counted loops when possible.
+ IdealLoopTree* lpt = get_loop(rf);
+ Node* referent = rf->referent();
+ if (lpt->is_invariant(referent)) {
+ IfFalseNode* unique_loop_exit = lpt->unique_loop_exit_proj_or_null();
+ if (unique_loop_exit != nullptr) {
+ // Skip over an outer strip-mined loop.
+ if (!lpt->is_root()) {
+ IdealLoopTree* outer_lpt = lpt->_parent;
+ if (outer_lpt->head()->is_OuterStripMinedLoop()) {
+ if (outer_lpt->is_invariant(referent)) {
+ IfNode* outer_loop_end = outer_lpt->head()->as_OuterStripMinedLoop()->outer_loop_end();
+ if (outer_loop_end != nullptr && outer_loop_end->false_proj_or_null() != nullptr) {
+ unique_loop_exit = outer_loop_end->false_proj_or_null();
+ }
+ } else {
+ // An attempt to insert an RF node inside outer strip-mined loop breaks
+ // its IR invariants and manifests as assertion failures.
+ assert(false, "not loop invariant in outer strip-mined loop");
+ continue; // skip
+ }
+ }
+ }
+
+ LoopExit p(referent, unique_loop_exit);
+ worklist.push(p);
+ redundant_rfs.push(rf);
+
+#ifndef PRODUCT
+ if (TraceLoopOpts) {
+ IdealLoopTree* loop = get_loop(unique_loop_exit->in(0));
+ tty->print_cr("ReachabilityFence: N%d: %s N%d/N%d -> loop exit N%d (%s N%d/N%d)",
+ rf->_idx, lpt->head()->Name(), lpt->head()->_idx, lpt->tail()->_idx,
+ unique_loop_exit->_idx,
+ loop->head()->Name(), loop->head()->_idx, loop->tail()->_idx);
+ }
+#endif // !PRODUCT
+ }
+ }
+ }
+
+ // Populate RFs outside loops.
+ while (worklist.is_nonempty()) {
+ LoopExit p = worklist.pop();
+ Node* referent = p.first;
+ Node* ctrl_out = p.second;
+ insert_rf(ctrl_out, referent);
+ }
+
+ // Eliminate redundant RFs.
+ bool progress = (redundant_rfs.size() > 0);
+ while (redundant_rfs.size() > 0) {
+ remove_rf(redundant_rfs.pop()->as_ReachabilityFence());
+ }
+
+ return progress;
+}
+
+//======================================================================
+//---------------------------- Phase 2 ---------------------------------
+
+// Linearly traverse CFG upwards starting at ctrl_start until first merge point.
+// All encountered safepoints are recorded in safepoints list, except
+// the ones filtered out by is_interfering_sfpt_candidate().
+static void enumerate_interfering_sfpts_linear_traversal(Node* ctrl_start, Node_Stack& stack, VectorSet& visited,
+ Node_List& interfering_sfpts) {
+ for (Node* ctrl = ctrl_start; ctrl != nullptr; ctrl = ctrl->in(0)) {
+ assert(ctrl->is_CFG(), "");
+ if (visited.test_set(ctrl->_idx)) {
+ return;
+ } else {
+ if (ctrl->is_Region()) {
+ stack.push(ctrl, 1);
+ return; // stop at merge points
+ } else if (ctrl->is_SafePoint() && is_interfering_sfpt_candidate(ctrl->as_SafePoint())) {
+ assert(!ctrl->is_CallStaticJava() || !ctrl->as_CallStaticJava()->is_uncommon_trap(),
+ "uncommon traps should not be enumerated");
+ interfering_sfpts.push(ctrl);
+ }
+ }
+ }
+}
+
+// Enumerate all safepoints which are reachable from the RF to its referent through CFG.
+// Start at RF node and traverse CFG upwards until referent's control node is reached.
+static void enumerate_interfering_sfpts(ReachabilityFenceNode* rf, PhaseIdealLoop* phase,
+ Node_Stack& stack, VectorSet& visited,
+ Node_List& interfering_sfpts) {
+ assert(stack.is_empty(), "required");
+ assert(visited.is_empty(), "required");
+
+ Node* referent = rf->referent();
+ Node* referent_ctrl = phase->get_ctrl(referent);
+ assert(phase->is_dominator(referent_ctrl, rf), "sanity");
+
+ visited.set(referent_ctrl->_idx); // end point
+ enumerate_interfering_sfpts_linear_traversal(rf, stack, visited, interfering_sfpts); // starting point in CFG
+ while (stack.is_nonempty()) {
+ Node* cur = stack.node();
+ uint idx = stack.index();
+
+ assert(cur != nullptr, "");
+ assert(cur->is_Region(), "%s", NodeClassNames[cur->Opcode()]);
+ assert(phase->is_dominator(referent_ctrl, cur), "");
+ assert(idx > 0 && idx <= cur->req(), "%d %d", idx, cur->req());
+
+ if (idx < cur->req()) {
+ stack.set_index(idx + 1);
+ enumerate_interfering_sfpts_linear_traversal(cur->in(idx), stack, visited, interfering_sfpts);
+ } else {
+ stack.pop();
+ }
+ }
+ // Reset temporary structures to their initial state.
+ assert(stack.is_empty(), "required");
+ visited.clear();
+}
+
+// Start offset for reachability info on a safepoint node.
+static uint rf_base_offset(SafePointNode* sfpt) {
+ return sfpt->jvms()->debug_end();
+}
+
+static bool dominates_another_rf(ReachabilityFenceNode* rf, PhaseIdealLoop* phase) {
+ assert(!rf->is_redundant(phase->igvn()), "");
+
+ for (int i = 0; i < phase->C->reachability_fences_count(); i++) {
+ ReachabilityFenceNode* other_rf = phase->C->reachability_fence(i);
+ assert(other_rf->outcnt() > 0, "dead node");
+ if (rf != other_rf && rf->referent()->eqv_uncast(other_rf->referent()) &&
+ phase->is_dominator(rf, other_rf)) {
+ return true; // dominates another reachability fence with the same referent
+ }
+ }
+ return false;
+}
+
+// Phase 2: migrate reachability info to safepoints.
+// All RFs are replaced with edges from corresponding referents to interfering safepoints.
+// Interfering safepoints are safepoint nodes which are reachable from the RF to its referent through CFG.
+bool PhaseIdealLoop::expand_reachability_fences() {
+ Compile::TracePhase tp(_t_reachability_expand);
+
+ assert(OptimizeReachabilityFences, "required");
+ assert(C->post_loop_opts_phase(), "required");
+ DEBUG_ONLY( int no_of_constant_rfs = 0; )
+
+ ResourceMark rm;
+ Unique_Node_List for_removal;
+ typedef Pair ReachabilityEdge;
+ GrowableArray reachability_edges;
+ {
+ // Reuse temporary structures to avoid allocating them for every single RF node.
+ Node_List sfpt_worklist;
+ Node_Stack stack(0);
+ VectorSet visited;
+
+ for (int i = 0; i < C->reachability_fences_count(); i++) {
+ ReachabilityFenceNode* rf = C->reachability_fence(i);
+ assert(!rf->is_redundant(igvn()), "missed");
+ if (PreserveReachabilityFencesOnConstants) {
+ const Type* referent_t = igvn().type(rf->referent());
+ assert(referent_t != TypePtr::NULL_PTR, "redundant rf");
+ bool is_constant_rf = referent_t->singleton();
+ if (is_constant_rf) {
+ DEBUG_ONLY( no_of_constant_rfs += 1; )
+ continue; // leave RFs on constants intact
+ }
+ }
+ if (dominates_another_rf(rf, this)) {
+ // Redundant fence: dominates another RF with the same referent.
+ // RF is redundant for some referent oop when the referent has another RF which
+ // keeps it alive across the RF. In terms of dominance relation it can be formulated
+ // as "a referent has another RF which is dominated by the redundant RF".
+ //
+ // NB! It is safe to assume that dominating RF is redundant only during expansion.
+ // Otherwise, there's a chance for the superseding RF node to go away before expansion.
+ // Non-RF users are ignored for a similar reason: they can go away before or after expansion
+ // takes place, so no guarantees reachability information is preserved.
+ } else {
+ assert(sfpt_worklist.size() == 0, "not empty");
+ enumerate_interfering_sfpts(rf, this, stack, visited, sfpt_worklist);
+
+ Node* referent = rf->referent();
+ while (sfpt_worklist.size() > 0) {
+ SafePointNode* sfpt = sfpt_worklist.pop()->as_SafePoint();
+ assert(is_dominator(get_ctrl(referent), sfpt), "");
+ assert(sfpt->req() == rf_base_offset(sfpt), "no extra edges allowed");
+ if (sfpt->find_edge(referent) == -1) {
+ ReachabilityEdge p(sfpt, referent);
+ reachability_edges.push(p);
+ }
+ }
+ }
+ for_removal.push(rf);
+ }
+ }
+ // Materialize reachability edges.
+ while (reachability_edges.length() > 0) {
+ ReachabilityEdge p = reachability_edges.pop();
+ SafePointNode* sfpt = p.first;
+ Node* referent = p.second;
+ if (sfpt->find_edge(referent) == -1) {
+ sfpt->add_req(referent);
+ igvn()._worklist.push(sfpt);
+ }
+ }
+ // Eliminate processed RFs. They become redundant once reachability edges are added.
+ bool progress = (for_removal.size() > 0);
+ while (for_removal.size() > 0) {
+ remove_rf(for_removal.pop()->as_ReachabilityFence());
+ }
+
+ assert(C->reachability_fences_count() == no_of_constant_rfs, "");
+ return progress;
+}
+
+//======================================================================
+//---------------------------- Phase 3 ---------------------------------
+
+// Find a point in CFG right after safepoint node to insert reachability fence.
+static Node* sfpt_ctrl_out(SafePointNode* sfpt) {
+ if (sfpt->is_Call()) {
+ CallProjections callprojs;
+ sfpt->as_Call()->extract_projections(&callprojs,
+ false /*separate_io_proj*/,
+ false /*do_asserts*/,
+ true /*allow_handlers*/);
+ // Calls can have multiple control projections. However, reachability edge expansion
+ // happens during final graph reshaping which is performed very late in compilation pipeline.
+ // The assumption here is that the control path chosen for insertion can't go away.
+ // So, materializing a reachability fence on a single control path produced by a call
+ // is enough to keep the referent oop alive across the call.
+ if (callprojs.fallthrough_catchproj != nullptr) {
+ return callprojs.fallthrough_catchproj;
+ } else if (callprojs.catchall_catchproj != nullptr) {
+ return callprojs.catchall_catchproj; // rethrow stub
+ } else if (callprojs.fallthrough_proj != nullptr) {
+ return callprojs.fallthrough_proj; // no exceptions thrown
+ } else {
+ ShouldNotReachHere();
+ }
+ } else {
+ return sfpt;
+ }
+}
+
+// Phase 3: materialize reachability fences from reachability edges on safepoints.
+// Turn extra safepoint edges into reachability fences immediately following the safepoint.
+//
+// NB! As of now, a special care is needed to properly enumerate reachability edges because
+// there are other use cases for non-debug safepoint edges. expand_reachability_edges() runs
+// after macro expansion where runtime calls during array allocation are annotated with
+// valid_length_test_input as an extra edges. Until there's a mechanism to distinguish between
+// different types of non-debug edges, unrelated cases are filtered out explicitly and in ad-hoc manner.
+void Compile::expand_reachability_edges(Unique_Node_List& safepoints) {
+ for (uint i = 0; i < safepoints.size(); i++) {
+ SafePointNode* sfpt = safepoints.at(i)->as_SafePoint();
+
+ uint rf_offset = rf_base_offset(sfpt);
+ if (sfpt->jvms() != nullptr && sfpt->req() > rf_offset) {
+ assert(is_interfering_sfpt_candidate(sfpt), "");
+ Node* ctrl_out = sfpt_ctrl_out(sfpt);
+ Node* ctrl_end = ctrl_out->unique_ctrl_out();
+
+ Node* extra_edge = nullptr;
+ if (sfpt->is_Call()) {
+ address entry = sfpt->as_Call()->entry_point();
+ if (entry == OptoRuntime::new_array_Java() ||
+ entry == OptoRuntime::new_array_nozero_Java()) {
+ // valid_length_test_input is appended during macro expansion at the very end
+ int last_idx = sfpt->req() - 1;
+ extra_edge = sfpt->in(last_idx);
+ sfpt->del_req(last_idx);
+ }
+ }
+
+ while (sfpt->req() > rf_offset) {
+ int idx = sfpt->req() - 1;
+ Node* referent = sfpt->in(idx);
+ sfpt->del_req(idx);
+
+ Node* new_rf = new ReachabilityFenceNode(C, ctrl_out, referent);
+ ctrl_end->replace_edge(ctrl_out, new_rf);
+ ctrl_end = new_rf;
+ }
+
+ if (extra_edge != nullptr) {
+ sfpt->add_req(extra_edge); // Add valid_length_test_input edge back
+ }
+ }
+ }
+}
diff --git a/src/hotspot/share/opto/reachability.hpp b/src/hotspot/share/opto/reachability.hpp
new file mode 100644
index 00000000000..ba435c8484f
--- /dev/null
+++ b/src/hotspot/share/opto/reachability.hpp
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * 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_REACHABILITY_HPP
+#define SHARE_OPTO_REACHABILITY_HPP
+
+#include "opto/multnode.hpp"
+#include "opto/node.hpp"
+#include "opto/opcodes.hpp"
+#include "opto/type.hpp"
+
+//------------------------ReachabilityFenceNode--------------------------
+// Represents a Reachability Fence (RF) in the code.
+//
+// RF ensures that the given object (referent) remains strongly reachable regardless of
+// any optimizing transformations the virtual machine may perform that might otherwise
+// allow the object to become unreachable.
+
+// java.lang.ref.Reference::reachabilityFence calls are intrinsified into ReachabilityFence nodes.
+//
+// More details in reachability.cpp.
+class ReachabilityFenceNode : public Node {
+public:
+ ReachabilityFenceNode(Compile* C, Node* ctrl, Node* referent)
+ : Node(1) {
+ assert(referent->bottom_type()->isa_oopptr() ||
+ referent->bottom_type()->isa_narrowoop() != nullptr ||
+ referent->bottom_type() == TypePtr::NULL_PTR,
+ "%s", Type::str(referent->bottom_type()));
+ init_class_id(Class_ReachabilityFence);
+ init_req(TypeFunc::Control, ctrl);
+ add_req(referent);
+ C->add_reachability_fence(this);
+ }
+ virtual int Opcode() const;
+ virtual bool is_CFG() const { return true; }
+ virtual uint hash() const { return NO_HASH; } // CFG nodes do not hash
+ virtual bool depends_only_on_test() const { return false; };
+ virtual uint ideal_reg() const { return 0; } // not matched in the AD file
+ virtual const Type* bottom_type() const { return Type::CONTROL; }
+ virtual const RegMask& in_RegMask(uint idx) const {
+ // Fake input register mask for the referent: accepts all registers and all stack slots.
+ // This avoids redundant register moves around reachability fences.
+ return RegMask::ALL;
+ }
+ virtual const RegMask& out_RegMask() const {
+ return RegMask::EMPTY;
+ }
+
+ virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
+ virtual Node* Identity(PhaseGVN* phase);
+
+ Node* referent() const { return in(1); }
+ bool is_redundant(PhaseGVN& gvn);
+ bool clear_referent(PhaseIterGVN& phase);
+
+#ifndef PRODUCT
+ virtual void format(PhaseRegAlloc* ra, outputStream* st) const;
+ virtual void emit(C2_MacroAssembler* masm, PhaseRegAlloc* ra) const;
+#endif
+};
+
+#endif // SHARE_OPTO_REACHABILITY_HPP
diff --git a/src/hotspot/share/opto/split_if.cpp b/src/hotspot/share/opto/split_if.cpp
index c1303f0d0db..e5f8043ae19 100644
--- a/src/hotspot/share/opto/split_if.cpp
+++ b/src/hotspot/share/opto/split_if.cpp
@@ -704,6 +704,9 @@ void PhaseIdealLoop::do_split_if(Node* iff, RegionNode** new_false_region, Regio
new_true = ifpx;
}
}
+ assert(new_false != nullptr, "iff is malformed");
+ assert(new_true != nullptr, "iff is malformed");
+
_igvn.remove_dead_node(new_iff, PhaseIterGVN::NodeOrigin::Speculative);
// Lazy replace IDOM info with the region's dominator
replace_node_and_forward_ctrl(iff, region_dom);
diff --git a/src/hotspot/share/opto/vector.cpp b/src/hotspot/share/opto/vector.cpp
index f44df7e6da2..d35717c5922 100644
--- a/src/hotspot/share/opto/vector.cpp
+++ b/src/hotspot/share/opto/vector.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -455,14 +455,12 @@ void PhaseVector::expand_vunbox_node(VectorUnboxNode* vec_unbox) {
gvn.record_for_igvn(local_mem);
BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
C2OptAccess access(gvn, ctrl, local_mem, decorators, T_OBJECT, obj, addr);
- const Type* type = TypeOopPtr::make_from_klass(field->type()->as_klass());
- vec_field_ld = bs->load_at(access, type);
- }
- // For proper aliasing, attach concrete payload type.
- ciKlass* payload_klass = ciTypeArrayKlass::make(bt);
- const Type* payload_type = TypeAryPtr::make_from_klass(payload_klass)->cast_to_ptr_type(TypePtr::NotNull);
- vec_field_ld = gvn.transform(new CastPPNode(nullptr, vec_field_ld, payload_type));
+ // For proper aliasing, attach concrete payload type.
+ ciKlass* payload_klass = ciTypeArrayKlass::make(bt);
+ const Type* payload_type = TypeAryPtr::make_from_klass(payload_klass)->cast_to_ptr_type(TypePtr::NotNull);
+ vec_field_ld = bs->load_at(access, payload_type);
+ }
Node* adr = kit.array_element_address(vec_field_ld, gvn.intcon(0), bt);
const TypePtr* adr_type = adr->bottom_type()->is_ptr();
diff --git a/src/hotspot/share/opto/vectornode.cpp b/src/hotspot/share/opto/vectornode.cpp
index 6012bdef86e..d19aa476196 100644
--- a/src/hotspot/share/opto/vectornode.cpp
+++ b/src/hotspot/share/opto/vectornode.cpp
@@ -1047,6 +1047,20 @@ Node* VectorNode::Ideal(PhaseGVN* phase, bool can_reshape) {
return nullptr;
}
+// Traverses a chain of VectorMaskCast and returns the first non VectorMaskCast node.
+//
+// Due to the unique nature of vector masks, for specific IR patterns,
+// VectorMaskCast does not affect the output results. For example:
+// (VectorStoreMask (VectorMaskCast* (VectorLoadMask x))) => (x)
+// x remains to be a bool vector with no changes.
+// This function can be used to eliminate the VectorMaskCast in such patterns.
+Node* VectorNode::uncast_mask(Node* n) {
+ while (n->Opcode() == Op_VectorMaskCast) {
+ n = n->in(1);
+ }
+ return n;
+}
+
// Return initial Pack node. Additional operands added with add_opd() calls.
PackNode* PackNode::make(Node* s, uint vlen, BasicType bt) {
const TypeVect* vt = TypeVect::make(bt, vlen);
@@ -1246,6 +1260,10 @@ int ReductionNode::opcode(int opc, BasicType bt) {
assert(bt == T_LONG, "must be");
vopc = Op_AddReductionVL;
break;
+ case Op_AddHF:
+ assert(bt == T_SHORT, "must be");
+ vopc = Op_AddReductionVHF;
+ break;
case Op_AddF:
assert(bt == T_FLOAT, "must be");
vopc = Op_AddReductionVF;
@@ -1270,6 +1288,10 @@ int ReductionNode::opcode(int opc, BasicType bt) {
assert(bt == T_LONG, "must be");
vopc = Op_MulReductionVL;
break;
+ case Op_MulHF:
+ assert(bt == T_SHORT, "must be");
+ vopc = Op_MulReductionVHF;
+ break;
case Op_MulF:
assert(bt == T_FLOAT, "must be");
vopc = Op_MulReductionVF;
@@ -1418,10 +1440,12 @@ ReductionNode* ReductionNode::make(int opc, Node* ctrl, Node* n1, Node* n2, Basi
switch (vopc) {
case Op_AddReductionVI: return new AddReductionVINode(ctrl, n1, n2);
case Op_AddReductionVL: return new AddReductionVLNode(ctrl, n1, n2);
+ case Op_AddReductionVHF: return new AddReductionVHFNode(ctrl, n1, n2, requires_strict_order);
case Op_AddReductionVF: return new AddReductionVFNode(ctrl, n1, n2, requires_strict_order);
case Op_AddReductionVD: return new AddReductionVDNode(ctrl, n1, n2, requires_strict_order);
case Op_MulReductionVI: return new MulReductionVINode(ctrl, n1, n2);
case Op_MulReductionVL: return new MulReductionVLNode(ctrl, n1, n2);
+ case Op_MulReductionVHF: return new MulReductionVHFNode(ctrl, n1, n2, requires_strict_order);
case Op_MulReductionVF: return new MulReductionVFNode(ctrl, n1, n2, requires_strict_order);
case Op_MulReductionVD: return new MulReductionVDNode(ctrl, n1, n2, requires_strict_order);
case Op_MinReductionV: return new MinReductionVNode (ctrl, n1, n2);
@@ -1495,10 +1519,12 @@ Node* VectorLoadMaskNode::Identity(PhaseGVN* phase) {
Node* VectorStoreMaskNode::Identity(PhaseGVN* phase) {
// Identity transformation on boolean vectors.
- // VectorStoreMask (VectorLoadMask bv) elem_size ==> bv
+ // VectorStoreMask (VectorMaskCast* VectorLoadMask bv) elem_size ==> bv
// vector[n]{bool} => vector[n]{t} => vector[n]{bool}
- if (in(1)->Opcode() == Op_VectorLoadMask) {
- return in(1)->in(1);
+ Node* in1 = VectorNode::uncast_mask(in(1));
+ if (in1->Opcode() == Op_VectorLoadMask) {
+ assert(length() == in1->as_Vector()->length(), "vector length must match");
+ return in1->in(1);
}
return this;
}
@@ -1597,6 +1623,8 @@ Node* ReductionNode::make_identity_con_scalar(PhaseGVN& gvn, int sopc, BasicType
return nullptr;
}
break;
+ case Op_AddReductionVHF:
+ return gvn.makecon(TypeH::ZERO);
case Op_AddReductionVI: // fallthrough
case Op_AddReductionVL: // fallthrough
case Op_AddReductionVF: // fallthrough
@@ -1608,6 +1636,8 @@ Node* ReductionNode::make_identity_con_scalar(PhaseGVN& gvn, int sopc, BasicType
return gvn.makecon(TypeInt::ONE);
case Op_MulReductionVL:
return gvn.makecon(TypeLong::ONE);
+ case Op_MulReductionVHF:
+ return gvn.makecon(TypeH::ONE);
case Op_MulReductionVF:
return gvn.makecon(TypeF::ONE);
case Op_MulReductionVD:
@@ -1700,12 +1730,14 @@ bool ReductionNode::auto_vectorization_requires_strict_order(int vopc) {
// These are cases that all have associative operations, which can
// thus be reordered, allowing non-strict order reductions.
return false;
+ case Op_AddReductionVHF:
+ case Op_MulReductionVHF:
case Op_AddReductionVF:
case Op_MulReductionVF:
case Op_AddReductionVD:
case Op_MulReductionVD:
// Floating-point addition and multiplication are non-associative,
- // so AddReductionVF/D and MulReductionVF/D require strict ordering
+ // so AddReductionVHF/VF/VD and MulReductionVHF/VF/VD require strict ordering
// in auto-vectorization.
return true;
default:
@@ -1959,11 +1991,12 @@ Node* VectorMaskOpNode::Ideal(PhaseGVN* phase, bool can_reshape) {
}
Node* VectorMaskCastNode::Identity(PhaseGVN* phase) {
- Node* in1 = in(1);
- // VectorMaskCast (VectorMaskCast x) => x
- if (in1->Opcode() == Op_VectorMaskCast &&
- vect_type()->eq(in1->in(1)->bottom_type())) {
- return in1->in(1);
+ // (VectorMaskCast+ x) => (x)
+ // If the types of the input and output nodes in a VectorMaskCast chain are
+ // exactly the same, the intermediate VectorMaskCast nodes can be eliminated.
+ Node* n = VectorNode::uncast_mask(this);
+ if (vect_type()->eq(n->bottom_type())) {
+ return n;
}
return this;
}
@@ -2432,67 +2465,68 @@ bool MulVLNode::has_uint_inputs() const {
has_vector_elements_fit_uint(in(2));
}
-static Node* UMinMaxV_Ideal(Node* n, PhaseGVN* phase, bool can_reshape) {
+static Node* MinMaxV_Common_Ideal(MinMaxVNode* n, PhaseGVN* phase, bool can_reshape) {
int vopc = n->Opcode();
- assert(vopc == Op_UMinV || vopc == Op_UMaxV, "Unexpected opcode");
+ int min_opcode = n->min_opcode();
+ int max_opcode = n->max_opcode();
- Node* umin = nullptr;
- Node* umax = nullptr;
+ Node* min_op = nullptr;
+ Node* max_op = nullptr;
int lopc = n->in(1)->Opcode();
int ropc = n->in(2)->Opcode();
- if (lopc == Op_UMinV && ropc == Op_UMaxV) {
- umin = n->in(1);
- umax = n->in(2);
- } else if (lopc == Op_UMaxV && ropc == Op_UMinV) {
- umin = n->in(2);
- umax = n->in(1);
+ if (lopc == min_opcode && ropc == max_opcode) {
+ min_op = n->in(1);
+ max_op = n->in(2);
+ } else if (lopc == max_opcode && ropc == min_opcode) {
+ min_op = n->in(2);
+ max_op = n->in(1);
} else {
return nullptr;
}
- // UMin (UMin(a, b), UMax(a, b)) => UMin(a, b)
- // UMin (UMax(a, b), UMin(b, a)) => UMin(a, b)
- // UMax (UMin(a, b), UMax(a, b)) => UMax(a, b)
- // UMax (UMax(a, b), UMin(b, a)) => UMax(a, b)
- if (umin != nullptr && umax != nullptr) {
- if ((umin->in(1) == umax->in(1) && umin->in(2) == umax->in(2)) ||
- (umin->in(2) == umax->in(1) && umin->in(1) == umax->in(2))) {
- if (vopc == Op_UMinV) {
- return new UMinVNode(umax->in(1), umax->in(2), n->bottom_type()->is_vect());
- } else {
- return new UMaxVNode(umax->in(1), umax->in(2), n->bottom_type()->is_vect());
+ // Min (Min(a, b), Max(a, b)) => Min(a, b)
+ // Min (Max(a, b), Min(b, a)) => Min(a, b)
+ // Max (Min(a, b), Max(a, b)) => Max(a, b)
+ // Max (Max(a, b), Min(b, a)) => Max(a, b)
+
+ if (min_op != nullptr && max_op != nullptr) {
+ // Skip if predication status is inconsistent across n, min_op, and max_op,
+ // or if predicated operands carry different masks.
+ if (n->is_predicated_vector() != min_op->is_predicated_vector() ||
+ min_op->is_predicated_vector() != max_op->is_predicated_vector()) {
+ return nullptr;
+ }
+ if (min_op->is_predicated_vector() &&
+ !(n->in(3) == min_op->in(3) && min_op->in(3) == max_op->in(3))) {
+ return nullptr;
+ }
+
+ if ((min_op->in(1) == max_op->in(1) && min_op->in(2) == max_op->in(2)) ||
+ (min_op->in(2) == max_op->in(1) && min_op->in(1) == max_op->in(2))) {
+ // Use n->in(1) inputs for the result to preserve correct merge-masking
+ // passthrough: inactive lanes use in(1), so result->in(1) must equal
+ // n->in(1)->in(1) to maintain the original passthrough semantics.
+ VectorNode* result = VectorNode::make(vopc, n->in(1)->in(1), n->in(1)->in(2), n->bottom_type()->is_vect());
+ if (n->is_predicated_vector()) {
+ result->add_req(n->in(3));
+ result->add_flag(Node::Flag_is_predicated_vector);
}
+ return result;
}
}
return nullptr;
}
-Node* UMinVNode::Ideal(PhaseGVN* phase, bool can_reshape) {
- Node* progress = UMinMaxV_Ideal(this, phase, can_reshape);
+Node* MinMaxVNode::Ideal(PhaseGVN* phase, bool can_reshape) {
+ Node* progress = MinMaxV_Common_Ideal(this, phase, can_reshape);
if (progress != nullptr) return progress;
return VectorNode::Ideal(phase, can_reshape);
}
-Node* UMinVNode::Identity(PhaseGVN* phase) {
- // UMin (a, a) => a
- if (in(1) == in(2)) {
- return in(1);
- }
- return this;
-}
-
-Node* UMaxVNode::Ideal(PhaseGVN* phase, bool can_reshape) {
- Node* progress = UMinMaxV_Ideal(this, phase, can_reshape);
- if (progress != nullptr) return progress;
-
- return VectorNode::Ideal(phase, can_reshape);
-}
-
-Node* UMaxVNode::Identity(PhaseGVN* phase) {
- // UMax (a, a) => a
+Node* MinMaxVNode::Identity(PhaseGVN* phase) {
if (in(1) == in(2)) {
return in(1);
}
@@ -2502,4 +2536,5 @@ Node* UMaxVNode::Identity(PhaseGVN* phase) {
void VectorBoxAllocateNode::dump_spec(outputStream *st) const {
CallStaticJavaNode::dump_spec(st);
}
+
#endif // !PRODUCT
diff --git a/src/hotspot/share/opto/vectornode.hpp b/src/hotspot/share/opto/vectornode.hpp
index dce43f92905..91cff9fcae8 100644
--- a/src/hotspot/share/opto/vectornode.hpp
+++ b/src/hotspot/share/opto/vectornode.hpp
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2007, 2026, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2026 Arm Limited and/or its affiliates.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -195,6 +196,7 @@ class VectorNode : public TypeNode {
static bool is_scalar_op_that_returns_int_but_vector_op_returns_long(int opc);
static bool is_reinterpret_opcode(int opc);
+ static Node* uncast_mask(Node* n);
static void trace_new_vector(Node* n, const char* context) {
#ifdef ASSERT
@@ -321,7 +323,7 @@ class ReductionNode : public Node {
virtual uint size_of() const { return sizeof(*this); }
// Floating-point addition and multiplication are non-associative, so
- // AddReductionVF/D and MulReductionVF/D require strict ordering
+ // AddReductionVHF/F/D and MulReductionVHF/F/D require strict ordering
// in auto-vectorization. Vector API can generate AddReductionVF/D
// and MulReductionVF/VD without strict ordering, which can benefit
// some platforms.
@@ -358,6 +360,35 @@ public:
virtual int Opcode() const;
};
+// Vector add half float as a reduction
+class AddReductionVHFNode : public ReductionNode {
+private:
+ // True if add reduction operation for half floats requires strict ordering.
+ // As an example - The value is true when add reduction for half floats is auto-vectorized
+ // as auto-vectorization mandates strict ordering but the value is false when this node
+ // is generated through VectorAPI as VectorAPI does not impose any such rules on ordering.
+ const bool _requires_strict_order;
+
+public:
+ // _requires_strict_order is set to true by default as mandated by auto-vectorization
+ AddReductionVHFNode(Node* ctrl, Node* in1, Node* in2, bool requires_strict_order = true) :
+ ReductionNode(ctrl, in1, in2), _requires_strict_order(requires_strict_order) {}
+
+ int Opcode() const override;
+ bool requires_strict_order() const override { return _requires_strict_order; }
+
+ uint hash() const override { return Node::hash() + _requires_strict_order; }
+
+ bool cmp(const Node& n) const override {
+ return Node::cmp(n) && _requires_strict_order == ((ReductionNode&)n).requires_strict_order();
+ }
+
+ uint size_of() const override { return sizeof(*this); }
+
+ const Type* bottom_type() const override { return Type::HALF_FLOAT; }
+ uint ideal_reg() const override { return Op_RegF; }
+};
+
// Vector add float as a reduction
class AddReductionVFNode : public ReductionNode {
private:
@@ -367,7 +398,7 @@ private:
// is generated through VectorAPI as VectorAPI does not impose any such rules on ordering.
const bool _requires_strict_order;
public:
- //_requires_strict_order is set to true by default as mandated by auto-vectorization
+ // _requires_strict_order is set to true by default as mandated by auto-vectorization
AddReductionVFNode(Node* ctrl, Node* in1, Node* in2, bool requires_strict_order = true) :
ReductionNode(ctrl, in1, in2), _requires_strict_order(requires_strict_order) {}
@@ -393,7 +424,7 @@ private:
// is generated through VectorAPI as VectorAPI does not impose any such rules on ordering.
const bool _requires_strict_order;
public:
- //_requires_strict_order is set to true by default as mandated by auto-vectorization
+ // _requires_strict_order is set to true by default as mandated by auto-vectorization
AddReductionVDNode(Node* ctrl, Node* in1, Node* in2, bool requires_strict_order = true) :
ReductionNode(ctrl, in1, in2), _requires_strict_order(requires_strict_order) {}
@@ -577,6 +608,35 @@ public:
virtual int Opcode() const;
};
+// Vector multiply half float as a reduction
+class MulReductionVHFNode : public ReductionNode {
+private:
+ // True if mul reduction operation for half floats requires strict ordering.
+ // As an example - The value is true when mul reduction for half floats is auto-vectorized
+ // as auto-vectorization mandates strict ordering but the value is false when this node
+ // is generated through VectorAPI as VectorAPI does not impose any such rules on ordering.
+ const bool _requires_strict_order;
+
+public:
+ // _requires_strict_order is set to true by default as mandated by auto-vectorization
+ MulReductionVHFNode(Node* ctrl, Node* in1, Node* in2, bool requires_strict_order = true) :
+ ReductionNode(ctrl, in1, in2), _requires_strict_order(requires_strict_order) {}
+
+ int Opcode() const override;
+ bool requires_strict_order() const override { return _requires_strict_order; }
+
+ uint hash() const override { return Node::hash() + _requires_strict_order; }
+
+ bool cmp(const Node& n) const override {
+ return Node::cmp(n) && _requires_strict_order == ((ReductionNode&)n).requires_strict_order();
+ }
+
+ uint size_of() const override { return sizeof(*this); }
+
+ const Type* bottom_type() const override { return Type::HALF_FLOAT; }
+ uint ideal_reg() const override { return Op_RegF; }
+};
+
// Vector multiply float as a reduction
class MulReductionVFNode : public ReductionNode {
// True if mul reduction operation for floats requires strict ordering.
@@ -585,7 +645,7 @@ class MulReductionVFNode : public ReductionNode {
// is generated through VectorAPI as VectorAPI does not impose any such rules on ordering.
const bool _requires_strict_order;
public:
- //_requires_strict_order is set to true by default as mandated by auto-vectorization
+ // _requires_strict_order is set to true by default as mandated by auto-vectorization
MulReductionVFNode(Node* ctrl, Node* in1, Node* in2, bool requires_strict_order = true) :
ReductionNode(ctrl, in1, in2), _requires_strict_order(requires_strict_order) {}
@@ -610,7 +670,7 @@ class MulReductionVDNode : public ReductionNode {
// is generated through VectorAPI as VectorAPI does not impose any such rules on ordering.
const bool _requires_strict_order;
public:
- //_requires_strict_order is set to true by default as mandated by auto-vectorization
+ // _requires_strict_order is set to true by default as mandated by auto-vectorization
MulReductionVDNode(Node* ctrl, Node* in1, Node* in2, bool requires_strict_order = true) :
ReductionNode(ctrl, in1, in2), _requires_strict_order(requires_strict_order) {}
@@ -662,10 +722,22 @@ public:
virtual int Opcode() const;
};
-// Vector Min
-class MinVNode : public VectorNode {
+// Common superclass for Min/Max vector nodes
+class MinMaxVNode : public VectorNode {
public:
- MinVNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1, in2, vt) {}
+ MinMaxVNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1, in2, vt) {}
+ virtual int min_opcode() const = 0;
+ virtual int max_opcode() const = 0;
+ virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
+ virtual Node* Identity(PhaseGVN* phase);
+};
+
+// Vector Min
+class MinVNode : public MinMaxVNode {
+public:
+ MinVNode(Node* in1, Node* in2, const TypeVect* vt) : MinMaxVNode(in1, in2, vt) {}
+ virtual int min_opcode() const { return Op_MinV; }
+ virtual int max_opcode() const { return Op_MaxV; }
virtual int Opcode() const;
};
@@ -684,31 +756,33 @@ public:
};
// Vector Unsigned Min
-class UMinVNode : public VectorNode {
+class UMinVNode : public MinMaxVNode {
public:
- UMinVNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1, in2 ,vt) {
+ UMinVNode(Node* in1, Node* in2, const TypeVect* vt) : MinMaxVNode(in1, in2, vt) {
assert(is_integral_type(vt->element_basic_type()), "");
}
- virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
- virtual Node* Identity(PhaseGVN* phase);
+ virtual int min_opcode() const { return Op_UMinV; }
+ virtual int max_opcode() const { return Op_UMaxV; }
virtual int Opcode() const;
};
// Vector Max
-class MaxVNode : public VectorNode {
+class MaxVNode : public MinMaxVNode {
public:
- MaxVNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1, in2, vt) {}
+ MaxVNode(Node* in1, Node* in2, const TypeVect* vt) : MinMaxVNode(in1, in2, vt) {}
+ virtual int min_opcode() const { return Op_MinV; }
+ virtual int max_opcode() const { return Op_MaxV; }
virtual int Opcode() const;
};
// Vector Unsigned Max
-class UMaxVNode : public VectorNode {
+class UMaxVNode : public MinMaxVNode {
public:
- UMaxVNode(Node* in1, Node* in2, const TypeVect* vt) : VectorNode(in1, in2, vt) {
+ UMaxVNode(Node* in1, Node* in2, const TypeVect* vt) : MinMaxVNode(in1, in2, vt) {
assert(is_integral_type(vt->element_basic_type()), "");
}
- virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
- virtual Node* Identity(PhaseGVN* phase);
+ virtual int min_opcode() const { return Op_UMinV; }
+ virtual int max_opcode() const { return Op_UMaxV; }
virtual int Opcode() const;
};
diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp
index 85207fddf29..73082c6047d 100644
--- a/src/hotspot/share/prims/jni.cpp
+++ b/src/hotspot/share/prims/jni.cpp
@@ -867,8 +867,7 @@ static void jni_invoke_static(JNIEnv *env, JavaValue* result, jobject receiver,
// Create object to hold arguments for the JavaCall, and associate it with
// the jni parser
ResourceMark rm(THREAD);
- int number_of_parameters = method->size_of_parameters();
- JavaCallArguments java_args(number_of_parameters);
+ JavaCallArguments java_args(method->size_of_parameters());
assert(method->is_static(), "method should be static");
diff --git a/src/hotspot/share/prims/jvmtiEventController.cpp b/src/hotspot/share/prims/jvmtiEventController.cpp
index cb44b833c48..832c8a33c88 100644
--- a/src/hotspot/share/prims/jvmtiEventController.cpp
+++ b/src/hotspot/share/prims/jvmtiEventController.cpp
@@ -544,6 +544,11 @@ JvmtiEventControllerPrivate::recompute_env_thread_enabled(JvmtiEnvThreadState* e
}
switch (JvmtiEnv::get_phase()) {
+ case JVMTI_PHASE_ONLOAD:
+ case JVMTI_PHASE_PRIMORDIAL:
+ case JVMTI_PHASE_START:
+ now_enabled &= EARLY_EVENT_BITS;
+ break;
case JVMTI_PHASE_DEAD:
// no events allowed when dead
now_enabled = 0;
diff --git a/src/hotspot/share/prims/vectorSupport.cpp b/src/hotspot/share/prims/vectorSupport.cpp
index 7d80ed327fd..5c6010acdf1 100644
--- a/src/hotspot/share/prims/vectorSupport.cpp
+++ b/src/hotspot/share/prims/vectorSupport.cpp
@@ -226,7 +226,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_LONG: return Op_AddL;
case LT_FLOAT: return Op_AddF;
case LT_DOUBLE: return Op_AddD;
- default: fatal("ADD: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -238,7 +238,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_LONG: return Op_SubL;
case LT_FLOAT: return Op_SubF;
case LT_DOUBLE: return Op_SubD;
- default: fatal("SUB: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -250,7 +250,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_LONG: return Op_MulL;
case LT_FLOAT: return Op_MulF;
case LT_DOUBLE: return Op_MulD;
- default: fatal("MUL: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -262,7 +262,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_LONG: return Op_DivL;
case LT_FLOAT: return Op_DivF;
case LT_DOUBLE: return Op_DivD;
- default: fatal("DIV: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -274,7 +274,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_LONG: return Op_MinL;
case LT_FLOAT: return Op_MinF;
case LT_DOUBLE: return Op_MinD;
- default: fatal("MIN: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -286,7 +286,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_LONG: return Op_MaxL;
case LT_FLOAT: return Op_MaxF;
case LT_DOUBLE: return Op_MaxD;
- default: fatal("MAX: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -296,7 +296,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_SHORT:
case LT_INT:
case LT_LONG: return Op_UMinV;
- default: fatal("MIN: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -306,7 +306,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_SHORT:
case LT_INT:
case LT_LONG: return Op_UMaxV;
- default: fatal("MAX: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -318,7 +318,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_LONG: return Op_AbsL;
case LT_FLOAT: return Op_AbsF;
case LT_DOUBLE: return Op_AbsD;
- default: fatal("ABS: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -330,7 +330,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_LONG: return Op_NegL;
case LT_FLOAT: return Op_NegF;
case LT_DOUBLE: return Op_NegD;
- default: fatal("NEG: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -340,7 +340,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_SHORT: // fall-through
case LT_INT: return Op_AndI;
case LT_LONG: return Op_AndL;
- default: fatal("AND: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -350,7 +350,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_SHORT: // fall-through
case LT_INT: return Op_OrI;
case LT_LONG: return Op_OrL;
- default: fatal("OR: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -360,7 +360,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_SHORT: // fall-through
case LT_INT: return Op_XorI;
case LT_LONG: return Op_XorL;
- default: fatal("XOR: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -368,7 +368,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
switch (lt) {
case LT_FLOAT: return Op_SqrtF;
case LT_DOUBLE: return Op_SqrtD;
- default: fatal("SQRT: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -376,7 +376,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
switch (lt) {
case LT_FLOAT: return Op_FmaF;
case LT_DOUBLE: return Op_FmaD;
- default: fatal("FMA: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -386,7 +386,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_SHORT: // fall-through
case LT_INT: return Op_LShiftI;
case LT_LONG: return Op_LShiftL;
- default: fatal("LSHIFT: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -396,7 +396,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_SHORT: // fall-through
case LT_INT: return Op_RShiftI;
case LT_LONG: return Op_RShiftL;
- default: fatal("RSHIFT: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -406,7 +406,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_SHORT: return Op_URShiftS;
case LT_INT: return Op_URShiftI;
case LT_LONG: return Op_URShiftL;
- default: fatal("URSHIFT: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -416,7 +416,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_SHORT: // fall-through
case LT_INT: // fall-through
case LT_LONG: return Op_RotateLeft;
- default: fatal("LROTATE: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -426,7 +426,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_SHORT: // fall-through
case LT_INT: // fall-through
case LT_LONG: return Op_RotateRight;
- default: fatal("RROTATE: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -438,7 +438,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_LONG: // fall-through
case LT_FLOAT: // fall-through
case LT_DOUBLE: return Op_VectorMaskLastTrue;
- default: fatal("MASK_LASTTRUE: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -450,7 +450,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_LONG: // fall-through
case LT_FLOAT: // fall-through
case LT_DOUBLE: return Op_VectorMaskFirstTrue;
- default: fatal("MASK_FIRSTTRUE: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -462,7 +462,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_LONG: // fall-through
case LT_FLOAT: // fall-through
case LT_DOUBLE: return Op_VectorMaskTrueCount;
- default: fatal("MASK_TRUECOUNT: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -474,7 +474,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_LONG: // fall-through
case LT_FLOAT: // fall-through
case LT_DOUBLE: return Op_VectorMaskToLong;
- default: fatal("MASK_TOLONG: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -486,7 +486,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_LONG: // fall-through
case LT_FLOAT: // fall-through
case LT_DOUBLE: return Op_ExpandV;
- default: fatal("EXPAND: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -498,7 +498,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_LONG: // fall-through
case LT_FLOAT: // fall-through
case LT_DOUBLE: return Op_CompressV;
- default: fatal("COMPRESS: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -510,7 +510,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_LONG: // fall-through
case LT_FLOAT: // fall-through
case LT_DOUBLE: return Op_CompressM;
- default: fatal("MASK_COMPRESS: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -520,7 +520,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_SHORT: // for byte and short types temporarily
case LT_INT: return Op_PopCountI;
case LT_LONG: return Op_PopCountL;
- default: fatal("BILT_COUNT: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -530,7 +530,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_SHORT:
case LT_INT: return Op_CountTrailingZerosI;
case LT_LONG: return Op_CountTrailingZerosL;
- default: fatal("TZ_COUNT: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -540,7 +540,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_SHORT:
case LT_INT: return Op_CountLeadingZerosI;
case LT_LONG: return Op_CountLeadingZerosL;
- default: fatal("LZ_COUNT: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -550,7 +550,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_SHORT: // Op_ReverseI for byte and short
case LT_INT: return Op_ReverseI;
case LT_LONG: return Op_ReverseL;
- default: fatal("REVERSE: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -565,7 +565,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_BYTE: // Intentionally fall-through
case LT_INT: return Op_ReverseBytesI;
case LT_LONG: return Op_ReverseBytesL;
- default: fatal("REVERSE_BYTES: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -576,7 +576,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_SHORT: // fall-through
case LT_INT: // fall-through
case LT_LONG: return Op_SaturatingAddV;
- default: fatal("S[U]ADD: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -587,7 +587,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case LT_SHORT: // fall-through
case LT_INT: // fall-through
case LT_LONG: return Op_SaturatingSubV;
- default: fatal("S[U}SUB: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -595,7 +595,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
switch (lt) {
case LT_INT:
case LT_LONG: return Op_CompressBits;
- default: fatal("COMPRESS_BITS: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -603,7 +603,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
switch (lt) {
case LT_INT:
case LT_LONG: return Op_ExpandBits;
- default: fatal("EXPAND_BITS: %s", lanetype2name(lt));
+ default: return 0;
}
break;
}
@@ -627,7 +627,7 @@ int VectorSupport::vop2ideal(jint id, LaneType lt) {
case VECTOR_OP_EXPM1: // fall-through
case VECTOR_OP_HYPOT: return 0; // not supported; should be handled in Java code
- default: fatal("unknown op: %d", vop);
+ default: return 0;
}
return 0; // Unimplemented
}
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index f50e6ddb3db..de140fb95ff 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -1280,8 +1280,8 @@ WB_ENTRY(void, WB_ClearMethodState(JNIEnv* env, jobject o, jobject method))
if (mdo != nullptr) {
mdo->init();
ResourceMark rm(THREAD);
- int arg_count = mdo->method()->size_of_parameters();
- for (int i = 0; i < arg_count; i++) {
+ int arg_size = mdo->method()->size_of_parameters();
+ for (int i = 0; i < arg_size; i++) {
mdo->set_arg_modified(i, 0);
}
mdo->clean_method_data(/*always_clean*/true);
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 1d79c4d0488..2d40ee1822a 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -533,9 +533,6 @@ static SpecialFlag const special_jvm_flags[] = {
{ "DynamicDumpSharedSpaces", JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() },
{ "RequireSharedSpaces", JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() },
{ "UseSharedSpaces", JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() },
-#ifdef _LP64
- { "UseCompressedClassPointers", JDK_Version::jdk(25), JDK_Version::jdk(27), JDK_Version::undefined() },
-#endif
{ "AggressiveHeap", JDK_Version::jdk(26), JDK_Version::jdk(27), JDK_Version::jdk(28) },
// --- 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() },
@@ -546,6 +543,9 @@ static SpecialFlag const special_jvm_flags[] = {
#if defined(AARCH64)
{ "NearCpool", JDK_Version::undefined(), JDK_Version::jdk(25), JDK_Version::undefined() },
#endif
+#ifdef _LP64
+ { "UseCompressedClassPointers", JDK_Version::jdk(25), JDK_Version::jdk(27), JDK_Version::undefined() },
+#endif
{ "PSChunkLargeArrays", JDK_Version::jdk(26), JDK_Version::jdk(27), JDK_Version::jdk(28) },
{ "ParallelRefProcEnabled", JDK_Version::jdk(26), JDK_Version::jdk(27), JDK_Version::jdk(28) },
@@ -1515,7 +1515,7 @@ void Arguments::set_heap_size() {
!FLAG_IS_DEFAULT(MinRAMPercentage) ||
!FLAG_IS_DEFAULT(InitialRAMPercentage);
- const size_t avail_mem = os::physical_memory();
+ const physical_memory_size_type avail_mem = os::physical_memory();
// If the maximum heap size has not been set with -Xmx, then set it as
// fraction of the size of physical memory, respecting the maximum and
diff --git a/src/hotspot/share/runtime/frame.cpp b/src/hotspot/share/runtime/frame.cpp
index 8f969600ba8..d691a3c8028 100644
--- a/src/hotspot/share/runtime/frame.cpp
+++ b/src/hotspot/share/runtime/frame.cpp
@@ -1286,7 +1286,7 @@ public:
}
bool is_good(oop* p) {
- return *p == nullptr || (dbg_is_safe(*p, -1) && dbg_is_safe((*p)->klass(), -1) && oopDesc::is_oop_or_null(*p));
+ return *p == nullptr || (dbg_is_safe(*p, -1) && dbg_is_safe((*p)->klass_without_asserts(), -1) && oopDesc::is_oop_or_null(*p));
}
void describe(FrameValues& values, int frame_no) {
for (int i = 0; i < _oops->length(); i++) {
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index ac1ddec7cbc..9d38a44cbd5 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -871,6 +871,9 @@ const int ObjectAlignmentInBytes = 8;
develop(bool, TimeOopMap, false, \
"Time calls to GenerateOopMap::compute_map() in sum") \
\
+ develop(bool, GenerateOopMapALot, false, \
+ "Generate interpreter oopmaps at all safepoints") \
+ \
develop(bool, TraceFinalizerRegistration, false, \
"Trace registration of final references") \
\
diff --git a/src/hotspot/share/runtime/hotCodeCollector.cpp b/src/hotspot/share/runtime/hotCodeCollector.cpp
index 643cf3a8bbb..6bdeee011ce 100644
--- a/src/hotspot/share/runtime/hotCodeCollector.cpp
+++ b/src/hotspot/share/runtime/hotCodeCollector.cpp
@@ -29,6 +29,7 @@
#include "compiler/compilerDefinitions.inline.hpp"
#include "logging/log.hpp"
#include "memory/resourceArea.hpp"
+#include "oops/method.inline.hpp"
#include "runtime/hotCodeCollector.hpp"
#include "runtime/hotCodeSampler.hpp"
#include "runtime/java.hpp"
diff --git a/src/hotspot/share/runtime/interfaceSupport.cpp b/src/hotspot/share/runtime/interfaceSupport.cpp
index 11a7d9fd41f..6ccf63b4c5e 100644
--- a/src/hotspot/share/runtime/interfaceSupport.cpp
+++ b/src/hotspot/share/runtime/interfaceSupport.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,6 +23,7 @@
*/
#include "gc/shared/collectedHeap.inline.hpp"
+#include "interpreter/interpreterRuntime.hpp"
#include "logging/log.hpp"
#include "memory/resourceArea.hpp"
#include "memory/universe.hpp"
@@ -65,6 +66,10 @@ VMEntryWrapper::~VMEntryWrapper() {
if (VerifyStack) {
InterfaceSupport::verify_stack();
}
+ // Verify interpreter oopmap generation
+ if (GenerateOopMapALot) {
+ InterpreterRuntime::generate_oop_map_alot();
+ }
}
VMNativeEntryWrapper::VMNativeEntryWrapper() {
diff --git a/src/hotspot/share/runtime/mutex.cpp b/src/hotspot/share/runtime/mutex.cpp
index c455b5f36a2..8e0c1d10e5c 100644
--- a/src/hotspot/share/runtime/mutex.cpp
+++ b/src/hotspot/share/runtime/mutex.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,8 @@ Mutex::Mutex(Rank rank, const char * name, bool allow_vm_block) : _owner(nullptr
_rank = rank;
_skip_rank_check = false;
- assert(_rank >= static_cast(0) && _rank <= safepoint, "Bad lock rank %s: %s", rank_name(), name);
+ assert(_rank >= static_cast(0) && _rank <= safepoint, "Bad lock rank %d outside [0, %d]: %s",
+ static_cast(rank), static_cast(safepoint), name);
// The allow_vm_block also includes allowing other non-Java threads to block or
// allowing Java threads to block in native.
@@ -324,25 +325,33 @@ static const char* _rank_names[] = { "event", "service", "stackwatermark", "tty"
static const int _num_ranks = 7;
-static const char* rank_name_internal(Mutex::Rank r) {
+static void print_rank_name_internal(outputStream* st, Mutex::Rank r) {
// Find closest rank and print out the name
- stringStream st;
for (int i = 0; i < _num_ranks; i++) {
if (r == _ranks[i]) {
- return _rank_names[i];
+ st->print("%s", _rank_names[i]);
} else if (r > _ranks[i] && (i < _num_ranks-1 && r < _ranks[i+1])) {
int delta = static_cast(_ranks[i+1]) - static_cast(r);
- st.print("%s-%d", _rank_names[i+1], delta);
- return st.as_string();
+ st->print("%s-%d", _rank_names[i+1], delta);
}
}
- return "fail";
+}
+
+// Requires caller to have ResourceMark.
+static const char* rank_name_internal(Mutex::Rank r) {
+ stringStream st;
+ print_rank_name_internal(&st, r);
+ return st.as_string();
}
const char* Mutex::rank_name() const {
return rank_name_internal(_rank);
}
+// Does not require caller to have ResourceMark.
+void Mutex::print_rank_name(outputStream* st) const {
+ print_rank_name_internal(st, _rank);
+}
void Mutex::assert_no_overlap(Rank orig, Rank adjusted, int adjust) {
int i = 0;
@@ -364,7 +373,8 @@ void Mutex::print_on(outputStream* st) const {
if (_allow_vm_block) {
st->print("%s", " allow_vm_block");
}
- DEBUG_ONLY(st->print(" %s", rank_name()));
+ st->print(" ");
+ DEBUG_ONLY(print_rank_name(st));
st->cr();
}
diff --git a/src/hotspot/share/runtime/mutex.hpp b/src/hotspot/share/runtime/mutex.hpp
index cf2b222d2da..4d30a320cbf 100644
--- a/src/hotspot/share/runtime/mutex.hpp
+++ b/src/hotspot/share/runtime/mutex.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,9 +130,11 @@ class Mutex : public CHeapObj {
return _skip_rank_check;
}
+ const char* rank_name() const;
+ void print_rank_name(outputStream* st) const;
+
public:
Rank rank() const { return _rank; }
- const char* rank_name() const;
Mutex* next() const { return _next; }
#endif // ASSERT
diff --git a/src/hotspot/share/runtime/stubDeclarations.hpp b/src/hotspot/share/runtime/stubDeclarations.hpp
index d1ce378ee20..ed1b3ea2e78 100644
--- a/src/hotspot/share/runtime/stubDeclarations.hpp
+++ b/src/hotspot/share/runtime/stubDeclarations.hpp
@@ -539,18 +539,19 @@
// generated.
//
// Architecture-specific entries need to be declared using the
-// do_arch_entry template
+// do_arch_entry templates
//
// do_arch_entry(arch, blob_name, stub_name, field_name, getter_name)
//
// do_arch_entry_init(arch, blob_name, stub_name, field_name,
// getter_name, init_function)
//
+// do_arch_entry_array(arch, blob_name, stub_name, field_name,
+// getter_name, count)
+//
// The only difference between these templates and the generic ones is
// that they receive an extra argument which identifies the current
// architecture e.g. x86, aarch64 etc.
-//
-// Currently there is no support for a do_arch_array_entry template.
// Include arch-specific stub and entry declarations and make sure the
// relevant template macros have been defined
@@ -598,7 +599,8 @@
do_entry, do_entry_init, \
do_entry_array, \
do_arch_blob, \
- do_arch_entry, do_arch_entry_init) \
+ do_arch_entry, do_arch_entry_init, \
+ do_arch_entry_array) \
do_blob(preuniverse) \
do_stub(preuniverse, fence) \
do_entry(preuniverse, fence, fence_entry, fence_entry) \
@@ -615,7 +617,8 @@
atomic_cmpxchg_long_entry) \
/* merge in stubs and entries declared in arch header */ \
STUBGEN_PREUNIVERSE_BLOBS_ARCH_DO(do_stub, do_arch_blob, \
- do_arch_entry, do_arch_entry_init) \
+ do_arch_entry, do_arch_entry_init, \
+ do_arch_entry_array) \
end_blob(preuniverse) \
#define STUBGEN_INITIAL_BLOBS_DO(do_blob, end_blob, \
@@ -623,7 +626,8 @@
do_entry, do_entry_init, \
do_entry_array, \
do_arch_blob, \
- do_arch_entry, do_arch_entry_init) \
+ do_arch_entry, do_arch_entry_init, \
+ do_arch_entry_array) \
do_blob(initial) \
do_stub(initial, call_stub) \
do_entry(initial, call_stub, call_stub_entry, call_stub_entry) \
@@ -669,7 +673,8 @@
do_entry(initial, fmod, fmod, fmod) \
/* merge in stubs and entries declared in arch header */ \
STUBGEN_INITIAL_BLOBS_ARCH_DO(do_stub, do_arch_blob, \
- do_arch_entry, do_arch_entry_init) \
+ do_arch_entry, do_arch_entry_init, \
+ do_arch_entry_array) \
end_blob(initial) \
@@ -679,7 +684,8 @@
do_entry_array, \
do_arch_blob, \
do_arch_entry, \
- do_arch_entry_init) \
+ do_arch_entry_init, \
+ do_arch_entry_array) \
do_blob(continuation) \
do_stub(continuation, cont_thaw) \
do_entry(continuation, cont_thaw, cont_thaw, cont_thaw) \
@@ -694,7 +700,8 @@
cont_returnBarrierExc) \
/* merge in stubs and entries declared in arch header */ \
STUBGEN_CONTINUATION_BLOBS_ARCH_DO(do_stub, do_arch_blob, \
- do_arch_entry, do_arch_entry_init) \
+ do_arch_entry, do_arch_entry_init, \
+ do_arch_entry_array) \
end_blob(continuation) \
@@ -703,7 +710,8 @@
do_entry, do_entry_init, \
do_entry_array, \
do_arch_blob, \
- do_arch_entry, do_arch_entry_init) \
+ do_arch_entry, do_arch_entry_init, \
+ do_arch_entry_array) \
do_blob(compiler) \
do_stub(compiler, array_sort) \
do_entry(compiler, array_sort, array_sort, select_arraysort_function) \
@@ -848,7 +856,8 @@
bigIntegerLeftShiftWorker, bigIntegerLeftShift) \
/* merge in stubs and entries declared in arch header */ \
STUBGEN_COMPILER_BLOBS_ARCH_DO(do_stub, do_arch_blob, \
- do_arch_entry, do_arch_entry_init) \
+ do_arch_entry, do_arch_entry_init, \
+ do_arch_entry_array) \
end_blob(compiler) \
@@ -857,7 +866,8 @@
do_entry, do_entry_init, \
do_entry_array, \
do_arch_blob, \
- do_arch_entry, do_arch_entry_init) \
+ do_arch_entry, do_arch_entry_init, \
+ do_arch_entry_array) \
do_blob(final) \
do_stub(final, verify_oop) \
do_entry(final, verify_oop, verify_oop_subroutine_entry, \
@@ -1069,7 +1079,8 @@
lookup_secondary_supers_table_slow_path_stub) \
/* merge in stubs and entries declared in arch header */ \
STUBGEN_FINAL_BLOBS_ARCH_DO(do_stub, do_arch_blob, \
- do_arch_entry, do_arch_entry_init) \
+ do_arch_entry, do_arch_entry_init, \
+ do_arch_entry_array) \
end_blob(final) \
@@ -1082,37 +1093,43 @@
do_entry, do_entry_init, \
do_entry_array, \
do_arch_blob, \
- do_arch_entry, do_arch_entry_init) \
+ do_arch_entry, do_arch_entry_init, \
+ do_arch_entry_array) \
STUBGEN_PREUNIVERSE_BLOBS_DO(do_blob, end_blob, \
do_stub, \
do_entry, do_entry_init, \
do_entry_array, \
do_arch_blob, \
- do_arch_entry, do_arch_entry_init) \
+ do_arch_entry, do_arch_entry_init, \
+ do_arch_entry_array) \
STUBGEN_INITIAL_BLOBS_DO(do_blob, end_blob, \
do_stub, \
do_entry, do_entry_init, \
do_entry_array, \
do_arch_blob, \
- do_arch_entry, do_arch_entry_init) \
+ do_arch_entry, do_arch_entry_init, \
+ do_arch_entry_array) \
STUBGEN_CONTINUATION_BLOBS_DO(do_blob, end_blob, \
do_stub, \
do_entry, do_entry_init, \
do_entry_array, \
do_arch_blob, \
- do_arch_entry, do_arch_entry_init) \
+ do_arch_entry, do_arch_entry_init, \
+ do_arch_entry_array) \
STUBGEN_COMPILER_BLOBS_DO(do_blob, end_blob, \
do_stub, \
do_entry, do_entry_init, \
do_entry_array, \
do_arch_blob, \
- do_arch_entry, do_arch_entry_init) \
+ do_arch_entry, do_arch_entry_init, \
+ do_arch_entry_array) \
STUBGEN_FINAL_BLOBS_DO(do_blob, end_blob, \
do_stub, \
do_entry, do_entry_init, \
do_entry_array, \
do_arch_blob, \
- do_arch_entry, do_arch_entry_init) \
+ do_arch_entry, do_arch_entry_init, \
+ do_arch_entry_array) \
// Convenience macros for use by template implementations
@@ -1162,6 +1179,9 @@
#define STUBGEN_COUNT5(_1, _2, _3, _4, count) \
+ count
+#define STUBGEN_COUNT6(_1, _2, _3, _4, _5, count) \
+ + count
+
// Convenience templates that emit nothing
// ignore do_blob(blob_name, type) declarations
@@ -1200,7 +1220,8 @@
DO_ENTRY_EMPTY4, DO_ENTRY_EMPTY5, \
DO_ENTRY_EMPTY5, \
DO_ARCH_BLOB_EMPTY2, \
- DO_ARCH_ENTRY_EMPTY5, DO_ARCH_ENTRY_EMPTY6) \
+ DO_ARCH_ENTRY_EMPTY5, DO_ARCH_ENTRY_EMPTY6, \
+ DO_ARCH_ENTRY_EMPTY6) \
// client macro to operate only on StubGenerator stubs
@@ -1210,7 +1231,8 @@
DO_ENTRY_EMPTY4, DO_ENTRY_EMPTY5, \
DO_ENTRY_EMPTY5, \
DO_ARCH_BLOB_EMPTY2, \
- DO_ARCH_ENTRY_EMPTY5, DO_ARCH_ENTRY_EMPTY6) \
+ DO_ARCH_ENTRY_EMPTY5, DO_ARCH_ENTRY_EMPTY6, \
+ DO_ARCH_ENTRY_EMPTY6) \
// client macros to operate only on StubGenerator blobs and stubs
@@ -1220,18 +1242,21 @@
DO_ENTRY_EMPTY4, DO_ENTRY_EMPTY5, \
DO_ENTRY_EMPTY5, \
DO_ARCH_BLOB_EMPTY2, \
- DO_ARCH_ENTRY_EMPTY5,DO_ARCH_ENTRY_EMPTY6) \
+ DO_ARCH_ENTRY_EMPTY5,DO_ARCH_ENTRY_EMPTY6, \
+ DO_ARCH_ENTRY_EMPTY6) \
// client macro to operate only on StubGenerator generci and arch entries
#define STUBGEN_ALL_ENTRIES_DO(do_entry, do_entry_init, do_entry_array, \
- do_arch_entry, do_arch_entry_init) \
+ do_arch_entry, do_arch_entry_init, \
+ do_arch_entry_array) \
STUBGEN_ALL_DO(DO_BLOB_EMPTY1, DO_BLOB_EMPTY1, \
DO_STUB_EMPTY2, \
do_entry, do_entry_init, \
do_entry_array, \
DO_ARCH_BLOB_EMPTY2, \
- do_arch_entry, do_arch_entry_init) \
+ do_arch_entry, do_arch_entry_init, \
+ do_arch_entry_array) \
// client macro to operate only on StubGenerator entries
@@ -1241,7 +1266,8 @@
do_entry, do_entry_init, \
do_entry_array, \
DO_ARCH_BLOB_EMPTY2, \
- DO_ARCH_ENTRY_EMPTY5, DO_ARCH_ENTRY_EMPTY6) \
+ DO_ARCH_ENTRY_EMPTY5, DO_ARCH_ENTRY_EMPTY6, \
+ DO_ARCH_ENTRY_EMPTY6) \
// client macro to operate only on StubGenerator arch blobs
@@ -1251,16 +1277,19 @@
DO_ENTRY_EMPTY4, DO_ENTRY_EMPTY5, \
DO_ENTRY_EMPTY5, \
do_arch_blob, \
- DO_ARCH_ENTRY_EMPTY5, DO_ARCH_ENTRY_EMPTY6) \
+ DO_ARCH_ENTRY_EMPTY5, DO_ARCH_ENTRY_EMPTY6, \
+ DO_ARCH_ENTRY_EMPTY6) \
// client macro to operate only on StubGenerator arch entries
-#define STUBGEN_ARCH_ENTRIES_DO(do_arch_entry, do_arch_entry_init) \
+#define STUBGEN_ARCH_ENTRIES_DO(do_arch_entry, do_arch_entry_init, \
+ do_arch_entry_array) \
STUBGEN_ALL_DO(DO_BLOB_EMPTY1, DO_BLOB_EMPTY1, \
DO_STUB_EMPTY2, \
DO_ENTRY_EMPTY4, DO_ENTRY_EMPTY5, \
DO_ENTRY_EMPTY5, \
DO_ARCH_BLOB_EMPTY2, \
- do_arch_entry, do_arch_entry_init) \
+ do_arch_entry, do_arch_entry_init, \
+ do_arch_entry_array) \
#endif // SHARE_RUNTIME_STUBDECLARATIONS_HPP
diff --git a/src/hotspot/share/runtime/stubInfo.cpp b/src/hotspot/share/runtime/stubInfo.cpp
index c07c0298f2b..4d4d865cf95 100644
--- a/src/hotspot/share/runtime/stubInfo.cpp
+++ b/src/hotspot/share/runtime/stubInfo.cpp
@@ -574,6 +574,18 @@ void StubInfo::process_stubgen_entry(StubGroup& group_cursor,
field_name, id), \
0); \
+#define PROCESS_STUBGEN_ENTRY_ARCH_ARRAY(arch_name, blob, stub, \
+ field_name, getter_name, \
+ count) \
+ process_stubgen_entry(_group_cursor, _blob_cursor, \
+ _stub_cursor, _entry_cursor, \
+ #arch_name "_" # field_name "_entry (stub gen)", \
+ BlobId:: JOIN3(stubgen, blob, id), \
+ StubId:: JOIN3(stubgen, stub, id), \
+ EntryId:: JOIN4(stubgen, arch_name, \
+ field_name, id), \
+ count); \
+
void StubInfo::populate_stub_tables() {
StubGroup _group_cursor;
BlobId _blob_cursor = BlobId::NO_BLOBID;
@@ -615,7 +627,8 @@ void StubInfo::populate_stub_tables() {
PROCESS_STUBGEN_ENTRY, PROCESS_STUBGEN_ENTRY_INIT,
PROCESS_STUBGEN_ENTRY_ARRAY,
DO_ARCH_BLOB_EMPTY2,
- PROCESS_STUBGEN_ENTRY_ARCH, PROCESS_STUBGEN_ENTRY_ARCH_INIT);
+ PROCESS_STUBGEN_ENTRY_ARCH, PROCESS_STUBGEN_ENTRY_ARCH_INIT,
+ PROCESS_STUBGEN_ENTRY_ARCH_ARRAY);
assert(next(_blob_cursor) == BlobId::NUM_BLOBIDS, "should have exhausted all blob ids!");
assert(next(_stub_cursor) == StubId::NUM_STUBIDS, "should have exhausted all stub ids!");
assert(next(_entry_cursor) == EntryId::NUM_ENTRYIDS, "should have exhausted all entry ids!");
@@ -636,6 +649,7 @@ void StubInfo::populate_stub_tables() {
#undef PROCESS_STUBGEN_ENTRY_ARRAY
#undef PROCESS_STUBGEN_ENTRY_ARCH
#undef PROCESS_STUBGEN_ENTRY_ARCH_INIT
+#undef PROCESS_STUBGEN_ENTRY_ARCH_ARRAY
#ifdef ASSERT
diff --git a/src/hotspot/share/runtime/stubInfo.hpp b/src/hotspot/share/runtime/stubInfo.hpp
index 447f7d3a582..2fe503a8d0e 100644
--- a/src/hotspot/share/runtime/stubInfo.hpp
+++ b/src/hotspot/share/runtime/stubInfo.hpp
@@ -349,6 +349,14 @@ enum class StubId : int {
init_function) \
JOIN4(stubgen, arch_name, field_name, id), \
+#define STUBGEN_DECLARE_ARCH_ARRAY_TAG(arch_name, blob_name, stub_name, \
+ field_name, getter_name, \
+ count) \
+ JOIN4(stubgen, arch_name, field_name, id), \
+ JOIN4(stubgen, arch_name, field_name, max) = \
+ JOIN4(stubgen, arch_name, field_name, id) + \
+ count - 1, \
+
// the above macros are enough to declare the enum
enum class EntryId : int {
@@ -366,7 +374,8 @@ enum class EntryId : int {
STUBGEN_DECLARE_INIT_TAG,
STUBGEN_DECLARE_ARRAY_TAG,
STUBGEN_DECLARE_ARCH_TAG,
- STUBGEN_DECLARE_ARCH_INIT_TAG)
+ STUBGEN_DECLARE_ARCH_INIT_TAG,
+ STUBGEN_DECLARE_ARCH_ARRAY_TAG)
NUM_ENTRYIDS
};
@@ -379,6 +388,7 @@ enum class EntryId : int {
#undef STUBGEN_DECLARE_ARRAY_TAG
#undef STUBGEN_DECLARE_ARCH_TAG
#undef STUBGEN_DECLARE_ARCH_INIT_TAG
+#undef STUBGEN_DECLARE_ARCH_ARRAY_TAG
// we need static init expressions for blob, stub and entry counts in
// each stubgroup
@@ -404,7 +414,8 @@ enum class EntryId : int {
#define STUBGEN_ENTRY_COUNT_INITIALIZER \
0 STUBGEN_ALL_ENTRIES_DO(COUNT4, COUNT5, \
STUBGEN_COUNT5, \
- COUNT5, COUNT6)
+ COUNT5, COUNT6, \
+ STUBGEN_COUNT6)
// Declare management class StubInfo
diff --git a/src/hotspot/share/runtime/stubRoutines.cpp b/src/hotspot/share/runtime/stubRoutines.cpp
index 0bc71c65471..f5509b9d996 100644
--- a/src/hotspot/share/runtime/stubRoutines.cpp
+++ b/src/hotspot/share/runtime/stubRoutines.cpp
@@ -178,18 +178,23 @@ static BufferBlob* initialize_stubs(BlobId blob_id,
AOTStubData* stub_data_p = nullptr;
LogTarget(Info, stubs) lt;
+ // we need to track and publish details of stubs in a stubgen blob
+ // when we are 1) using stubs from the cache 2) dumping stubs to the
+ // cache 3) generating stubs that may be needed by other cache
+ // elements.
+
+ if (stub_data.is_open()) {
+ stub_data_p = &stub_data;
+ }
if (code_size > 0 && stub_data.is_using()) {
- // AOTCodeEntry tracks and logs status of any cached blob
- bool loaded = stub_data.load_code_blob();
- if (loaded) {
+ // try to load the blob and details of its stubs from cache. if
+ // that fails we will still generate all necessary stubs
+ if (stub_data.load_code_blob()) {
if (lt.is_enabled()) {
LogStream ls(lt);
ls.print_cr("Found blob %s in AOT cache", StubInfo::name(blob_id));
}
- stub_data_p = &stub_data;
}
- } else if (stub_data.is_dumping()) {
- stub_data_p = &stub_data;
}
// Even if we managed to load a blob from the AOT cache we still
@@ -236,17 +241,8 @@ static BufferBlob* initialize_stubs(BlobId blob_id,
"increase %s, code_size: %d, used: %d, free: %d",
assert_msg, code_size, buffer.total_content_size(), buffer.insts_remaining());
- if (stub_data.is_using()) {
- // we generated some new entries so republish all entries TODO -
- // ensure we publish collect and publish the preuniverse stubs but
- // don't try to save them
- AOTCodeCache::publish_stub_addresses(*stubs_code, blob_id, &stub_data);
- if (lt.is_enabled()) {
- LogStream ls(lt);
- ls.print_cr("Republished entries for blob '%s'", buffer_name);
- }
- } else if (stub_data.is_dumping()) {
- // save the blob and publihs the entry addresses
+ if (stub_data.is_dumping()) {
+ // save the blob and publish the entry addresses
if (stub_data.store_code_blob(*stubs_code, &buffer)) {
if (lt.is_enabled()) {
LogStream ls(lt);
@@ -258,6 +254,17 @@ static BufferBlob* initialize_stubs(BlobId blob_id,
ls.print_cr("Failed to store blob '%s' to Startup Code Cache", buffer_name);
}
}
+ } else if (stub_data.is_open()) {
+ // we either loaded some entries or generated new entries so
+ // publish all entries
+ //
+ // TODO - ensure we publish collect and publish the preuniverse
+ // stubs but don't try to save them
+ AOTCodeCache::publish_stub_addresses(*stubs_code, blob_id, &stub_data);
+ if (lt.is_enabled()) {
+ LogStream ls(lt);
+ ls.print_cr("Republished entries for blob '%s'", buffer_name);
+ }
}
// close off recording of any further stubgen generation
diff --git a/src/hotspot/share/runtime/vmOperation.hpp b/src/hotspot/share/runtime/vmOperation.hpp
index 5140d0401fb..6078600c16e 100644
--- a/src/hotspot/share/runtime/vmOperation.hpp
+++ b/src/hotspot/share/runtime/vmOperation.hpp
@@ -90,7 +90,7 @@
template(ShenandoahFinalMarkStartEvac) \
template(ShenandoahInitUpdateRefs) \
template(ShenandoahFinalUpdateRefs) \
- template(ShenandoahFinalRoots) \
+ template(ShenandoahFinalVerify) \
template(ShenandoahDegeneratedGC) \
template(Exit) \
template(LinuxDllLoad) \
diff --git a/src/hotspot/share/services/diagnosticCommand.cpp b/src/hotspot/share/services/diagnosticCommand.cpp
index 0846f339227..f2fa114133e 100644
--- a/src/hotspot/share/services/diagnosticCommand.cpp
+++ b/src/hotspot/share/services/diagnosticCommand.cpp
@@ -99,6 +99,7 @@ void DCmd::register_dcmds() {
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl(full_export));
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl(full_export));
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl(full_export));
+ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl(full_export));
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl(full_export));
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl(full_export));
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl(full_export));
@@ -334,8 +335,8 @@ void JVMTIAgentLoadDCmd::execute(DCmdSource source, TRAPS) {
#endif // INCLUDE_JVMTI
#endif // INCLUDE_SERVICES
-void PrintSystemPropertiesDCmd::execute(DCmdSource source, TRAPS) {
- // load VMSupport
+// helper method for printing system and security properties
+static void print_properties(Symbol* method_name, outputStream* out, TRAPS) {
Symbol* klass = vmSymbols::jdk_internal_vm_VMSupport();
Klass* k = SystemDictionary::resolve_or_fail(klass, true, CHECK);
InstanceKlass* ik = InstanceKlass::cast(k);
@@ -343,39 +344,36 @@ void PrintSystemPropertiesDCmd::execute(DCmdSource source, TRAPS) {
ik->initialize(THREAD);
}
if (HAS_PENDING_EXCEPTION) {
- java_lang_Throwable::print(PENDING_EXCEPTION, output());
- output()->cr();
+ java_lang_Throwable::print(PENDING_EXCEPTION, out);
+ out->cr();
CLEAR_PENDING_EXCEPTION;
return;
}
-
- // invoke the serializePropertiesToByteArray method
JavaValue result(T_OBJECT);
JavaCallArguments args;
-
Symbol* signature = vmSymbols::void_byte_array_signature();
- JavaCalls::call_static(&result,
- ik,
- vmSymbols::serializePropertiesToByteArray_name(),
- signature,
- &args,
- THREAD);
+ JavaCalls::call_static(&result, ik, method_name, signature, &args, THREAD);
+
if (HAS_PENDING_EXCEPTION) {
- java_lang_Throwable::print(PENDING_EXCEPTION, output());
- output()->cr();
+ java_lang_Throwable::print(PENDING_EXCEPTION, out);
+ out->cr();
CLEAR_PENDING_EXCEPTION;
return;
}
-
- // The result should be a [B
oop res = result.get_oop();
- assert(res->is_typeArray(), "just checking");
- assert(TypeArrayKlass::cast(res->klass())->element_type() == T_BYTE, "just checking");
-
- // copy the bytes to the output stream
+ assert(res->is_typeArray(), "should be a byte array");
+ assert(TypeArrayKlass::cast(res->klass())->element_type() == T_BYTE, "should be a byte array");
typeArrayOop ba = typeArrayOop(res);
- jbyte* addr = typeArrayOop(res)->byte_at_addr(0);
- output()->print_raw((const char*)addr, ba->length());
+ jbyte* addr = ba->byte_at_addr(0);
+ out->print_raw((const char*)addr, ba->length());
+}
+
+void PrintSystemPropertiesDCmd::execute(DCmdSource source, TRAPS) {
+ print_properties(vmSymbols::serializePropertiesToByteArray_name(), output(), THREAD);
+}
+
+void PrintSecurityPropertiesDCmd::execute(DCmdSource source, TRAPS) {
+ print_properties(vmSymbols::serializeSecurityPropertiesToByteArray_name(), output(), THREAD);
}
VMUptimeDCmd::VMUptimeDCmd(outputStream* output, bool heap) :
diff --git a/src/hotspot/share/services/diagnosticCommand.hpp b/src/hotspot/share/services/diagnosticCommand.hpp
index c41e7bf2e2e..97ceb19d0ad 100644
--- a/src/hotspot/share/services/diagnosticCommand.hpp
+++ b/src/hotspot/share/services/diagnosticCommand.hpp
@@ -94,6 +94,15 @@ public:
virtual void execute(DCmdSource source, TRAPS);
};
+class PrintSecurityPropertiesDCmd : public DCmd {
+public:
+ PrintSecurityPropertiesDCmd(outputStream* output, bool heap) : DCmd(output, heap) { }
+ static const char* name() { return "VM.security_properties"; }
+ static const char* description() { return "Print java.security.Security properties."; }
+ static const char* impact() { return "Low"; }
+ virtual void execute(DCmdSource source, TRAPS);
+};
+
// See also: print_flag in attachListener.cpp
class PrintVMFlagsDCmd : public DCmdWithParser {
protected:
diff --git a/src/hotspot/share/utilities/growableArray.cpp b/src/hotspot/share/utilities/growableArray.cpp
index 6a1cb0b0414..9cc0813a1f6 100644
--- a/src/hotspot/share/utilities/growableArray.cpp
+++ b/src/hotspot/share/utilities/growableArray.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,7 @@
*
*/
+#include "cds/aotMetaspace.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/resourceArea.hpp"
#include "runtime/javaThread.hpp"
@@ -56,7 +57,9 @@ void* GrowableArrayCHeapAllocator::allocate(int max, int element_size, MemTag me
}
void GrowableArrayCHeapAllocator::deallocate(void* elements) {
- FreeHeap(elements);
+ if (!AOTMetaspace::in_aot_cache(elements)) {
+ FreeHeap(elements);
+ }
}
#ifdef ASSERT
diff --git a/src/hotspot/share/utilities/growableArray.hpp b/src/hotspot/share/utilities/growableArray.hpp
index e300bea6993..14b54cfc4ea 100644
--- a/src/hotspot/share/utilities/growableArray.hpp
+++ b/src/hotspot/share/utilities/growableArray.hpp
@@ -116,12 +116,6 @@ protected:
~GrowableArrayView() {}
-protected:
- // Used by AOTGrowableArray for MetaspaceClosure support.
- E** data_addr() {
- return &_data;
- }
-
public:
bool operator==(const GrowableArrayView& rhs) const {
if (_len != rhs._len)
@@ -303,6 +297,11 @@ public:
}
tty->print("}\n");
}
+
+ // MetaspaceClosure support
+ E** data_addr() {
+ return &_data;
+ }
};
template
@@ -821,6 +820,8 @@ public:
this->clear_and_deallocate();
}
}
+
+ void assert_on_C_heap() { assert(on_C_heap(), "must be on C heap"); }
};
// Leaner GrowableArray for CHeap backed data arrays, with compile-time decided MemTag.
diff --git a/src/java.base/share/classes/java/lang/ref/Reference.java b/src/java.base/share/classes/java/lang/ref/Reference.java
index 88bdb99dfd6..df46ffe6ca6 100644
--- a/src/java.base/share/classes/java/lang/ref/Reference.java
+++ b/src/java.base/share/classes/java/lang/ref/Reference.java
@@ -644,12 +644,9 @@ public abstract sealed class Reference<@jdk.internal.RequiresIdentity T>
* {@code null}, this method has no effect.
* @since 9
*/
- @ForceInline
+ @IntrinsicCandidate
public static void reachabilityFence(Object ref) {
- // Does nothing. This method is annotated with @ForceInline to eliminate
- // most of the overhead that using @DontInline would cause with the
- // HotSpot JVM, when this fence is used in a wide variety of situations.
- // HotSpot JVM retains the ref and does not GC it before a call to
- // this method, because the JIT-compilers do not have GC-only safepoints.
+ // Does nothing. HotSpot JVM retains the ref and does not GC it before a call to this method.
+ // Using an intrinsic allows JIT-compilers to further optimize it while retaining the correct semantics.
}
}
diff --git a/src/java.base/share/classes/java/security/Security.java b/src/java.base/share/classes/java/security/Security.java
index 30a22b05742..9faa172c8e7 100644
--- a/src/java.base/share/classes/java/security/Security.java
+++ b/src/java.base/share/classes/java/security/Security.java
@@ -330,6 +330,10 @@ public final class Security {
public Properties getInitialProperties() {
return initialSecurityProperties;
}
+ @Override
+ public Properties getCurrentProperties() {
+ return props;
+ }
});
}
diff --git a/src/java.base/share/classes/java/util/ServiceLoader.java b/src/java.base/share/classes/java/util/ServiceLoader.java
index 5137adc1c08..5e4fa4ed2ef 100644
--- a/src/java.base/share/classes/java/util/ServiceLoader.java
+++ b/src/java.base/share/classes/java/util/ServiceLoader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,9 +621,9 @@ public final class ServiceLoader
Constructor ctor = null;
try {
ctor = clazz.getConstructor();
- } catch (NoSuchMethodException ex) {
+ } catch (NoSuchMethodException | LinkageError e) {
String cn = clazz.getName();
- fail(service, cn + " Unable to get public no-arg constructor", ex);
+ fail(service, cn + " Unable to get public no-arg constructor", e);
}
if (inExplicitModule(clazz))
ctor.setAccessible(true);
@@ -1086,8 +1086,8 @@ public final class ServiceLoader
String cn = pending.next();
try {
return Class.forName(cn, false, loader);
- } catch (ClassNotFoundException x) {
- fail(service, "Provider " + cn + " not found");
+ } catch (ClassNotFoundException | LinkageError e) {
+ fail(service, "Provider " + cn + " not found", e);
return null;
}
}
diff --git a/src/java.base/share/classes/java/util/stream/Stream.java b/src/java.base/share/classes/java/util/stream/Stream.java
index 1dd13133fe1..645f4f033b7 100644
--- a/src/java.base/share/classes/java/util/stream/Stream.java
+++ b/src/java.base/share/classes/java/util/stream/Stream.java
@@ -1002,8 +1002,8 @@ public interface Stream extends BaseStream> {
/**
* Performs a reduction on the
- * elements of this stream, using the provided identity, accumulation and
- * combining functions. This is equivalent to:
+ * elements of this stream using the provided identity value, accumulation
+ * function, and combining function. This is equivalent to:
*
{@code
* U result = identity;
* for (T element : this stream)
diff --git a/src/java.base/share/classes/java/util/zip/GZIPInputStream.java b/src/java.base/share/classes/java/util/zip/GZIPInputStream.java
index ebcb9e3204c..72fb8036f08 100644
--- a/src/java.base/share/classes/java/util/zip/GZIPInputStream.java
+++ b/src/java.base/share/classes/java/util/zip/GZIPInputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2026, 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
@@ -79,11 +79,7 @@ public class GZIPInputStream extends InflaterInputStream {
super(in, createInflater(in, size), size);
usesDefaultInflater = true;
try {
- // we don't expect the stream to be at EOF
- // and if it is, then we want readHeader to
- // raise an exception, so we pass "true" for
- // the "failOnEOF" param.
- readHeader(in, true);
+ readHeader(in);
} catch (IOException ioe) {
this.inf.end();
throw ioe;
@@ -194,40 +190,12 @@ public class GZIPInputStream extends InflaterInputStream {
/*
* Reads GZIP member header and returns the total byte number
* of this member header.
- * If failOnEOF is false and if the given InputStream has already
- * reached EOF when this method was invoked, then this method returns
- * -1 (indicating that there's no GZIP member header).
- * In all other cases of malformed header or EOF being detected
- * when reading the header, this method will throw an IOException.
*/
- private int readHeader(InputStream this_in, boolean failOnEOF) throws IOException {
+ private int readHeader(InputStream this_in) throws IOException {
CheckedInputStream in = new CheckedInputStream(this_in, crc);
crc.reset();
-
- int magic;
- if (!failOnEOF) {
- // read an unsigned short value representing the GZIP magic header.
- // this is the same as calling readUShort(in), except that here,
- // when reading the first byte, we don't raise an EOFException
- // if the stream has already reached EOF.
-
- // read unsigned byte
- int b = in.read();
- if (b == -1) { // EOF
- crc.reset();
- return -1; // represents no header bytes available
- }
- checkUnexpectedByte(b);
- // read the next unsigned byte to form the unsigned
- // short. we throw the usual EOFException/ZipException
- // from this point on if there is no more data or
- // the data doesn't represent a header.
- magic = (readUByte(in) << 8) | b;
- } else {
- magic = readUShort(in);
- }
// Check header magic
- if (magic != GZIP_MAGIC) {
+ if (readUShort(in) != GZIP_MAGIC) {
throw new ZipException("Not in GZIP format");
}
// Check compression method
@@ -290,21 +258,23 @@ public class GZIPInputStream extends InflaterInputStream {
(readUInt(in) != (inf.getBytesWritten() & 0xffffffffL)))
throw new ZipException("Corrupt GZIP trailer");
+ // If there are more bytes available in "in" or
+ // the leftover in the "inf" is > 26 bytes:
+ // this.trailer(8) + next.header.min(10) + next.trailer(8)
// try concatenated case
- int m = 8; // this.trailer
- try {
- int numNextHeaderBytes = readHeader(in, false); // next.header (if available)
- if (numNextHeaderBytes == -1) {
- return true; // end of stream reached
+ if (this.in.available() > 0 || n > 26) {
+ int m = 8; // this.trailer
+ try {
+ m += readHeader(in); // next.header
+ } catch (IOException ze) {
+ return true; // ignore any malformed, do nothing
}
- m += numNextHeaderBytes;
- } catch (IOException ze) {
- return true; // ignore any malformed, do nothing
+ inf.reset();
+ if (n > m)
+ inf.setInput(buf, len - n + m, n - m);
+ return false;
}
- inf.reset();
- if (n > m)
- inf.setInput(buf, len - n + m, n - m);
- return false;
+ return true;
}
/*
@@ -331,16 +301,12 @@ public class GZIPInputStream extends InflaterInputStream {
if (b == -1) {
throw new EOFException();
}
- checkUnexpectedByte(b);
- return b;
- }
-
- private void checkUnexpectedByte(final int b) throws IOException {
if (b < -1 || b > 255) {
- // report the InputStream type which returned this unexpected byte
+ // Report on this.in, not argument in; see read{Header, Trailer}.
throw new IOException(this.in.getClass().getName()
- + ".read() returned value out of range -1..255: " + b);
+ + ".read() returned value out of range -1..255: " + b);
}
+ return b;
}
private byte[] tmpbuf = new byte[128];
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaSecurityPropertiesAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaSecurityPropertiesAccess.java
index a4875f357e3..2d9dbea052a 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaSecurityPropertiesAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaSecurityPropertiesAccess.java
@@ -29,4 +29,5 @@ import java.util.Properties;
public interface JavaSecurityPropertiesAccess {
Properties getInitialProperties();
+ Properties getCurrentProperties();
}
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 197da0d456c..32c358340af 100644
--- a/src/java.base/share/classes/jdk/internal/vm/VMSupport.java
+++ b/src/java.base/share/classes/jdk/internal/vm/VMSupport.java
@@ -98,6 +98,11 @@ public class VMSupport {
return serializePropertiesToByteArray(onlyStrings(System.getProperties()));
}
+ public static byte[] serializeSecurityPropertiesToByteArray() throws IOException {
+ Properties p = SharedSecrets.getJavaSecurityPropertiesAccess().getCurrentProperties();
+ return serializePropertiesToByteArray(onlyStrings(p));
+ }
+
public static byte[] serializeAgentPropertiesToByteArray() throws IOException {
return serializePropertiesToByteArray(onlyStrings(getAgentProperties()));
}
diff --git a/src/java.base/share/classes/sun/security/provider/DigestBase.java b/src/java.base/share/classes/sun/security/provider/DigestBase.java
index 2aaf0a2fac6..0bb15ef3efe 100644
--- a/src/java.base/share/classes/sun/security/provider/DigestBase.java
+++ b/src/java.base/share/classes/sun/security/provider/DigestBase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -242,4 +242,21 @@ abstract class DigestBase extends MessageDigestSpi implements Cloneable {
padding = new byte[136];
padding[0] = (byte)0x80;
}
+
+ /**
+ * Digest block-length bytes in a single operation.
+ * Subclasses are expected to override this method. It is intended
+ * for fixed-length short input where input includes padding bytes.
+ * @param input byte array to be digested
+ * @param inLen the length of the input
+ * @param output the output buffer
+ * @param outOffset the offset into output buffer where digest should be written
+ * @param outLen the length of the output buffer
+ * @throws UnsupportedOperationException if a subclass does not override this method
+ */
+ void implDigestFixedLengthPreprocessed (
+ byte[] input, int inLen, byte[] output, int outOffset, int outLen)
+ throws UnsupportedOperationException {
+ throw new UnsupportedOperationException("should not be here");
+ }
}
diff --git a/src/java.base/share/classes/sun/security/provider/HSS.java b/src/java.base/share/classes/sun/security/provider/HSS.java
index c1cb5ed6a30..50afba7cab8 100644
--- a/src/java.base/share/classes/sun/security/provider/HSS.java
+++ b/src/java.base/share/classes/sun/security/provider/HSS.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,16 +24,22 @@
*/
package sun.security.provider;
+import java.io.ByteArrayOutputStream;
+import java.io.InvalidObjectException;
+import java.io.Serial;
+import java.io.Serializable;
+import java.security.SecureRandom;
+import java.security.*;
+import java.security.spec.AlgorithmParameterSpec;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.KeySpec;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.Arrays;
+
import sun.security.util.*;
import sun.security.x509.AlgorithmId;
import sun.security.x509.X509Key;
-import java.io.*;
-import java.security.*;
-import java.security.SecureRandom;
-import java.security.spec.*;
-import java.util.Arrays;
-
/**
* Implementation of the Hierarchical Signature System using the
* Leighton-Micali Signatures (HSS/LMS) as described in RFC 8554 and
@@ -196,42 +202,94 @@ public final class HSS extends SignatureSpi {
static class LMSUtils {
static final int LMS_RESERVED = 0;
- static final int LMS_SHA256_M32_H5 = 5;
- static final int LMS_SHA256_M32_H10 = 6;
- static final int LMS_SHA256_M32_H15 = 7;
- static final int LMS_SHA256_M32_H20 = 8;
- static final int LMS_SHA256_M32_H25 = 9;
+ static final int LMS_SHA256_M32_H5 = 0x05;
+ static final int LMS_SHA256_M32_H10 = 0x06;
+ static final int LMS_SHA256_M32_H15 = 0x07;
+ static final int LMS_SHA256_M32_H20 = 0x08;
+ static final int LMS_SHA256_M32_H25 = 0x09;
+ static final int LMS_SHA256_M24_H5 = 0x0a;
+ static final int LMS_SHA256_M24_H10 = 0x0b;
+ static final int LMS_SHA256_M24_H15 = 0x0c;
+ static final int LMS_SHA256_M24_H20 = 0x0d;
+ static final int LMS_SHA256_M24_H25 = 0x0e;
+ static final int LMS_SHAKE_M32_H5 = 0x0f;
+ static final int LMS_SHAKE_M32_H10 = 0x10;
+ static final int LMS_SHAKE_M32_H15 = 0x11;
+ static final int LMS_SHAKE_M32_H20 = 0x12;
+ static final int LMS_SHAKE_M32_H25 = 0x13;
+ static final int LMS_SHAKE_M24_H5 = 0x14;
+ static final int LMS_SHAKE_M24_H10 = 0x15;
+ static final int LMS_SHAKE_M24_H15 = 0x16;
+ static final int LMS_SHAKE_M24_H20 = 0x17;
+ static final int LMS_SHAKE_M24_H25 = 0x18;
static String lmsType(int type) {
- String typeStr;
- switch (type) {
- case LMS_RESERVED: typeStr = "LMS_RESERVED"; break;
- case LMS_SHA256_M32_H5: typeStr = "LMS_SHA256_M32_H5"; break;
- case LMS_SHA256_M32_H10: typeStr = "LMS_SHA256_M32_H10"; break;
- case LMS_SHA256_M32_H15: typeStr = "LMS_SHA256_M32_H15"; break;
- case LMS_SHA256_M32_H20: typeStr = "LMS_SHA256_M32_H20"; break;
- case LMS_SHA256_M32_H25: typeStr = "LMS_SHA256_M32_H25"; break;
- default: typeStr = "unrecognized";
- }
+ String typeStr = switch (type) {
+ case LMS_RESERVED -> "LMS_RESERVED";
+ case LMS_SHA256_M32_H5 -> "LMS_SHA256_M32_H5";
+ case LMS_SHA256_M32_H10 -> "LMS_SHA256_M32_H10";
+ case LMS_SHA256_M32_H15 -> "LMS_SHA256_M32_H15";
+ case LMS_SHA256_M32_H20 -> "LMS_SHA256_M32_H20";
+ case LMS_SHA256_M32_H25 -> "LMS_SHA256_M32_H25";
+ case LMS_SHA256_M24_H5 -> "LMS_SHA256_M24_H5";
+ case LMS_SHA256_M24_H10 -> "LMS_SHA256_M24_H10";
+ case LMS_SHA256_M24_H15 -> "LMS_SHA256_M24_H15";
+ case LMS_SHA256_M24_H20 -> "LMS_SHA256_M24_H20";
+ case LMS_SHA256_M24_H25 -> "LMS_SHA256_M24_H25";
+ case LMS_SHAKE_M32_H5 -> "LMS_SHAKE_M32_H5";
+ case LMS_SHAKE_M32_H10 -> "LMS_SHAKE_M32_H10";
+ case LMS_SHAKE_M32_H15 -> "LMS_SHAKE_M32_H15";
+ case LMS_SHAKE_M32_H20 -> "LMS_SHAKE_M32_H20";
+ case LMS_SHAKE_M32_H25 -> "LMS_SHAKE_M32_H25";
+ case LMS_SHAKE_M24_H5 -> "LMS_SHAKE_M24_H5";
+ case LMS_SHAKE_M24_H10 -> "LMS_SHAKE_M24_H10";
+ case LMS_SHAKE_M24_H15 -> "LMS_SHAKE_M24_H15";
+ case LMS_SHAKE_M24_H20 -> "LMS_SHAKE_M24_H20";
+ case LMS_SHAKE_M24_H25 -> "LMS_SHAKE_M24_H25";
+ default -> "unrecognized";
+ };
return typeStr;
}
static final int LMOTS_RESERVED = 0;
- static final int LMOTS_SHA256_N32_W1 = 1;
- static final int LMOTS_SHA256_N32_W2 = 2;
- static final int LMOTS_SHA256_N32_W4 = 3;
- static final int LMOTS_SHA256_N32_W8 = 4;
+ static final int LMOTS_SHA256_N32_W1 = 0x01;
+ static final int LMOTS_SHA256_N32_W2 = 0x02;
+ static final int LMOTS_SHA256_N32_W4 = 0x03;
+ static final int LMOTS_SHA256_N32_W8 = 0x04;
+ static final int LMOTS_SHA256_N24_W1 = 0x05;
+ static final int LMOTS_SHA256_N24_W2 = 0x06;
+ static final int LMOTS_SHA256_N24_W4 = 0x07;
+ static final int LMOTS_SHA256_N24_W8 = 0x08;
+ static final int LMOTS_SHAKE_N32_W1 = 0x09;
+ static final int LMOTS_SHAKE_N32_W2 = 0x0a;
+ static final int LMOTS_SHAKE_N32_W4 = 0x0b;
+ static final int LMOTS_SHAKE_N32_W8 = 0x0c;
+ static final int LMOTS_SHAKE_N24_W1 = 0x0d;
+ static final int LMOTS_SHAKE_N24_W2 = 0x0e;
+ static final int LMOTS_SHAKE_N24_W4 = 0x0f;
+ static final int LMOTS_SHAKE_N24_W8 = 0x10;
static String lmotsType(int type) {
- String typeStr;
- switch (type) {
- case LMOTS_RESERVED: typeStr = "LMOTS_RESERVED"; break;
- case LMOTS_SHA256_N32_W1: typeStr = "LMOTS_SHA256_N32_W1"; break;
- case LMOTS_SHA256_N32_W2: typeStr = "LMOTS_SHA256_N32_W2"; break;
- case LMOTS_SHA256_N32_W4: typeStr = "LMOTS_SHA256_N32_W4"; break;
- case LMOTS_SHA256_N32_W8: typeStr = "LMOTS_SHA256_N32_W8"; break;
- default: typeStr = "unrecognized";
- }
+ String typeStr = switch (type) {
+ case LMOTS_RESERVED -> "LMOTS_RESERVED";
+ case LMOTS_SHA256_N32_W1 -> "LMOTS_SHA256_N32_W1";
+ case LMOTS_SHA256_N32_W2 -> "LMOTS_SHA256_N32_W2";
+ case LMOTS_SHA256_N32_W4 -> "LMOTS_SHA256_N32_W4";
+ case LMOTS_SHA256_N32_W8 -> "LMOTS_SHA256_N32_W8";
+ case LMOTS_SHA256_N24_W1 -> "LMOTS_SHA256_N24_W1";
+ case LMOTS_SHA256_N24_W2 -> "LMOTS_SHA256_N24_W2";
+ case LMOTS_SHA256_N24_W4 -> "LMOTS_SHA256_N24_W4";
+ case LMOTS_SHA256_N24_W8 -> "LMOTS_SHA256_N24_W8";
+ case LMOTS_SHAKE_N32_W1 -> "LMOTS_SHAKE_N32_W1";
+ case LMOTS_SHAKE_N32_W2 -> "LMOTS_SHAKE_N32_W2";
+ case LMOTS_SHAKE_N32_W4 -> "LMOTS_SHAKE_N32_W4";
+ case LMOTS_SHAKE_N32_W8 -> "LMOTS_SHAKE_N32_W8";
+ case LMOTS_SHAKE_N24_W1 -> "LMOTS_SHAKE_N24_W1";
+ case LMOTS_SHAKE_N24_W2 -> "LMOTS_SHAKE_N24_W2";
+ case LMOTS_SHAKE_N24_W4 -> "LMOTS_SHAKE_N24_W4";
+ case LMOTS_SHAKE_N24_W8 -> "LMOTS_SHAKE_N24_W8";
+ default -> "unrecognized";
+ };
return typeStr;
}
@@ -352,53 +410,65 @@ public final class HSS extends SignatureSpi {
static class LMSParams {
final int m; // the number of bytes used from the hash output
- final int hashAlg_m = 32; // output length of the LMS tree hash function
+ final int hashAlg_m; // output length of the LMS tree hash function
final int h; // height of the LMS tree
final int twoPowh;
final String hashAlgStr;
- LMSParams(int m, int h, String hashAlgStr) {
+ private LMSParams(int m, int h, String hashAlgStr, int hashAlg_m) {
this.m = m;
this.h = h;
this.hashAlgStr = hashAlgStr;
+ this.hashAlg_m = hashAlg_m;
twoPowh = 1 << h;
}
static LMSParams of(int type) {
- int m;
- int h;
- String hashAlgStr;
- switch (type) {
- case LMSUtils.LMS_SHA256_M32_H5:
- m = 32;
- h = 5;
- hashAlgStr = "SHA-256";
- break;
- case LMSUtils.LMS_SHA256_M32_H10:
- m = 32;
- h = 10;
- hashAlgStr = "SHA-256";
- break;
- case LMSUtils.LMS_SHA256_M32_H15:
- m = 32;
- h = 15;
- hashAlgStr = "SHA-256";
- break;
- case LMSUtils.LMS_SHA256_M32_H20:
- m = 32;
- h = 20;
- hashAlgStr = "SHA-256";
- break;
- case LMSUtils.LMS_SHA256_M32_H25:
- m = 32;
- h = 25;
- hashAlgStr = "SHA-256";
- break;
- default:
+ LMSParams params = switch (type) {
+ case LMSUtils.LMS_SHA256_M32_H5 ->
+ new LMSParams(32, 5, "SHA-256", 32);
+ case LMSUtils.LMS_SHA256_M32_H10 ->
+ new LMSParams(32, 10, "SHA-256", 32);
+ case LMSUtils.LMS_SHA256_M32_H15 ->
+ new LMSParams(32, 15, "SHA-256", 32);
+ case LMSUtils.LMS_SHA256_M32_H20 ->
+ new LMSParams(32, 20, "SHA-256", 32);
+ case LMSUtils.LMS_SHA256_M32_H25 ->
+ new LMSParams(32, 25, "SHA-256", 32);
+ case LMSUtils.LMS_SHA256_M24_H5 ->
+ new LMSParams(24, 5, "SHA-256", 32);
+ case LMSUtils.LMS_SHA256_M24_H10 ->
+ new LMSParams(24, 10, "SHA-256", 32);
+ case LMSUtils.LMS_SHA256_M24_H15 ->
+ new LMSParams(24, 15, "SHA-256", 32);
+ case LMSUtils.LMS_SHA256_M24_H20 ->
+ new LMSParams(24, 20, "SHA-256", 32);
+ case LMSUtils.LMS_SHA256_M24_H25 ->
+ new LMSParams(24, 25, "SHA-256", 32);
+ case LMSUtils.LMS_SHAKE_M32_H5 ->
+ new LMSParams(32, 5, "SHAKE256-512", 64);
+ case LMSUtils.LMS_SHAKE_M32_H10 ->
+ new LMSParams(32, 10, "SHAKE256-512", 64);
+ case LMSUtils.LMS_SHAKE_M32_H15 ->
+ new LMSParams(32, 15, "SHAKE256-512", 64);
+ case LMSUtils.LMS_SHAKE_M32_H20 ->
+ new LMSParams(32, 20, "SHAKE256-512", 64);
+ case LMSUtils.LMS_SHAKE_M32_H25 ->
+ new LMSParams(32, 25, "SHAKE256-512", 64);
+ case LMSUtils.LMS_SHAKE_M24_H5 ->
+ new LMSParams(24, 5, "SHAKE256-512", 64);
+ case LMSUtils.LMS_SHAKE_M24_H10 ->
+ new LMSParams(24, 10, "SHAKE256-512", 64);
+ case LMSUtils.LMS_SHAKE_M24_H15 ->
+ new LMSParams(24, 15, "SHAKE256-512", 64);
+ case LMSUtils.LMS_SHAKE_M24_H20 ->
+ new LMSParams(24, 20, "SHAKE256-512", 64);
+ case LMSUtils.LMS_SHAKE_M24_H25 ->
+ new LMSParams(24, 25, "SHAKE256-512", 64);
+ default ->
throw new IllegalArgumentException("Unsupported or bad LMS type");
- }
-
- return new LMSParams(m, h, hashAlgStr);
+ };
+ return params;
}
boolean hasSameHash(LMSParams other) {
@@ -495,7 +565,7 @@ public final class HSS extends SignatureSpi {
static class LMOTSParams {
final int lmotSigType;
final int n; // the number of bytes used from the hash output
- final int hashAlg_n = 32; // the output length of the hash function
+ int hashAlg_n; // the output length of the hash function
final int w;
final int twoPowWMinus1;
final int ls;
@@ -511,6 +581,7 @@ public final class HSS extends SignatureSpi {
// back into the buffer. This way, we avoid memory allocations and some
// computations that would have to be done otherwise.
final byte[] hashBuf;
+
// Precomputed block for SHA256 when the message size is 55 bytes
// (i.e. when SHA256 is used)
private static final byte[] hashbufSha256_32 = {
@@ -523,10 +594,64 @@ public final class HSS extends SignatureSpi {
0, 0, 0, 0, 0, 0, 0, (byte) 0x80,
0, 0, 0, 0, 0, 0, 1, (byte) 0xb8
};
+ // Precomputed block for SHA256 when the message size is 47 bytes
+ // (i.e. when SHA256-192 is used)
+ private static final byte[] hashbufSha256_24 = {
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, (byte) 0x80,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 1, 0x78
+ };
+ // Precomputed block for SHAKE256 when the message size is 55 bytes
+ // (i.e. when SHAKE256 is used)
+ private static final byte[] hashbufShake256_32 = {
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, (byte) 0x1F,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, (byte) 0x80
+ };
+ // Precomputed block for SHAKE256 when the message size is 47 bytes
+ // (i.e. when SHAKE256-192 is used)
+ private static final byte[] hashbufShake256_24 = {
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, (byte) 0x1F,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, (byte) 0x80
+ };
private LMOTSParams(
int lmotSigType, int hLen, int w,
- int ls, int p, String hashAlgName) {
+ int ls, int p, String hashAlgName, int hashAlg_n) {
this.lmotSigType = lmotSigType;
this.n = hLen;
this.w = w;
@@ -534,32 +659,60 @@ public final class HSS extends SignatureSpi {
this.p = p;
twoPowWMinus1 = (1 << w) - 1;
this.hashAlgName = hashAlgName;
- hashBuf = hashbufSha256_32;
+ this.hashAlg_n = hashAlg_n;
+ hashBuf = switch (hashAlgName) {
+ case "SHAKE256-512" -> {
+ yield this.n == 24 ?
+ hashbufShake256_24 : hashbufShake256_32;
+ }
+ case "SHA-256" -> {
+ yield this.n == 24 ?
+ hashbufSha256_24 : hashbufSha256_32;
+ }
+ default ->
+ throw new IllegalArgumentException(
+ "Unknown hash algorithm "+hashAlgName);
+ };
}
static LMOTSParams of(int lmotsType) {
- LMOTSParams params;
- switch (lmotsType) {
- case LMSUtils.LMOTS_SHA256_N32_W1:
- params = new LMOTSParams(
- lmotsType, 32, 1, 7, 265, "SHA-256");
- break;
- case LMSUtils.LMOTS_SHA256_N32_W2:
- params = new LMOTSParams(
- lmotsType, 32, 2, 6, 133, "SHA-256");
- break;
- case LMSUtils.LMOTS_SHA256_N32_W4:
- params = new LMOTSParams(
- lmotsType, 32, 4, 4, 67, "SHA-256");
- break;
- case LMSUtils.LMOTS_SHA256_N32_W8:
- params = new LMOTSParams(
- lmotsType, 32, 8, 0, 34, "SHA-256");
- break;
- default:
+ LMOTSParams params = switch (lmotsType) {
+ case LMSUtils.LMOTS_SHA256_N32_W1 ->
+ new LMOTSParams(lmotsType, 32, 1, 7, 265, "SHA-256", 32);
+ case LMSUtils.LMOTS_SHA256_N32_W2 ->
+ new LMOTSParams(lmotsType, 32, 2, 6, 133, "SHA-256", 32);
+ case LMSUtils.LMOTS_SHA256_N32_W4 ->
+ new LMOTSParams(lmotsType, 32, 4, 4, 67, "SHA-256", 32);
+ case LMSUtils.LMOTS_SHA256_N32_W8 ->
+ new LMOTSParams(lmotsType, 32, 8, 0, 34, "SHA-256", 32);
+ case LMSUtils.LMOTS_SHA256_N24_W1 ->
+ new LMOTSParams(lmotsType, 24, 1, 8, 200, "SHA-256", 32);
+ case LMSUtils.LMOTS_SHA256_N24_W2 ->
+ new LMOTSParams(lmotsType, 24, 2, 6, 101, "SHA-256", 32);
+ case LMSUtils.LMOTS_SHA256_N24_W4 ->
+ new LMOTSParams(lmotsType, 24, 4, 4, 51, "SHA-256", 32);
+ case LMSUtils.LMOTS_SHA256_N24_W8 ->
+ new LMOTSParams(lmotsType, 24, 8, 0, 26, "SHA-256", 32);
+ case LMSUtils.LMOTS_SHAKE_N32_W1 ->
+ new LMOTSParams(lmotsType, 32, 1, 7, 265, "SHAKE256-512", 64);
+ case LMSUtils.LMOTS_SHAKE_N32_W2 ->
+ new LMOTSParams(lmotsType, 32, 2, 6, 133, "SHAKE256-512", 64);
+ case LMSUtils.LMOTS_SHAKE_N32_W4 ->
+ new LMOTSParams(lmotsType, 32, 4, 4, 67, "SHAKE256-512", 64);
+ case LMSUtils.LMOTS_SHAKE_N32_W8 ->
+ new LMOTSParams(lmotsType, 32, 8, 0, 34, "SHAKE256-512", 64);
+ case LMSUtils.LMOTS_SHAKE_N24_W1 ->
+ new LMOTSParams(lmotsType, 24, 1, 8, 200, "SHAKE256-512", 64);
+ case LMSUtils.LMOTS_SHAKE_N24_W2 ->
+ new LMOTSParams(lmotsType, 24, 2, 6, 101, "SHAKE256-512", 64);
+ case LMSUtils.LMOTS_SHAKE_N24_W4 ->
+ new LMOTSParams(lmotsType, 24, 4, 4, 51, "SHAKE256-512", 64);
+ case LMSUtils.LMOTS_SHAKE_N24_W8 ->
+ new LMOTSParams(lmotsType, 24, 8, 0, 26, "SHAKE256-512", 64);
+ default ->
throw new IllegalArgumentException(
"Unsupported or bad OTS Algorithm Identifier.");
- }
+ };
return params;
}
@@ -580,13 +733,6 @@ public final class HSS extends SignatureSpi {
S[len + 1] = (byte) (sum & 0xff);
}
- void digestFixedLengthPreprocessed(
- SHA2.SHA256 sha256, byte[] input, int inLen,
- byte[] output, int outOffset, int outLen) {
- sha256.implDigestFixedLengthPreprocessed(
- input, inLen, output, outOffset, outLen);
- }
-
byte[] lmotsPubKeyCandidate(
LMSignature lmSig, byte[] message, LMSPublicKey pKey)
throws SignatureException {
@@ -625,7 +771,13 @@ public final class HSS extends SignatureSpi {
byte[] preZi = hashBuf.clone();
int hashLen = hashBuf.length;
- SHA2.SHA256 sha256 = new SHA2.SHA256();
+
+ DigestBase db;
+ if (hashAlgName.startsWith("SHAKE")) {
+ db = new SHA3.SHAKE256Hash();
+ } else {
+ db = new SHA2.SHA256();
+ }
pKey.getI(preZi, 0);
lmSig.getQArr(preZi, 16);
@@ -643,11 +795,11 @@ public final class HSS extends SignatureSpi {
for (int j = a; j < twoPowWMinus1; j++) {
preZi[22] = (byte) j;
if (j < twoPowWMinus2) {
- digestFixedLengthPreprocessed(
- sha256, preZi, hashLen, preZi, 23, n);
+ db.implDigestFixedLengthPreprocessed(preZi,
+ hashLen, preZi, 23, n);
} else {
- digestFixedLengthPreprocessed(
- sha256, preZi, hashLen, preCandidate, 22 + i * n, n);
+ db.implDigestFixedLengthPreprocessed(preZi,
+ hashLen, preCandidate, 22 + i * n, n);
}
}
}
diff --git a/src/java.base/share/classes/sun/security/provider/SHA2.java b/src/java.base/share/classes/sun/security/provider/SHA2.java
index e966e6b77f8..7d8c2840de9 100644
--- a/src/java.base/share/classes/sun/security/provider/SHA2.java
+++ b/src/java.base/share/classes/sun/security/provider/SHA2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,6 +117,7 @@ abstract class SHA2 extends DigestBase {
}
+ @Override
protected void implDigestFixedLengthPreprocessed(
byte[] input, int inLen, byte[] output, int outOffset, int outLen) {
implReset();
diff --git a/src/java.base/share/classes/sun/security/provider/SHA3.java b/src/java.base/share/classes/sun/security/provider/SHA3.java
index a096cac5f50..0578645c1cd 100644
--- a/src/java.base/share/classes/sun/security/provider/SHA3.java
+++ b/src/java.base/share/classes/sun/security/provider/SHA3.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,6 +98,15 @@ public abstract class SHA3 extends DigestBase {
this.suffix = suffix;
}
+ @Override
+ protected void implDigestFixedLengthPreprocessed(
+ byte[] input, int inLen, byte[] output, int outOffset, int outLen) {
+ implReset();
+
+ implCompress(input, 0);
+ implDigest0(output, outOffset, outLen);
+ }
+
private void implCompressCheck(byte[] b, int ofs) {
Objects.requireNonNull(b);
Preconditions.checkIndex(ofs + blockSize - 1, b.length, Preconditions.AIOOBE_FORMATTER);
@@ -136,9 +145,6 @@ public abstract class SHA3 extends DigestBase {
* DigestBase calls implReset() when necessary.
*/
void implDigest(byte[] out, int ofs) {
- // Moving this allocation to the block where it is used causes a little
- // performance drop, that is why it is here.
- byte[] byteState = new byte[8];
if (engineGetDigestLength() == 0) {
// This is an XOF, so the digest() call is illegal.
throw new ProviderException("Calling digest() is not allowed in an XOF");
@@ -146,8 +152,12 @@ public abstract class SHA3 extends DigestBase {
finishAbsorb();
+ implDigest0(out, ofs, engineGetDigestLength());
+ }
+
+ void implDigest0(byte[] out, int ofs, int outLen) {
int availableBytes = blockSize;
- int numBytes = engineGetDigestLength();
+ int numBytes = outLen;
while (numBytes > availableBytes) {
for (int i = 0; i < availableBytes / 8; i++) {
@@ -163,6 +173,10 @@ public abstract class SHA3 extends DigestBase {
asLittleEndian.set(out, ofs, state[i]);
ofs += 8;
}
+
+ // Moving this allocation to the block where it is used causes a little
+ // performance drop, that is why it is here.
+ byte[] byteState = new byte[8];
if (numBytes % 8 != 0) {
asLittleEndian.set(byteState, 0, state[numLongs]);
System.arraycopy(byteState, 0, out, ofs, numBytes % 8);
diff --git a/src/java.base/share/classes/sun/security/ssl/Alert.java b/src/java.base/share/classes/sun/security/ssl/Alert.java
index fb06b02a5d4..e9588a09b3d 100644
--- a/src/java.base/share/classes/sun/security/ssl/Alert.java
+++ b/src/java.base/share/classes/sun/security/ssl/Alert.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -281,6 +281,8 @@ public enum Alert {
// consumer so the state machine doesn't expect it.
tc.handshakeContext.handshakeConsumers.remove(
SSLHandshake.CERTIFICATE.id);
+ tc.handshakeContext.handshakeConsumers.remove(
+ SSLHandshake.COMPRESSED_CERTIFICATE.id);
tc.handshakeContext.handshakeConsumers.remove(
SSLHandshake.CERTIFICATE_VERIFY.id);
}
diff --git a/src/java.base/share/classes/sun/security/ssl/CertificateMessage.java b/src/java.base/share/classes/sun/security/ssl/CertificateMessage.java
index c6897d71aa6..af5007d7899 100644
--- a/src/java.base/share/classes/sun/security/ssl/CertificateMessage.java
+++ b/src/java.base/share/classes/sun/security/ssl/CertificateMessage.java
@@ -781,14 +781,6 @@ final class CertificateMessage {
}
}
- T13CertificateMessage(HandshakeContext handshakeContext,
- byte[] requestContext, List certificates) {
- super(handshakeContext);
-
- this.requestContext = requestContext.clone();
- this.certEntries = certificates;
- }
-
T13CertificateMessage(HandshakeContext handshakeContext,
ByteBuffer m) throws IOException {
super(handshakeContext);
@@ -925,16 +917,26 @@ final class CertificateMessage {
HandshakeMessage message) throws IOException {
// The producing happens in handshake context only.
HandshakeContext hc = (HandshakeContext)context;
- if (hc.sslConfig.isClientMode) {
- return onProduceCertificate(
- (ClientHandshakeContext)context, message);
- } else {
- return onProduceCertificate(
+ T13CertificateMessage cm = hc.sslConfig.isClientMode ?
+ onProduceCertificate(
+ (ClientHandshakeContext)context, message) :
+ onProduceCertificate(
(ServerHandshakeContext)context, message);
+
+ // Output the handshake message.
+ if (hc.certDeflater == null) {
+ cm.write(hc.handshakeOutput);
+ hc.handshakeOutput.flush();
+ } else {
+ // Replace with CompressedCertificate message
+ CompressedCertificate.handshakeProducer.produce(hc, cm);
}
+
+ // The handshake message has been delivered.
+ return null;
}
- private byte[] onProduceCertificate(ServerHandshakeContext shc,
+ private T13CertificateMessage onProduceCertificate(ServerHandshakeContext shc,
HandshakeMessage message) throws IOException {
ClientHelloMessage clientHello = (ClientHelloMessage)message;
@@ -993,12 +995,7 @@ final class CertificateMessage {
SSLLogger.fine("Produced server Certificate message", cm);
}
- // Output the handshake message.
- cm.write(shc.handshakeOutput);
- shc.handshakeOutput.flush();
-
- // The handshake message has been delivered.
- return null;
+ return cm;
}
private static SSLPossession choosePossession(
@@ -1045,7 +1042,7 @@ final class CertificateMessage {
return pos;
}
- private byte[] onProduceCertificate(ClientHandshakeContext chc,
+ private T13CertificateMessage onProduceCertificate(ClientHandshakeContext chc,
HandshakeMessage message) throws IOException {
ClientHelloMessage clientHello = (ClientHelloMessage)message;
SSLPossession pos = choosePossession(chc, clientHello);
@@ -1091,12 +1088,7 @@ final class CertificateMessage {
SSLLogger.fine("Produced client Certificate message", cm);
}
- // Output the handshake message.
- cm.write(chc.handshakeOutput);
- chc.handshakeOutput.flush();
-
- // The handshake message has been delivered.
- return null;
+ return cm;
}
}
@@ -1116,6 +1108,7 @@ final class CertificateMessage {
HandshakeContext hc = (HandshakeContext)context;
// clean up this consumer
+ hc.handshakeConsumers.remove(SSLHandshake.COMPRESSED_CERTIFICATE.id);
hc.handshakeConsumers.remove(SSLHandshake.CERTIFICATE.id);
// Ensure that the Certificate message has not been sent w/o
diff --git a/src/java.base/share/classes/sun/security/ssl/CertificateRequest.java b/src/java.base/share/classes/sun/security/ssl/CertificateRequest.java
index 039399560cd..2eceb4d9ebd 100644
--- a/src/java.base/share/classes/sun/security/ssl/CertificateRequest.java
+++ b/src/java.base/share/classes/sun/security/ssl/CertificateRequest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -956,6 +956,11 @@ final class CertificateRequest {
// update
//
shc.certRequestContext = crm.requestContext.clone();
+ if (shc.certInflaters != null && !shc.certInflaters.isEmpty()) {
+ shc.handshakeConsumers.put(
+ SSLHandshake.COMPRESSED_CERTIFICATE.id,
+ SSLHandshake.COMPRESSED_CERTIFICATE);
+ }
shc.handshakeConsumers.put(SSLHandshake.CERTIFICATE.id,
SSLHandshake.CERTIFICATE);
shc.handshakeConsumers.put(SSLHandshake.CERTIFICATE_VERIFY.id,
diff --git a/src/java.base/share/classes/sun/security/ssl/CompressCertExtension.java b/src/java.base/share/classes/sun/security/ssl/CompressCertExtension.java
new file mode 100644
index 00000000000..eff97857ef0
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/ssl/CompressCertExtension.java
@@ -0,0 +1,306 @@
+/*
+ * Copyright (C) 2022 THL A29 Limited, a Tencent company. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * 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.security.ssl;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.text.MessageFormat;
+import java.util.Locale;
+import java.util.Map;
+import java.util.function.Function;
+import javax.net.ssl.SSLProtocolException;
+import sun.security.ssl.SSLExtension.ExtensionConsumer;
+import sun.security.ssl.SSLExtension.SSLExtensionSpec;
+import sun.security.ssl.SSLHandshake.HandshakeMessage;
+
+/**
+ * Pack of the "compress_certificate" extensions [RFC 5246].
+ */
+final class CompressCertExtension {
+
+ static final HandshakeProducer chNetworkProducer =
+ new CHCompressCertificateProducer();
+ static final ExtensionConsumer chOnLoadConsumer =
+ new CHCompressCertificateConsumer();
+
+ static final HandshakeProducer crNetworkProducer =
+ new CRCompressCertificateProducer();
+ static final ExtensionConsumer crOnLoadConsumer =
+ new CRCompressCertificateConsumer();
+
+ static final SSLStringizer ccStringizer =
+ new CompressCertificateStringizer();
+
+ /**
+ * The "signature_algorithms" extension.
+ */
+ static final class CertCompressionSpec implements SSLExtensionSpec {
+
+ private final int[] compressionAlgorithms; // non-null
+
+ CertCompressionSpec(
+ Map> certInflaters) {
+ compressionAlgorithms = new int[certInflaters.size()];
+ int i = 0;
+ for (Integer id : certInflaters.keySet()) {
+ compressionAlgorithms[i++] = id;
+ }
+ }
+
+ CertCompressionSpec(HandshakeContext hc,
+ ByteBuffer buffer) throws IOException {
+ if (buffer.remaining() < 2) { // 2: the length of the list
+ throw hc.conContext.fatal(Alert.DECODE_ERROR,
+ new SSLProtocolException(
+ "Invalid compress_certificate: insufficient data"));
+ }
+
+ byte[] algs = Record.getBytes8(buffer);
+ if (buffer.hasRemaining()) {
+ throw hc.conContext.fatal(Alert.DECODE_ERROR,
+ new SSLProtocolException(
+ "Invalid compress_certificate: unknown extra data"));
+ }
+
+ if (algs.length == 0 || (algs.length & 0x01) != 0) {
+ throw hc.conContext.fatal(Alert.DECODE_ERROR,
+ new SSLProtocolException(
+ "Invalid compress_certificate: incomplete data"));
+ }
+
+ int[] compressionAlgs = new int[algs.length / 2];
+ for (int i = 0, j = 0; i < algs.length; ) {
+ byte hash = algs[i++];
+ byte sign = algs[i++];
+ compressionAlgs[j++] = ((hash & 0xFF) << 8) | (sign & 0xFF);
+ }
+
+ this.compressionAlgorithms = compressionAlgs;
+ }
+
+ @Override
+ public String toString() {
+ MessageFormat messageFormat = new MessageFormat(
+ "\"compression algorithms\": '['{0}']'", Locale.ENGLISH);
+
+ if (compressionAlgorithms.length == 0) {
+ Object[] messageFields = {
+ ""
+ };
+ return messageFormat.format(messageFields);
+ } else {
+ StringBuilder builder = new StringBuilder(512);
+ boolean isFirst = true;
+ for (int ca : compressionAlgorithms) {
+ if (isFirst) {
+ isFirst = false;
+ } else {
+ builder.append(", ");
+ }
+
+ builder.append(CompressionAlgorithm.nameOf(ca));
+ }
+
+ Object[] messageFields = {
+ builder.toString()
+ };
+
+ return messageFormat.format(messageFields);
+ }
+ }
+ }
+
+ private static final
+ class CompressCertificateStringizer implements SSLStringizer {
+
+ @Override
+ public String toString(HandshakeContext hc, ByteBuffer buffer) {
+ try {
+ return (new CertCompressionSpec(hc, buffer)).toString();
+ } catch (IOException ioe) {
+ // For debug logging only, so please swallow exceptions.
+ return ioe.getMessage();
+ }
+ }
+ }
+
+ /**
+ * Network data producer of a "compress_certificate" extension in
+ * the ClientHello handshake message.
+ */
+ private static final
+ class CHCompressCertificateProducer implements HandshakeProducer {
+
+ // Prevent instantiation of this class.
+ private CHCompressCertificateProducer() {
+ // blank
+ }
+
+ @Override
+ public byte[] produce(ConnectionContext context,
+ HandshakeMessage message) throws IOException {
+ // The producing happens in client side only.
+ return produceCompCertExt(context,
+ SSLExtension.CH_COMPRESS_CERTIFICATE);
+ }
+ }
+
+ /**
+ * Network data consumer of a "compress_certificate" extension in
+ * the ClientHello handshake message.
+ */
+ private static final
+ class CHCompressCertificateConsumer implements ExtensionConsumer {
+
+ // Prevent instantiation of this class.
+ private CHCompressCertificateConsumer() {
+ // blank
+ }
+
+ @Override
+ public void consume(ConnectionContext context,
+ HandshakeMessage message, ByteBuffer buffer)
+ throws IOException {
+ // The consuming happens in server side only.
+ consumeCompCertExt(context, buffer,
+ SSLExtension.CH_COMPRESS_CERTIFICATE);
+ }
+ }
+
+ /**
+ * Network data producer of a "compress_certificate" extension in
+ * the CertificateRequest handshake message.
+ */
+ private static final
+ class CRCompressCertificateProducer implements HandshakeProducer {
+
+ // Prevent instantiation of this class.
+ private CRCompressCertificateProducer() {
+ // blank
+ }
+
+ @Override
+ public byte[] produce(ConnectionContext context,
+ HandshakeMessage message) throws IOException {
+ // The producing happens in server side only.
+ return produceCompCertExt(context,
+ SSLExtension.CR_COMPRESS_CERTIFICATE);
+ }
+ }
+
+ /**
+ * Network data consumer of a "compress_certificate" extension in
+ * the CertificateRequest handshake message.
+ */
+ private static final
+ class CRCompressCertificateConsumer implements ExtensionConsumer {
+
+ // Prevent instantiation of this class.
+ private CRCompressCertificateConsumer() {
+ // blank
+ }
+
+ @Override
+ public void consume(ConnectionContext context,
+ HandshakeMessage message, ByteBuffer buffer)
+ throws IOException {
+ // The consuming happens in client side only.
+ consumeCompCertExt(context, buffer,
+ SSLExtension.CR_COMPRESS_CERTIFICATE);
+ }
+ }
+
+ private static byte[] produceCompCertExt(
+ ConnectionContext context, SSLExtension extension)
+ throws IOException {
+
+ HandshakeContext hc = (HandshakeContext) context;
+ // Is it a supported and enabled extension?
+ if (!hc.sslConfig.isAvailable(extension)) {
+ if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
+ SSLLogger.fine("Ignore unavailable " +
+ "compress_certificate extension");
+ }
+ return null;
+ }
+
+ // Produce the extension.
+ hc.certInflaters = CompressionAlgorithm.getInflaters();
+
+ if (hc.certInflaters.isEmpty()) {
+ if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
+ SSLLogger.warning("Unable to produce the extension: "
+ + "no certificate compression inflaters defined");
+ }
+ return null;
+ }
+
+ int vectorLen = CompressionAlgorithm.sizeInRecord() *
+ hc.certInflaters.size();
+ byte[] extData = new byte[vectorLen + 1];
+ ByteBuffer m = ByteBuffer.wrap(extData);
+ Record.putInt8(m, vectorLen);
+ for (Integer algId : hc.certInflaters.keySet()) {
+ Record.putInt16(m, algId);
+ }
+
+ // Update the context.
+ hc.handshakeExtensions.put(
+ extension, new CertCompressionSpec(hc.certInflaters));
+
+ return extData;
+ }
+
+ private static void consumeCompCertExt(ConnectionContext context,
+ ByteBuffer buffer, SSLExtension extension) throws IOException {
+
+ HandshakeContext hc = (HandshakeContext) context;
+ // Is it a supported and enabled extension?
+ if (!hc.sslConfig.isAvailable(extension)) {
+ if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
+ SSLLogger.fine("Ignore unavailable " +
+ "compress_certificate extension");
+ }
+ return; // ignore the extension
+ }
+
+ // Parse the extension.
+ CertCompressionSpec spec = new CertCompressionSpec(hc, buffer);
+
+ // Update the context.
+ hc.certDeflater = CompressionAlgorithm.selectDeflater(
+ spec.compressionAlgorithms);
+
+ if (hc.certDeflater == null) {
+ if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
+ SSLLogger.fine("Ignore, no supported " +
+ "certificate compression algorithms");
+ }
+ }
+ // No impact on session resumption.
+ }
+}
diff --git a/src/java.base/share/classes/sun/security/ssl/CompressedCertificate.java b/src/java.base/share/classes/sun/security/ssl/CompressedCertificate.java
new file mode 100644
index 00000000000..067a0344c9d
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/ssl/CompressedCertificate.java
@@ -0,0 +1,264 @@
+/*
+ * Copyright (C) 2022 THL A29 Limited, a Tencent company. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * 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.security.ssl;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.text.MessageFormat;
+import java.util.Locale;
+import java.util.function.Function;
+import javax.net.ssl.SSLProtocolException;
+import sun.security.ssl.SSLHandshake.HandshakeMessage;
+import sun.security.util.Cache;
+import sun.security.util.Cache.EqualByteArray;
+import sun.security.util.HexDumpEncoder;
+
+/**
+ * Pack of the CompressedCertificate handshake message.
+ */
+final class CompressedCertificate {
+
+ static final SSLConsumer handshakeConsumer =
+ new CompressedCertConsumer();
+ static final HandshakeProducer handshakeProducer =
+ new CompressedCertProducer();
+
+ record CompCertCacheKey(EqualByteArray eba, int algId) {}
+
+ /**
+ * The CompressedCertificate handshake message for TLS 1.3.
+ */
+ static final class CompressedCertMessage extends HandshakeMessage {
+
+ private final int algorithmId;
+ private final int uncompressedLength;
+ private final byte[] compressedCert;
+
+ CompressedCertMessage(HandshakeContext context,
+ int algorithmId, int uncompressedLength,
+ byte[] compressedCert) {
+ super(context);
+
+ this.algorithmId = algorithmId;
+ this.uncompressedLength = uncompressedLength;
+ this.compressedCert = compressedCert;
+ }
+
+ CompressedCertMessage(HandshakeContext handshakeContext,
+ ByteBuffer m) throws IOException {
+ super(handshakeContext);
+
+ // struct {
+ // CertificateCompressionAlgorithm algorithm;
+ // uint24 uncompressed_length;
+ // opaque compressed_certificate_message<1..2^24-1>;
+ // } CompressedCertificate;
+ if (m.remaining() < 9) {
+ throw new SSLProtocolException(
+ "Invalid CompressedCertificate message: " +
+ "insufficient data (length=" + m.remaining()
+ + ")");
+ }
+ this.algorithmId = Record.getInt16(m);
+ this.uncompressedLength = Record.getInt24(m);
+ this.compressedCert = Record.getBytes24(m);
+
+ if (m.hasRemaining()) {
+ throw handshakeContext.conContext.fatal(
+ Alert.HANDSHAKE_FAILURE,
+ "Invalid CompressedCertificate message: " +
+ "unknown extra data");
+ }
+ }
+
+ @Override
+ public SSLHandshake handshakeType() {
+ return SSLHandshake.COMPRESSED_CERTIFICATE;
+ }
+
+ @Override
+ public int messageLength() {
+ return 8 + compressedCert.length;
+ }
+
+ @Override
+ public void send(HandshakeOutStream hos) throws IOException {
+ hos.putInt16(algorithmId);
+ hos.putInt24(uncompressedLength);
+ hos.putBytes24(compressedCert);
+ }
+
+ @Override
+ public String toString() {
+ MessageFormat messageFormat = new MessageFormat(
+ """
+ "CompressedCertificate": '{'
+ "algorithm": "{0}",
+ "uncompressed_length": {1}
+ "compressed_certificate_message": [
+ {2}
+ ]
+ '}'""",
+ Locale.ENGLISH);
+
+ HexDumpEncoder hexEncoder = new HexDumpEncoder();
+ Object[] messageFields = {
+ CompressionAlgorithm.nameOf(algorithmId),
+ uncompressedLength,
+ Utilities.indent(hexEncoder.encode(compressedCert), " ")
+ };
+
+ return messageFormat.format(messageFields);
+ }
+ }
+
+ /**
+ * The "CompressedCertificate" handshake message producer for TLS 1.3.
+ */
+ private static final
+ class CompressedCertProducer implements HandshakeProducer {
+
+ // Prevent instantiation of this class.
+ private CompressedCertProducer() {
+ // blank
+ }
+
+ // Note this is a special producer, which can only be called from
+ // the CertificateMessage producer. The input 'message' parameter
+ // represents the Certificate handshake message.
+ @Override
+ public byte[] produce(ConnectionContext context,
+ HandshakeMessage message) throws IOException {
+ // The producing happens in handshake context only.
+ HandshakeContext hc = (HandshakeContext) context;
+
+ // Compress the Certificate message.
+ HandshakeOutStream hos = new HandshakeOutStream(null);
+ message.send(hos);
+ byte[] certMsg = hos.toByteArray();
+ byte[] compressedCertMsg;
+
+ // First byte is the size of certificate_request_context which
+ // should be random if present. Don't cache a randomized message.
+ if (certMsg[0] != 0) {
+ compressedCertMsg = hc.certDeflater.getValue().apply(certMsg);
+ } else {
+ Cache cache =
+ hc.sslContext.getCompCertCache();
+ CompCertCacheKey key = new CompCertCacheKey(
+ new EqualByteArray(certMsg), hc.certDeflater.getKey());
+ compressedCertMsg = cache.get(key);
+
+ if (compressedCertMsg == null) {
+ compressedCertMsg =
+ hc.certDeflater.getValue().apply(certMsg);
+
+ if (SSLLogger.isOn()
+ && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
+ SSLLogger.fine("Caching CompressedCertificate message");
+ }
+
+ cache.put(key, compressedCertMsg);
+ }
+ }
+
+ if (compressedCertMsg == null || compressedCertMsg.length == 0) {
+ throw hc.conContext.fatal(Alert.HANDSHAKE_FAILURE,
+ "No compressed Certificate data");
+ }
+
+ CompressedCertMessage ccm = new CompressedCertMessage(hc,
+ hc.certDeflater.getKey(), certMsg.length,
+ compressedCertMsg);
+
+ if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
+ SSLLogger.fine(
+ "Produced CompressedCertificate handshake message",
+ ccm);
+ }
+
+ ccm.write(hc.handshakeOutput);
+ hc.handshakeOutput.flush();
+
+ // The handshake message has been delivered.
+ return null;
+ }
+ }
+
+ /**
+ * The "CompressedCertificate" handshake message consumer for TLS 1.3.
+ */
+ private static final class CompressedCertConsumer implements SSLConsumer {
+
+ // Prevent instantiation of this class.
+ private CompressedCertConsumer() {
+ // blank
+ }
+
+ @Override
+ public void consume(ConnectionContext context,
+ ByteBuffer message) throws IOException {
+ // The consuming happens in handshake context only.
+ HandshakeContext hc = (HandshakeContext) context;
+
+ // clean up this consumer
+ hc.handshakeConsumers.remove(
+ SSLHandshake.COMPRESSED_CERTIFICATE.id);
+ hc.handshakeConsumers.remove(SSLHandshake.CERTIFICATE.id);
+
+ // Parse the handshake message
+ CompressedCertMessage ccm = new CompressedCertMessage(hc, message);
+ if (SSLLogger.isOn() && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
+ SSLLogger.fine(
+ "Consuming CompressedCertificate handshake message",
+ ccm);
+ }
+
+ // check the compression algorithm
+ Function inflater =
+ hc.certInflaters.get(ccm.algorithmId);
+ if (inflater == null) {
+ throw hc.conContext.fatal(Alert.BAD_CERTIFICATE,
+ "Unsupported certificate compression algorithm");
+ }
+
+ // decompress
+ byte[] certificateMessage = inflater.apply(ccm.compressedCert);
+
+ // check the uncompressed length
+ if (certificateMessage == null ||
+ certificateMessage.length != ccm.uncompressedLength) {
+ throw hc.conContext.fatal(Alert.BAD_CERTIFICATE,
+ "Improper certificate compression");
+ }
+
+ // Call the Certificate handshake message consumer.
+ CertificateMessage.t13HandshakeConsumer.consume(hc,
+ ByteBuffer.wrap(certificateMessage));
+ }
+ }
+}
diff --git a/src/java.base/share/classes/sun/security/ssl/CompressionAlgorithm.java b/src/java.base/share/classes/sun/security/ssl/CompressionAlgorithm.java
new file mode 100644
index 00000000000..3e9ef154424
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/ssl/CompressionAlgorithm.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright (C) 2022 THL A29 Limited, a Tencent company. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+ * 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.security.ssl;
+
+import java.io.ByteArrayOutputStream;
+import java.util.AbstractMap;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.zip.Deflater;
+import java.util.zip.Inflater;
+
+/**
+ * Enum for TLS certificate compression algorithms.
+ * This class also defines internally supported inflate/deflate functions.
+ */
+
+enum CompressionAlgorithm {
+ ZLIB(1); // Currently only ZLIB is supported.
+
+ final int id;
+
+ CompressionAlgorithm(int id) {
+ this.id = id;
+ }
+
+ static CompressionAlgorithm nameOf(int id) {
+ for (CompressionAlgorithm ca : CompressionAlgorithm.values()) {
+ if (ca.id == id) {
+ return ca;
+ }
+ }
+
+ return null;
+ }
+
+ // Return the size of a compression algorithms structure in TLS record.
+ static int sizeInRecord() {
+ return 2;
+ }
+
+ // The size of compression/decompression buffer.
+ private static final int BUF_SIZE = 1024;
+
+ private static final Map> DEFLATORS =
+ Map.of(ZLIB.id, (input) -> {
+ try (Deflater deflater = new Deflater();
+ ByteArrayOutputStream outputStream =
+ new ByteArrayOutputStream(input.length)) {
+
+ deflater.setInput(input);
+ deflater.finish();
+ byte[] buffer = new byte[BUF_SIZE];
+
+ while (!deflater.finished()) {
+ int compressedSize = deflater.deflate(buffer);
+ outputStream.write(buffer, 0, compressedSize);
+ }
+
+ return outputStream.toByteArray();
+ } catch (Exception e) {
+ if (SSLLogger.isOn()
+ && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
+ SSLLogger.warning("Exception during certificate "
+ + "compression: ", e);
+ }
+ return null;
+ }
+ });
+
+ static Map.Entry> selectDeflater(
+ int[] compressionAlgorithmIds) {
+
+ for (var entry : DEFLATORS.entrySet()) {
+ for (int id : compressionAlgorithmIds) {
+ if (id == entry.getKey()) {
+ return new AbstractMap.SimpleImmutableEntry<>(entry);
+ }
+ }
+ }
+
+ return null;
+ }
+
+ private static final Map> INFLATORS =
+ Map.of(ZLIB.id, (input) -> {
+ try (Inflater inflater = new Inflater();
+ ByteArrayOutputStream outputStream =
+ new ByteArrayOutputStream(input.length)) {
+
+ inflater.setInput(input);
+ byte[] buffer = new byte[BUF_SIZE];
+
+ while (!inflater.finished()) {
+ int decompressedSize = inflater.inflate(buffer);
+
+ if (decompressedSize == 0) {
+ if (inflater.needsDictionary()) {
+ if (SSLLogger.isOn()
+ && SSLLogger.isOn(
+ SSLLogger.Opt.HANDSHAKE)) {
+ SSLLogger.warning("Compressed input "
+ + "requires a dictionary");
+ }
+
+ return null;
+ }
+
+ if (inflater.needsInput()) {
+ if (SSLLogger.isOn()
+ && SSLLogger.isOn(
+ SSLLogger.Opt.HANDSHAKE)) {
+ SSLLogger.warning(
+ "Incomplete compressed input");
+ }
+
+ return null;
+ }
+
+ // Else just break the loop.
+ break;
+ }
+
+ outputStream.write(buffer, 0, decompressedSize);
+
+ // Bound the memory usage.
+ if (outputStream.size()
+ > SSLConfiguration.maxHandshakeMessageSize) {
+ if (SSLLogger.isOn()
+ && SSLLogger.isOn(
+ SSLLogger.Opt.HANDSHAKE)) {
+ SSLLogger.warning("The size of the "
+ + "uncompressed certificate message "
+ + "exceeds maximum allowed size of "
+ + SSLConfiguration.maxHandshakeMessageSize
+ + " bytes; compressed size: "
+ + input.length);
+ }
+
+ return null;
+ }
+ }
+
+ return outputStream.toByteArray();
+ } catch (Exception e) {
+ if (SSLLogger.isOn()
+ && SSLLogger.isOn(SSLLogger.Opt.HANDSHAKE)) {
+ SSLLogger.warning(
+ "Exception during certificate decompression: ",
+ e);
+ }
+ return null;
+ }
+ });
+
+ static Map> getInflaters() {
+ return INFLATORS;
+ }
+}
diff --git a/src/java.base/share/classes/sun/security/ssl/HandshakeContext.java b/src/java.base/share/classes/sun/security/ssl/HandshakeContext.java
index 54a2650c058..fbf2c00bbb4 100644
--- a/src/java.base/share/classes/sun/security/ssl/HandshakeContext.java
+++ b/src/java.base/share/classes/sun/security/ssl/HandshakeContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
* 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.AlgorithmConstraints;
import java.security.CryptoPrimitive;
import java.util.*;
import java.util.AbstractMap.SimpleImmutableEntry;
+import java.util.function.Function;
import javax.crypto.SecretKey;
import javax.net.ssl.SNIServerName;
import javax.net.ssl.SSLHandshakeException;
@@ -131,6 +132,10 @@ abstract class HandshakeContext implements ConnectionContext {
List peerRequestedSignatureSchemes;
List peerRequestedCertSignSchemes;
+ // CertificateCompressionAlgorithm
+ Map> certInflaters;
+ Map.Entry> certDeflater;
+
// Known authorities
X500Principal[] peerSupportedAuthorities = null;
diff --git a/src/java.base/share/classes/sun/security/ssl/QuicTLSEngineImpl.java b/src/java.base/share/classes/sun/security/ssl/QuicTLSEngineImpl.java
index b5f1eff179c..3384bf5f089 100644
--- a/src/java.base/share/classes/sun/security/ssl/QuicTLSEngineImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/QuicTLSEngineImpl.java
@@ -73,6 +73,7 @@ public final class QuicTLSEngineImpl implements QuicTLSEngine, SSLTransport {
SSLHandshake.ENCRYPTED_EXTENSIONS.id, HANDSHAKE,
SSLHandshake.CERTIFICATE_REQUEST.id, HANDSHAKE,
SSLHandshake.CERTIFICATE.id, HANDSHAKE,
+ SSLHandshake.COMPRESSED_CERTIFICATE.id, HANDSHAKE,
SSLHandshake.CERTIFICATE_VERIFY.id, HANDSHAKE,
SSLHandshake.FINISHED.id, HANDSHAKE,
SSLHandshake.NEW_SESSION_TICKET.id, ONE_RTT);
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
index a1cc3ee112f..fdeb94bb496 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
@@ -34,7 +34,9 @@ import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
import javax.net.ssl.*;
import sun.security.provider.certpath.AlgorithmChecker;
+import sun.security.ssl.CompressedCertificate.CompCertCacheKey;
import sun.security.ssl.SSLAlgorithmConstraints.SIGNATURE_CONSTRAINTS_MODE;
+import sun.security.util.Cache;
import sun.security.validator.Validator;
/**
@@ -73,6 +75,10 @@ public abstract class SSLContextImpl extends SSLContextSpi {
private final ReentrantLock contextLock = new ReentrantLock();
+ // Avoid compressing local certificates repeatedly for every handshake.
+ private final Cache compCertCache =
+ Cache.newSoftMemoryCache(12);
+
SSLContextImpl() {
ephemeralKeyManager = new EphemeralKeyManager();
clientCache = new SSLSessionContextImpl(false);
@@ -225,6 +231,10 @@ public abstract class SSLContextImpl extends SSLContextSpi {
return ephemeralKeyManager;
}
+ Cache getCompCertCache() {
+ return compCertCache;
+ }
+
// Used for DTLS in server mode only.
HelloCookieManager getHelloCookieManager(ProtocolVersion protocolVersion) {
if (helloCookieManagerBuilder == null) {
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 aacb9420748..b13edc0359c 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, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -270,6 +270,27 @@ enum SSLExtension implements SSLStringizer {
// Extensions defined in RFC 7924 (TLS Cached Information Extension)
CACHED_INFO (0x0019, "cached_info"),
+ // Extensions defined in RFC 8879 (TLS Certificate Compression)
+ CH_COMPRESS_CERTIFICATE (0x001B, "compress_certificate",
+ SSLHandshake.CLIENT_HELLO,
+ ProtocolVersion.PROTOCOLS_OF_13,
+ CompressCertExtension.chNetworkProducer,
+ CompressCertExtension.chOnLoadConsumer,
+ null,
+ null,
+ null,
+ CompressCertExtension.ccStringizer),
+
+ CR_COMPRESS_CERTIFICATE (0x001B, "compress_certificate",
+ SSLHandshake.CERTIFICATE_REQUEST,
+ ProtocolVersion.PROTOCOLS_OF_13,
+ CompressCertExtension.crNetworkProducer,
+ CompressCertExtension.crOnLoadConsumer,
+ null,
+ null,
+ null,
+ CompressCertExtension.ccStringizer),
+
// Extensions defined in RFC 5077 (TLS Session Resumption without Server-Side State)
CH_SESSION_TICKET (0x0023, "session_ticket",
SSLHandshake.CLIENT_HELLO,
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLHandshake.java b/src/java.base/share/classes/sun/security/ssl/SSLHandshake.java
index 7c78f6c3005..2c6b58bafa5 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLHandshake.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLHandshake.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -370,7 +370,22 @@ enum SSLHandshake implements SSLConsumer, HandshakeProducer {
}),
// RFC 8879 - TLS Certificate Compression
- COMPRESSED_CERTIFICATE ((byte)0x19, "compressed_certificate"),
+ @SuppressWarnings({"unchecked", "rawtypes"})
+ COMPRESSED_CERTIFICATE ((byte)0x19, "compressed_certificate",
+ (new Map.Entry[] {
+ new SimpleImmutableEntry<>(
+ CompressedCertificate.handshakeConsumer,
+ ProtocolVersion.PROTOCOLS_OF_13
+ )
+ }),
+ (new Map.Entry[] {
+ // Note that the producing of this message is delegated to
+ // CertificateMessage producer.
+ new SimpleImmutableEntry<>(
+ CertificateMessage.t13HandshakeProducer,
+ ProtocolVersion.PROTOCOLS_OF_13
+ )
+ })),
// RFC 8870 - Encrypted Key Transport for DTLS/Secure RTP
EKT_KEY ((byte)0x1A, "ekt_key"),
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
index f603cc22949..cef2f43526a 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,13 +28,13 @@ package sun.security.ssl;
import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InterruptedIOException;
import java.io.OutputStream;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketAddress;
import java.net.SocketException;
+import java.net.SocketTimeoutException;
import java.nio.ByteBuffer;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -77,10 +77,10 @@ public final class SSLSocketImpl
/**
* ERROR HANDLING GUIDELINES
* (which exceptions to throw and catch and which not to throw and catch)
- *
+ *
* - if there is an IOException (SocketException) when accessing the
* underlying Socket, pass it through
- *
+ *
* - do not throw IOExceptions, throw SSLExceptions (or a subclass)
*/
@@ -454,12 +454,12 @@ public final class SSLSocketImpl
if (!conContext.isNegotiated) {
readHandshakeRecord();
}
- } catch (InterruptedIOException iioe) {
+ } catch (SocketTimeoutException e) {
if(resumable){
- handleException(iioe);
+ handleException(e);
} else{
throw conContext.fatal(Alert.HANDSHAKE_FAILURE,
- "Couldn't kickstart handshaking", iioe);
+ "Couldn't kickstart handshaking", e);
}
} catch (SocketException se) {
handleException(se);
@@ -1427,7 +1427,7 @@ public final class SSLSocketImpl
return 0;
}
} catch (SSLException |
- InterruptedIOException | SocketException se) {
+ SocketTimeoutException | SocketException se) {
// Don't change exception in case of timeouts or interrupts
// or SocketException.
throw se;
@@ -1486,7 +1486,7 @@ public final class SSLSocketImpl
return buffer;
}
} catch (SSLException |
- InterruptedIOException | SocketException se) {
+ SocketTimeoutException | SocketException se) {
// Don't change exception in case of timeouts or interrupts
// or SocketException.
throw se;
@@ -1677,40 +1677,23 @@ public final class SSLSocketImpl
SSLLogger.warning("handling exception", cause);
}
- // Don't close the Socket in case of timeouts or interrupts.
- if (cause instanceof InterruptedIOException) {
- throw (IOException)cause;
- }
-
- // need to perform error shutdown
- boolean isSSLException = (cause instanceof SSLException);
- Alert alert;
- if (isSSLException) {
- if (cause instanceof SSLHandshakeException) {
- alert = Alert.HANDSHAKE_FAILURE;
- } else {
- alert = Alert.UNEXPECTED_MESSAGE;
+ throw switch (cause) {
+ // Don't close the Socket in case of timeouts.
+ case SocketTimeoutException ste -> ste;
+ // Send TLS alert with "fatal", then throw the socket exception.
+ case SocketException se -> {
+ try {
+ throw conContext.fatal(Alert.UNEXPECTED_MESSAGE, se);
+ } catch (Exception _) {
+ }
+ yield se;
}
- } else {
- if (cause instanceof IOException) {
- alert = Alert.UNEXPECTED_MESSAGE;
- } else {
- // RuntimeException
- alert = Alert.INTERNAL_ERROR;
- }
- }
-
- if (cause instanceof SocketException) {
- try {
- throw conContext.fatal(alert, cause);
- } catch (Exception e) {
- // Just delivering the fatal alert, re-throw the socket exception instead.
- }
-
- throw (SocketException)cause;
- }
-
- throw conContext.fatal(alert, cause);
+ case SSLHandshakeException sslhe ->
+ conContext.fatal(Alert.HANDSHAKE_FAILURE, sslhe);
+ case IOException ioe ->
+ conContext.fatal(Alert.UNEXPECTED_MESSAGE, ioe);
+ default -> conContext.fatal(Alert.INTERNAL_ERROR, cause);
+ };
}
private Plaintext handleEOF(EOFException eofe) throws IOException {
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java b/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java
index fd9c4b171e7..fc3d9733150 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, Azul Systems, Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -27,10 +27,10 @@
package sun.security.ssl;
import java.io.EOFException;
-import java.io.InterruptedIOException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.net.SocketTimeoutException;
import java.nio.ByteBuffer;
import java.security.GeneralSecurityException;
import java.util.ArrayList;
@@ -180,7 +180,7 @@ final class SSLSocketInputRecord extends InputRecord implements SSLRecord {
if (plaintext == null) {
plaintext = decodeInputRecord();
}
- } catch(InterruptedIOException e) {
+ } catch (SocketTimeoutException e) {
// do not clean header and recordBody in case of Socket Timeout
cleanInBuffer = false;
throw e;
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLTransport.java b/src/java.base/share/classes/sun/security/ssl/SSLTransport.java
index 50bff1e6d21..02551b4a8c1 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLTransport.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLTransport.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,8 @@ package sun.security.ssl;
import java.io.EOFException;
import java.io.IOException;
-import java.io.InterruptedIOException;
import java.net.SocketException;
+import java.net.SocketTimeoutException;
import java.nio.ByteBuffer;
import javax.crypto.AEADBadTagException;
import javax.crypto.BadPaddingException;
@@ -138,7 +138,7 @@ interface SSLTransport {
} catch (EOFException eofe) {
// rethrow EOFException, the call will handle it if needed.
throw eofe;
- } catch (InterruptedIOException | SocketException se) {
+ } catch (SocketTimeoutException | SocketException se) {
// don't close the Socket in case of timeouts or interrupts or SocketException.
throw se;
} catch (IOException ioe) {
diff --git a/src/java.base/share/classes/sun/security/ssl/ServerHello.java b/src/java.base/share/classes/sun/security/ssl/ServerHello.java
index 6980c216697..4bd2b0a059f 100644
--- a/src/java.base/share/classes/sun/security/ssl/ServerHello.java
+++ b/src/java.base/share/classes/sun/security/ssl/ServerHello.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1461,6 +1461,11 @@ final class ServerHello {
chc.handshakeConsumers.put(
SSLHandshake.CERTIFICATE_REQUEST.id,
SSLHandshake.CERTIFICATE_REQUEST);
+ if (chc.certInflaters != null && !chc.certInflaters.isEmpty()) {
+ chc.handshakeConsumers.put(
+ SSLHandshake.COMPRESSED_CERTIFICATE.id,
+ SSLHandshake.COMPRESSED_CERTIFICATE);
+ }
chc.handshakeConsumers.put(
SSLHandshake.CERTIFICATE.id,
SSLHandshake.CERTIFICATE);
diff --git a/src/java.base/share/classes/sun/security/util/KeyUtil.java b/src/java.base/share/classes/sun/security/util/KeyUtil.java
index 942a91d61b8..e9dabdc5b06 100644
--- a/src/java.base/share/classes/sun/security/util/KeyUtil.java
+++ b/src/java.base/share/classes/sun/security/util/KeyUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -444,15 +444,16 @@ public final class KeyUtil {
// is the LMS public key for the top-level tree.
// Section 5.3: LMS public key is u32str(type) || u32str(otstype) || I || T[1]
// Section 8: type is the numeric identifier for an LMS specification.
- // This RFC defines 5 SHA-256 based types, value from 5 to 9.
if (rawKey.length < 8) {
throw new NoSuchAlgorithmException("Cannot decode public key");
}
int num = ((rawKey[4] & 0xff) << 24) + ((rawKey[5] & 0xff) << 16)
+ ((rawKey[6] & 0xff) << 8) + (rawKey[7] & 0xff);
return switch (num) {
- // RFC 8554 only supports SHA_256 hash algorithm
+ // RFC 8554 only supports SHA_256 hash algorithms
case 5, 6, 7, 8, 9 -> AlgorithmId.SHA256_oid;
+ // RFC 9858 supports SHAKE_256 hash algorithms
+ case 15, 16, 17, 18, 19 -> AlgorithmId.SHAKE256_512_oid;
default -> throw new NoSuchAlgorithmException("Unknown LMS type: " + num);
};
} catch (IOException e) {
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessible.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessible.java
index 5be7f70b981..4315abe6197 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessible.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessible.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,10 +188,6 @@ final class CAccessible extends CFRetainedResource implements Accessible {
// Do send check box state changes to native side
if (thisRole == AccessibleRole.CHECK_BOX) {
- if (!Objects.equals(newValue, oldValue)) {
- valueChanged(ptr);
- }
-
// Notify native side to handle check box style menuitem
if (parentRole == AccessibleRole.POPUP_MENU && newValue != null
&& ((AccessibleState)newValue) == AccessibleState.FOCUSED) {
@@ -201,23 +197,12 @@ final class CAccessible extends CFRetainedResource implements Accessible {
// Do send radio button state changes to native side
if (thisRole == AccessibleRole.RADIO_BUTTON) {
- if (newValue != null && !newValue.equals(oldValue)) {
- valueChanged(ptr);
- }
-
// Notify native side to handle radio button style menuitem
if (parentRole == AccessibleRole.POPUP_MENU && newValue != null
&& ((AccessibleState)newValue) == AccessibleState.FOCUSED) {
menuItemSelected(ptr);
}
}
-
- // Do send toggle button state changes to native side
- if (thisRole == AccessibleRole.TOGGLE_BUTTON) {
- if (!Objects.equals(newValue, oldValue)) {
- valueChanged(ptr);
- }
- }
} else if (name.equals(ACCESSIBLE_NAME_PROPERTY)) {
//for now trigger only for JTabbedPane.
if (e.getSource() instanceof JTabbedPane) {
@@ -227,7 +212,10 @@ final class CAccessible extends CFRetainedResource implements Accessible {
AccessibleRole thisRole = accessible.getAccessibleContext()
.getAccessibleRole();
if (thisRole == AccessibleRole.SLIDER ||
- thisRole == AccessibleRole.PROGRESS_BAR) {
+ thisRole == AccessibleRole.PROGRESS_BAR ||
+ thisRole == AccessibleRole.CHECK_BOX ||
+ thisRole == AccessibleRole.RADIO_BUTTON ||
+ thisRole == AccessibleRole.TOGGLE_BUTTON ) {
valueChanged(ptr);
}
}
diff --git a/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java b/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java
index f3569941321..78ae70629b6 100644
--- a/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java
+++ b/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java
@@ -57,15 +57,16 @@ import java.util.Map;
* Align bounds is a rect that defines how to align this to margins.
* it generally allows some overhang that logical bounds would prevent.
*/
-class ExtendedTextSourceLabel implements TextLineComponent, Decoration.Label {
+final class ExtendedTextSourceLabel implements TextLineComponent, Decoration.Label {
private final TextSource source;
private final Decoration decorator;
// caches
- private Font font;
- private AffineTransform baseTX;
- private CoreMetrics cm;
+ private final Font font;
+ private final AffineTransform baseTX;
+ private final CoreMetrics cm;
+ private final float advTracking;
private Rectangle2D lb;
private Rectangle2D ab;
@@ -74,34 +75,18 @@ class ExtendedTextSourceLabel implements TextLineComponent, Decoration.Label {
private StandardGlyphVector gv;
private float[] charinfo;
- private float advTracking;
-
/**
* Create from a TextSource.
*/
public ExtendedTextSourceLabel(TextSource source, Decoration decorator) {
this.source = source;
this.decorator = decorator;
- finishInit();
- }
-
- /**
- * Create from a TextSource, optionally using cached data from oldLabel starting at the offset.
- * If present oldLabel must have been created from a run of text that includes the text used in
- * the new label. Start in source corresponds to logical character offset in oldLabel.
- */
- public ExtendedTextSourceLabel(TextSource source, ExtendedTextSourceLabel oldLabel, int offset) {
- // currently no optimization.
- this.source = source;
- this.decorator = oldLabel.decorator;
- finishInit();
- }
-
- private void finishInit() {
- font = source.getFont();
+ Font font = source.getFont();
Map atts = font.getAttributes();
- baseTX = AttributeValues.getBaselineTransform(atts);
+ AffineTransform baseTX = AttributeValues.getBaselineTransform(atts);
+
+ CoreMetrics cm;
if (baseTX == null){
cm = source.getCoreMetrics();
} else {
@@ -110,13 +95,15 @@ class ExtendedTextSourceLabel implements TextLineComponent, Decoration.Label {
charTX = new AffineTransform();
}
font = font.deriveFont(charTX);
-
LineMetrics lm = font.getLineMetrics(source.getChars(), source.getStart(),
source.getStart() + source.getLength(), source.getFRC());
cm = CoreMetrics.get(lm);
}
- advTracking = font.getSize() * AttributeValues.getTracking(atts);
+ this.font = font;
+ this.baseTX = baseTX;
+ this.cm = cm;
+ this.advTracking = font.getSize() * AttributeValues.getTracking(atts);
}
/**
diff --git a/src/java.desktop/share/classes/sun/font/GlyphLayout.java b/src/java.desktop/share/classes/sun/font/GlyphLayout.java
index 5bff127f143..851201fe347 100644
--- a/src/java.desktop/share/classes/sun/font/GlyphLayout.java
+++ b/src/java.desktop/share/classes/sun/font/GlyphLayout.java
@@ -125,10 +125,10 @@ public final class GlyphLayout {
}
private static final class SDCache {
- public AffineTransform dtx;
- public AffineTransform gtx;
- public Point2D.Float delta;
- public FontStrikeDesc sd;
+ private final AffineTransform dtx;
+ private final AffineTransform gtx;
+ private final Point2D.Float delta;
+ private final FontStrikeDesc sd;
private SDCache(Font font, FontRenderContext frc) {
// !!! add getVectorTransform and hasVectorTransform to frc? then
diff --git a/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java b/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java
index 32728efde6c..b28723f94a6 100644
--- a/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java
+++ b/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java
@@ -33,24 +33,23 @@ import java.awt.HeadlessException;
import java.awt.KeyboardFocusManager;
import java.awt.Rectangle;
import java.awt.Shape;
+import java.awt.Window;
import java.awt.geom.AffineTransform;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
import java.awt.print.Book;
-import java.awt.print.Pageable;
import java.awt.print.PageFormat;
+import java.awt.print.Pageable;
import java.awt.print.Paper;
import java.awt.print.Printable;
import java.awt.print.PrinterAbortException;
import java.awt.print.PrinterException;
import java.awt.print.PrinterJob;
-import java.awt.Window;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Locale;
-import sun.awt.image.ByteInterleavedRaster;
import javax.print.Doc;
import javax.print.DocFlavor;
@@ -69,8 +68,8 @@ import javax.print.attribute.ResolutionSyntax;
import javax.print.attribute.Size2DSyntax;
import javax.print.attribute.standard.Copies;
import javax.print.attribute.standard.Destination;
-import javax.print.attribute.standard.DialogTypeSelection;
import javax.print.attribute.standard.DialogOwner;
+import javax.print.attribute.standard.DialogTypeSelection;
import javax.print.attribute.standard.Fidelity;
import javax.print.attribute.standard.JobName;
import javax.print.attribute.standard.JobSheets;
@@ -81,15 +80,17 @@ import javax.print.attribute.standard.MediaSizeName;
import javax.print.attribute.standard.OrientationRequested;
import javax.print.attribute.standard.OutputBin;
import javax.print.attribute.standard.PageRanges;
+import javax.print.attribute.standard.PrinterIsAcceptingJobs;
import javax.print.attribute.standard.PrinterResolution;
import javax.print.attribute.standard.PrinterState;
import javax.print.attribute.standard.PrinterStateReason;
import javax.print.attribute.standard.PrinterStateReasons;
-import javax.print.attribute.standard.PrinterIsAcceptingJobs;
import javax.print.attribute.standard.RequestingUserName;
import javax.print.attribute.standard.SheetCollate;
import javax.print.attribute.standard.Sides;
+import sun.awt.image.ByteInterleavedRaster;
+
import static sun.font.FontUtilities.isIgnorableWhitespace;
/**
@@ -1613,8 +1614,7 @@ public abstract class RasterPrinterJob extends PrinterJob {
} catch (PrinterException pe) {
throw pe;
} catch (Throwable printError) {
- throw (PrinterException)
- new PrinterException().initCause(printError.getCause());
+ throw (PrinterException) new PrinterException().initCause(printError);
} finally {
// reset previousPaper in case this job is invoked again.
previousPaper = null;
diff --git a/src/java.desktop/share/legal/libpng.md b/src/java.desktop/share/legal/libpng.md
index 034de22bf25..7783fc7ff03 100644
--- a/src/java.desktop/share/legal/libpng.md
+++ b/src/java.desktop/share/legal/libpng.md
@@ -1,4 +1,4 @@
-## libpng v1.6.56
+## libpng v1.6.57
### libpng License
@@ -180,6 +180,7 @@ Authors, for copyright and licensing purposes.
* Mans Rullgard
* Matt Sarett
* Mike Klein
+ * Mohammad Seet
* Pascal Massimino
* Paul Schmidt
* Petr Simecek
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES b/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES
index 673d4d50420..ba81df0c0e6 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES
@@ -6368,6 +6368,17 @@ Version 1.6.56 [March 25, 2026]
(Contributed by Bob Friesenhahn and Philippe Antoine.)
Performed various refactorings and cleanups.
+Version 1.6.57 [April 8, 2026]
+ Fixed CVE-2026-34757 (medium severity):
+ Use-after-free in `png_set_PLTE`, `png_set_tRNS` and `png_set_hIST`
+ leading to corrupted chunk data and potential heap information disclosure.
+ Also hardened the append-style setters (`png_set_text`, `png_set_sPLT`,
+ `png_set_unknown_chunks`) against a theoretical variant of the same
+ aliasing pattern.
+ (Reported by Iv4n .)
+ Fixed integer overflow in rowbytes computation in read transforms.
+ (Contributed by Mohammad Seet.)
+
Send comments/corrections/commendations to png-mng-implement at lists.sf.net.
Subscription is required; visit
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/README b/src/java.desktop/share/native/libsplashscreen/libpng/README
index d0b085f7933..179b8dc8cb4 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/README
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/README
@@ -1,4 +1,4 @@
-README for libpng version 1.6.56
+README for libpng version 1.6.57
================================
See the note about version numbers near the top of `png.h`.
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/png.c b/src/java.desktop/share/native/libsplashscreen/libpng/png.c
index fd095b515b9..e4e13b0a684 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/png.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/png.c
@@ -42,7 +42,7 @@
#include "pngpriv.h"
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_6_56 Your_png_h_is_not_version_1_6_56;
+typedef png_libpng_version_1_6_57 Your_png_h_is_not_version_1_6_57;
/* Sanity check the chunks definitions - PNG_KNOWN_CHUNKS from pngpriv.h and the
* corresponding macro definitions. This causes a compile time failure if
@@ -849,7 +849,7 @@ png_get_copyright(png_const_structrp png_ptr)
return PNG_STRING_COPYRIGHT
#else
return PNG_STRING_NEWLINE \
- "libpng version 1.6.56" PNG_STRING_NEWLINE \
+ "libpng version 1.6.57" PNG_STRING_NEWLINE \
"Copyright (c) 2018-2026 Cosmin Truta" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson" \
PNG_STRING_NEWLINE \
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/png.h b/src/java.desktop/share/native/libsplashscreen/libpng/png.h
index 56ec204cd1a..349e7d07383 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/png.h
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/png.h
@@ -29,7 +29,7 @@
* However, the following notice accompanied the original version of this
* file and, per its terms, should not be removed:
*
- * libpng version 1.6.56
+ * libpng version 1.6.57
*
* Copyright (c) 2018-2026 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
@@ -43,7 +43,7 @@
* libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
* libpng versions 0.97, January 1998, through 1.6.35, July 2018:
* Glenn Randers-Pehrson
- * libpng versions 1.6.36, December 2018, through 1.6.56, March 2026:
+ * libpng versions 1.6.36, December 2018, through 1.6.57, April 2026:
* Cosmin Truta
* See also "Contributing Authors", below.
*/
@@ -267,7 +267,7 @@
* ...
* 1.5.30 15 10530 15.so.15.30[.0]
* ...
- * 1.6.56 16 10656 16.so.16.56[.0]
+ * 1.6.57 16 10657 16.so.16.57[.0]
*
* Henceforth the source version will match the shared-library major and
* minor numbers; the shared-library major version number will be used for
@@ -303,7 +303,7 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.6.56"
+#define PNG_LIBPNG_VER_STRING "1.6.57"
#define PNG_HEADER_VERSION_STRING " libpng version " PNG_LIBPNG_VER_STRING "\n"
/* The versions of shared library builds should stay in sync, going forward */
@@ -314,7 +314,7 @@
/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
#define PNG_LIBPNG_VER_MAJOR 1
#define PNG_LIBPNG_VER_MINOR 6
-#define PNG_LIBPNG_VER_RELEASE 56
+#define PNG_LIBPNG_VER_RELEASE 57
/* This should be zero for a public release, or non-zero for a
* development version.
@@ -345,7 +345,7 @@
* From version 1.0.1 it is:
* XXYYZZ, where XX=major, YY=minor, ZZ=release
*/
-#define PNG_LIBPNG_VER 10656 /* 1.6.56 */
+#define PNG_LIBPNG_VER 10657 /* 1.6.57 */
/* Library configuration: these options cannot be changed after
* the library has been built.
@@ -455,7 +455,7 @@ extern "C" {
/* This triggers a compiler error in png.c, if png.c and png.h
* do not agree upon the version number.
*/
-typedef char *png_libpng_version_1_6_56;
+typedef char *png_libpng_version_1_6_57;
/* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
*
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h b/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h
index 5772e6ebb1c..1a5bb7b60f8 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h
@@ -29,7 +29,7 @@
* However, the following notice accompanied the original version of this
* file and, per its terms, should not be removed:
*
- * libpng version 1.6.56
+ * libpng version 1.6.57
*
* Copyright (c) 2018-2026 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h b/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h
index 4a7e51d112d..de63c998927 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h
@@ -31,7 +31,7 @@
* However, the following notice accompanied the original version of this
* file and, per its terms, should not be removed:
*/
-/* libpng version 1.6.56 */
+/* libpng version 1.6.57 */
/* Copyright (c) 2018-2026 Cosmin Truta */
/* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c
index f0972ba9bef..838c8460f91 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c
@@ -2408,7 +2408,7 @@ png_do_unpack(png_row_infop row_info, png_bytep row)
}
row_info->bit_depth = 8;
row_info->pixel_depth = (png_byte)(8 * row_info->channels);
- row_info->rowbytes = row_width * row_info->channels;
+ row_info->rowbytes = (size_t)row_width * row_info->channels;
}
}
#endif
@@ -2610,7 +2610,7 @@ png_do_scale_16_to_8(png_row_infop row_info, png_bytep row)
row_info->bit_depth = 8;
row_info->pixel_depth = (png_byte)(8 * row_info->channels);
- row_info->rowbytes = row_info->width * row_info->channels;
+ row_info->rowbytes = (size_t)row_info->width * row_info->channels;
}
}
#endif
@@ -2638,7 +2638,7 @@ png_do_chop(png_row_infop row_info, png_bytep row)
row_info->bit_depth = 8;
row_info->pixel_depth = (png_byte)(8 * row_info->channels);
- row_info->rowbytes = row_info->width * row_info->channels;
+ row_info->rowbytes = (size_t)row_info->width * row_info->channels;
}
}
#endif
@@ -2874,7 +2874,7 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,
*(--dp) = lo_filler;
row_info->channels = 2;
row_info->pixel_depth = 16;
- row_info->rowbytes = row_width * 2;
+ row_info->rowbytes = (size_t)row_width * 2;
}
else
@@ -2889,7 +2889,7 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,
}
row_info->channels = 2;
row_info->pixel_depth = 16;
- row_info->rowbytes = row_width * 2;
+ row_info->rowbytes = (size_t)row_width * 2;
}
}
@@ -2912,7 +2912,7 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,
*(--dp) = hi_filler;
row_info->channels = 2;
row_info->pixel_depth = 32;
- row_info->rowbytes = row_width * 4;
+ row_info->rowbytes = (size_t)row_width * 4;
}
else
@@ -2929,7 +2929,7 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,
}
row_info->channels = 2;
row_info->pixel_depth = 32;
- row_info->rowbytes = row_width * 4;
+ row_info->rowbytes = (size_t)row_width * 4;
}
}
#endif
@@ -2953,7 +2953,7 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,
*(--dp) = lo_filler;
row_info->channels = 4;
row_info->pixel_depth = 32;
- row_info->rowbytes = row_width * 4;
+ row_info->rowbytes = (size_t)row_width * 4;
}
else
@@ -2970,7 +2970,7 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,
}
row_info->channels = 4;
row_info->pixel_depth = 32;
- row_info->rowbytes = row_width * 4;
+ row_info->rowbytes = (size_t)row_width * 4;
}
}
@@ -2997,7 +2997,7 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,
*(--dp) = hi_filler;
row_info->channels = 4;
row_info->pixel_depth = 64;
- row_info->rowbytes = row_width * 8;
+ row_info->rowbytes = (size_t)row_width * 8;
}
else
@@ -3019,7 +3019,7 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,
row_info->channels = 4;
row_info->pixel_depth = 64;
- row_info->rowbytes = row_width * 8;
+ row_info->rowbytes = (size_t)row_width * 8;
}
}
#endif
@@ -4513,7 +4513,7 @@ png_do_expand_palette(png_structrp png_ptr, png_row_infop row_info,
}
row_info->bit_depth = 8;
row_info->pixel_depth = 32;
- row_info->rowbytes = row_width * 4;
+ row_info->rowbytes = (size_t)row_width * 4;
row_info->color_type = 6;
row_info->channels = 4;
}
@@ -4521,7 +4521,7 @@ png_do_expand_palette(png_structrp png_ptr, png_row_infop row_info,
else
{
sp = row + (size_t)row_width - 1;
- dp = row + (size_t)(row_width * 3) - 1;
+ dp = row + (size_t)row_width * 3 - 1;
i = 0;
#ifdef PNG_ARM_NEON_INTRINSICS_AVAILABLE
i = png_do_expand_palette_rgb8_neon(png_ptr, row_info, row,
@@ -4540,7 +4540,7 @@ png_do_expand_palette(png_structrp png_ptr, png_row_infop row_info,
row_info->bit_depth = 8;
row_info->pixel_depth = 24;
- row_info->rowbytes = row_width * 3;
+ row_info->rowbytes = (size_t)row_width * 3;
row_info->color_type = 2;
row_info->channels = 3;
}
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c
index 05d18cd06b7..29082a6be08 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c
@@ -414,6 +414,7 @@ void PNGAPI
png_set_hIST(png_const_structrp png_ptr, png_inforp info_ptr,
png_const_uint_16p hist)
{
+ png_uint_16 safe_hist[PNG_MAX_PALETTE_LENGTH];
int i;
png_debug1(1, "in %s storage function", "hIST");
@@ -430,6 +431,13 @@ png_set_hIST(png_const_structrp png_ptr, png_inforp info_ptr,
return;
}
+ /* Snapshot the caller's hist before freeing, in case it points to
+ * info_ptr->hist (getter-to-setter aliasing).
+ */
+ memcpy(safe_hist, hist, (unsigned int)info_ptr->num_palette *
+ (sizeof (png_uint_16)));
+ hist = safe_hist;
+
png_free_data(png_ptr, info_ptr, PNG_FREE_HIST, 0);
/* Changed from info->num_palette to PNG_MAX_PALETTE_LENGTH in
@@ -771,7 +779,7 @@ void PNGAPI
png_set_PLTE(png_structrp png_ptr, png_inforp info_ptr,
png_const_colorp palette, int num_palette)
{
-
+ png_color safe_palette[PNG_MAX_PALETTE_LENGTH];
png_uint_32 max_palette_length;
png_debug1(1, "in %s storage function", "PLTE");
@@ -805,6 +813,15 @@ png_set_PLTE(png_structrp png_ptr, png_inforp info_ptr,
png_error(png_ptr, "Invalid palette");
}
+ /* Snapshot the caller's palette before freeing, in case it points to
+ * info_ptr->palette (getter-to-setter aliasing).
+ */
+ if (num_palette > 0)
+ memcpy(safe_palette, palette, (unsigned int)num_palette *
+ (sizeof (png_color)));
+
+ palette = safe_palette;
+
png_free_data(png_ptr, info_ptr, PNG_FREE_PLTE, 0);
/* Changed in libpng-1.2.1 to allocate PNG_MAX_PALETTE_LENGTH instead
@@ -966,6 +983,7 @@ png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr,
png_const_textp text_ptr, int num_text)
{
int i;
+ png_textp old_text = NULL;
png_debug1(1, "in text storage function, chunk typeid = 0x%lx",
png_ptr == NULL ? 0xabadca11UL : (unsigned long)png_ptr->chunk_name);
@@ -1013,7 +1031,10 @@ png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr,
return 1;
}
- png_free(png_ptr, info_ptr->text);
+ /* Defer freeing the old array until after the copy loop below,
+ * in case text_ptr aliases info_ptr->text (getter-to-setter).
+ */
+ old_text = info_ptr->text;
info_ptr->text = new_text;
info_ptr->free_me |= PNG_FREE_TEXT;
@@ -1098,6 +1119,7 @@ png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr,
{
png_chunk_report(png_ptr, "text chunk: out of memory",
PNG_CHUNK_WRITE_ERROR);
+ png_free(png_ptr, old_text);
return 1;
}
@@ -1151,6 +1173,8 @@ png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr,
png_debug1(3, "transferred text chunk %d", info_ptr->num_text);
}
+ png_free(png_ptr, old_text);
+
return 0;
}
#endif
@@ -1194,6 +1218,16 @@ png_set_tRNS(png_structrp png_ptr, png_inforp info_ptr,
if (trans_alpha != NULL)
{
+ /* Snapshot the caller's trans_alpha before freeing, in case it
+ * points to info_ptr->trans_alpha (getter-to-setter aliasing).
+ */
+ png_byte safe_trans[PNG_MAX_PALETTE_LENGTH];
+
+ if (num_trans > 0 && num_trans <= PNG_MAX_PALETTE_LENGTH)
+ memcpy(safe_trans, trans_alpha, (size_t)num_trans);
+
+ trans_alpha = safe_trans;
+
png_free_data(png_ptr, info_ptr, PNG_FREE_TRNS, 0);
if (num_trans > 0 && num_trans <= PNG_MAX_PALETTE_LENGTH)
@@ -1278,6 +1312,7 @@ png_set_sPLT(png_const_structrp png_ptr,
*/
{
png_sPLT_tp np;
+ png_sPLT_tp old_spalettes;
png_debug1(1, "in %s storage function", "sPLT");
@@ -1298,7 +1333,10 @@ png_set_sPLT(png_const_structrp png_ptr,
return;
}
- png_free(png_ptr, info_ptr->splt_palettes);
+ /* Defer freeing the old array until after the copy loop below,
+ * in case entries aliases info_ptr->splt_palettes (getter-to-setter).
+ */
+ old_spalettes = info_ptr->splt_palettes;
info_ptr->splt_palettes = np;
info_ptr->free_me |= PNG_FREE_SPLT;
@@ -1362,6 +1400,8 @@ png_set_sPLT(png_const_structrp png_ptr,
}
while (--nentries);
+ png_free(png_ptr, old_spalettes);
+
if (nentries > 0)
png_chunk_report(png_ptr, "sPLT out of memory", PNG_CHUNK_WRITE_ERROR);
}
@@ -1410,6 +1450,7 @@ png_set_unknown_chunks(png_const_structrp png_ptr,
png_inforp info_ptr, png_const_unknown_chunkp unknowns, int num_unknowns)
{
png_unknown_chunkp np;
+ png_unknown_chunkp old_unknowns;
if (png_ptr == NULL || info_ptr == NULL || num_unknowns <= 0 ||
unknowns == NULL)
@@ -1456,7 +1497,10 @@ png_set_unknown_chunks(png_const_structrp png_ptr,
return;
}
- png_free(png_ptr, info_ptr->unknown_chunks);
+ /* Defer freeing the old array until after the copy loop below,
+ * in case unknowns aliases info_ptr->unknown_chunks (getter-to-setter).
+ */
+ old_unknowns = info_ptr->unknown_chunks;
info_ptr->unknown_chunks = np; /* safe because it is initialized */
info_ptr->free_me |= PNG_FREE_UNKN;
@@ -1502,6 +1546,8 @@ png_set_unknown_chunks(png_const_structrp png_ptr,
++np;
++(info_ptr->unknown_chunks_num);
}
+
+ png_free(png_ptr, old_unknowns);
}
void PNGAPI
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp b/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp
index 8d016d8b39f..b18fa5a7e2c 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -522,7 +522,6 @@ Java_sun_awt_windows_WPageDialogPeer__1show(JNIEnv *env, jobject peer)
AwtComponent *awtParent = (parent != NULL) ? (AwtComponent *)JNI_GET_PDATA(parent) : NULL;
HWND hwndOwner = awtParent ? awtParent->GetHWnd() : NULL;
- jboolean doIt = JNI_FALSE;
PAGESETUPDLG setup;
memset(&setup, 0, sizeof(setup));
@@ -578,7 +577,7 @@ Java_sun_awt_windows_WPageDialogPeer__1show(JNIEnv *env, jobject peer)
*/
if ((setup.hDevMode == NULL) && (setup.hDevNames == NULL)) {
CLEANUP_SHOW;
- return doIt;
+ return JNI_FALSE;
}
} else {
int measure = PSD_INTHOUSANDTHSOFINCHES;
@@ -606,7 +605,7 @@ Java_sun_awt_windows_WPageDialogPeer__1show(JNIEnv *env, jobject peer)
pageFormatToSetup(env, self, page, &setup, AwtPrintControl::getPrintDC(env, self));
if (env->ExceptionCheck()) {
CLEANUP_SHOW;
- return doIt;
+ return JNI_FALSE;
}
setup.lpfnPageSetupHook = reinterpret_cast(pageDlgHook);
@@ -615,89 +614,91 @@ Java_sun_awt_windows_WPageDialogPeer__1show(JNIEnv *env, jobject peer)
AwtDialog::CheckInstallModalHook();
BOOL ret = ::PageSetupDlg(&setup);
- if (ret) {
-
- jobject paper = getPaper(env, page);
- if (paper == NULL) {
- CLEANUP_SHOW;
- return doIt;
- }
- int units = setup.Flags & PSD_INTHOUSANDTHSOFINCHES ?
- MM_HIENGLISH :
- MM_HIMETRIC;
- POINT paperSize;
- RECT margins;
- jint orientation;
-
- /* The printer may have been changed, and we track that change,
- * but then need to get a new DC for the current printer so that
- * we validate the paper size correctly
- */
- if (setup.hDevNames != NULL) {
- DEVNAMES* names = (DEVNAMES*)::GlobalLock(setup.hDevNames);
- if (names != NULL) {
- LPTSTR printer = (LPTSTR)names+names->wDeviceOffset;
- SAVE_CONTROLWORD
- HDC newDC = ::CreateDC(TEXT("WINSPOOL"), printer, NULL, NULL);
- RESTORE_CONTROLWORD
- if (newDC != NULL) {
- HDC oldDC = AwtPrintControl::getPrintDC(env, self);
- if (oldDC != NULL) {
- ::DeleteDC(oldDC);
- }
- }
- AwtPrintControl::setPrintDC(env, self, newDC);
- }
- ::GlobalUnlock(setup.hDevNames);
- }
-
- /* Get the Windows paper and margins description.
- */
- retrievePaperInfo(&setup, &paperSize, &margins, &orientation,
- AwtPrintControl::getPrintDC(env, self));
-
- /* Convert the Windows' paper and margins description
- * and place them into a Paper instance.
- */
- setPaperValues(env, paper, &paperSize, &margins, units);
- if (env->ExceptionCheck()) {
- CLEANUP_SHOW;
- return doIt;
- }
- /*
- * Put the updated Paper instance and the orientation into
- * the PageFormat.
- */
- setPaper(env, page, paper);
- if (env->ExceptionCheck()) {
- CLEANUP_SHOW;
- return doIt;
- }
- setPageFormatOrientation(env, page, orientation);
- if (env->ExceptionCheck()) {
- CLEANUP_SHOW;
- return JNI_FALSE;
- }
- if (setup.hDevMode != NULL) {
- DEVMODE *devmode = (DEVMODE *)::GlobalLock(setup.hDevMode);
- if (devmode != NULL) {
- if (devmode->dmFields & DM_PAPERSIZE) {
- jboolean err = setPrintPaperSize(env, self, devmode->dmPaperSize);
- if (err) {
- CLEANUP_SHOW;
- return doIt;
- }
- }
- }
- ::GlobalUnlock(setup.hDevMode);
- }
- doIt = JNI_TRUE;
- }
AwtDialog::CheckUninstallModalHook();
-
AwtDialog::ModalActivateNextWindow(NULL, target, peer);
+ if (!ret) {
+ CLEANUP_SHOW;
+ return JNI_FALSE;
+ }
+
+ jobject paper = getPaper(env, page);
+ if (paper == NULL) {
+ CLEANUP_SHOW;
+ return JNI_FALSE;
+ }
+ int units = setup.Flags & PSD_INTHOUSANDTHSOFINCHES ?
+ MM_HIENGLISH :
+ MM_HIMETRIC;
+ POINT paperSize;
+ RECT margins;
+ jint orientation;
+
+ /* The printer may have been changed, and we track that change,
+ * but then need to get a new DC for the current printer so that
+ * we validate the paper size correctly
+ */
+ if (setup.hDevNames != NULL) {
+ DEVNAMES* names = (DEVNAMES*)::GlobalLock(setup.hDevNames);
+ if (names != NULL) {
+ LPTSTR printer = (LPTSTR)names+names->wDeviceOffset;
+ SAVE_CONTROLWORD
+ HDC newDC = ::CreateDC(TEXT("WINSPOOL"), printer, NULL, NULL);
+ RESTORE_CONTROLWORD
+ if (newDC != NULL) {
+ HDC oldDC = AwtPrintControl::getPrintDC(env, self);
+ if (oldDC != NULL) {
+ ::DeleteDC(oldDC);
+ }
+ }
+ AwtPrintControl::setPrintDC(env, self, newDC);
+ }
+ ::GlobalUnlock(setup.hDevNames);
+ }
+
+ /* Get the Windows paper and margins description.
+ */
+ retrievePaperInfo(&setup, &paperSize, &margins, &orientation,
+ AwtPrintControl::getPrintDC(env, self));
+
+ /* Convert the Windows' paper and margins description
+ * and place them into a Paper instance.
+ */
+ setPaperValues(env, paper, &paperSize, &margins, units);
+ if (env->ExceptionCheck()) {
+ CLEANUP_SHOW;
+ return JNI_FALSE;
+ }
+ /*
+ * Put the updated Paper instance and the orientation into
+ * the PageFormat.
+ */
+ setPaper(env, page, paper);
+ if (env->ExceptionCheck()) {
+ CLEANUP_SHOW;
+ return JNI_FALSE;
+ }
+ setPageFormatOrientation(env, page, orientation);
+ if (env->ExceptionCheck()) {
+ CLEANUP_SHOW;
+ return JNI_FALSE;
+ }
+ if (setup.hDevMode != NULL) {
+ DEVMODE *devmode = (DEVMODE *)::GlobalLock(setup.hDevMode);
+ if (devmode != NULL) {
+ if (devmode->dmFields & DM_PAPERSIZE) {
+ jboolean err = setPrintPaperSize(env, self, devmode->dmPaperSize);
+ if (err) {
+ ::GlobalUnlock(setup.hDevMode);
+ CLEANUP_SHOW;
+ return JNI_FALSE;
+ }
+ }
+ }
+ ::GlobalUnlock(setup.hDevMode);
+ }
+
HGLOBAL oldG = AwtPrintControl::getPrintHDMode(env, self);
if (setup.hDevMode != oldG) {
AwtPrintControl::setPrintHDMode(env, self, setup.hDevMode);
@@ -710,7 +711,7 @@ Java_sun_awt_windows_WPageDialogPeer__1show(JNIEnv *env, jobject peer)
CLEANUP_SHOW;
- return doIt;
+ return JNI_TRUE;
CATCH_BAD_ALLOC_RET(0);
}
diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestBuilderImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestBuilderImpl.java
index ef0e2b152bb..c39edf878c9 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestBuilderImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestBuilderImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,7 +145,7 @@ public class HttpRequestBuilderImpl implements HttpRequest.Builder {
@Override
public HttpRequestBuilderImpl headers(String... params) {
requireNonNull(params);
- if (params.length == 0 || params.length % 2 != 0) {
+ if (params.length % 2 != 0) {
throw newIAE("wrong number, %d, of parameters", params.length);
}
for (int i = 0; i < params.length; i += 2) {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
index 1c93c37698a..7a8e6c6f4f1 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,6 +34,7 @@ import com.sun.tools.javac.resources.CompilerProperties.LintWarnings;
import com.sun.tools.javac.resources.CompilerProperties.Warnings;
import com.sun.tools.javac.util.Assert;
import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag;
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
import com.sun.tools.javac.util.JCDiagnostic.Error;
import com.sun.tools.javac.util.JCDiagnostic.LintWarning;
@@ -150,24 +151,26 @@ public class Preview {
/**
* Report usage of a preview feature. Usages reported through this method will affect the
* set of sourcefiles with dependencies on preview features.
+ * @param flag a flag to set on the diagnostic
* @param pos the position at which the preview feature was used.
* @param feature the preview feature used.
*/
- public void warnPreview(int pos, Feature feature) {
- warnPreview(new SimpleDiagnosticPosition(pos), feature);
+ public void warnPreview(DiagnosticFlag flag, int pos, Feature feature) {
+ warnPreview(flag, new SimpleDiagnosticPosition(pos), feature);
}
/**
* Report usage of a preview feature. Usages reported through this method will affect the
* set of sourcefiles with dependencies on preview features.
+ * @param flag a flag to set on the diagnostic
* @param pos the position at which the preview feature was used.
* @param feature the preview feature used.
*/
- public void warnPreview(DiagnosticPosition pos, Feature feature) {
+ public void warnPreview(DiagnosticFlag flag, DiagnosticPosition pos, Feature feature) {
Assert.check(isEnabled());
Assert.check(isPreview(feature));
markUsesPreview(pos);
- log.warning(pos,
+ log.warning(flag, pos,
feature.isPlural() ?
LintWarnings.PreviewFeatureUsePlural(feature.nameFragment()) :
LintWarnings.PreviewFeatureUse(feature.nameFragment()));
@@ -263,7 +266,7 @@ public class Preview {
log.error(pos, feature.error(source.name));
}
if (isEnabled() && isPreview(feature)) {
- warnPreview(pos, feature);
+ warnPreview(null, pos, feature);
}
}
}
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 444530c7266..89ae68e85ba 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
@@ -5270,11 +5270,15 @@ public class Attr extends JCTree.Visitor {
public void visitAnnotatedType(JCAnnotatedType tree) {
attribAnnotationTypes(tree.annotations, env);
- Type underlyingType = attribType(tree.underlyingType, env);
- Type annotatedType = underlyingType.preannotatedType();
+ Type underlyingType = attribTree(tree.underlyingType, env, resultInfo);
+ if (underlyingType.getTag() == PACKAGE) {
+ result = tree.type = underlyingType;
+ } else {
+ Type annotatedType = underlyingType.preannotatedType();
- annotate.annotateTypeSecondStage(tree, tree.annotations, annotatedType);
- result = tree.type = annotatedType;
+ annotate.annotateTypeSecondStage(tree, tree.annotations, annotatedType);
+ result = tree.type = annotatedType;
+ }
}
public void visitErroneous(JCErroneous tree) {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
index 55f2f76e358..d8b5b1ddd6b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
@@ -176,7 +176,7 @@ public class JavaTokenizer extends UnicodeReader {
lexError(pos, feature.error(source.name));
} else if (preview.isPreview(feature)) {
//use of preview feature, warn
- preview.warnPreview(pos, feature);
+ preview.warnPreview(DiagnosticFlag.SYNTAX, pos, feature);
}
}
@@ -1040,10 +1040,10 @@ public class JavaTokenizer extends UnicodeReader {
// Verify that the incidental indentation is consistent.
Set checks = TextBlockSupport.checkWhitespace(string);
if (checks.contains(TextBlockSupport.WhitespaceChecks.INCONSISTENT)) {
- log.warning(pos, LintWarnings.InconsistentWhiteSpaceIndentation);
+ log.warning(DiagnosticFlag.SYNTAX, pos, LintWarnings.InconsistentWhiteSpaceIndentation);
}
if (checks.contains(TextBlockSupport.WhitespaceChecks.TRAILING)) {
- log.warning(pos, LintWarnings.TrailingWhiteSpaceWillBeRemoved);
+ log.warning(DiagnosticFlag.SYNTAX, pos, LintWarnings.TrailingWhiteSpaceWillBeRemoved);
}
// Remove incidental indentation.
try {
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 df5da5cb954..b4dfb04766c 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
@@ -772,7 +772,7 @@ public class JavacParser implements Parser {
}
} else if (token.kind == UNDERSCORE) {
if (Feature.UNDERSCORE_IDENTIFIER.allowedInSource(source)) {
- log.warning(token.pos, Warnings.UnderscoreAsIdentifier);
+ log.warning(DiagnosticFlag.SYNTAX, token.pos, Warnings.UnderscoreAsIdentifier);
} else if (asVariable) {
checkSourceLevel(Feature.UNNAMED_VARIABLES);
if (peekToken(LBRACKET)) {
@@ -2339,7 +2339,7 @@ public class JavacParser implements Parser {
if (allowYieldStatement) {
return true;
} else {
- log.warning(pos, Warnings.InvalidYield);
+ log.warning(DiagnosticFlag.SYNTAX, pos, Warnings.InvalidYield);
}
}
return false;
@@ -3858,35 +3858,35 @@ public class JavacParser implements Parser {
if (Feature.LOCAL_VARIABLE_TYPE_INFERENCE.allowedInSource(source)) {
return Source.JDK10;
} else if (shouldWarn) {
- log.warning(pos, Warnings.RestrictedTypeNotAllowed(name, Source.JDK10));
+ log.warning(DiagnosticFlag.SYNTAX, pos, Warnings.RestrictedTypeNotAllowed(name, Source.JDK10));
}
}
if (name == names.yield) {
if (allowYieldStatement) {
return Source.JDK14;
} else if (shouldWarn) {
- log.warning(pos, Warnings.RestrictedTypeNotAllowed(name, Source.JDK14));
+ log.warning(DiagnosticFlag.SYNTAX, pos, Warnings.RestrictedTypeNotAllowed(name, Source.JDK14));
}
}
if (name == names.record) {
if (allowRecords) {
return Source.JDK14;
} else if (shouldWarn) {
- log.warning(pos, Warnings.RestrictedTypeNotAllowedPreview(name, Source.JDK14));
+ log.warning(DiagnosticFlag.SYNTAX, pos, Warnings.RestrictedTypeNotAllowedPreview(name, Source.JDK14));
}
}
if (name == names.sealed) {
if (allowSealedTypes) {
return Source.JDK15;
} else if (shouldWarn) {
- log.warning(pos, Warnings.RestrictedTypeNotAllowedPreview(name, Source.JDK15));
+ log.warning(DiagnosticFlag.SYNTAX, pos, Warnings.RestrictedTypeNotAllowedPreview(name, Source.JDK15));
}
}
if (name == names.permits) {
if (allowSealedTypes) {
return Source.JDK15;
} else if (shouldWarn) {
- log.warning(pos, Warnings.RestrictedTypeNotAllowedPreview(name, Source.JDK15));
+ log.warning(DiagnosticFlag.SYNTAX, pos, Warnings.RestrictedTypeNotAllowedPreview(name, Source.JDK15));
}
}
return null;
@@ -4057,7 +4057,7 @@ public class JavacParser implements Parser {
if (source.compareTo(Source.JDK21) >= 0)
reportSyntaxError(semiList.first().pos, Errors.ExtraneousSemicolon);
else
- log.warning(semiList.first().pos, Warnings.ExtraneousSemicolon);
+ log.warning(DiagnosticFlag.SYNTAX, semiList.first().pos, Warnings.ExtraneousSemicolon);
}
seenImport = true;
defs.append(importDeclaration());
@@ -4074,7 +4074,7 @@ public class JavacParser implements Parser {
if (source.compareTo(Source.JDK21) >= 0)
reportSyntaxError(semiList.first().pos, Errors.ExtraneousSemicolon);
else
- log.warning(semiList.first().pos, Warnings.ExtraneousSemicolon);
+ log.warning(DiagnosticFlag.SYNTAX, semiList.first().pos, Warnings.ExtraneousSemicolon);
}
ModuleKind kind = ModuleKind.STRONG;
if (token.name() == names.open) {
@@ -5616,7 +5616,7 @@ public class JavacParser implements Parser {
log.error(pos, feature.error(source.name));
} else if (preview.isPreview(feature)) {
//use of preview feature, warn
- preview.warnPreview(pos, feature);
+ preview.warnPreview(DiagnosticFlag.SYNTAX, pos, feature);
}
}
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/TextBlockSupport.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/TextBlockSupport.java
index d099ceadba0..5112849d45f 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/TextBlockSupport.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/TextBlockSupport.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,8 +56,8 @@ class TextBlockSupport {
// No need to check indentation if opting out (last line is empty.)
char lastChar = string.charAt(string.length() - 1);
boolean optOut = lastChar == '\n' || lastChar == '\r';
- // Split string based at line terminators.
- String[] lines = string.split("\\R");
+ // Split string using JLS text block line terminators: CRLF, CR, or LF.
+ String[] lines = string.split("\\r\\n|\\r|\\n");
int length = lines.length;
// Extract last line.
String lastLine = length == 0 ? "" : lines[length - 1];
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
index 809c19d5012..11fa3a5aebf 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
@@ -1204,6 +1204,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
//where:
private final Predicate ACCEPT_NON_RECOVERABLE_LINTS =
d -> !Optional.of(d)
+ .filter(diag -> !diag.isFlagSet(SYNTAX))
.map(JCDiagnostic::getLintCategory)
.map(lc -> lc.annotationSuppression ||
lc == Lint.LintCategory.INCUBATING)
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractLog.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractLog.java
index ce3e56f2f3f..b8b2a3af254 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractLog.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractLog.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -192,6 +192,16 @@ public abstract class AbstractLog {
report(diags.warning(null, source, wrap(pos), warningKey));
}
+ /** Report a warning, unless suppressed by the -nowarn option or the
+ * maximum number of warnings has been reached.
+ * @param flag A flag to set on the diagnostic
+ * @param pos The source position at which to report the warning.
+ * @param warningKey The key for the localized warning message.
+ */
+ public void warning(DiagnosticFlag flag, int pos, Warning warningKey) {
+ report(diags.warning(flag, source, wrap(pos), warningKey));
+ }
+
/** Provide a non-fatal notification, unless suppressed by the -nowarn option.
* @param noteKey The key for the localized notification message.
*/
diff --git a/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp b/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp
index ff011dca889..5c84b929ef1 100644
--- a/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp
+++ b/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1375,7 +1375,7 @@ JNIEXPORT jobject JNICALL Java_sun_security_mscapi_CKeyPairGenerator_00024RSA_ge
PROV_RSA_FULL,
CRYPT_NEWKEYSET) == FALSE)
{
- ThrowException(env, KEY_EXCEPTION, GetLastError());
+ ThrowExceptionWithMessageAndErrcode(env, KEY_EXCEPTION, "CryptAcquireContext failure", GetLastError());
__leave;
}
}
@@ -1387,7 +1387,7 @@ JNIEXPORT jobject JNICALL Java_sun_security_mscapi_CKeyPairGenerator_00024RSA_ge
dwFlags,
&hKeyPair) == FALSE)
{
- ThrowException(env, KEY_EXCEPTION, GetLastError());
+ ThrowExceptionWithMessageAndErrcode(env, KEY_EXCEPTION, "CryptGenKey failure", GetLastError());
__leave;
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/CPUFeatures.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/CPUFeatures.java
index 0ad7ba1651d..05b5f6f69f4 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/CPUFeatures.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/CPUFeatures.java
@@ -74,9 +74,6 @@ import static jdk.internal.vm.vector.Utils.debug;
debug("AVX=%b; AVX2=%b; AVX512F=%b; AVX512DQ=%b",
SUPPORTS_AVX, SUPPORTS_AVX2, SUPPORTS_AVX512F, SUPPORTS_AVX512DQ);
- assert SUPPORTS_AVX512F == (VectorShape.getMaxVectorBitSize(int.class) == 512);
- assert SUPPORTS_AVX2 == (VectorShape.getMaxVectorBitSize(byte.class) >= 256);
- assert SUPPORTS_AVX == (VectorShape.getMaxVectorBitSize(float.class) >= 256);
}
}
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMathLibrary.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMathLibrary.java
index 823cebd85a9..59697733d86 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMathLibrary.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMathLibrary.java
@@ -31,6 +31,7 @@ import jdk.internal.vm.vector.VectorSupport;
import java.lang.foreign.MemorySegment;
import java.lang.foreign.SymbolLookup;
+import java.util.Locale;
import java.util.function.IntFunction;
import static jdk.incubator.vector.Util.requires;
@@ -141,7 +142,7 @@ import static jdk.internal.vm.vector.Utils.debug;
String elemType = (vspecies.elementType() == float.class ? "f" : "");
boolean isFloatVector64 = (vspecies.elementType() == float.class) && (vspecies.length() == 2); // FloatVector64 or FloatVectorMax
int vlen = (isFloatVector64 ? 4 : vspecies.length()); // reuse 128-bit variant for 64-bit float vectors
- return String.format("__jsvml_%s%s%d_ha_%s", op.operatorName(), elemType, vlen, suffix);
+ return String.format(Locale.ROOT, "__jsvml_%s%s%d_ha_%s", op.operatorName(), elemType, vlen, suffix);
}
@Override
@@ -214,7 +215,7 @@ import static jdk.internal.vm.vector.Utils.debug;
boolean isFloatVector64 = (vspecies.elementType() == float.class) && (vspecies.length() == 2); // FloatVector64 or FloatVectorMax
int vlen = (isFloatVector64 ? 4 : vspecies.length()); // reuse 128-bit variant for 64-bit float vectors
boolean isShapeAgnostic = isRISCV64() || (isAARCH64() && vspecies.vectorBitSize() > 128);
- return String.format("%s%s%s_%s%s", op.operatorName(),
+ return String.format(Locale.ROOT, "%s%s%s_%s%s", op.operatorName(),
(vspecies.elementType() == float.class ? "f" : "d"),
(isShapeAgnostic ? "x" : Integer.toString(vlen)),
precisionLevel(op),
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorOperators.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorOperators.java
index 2f2d33ab130..cc5a7ccbdef 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorOperators.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorOperators.java
@@ -560,15 +560,15 @@ public final class VectorOperators {
/** Produce {@code a<<(n&(ESIZE*8-1))}. Integral only. */
- public static final /*bitwise*/ Binary LSHL = binary("LSHL", "<<", VectorSupport.VECTOR_OP_LSHIFT, VO_SHIFT);
+ public static final /*bitwise*/ Binary LSHL = binary("LSHL", "<<", VectorSupport.VECTOR_OP_LSHIFT, VO_SHIFT+VO_NOFP);
/** Produce {@code a>>(n&(ESIZE*8-1))}. Integral only. */
- public static final /*bitwise*/ Binary ASHR = binary("ASHR", ">>", VectorSupport.VECTOR_OP_RSHIFT, VO_SHIFT);
+ public static final /*bitwise*/ Binary ASHR = binary("ASHR", ">>", VectorSupport.VECTOR_OP_RSHIFT, VO_SHIFT+VO_NOFP);
/** Produce {@code (a&EMASK)>>>(n&(ESIZE*8-1))}. Integral only. */
- public static final /*bitwise*/ Binary LSHR = binary("LSHR", ">>>", VectorSupport.VECTOR_OP_URSHIFT, VO_SHIFT);
+ public static final /*bitwise*/ Binary LSHR = binary("LSHR", ">>>", VectorSupport.VECTOR_OP_URSHIFT, VO_SHIFT+VO_NOFP);
/** Produce {@code rotateLeft(a,n)}. Integral only. */
- public static final /*bitwise*/ Binary ROL = binary("ROL", "rotateLeft", VectorSupport.VECTOR_OP_LROTATE, VO_SHIFT);
+ public static final /*bitwise*/ Binary ROL = binary("ROL", "rotateLeft", VectorSupport.VECTOR_OP_LROTATE, VO_SHIFT+VO_NOFP);
/** Produce {@code rotateRight(a,n)}. Integral only. */
- public static final /*bitwise*/ Binary ROR = binary("ROR", "rotateRight", VectorSupport.VECTOR_OP_RROTATE, VO_SHIFT);
+ public static final /*bitwise*/ Binary ROR = binary("ROR", "rotateRight", VectorSupport.VECTOR_OP_RROTATE, VO_SHIFT+VO_NOFP);
/** Produce {@code compress(a,n)}. Integral, {@code int} and {@code long}, only.
* @since 19
*/
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/StandardDoclet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/StandardDoclet.java
index 8f5fec1e4b9..90511db8053 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/StandardDoclet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/StandardDoclet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
* 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 @@ import jdk.javadoc.internal.doclets.formats.html.HtmlDoclet;
* in documentation comments.
*
* Taglets invoked by the standard doclet must return strings from
- * {@link Taglet#toString(List,Element) Taglet.toString} as follows:
+ * {@link Taglet#toString(List,Element,java.net.URI) Taglet.toString} as follows:
*
*
*
Inline Tags
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Taglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Taglet.java
index 1ad67a89fef..ec079047dfa 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Taglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/Taglet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2026, Oracle and/or its affiliates. All rights reserved.
* 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 jdk.javadoc.doclet;
+import java.net.URI;
import java.util.List;
import java.util.Set;
@@ -34,7 +35,7 @@ import com.sun.source.doctree.DocTree;
/**
* The interface for a custom taglet supported by doclets such as
- * the {@link jdk.javadoc.doclet.StandardDoclet standard doclet}.
+ * the {@linkplain StandardDoclet standard doclet}.
* Custom taglets are used to handle custom tags in documentation
* comments; custom tags can be instantiated individually as either
* block tags, which appear at the end of a comment,
@@ -55,10 +56,10 @@ import com.sun.source.doctree.DocTree;
* {@link #isInlineTag() isInlineTag}, to determine the characteristics
* of the tags supported by the taglet.
*
As appropriate, the doclet calls the
- * {@link #toString(List,Element) toString} method on the taglet object,
- * giving it a list of tags and the element for which the tags are part
- * of the element's documentation comment, from which the taglet can
- * determine the string to be included in the documentation.
+ * {@link #toString(List,Element,URI) toString} method on the taglet object,
+ * giving it a list of tags, the element whose documentation comment contains
+ * the tags, and the root URI of the generated output, from which the taglet
+ * can determine the string to be included in the documentation.
* The doclet will typically specify any requirements on the contents of
* the string that is returned.
*
@@ -126,25 +127,70 @@ public interface Taglet {
default void init(DocletEnvironment env, Doclet doclet) { }
/**
- * Returns the string representation of a series of instances of
- * this tag to be included in the generated output.
+ * Returns the string representation of the specified instances of this tag
+ * to be included in the generated output.
*
- *
If this taglet supports {@link #isInlineTag inline} tags, it will
+ *
If this taglet supports {@link #isInlineTag inline} tags, this method will
* be called once per instance of the inline tag, each time with a singleton list.
* If this taglet supports {@link #isBlockTag block} tags, it will be called once
* for each comment containing instances of block tags, with a list of all the instances
* of the block tag in that comment.
*
+ * @apiNote Taglets that do not need the root URI of the generated output may
+ * implement this method only. Taglets that require the root URI to link to other
+ * doclet-generated resources should override {@link #toString(List, Element, URI)},
+ * and optionally throw an exception in the implementation of this method.
+ *
* @param tags the list of instances of this tag
* @param element the element to which the enclosing comment belongs
* @return the string representation of the tags to be included in
* the generated output
- *
+ * @throws UnsupportedOperationException if {@link #toString(List, Element, URI)}
+ * should be invoked instead
* @see User-Defined Taglets
* for the Standard Doclet
+ * @see #toString(List, Element, URI)
*/
String toString(List tags, Element element);
+ /**
+ * Returns the string representation of the specified instances of this tag
+ * to be included in the generated output.
+ *
+ *
If this taglet supports {@link #isInlineTag inline} tags, this method will
+ * be called once per instance of the inline tag, each time with a singleton list.
+ * If this taglet supports {@link #isBlockTag block} tags, it will be called once
+ * for each comment containing instances of block tags, with a list of all the instances
+ * of the block tag in that comment.
+ *
+ *
The {@code docRoot} argument identifies the root of the generated output
+ * as seen by the current resource, and may be used to {@linkplain URI#resolve(String)
+ * resolve} links to other resources generated by the doclet.
+ *
+ * @apiNote The exact form of {@code docRoot} is doclet-specific. For the
+ * {@linkplain StandardDoclet standard doclet}, it is a relative URI from
+ * the current resource to the root directory of the generated output.
+ * Taglets intended for use with other doclets should check the validity
+ * of the {@code docRoot} argument as appropriate.
+ *
+ * @implSpec The default implementation invokes {@link #toString(List, Element)
+ * toString(tags, element)}.
+ *
+ * @param tags the list of instances of this tag
+ * @param element the element to which the enclosing comment belongs
+ * @param docRoot the root URI of the generated output
+ * @return the string representation of the tags to be included in
+ * the generated output
+ * @throws IllegalArgumentException if {@code docRoot} is not a valid URI
+ * @see User-Defined Taglets
+ * for the Standard Doclet
+ * @see #toString(List, Element)
+ * @since 27
+ */
+ default String toString(List tags, Element element, URI docRoot) {
+ return toString(tags, element);
+ }
+
/**
* The kind of location in which a tag may be used.
*/
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
index 66fcd90e2e8..17d56ff11ba 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -335,16 +335,9 @@ public class HtmlDoclet extends AbstractDoclet {
if (options.createIndex()) {
copyResource(DocPaths.SEARCH_JS_TEMPLATE, DocPaths.SCRIPT_FILES.resolve(DocPaths.SEARCH_JS), true);
- copyResource(DocPaths.SEARCH_PAGE_JS, DocPaths.SCRIPT_FILES.resolve(DocPaths.SEARCH_PAGE_JS), true);
copyResource(DocPaths.GLASS_SVG, DocPaths.RESOURCE_FILES.resolve(DocPaths.GLASS_SVG), false);
copyResource(DocPaths.X_SVG, DocPaths.RESOURCE_FILES.resolve(DocPaths.X_SVG), false);
- // No newline replacement for JQuery files
- copyResource(DocPaths.JQUERY_DIR.resolve(DocPaths.JQUERY_JS),
- DocPaths.SCRIPT_FILES.resolve(DocPaths.JQUERY_JS), false);
- copyResource(DocPaths.JQUERY_DIR.resolve(DocPaths.JQUERY_UI_JS),
- DocPaths.SCRIPT_FILES.resolve(DocPaths.JQUERY_UI_JS), false);
- copyResource(DocPaths.JQUERY_DIR.resolve(DocPaths.JQUERY_UI_CSS),
- DocPaths.RESOURCE_FILES.resolve(DocPaths.JQUERY_UI_CSS), false); }
+ }
copyLegalFiles(options.createIndex(), options.syntaxHighlight());
// Print a notice if the documentation contains diagnostic markers
@@ -369,7 +362,7 @@ public class HtmlDoclet extends AbstractDoclet {
case "", "default" -> {
// use a known resource as a stand-in, because we cannot get the URL for a resources directory
var url = HtmlDoclet.class.getResource(
- DocPaths.RESOURCES.resolve(DocPaths.LEGAL).resolve(DocPaths.JQUERY_MD).getPath());
+ DocPaths.RESOURCES.resolve(DocPaths.LEGAL).resolve(DocPaths.DEJAVU_MD).getPath());
if (url != null) {
try {
legalNoticesDir = Path.of(url.toURI()).getParent();
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 86ac3a892fd..594c36c4af2 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -243,12 +243,8 @@ public abstract class HtmlDocletWriter {
if (generating) {
writeGenerating();
}
- CURRENT_PATH.set(path.getPath());
}
- /** Temporary workaround to share current path with taglets, see 8373909 */
- public static final ThreadLocal CURRENT_PATH = new ThreadLocal<>();
-
/**
* The top-level method to generate and write the page represented by this writer.
*
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 a3fba7eca14..50e6207b833 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -112,6 +112,11 @@ public class HtmlIds {
static final HtmlId RELATED_PACKAGE_SUMMARY = HtmlId.of("related-package-summary");
static final HtmlId RESET_SEARCH = HtmlId.of("reset-search");
static final HtmlId SEARCH_INPUT = HtmlId.of("search-input");
+ static final HtmlId SEARCH_INPUT_CONTAINER = HtmlId.of("search-input-container");
+ static final HtmlId SEARCH_MODULES = HtmlId.of("search-modules");
+ static final HtmlId SEARCH_PAGE_LINK = HtmlId.of("search-page-link");
+ static final HtmlId SEARCH_RESULT_CONTAINER = HtmlId.of("search-result-container");
+ static final HtmlId SEARCH_RESULT_SECTION = HtmlId.of("search-result-section");
static final HtmlId SERVICES = HtmlId.of("services-summary");
static final HtmlId SKIP_NAVBAR_TOP = HtmlId.of("skip-navbar-top");
static final HtmlId THEME_BUTTON = HtmlId.of("theme-button");
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 30318bbaeea..cde5b287e25 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,6 +45,8 @@ 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.HtmlId;
+import jdk.javadoc.internal.html.HtmlTag;
import jdk.javadoc.internal.html.HtmlTree;
import jdk.javadoc.internal.html.Text;
@@ -535,6 +537,42 @@ public class Navigation {
.add(inputText)
.add(inputReset);
target.add(searchDiv);
+ target.add(HtmlTree.DIV(HtmlIds.SEARCH_RESULT_SECTION)
+ .add(HtmlTree.DIV(HtmlStyles.searchForm)
+ .add(HtmlTree.DIV(HtmlTree.LABEL(HtmlIds.SEARCH_INPUT.name(),
+ contents.getContent("doclet.search.for"))))
+ .add(HtmlTree.DIV(HtmlIds.SEARCH_INPUT_CONTAINER).addUnchecked(Text.EMPTY))
+ .add(createModuleSelector()))
+ .add(HtmlTree.DIV(HtmlIds.SEARCH_RESULT_CONTAINER).addUnchecked(Text.EMPTY))
+ .add(HtmlTree.DIV(HtmlStyles.searchLinks)
+ .add(HtmlTree.DIV(links.createLink(pathToRoot.resolve(DocPaths.SEARCH_PAGE),
+ contents.getContent("doclet.search.linkSearchPageLabel"))
+ .setId(HtmlIds.SEARCH_PAGE_LINK)))
+ .add(options.noHelp() || !options.helpFile().isEmpty()
+ ? HtmlTree.DIV(Text.EMPTY).addUnchecked(Text.EMPTY)
+ : HtmlTree.DIV(links.createLink(pathToRoot.resolve(DocPaths.HELP_DOC).fragment("search"),
+ contents.getContent("doclet.search.linkSearchHelpLabel"))))));
+ }
+
+ private Content createModuleSelector() {
+ if (!configuration.showModules || configuration.modules.size() < 2) {
+ return Text.EMPTY;
+ }
+ var content = new ContentBuilder(HtmlTree.DIV(HtmlTree.LABEL(HtmlIds.SEARCH_MODULES.name(),
+ contents.getContent("doclet.search.in_modules"))));
+ var select = HtmlTree.of(HtmlTag.SELECT)
+ .setId(HtmlIds.SEARCH_MODULES)
+ .put(HtmlAttr.ARIA_LABEL, configuration.getDocResources().getText("doclet.selectModule"))
+ .add(HtmlTree.of(HtmlTag.OPTION)
+ .put(HtmlAttr.VALUE, "")
+ .add(contents.getContent("doclet.search.all_modules")));
+
+ for (ModuleElement module : configuration.modules) {
+ select.add(HtmlTree.of(HtmlTag.OPTION)
+ .put(HtmlAttr.VALUE, module.getQualifiedName().toString())
+ .add(Text.of(module.getQualifiedName().toString())));
+ }
+ return content.add(HtmlTree.DIV(select));
}
/**
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 433a641530d..5fa0daacf98 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2026, Oracle and/or its affiliates. All rights reserved.
* 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,17 +92,15 @@ public class SearchWriter extends HtmlDocletWriter {
.add(resourceSection)
.add(HtmlTree.P(contents.getContent("doclet.search.loading"))
.setId(HtmlId.of("page-search-notify")))
- .add(HtmlTree.DIV(HtmlTree.DIV(HtmlId.of("result-container"))
+ .add(HtmlTree.DIV(HtmlTree.DIV(HtmlIds.SEARCH_RESULT_CONTAINER)
.addUnchecked(Text.EMPTY))
- .setId(HtmlId.of("result-section"))
- .put(HtmlAttr.STYLE, "display: none;")
- .add(HtmlTree.SCRIPT(pathToRoot.resolve(DocPaths.SCRIPT_FILES)
- .resolve(DocPaths.SEARCH_PAGE_JS).getPath())));
+ .setId(HtmlIds.SEARCH_RESULT_SECTION)
+ .put(HtmlAttr.STYLE, "display: none;"));
}
private Content createModuleSelector() {
- if (!configuration.showModules) {
+ if (!configuration.showModules || configuration.modules.size() < 2) {
return Text.EMPTY;
}
@@ -118,7 +116,7 @@ public class SearchWriter extends HtmlDocletWriter {
.put(HtmlAttr.VALUE, module.getQualifiedName().toString())
.add(Text.of(module.getQualifiedName().toString())));
}
- return new ContentBuilder(contents.getContent("doclet.search.in", select));
+ return new ContentBuilder(contents.getContent("doclet.search.in_modules"), select);
}
private Content createResourceSection() {
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 cda4bc9a5be..bff32cbd7bf 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -336,11 +336,6 @@ public class Head extends Content {
}
private void addStylesheets(HtmlTree head) {
- if (index) {
- // Add JQuery-UI stylesheet first so its rules can be overridden.
- addStylesheet(head, DocPaths.RESOURCE_FILES.resolve(DocPaths.JQUERY_UI_CSS));
- }
-
if (mainStylesheet == null) {
mainStylesheet = DocPaths.STYLESHEET;
}
@@ -381,8 +376,6 @@ public class Head extends Content {
.append("loadScripts();\n")
.append("initTheme();\n");
}
- addScriptElement(head, DocPaths.JQUERY_JS);
- addScriptElement(head, DocPaths.JQUERY_UI_JS);
}
for (HtmlConfiguration.JavaScriptFile javaScriptFile : additionalScripts) {
addScriptElement(head, javaScriptFile);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyles.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyles.java
index 9b59cb0cb47..2b154db7de7 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyles.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyles.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -734,6 +734,16 @@ public enum HtmlStyles implements HtmlStyle {
*/
pageSearchInfo,
+ /**
+ * The class for a {@code div} element in the search widget containing the search form inputs.
+ */
+ searchForm,
+
+ /**
+ * The class for a {@code div} element in the search widget containing search-related links.
+ */
+ searchLinks,
+
/**
* The class for a link in the static "Index" pages to a custom searchable item,
* such as defined with an {@code @index} tag.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-3.7.1.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-3.7.1.js
deleted file mode 100644
index 1a86433c223..00000000000
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/jquery/jquery-3.7.1.js
+++ /dev/null
@@ -1,10716 +0,0 @@
-/*!
- * jQuery JavaScript Library v3.7.1
- * https://jquery.com/
- *
- * Copyright OpenJS Foundation and other contributors
- * Released under the MIT license
- * https://jquery.org/license
- *
- * Date: 2023-08-28T13:37Z
- */
-( function( global, factory ) {
-
- "use strict";
-
- if ( typeof module === "object" && typeof module.exports === "object" ) {
-
- // For CommonJS and CommonJS-like environments where a proper `window`
- // is present, execute the factory and get jQuery.
- // For environments that do not have a `window` with a `document`
- // (such as Node.js), expose a factory as module.exports.
- // This accentuates the need for the creation of a real `window`.
- // e.g. var jQuery = require("jquery")(window);
- // See ticket trac-14549 for more info.
- module.exports = global.document ?
- factory( global, true ) :
- function( w ) {
- if ( !w.document ) {
- throw new Error( "jQuery requires a window with a document" );
- }
- return factory( w );
- };
- } else {
- factory( global );
- }
-
-// Pass this if window is not defined yet
-} )( typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
-
-// Edge <= 12 - 13+, Firefox <=18 - 45+, IE 10 - 11, Safari 5.1 - 9+, iOS 6 - 9.1
-// throw exceptions when non-strict code (e.g., ASP.NET 4.5) accesses strict mode
-// arguments.callee.caller (trac-13335). But as of jQuery 3.0 (2016), strict mode should be common
-// enough that all such attempts are guarded in a try block.
-"use strict";
-
-var arr = [];
-
-var getProto = Object.getPrototypeOf;
-
-var slice = arr.slice;
-
-var flat = arr.flat ? function( array ) {
- return arr.flat.call( array );
-} : function( array ) {
- return arr.concat.apply( [], array );
-};
-
-
-var push = arr.push;
-
-var indexOf = arr.indexOf;
-
-var class2type = {};
-
-var toString = class2type.toString;
-
-var hasOwn = class2type.hasOwnProperty;
-
-var fnToString = hasOwn.toString;
-
-var ObjectFunctionString = fnToString.call( Object );
-
-var support = {};
-
-var isFunction = function isFunction( obj ) {
-
- // Support: Chrome <=57, Firefox <=52
- // In some browsers, typeof returns "function" for HTML