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

8292443: Weak CAS VarHandle/Unsafe tests should test always-failing cases #1853

Closed
wants to merge 3 commits into from

Conversation

zhengxiaolinX
Copy link
Contributor

@zhengxiaolinX zhengxiaolinX commented Apr 27, 2023

Backporting JDK-8292443 as an RFE for testing. Please see the discussion thread in JDK-8292443: changes related to JDK-8207146 were dropped.

Most of code in this patch is generated by the fixed generate-unsafe-access-tests.sh after #1852.

I have verified this on x86_64 and AArch64 machines.

Thanks,
Xiaolin


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-8292443: Weak CAS VarHandle/Unsafe tests should test always-failing cases (Enhancement - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev.git pull/1853/head:pull/1853
$ git checkout pull/1853

Update a local copy of the PR:
$ git checkout pull/1853
$ git pull https://git.openjdk.org/jdk11u-dev.git pull/1853/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1853

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/1853.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 27, 2023

👋 Welcome back xlinzheng! 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 changed the title Backport e8bc87956abc92851de8694c56a78f6ecc546cbd 8292443: Weak CAS VarHandle/Unsafe tests should test always-failing cases Apr 27, 2023
@openjdk
Copy link

openjdk bot commented Apr 27, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Apr 27, 2023
@mlbridge
Copy link

mlbridge bot commented Apr 27, 2023

Webrevs

@zhengxiaolinX
Copy link
Contributor Author

zhengxiaolinX commented Apr 27, 2023

May not be easy to get it reviewed:

In the mainline JDK repo to show the original commit:
git show e8bc87956abc92851de8694c56a78f6ecc546cbd > ~/1.diff

This patch:
git show b9123cf3cc > ~/2.diff

Diff the two diffs:
diff ~/1.diff ~/2.diff > diff.txt

diff.txt
Might be easier to look - the changeset is small and only the head -n 150 of it matters.

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 21, 2023

@zhengxiaolinX This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

Copy link
Member

@phohensee phohensee 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 Jun 26, 2023

@zhengxiaolinX This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8292443: Weak CAS VarHandle/Unsafe tests should test always-failing cases

Reviewed-by: phh

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

  • ccbb928: 8260878: com/sun/jdi/JdbOptions.java fails without jfr
  • 193dc76: 8259796: timed CompletableFuture.get may swallow InterruptedException
  • 97c07a1: 8234808: jdb quoted option parsing broken
  • 5506ecf: 8254350: CompletableFuture.get may swallow InterruptedException
  • cc88f4c: 8303511: C2: assert(get_ctrl(n) == cle_out) during unrolling
  • 4dd85cb: 8297587: Upgrade JLine to 3.22.0
  • e0b98bc: 8292033: Move jdk.X509Certificate event logic to JCA layer
  • b2e04df: 8289508: Improve test coverage for XPath Axes: ancestor, ancestor-or-self, preceding, and preceding-sibling
  • 7f1047e: 8297955: LDAP CertStore should use LdapName and not String for DNs
  • 4a7557e: 8236045: [TESTBUG] MismatchedWhiteBox test fails with missing WhiteBox$WhiteBoxPermission.class
  • ... and 70 more: https://git.openjdk.org/jdk11u-dev/compare/589894526da90bc9beb69033ce76d540c4a19501...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@phohensee) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 26, 2023
@zhengxiaolinX
Copy link
Contributor Author

Got the jdk11u-fix-yes approval.

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 27, 2023
@openjdk
Copy link

openjdk bot commented Jun 27, 2023

@zhengxiaolinX
Your change (at version fd33457) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 27, 2023

Going to push as commit 398f413.
Since your change was applied there have been 83 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 Jun 27, 2023
@openjdk openjdk bot closed this Jun 27, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Jun 27, 2023
@openjdk
Copy link

openjdk bot commented Jun 27, 2023

@phohensee @zhengxiaolinX Pushed as commit 398f413.

💡 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
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants