Skip to content

Commit 33de314

Browse files
RealCLangerRealCLanger
authored
Merge pull request SAP#2275 from SAP/pr-jdk-28+2
Merge to tag jdk-28+2
2 parents fbd01da + 239be53 commit 33de314

202 files changed

Lines changed: 51742 additions & 1649 deletions

File tree

Some content is hidden

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

‎.git-blame-ignore-revs‎

Lines changed: 184 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,184 @@
1+
# git blame ignore revs file
2+
#
3+
# The list of revisions below will be ignored by git-blame (1) if this file gets
4+
# passed via the --ignore-revs-file command line option or is configured using
5+
# the blame.ignoreRevsFile key.
6+
#
7+
# Only add commits that obviously do not change semantics, e.g. mechanical refactorings
8+
# or formatting. Always add the commit message as a comment above the revision
9+
# to keep the file readable.
10+
11+
# 8299973: Replace NULL with nullptr in share/utilities/
12+
1084fd24eb118d4131538c2a3ead714db7d0357b
13+
14+
# 8299974: Replace NULL with nullptr in share/adlc/
15+
62537d200f01d58ff1c236f31f71c5839316db9e
16+
17+
# 8300081: Replace NULL with nullptr in share/asm/
18+
9d5bab11f08a992803399f422d75b17f8607df72
19+
20+
# 8300086: Replace NULL with nullptr in share/c1/
21+
90d5041b6a055d6266140ffea2aa9a3b08b32209
22+
23+
# 8300087: Replace NULL with nullptr in share/cds/
24+
eca64795be63c599a637ce2a7f740b2d0a1ec9bc
25+
26+
# 8300222: Replace NULL with nullptr in share/logging
27+
bd5ca953058704087da4bc5796b3ce28ce2a8f78
28+
29+
# 8300240: Replace NULL with nullptr in share/ci/
30+
f52d35c84b7333809156d201c866793854143888
31+
32+
# 8300241: Replace NULL with nullptr in share/classfile/
33+
49ff52087be8b95cbf369518281312ecc9d83618
34+
35+
# 8300242: Replace NULL with nullptr in share/code/
36+
cfe57466ddecb93b528478d0b053b089dd1ed285
37+
38+
# 8300243: Replace NULL with nullptr in share/compiler/
39+
fcbf9d052efd16821750fb20813f8030ee828472
40+
41+
# 8300244: Replace NULL with nullptr in share/interpreter/
42+
a5d8e12872d9de399fa97b33896635d101b71372
43+
44+
# 8300245: Replace NULL with nullptr in share/jfr/
45+
cc396895e5a1dac49f4e341ce91c04b8c092d0af
46+
47+
# 8300651: Replace NULL with nullptr in share/runtime/
48+
71107f4648d8f31a7bcc0aa5202ef46230df583f
49+
50+
# 8301068: Replace NULL with nullptr in share/jvmci/
51+
90ec19efeda90f13a918b4481fe6ee552ab2af66
52+
53+
# 8301069: Replace NULL with nullptr in share/libadt/
54+
b0376a5f4421fb58c0feeddfce2c2083314e400c
55+
56+
# 8301070: Replace NULL with nullptr in share/memory/
57+
d98a323a8b972c17a066c597a81b164681ad5589
58+
59+
# 8301072: Replace NULL with nullptr in share/oops/
60+
c8ace482edead720c865cf996729a316025d937e
61+
62+
# 8301074: Replace NULL with nullptr in share/opto/
63+
5726d31e56530bbe7dee61ae04b126e20cb3611d
64+
65+
# 8301076: Replace NULL with nullptr in share/prims/
66+
b76a52f2104b63e84e5d09f47ce01dd0cb3935d7
67+
68+
# 8301077: Replace NULL with nullptr in share/services/
69+
5c1ec82656323872c4628026662fe5b62e7a61e3
70+
71+
# 8301178: Replace NULL with nullptr in share/gc/epsilon/
72+
b77abc6a0daed0e01a9003d42493320376dc98bc
73+
74+
# 8301179: Replace NULL with nullptr in share/gc/serial/
75+
107e184d59c0bbed6441a3c1a9bfd4527da3bce5
76+
77+
# 8301180: Replace NULL with nullptr in share/gc/parallel/
78+
3758487fda61b27e7e684413793ed28c0b9e64d3
79+
80+
# 8301223: Replace NULL with nullptr in share/gc/g1/
81+
75a4edca6b9fa6b3e66b564aeb4d7ca8acf02491
82+
83+
# 8301225: Replace NULL with nullptr in share/gc/shenandoah/
84+
0c9658446d111ec944f06b7a8a4e3ae7bf53ee8d
85+
86+
# 8301477: Replace NULL with nullptr in os/aix
87+
43288bbd684abfcefdf385ed1e0307070399ccbf
88+
89+
# 8301478: Replace NULL with nullptr in os/bsd
90+
716f1df609e7f0aa7b3b9383d23dde5c71017d02
91+
92+
# 8301479: Replace NULL with nullptr in os/linux
93+
ac9e046748a9bb6ee065dc473d82135ce36043b7
94+
95+
# 8301480: Replace NULL with nullptr in os/posix
96+
4539899c55c77771b951d005c17550ef9ac94819
97+
98+
# 8301481: Replace NULL with nullptr in os/windows
99+
c91cd2814baa8dee2af8af0fecf9185d4a0a44cf
100+
101+
# 8301493: Replace NULL with nullptr in cpu/aarch64
102+
948f3b3c24709eca3aa6c3f0db6adb9226d6f9ac
103+
104+
# 8301494: Replace NULL with nullptr in cpu/arm
105+
c4ffe4bf6369d5b271aa8689b8648f3fe8dcabed
106+
107+
# 8301495: Replace NULL with nullptr in cpu/ppc
108+
0826ceee65ab83f643a77716f8f12d0060369923
109+
110+
# 8301496: Replace NULL with nullptr in cpu/riscv
111+
d2ce04bb101002abfdb7c8adb3fa8ea267903c36
112+
113+
# 8301497: Replace NULL with nullptr in cpu/s390
114+
54f7b6ca34986cc26c5b91c6724b9a1754c94391
115+
116+
# 8301498: Replace NULL with nullptr in cpu/x86
117+
4154a980ca28c1ae56db26e3dce64c07c225de12
118+
119+
# 8301499: Replace NULL with nullptr in cpu/zero
120+
4e327db1d127c652ef39e31c164e36ae429a0065
121+
122+
# 8301500: Replace NULL with nullptr in os_cpu/aix_ppc
123+
c8307e37fdf4453cade84efc113d93dd14333fd0
124+
125+
# 8301501: Replace NULL with nullptr in os_cpu/bsd_aarch64
126+
218223e4a31d485935655cb3f186a752defd8fa8
127+
128+
# 8301502: Replace NULL with nullptr in os_cpu/bsd_x86
129+
6daff6b26946748360d59a12e9069a08ab5ca06d
130+
131+
# 8301503: Replace NULL with nullptr in os_cpu/bsd_zero
132+
8cc399b672c6ce08037685b3a3a2db3c53a87b50
133+
134+
# 8301504: Replace NULL with nullptr in os_cpu/linux_aarch64
135+
13fcd602d37eb0095f169255128588b872639571
136+
137+
# 8301505: Replace NULL with nullptr in os_cpu/linux_arm
138+
b81f0ff43ac8d1431f2f5dccb7499a3a1503823d
139+
140+
# 8301506: Replace NULL with nullptr in os_cpu/linux_ppc
141+
b1e96989b693aadea082a01576e25f85ed28ff0d
142+
143+
# 8301507: Replace NULL with nullptr in os_cpu/linux_riscv
144+
182d1b2fb7034b6e9177dc360cbea43d548c3ff0
145+
146+
# 8301508: Replace NULL with nullptr in os_cpu/linux_s390
147+
d097b5e6285e1a59632211e006592fedf2047c09
148+
149+
# 8301509: Replace NULL with nullptr in os_cpu/linux_x86
150+
5d1f71daf06870810c9ca24e911d6191cc4f3006
151+
152+
# 8301511: Replace NULL with nullptr in os_cpu/linux_zero
153+
42a286a15862d9a05ea3477a9eeab46e7b33e599
154+
155+
# 8301512: Replace NULL with nullptr in os_cpu/windows_aarch64
156+
ad79e49141f063a61090eda69d96dc580db88949
157+
158+
# 8301513: Replace NULL with nullptr in os_cpu/windows_x86
159+
c109dae48c61c6fbeacadf59d509d37d2c4d2bb8
160+
161+
# 8308092: Replace NULL with nullptr in gc/x
162+
599fa774b875da971d66f79e5e43ede2b5ce18aa
163+
164+
# 8309044: Replace NULL with nullptr, final sweep of hotspot code
165+
4f16161607edbf69f423ced1d3c24f7af058d46b
166+
167+
# 8324286: Fix backsliding on use of nullptr instead of NULL
168+
bcb340da091e3287da8d2ecfcd017ebcc6613cae
169+
170+
# 8324678: Replace NULL with nullptr in HotSpot gtests
171+
c1281e6b45ed167df69d29a6039d81854c145ae6
172+
173+
# 8324679: Replace NULL with nullptr in HotSpot .ad files
174+
b3ecd55601d483359819d02e70789bbd412b13da
175+
176+
# 8324680: Replace NULL with nullptr in JVMTI generated code
177+
267780bf0adf4bfd831fbc04347e297fa8f3bb01
178+
179+
# 8324681: Replace NULL with nullptr in HotSpot jtreg test native code files
180+
a6bdee48f39993128d8095d40ab417f0102af0f4
181+
182+
# 8324799: Use correct extension for C++ test headers
183+
998d0baab0fd051c38d9fd6021628eb863b80554
184+

