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

Fixes, intermediate

Browse Source
This commit is contained in:
tstuefe 2025-11-17 11:40:54 +01:00
parent 9770dbda78
commit 1cefb30382
6 changed files with 10 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
View File

@ -76,23 +76,6 @@ const Register SHIFT_count = rcx; // where count for shift operations must be
#define __ _masm->
static void select_different_registers(Register preserve,
Register extra,
Register &tmp1,
Register &tmp2) {
if (tmp1 == preserve) {
assert_different_registers(tmp1, tmp2, extra);
tmp1 = extra;
} else if (tmp2 == preserve) {
assert_different_registers(tmp1, tmp2, extra);
tmp2 = extra;
}
assert_different_registers(preserve, tmp1, tmp2);
}
static void select_different_registers(Register preserve,
Register extra,
Register &tmp1,

3
src/hotspot/share/cds/filemap.cpp
View File

@ -1907,7 +1907,8 @@ bool FileMapHeader::validate() {
file_type, compressed_oops(), compact_headers());
if (compressed_oops() != UseCompressedOops) {
aot_log_warning(aot)("Unable to use %s.\nThe saved state of UseCompressedOops (%d) is "
"different from runtime (%d), CDS will be disabled.", compressed_oops(), UseCompressedOops, file_type);
"different from runtime (%d), CDS will be disabled.", file_type,
compressed_oops(), UseCompressedOops);
return false;
}

7
src/hotspot/share/code/aotCodeCache.cpp
View File

@ -407,9 +407,6 @@ void AOTCodeCache::Config::record() {
if (UseCompressedOops) {
_flags |= compressedOops;
}
if (USE_COMPRESSED_CLASS_POINTERS_ALWAYS_TRUE) {
_flags |= compressedClassPointers;
}
if (UseTLAB) {
_flags |= useTLAB;
}
@ -452,10 +449,6 @@ bool AOTCodeCache::Config::verify() const {
return false;
}
if (((_flags & compressedClassPointers) != 0) != USE_COMPRESSED_CLASS_POINTERS_ALWAYS_TRUE) {
log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with USE_COMPRESSED_CLASS_POINTERS_ALWAYS_TRUE = %s", USE_COMPRESSED_CLASS_POINTERS_ALWAYS_TRUE ? "false" : "true");
return false;
}
if (_compressedKlassShift != (uint)CompressedKlassPointers::shift()) {
log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with CompressedKlassPointers::shift() = %d vs current %d", _compressedKlassShift, CompressedKlassPointers::shift());
return false;

11
src/hotspot/share/code/aotCodeCache.hpp
View File

@ -177,12 +177,11 @@ protected:
none = 0,
debugVM = 1,
compressedOops = 2,
compressedClassPointers = 4,
useTLAB = 8,
systemClassAssertions = 16,
userClassAssertions = 32,
enableContendedPadding = 64,
restrictContendedPadding = 128
useTLAB = 4,
systemClassAssertions = 8,
userClassAssertions = 16,
enableContendedPadding = 32,
restrictContendedPadding = 64
};
uint _flags;

13
src/hotspot/share/code/compiledIC.cpp
View File

@ -76,11 +76,7 @@ CompiledICData::CompiledICData()
// Inline cache callsite info is initialized once the first time it is resolved
void CompiledICData::initialize(CallInfo* call_info, Klass* receiver_klass) {
_speculated_method = call_info->selected_method();
if (USE_COMPRESSED_CLASS_POINTERS_ALWAYS_TRUE) {
_speculated_klass = (uintptr_t)CompressedKlassPointers::encode_not_null(receiver_klass);
} else {
_speculated_klass = (uintptr_t)receiver_klass;
}
_speculated_klass = (uintptr_t)CompressedKlassPointers::encode_not_null(receiver_klass);
if (call_info->call_kind() == CallInfo::itable_call) {
assert(call_info->resolved_method() != nullptr, "virtual or interface method must be found");
_itable_defc_klass = call_info->resolved_method()->method_holder();
@ -133,12 +129,7 @@ Klass* CompiledICData::speculated_klass() const {
if (is_speculated_klass_unloaded()) {
return nullptr;
}
if (USE_COMPRESSED_CLASS_POINTERS_ALWAYS_TRUE) {
return CompressedKlassPointers::decode_not_null((narrowKlass)_speculated_klass);
} else {
return (Klass*)_speculated_klass;
}
return CompressedKlassPointers::decode_not_null((narrowKlass)_speculated_klass);
}
//-----------------------------------------------------------------------------

2
test/hotspot/gtest/oops/test_objArrayOop.cpp
View File

@ -46,7 +46,7 @@ TEST_VM(objArrayOop, osize) {
#else
{ 8, false, false, 4 }, // 12 byte header, 4 byte oops, wordsize 4
#endif
{ -1, false, false, false, -1 }
{ -1, false, false, -1 }
};
for (int i = 0; x[i].result != -1; i++) {
if (x[i].objal == (int)ObjectAlignmentInBytes && x[i].coops == UseCompressedOops &&