Skip to content

8365823: Revert storing abstract and interface Klasses to non-class metaspace #27295

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
wants to merge 8 commits into from
Closed

8365823: Revert storing abstract and interface Klasses to non-class metaspace #27295

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ec610f4
8365823: Revert storing abstract and interface Klasses to non-class m…
coleenp Aug 20, 2025
864e938
8365823: Revert storing abstract and interface Klasses to non-class m…
coleenp Sep 12, 2025
48d0c6f
Restore comment.
coleenp Sep 15, 2025
2471bf5
Update src/hotspot/share/memory/metaspace.cpp
coleenp Sep 15, 2025
097c6b3
Update src/hotspot/share/memory/metaspace.cpp
coleenp Sep 15, 2025
fe44431
Remove CFP.is_abstract().
coleenp Sep 15, 2025
c333b8a
Revert JFR changes from JDK-8338526 also.
coleenp Sep 18, 2025
f1d08d6
Some limited additional cleanup to HotSpotMetaspaceConstantImpl.java …
coleenp Sep 18, 2025
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
4 changes: 2 additions & 2 deletions src/hotspot/share/memory/metaspace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -882,7 +882,7 @@ MetaWord* Metaspace::allocate(ClassLoaderData* loader_data, size_t word_size,
// Deal with concurrent unloading failed allocation starvation
MetaspaceCriticalAllocation::block_if_concurrent_purge();

MetadataType mdtype = type == MetaspaceObj::ClassType ? ClassType: NonClassType;
MetadataType mdtype = (type == MetaspaceObj::ClassType) ? ClassType : NonClassType;

// Try to allocate metadata.
MetaWord* result = loader_data->metaspace_non_null()->allocate(word_size, mdtype);
Expand Down Expand Up @@ -917,7 +917,7 @@ MetaWord* Metaspace::allocate(ClassLoaderData* loader_data, size_t word_size,
MetaWord* result = allocate(loader_data, word_size, type);

if (result == nullptr) {
MetadataType mdtype = type == MetaspaceObj::ClassType ? ClassType: NonClassType;
MetadataType mdtype = (type == MetaspaceObj::ClassType) ? ClassType : NonClassType;
tracer()->report_metaspace_allocation_failure(loader_data, word_size, type, mdtype);

// Allocation failed.
Expand Down
2 changes: 2 additions & 0 deletions src/hotspot/share/oops/klass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,8 @@ static markWord make_prototype(const Klass* kls) {
markWord prototype = markWord::prototype();
#ifdef _LP64
if (UseCompactObjectHeaders) {
// With compact object headers, the narrow Klass ID is part of the mark word.
// We therefore seed the mark word with the narrow Klass ID.
precond(CompressedKlassPointers::is_encodable(kls));
const narrowKlass nk = CompressedKlassPointers::encode(const_cast<Klass*>(kls));
prototype = prototype.set_narrow_klass(nk);
Expand Down