-
Notifications
You must be signed in to change notification settings - Fork 6.2k
8366477: Refactor AOT-related flag bits in klass.hpp #27018
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
base: master
Are you sure you want to change the base?
8366477: Refactor AOT-related flag bits in klass.hpp #27018
Conversation
👋 Welcome back iklam! A progress list of the required criteria for merging this PR into |
❗ This change is not yet ready to be integrated. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks helpful.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good.
…into 8366475-rename-metaspace-shared-to-aot-metaspace
…8366477-refactor-aot-related-flag-bits-in-klass-hpp
src/hotspot/share/oops/klass.hpp
Outdated
_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 |
There was a problem hiding this comment.
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
?
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
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 |
@iklam this pull request can not be integrated into 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 |
|
…lass -> _is_aot_generated_class
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
This PR is one (of many) steps in JDK-8366473 (Refactor CDS source code with new AOT terminology):
Klass::_shared_class_flags
toKlass::_aot_class_flags
_has_aot_safe_initializer
and_is_runtime_setup_required
fromInstanceKlassFlags
(has run out of bits) to here (we still have 7 extra bits left), to accommodate future@AOTXXX
annotations.Progress
Issue
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