‎make/conf/jib-profiles.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,8 +1192,8 @@ var getJibProfilesDependencies = function (input, common) {
11921192
server: "jpg",
11931193
product: "jcov",
11941194
version: "3.0",
1195-
build_number: "5",
1196-
file: "bundles/jcov-3.0+5.zip",
1195+
build_number: "6",
1196+
file: "bundles/jcov-3.0+6.zip",
11971197
environment_name: "JCOV_HOME",
11981198
},
11991199

‎make/conf/version-numbers.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ DEFAULT_VERSION_PATCH=0
3333
DEFAULT_VERSION_EXTRA1=0
3434
DEFAULT_VERSION_EXTRA2=0
3535
DEFAULT_VERSION_EXTRA3=0
36-
DEFAULT_VERSION_DATE=2027-03-27
36+
DEFAULT_VERSION_DATE=2027-03-23
3737
DEFAULT_VERSION_CLASSFILE_MAJOR=72 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
3838
DEFAULT_VERSION_CLASSFILE_MINOR=0
3939
DEFAULT_VERSION_DOCS_API_SINCE=11

‎make/devkit/Sysroot.gmk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ endif
109109
EMPTY :=
110110
SPACE := $(EMPTY) $(EMPTY)
111111
COMMA := ,
112-
DNF_ARCHS := $(subst $(SPACE),$(COMMA),$(RPM_ARCHS))
112+
DNF_ARCHS := $(foreach arch,$(RPM_ARCHS),--arch $(arch))
113113

