Skip to content
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.

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

[Backport] 8316126: [Lilliput/JDK21] Cherry-pick: 8305895: Implementation: JEP 450: Compact Object Headers (Experimental) #74

Merged
merged 11 commits into from
Jul 18, 2024

Conversation

linade
Copy link
Collaborator

@linade linade commented Jul 9, 2024

Backport the following changes:

8316126: [Lilliput/JDK21] Cherry-pick: 8305895: Implementation: JEP 450: Compact Object Headers (Experimental)
8317954: [Lilliput/JDK21] Make C2 LoadNKlassCompactHeader more robust
8316687: [Lilliput/JDK21] Various cleanups
8319724: [Lilliput] ParallelGC: Forwarded objects found during heap inspection
8316424: [Lilliput/JDK21] ZGC/CDS-related test fixes

These make this pr equivalent to the upstream lilliput pr 13961 https://bugs.openjdk.org/browse/JDK-8305895
Differences are explained below:

src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp
src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp

Differences caused by the way we port 8139457: Relax alignment of array elements
Here we choose to do the modification in initialize_header, so as to stay consistent across major platforms (x86/aarch64/riscv).


src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp

Lilliput21 missed the change to increase itable stuff size (openjdk/jdk@467ccb8). Added back.


src/hotspot/share/cds/archiveBuilder.cpp
src/hotspot/share/cds/archiveBuilder.hpp
src/hotspot/share/cds/archiveHeapWriter.hpp
src/hotspot/share/cds/filemap.cpp
src/hotspot/share/cds/metaspaceShared.cpp

Differences in these file are caused by various CDS related changes (8311035, openjdk/jdk@a76bc68, openjdk/jdk@467ccb8)
We don't need them because we don't have 8311035 in 21.


src/hotspot/share/gc/parallel/mutableSpace.cpp
src/hotspot/share/gc/parallel/mutableSpace.hpp

This is caued by missing 8319376 (ParallelGC: Forwarded objects found during heap inspection) in 21. 8319376 will be ported to 21.0.4 later.
But to ensure correctness we still have to apply the fix (and resolve conflict when merging 21.0.4).


src/hotspot/share/jvmci/jvmciCompilerToVM.cpp

It's logically equivalent to pr 13961. No need to change.


All other differences are trivial.

@CLAassistant
Copy link

CLAassistant commented Jul 9, 2024

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
0 out of 2 committers have signed the CLA.

❌ rkennke
❌ linade
You have signed the CLA already but the status is still pending? Let us recheck it.

@linade linade requested review from mmyxym, kuaiwei and lingjun-cg July 9, 2024 03:48
@linade
Copy link
Collaborator Author

linade commented Jul 16, 2024

Copy link
Collaborator

@lingjun-cg lingjun-cg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Collaborator

@kuaiwei kuaiwei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@linade linade merged commit 64dff31 into dragonwell-project:master Jul 18, 2024
88 of 91 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants