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

8353365: TOUCH_ASSERT_POISON clears GetLastError() #24435

Closed
wants to merge 3 commits into from

Conversation

dholmes-ora
Copy link
Member

@dholmes-ora dholmes-ora commented Apr 4, 2025

This is a very simple fix to save/restore the "last error" value on Windows, so that the TOUCH_ASSERT_POISON mechanism used in assert/guarantee/fatal, does not clear it.

Testing

  • new Windows-only gtest added to vmErrors test group
  • tiers 103 sanity

Thanks.


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-8353365: TOUCH_ASSERT_POISON clears GetLastError() (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24435

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 4, 2025

👋 Welcome back dholmes! 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 Apr 4, 2025

@dholmes-ora 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:

8353365: TOUCH_ASSERT_POISON clears GetLastError()

Reviewed-by: kbarrett, stuefe, jwaters

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

  • 32d6d03: 8349348: Refactor ClassLoaderDeadlock.sh and Deadlock.sh to run fully in java
  • 39549f8: 8352116: Deadlock with GCLocker and JVMTI after JDK-8192647
  • d63b561: 8353188: C1: Clean up x86 backend after 32-bit x86 removal
  • d1e91fc: 8353344: RISC-V: Detect and enable several extensions for debug builds
  • 6abf4e6: 8353568: SEGV_BNDERR signal code adjust definition
  • 6d9ece7: 8351949: RISC-V: Cleanup and enable store-load peephole for membars
  • 97ed536: 8346989: C2: deoptimization and re-execution cycle with Math.*Exact in case of frequent overflow
  • 660b17a: 8350852: Implement JMH benchmark for sparse CodeCache
  • 6d37e63: 8353753: Remove unnecessary forward declaration in oop.hpp
  • 9bb804b: 8338554: Fix inconsistencies in javadoc/doclet/testLinkOption/TestRedirectLinks.java
  • ... and 60 more: https://git.openjdk.org/jdk/compare/6970cf6ac69864e7027138746361e7da1983c24d...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 rfr Pull request is ready for review label Apr 4, 2025
@openjdk
Copy link

openjdk bot commented Apr 4, 2025

@dholmes-ora 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.

@openjdk openjdk bot added the hotspot hotspot-dev@openjdk.org label Apr 4, 2025
@mlbridge
Copy link

mlbridge bot commented Apr 4, 2025

Webrevs

Copy link
Member

@tstuefe tstuefe left a comment

Choose a reason for hiding this comment

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

Oh, sorry for that. Thanks @stefank @dholmes-ora for finding and fixing this. The patch is fine.

I wonder whether we have the same problem on Posix with errno, but I assume we don't call any functions there that modify errno.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 4, 2025
Copy link
Contributor

@TheShermanTanker TheShermanTanker left a comment

Choose a reason for hiding this comment

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

Simple enough for me to review, so I'll give it a +1, just one trivial question

@kimbarrett
Copy link

Oh, sorry for that. Thanks @stefank @dholmes-ora for finding and fixing this. The patch is fine.

I wonder whether we have the same problem on Posix with errno, but I assume we don't call any functions there that modify errno.

Same problem exists for posix, but we already preserve errno:

// Preserve errno value over signal handler.
// (note: RAII ok here, even with JFR thread crash protection, see below).
ErrnoPreserver ep;

That behavior goes back to https://bugs.openjdk.org/browse/JDK-6749267, fixed in jdk8.

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Apr 6, 2025
Copy link

@kimbarrett kimbarrett 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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 7, 2025
@dholmes-ora
Copy link
Member Author

Thanks for the reviews!

/integrate

@openjdk
Copy link

openjdk bot commented Apr 7, 2025

Going to push as commit 3951a8e.
Since your change was applied there have been 95 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 Apr 7, 2025
@openjdk openjdk bot closed this Apr 7, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 7, 2025
@openjdk
Copy link

openjdk bot commented Apr 7, 2025

@dholmes-ora Pushed as commit 3951a8e.

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

@dholmes-ora dholmes-ora deleted the 8353365-GetLastError branch April 7, 2025 23:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants