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

8299326: LinkResolver::resolve_field resolved_klass cannot be null #11832

Closed
wants to merge 2 commits into from

Conversation

coleenp
Copy link
Contributor

@coleenp coleenp commented Jan 3, 2023

Removed the code checking for null and add an assert for the creation of LinkInfo that the resolved_klass can't be null. Use delegating constructors for LinkInfo.
Tested with tier1-7.


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-8299326: LinkResolver::resolve_field resolved_klass cannot be null

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/11832/head:pull/11832
$ git checkout pull/11832

Update a local copy of the PR:
$ git checkout pull/11832
$ git pull https://git.openjdk.org/jdk pull/11832/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11832

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/11832.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 3, 2023

👋 Welcome back coleenp! 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 Jan 3, 2023
@openjdk
Copy link

openjdk bot commented Jan 3, 2023

@coleenp 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 Jan 3, 2023
@mlbridge
Copy link

mlbridge bot commented Jan 3, 2023

Webrevs

Copy link
Member

@iklam iklam left a comment

Choose a reason for hiding this comment

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

LGTM.

@openjdk
Copy link

openjdk bot commented Jan 3, 2023

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

8299326: LinkResolver::resolve_field resolved_klass cannot be null

Reviewed-by: iklam, fparain

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 47 new commits pushed to the master branch:

  • ea25a56: 8299520: TestPrintXML.java output error messages in case compare fails
  • 92dfc73: 8294526: sun/security/provider/SubjectCodeSource.java no longer referenced
  • 3d0db02: Merge
  • a6a903d: 8288204: GVN Crash: assert() failed: correct memory chain
  • 37f8b05: 8298592: Add java man page documentation for ChaCha20 and Poly1305 intrinsics
  • 245f0cf: 8291302: ARM32: nmethod entry barriers support
  • a9ce772: 8299437: Make InetSocketAddressHolder shallowly immutable
  • 8afd665: 8299395: Remove metaprogramming/removeCV.hpp
  • 3757433: 8295974: jni_FatalError and Xcheck:jni warnings should print the native stack when there are no Java frames
  • 417d01e: 8299441: Fix typos in some test files under core-libs component
  • ... and 37 more: https://git.openjdk.org/jdk/compare/b378381a9c5abf555c4ccf87d387d2cd77196e04...master

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.

@coleenp
Copy link
Contributor Author

coleenp commented Jan 3, 2023

Thanks, Ioi!

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 3, 2023
Copy link
Contributor

@fparain fparain left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@coleenp
Copy link
Contributor Author

coleenp commented Jan 3, 2023

Thanks Fred.

@coleenp
Copy link
Contributor Author

coleenp commented Jan 4, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jan 4, 2023

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

  • e3035ba: 8299079: Better interface nmethod oop accesses
  • 41900b5: 8189338: JMX RMI Remote Mbean server connection hangs if the server stops responding during a SSL Handshake
  • 82deb5c: 8298601: Refactor archiving of java.lang.Module objects
  • 77ff197: 7030853: JDK 7 Serializable Swing classes not compatible with JDK 6
  • 38cfc59: 8299378: sprintf is deprecated in Xcode 14
  • ea25a56: 8299520: TestPrintXML.java output error messages in case compare fails
  • 92dfc73: 8294526: sun/security/provider/SubjectCodeSource.java no longer referenced
  • 3d0db02: Merge
  • a6a903d: 8288204: GVN Crash: assert() failed: correct memory chain
  • 37f8b05: 8298592: Add java man page documentation for ChaCha20 and Poly1305 intrinsics
  • ... and 42 more: https://git.openjdk.org/jdk/compare/b378381a9c5abf555c4ccf87d387d2cd77196e04...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 4, 2023

@coleenp Pushed as commit ccbcea8.

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

@coleenp coleenp deleted the link-info branch January 4, 2023 14:48
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
3 participants