Skip to content

8379913: [lworld] AppCDS test asserts with -Xcomp --enable-preview #2233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dafedafe wants to merge 10 commits into from
+6 −4
Closed

8379913: [lworld] AppCDS test asserts with -Xcomp --enable-preview #2233

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
aa883cb
JDK-8379913: [lworld] AppCDS test asserts with -Xcomp --enable-preview
dafedafe Mar 16, 2026
145c2d3
JDK-8379913: aarch64
dafedafe Mar 16, 2026
713f797
JDK-8379913: remove useless comment
dafedafe Mar 17, 2026
445ebd7
JDK-8379913: add VerifyOops condition
dafedafe Mar 17, 2026
cacde66
JDK-8379913: remove include
dafedafe Mar 17, 2026
cae74f8
JDK-8379913: revert adding cache entries
dafedafe Mar 26, 2026
8588e53
JDK-8379913: disable adapters caching if VerifyOops
dafedafe Mar 26, 2026
a2864a2
JDK-8379913: fix typo
dafedafe Mar 26, 2026
40625f5
Merge branch 'lworld' into JDK-8379913
dafedafe Mar 26, 2026
3793fba
JDK-8379913: make AOTAdapterCaching dependent on InlineTypePassFields…
dafedafe Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2042,6 +2042,7 @@ void MacroAssembler::_verify_oop(Register reg, const char* s, const char* file,
stringStream ss;
ss.print("verify_oop: %s: %s (%s:%d)", reg->name(), s, file, line);
b = code_string(ss.as_string());
b = AOTCodeCache::add_C_string(b);
}
BLOCK_COMMENT("verify_oop {");

Expand Down Expand Up @@ -2078,6 +2079,7 @@ void MacroAssembler::_verify_oop_addr(Address addr, const char* s, const char* f
stringStream ss;
ss.print("verify_oop_addr: %s (%s:%d)", s, file, line);
b = code_string(ss.as_string());
b = AOTCodeCache::add_C_string(b);
}
BLOCK_COMMENT("verify_oop_addr {");

Expand Down
2 changes: 2 additions & 0 deletions src/hotspot/cpu/x86/macroAssembler_x86.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4998,6 +4998,7 @@ void MacroAssembler::_verify_oop(Register reg, const char* s, const char* file,
stringStream ss;
ss.print("verify_oop: %s: %s (%s:%d)", reg->name(), s, file, line);
b = code_string(ss.as_string());
b = AOTCodeCache::add_C_string(b);
}
AddressLiteral buffer((address) b, external_word_Relocation::spec_for_immediate());
pushptr(buffer.addr(), rscratch1);
Expand Down Expand Up @@ -5266,6 +5267,7 @@ void MacroAssembler::_verify_oop_addr(Address addr, const char* s, const char* f
stringStream ss;
ss.print("verify_oop_addr: %s (%s:%d)", s, file, line);
b = code_string(ss.as_string());
b = AOTCodeCache::add_C_string(b);
}
AddressLiteral buffer((address) b, external_word_Relocation::spec_for_immediate());
pushptr(buffer.addr(), rscratch1);
Expand Down
4 changes: 4 additions & 0 deletions src/hotspot/share/code/aotCodeCache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1475,6 +1475,10 @@ void AOTCodeAddressTable::init_extrs() {
#endif
#endif // ZERO

if (VerifyOops) {
SET_ADDRESS(_extrs, StubRoutines::verify_oop_subroutine_entry_address());
}

if (UseCompressedOops) {
SET_ADDRESS(_extrs, CompressedOops::base_addr());
}
Expand Down