-
Notifications
You must be signed in to change notification settings - Fork 6.3k
8356022: Migrate descriptor parsing from generics to BytecodeDescriptor #24978
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
👋 Welcome back liach! A progress list of the required criteria for merging this PR into |
@liach 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 484 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 |
Webrevs
|
// Descriptor already validated by VM | ||
List<Class<?>> types = BytecodeDescriptor.parseMethod(enclosingInfo.getDescriptor(), getClassLoader()); | ||
types.removeLast(); | ||
Class<?>[] parameterClasses = types.toArray(EMPTY_CLASS_ARRAY); |
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.
Class<?>[] parameterClasses = types.toArray(EMPTY_CLASS_ARRAY); | |
var parameterClasses = types.toArray(EMPTY_CLASS_ARRAY); |
Here the type of parameterClasses is very clear, or you can use var
@liach This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply issue a |
@liach This pull request has been inactive for more than 8 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it! This can be done using the |
/open |
@liach This pull request is now open |
@liach This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply issue a |
@liach This pull request has been inactive for more than 8 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it! This can be done using the |
/open |
@liach This pull request is now open |
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 ok
/** | ||
* @param loader the class loader in which to look up the types (null means | ||
* bootstrap class loader) | ||
* @throws IllegalArgumentException if the descriptor is invalid |
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.
Pre-existing; the other parameters should be documented too; especially the in/out index.
Marking as draft to wait for #26909, which includes a fix tests in this patch depends on. |
Tier 1-3 clear after the JDK-8366028 is fixed. |
@liach This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply issue a |
I will merge latest master locally and run through CI before integration. |
Tier 1-3 looks good. Thanks for the reviews! /integrate |
Going to push as commit 6c8e384.
Your commit was automatically rebased without conflicts. |
Does this mean GenericSignatureFormatError will be thrown for cases where it wasn't previously thrown? If so, can you create a CSR with a summary of the compatibility impact. |
Thanks, filed CSR https://bugs.openjdk.org/browse/JDK-8368980 to document this impact. |
Such cases would have previously thrown |
As another step toward the removal of the old generics infrastructure, I propose to remove the usages of generic parsing utilities and use the facilities provided by BytecodeDescriptor, already used by MethodType.fromDescriptorString. This also prevents extra validation cost in use sites to defend against generic types.
In this patch, BytecodeDescriptor and Wrapper see minor updates, mainly for better exception messages - previously, an unparseable char in the descriptor string just reports that char, and now the whole descriptor string is reported.
These behaviors are already covered by the tests added in JDK-8350704 #23788.
Testing: reflect/annotation/Class, running tier 1+2
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/24978/head:pull/24978
$ git checkout pull/24978
Update a local copy of the PR:
$ git checkout pull/24978
$ git pull https://git.openjdk.org/jdk.git pull/24978/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 24978
View PR using the GUI difftool:
$ git pr show -t 24978
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/24978.diff
Using Webrev
Link to Webrev Comment