Skip to content

Conversation

liach
Copy link
Member

@liach liach commented May 1, 2025

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

  • 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-8356022: Migrate descriptor parsing from generics to BytecodeDescriptor (Sub-task - P4)

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

@bridgekeeper
Copy link

bridgekeeper bot commented May 1, 2025

👋 Welcome back liach! A progress list of the required criteria for merging this PR into master 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 May 1, 2025

@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:

8356022: Migrate descriptor parsing from generics to BytecodeDescriptor

Reviewed-by: rriggs

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 master branch:

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 master branch, type /integrate in a new comment.

@openjdk openjdk bot added the rfr Pull request is ready for review label May 1, 2025
@openjdk
Copy link

openjdk bot commented May 1, 2025

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

  • core-libs

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.

@mlbridge
Copy link

mlbridge bot commented May 1, 2025

Webrevs

// Descriptor already validated by VM
List<Class<?>> types = BytecodeDescriptor.parseMethod(enclosingInfo.getDescriptor(), getClassLoader());
types.removeLast();
Class<?>[] parameterClasses = types.toArray(EMPTY_CLASS_ARRAY);
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
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

@bridgekeeper
Copy link

bridgekeeper bot commented May 30, 2025

@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 /touch or /keepalive command to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 27, 2025

@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 pull request command.

@bridgekeeper bridgekeeper bot closed this Jun 27, 2025
@liach
Copy link
Member Author

liach commented Jun 27, 2025

/open

@openjdk openjdk bot reopened this Jun 27, 2025
@openjdk
Copy link

openjdk bot commented Jun 27, 2025

@liach This pull request is now open

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 25, 2025

@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 /touch or /keepalive command to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 22, 2025

@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 pull request command.

@bridgekeeper bridgekeeper bot closed this Aug 22, 2025
@liach
Copy link
Member Author

liach commented Aug 22, 2025

/open

@openjdk openjdk bot reopened this Aug 22, 2025
@openjdk
Copy link

openjdk bot commented Aug 22, 2025

@liach This pull request is now open

Copy link
Contributor

@RogerRiggs RogerRiggs left a 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
Copy link
Contributor

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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 22, 2025
@liach liach marked this pull request as draft August 23, 2025 02:04
@liach
Copy link
Member Author

liach commented Aug 23, 2025

Marking as draft to wait for #26909, which includes a fix tests in this patch depends on.

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Aug 23, 2025
@openjdk openjdk bot removed the rfr Pull request is ready for review label Aug 23, 2025
@liach
Copy link
Member Author

liach commented Aug 27, 2025

Tier 1-3 clear after the JDK-8366028 is fixed.

@liach liach marked this pull request as ready for review August 27, 2025 19:12
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 27, 2025
@bridgekeeper
Copy link

bridgekeeper bot commented Sep 25, 2025

@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 /touch or /keepalive command to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Sep 26, 2025
@liach
Copy link
Member Author

liach commented Sep 26, 2025

I will merge latest master locally and run through CI before integration.

@liach
Copy link
Member Author

liach commented Sep 29, 2025

Tier 1-3 looks good. Thanks for the reviews!

/integrate

@openjdk
Copy link

openjdk bot commented Sep 29, 2025

Going to push as commit 6c8e384.
Since your change was applied there have been 500 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Sep 29, 2025
@openjdk openjdk bot closed this Sep 29, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 29, 2025
@openjdk
Copy link

openjdk bot commented Sep 29, 2025

@liach Pushed as commit 6c8e384.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@AlanBateman
Copy link
Contributor

AlanBateman commented Sep 30, 2025

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.

@liach
Copy link
Member Author

liach commented Sep 30, 2025

Thanks, filed CSR https://bugs.openjdk.org/browse/JDK-8368980 to document this impact.

@ExE-Boss
Copy link

ExE-Boss commented Oct 2, 2025

Such cases would have previously thrown ClassCastException from the old AnnotationParser​::toClass(…) method.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs [email protected] integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

5 participants