Skip to content

8339939: [JVMCI] Don't compress abstract and interface Klasses #20949

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 5 commits into from
Closed

8339939: [JVMCI] Don't compress abstract and interface Klasses #20949

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
df93959
make JVMCI aware that some klass pointers are not compressible
dougxc Sep 11, 2024
712272b
trim trailing whitespace
mur47x111 Sep 11, 2024
7fc4bef
Merge master
mur47x111 Oct 16, 2024
92001a8
address comments.
mur47x111 Oct 16, 2024
e44d98a
Fix JIT error.
mur47x111 Oct 16, 2024
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: 1 addition & 1 deletion src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ narrowKlass CodeInstaller::record_narrow_metadata_reference(CodeSection* section
int index = _oop_recorder->find_index(klass);
section->relocate(dest, metadata_Relocation::spec(index));
JVMCI_event_3("narrowKlass[%d of %d] = %s", index, _oop_recorder->metadata_count(), klass->name()->as_C_string());
guarantee(CompressedKlassPointers::is_in_encoding_range(klass), "klass cannot be compressed: %s", klass->external_name());
guarantee(CompressedKlassPointers::is_encodable(klass), "klass cannot be compressed: %s", klass->external_name());
return CompressedKlassPointers::encode(klass);
}
#endif
Expand Down
7 changes: 4 additions & 3 deletions src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotConstant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
import jdk.vm.ci.meta.Constant;

/**
* Marker interface for hotspot specific constants.
* A value in a space managed by Hotspot (e.g. heap or metaspace).
* Some of these values can be referenced with a compressed pointer
* instead of a full word-sized pointer.
*/
public interface HotSpotConstant extends Constant {

Expand All @@ -42,8 +44,7 @@ public interface HotSpotConstant extends Constant {
/**
* Gets a compressed version of this uncompressed constant.
*
* @throws IllegalArgumentException if this is a compressed constant
* or this constant is not compressible
* @throws IllegalArgumentException if this constant is not compressible
*/
Constant compress();

Expand Down
3 changes: 3 additions & 0 deletions src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMetaspaceConstantImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ public boolean isCompressed() {

@Override
public boolean isCompressible() {
if (compressed) {
return false;
}
if (metaspaceObject instanceof HotSpotResolvedJavaType t && !t.isArray()) {
// As of JDK-8338526, interface and abstract types are not stored
// in compressible metaspace.
Expand Down
2 changes: 1 addition & 1 deletion src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotObjectConstantImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public boolean isCompressed() {

@Override
public boolean isCompressible() {
return true;
return !compressed;
}

@Override
Expand Down