114114
# Specify a dummy installation root, otherwise dnf will run into
115115
# problems trying to reconcile with the local/system state
@@ -123,7 +123,7 @@ DNF_DOWNLOAD_FLAGS := \
123123
--disablerepo='*' \
124124
$(DNF_REPOS) \
125125
--resolve \
126-
--archlist $(DNF_ARCHS) \
126+
$(DNF_ARCHS) \
127127
--forcearch $(RPM_ARCH) \
128128
--installroot $(DNF_DUMMY_INSTALL_ROOT) \
129129
--releasever $(BASE_OS_VERSION) \

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8294,6 +8294,34 @@ instruct castII_checked(iRegI dst, rFlagsReg cr)
82948294
ins_pipe(pipe_slow);
82958295
%}
82968296

8297+
// The unchecked and checked variants for CastII below both use iRegINoSp for src and dst
8298+
// as some consumers of CastII node like ConvHF2F forbid the stack pointer as an input
8299+
// (please see convHF2F_reg_reg rule which requires input to be in an iRegINoSp register).
8300+
instruct castII_nosp(iRegINoSp dst)
8301+
%{
8302+
predicate(VerifyConstraintCasts == 0);
8303+
match(Set dst (CastII dst));
8304+
8305+
size(0);
8306+
format %{ "# castII of $dst" %}
8307+
ins_encode(/* empty encoding */);
8308+
ins_cost(0);
8309+
ins_pipe(pipe_class_empty);
8310+
%}
8311+
8312+
instruct castII_checked_nosp(iRegINoSp dst, rFlagsReg cr)
8313+
%{
8314+
predicate(VerifyConstraintCasts > 0);
8315+
match(Set dst (CastII dst));
8316+
effect(KILL cr);
8317+
8318+
format %{ "# castII_checked of $dst" %}
8319+
ins_encode %{
8320+
__ verify_int_in_range(_idx, bottom_type()->is_int(), $dst$$Register, rscratch1);
8321+
%}
8322+
ins_pipe(pipe_slow);
8323+
%}
8324+
82978325
instruct castLL(iRegL dst)
82988326
%{
82998327
predicate(VerifyConstraintCasts == 0);

‎src/hotspot/cpu/aarch64/aarch64_vector_ad.m4‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,9 @@ source %{
241241
return false;
242242
}
243243
break;
244-
// At the time of writing this, the Vector API has no half-float (FP16) species.
245-
// Consequently, AddReductionVHF and MulReductionVHF are only produced by the
246-
// auto-vectorizer, which requires strictly ordered semantics for FP reductions.
244+
// AddReductionVHF and MulReductionVHF are currently only produced by the
245+
// auto-vectorizer (the Vector API does not yet intrinsify Float16 reductions),
246+
// which requires strictly ordered semantics for FP reductions.
247247
//
248248
// There is no direct Neon instruction that performs strictly ordered floating
249249
// point add reduction. Hence, on Neon only machines, the add reduction operation
@@ -354,9 +354,9 @@ source %{
354354
opcode = Op_StoreVectorScatterMasked;
355355
break;
356356
// Currently, the masked versions of the following 8 Float16 operations are disabled.
357-
// When the support for Float16 vector classes is added in VectorAPI and the masked
358-
// Float16 IR can be generated, these masked operations will be enabled and relevant
359-
// backend support added.
357+
// The Vector API does not yet emit predicated Float16 IR. When such masked IR can be
358+
// generated, these masked operations will be enabled and the relevant backend support
359+
// added.
360360
case Op_AddVHF:
361361
case Op_SubVHF:
362362
case Op_MulVHF:

‎src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -976,12 +976,9 @@ void ShenandoahBarrierStubC2::lrb(MacroAssembler& masm) {
976976
if (c_rarg0 == _obj) {
977977
__ lea(c_rarg1, _addr);
978978
} else if (c_rarg1 == _obj) {
979-
// Set up arguments in reverse, and then flip them
980-
__ lea(c_rarg0, _addr);
981-
// flip them
982-
__ mov(_tmp1, c_rarg0);
983-
__ mov(c_rarg0, c_rarg1);
984-
__ mov(c_rarg1, _tmp1);
979+
__ mov(_tmp1, c_rarg1);
980+
__ lea(c_rarg1, _addr);
981+
__ mov(c_rarg0, _tmp1);
985982
} else {
986983
assert_different_registers(c_rarg1, _obj);
987984
__ lea(c_rarg1, _addr);

0 commit comments

Comments
 (0)