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

8292608: [AIX] Broken build after 8291945 #9922

Closed

Conversation

backwaterred
Copy link
Contributor

@backwaterred backwaterred commented Aug 18, 2022

Improvements to the os class for AIX contained a minor bug.

- _page_sizes.add(AIX::_page_size);
+ _page_sizes.add(os::vm_page_size);

AIX::_page_size is an int, but os::vm_page_size is a () -> int. Adding the parens (changing vm_page_size to a function call) does the trick.


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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9922

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 18, 2022

👋 Welcome back tsteele! 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 Aug 18, 2022
@backwaterred backwaterred changed the title 8291945: [AIX] Broken build after 8291945 8292608: [AIX] Broken build after 8291945 Aug 18, 2022
@openjdk
Copy link

openjdk bot commented Aug 18, 2022

@backwaterred 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 Aug 18, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 18, 2022

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 fine and trivial.

@backwaterred
Copy link
Contributor Author

Thanks 👍

@openjdk
Copy link

openjdk bot commented Aug 18, 2022

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

8292608: [AIX] Broken build after 8291945

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

  • 62a7fc6: 8292315: Tests should not rely on specific JAR file names (hotspot)
  • 20a3cb7: 8292488: JFR: Incorrect comment in ActiveRecordingEvent
  • f567fa0: 8292498: java/lang/invoke/lambda/LogGeneratedClassesTest.java failed with "AssertionError: only show error once expected [1] but found [0]"
  • d00e7b9: 8292544: G1: Remove virtual specifier for methods in G1EdenRegions and G1SurvivorRegions

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 Aug 18, 2022
@backwaterred
Copy link
Contributor Author

@shipilev As I understand it, we usually wait for 2 reviewers. In this case, since the changes are trivial, can I assume that I may go ahead and merge without waiting for a second reviewer? Either way, I'll wait for the integration tests to complete.

@shipilev
Copy link
Member

shipilev commented Aug 18, 2022

@shipilev As I understand it, we usually wait for 2 reviewers. In this case, since the changes are trivial, can I assume that I may go ahead and merge without waiting for a second reviewer? Either way, I'll wait for the integration tests to complete.

Triviality rule. Notice I said "...and trivial" :)

For trivial patches, 1 reviewer is enough, and the patch is good for immediate integration. In addtition in this case, since the change is in AIX-specific file, and there are no AIX builds in GHA, there is no need to wait for integration tests to complete.

@backwaterred
Copy link
Contributor Author

Sweet efficiency 🚀 !

/integrate

@openjdk
Copy link

openjdk bot commented Aug 18, 2022

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

  • 62a7fc6: 8292315: Tests should not rely on specific JAR file names (hotspot)
  • 20a3cb7: 8292488: JFR: Incorrect comment in ActiveRecordingEvent
  • f567fa0: 8292498: java/lang/invoke/lambda/LogGeneratedClassesTest.java failed with "AssertionError: only show error once expected [1] but found [0]"
  • d00e7b9: 8292544: G1: Remove virtual specifier for methods in G1EdenRegions and G1SurvivorRegions

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 18, 2022

@backwaterred Pushed as commit 833bf06.

💡 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
2 participants