infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-06 21:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove UseCCP from runtime (apart from arg)

Browse Source
This commit is contained in:
tstuefe 2025-11-17 12:38:33 +01:00
parent e74ceb987f
commit 3769b9ded4
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/hotspot/share/runtime/arguments.cpp
View File

@ -1573,7 +1573,7 @@ void Arguments::set_heap_size() {
}
#ifdef _LP64
if (UseCompressedOops || USE_COMPRESSED_CLASS_POINTERS_ALWAYS_TRUE) {
if (UseCompressedOops) {
// HeapBaseMinAddress can be greater than default but not less than.
if (!FLAG_IS_DEFAULT(HeapBaseMinAddress)) {
if (HeapBaseMinAddress < DefaultHeapBaseMinAddress) {
@ -1586,11 +1586,9 @@ void Arguments::set_heap_size() {
FLAG_SET_ERGO(HeapBaseMinAddress, DefaultHeapBaseMinAddress);
}
}
}
if (UseCompressedOops) {
uintptr_t heap_end = HeapBaseMinAddress + MaxHeapSize;
uintptr_t max_coop_heap = max_heap_for_compressed_oops();
size_t heap_end = HeapBaseMinAddress + MaxHeapSize;
size_t max_coop_heap = max_heap_for_compressed_oops();
// Limit the heap size to the maximum possible when using compressed oops
if (heap_end < max_coop_heap) {
@ -3797,10 +3795,6 @@ jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) {
void Arguments::set_compact_headers_flags() {
#ifdef _LP64
if (UseCompactObjectHeaders && FLAG_IS_CMDLINE(USE_COMPRESSED_CLASS_POINTERS_ALWAYS_TRUE) && !USE_COMPRESSED_CLASS_POINTERS_ALWAYS_TRUE) {
warning("Compact object headers require compressed class pointers. Disabling compact object headers.");
FLAG_SET_DEFAULT(UseCompactObjectHeaders, false);
}
if (UseCompactObjectHeaders && !UseObjectMonitorTable) {
// If UseCompactObjectHeaders is on the command line, turn on UseObjectMonitorTable.
if (FLAG_IS_CMDLINE(UseCompactObjectHeaders)) {
@ -3814,9 +3808,6 @@ void Arguments::set_compact_headers_flags() {
FLAG_SET_DEFAULT(UseObjectMonitorTable, true);
}
}
if (UseCompactObjectHeaders && !USE_COMPRESSED_CLASS_POINTERS_ALWAYS_TRUE) {
FLAG_SET_DEFAULT(USE_COMPRESSED_CLASS_POINTERS_ALWAYS_TRUE, true);
}
#endif
}
@ -3832,9 +3823,7 @@ jint Arguments::apply_ergo() {
set_compact_headers_flags();
if (USE_COMPRESSED_CLASS_POINTERS_ALWAYS_TRUE) {
CompressedKlassPointers::pre_initialize();
}
CompressedKlassPointers::pre_initialize();
CDSConfig::ergo_initialize();
@ -3879,10 +3868,6 @@ jint Arguments::apply_ergo() {
DebugNonSafepoints = true;
}
if (FLAG_IS_CMDLINE(CompressedClassSpaceSize) && !USE_COMPRESSED_CLASS_POINTERS_ALWAYS_TRUE) {
warning("Setting CompressedClassSpaceSize has no effect when compressed class pointers are not used");
}
// Treat the odd case where local verification is enabled but remote
// verification is not as if both were enabled.
if (BytecodeVerificationLocal && !BytecodeVerificationRemote) {

5
src/hotspot/share/runtime/os.cpp
View File

@ -1296,7 +1296,7 @@ void os::print_location(outputStream* st, intptr_t x, bool verbose) {
bool accessible = is_readable_pointer(addr);
// Check if addr points into the narrow Klass protection zone
if (USE_COMPRESSED_CLASS_POINTERS_ALWAYS_TRUE && CompressedKlassPointers::is_in_protection_zone(addr)) {
if (CompressedKlassPointers::is_in_protection_zone(addr)) {
st->print_cr(PTR_FORMAT " points into nKlass protection zone", p2i(addr));
return;
}
@ -1350,8 +1350,9 @@ void os::print_location(outputStream* st, intptr_t x, bool verbose) {
}
// Compressed klass needs to be decoded first.
// Todo: questionable for COH - can we do this better?
#ifdef _LP64
if (USE_COMPRESSED_CLASS_POINTERS_ALWAYS_TRUE && ((uintptr_t)addr &~ (uintptr_t)max_juint) == 0) {
if (((uintptr_t)addr &~ (uintptr_t)max_juint) == 0) {
narrowKlass narrow_klass = (narrowKlass)(uintptr_t)addr;
Klass* k = CompressedKlassPointers::decode_without_asserts(narrow_klass);