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

8265831: 8257831 broke Windows x86 build #3647

Conversation

tstuefe
Copy link
Member

@tstuefe tstuefe commented Apr 23, 2021

Hi,

may I please have reviews for this trivial build fix? Thanks!

The error is just a missing include. I have no idea why this only breaks x86 though. It has nothing to do with different calling conventions between caller and callee (typical for x86 windows). I just assume the Windows x64 build pulls semaphore.inline.hpp via some other includes.

Cheers, Thomas


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/3647/head:pull/3647
$ git checkout pull/3647

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3647

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 23, 2021

👋 Welcome back stuefe! 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 Apr 23, 2021
@openjdk
Copy link

openjdk bot commented Apr 23, 2021

@tstuefe 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 Apr 23, 2021
@mlbridge
Copy link

mlbridge bot commented Apr 23, 2021

Webrevs

Copy link
Member

@shipilev shipilev 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 and trivial. I also see this failure in my Windows nightlies, and also only on x86_32.

@openjdk
Copy link

openjdk bot commented Apr 23, 2021

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

8265831: 8257831 broke Windows x86 build

Reviewed-by: shade

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:

  • b3a319c: 8264842: IGV: different nodes sharing idx are treated as equal

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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 23, 2021
@tstuefe
Copy link
Member Author

tstuefe commented Apr 23, 2021

Thank you Alexey!

@tstuefe
Copy link
Member Author

tstuefe commented Apr 23, 2021

/integrate

@openjdk openjdk bot closed this Apr 23, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 23, 2021
@openjdk
Copy link

openjdk bot commented Apr 23, 2021

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

  • 8e31229: 8265327: Remove check_safepoint_and_suspend_for_native_trans()
  • c9b70c8: 8265240: runtime/Thread/SuspendAtExit.java needs updating
  • 891f72f: 8265606: Reduce allocations in AdapterHandlerLibrary::get_adapter
  • bfc1cd8: 8264320: ShouldNotReachHere in Compile::print_inlining_move_to()
  • 5db64c3: 8265268: Unify ReservedSpace reservation code in initialize and try_reserve_heap
  • 191f1fc: 8265759: Shenandoah: Avoid race for referent in assert
  • b3a319c: 8264842: IGV: different nodes sharing idx are treated as equal

Your commit was automatically rebased without conflicts.

Pushed as commit ac23870.

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

@tstuefe tstuefe deleted the 8265831-8257831-broke-Windows-x86-build branch April 26, 2021 05:06
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.

2 participants