Skip to content

Commit b4341bd

Browse files
biboudisbiboudis
committed
Merge remote-tracking branch 'refs/remotes/upstream-amber/master' into matchers-experiment
# Conflicts: # src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java # src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java # src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java # test/jdk/jdk/classfile/StackMapsTest.java
2 parents 987a35a + 902c2af commit b4341bd

File tree

1,396 files changed

+41148
-17915
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,396 files changed

+41148
-17915
lines changed

‎.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146
apt-architecture: 'i386'
147147
# Some multilib libraries do not have proper inter-dependencies, so we have to
148148
# install their dependencies manually.
149-
apt-extra-packages: 'libfreetype-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libc6-i386 libgcc-s1:i386 libstdc++6:i386 libffi-dev:i386'
149+
apt-extra-packages: 'libfreetype-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libffi-dev:i386'
150150
extra-conf-options: '--with-target-bits=32 --enable-fallback-linker --enable-libffi-bundling'
151151
configure-arguments: ${{ github.event.inputs.configure-arguments }}
152152
make-arguments: ${{ github.event.inputs.make-arguments }}

‎.jcheck/conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version=24
55

66
[checks]
77
error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists
8-
warning=issuestitle
8+
warning=issuestitle,binary
99

1010
[repository]
1111
tags=(?:jdk-(?:[1-9]([0-9]*)(?:\.(?:0|[1-9][0-9]*)){0,4})(?:\+(?:(?:[0-9]+))|(?:-ga)))|(?:jdk[4-9](?:u\d{1,3})?-(?:(?:b\d{2,3})|(?:ga)))|(?:hs\d\d(?:\.\d{1,2})?-b\d\d)

‎doc/ide.html

+6-5
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,12 @@ <h5 id="alternative-indexers">Alternative indexers</h5>
6363
<p>The main <code>vscode-project</code> target configures the default
6464
C++ support in Visual Studio Code. There are also other source indexers
6565
that can be installed, that may provide additional features. It's
66-
currently possible to generate configuration for two such indexers, <a
67-
href="https://clang.llvm.org/extra/clangd/">clangd</a> and <a
68-
href="https://github.com/Andersbakken/rtags">rtags</a>. These can be
69-
configured by appending the name of the indexer to the make target, such
70-
as:</p>
66+
currently possible to generate configuration for three such indexers, <a
67+
href="https://clang.llvm.org/extra/clangd/">clangd</a>, <a
68+
href="https://github.com/MaskRay/ccls/wiki/Visual-Studio-Code">ccls</a>
69+
and <a href="https://github.com/Andersbakken/rtags">rtags</a>. These can
70+
be configured by appending the name of the indexer to the make target,
71+
such as:</p>
7172
<pre class="shell"><code>make vscode-project-clangd</code></pre>
7273
<p>Additional instructions for configuring the given indexer will be
7374
displayed after the workspace has been generated.</p>

