Skip to content

Conversation

@shipilev
Copy link
Member

@shipilev shipilev commented Apr 25, 2025

I noticed in macros.hpp:

#ifdef ASSERT
#define DEBUG_ONLY(code) code
#define NOT_DEBUG(code)
#define NOT_DEBUG_RETURN /*next token must be ;*/
// Historical.
#define debug_only(code) code
#else // ASSERT

There are 350+ instances of debug_only, and 1600+ instances of DEBUG_ONLY. We can cleanup debug_only and rewrite all uses to DEBUG_ONLY.

I think we can do this in one shot. This was a mechanical rename. I have looked through the grep -R debug_only src/ | nl, and there are no hits anymore.

Additional testing:

  • GHA

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-8355617: Remove historical debug_only macro in favor of DEBUG_ONLY (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24879

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 25, 2025

👋 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
Copy link

openjdk bot commented Apr 25, 2025

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

8355617: Remove historical debug_only macro in favor of DEBUG_ONLY

Reviewed-by: stefank, kbarrett, 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 21 new commits pushed to 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 rfr Pull request is ready for review label Apr 25, 2025
@openjdk
Copy link

openjdk bot commented Apr 25, 2025

@shipilev The following labels will be automatically applied to this pull request:

  • graal
  • hotspot
  • serviceability
  • shenandoah

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added graal graal-dev@openjdk.org serviceability serviceability-dev@openjdk.org hotspot hotspot-dev@openjdk.org shenandoah shenandoah-dev@openjdk.org labels Apr 25, 2025
@mlbridge
Copy link

mlbridge bot commented Apr 25, 2025

Webrevs

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 25, 2025
Copy link

@kimbarrett kimbarrett 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.

Copy link
Contributor

@TheShermanTanker TheShermanTanker 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

@shipilev
Copy link
Member Author

Thanks for reviews! I re-merged with current master locally. There were no conflicts, and no backsliding of debug_only either. Light testing (hotspot:tier1) still passes. So I think we are good to go. Here goes:

/integrate

@openjdk
Copy link

openjdk bot commented Apr 28, 2025

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 28, 2025

@shipilev Pushed as commit db6fa59.

💡 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

graal graal-dev@openjdk.org hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated serviceability serviceability-dev@openjdk.org shenandoah shenandoah-dev@openjdk.org

Development

Successfully merging this pull request may close these issues.

4 participants