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
8281266: [JVMCI] MetaUtil.toInternalName() doesn't handle hidden classes correctly #7346
Conversation
Removes the previous test that was comparing the internal name's suffix that returned by toJavaName(). As of 7cc1371 InnerClassLambdaMetafactory is generating hidden classes instead of anonymous ones for lambdas and in hidden classes the internal name's suffix needs to be converted. E.g. Foo$$Lambda$217.0x0000000800d40df0 in com/example/Foo$$Lambda$217.0x0000000800d40df0 needs to become Foo$$Lambda$217/0x0000000800d40df0, while previously it was already Foo$$Lambda$217/0x0000000800d40df0
Hi @zakkak, welcome to this OpenJDK project and thanks for contributing! We do not recognize you as Contributor and need to ensure you have signed the Oracle Contributor Agreement (OCA). If you have not signed the OCA, please follow the instructions. Please fill in your GitHub username in the "Username" field of the application. Once you have signed the OCA, please let us know by writing If you already are an OpenJDK Author, Committer or Reviewer, please click here to open a new issue so that we can record that fact. Please use "Add GitHub user zakkak" as summary for the issue. If you are contributing this work on behalf of your employer and your employer has signed the OCA, please let us know by writing |
/covered |
Thank you! Please allow for a few business days to verify that your employer has signed the OCA. Also, please note that pull requests that are pending an OCA check will not usually be evaluated, so your patience is appreciated! |
@zakkak Works for Red Hat is covered by the RH OCA. |
I've created a bug for this here: https://bugs.openjdk.java.net/browse/JDK-8281266 |
@zakkak If you update the PR title to the bug synopsis the bots should add the issue just fine. I.e. change it to:
|
Done, thanks for the ping! |
Webrevs
|
Thanks, Dalibor! |
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.
This looks fine to me. Perhaps @dougxc or @tkrodriguez want to have a look at this too?
src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MetaUtil.java
Outdated
Show resolved
Hide resolved
|
@zakkak 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 344 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. As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@jerboaa, @dougxc) but any other Committer may sponsor as well. ➡️ To flag this PR as ready for integration with the above commit message, type |
7cc1371 introduced hidden classes with internal names like com/example/Foo.1234 that get changed to com.example.Foo/1234 by Class.getName() which are not properly handled by MetaUtil's toInternalName and internalNameToJava
9093472
to
f0ac427
Compare
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.
Still good.
/integrate |
/sponsor |
Going to push as commit 0cbc4b8.
Your commit was automatically rebased without conflicts. |
7cc1371 introduced hidden classes with internal names like
com/example/Foo.1234
that get changed tocom.example.Foo/1234
byClass.getName()
which are not properly handled byMetaUtil
'stoInternalName
andinternalNameToJava
This PR fixes this along with the corresponding test that used to work on the assumption that the internal class names didn't contain the
.
character and that java class names didn't contain the/
character except for lambdas (which are now treated as hidden classes as well), an assumption that no longer holds.Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/7346/head:pull/7346
$ git checkout pull/7346
Update a local copy of the PR:
$ git checkout pull/7346
$ git pull https://git.openjdk.java.net/jdk pull/7346/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 7346
View PR using the GUI difftool:
$ git pr show -t 7346
Using diff file
Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/7346.diff