‎doc/ide.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ choose `File -> Open Workspace...` in Visual Studio Code.
3232
The main `vscode-project` target configures the default C++ support in Visual
3333
Studio Code. There are also other source indexers that can be installed, that
3434
may provide additional features. It's currently possible to generate
35-
configuration for two such indexers, [clangd](https://clang.llvm.org/extra/clangd/)
35+
configuration for three such indexers, [clangd](https://clang.llvm.org/extra/clangd/),
36+
[ccls](https://github.com/MaskRay/ccls/wiki/Visual-Studio-Code)
3637
and [rtags](https://github.com/Andersbakken/rtags). These can be configured by
3738
appending the name of the indexer to the make target, such as:
3839

‎make/Docs.gmk

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
22
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
33
#
44
# This code is free software; you can redistribute it and/or modify it
@@ -714,7 +714,7 @@ SPEC_HEADER_BLOCK := \
714714
<div class="navbar"> \
715715
<div>$(HEADER_RIGHT_SIDE_INFO)</div> \
716716
<nav><ul><li><a href="PATH_TO_SPECS/../api/index.html">API</a> \
717-
<li><a href="PATH_TO_SPECS/index.html">OTHER SPECIFICATIONS \
717+
<li><a href="PATH_TO_SPECS/index.html">OTHER SPECIFICATIONS</a> \
718718
<li><a href="PATH_TO_SPECS/man/index.html">TOOL GUIDES</a></ul></nav> \
719719
</div> \
720720
</header>

‎make/GenerateLinkOptData.gmk

+13-3
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,23 @@ ifeq ($(EXTERNAL_BUILDJDK), true)
6262
INTERIM_IMAGE_DIR := $(BUILD_JDK)
6363
endif
6464

65+
# To make the classlist deterministic:
66+
# - The classlist can be influenced by locale. Always set it to en/US.
67+
# - Concurrency in the core libraries can cause constant pool resolution
68+
# to be non-deterministic. Since the benefits of resolved CP references in the
69+
# default classlist is minimal, let's filter out the '@cp' lines until we can
70+
# find a proper solution.
71+
CLASSLIST_FILE_VM_OPTS = \
72+
-Duser.language=en -Duser.country=US
73+
6574
# Save the stderr output of the command and print it along with stdout in case
6675
# something goes wrong.
6776
$(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST_JAR)
6877
$(call MakeDir, $(LINK_OPT_DIR))
6978
$(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $@))
7079
$(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $(JLI_TRACE_FILE)))
7180
$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.raw \
72-
-Duser.language=en -Duser.country=US \
81+
$(CLASSLIST_FILE_VM_OPTS) \
7382
-cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
7483
build.tools.classlist.HelloClasslist $(LOG_DEBUG)
7584
$(GREP) -v HelloClasslist $@.raw > $@.interim
@@ -79,7 +88,7 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
7988
$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.raw.2 \
8089
-XX:SharedClassListFile=$@.interim -XX:SharedArchiveFile=$@.jsa \
8190
-Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true \
82-
-Duser.language=en -Duser.country=US \
91+
$(CLASSLIST_FILE_VM_OPTS) \
8392
--module-path $(SUPPORT_OUTPUTDIR)/classlist.jar \
8493
-cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
8594
build.tools.classlist.HelloClasslist \
@@ -92,9 +101,10 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
92101
exit $$exitcode \
93102
)
94103
$(GREP) -v HelloClasslist $@.raw.2 > $@.raw.3
104+
$(GREP) -v @cp $@.raw.3 > $@.raw.4
95105
$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java \
96106
-cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
97-
build.tools.classlist.SortClasslist $@.raw.3 > $@
107+
build.tools.classlist.SortClasslist $@.raw.4 > $@
98108

99109
# The jli trace is created by the same recipe as classlist. By declaring these
100110
# dependencies, make will correctly rebuild both jli trace and classlist

‎make/InitSupport.gmk

+5-5
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ ifeq ($(HAS_SPEC),)
6363

6464
# The variable MAKEOVERRIDES contains variable assignments from the command
6565
# line, but in reverse order to what the user entered.
66-
# The '\#' <=> '\ 'dance is needed to keep values with space in them connected.
67-
COMMAND_LINE_VARIABLES := $(subst \#,\ , $(call reverse, $(subst \ ,\#,$(MAKEOVERRIDES))))
66+
# The '§' <=> '\ 'dance is needed to keep values with space in them connected.
67+
COMMAND_LINE_VARIABLES := $(subst §,\ , $(call reverse, $(subst \ ,§,$(MAKEOVERRIDES))))
6868

6969
# A list like FOO="val1" BAR="val2" containing all user-supplied make
7070
# variables that we should propagate.
71-
# The '\#' <=> '\ 'dance is needed to keep values with space in them connected.
72-
USER_MAKE_VARS := $(subst \#,\ , $(filter-out $(addsuffix =%, $(INIT_CONTROL_VARIABLES)), \
73-
$(subst \ ,\#,$(MAKEOVERRIDES))))
71+
# The '§' <=> '\ 'dance is needed to keep values with space in them connected.
72+
USER_MAKE_VARS := $(subst §,\ , $(filter-out $(addsuffix =%, $(INIT_CONTROL_VARIABLES)), \
73+
$(subst \ ,§,$(MAKEOVERRIDES))))
7474

7575
# Setup information about available configurations, if any.
7676
ifneq ($(CUSTOM_ROOT), )

‎make/autoconf/flags-cflags.m4

+6-6
Original file line numberDiff line numberDiff line change
@@ -502,12 +502,12 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
502502
elif test "x$TOOLCHAIN_TYPE" = xclang; then
503503
ALWAYS_DEFINES_JVM="-D_GNU_SOURCE"
504504
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
505-
# Access APIs for Windows 8 and above
506-
# see https://docs.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt?view=msvc-170
507-
ALWAYS_DEFINES_JDK="-DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0602 \
508-
-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DWIN32 -DIAL"
509-
ALWAYS_DEFINES_JVM="-DNOMINMAX -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0602 \
510-
-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE"
505+
# _WIN32_WINNT=0x0602 means access APIs for Windows 8 and above. See
506+
# https://docs.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt?view=msvc-170
507+
ALWAYS_DEFINES="-DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0602 \
508+
-D_CRT_DECLARE_NONSTDC_NAMES -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS"
509+
ALWAYS_DEFINES_JDK="$ALWAYS_DEFINES -DWIN32 -DIAL"
510+
ALWAYS_DEFINES_JVM="$ALWAYS_DEFINES -DNOMINMAX"
511511
fi
512512
513513
###############################################################################

‎make/autoconf/jdk-options.m4

+20-4
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,8 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
197197
# three different page sizes: 4K, 64K, and if run on Mac m1 hardware, 16K.
198198
COMPATIBLE_CDS_ALIGNMENT_DEFAULT=false
199199
if test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
200-
COMPATIBLE_CDS_ALIGNMENT_DEFAULT=true
200+
COMPATIBLE_CDS_ALIGNMENT_DEFAULT=auto
201201
fi
202-
AC_SUBST(COMPATIBLE_CDS_ALIGNMENT_DEFAULT)
203202
204203
# Compress jars
205204
COMPRESS_JARS=false
@@ -438,12 +437,23 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_ADDRESS_SANITIZER],
438437
# It's harmless to be suppressed in clang as well.
439438
ASAN_CFLAGS="-fsanitize=address -Wno-stringop-truncation -fno-omit-frame-pointer -fno-common -DADDRESS_SANITIZER"
440439
ASAN_LDFLAGS="-fsanitize=address"
440+
# detect_stack_use_after_return causes ASAN to offload stack-local
441+
# variables to c-heap and therefore breaks assumptions in hotspot
442+
# that rely on data (e.g. Marks) living in thread stacks.
443+
if test "x$TOOLCHAIN_TYPE" = "xgcc"; then
444+
ASAN_CFLAGS="$ASAN_CFLAGS --param asan-use-after-return=0"
445+
fi
446+
if test "x$TOOLCHAIN_TYPE" = "xclang"; then
447+
ASAN_CFLAGS="$ASAN_CFLAGS -fsanitize-address-use-after-return=never"
448+
fi
441449
elif test "x$TOOLCHAIN_TYPE" = "xmicrosoft"; then
442450
# -Oy- is equivalent to -fno-omit-frame-pointer in GCC/Clang.
443451
ASAN_CFLAGS="-fsanitize=address -Oy- -DADDRESS_SANITIZER"
444452
# MSVC produces a warning if you pass -fsanitize=address to the linker. It also complains
445453
$ if -DEBUG is not passed to the linker when building with ASan.
446454
ASAN_LDFLAGS="-debug"
455+
# -fsanitize-address-use-after-return is off by default in MS Visual Studio 22 (19.37.32824).
456+
# cl : Command line warning D9002 : ignoring unknown option '-fno-sanitize-address-use-after-return'
447457
fi
448458
JVM_CFLAGS="$JVM_CFLAGS $ASAN_CFLAGS"
449459
JVM_LDFLAGS="$JVM_LDFLAGS $ASAN_LDFLAGS"
@@ -496,9 +506,15 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_LEAK_SANITIZER],
496506
#
497507
AC_DEFUN_ONCE([JDKOPT_SETUP_UNDEFINED_BEHAVIOR_SANITIZER],
498508
[
509+
UTIL_ARG_WITH(NAME: additional-ubsan-checks, TYPE: string,
510+
DEFAULT: [],
511+
DESC: [Customizes the ubsan checks],
512+
OPTIONAL: true)
513+
499514
# GCC reports lots of likely false positives for stringop-truncation and format-overflow.
500515
# Silence them for now.
501-
UBSAN_CHECKS="-fsanitize=undefined -fsanitize=float-divide-by-zero -fno-sanitize=shift-base -fno-sanitize=alignment"
516+
UBSAN_CHECKS="-fsanitize=undefined -fsanitize=float-divide-by-zero -fno-sanitize=shift-base -fno-sanitize=alignment \
517+
$ADDITIONAL_UBSAN_CHECKS"
502518
UBSAN_CFLAGS="$UBSAN_CHECKS -Wno-stringop-truncation -Wno-format-overflow -fno-omit-frame-pointer -DUNDEFINED_BEHAVIOR_SANITIZER"
503519
UBSAN_LDFLAGS="$UBSAN_CHECKS"
504520
UTIL_ARG_ENABLE(NAME: ubsan, DEFAULT: false, RESULT: UBSAN_ENABLED,
@@ -666,7 +682,7 @@ AC_DEFUN([JDKOPT_ENABLE_DISABLE_COMPATIBLE_CDS_ALIGNMENT],
666682
UTIL_ARG_ENABLE(NAME: compatible-cds-alignment, DEFAULT: $COMPATIBLE_CDS_ALIGNMENT_DEFAULT,
667683
RESULT: ENABLE_COMPATIBLE_CDS_ALIGNMENT,
668684
DESC: [enable use alternative compatible cds core region alignment],
669-
DEFAULT_DESC: [disabled],
685+
DEFAULT_DESC: [disabled except on linux-aarch64],
670686
CHECKING_MSG: [if compatible cds region alignment enabled],
671687
CHECK_AVAILABLE: [
672688
AC_MSG_CHECKING([if CDS archive is available])

‎make/autoconf/lib-tests.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
2828
################################################################################
2929

3030
# Minimum supported versions
31-
JTREG_MINIMUM_VERSION=7.3.1
31+
JTREG_MINIMUM_VERSION=7.4
3232
GTEST_MINIMUM_VERSION=1.14.0
3333

3434
###############################################################################

‎make/conf/github-actions.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# Versions and download locations for dependencies used by GitHub Actions (GHA)
2727

2828
GTEST_VERSION=1.14.0
29-
JTREG_VERSION=7.3.1+1
29+
JTREG_VERSION=7.4+1
3030

3131
LINUX_X64_BOOT_JDK_EXT=tar.gz
3232
LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk22/830ec9fcccef480bb3e73fb7ecafe059/36/GPL/openjdk-22_linux-x64_bin.tar.gz

‎make/conf/jib-profiles.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1184,9 +1184,9 @@ var getJibProfilesDependencies = function (input, common) {
11841184
jtreg: {
11851185
server: "jpg",
11861186
product: "jtreg",
1187-
version: "7.3.1",
1187+
version: "7.4",
11881188
build_number: "1",
1189-
file: "bundles/jtreg-7.3.1+1.zip",
1189+
file: "bundles/jtreg-7.4+1.zip",
11901190
environment_name: "JT_HOME",
11911191
environment_path: input.get("jtreg", "home_path") + "/bin",
11921192
configure_args: "--with-jtreg=" + input.get("jtreg", "home_path"),

‎make/hotspot/lib/JvmFeatures.gmk

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ ifneq ($(call check-jvm-feature, jvmti), true)
8484
jvmtiImpl.cpp jvmtiManageCapabilities.cpp jvmtiRawMonitor.cpp jvmtiUtil.cpp jvmtiTrace.cpp \
8585
jvmtiCodeBlobEvents.cpp jvmtiEnv.cpp jvmtiRedefineClasses.cpp jvmtiEnvBase.cpp jvmtiEnvThreadState.cpp \
8686
jvmtiTagMap.cpp jvmtiEventController.cpp evmCompat.cpp jvmtiEnter.xsl jvmtiExport.cpp \
87-
jvmtiClassFileReconstituter.cpp jvmtiTagMapTable.cpp jvmtiAgent.cpp jvmtiAgentList.cpp
87+
jvmtiClassFileReconstituter.cpp jvmtiTagMapTable.cpp jvmtiAgent.cpp jvmtiAgentList.cpp jfrJvmtiAgent.cpp
8888
endif
8989

9090
ifneq ($(call check-jvm-feature, jvmci), true)

‎make/jdk/src/classes/build/tools/fixuppandoc/Main.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -638,7 +638,7 @@ void write(PrintWriter out) {
638638
index++;
639639
}
640640
boolean updateEndTd = false;
641-
Pattern styleAttr = Pattern.compile("(?<before>.*style=\")(?<style>[^\"]*)(?<after>\".*)");
641+
Pattern styleAttr = Pattern.compile("(?s)(?<before>.*style=\")(?<style>[^\"]*)(?<after>\".*)");
642642
for (Entry e : entries) {
643643
if (simple && e.column == maxIndex) {
644644
String attrs = e.html.substring(3, e.html.length() - 1);

‎make/jdk/src/classes/build/tools/intpoly/FieldGen.java

+2-8
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ private String generate(FieldParams params) throws IOException {
778778
result.appendLine("}");
779779

780780
result.appendLine("@Override");
781-
result.appendLine("protected int mult(long[] a, long[] b, long[] r) {");
781+
result.appendLine("protected void mult(long[] a, long[] b, long[] r) {");
782782
result.incrIndent();
783783
for (int i = 0; i < 2 * params.getNumLimbs() - 1; i++) {
784784
result.appendIndent();
@@ -804,9 +804,6 @@ private String generate(FieldParams params) throws IOException {
804804
}
805805
}
806806
result.append(");\n");
807-
result.appendIndent();
808-
result.append("return 0;");
809-
result.appendLine();
810807
result.decrIndent();
811808
result.appendLine("}");
812809

@@ -836,7 +833,7 @@ private String generate(FieldParams params) throws IOException {
836833
// }
837834
// }
838835
result.appendLine("@Override");
839-
result.appendLine("protected int square(long[] a, long[] r) {");
836+
result.appendLine("protected void square(long[] a, long[] r) {");
840837
result.incrIndent();
841838
for (int i = 0; i < 2 * params.getNumLimbs() - 1; i++) {
842839
result.appendIndent();
@@ -877,9 +874,6 @@ private String generate(FieldParams params) throws IOException {
877874
}
878875
}
879876
result.append(");\n");
880-
result.appendIndent();
881-
result.append("return 0;");
882-
result.appendLine();
883877
result.decrIndent();
884878
result.appendLine("}");
885879

‎make/jdk/src/classes/build/tools/taglet/SealedGraph.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -107,7 +107,7 @@ public String toString(List<? extends DocTree> tags, Element element) {
107107
throw new RuntimeException(e);
108108
}
109109

110-
String simpleTypeName = element.getSimpleName().toString();
110+
String simpleTypeName = packagelessCanonicalName(typeElement).replace('.', '/');
111111
String imageFile = simpleTypeName + "-sealed-graph.svg";
112112
int thumbnailHeight = 100; // also appears in the stylesheet
113113
String hoverImage = "<span>"
@@ -315,14 +315,14 @@ private static Optional<String> packageName(TypeElement element) {
315315
case MEMBER -> packageName((TypeElement) element.getEnclosingElement());
316316
};
317317
}
318+
}
318319

319-
private static String packagelessCanonicalName(TypeElement element) {
320-
String result = element.getSimpleName().toString();
321-
while (element.getNestingKind() == NestingKind.MEMBER) {
322-
element = (TypeElement) element.getEnclosingElement();
323-
result = element.getSimpleName().toString() + '.' + result;
324-
}
325-
return result;
320+
private static String packagelessCanonicalName(TypeElement element) {
321+
String result = element.getSimpleName().toString();
322+
while (element.getNestingKind() == NestingKind.MEMBER) {
323+
element = (TypeElement) element.getEnclosingElement();
324+
result = element.getSimpleName().toString() + '.' + result;
326325
}
326+
return result;
327327
}
328328
}

‎make/modules/java.desktop/lib/ClientLibraries.gmk

+1
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@ endif
281281
ifeq ($(USE_EXTERNAL_HARFBUZZ), true)
282282
LIBFONTMANAGER_EXTRA_SRC =
283283
LIBFONTMANAGER_LIBS += $(HARFBUZZ_LIBS)
284+
LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)
284285
else
285286
LIBFONTMANAGER_EXTRA_SRC = libharfbuzz
286287

‎make/modules/jdk.jdeps/Launcher.gmk

+9
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,12 @@ $(eval $(call SetupBuildLauncher, jdeprscan, \
5151
MAIN_CLASS := com.sun.tools.jdeprscan.Main, \
5252
CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
5353
))
54+
55+
################################################################################
56+
## Build jnativescan
57+
################################################################################
58+
59+
$(eval $(call SetupBuildLauncher, jnativescan, \
60+
MAIN_CLASS := com.sun.tools.jnativescan.Main, \
61+
CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
62+
))

‎make/src/classes/build/tools/jfr/GenerateJfrFiles.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ private static void printJfrEventControlHpp(Metadata metadata, File outputFile)
668668
out.write(" // add named struct members also.");
669669
out.write(" struct {");
670670
out.write(" jfrNativeEventSetting pad[NUMBER_OF_RESERVED_EVENTS];");
671-
for (TypeElement t : metadata.getEventsAndStructs()) {
671+
for (TypeElement t : metadata.getEvents()) {
672672
out.write(" jfrNativeEventSetting " + t.name + ";");
673673
}
674674
out.write(" } ev;");

‎src/hotspot/cpu/aarch64/aarch64.ad

+1-1
Original file line numberDiff line numberDiff line change
@@ -3360,7 +3360,7 @@ encode %{
33603360
}
33613361
%}
33623362

3363-
/// mov envcodings
3363+
// mov encodings
33643364

33653365
enc_class aarch64_enc_movw_imm(iRegI dst, immI src) %{
33663366
uint32_t con = (uint32_t)$src$$constant;

‎src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1154,7 +1154,7 @@ void C2_MacroAssembler::string_compare(Register str1, Register str2,
11541154

11551155
BLOCK_COMMENT("string_compare {");
11561156

1157-
// Bizzarely, the counts are passed in bytes, regardless of whether they
1157+
// Bizarrely, the counts are passed in bytes, regardless of whether they
11581158
// are L or U strings, however the result is always in characters.
11591159
if (!str1_isL) asrw(cnt1, cnt1, 1);
11601160
if (!str2_isL) asrw(cnt2, cnt2, 1);

0 commit comments

Comments
 (0)