Skip to content
This repository was archived by the owner on Apr 24, 2023. It is now read-only.
/ jdk20 Public archive

8299476: PPC64 Zero build fails after JDK-8286302 #79

Closed
wants to merge 1 commit into from
Closed

8299476: PPC64 Zero build fails after JDK-8286302 #79

wants to merge 1 commit into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Jan 2, 2023

Zero does not have access to PPC64-specific constants, so this happens:

/home/shade/trunks/shipilev-jdk20/src/hotspot/share/runtime/continuationFreezeThaw.cpp: In constructor 'FreezeBase::FreezeBase(JavaThread*, ContinuationWrapper&, intptr_t*)':
/home/shade/trunks/shipilev-jdk20/src/hotspot/share/runtime/continuationFreezeThaw.cpp:487:64: error: 'abi_reg_args_size' is not a member of 'frame'
  487 | PPC64_ONLY(frame::abi_reg_args_size >> LogBytesPerWord);
      | ^~~~~~~~~~~~~~~~~

Testing:

  • Linux x86_64 {server, zero} compilation
  • Linux PPC64 {server, zero} cross-compilation

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-8299476: PPC64 Zero build fails after JDK-8286302

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 79

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk20/pull/79.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 2, 2023

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

openjdk bot commented Jan 2, 2023

@shipilev 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 2, 2023
@mlbridge
Copy link

mlbridge bot commented Jan 2, 2023

Webrevs

@shipilev
Copy link
Member Author

shipilev commented Jan 4, 2023

@TheRealMDoerr, maybe? :)

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr 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. Thanks for fixing it!

@shipilev
Copy link
Member Author

shipilev commented Jan 4, 2023

Thanks!

/integrate

@openjdk
Copy link

openjdk bot commented Jan 4, 2023

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

8299476: PPC64 Zero build fails after JDK-8286302

Reviewed-by: mdoerr

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

  • b743519: 8293824: gc/whitebox/TestConcMarkCycleWB.java failed "RuntimeException: assertTrue: expected true, was false"
  • 8254cbb: 8299483: ProblemList java/text/Format/NumberFormat/CurrencyFormat.java
  • 031829d: 8298324: Unable to run shell test with make
  • 3eb85d1: 8299235: broken link referencing missing id
  • a6a903d: 8288204: GVN Crash: assert() failed: correct memory chain

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 Jan 4, 2023
@openjdk
Copy link

openjdk bot commented Jan 4, 2023

Going to push as commit a17f505.
Since your change was applied there have been 5 commits pushed to the master branch:

  • b743519: 8293824: gc/whitebox/TestConcMarkCycleWB.java failed "RuntimeException: assertTrue: expected true, was false"
  • 8254cbb: 8299483: ProblemList java/text/Format/NumberFormat/CurrencyFormat.java
  • 031829d: 8298324: Unable to run shell test with make
  • 3eb85d1: 8299235: broken link referencing missing id
  • a6a903d: 8288204: GVN Crash: assert() failed: correct memory chain

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jan 4, 2023
@openjdk openjdk bot closed this Jan 4, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 4, 2023
@openjdk
Copy link

openjdk bot commented Jan 4, 2023

@shipilev Pushed as commit a17f505.

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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