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

8264271: Avoid creating non_oop_word oops #3215

Closed

Conversation

@stefank
Copy link
Member

@stefank stefank commented Mar 26, 2021

Some parts of the JVM puts an marker to show that a location does not contain a valid oop. The code that handles this typically look like this:

oop* p = ...
if (*p != Universe::non_oop_word())

This means that sometimes the *p will create an oop that contains the non_oop_word. This makes it problematic to add stricter oop verification. I propose that we add a new function that checks the value of locations without converting it to an oop.

(Note: I'm testing the new dependent pull Skara feature with this PR. It builds depends on the pr/3214 branch)


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3215

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Mar 26, 2021

👋 Welcome back stefank! A progress list of the required criteria for merging this PR into pr/3214 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

Loading

@openjdk openjdk bot added the rfr label Mar 26, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 26, 2021

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

  • hotspot

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.

Loading

@openjdk openjdk bot added the hotspot label Mar 26, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 26, 2021

Webrevs

Loading

Copy link

@kimbarrett kimbarrett left a comment

Looks good.

Loading

@stefank
Copy link
Member Author

@stefank stefank commented Mar 29, 2021

Thanks, Kim. Now lets see what happens now that #3214 has been updated ...

Loading

@openjdk-notifier openjdk-notifier bot closed this Mar 29, 2021
@openjdk-notifier openjdk-notifier bot deleted the branch openjdk:master Mar 29, 2021
@stefank
Copy link
Member Author

@stefank stefank commented Mar 29, 2021

The bots accidentally closed this. The PR will be reopened today or tomorrow.

Loading

@rwestberg rwestberg reopened this Mar 30, 2021
@rwestberg rwestberg changed the base branch from pr/3214 to master Mar 30, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 30, 2021

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

8264271: Avoid creating non_oop_word oops

Reviewed-by: kbarrett, pliden

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 1 new commit pushed to the master branch:

  • 8100a20: 8263971: C2 crashes with SIGFPE with -XX:+StressGCM and -XX:+StressIGVN

Please see this link for an up-to-date comparison between the source branch of this pull request and 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.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Mar 30, 2021

⚠️ @stefank This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

Loading

@openjdk openjdk bot added the ready label Mar 30, 2021
pliden
pliden approved these changes Mar 30, 2021
Copy link
Contributor

@pliden pliden left a comment

Looks good!

Loading

@stefank
Copy link
Member Author

@stefank stefank commented Mar 30, 2021

Thanks, Per. I'm working with Robin to fix this branch. Currently it shows changes from the dependent branch, but after a merge with openjdk/master, this should hopefully be solved.

Loading

@stefank
Copy link
Member Author

@stefank stefank commented Mar 30, 2021

/integrate

Loading

@openjdk openjdk bot closed this Mar 30, 2021
@openjdk openjdk bot added the integrated label Mar 30, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 30, 2021

@stefank Since your change was applied there have been 11 commits pushed to the master branch:

  • daeca3f: 8262958: (fs) UnixUserDefinedFileAttributeView cleanup
  • af02883: 8264191: Javadoc search is broken in Internet Explorer
  • 6e74c3a: 8264193: Remove TRAPS parameters for modules and defaultmethods
  • ee5e00b: 8264279: Shenandoah: Missing handshake after JDK-8263427
  • ac604a1: 8264374: Shenandoah: Remove leftover parallel reference processing argument
  • f3726a8: 8264020: Optimize double negation elimination
  • 4ffa41c: 8263615: Cleanup tightly_coupled_allocation
  • 4ea6abf: 8264324: Simplify allocation list management in OopStorage::reduce_deferred_updates
  • 8735259: 8264333: Use the blessed modifier order in jdk.jshell
  • d2a63f2: 8264360: Loop strip mining verification fails with "should be on the backedge"
  • ... and 1 more: https://git.openjdk.java.net/jdk/compare/bcdf4694e07178de7d218f0dc21bda1c92e8f456...master

Your commit was automatically rebased without conflicts.

Pushed as commit 2c9365d.

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

Loading

@stefank stefank deleted the 8264271_avoid_creating_non_oop_word_oops branch May 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 participants