Skip to content

Conversation

@GoeLin
Copy link
Member

@GoeLin GoeLin commented Oct 28, 2025

I backport this for parity with 17.0.18-oracle from 21.

Resolved Copyright in verifier.hpp.

Skipped VerifierImpl.java, that was added by https://bugs.openjdk.org/browse/JDK-8294982: Implementation of Classfile API


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
  • JDK-8364660 needs maintainer approval

Issue

  • JDK-8364660: ClassVerifier::ends_in_athrow() should be removed (Enhancement - P4 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/4128/head:pull/4128
$ git checkout pull/4128

Update a local copy of the PR:
$ git checkout pull/4128
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/4128/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4128

View PR using the GUI difftool:
$ git pr show -t 4128

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/4128.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 28, 2025

👋 Welcome back goetz! 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 Oct 28, 2025

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

8364660: ClassVerifier::ends_in_athrow() should be removed

Reviewed-by: phh

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 20 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 changed the title backport 6a9bd7781ce1ddbc90712b00fd940c4ce697a1fe 8364660: ClassVerifier::ends_in_athrow() should be removed Oct 28, 2025
@openjdk
Copy link

openjdk bot commented Oct 28, 2025

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added the backport Port of a pull request already in a different code base label Oct 28, 2025
@GoeLin GoeLin marked this pull request as ready for review October 29, 2025 06:54
@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 29, 2025
@mlbridge
Copy link

mlbridge bot commented Oct 29, 2025

Webrevs

@openjdk
Copy link

openjdk bot commented Oct 29, 2025

⚠️ @GoeLin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Oct 29, 2025
@GoeLin
Copy link
Member Author

GoeLin commented Oct 29, 2025

HI @matias9927, @dean-long, @liach
I backported this pretty much as-is to 21 and 17.
@schmelter-sap noted in his review for 17 that the spec change is only for 22+.
So is it ok to backport it as I did? Or do I need to modify the change?

@openjdk openjdk bot removed the approval Requires approval; will be removed when approval is received label Oct 29, 2025
@liach
Copy link
Member

liach commented Oct 29, 2025

I believe that particular JVMS change was tracked by https://bugs.openjdk.org/browse/JDK-8302497, which removes the sentence:

Accordingly, the handler is required to either complete abruptly by throwing an exception to the caller of the enclosing method, or to loop forever.

So this JBS issue makes it clear this has been applicable to previous releases, and I believe you can backport this to much older versions.

@dean-long
Copy link
Member

@GoeLin , I can't seem to find the comment by @schmelter-sap, but I think going all the way back to jdk 8, the HotSpot implementation and the specs agree that the same exception handler can't handle both the before and after state, so if we get to the point where ends_in_athrow() is called, verification is going to fail no matter what, because of a stackmap mismatch. We have had some internal discussions here at Oracle, and agreed that ends_in_athrow() can be removed going back to jdk 8, so I think this PR is correct.

@GoeLin
Copy link
Member Author

GoeLin commented Oct 30, 2025

Hi @liach and @dean-long, thanks for shedding light on this!

@openjdk openjdk bot added approval Requires approval; will be removed when approval is received ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Oct 30, 2025
@GoeLin
Copy link
Member Author

GoeLin commented Oct 31, 2025

/integrate

@openjdk
Copy link

openjdk bot commented Oct 31, 2025

Going to push as commit 3f884a9.
Since your change was applied there have been 27 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 Oct 31, 2025
@openjdk openjdk bot closed this Oct 31, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 31, 2025
@GoeLin GoeLin deleted the goetz_backport_8364660 branch October 31, 2025 11:00
@openjdk
Copy link

openjdk bot commented Oct 31, 2025

@GoeLin Pushed as commit 3f884a9.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

4 participants