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

JDK-8317502 Add asserts to check for non-null in ciInstance::java_lang_Class_klass #16038

Closed
wants to merge 3 commits into from

Conversation

dafedafe
Copy link
Contributor

@dafedafe dafedafe commented Oct 4, 2023

ciInstance::java_lang_Class_klass and ciTypeArrayKlass::make_impl could potentially return a null pointer (solely based on the code). A static code analyzer found out that in other places in the code this could potentially lead to a null pointer dereferencing. However we know that this will never happen: java_lang_Class::as_Klass(get_oop()) cannot be null and neither can Universe::typeArrayKlassObj(t) (there is already an explicit assert in typeArrayKlassObj).

So, this change adds an assert in ciInstance::java_lang_Class_klass ensuring that java_lang_Class::as_Klass(get_oop()) don't return nullptr (no assert in ciTypeArrayKlass::make_impl as Universe::typeArrayKlassObj(t)already includes one for _typeArrayKlassObjs[t] != nullptr).


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-8317502: Add asserts to check for non-null in ciInstance::java_lang_Class_klass (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16038

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 4, 2023

👋 Welcome back dfenacci! 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 4, 2023

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

  • hotspot-compiler

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-compiler hotspot-compiler-dev@openjdk.org label Oct 4, 2023
@dafedafe dafedafe changed the title JDK-8317502 Add asserts to check for non-null in ciInstance::java_lang_Class_klass and ciTypeArrayKlass::make_impl JDK-8317502 Add asserts to check for non-null in ciInstance::java_lang_Class_klass Oct 5, 2023
@dafedafe dafedafe marked this pull request as ready for review October 5, 2023 08:31
@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 5, 2023
@mlbridge
Copy link

mlbridge bot commented Oct 5, 2023

Webrevs

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

Good.

@openjdk
Copy link

openjdk bot commented Oct 5, 2023

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

8317502: Add asserts to check for non-null in ciInstance::java_lang_Class_klass

Reviewed-by: kvn, thartmann

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

  • 991ce84: 4964430: (spec) missing IllegalStateException exception requirement for javax.crypto.Cipher.doFinal
  • 8a30c2a: 8317443: StackOverflowError on calling ListFormat::getInstance() for Norwegian locales
  • a1c9587: 8313348: Fix typo in JFormattedTextField: 'it self'
  • a8eacb3: 8317240: Promptly free OopMapEntry after fail to insert the entry to OopMapCache
  • 4c5b66d: 8317522: Test logic for BODY_CF in AbstractThrowingSubscribers.java is wrong
  • 42be238: 8316523: Relativize esp in interpreter frames (PowerPC only)
  • a250ae4: 8317039: Enable specifying the JDK used to run jtreg
  • 1ed9c76: 8309204: Obsolete DoReserveCopyInSuperWord
  • 3630af2: 8316594: C2 SuperWord: wrong result with hand unrolled loops
  • c6c69b5: 8314654: Metaspace: move locking out of MetaspaceArena
  • ... and 112 more: https://git.openjdk.org/jdk/compare/e510dee162612d9a706ba54d0ab79a49139e77d8...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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 5, 2023
Copy link
Member

@TobiHartmann TobiHartmann 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 too.

@dafedafe
Copy link
Contributor Author

dafedafe commented Oct 6, 2023

Thank you very much for the reviews @vnkozlov @TobiHartmann.

@dafedafe
Copy link
Contributor Author

dafedafe commented Oct 6, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Oct 6, 2023

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

  • 991ce84: 4964430: (spec) missing IllegalStateException exception requirement for javax.crypto.Cipher.doFinal
  • 8a30c2a: 8317443: StackOverflowError on calling ListFormat::getInstance() for Norwegian locales
  • a1c9587: 8313348: Fix typo in JFormattedTextField: 'it self'
  • a8eacb3: 8317240: Promptly free OopMapEntry after fail to insert the entry to OopMapCache
  • 4c5b66d: 8317522: Test logic for BODY_CF in AbstractThrowingSubscribers.java is wrong
  • 42be238: 8316523: Relativize esp in interpreter frames (PowerPC only)
  • a250ae4: 8317039: Enable specifying the JDK used to run jtreg
  • 1ed9c76: 8309204: Obsolete DoReserveCopyInSuperWord
  • 3630af2: 8316594: C2 SuperWord: wrong result with hand unrolled loops
  • c6c69b5: 8314654: Metaspace: move locking out of MetaspaceArena
  • ... and 112 more: https://git.openjdk.org/jdk/compare/e510dee162612d9a706ba54d0ab79a49139e77d8...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 6, 2023

@dafedafe Pushed as commit f0d66d1.

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