Skip to content

8337595: Remove empty statements in src/hotspot/share/memory/metaspace #20552

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

Conversation

caspernorrbin
Copy link
Member

@caspernorrbin caspernorrbin commented Aug 12, 2024

Hi everyone,

Some of the macro definitions in metaspaceCommon.hpp include semicolons, resulting in empty statements being inserted when invoked. This behavior is unclear and could potentially lead to bugs.

This PR removes the semicolons from these macros, aligning them with other metaspace macros.


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-8337595: Remove empty statements in src/hotspot/share/memory/metaspace (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 20552

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 12, 2024

👋 Welcome back caspernorrbin! 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 Aug 12, 2024

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

8337595: Remove empty statements in src/hotspot/share/memory/metaspace

Reviewed-by: stefank, dholmes, 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 76 new commits pushed to the master branch:

  • 76e33b6: 8336148: Test runtime/locking/TestRecursiveMonitorChurn.java failed: Unexpected Inflation
  • ff8a9f9: 8337318: Deoptimization::relock_objects fails assert(monitor->owner() == Thread::current()) failed: must be
  • fbe4cc9: 8336384: AbstractQueuedSynchronizer.acquire should cancel acquire when failing due to a LinkageError or other errors
  • ba69ed7: 8338202: Shenandoah: Improve handshake closure labels
  • 5bf2709: 8334475: UnsafeIntrinsicsTest.java#ZGenerationalDebug assert(!assert_on_failure) failed: Has low-order bits set
  • 73f7a5f: 8338155: Fix -Wzero-as-null-pointer-constant warnings involving PTHREAD_MUTEX_INITIALIZER
  • c27a8c8: 8338124: C2 SuperWord: MulAddS2I input permutation still partially broken after JDK-8333840
  • 73ddb7d: 8335628: C2 SuperWord: cleanup: remove SuperWord::longer_type_for_conversion
  • d77e6fe: 8338154: Fix -Wzero-as-null-pointer-constant warnings in gtest framework
  • e70c9bc: 8338248: PartialArrayStateAllocator::Impl leaks Arena array
  • ... and 66 more: https://git.openjdk.org/jdk/compare/1348ece6df7b460501931533c238e819995a2086...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@stefank, @dholmes-ora, @TheShermanTanker) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot changed the title 8337595 8337595: Remove empty statements in src/hotspot/share/memory/metaspace Aug 12, 2024
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 12, 2024
@openjdk
Copy link

openjdk bot commented Aug 12, 2024

@caspernorrbin 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 12, 2024
@mlbridge
Copy link

mlbridge bot commented Aug 12, 2024

Webrevs

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 12, 2024
Copy link
Member

@dholmes-ora dholmes-ora 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. Thanks for cleaning it up.

@caspernorrbin
Copy link
Member Author

Thank you both for the reviews!

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Aug 13, 2024
@openjdk
Copy link

openjdk bot commented Aug 13, 2024

@caspernorrbin
Your change (at version 79c782c) is now ready to be sponsored by a Committer.

@TheShermanTanker
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Aug 13, 2024

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

  • 76e33b6: 8336148: Test runtime/locking/TestRecursiveMonitorChurn.java failed: Unexpected Inflation
  • ff8a9f9: 8337318: Deoptimization::relock_objects fails assert(monitor->owner() == Thread::current()) failed: must be
  • fbe4cc9: 8336384: AbstractQueuedSynchronizer.acquire should cancel acquire when failing due to a LinkageError or other errors
  • ba69ed7: 8338202: Shenandoah: Improve handshake closure labels
  • 5bf2709: 8334475: UnsafeIntrinsicsTest.java#ZGenerationalDebug assert(!assert_on_failure) failed: Has low-order bits set
  • 73f7a5f: 8338155: Fix -Wzero-as-null-pointer-constant warnings involving PTHREAD_MUTEX_INITIALIZER
  • c27a8c8: 8338124: C2 SuperWord: MulAddS2I input permutation still partially broken after JDK-8333840
  • 73ddb7d: 8335628: C2 SuperWord: cleanup: remove SuperWord::longer_type_for_conversion
  • d77e6fe: 8338154: Fix -Wzero-as-null-pointer-constant warnings in gtest framework
  • e70c9bc: 8338248: PartialArrayStateAllocator::Impl leaks Arena array
  • ... and 66 more: https://git.openjdk.org/jdk/compare/1348ece6df7b460501931533c238e819995a2086...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 13, 2024

@TheShermanTanker @caspernorrbin Pushed as commit 877fd5a.

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

@caspernorrbin caspernorrbin deleted the metaspace-empty-macro-statements branch October 15, 2024 13:24
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.

4 participants