Skip to content

Conversation

@iklam
Copy link
Member

@iklam iklam commented Dec 15, 2020

Please review this trivial fix for mach5 tier1 build failure:

test/hotspot/gtest/runtime/test_os.cpp:525:39: error: cannot convert 'const MEMFLAGS' to 'bool'
     char* p = os::reserve_memory(1 * M, mtInternal);
                                         ^^^^^^^^^^

It's caused by the following change in os.hpp in JDK-8234930:

- static char*  reserve_memory(size_t bytes, MEMFLAGS flags = mtOther);
+ static char*  reserve_memory(size_t bytes, bool executable = false, MEMFLAGS flags = mtOther);

I am running a personal tier1 job to validate this fix.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8258438: build error in test/hotspot/gtest/runtime/test_os.cpp

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/1788/head:pull/1788
$ git checkout pull/1788

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 15, 2020

👋 Welcome back iklam! 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 Dec 15, 2020

@iklam 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 Dec 15, 2020
@iklam iklam marked this pull request as ready for review December 15, 2020 21:31
@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 15, 2020
Copy link
Member

@dcubed-ojdk dcubed-ojdk left a comment

Choose a reason for hiding this comment

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

Thumbs up. This is a trivial fix and doesn't need to wait 24 hours.

@openjdk
Copy link

openjdk bot commented Dec 15, 2020

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

8258438: build error in test/hotspot/gtest/runtime/test_os.cpp

Reviewed-by: dcubed, tschatzl

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 Dec 15, 2020
@mlbridge
Copy link

mlbridge bot commented Dec 15, 2020

Webrevs

@iklam
Copy link
Member Author

iklam commented Dec 15, 2020

My local build passed. Since all tier1 builds had failed due to this bug, I'll integrate now. It can't make things any worse.
Thanks @dcubed-ojdk and @tschatzl for the review.
/integrate

@openjdk openjdk bot closed this Dec 15, 2020
@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 Dec 15, 2020
@openjdk
Copy link

openjdk bot commented Dec 15, 2020

@iklam Since your change was applied there has been 1 commit pushed to the master branch:

  • 7977e38: 8254024: Enhance native libs for AWT and Swing to work with GraalVM Native Image

Your commit was automatically rebased without conflicts.

Pushed as commit 8bf46c7.

💡 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

Development

Successfully merging this pull request may close these issues.

3 participants