Skip to content

Commit 9f370b9

Browse files
Merge tag 'jdk-24+26' into labsjdk/adopt-jdk-24+26-master
Added tag jdk-24+26 for changeset 8485cb1
2 parents 3111873 + 8485cb1 commit 9f370b9

File tree

853 files changed

+26706
-21146
lines changed

Some content is hidden

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

853 files changed

+26706
-21146
lines changed

make/Main.gmk

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1344,9 +1344,13 @@ test-hotspot-jtreg-native: test-hotspot_native_sanity
13441344
test-hotspot-gtest: exploded-test-gtest
13451345
test-jdk-jtreg-native: test-jdk_native_sanity
13461346

1347+
# Set dependencies for doc tests
1348+
$(eval $(call AddTestDependency, docs_all, docs-jdk))
1349+
test-docs: test-docs_all
1350+
13471351
ALL_TARGETS += $(RUN_TEST_TARGETS) run-test exploded-run-test check \
13481352
test-hotspot-jtreg test-hotspot-jtreg-native test-hotspot-gtest \
1349-
test-jdk-jtreg-native
1353+
test-jdk-jtreg-native test-docs
13501354

13511355
################################################################################
13521356
################################################################################

make/MainSupport.gmk

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,15 @@ define CleanModule
137137
$(call Clean-include, $1)
138138
endef
139139

140+
define AddTestDependency
141+
test-$(strip $1): $2
142+
143+
exploded-test-$(strip $1): $2
144+
145+
ifneq ($(filter $(TEST), $1), )
146+
TEST_DEPS += $2
147+
endif
148+
endef
140149

141150
################################################################################
142151

make/hotspot/lib/JvmOverrideFiles.gmk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ ifeq ($(TOOLCHAIN_TYPE), gcc)
3737
# Need extra inlining to collapse shared marking code into the hot marking loop
3838
BUILD_LIBJVM_shenandoahMark.cpp_CXXFLAGS := --param inline-unit-growth=1000
3939
endif
40+
# disable lto in g1ParScanThreadState because of special inlining/flattening used there
41+
ifeq ($(call check-jvm-feature, link-time-opt), true)
42+
BUILD_LIBJVM_g1ParScanThreadState.cpp_CXXFLAGS := -fno-lto
43+
endif
4044
endif
4145

4246
LIBJVM_FDLIBM_COPY_OPT_FLAG := $(CXX_O_FLAG_NONE)

make/modules/java.desktop/Java.gmk

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,6 @@ EXCLUDE_FILES += \
4646
javax/swing/plaf/nimbus/SpinnerPainter.java \
4747
javax/swing/plaf/nimbus/SplitPanePainter.java \
4848
javax/swing/plaf/nimbus/TabbedPanePainter.java \
49-
sun/awt/resources/security-icon-bw16.png \
50-
sun/awt/resources/security-icon-bw24.png \
51-
sun/awt/resources/security-icon-bw32.png \
52-
sun/awt/resources/security-icon-bw48.png \
53-
sun/awt/resources/security-icon-interim16.png \
54-
sun/awt/resources/security-icon-interim24.png \
55-
sun/awt/resources/security-icon-interim32.png \
56-
sun/awt/resources/security-icon-interim48.png \
57-
sun/awt/resources/security-icon-yellow16.png \
58-
sun/awt/resources/security-icon-yellow24.png \
59-
sun/awt/resources/security-icon-yellow32.png \
60-
sun/awt/resources/security-icon-yellow48.png \
6149
sun/awt/X11/java-icon16.png \
6250
sun/awt/X11/java-icon24.png \
6351
sun/awt/X11/java-icon32.png \

