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

8284725: Fix include guard in jfrbitset.hpp #8198

Closed
wants to merge 1 commit into from

Conversation

rkennke
Copy link
Contributor

@rkennke rkennke commented Apr 12, 2022

In the fix for #7964 (https://bugs.openjdk.java.net/browse/JDK-8283710) I got the include guard for jfrbitset.hpp wrong. I made it:

SHARE_JFR_LEAKPROFILER_JFRBITMAP_HPP

but it should be:

SHARE_JFR_LEAKPROFILER_JFRBITSET_HPP

Testing:

  • Build
  • tier1

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/8198/head:pull/8198
$ git checkout pull/8198

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8198

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 12, 2022

👋 Welcome back rkennke! 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 Apr 12, 2022
@openjdk
Copy link

openjdk bot commented Apr 12, 2022

@rkennke The following label will be automatically applied to this pull request:

  • hotspot-jfr

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-jfr hotspot-jfr-dev@openjdk.org label Apr 12, 2022
@mlbridge
Copy link

mlbridge bot commented Apr 12, 2022

Webrevs

@rkennke
Copy link
Contributor Author

rkennke commented Apr 19, 2022

Ping? This is a rather trivial change, please ack it! Thanks, Roman

Copy link
Member

@tstuefe tstuefe left a comment

Choose a reason for hiding this comment

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

Good and trivial

Cheers, Thomas

@openjdk
Copy link

openjdk bot commented Apr 19, 2022

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

8284725: Fix include guard in jfrbitset.hpp

Reviewed-by: stuefe

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

  • 8d96ab0: 8280761: UseCompressedOops should be set after limit_heap_by_allocatable_memory
  • b9f513c: 8283790: G1: Remove redundant card/heap-address transition
  • 647aa2a: 8284572: Remove unneeded null check in ReferenceProcessor::discover_reference
  • ab83bce: 8284661: Reproducible assembly builds without relative linking
  • c5e9719: 8266246: Swing test PressedIconTest.java sometimes fails on macOS 11 ARM
  • 447c2d1: 8284521: Write an automated regression test for RFE 4371575
  • 145dfed: 8284937: riscv: should not allocate special register for temp
  • 87faa85: 8186958: Need method to create pre-sized HashMap
  • 41fc078: 8284112: Minor cleanup could be done in javax.crypto
  • 897d6c0: 8282008: Incorrect handling of quoted arguments in ProcessBuilder
  • ... and 59 more: https://git.openjdk.java.net/jdk/compare/4ce3cf12bff025441f658e1857e92486b5d73ee6...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.

➡️ 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 Apr 19, 2022
@rkennke
Copy link
Contributor Author

rkennke commented Apr 19, 2022

Thanks!

/integrate

@openjdk
Copy link

openjdk bot commented Apr 19, 2022

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

  • 595c8b8: 8284999: Remove remaining files in src/samples
  • 8d96ab0: 8280761: UseCompressedOops should be set after limit_heap_by_allocatable_memory
  • b9f513c: 8283790: G1: Remove redundant card/heap-address transition
  • 647aa2a: 8284572: Remove unneeded null check in ReferenceProcessor::discover_reference
  • ab83bce: 8284661: Reproducible assembly builds without relative linking
  • c5e9719: 8266246: Swing test PressedIconTest.java sometimes fails on macOS 11 ARM
  • 447c2d1: 8284521: Write an automated regression test for RFE 4371575
  • 145dfed: 8284937: riscv: should not allocate special register for temp
  • 87faa85: 8186958: Need method to create pre-sized HashMap
  • 41fc078: 8284112: Minor cleanup could be done in javax.crypto
  • ... and 60 more: https://git.openjdk.java.net/jdk/compare/4ce3cf12bff025441f658e1857e92486b5d73ee6...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 19, 2022

@rkennke Pushed as commit ac77b63.

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

@rkennke rkennke deleted the JDK-8284725 branch April 19, 2022 14:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-jfr hotspot-jfr-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants