-
Notifications
You must be signed in to change notification settings - Fork 6.1k
8364187: Make getClassAccessFlagsRaw non-native #26517
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
Conversation
… it for arrays so we really want the "raw" classfile access flags.
👋 Welcome back coleenp! A progress list of the required criteria for merging this PR into |
@coleenp This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be:
You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 80 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
@coleenp The following labels will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command. |
Webrevs
|
…test to reflect what the JVM does.
src/java.base/share/classes/jdk/internal/reflect/Reflection.java
Outdated
Show resolved
Hide resolved
@@ -245,6 +245,7 @@ private Class(ClassLoader loader, Class<?> arrayComponentType, char mods, Protec | |||
modifiers = mods; | |||
protectionDomain = pd; | |||
primitive = isPrim; | |||
classFileAccessFlags = flags; |
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.
Its not that hard to add a field, why not have done this for identity?
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.
Fields are initialized by injection in javaClasses instead of through this constructor, so it's easy for us to accidentally forget to inject a field.
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.
For IDENTITY, I didn't have to inject that one because the Java code knew when to set it, not the JVM code reading the data out of the classfile. And the logic belongs in the Java code, not the JVM. This one comes from the classfile, there isn't another way to get the information to the java.lang.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.
The VM and Java use the same logic for the value of isIdentity().
It is computed from as many a 5 fields/flags. At present, it has to be computed on each call to Class.isIdentity().
It would be reasonable to compute the value once in the constructor, but the code in the constructor is not run.
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.
Roger, can you file another RFE for this for repo-valhalla and I can try to figure out how to best to do this? Or I can. I didn't think the valhalla isIdentityClass() code was expensive to call.
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.
Created JDK-8364447
src/java.base/share/classes/jdk/internal/reflect/Reflection.java
Outdated
Show resolved
Hide resolved
src/java.base/share/classes/jdk/internal/reflect/Reflection.java
Outdated
Show resolved
Hide resolved
Co-authored-by: ExE Boss <[email protected]>
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.
Compiler changes look good to me.
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 good, thanks
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.
These changes look reasonable.
Thank you for reviewing Tobias, Roger and Chen. |
Going to push as commit ee3665b.
Your commit was automatically rebased without conflicts. |
@@ -1741,19 +1741,6 @@ JVM_ENTRY(jobjectArray, JVM_GetClassDeclaredConstructors(JNIEnv *env, jclass ofC | |||
} | |||
JVM_END | |||
|
|||
JVM_ENTRY(jint, JVM_GetClassAccessFlags(JNIEnv *env, jclass cls)) |
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.
What about the declaration in jvm.h
?
jdk/src/hotspot/share/include/jvm.h
Line 610 in 6c52b73
JVM_GetClassAccessFlags(JNIEnv *env, jclass cls); |
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.
Created issue https://bugs.openjdk.org/browse/JDK-8364750
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.
Sorry I missed the declaration. Will fix it. Thanks for filing the bug Roger.
This change removes the intrinsic for getClassAccessFlagsRaw for reflection and initializes an rawAccessFlags field in java.lang.Class instead, that Java code can non-natively access.
Tested with tier1-4.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/26517/head:pull/26517
$ git checkout pull/26517
Update a local copy of the PR:
$ git checkout pull/26517
$ git pull https://git.openjdk.org/jdk.git pull/26517/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 26517
View PR using the GUI difftool:
$ git pr show -t 26517
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/26517.diff
Using Webrev
Link to Webrev Comment