Skip to content

Conversation

iklam
Copy link
Member

@iklam iklam commented Aug 30, 2025

This PR is one (of many) steps in JDK-8366473 (Refactor CDS source code with new AOT terminology):

  1. Rename from Klass::_shared_class_flags to Klass::_aot_class_flags
  2. Move _has_aot_safe_initializer and _is_runtime_setup_required from InstanceKlassFlags (has run out of bits) to here (we still have 7 extra bits left), to accommodate future @AOTXXX annotations.

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8366477: Refactor AOT-related flag bits in klass.hpp (Sub-task - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/27018/head:pull/27018
$ git checkout pull/27018

Update a local copy of the PR:
$ git checkout pull/27018
$ git pull https://git.openjdk.org/jdk.git pull/27018/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 27018

View PR using the GUI difftool:
$ git pr show -t 27018

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/27018.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 30, 2025

👋 Welcome back iklam! A progress list of the required criteria for merging this PR into pr/27017 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Aug 30, 2025

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

@openjdk
Copy link

openjdk bot commented Aug 30, 2025

@iklam The following label will be automatically applied to this pull request:

  • hotspot

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added hotspot hotspot-dev@openjdk.org rfr Pull request is ready for review labels Aug 30, 2025
@mlbridge
Copy link

mlbridge bot commented Aug 30, 2025

Webrevs

Copy link
Member

@liach liach left a comment

Choose a reason for hiding this comment

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

Looks helpful.

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

Good.

@openjdk openjdk bot mentioned this pull request Aug 31, 2025
3 tasks
_is_generated_shared_class = 1 << 5,
// archived mirror already initialized by AOT-cache assembly: no further need to call <clinit>
_has_aot_initialized_mirror = 1 << 6,
_is_generated_shared_class = 1 << 5, // This class was not loaded from a classfile in the module image
Copy link
Contributor

Choose a reason for hiding this comment

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

does it make sense to rename _is_generated_shared_class to _is_generated_aot_class?

Copy link
Member

Choose a reason for hiding this comment

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

_is_aot_generated_class sounds better.

Copy link
Member Author

Choose a reason for hiding this comment

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

I changed it to _is_aot_generated_class

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/27017 to master September 4, 2025 16:30
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout 8366477-refactor-aot-related-flag-bits-in-klass-hpp
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Sep 4, 2025

@iklam this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout 8366477-refactor-aot-related-flag-bits-in-klass-hpp
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Sep 4, 2025

⚠️ @iklam This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Sep 4, 2025
@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Sep 4, 2025
Copy link
Contributor

@ashu-mehra ashu-mehra left a comment

Choose a reason for hiding this comment

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

lgtm

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot hotspot-dev@openjdk.org rfr Pull request is ready for review
Development

Successfully merging this pull request may close these issues.

4 participants