make/modules/java.desktop/gensrc/GensrcIcons.gmk

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,6 @@ GENSRC_AWT_ICONS_SRC += \
3737
$(X11_ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon32.png \
3838
$(X11_ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon48.png
3939

40-
41-
AWT_ICONPATH := $(MODULE_SRC)/share/classes/sun/awt/resources
42-
43-
GENSRC_AWT_ICONS_SRC += \
44-
$(AWT_ICONPATH)/security-icon-bw16.png \
45-
$(AWT_ICONPATH)/security-icon-interim16.png \
46-
$(AWT_ICONPATH)/security-icon-yellow16.png \
47-
$(AWT_ICONPATH)/security-icon-bw24.png \
48-
$(AWT_ICONPATH)/security-icon-interim24.png \
49-
$(AWT_ICONPATH)/security-icon-yellow24.png \
50-
$(AWT_ICONPATH)/security-icon-bw32.png \
51-
$(AWT_ICONPATH)/security-icon-interim32.png \
52-
$(AWT_ICONPATH)/security-icon-yellow32.png \
53-
$(AWT_ICONPATH)/security-icon-bw48.png \
54-
$(AWT_ICONPATH)/security-icon-interim48.png \
55-
$(AWT_ICONPATH)/security-icon-yellow48.png
56-
5740
GENSRC_AWT_ICONS_FILES := $(notdir $(GENSRC_AWT_ICONS_SRC))
5841

5942
GENSRC_AWT_ICONS_SHORT_NAME = $(subst .,_,$(subst -,_,$(1)))

src/demo/share/jfc/Font2DTest/FontPanel.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,13 +1114,7 @@ public void showZoomed() {
11141114
/// Position and set size of zoom window as needed
11151115
zoomWindow.setLocation( canvasLoc.x + zoomAreaX, canvasLoc.y + zoomAreaY );
11161116
if ( !nowZooming ) {
1117-
if ( zoomWindow.getWarningString() != null )
1118-
/// If this is not opened as a "secure" window,
1119-
/// it has a banner below the zoom dialog which makes it look really BAD
1120-
/// So enlarge it by a bit
1121-
zoomWindow.setSize( zoomAreaWidth + 1, zoomAreaHeight + 20 );
1122-
else
1123-
zoomWindow.setSize( zoomAreaWidth + 1, zoomAreaHeight + 1 );
1117+
zoomWindow.setSize( zoomAreaWidth + 1, zoomAreaHeight + 1 );
11241118
}
11251119

11261120
/// Prepare zoomed image

src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ address TemplateInterpreterGenerator::generate_cont_resume_interpreter_adapter()
620620
// Restore Java expression stack pointer
621621
__ ldr(rscratch1, Address(rfp, frame::interpreter_frame_last_sp_offset * wordSize));
622622
__ lea(esp, Address(rfp, rscratch1, Address::lsl(Interpreter::logStackElementSize)));
623-
// and NULL it as marker that esp is now tos until next java call
623+
// and null it as marker that esp is now tos until next java call
624624
__ str(zr, Address(rfp, frame::interpreter_frame_last_sp_offset * wordSize));
625625

626626
// Restore machine SP

src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp

Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -2339,83 +2339,6 @@ void C2_MacroAssembler::signum_fp_v(VectorRegister dst, VectorRegister one, Basi
23392339
vfsgnj_vv(dst, one, dst, v0_t);
23402340
}
23412341

2342-
void C2_MacroAssembler::compress_bits_v(Register dst, Register src, Register mask, bool is_long) {
2343-
Assembler::SEW sew = is_long ? Assembler::e64 : Assembler::e32;
2344-
// intrinsic is enabled when MaxVectorSize >= 16
2345-
Assembler::LMUL lmul = is_long ? Assembler::m4 : Assembler::m2;
2346-
long len = is_long ? 64 : 32;
2347-
2348-
// load the src data(in bits) to be compressed.
2349-
vsetivli(x0, 1, sew, Assembler::m1);
2350-
vmv_s_x(v0, src);
2351-
// reset the src data(in bytes) to zero.
2352-
mv(t0, len);
2353-
vsetvli(x0, t0, Assembler::e8, lmul);
2354-
vmv_v_i(v4, 0);
2355-
// convert the src data from bits to bytes.
2356-
vmerge_vim(v4, v4, 1); // v0 as the implicit mask register
2357-
// reset the dst data(in bytes) to zero.
2358-
vmv_v_i(v8, 0);
2359-
// load the mask data(in bits).
2360-
vsetivli(x0, 1, sew, Assembler::m1);
2361-
vmv_s_x(v0, mask);
2362-
// compress the src data(in bytes) to dst(in bytes).
2363-
vsetvli(x0, t0, Assembler::e8, lmul);
2364-
vcompress_vm(v8, v4, v0);
2365-
// convert the dst data from bytes to bits.
2366-
vmseq_vi(v0, v8, 1);
2367-
// store result back.
2368-
vsetivli(x0, 1, sew, Assembler::m1);
2369-
vmv_x_s(dst, v0);
2370-
}
2371-
2372-
void C2_MacroAssembler::compress_bits_i_v(Register dst, Register src, Register mask) {
2373-
compress_bits_v(dst, src, mask, /* is_long */ false);
2374-
}
2375-
2376-
void C2_MacroAssembler::compress_bits_l_v(Register dst, Register src, Register mask) {
2377-
compress_bits_v(dst, src, mask, /* is_long */ true);
2378-
}
2379-
2380-
void C2_MacroAssembler::expand_bits_v(Register dst, Register src, Register mask, bool is_long) {
2381-
Assembler::SEW sew = is_long ? Assembler::e64 : Assembler::e32;
2382-
// intrinsic is enabled when MaxVectorSize >= 16
2383-
Assembler::LMUL lmul = is_long ? Assembler::m4 : Assembler::m2;
2384-
long len = is_long ? 64 : 32;
2385-
2386-
// load the src data(in bits) to be expanded.
2387-
vsetivli(x0, 1, sew, Assembler::m1);
2388-
vmv_s_x(v0, src);
2389-
// reset the src data(in bytes) to zero.
2390-
mv(t0, len);
2391-
vsetvli(x0, t0, Assembler::e8, lmul);
2392-
vmv_v_i(v4, 0);
2393-
// convert the src data from bits to bytes.
2394-
vmerge_vim(v4, v4, 1); // v0 as implicit mask register
2395-
// reset the dst data(in bytes) to zero.
2396-
vmv_v_i(v12, 0);
2397-
// load the mask data(in bits).
2398-
vsetivli(x0, 1, sew, Assembler::m1);
2399-
vmv_s_x(v0, mask);
2400-
// expand the src data(in bytes) to dst(in bytes).
2401-
vsetvli(x0, t0, Assembler::e8, lmul);
2402-
viota_m(v8, v0);
2403-
vrgather_vv(v12, v4, v8, VectorMask::v0_t); // v0 as implicit mask register
2404-
// convert the dst data from bytes to bits.
2405-
vmseq_vi(v0, v12, 1);
2406-
// store result back.
2407-
vsetivli(x0, 1, sew, Assembler::m1);
2408-
vmv_x_s(dst, v0);
2409-
}
2410-
2411-
void C2_MacroAssembler::expand_bits_i_v(Register dst, Register src, Register mask) {
2412-
expand_bits_v(dst, src, mask, /* is_long */ false);
2413-
}
2414-
2415-
void C2_MacroAssembler::expand_bits_l_v(Register dst, Register src, Register mask) {
2416-
expand_bits_v(dst, src, mask, /* is_long */ true);
2417-
}
2418-
24192342
// j.l.Math.round(float)
24202343
// Returns the closest int to the argument, with ties rounding to positive infinity.
24212344
// We need to handle 3 special cases defined by java api spec:

src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@
3939
VectorRegister vrs,
4040
bool is_latin, Label& DONE, Assembler::LMUL lmul);
4141

42-
void compress_bits_v(Register dst, Register src, Register mask, bool is_long);
43-
void expand_bits_v(Register dst, Register src, Register mask, bool is_long);
44-
4542
public:
4643
// Code used by cmpFastLock and cmpFastUnlock mach instructions in .ad file.
4744
void fast_lock(Register object, Register box,
@@ -184,13 +181,6 @@
184181

185182
// intrinsic methods implemented by rvv instructions
186183

187-
// compress bits, i.e. j.l.Integer/Long::compress.
188-
void compress_bits_i_v(Register dst, Register src, Register mask);
189-
void compress_bits_l_v(Register dst, Register src, Register mask);
190-
// expand bits, i.e. j.l.Integer/Long::expand.
191-
void expand_bits_i_v(Register dst, Register src, Register mask);
192-
void expand_bits_l_v(Register dst, Register src, Register mask);
193-
194184
void java_round_float_v(VectorRegister dst, VectorRegister src, FloatRegister ftmp, BasicType bt, uint vector_length);
195185
void java_round_double_v(VectorRegister dst, VectorRegister src, FloatRegister ftmp, BasicType bt, uint vector_length);
196186

src/hotspot/cpu/riscv/interp_masm_riscv.cpp

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -179,15 +179,10 @@ void InterpreterMacroAssembler::check_and_handle_earlyret(Register java_thread)
179179

180180
void InterpreterMacroAssembler::get_unsigned_2_byte_index_at_bcp(Register reg, int bcp_offset) {
181181
assert(bcp_offset >= 0, "bcp is still pointing to start of bytecode");
182-
if (AvoidUnalignedAccesses && (bcp_offset % 2)) {
183-
lbu(t1, Address(xbcp, bcp_offset));
184-
lbu(reg, Address(xbcp, bcp_offset + 1));
185-
slli(t1, t1, 8);
186-
add(reg, reg, t1);
187-
} else {
188-
lhu(reg, Address(xbcp, bcp_offset));
189-
revb_h_h_u(reg, reg);
190-
}
182+
lbu(t1, Address(xbcp, bcp_offset));
183+
lbu(reg, Address(xbcp, bcp_offset + 1));
184+
slli(t1, t1, 8);
185+
add(reg, reg, t1);
191186
}
192187

193188
void InterpreterMacroAssembler::get_dispatch() {
@@ -200,15 +195,7 @@ void InterpreterMacroAssembler::get_cache_index_at_bcp(Register index,
200195
size_t index_size) {
201196
assert(bcp_offset > 0, "bcp is still pointing to start of bytecode");
202197
if (index_size == sizeof(u2)) {
203-
if (AvoidUnalignedAccesses) {
204-
assert_different_registers(index, tmp);
205-
load_unsigned_byte(index, Address(xbcp, bcp_offset));
206-
load_unsigned_byte(tmp, Address(xbcp, bcp_offset + 1));
207-
slli(tmp, tmp, 8);
208-
add(index, index, tmp);
209-
} else {
210-
load_unsigned_short(index, Address(xbcp, bcp_offset));
211-
}
198+
load_short_misaligned(index, Address(xbcp, bcp_offset), tmp, false);
212199
} else if (index_size == sizeof(u4)) {
213200
load_int_misaligned(index, Address(xbcp, bcp_offset), tmp, false);
214201
} else if (index_size == sizeof(u1)) {

0 commit comments

Comments
 (0)