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

8275162: Replace 'def' macros in mutexLocker.cpp #6066

Closed
wants to merge 1 commit into from

Conversation

coleenp
Copy link
Contributor

@coleenp coleenp commented Oct 21, 2021

This patch removes the 'def' macros from mutexLocker.cpp so it can use the default values for _allow_vm_block when possible and no more macro.
Tested with tier1-3 with product and debug builds.


Progress

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

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/6066/head:pull/6066
$ git checkout pull/6066

Update a local copy of the PR:
$ git checkout pull/6066
$ git pull https://git.openjdk.java.net/jdk pull/6066/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6066

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/6066.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Oct 21, 2021

👋 Welcome back coleenp! 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 label Oct 21, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 21, 2021

@coleenp 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 label Oct 21, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Oct 21, 2021

Webrevs

Copy link
Contributor

@pchilano pchilano left a comment

LGTM!

Thanks,
Patricio

@coleenp
Copy link
Contributor Author

@coleenp coleenp commented Oct 21, 2021

Thanks Patricio!

Copy link
Member

@stefank stefank left a comment

+1 for getting rid of the x-macros when possible. Personally, I'm willing to pay the price of having the name duplication, given how the code becomes easier to understand and more IDE friendly.

@openjdk
Copy link

@openjdk openjdk bot commented Oct 22, 2021

@coleenp this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout remove-def
git fetch https://git.openjdk.java.net/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict label Oct 22, 2021
@coleenp
Copy link
Contributor Author

@coleenp coleenp commented Oct 22, 2021

This change depended on the change for JDK-8274794 which I'm not going to redo. Will try Ioi's varargs idea.

@coleenp coleenp closed this Oct 22, 2021
@coleenp coleenp deleted the remove-def branch Nov 17, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime merge-conflict rfr
4 participants