Skip to content

8301005: Clean up Copy::conjoint_*_atomic on windows #12197

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

Closed
wants to merge 1 commit into from

Conversation

fisk
Copy link
Contributor

@fisk fisk commented Jan 25, 2023

The atomic copying code on windows has some logic that has been copy pasted for a bunch of types with the only difference being the type. Unfortunately, the jlong copying is using oop copying (even though the values are not at all oops), which isn't super nice. Moreover, this copy pasted sequence isn't actually using Atomic, even though it's for atomic copying, which also isn't super nice. This needs a cleanup, and this patch aims to fix that.


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-8301005: Clean up Copy::conjoint_*_atomic on windows

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12197

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 25, 2023

👋 Welcome back eosterlund! 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 25, 2023
@openjdk
Copy link

openjdk bot commented Jan 25, 2023

@fisk 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 25, 2023
@mlbridge
Copy link

mlbridge bot commented Jan 25, 2023

Webrevs

Copy link
Member

@xmas92 xmas92 left a comment

Choose a reason for hiding this comment

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

lgtm.

@fisk
Copy link
Contributor Author

fisk commented Jan 25, 2023

Thanks for the review, @xmas92!

@openjdk
Copy link

openjdk bot commented Jan 25, 2023

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

8301005: Clean up Copy::conjoint_*_atomic on windows

Reviewed-by: aboldtch, stefank, tschatzl

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

  • e80b5ea: 8299635: Hotspot update for deprecated sprintf in Xcode 14
  • f279c75: 8300805: Update autoconf build-aux files with latest from 2022-09-17
  • a23ff63: 8301086: jdk/internal/util/ByteArray/ReadWriteValues.java fails with CompilationError
  • 61775c8: 8300997: Add curl support to createJMHBundle.sh
  • 8a47429: 8295944: Move the Http2TestServer and related classes into a package of its own
  • c8ad600: 8301004: httpclient: Add more debug to HttpResponseInputStream
  • 74e1a8b: 8300236: Use VarHandle access in Data(Input | Output)Stream classes
  • a5d8e12: 8300244: Replace NULL with nullptr in share/interpreter/
  • 71107f4: 8300651: Replace NULL with nullptr in share/runtime/
  • 3c61d5a: 8300659: Refactor TestMemoryAwareness to use WhiteBox api for host values
  • ... and 39 more: https://git.openjdk.org/jdk/compare/5a4945c0d95423d0ab07762c915e9cb4d3c66abb...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 Jan 25, 2023
@fisk
Copy link
Contributor Author

fisk commented Jan 25, 2023

Thank you for the reviews, @tschatzl and @stefank!

@fisk
Copy link
Contributor Author

fisk commented Jan 26, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jan 26, 2023

Going to push as commit 14114c2.
Since your change was applied there have been 70 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 Jan 26, 2023
@openjdk openjdk bot closed this Jan 26, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 26, 2023
@openjdk
Copy link

openjdk bot commented Jan 26, 2023

@fisk Pushed as commit 14114c2.

💡 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