Skip to content
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

8287854: Dangling reference in ClassVerifier::verify_class #9075

Closed
wants to merge 2 commits into from

Conversation

hseigel
Copy link
Member

@hseigel hseigel commented Jun 7, 2022

Please review this small change to fix JDK_8287854. The fix was tested with JCK lang and VM tests, Mach5 tiers 1 and 2 on Linux, Mac OS, and Windows (in progress), and Mach5 tiers 3-5 on Linux x64.

Thanks, Harold


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-8287854: Dangling reference in ClassVerifier::verify_class

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/9075/head:pull/9075
$ git checkout pull/9075

Update a local copy of the PR:
$ git checkout pull/9075
$ git pull https://git.openjdk.java.net/jdk pull/9075/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9075

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/9075.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 7, 2022

👋 Welcome back hseigel! 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 openjdk bot added the rfr Pull request is ready for review label Jun 7, 2022
@openjdk
Copy link

openjdk bot commented Jun 7, 2022

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

  • hotspot-runtime

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.

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Jun 7, 2022
@mlbridge
Copy link

mlbridge bot commented Jun 8, 2022

Webrevs

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

The change is functionally correct, but this seems like a textbook case for a RAII helper class.

@openjdk
Copy link

openjdk bot commented Jun 8, 2022

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

8287854: Dangling reference in ClassVerifier::verify_class

Reviewed-by: dholmes, coleenp

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 40 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 ready Pull request is ready to be integrated label Jun 8, 2022
@iklam
Copy link
Member

iklam commented Jun 8, 2022

The change is functionally correct, but this seems like a textbook case for a RAII helper class.

I agree with David that RAII is needed here. There's one exit path that's not covered by the existing patch:

void ClassVerifier::verify_class(TRAPS) {
   ...
   verify_method(methodHandle(THREAD, m), CHECK_VERIFY(this));
   ...
}

Copy link
Contributor

@coleenp coleenp left a comment

Choose a reason for hiding this comment

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

I think this table should be created in the ClassVerifier constructor instead. Is there only this one caller of verify_class() ?
ClassVerifier split_verifier(jt, klass);
// We don't use CHECK here, or on inference_verify below, so that we can log any exception.
split_verifier.verify_class(THREAD);

@dholmes-ora
Copy link
Member

@iklam Good catch! I withdraw my approval.

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Needs further work.

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Jun 8, 2022
@hseigel
Copy link
Member Author

hseigel commented Jun 8, 2022

Please review this new fix that uses Coleen's suggestion to embed the method_signatures_table in the ClassVerifier class.

Thanks, Harold

Copy link
Contributor

@coleenp coleenp left a comment

Choose a reason for hiding this comment

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

This looks really good. The lifetime of ClassVerifier and this method signature table match.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 8, 2022
Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Much cleaner solution - thanks Harold and Coleen.

@hseigel
Copy link
Member Author

hseigel commented Jun 9, 2022

Thanks Coleen, David, and Ioi for reviewing this change.

/integrate

@openjdk
Copy link

openjdk bot commented Jun 9, 2022

Going to push as commit 3fa9984.
Since your change was applied there have been 45 commits pushed to the master branch:

  • 4285e3d: 8288023: AArch64: disable PAC-RET when preview is enabled
  • 560e292: 8287738: [PPC64] jdk/incubator/vector/*VectorTests failing
  • e5b56ba: 8288040: x86: Loom: Improve cont/monitor-count helper methods
  • 5a89cb0: 6429812: NPE after calling JTable.updateUI() when using a header renderer + XP L&F
  • bc28bae: 8287897: Augment src/jdk.internal.le/share/legal/jline.md with information on 4th party dependencies
  • aa2fc54: 8287493: 32-bit Windows build failure in codeBlob.cpp after JDK-8283689
  • 7e1cce8: 8288051: Loom: Extend the compilation warning workaround in stack chunk copy
  • 3419bee: 8286847: Rotate vectors don't support byte or short
  • e01cd7c: 8284780: Need methods to create pre-sized HashSet and LinkedHashSet
  • a941bc2: 8288082: Build failure due to clang_major is not defined after JDK-8214976
  • ... and 35 more: https://git.openjdk.java.net/jdk/compare/1aa87e0078765480bc7805e95b747addaf993cf6...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 9, 2022

@hseigel Pushed as commit 3fa9984.

💡 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
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants