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

8253219: Epsilon: clean up unnecessary includes #198

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Sep 16, 2020

Static analysis shows a few #include statements in gc/epsilon that are not needed.

Testing: Linux x86_64 {release, fastdebug, slowdebug} x {+PCH, -PCH}


Progress

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

Issue

Reviewers

Download

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 16, 2020

👋 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 openjdk bot added the rfr Pull request is ready for review label Sep 16, 2020
@openjdk
Copy link

openjdk bot commented Sep 16, 2020

@shipilev The following label will be automatically applied to this pull request: hotspot-gc.

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 (add|remove) "label" command.

@openjdk openjdk bot added the hotspot-gc hotspot-gc-dev@openjdk.org label Sep 16, 2020
@mlbridge
Copy link

mlbridge bot commented Sep 16, 2020

Webrevs

@mlbridge
Copy link

mlbridge bot commented Sep 16, 2020

Mailing list message from Thomas Schatzl on hotspot-gc-dev:

Hi,

On 16.09.20 09:49, Aleksey Shipilev wrote:

Static analysis shows a few #include statements in gc/epsilon that are not needed.

Testing: Linux x86_64 {release, fastdebug, slowdebug} x {+PCH, -PCH}

- in epsilonMonitoringSupport.cpp, the include for allocation.inline.hpp
is correct, CHeapObj is declared there.
The allocation.hpp one is superfluous though.

Looks good otherwise. I do not need a re-review for this change.

Thomas

@openjdk
Copy link

openjdk bot commented Sep 16, 2020

@shipilev This change now passes all automated pre-integration checks. In addition to the automated checks, the change must also fulfill all project specific requirements

After integration, the commit message will be:

8253219: Epsilon: clean up unnecessary includes

Reviewed-by: tschatzl, kbarrett
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /issue command.

Since the source branch of this PR was last updated there have been 4 commits pushed to the master branch:

  • 7f9b5d9: 8253220: Epsilon: clean up unused code/declarations
  • e0cf023: 8245309: Re-examine use of ThreadLocalCoders in sun.net.www.ParseUtil
  • 60c4902: 8253016: Box.Filler components should be unfocusable by default
  • dd43533: 8253222: Shenandoah: unused AlwaysTrueClosure after JDK-8246591

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate 7f9b5d9e324c958974e373acce5a3ce68535105c.

➡️ 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 Sep 16, 2020
@mlbridge
Copy link

mlbridge bot commented Sep 16, 2020

Mailing list message from Aleksey Shipilev on hotspot-gc-dev:

On 9/16/20 12:52 PM, Thomas Schatzl wrote:

Hi,

On 16.09.20 09:49, Aleksey Shipilev wrote:

Static analysis shows a few #include statements in gc/epsilon that are not needed.

Testing: Linux x86_64 {release, fastdebug, slowdebug} x {+PCH, -PCH}

- in epsilonMonitoringSupport.cpp, the include for allocation.inline.hpp
is correct, CHeapObj is declared there.
The allocation.hpp one is superfluous though.

Seems vice versa: allocation.hpp defines CHeapObj and needs to be included, and
allocation.inline.hpp needs to be dropped. Updated.

--
Thanks,
-Aleksey

@mlbridge
Copy link

mlbridge bot commented Sep 16, 2020

Mailing list message from Thomas Schatzl on hotspot-gc-dev:

Hi,

On 16.09.20 13:00, Aleksey Shipilev wrote:

On 9/16/20 12:52 PM, Thomas Schatzl wrote:

Hi,

On 16.09.20 09:49, Aleksey Shipilev wrote:

Static analysis shows a few #include statements in gc/epsilon that
are not needed.

Testing: Linux x86_64 {release, fastdebug, slowdebug} x {+PCH, -PCH}

- in epsilonMonitoringSupport.cpp, the include for allocation.inline.hpp
is correct, CHeapObj is declared there.
The allocation.hpp one is superfluous though.

Seems vice versa: allocation.hpp defines CHeapObj and needs to be
included, and allocation.inline.hpp needs to be dropped. Updated.

I tend to always prefer the .inline.hpp if available as something
might be defined in the .inline.hpp that is used in the .hpp file. I.e.
as a rule include to .inline.hpp if available. It does not seem to be
the case here so just the .hpp should be good.

Looks good.

Thomas

@shipilev
Copy link
Member Author

Mailing list message from Thomas Schatzl on hotspot-gc-dev:
I tend to always prefer the .inline.hpp if available as something
might be defined in the .inline.hpp that is used in the .hpp file. I.e.
as a rule include to .inline.hpp if available. It does not seem to be
the case here so just the .hpp should be good.

Right. I do as crystal^W static analyzer guides: include only what is necessary.

Integrating now.

@shipilev
Copy link
Member Author

/integrate

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

openjdk bot commented Sep 16, 2020

@shipilev Since your change was applied there have been 4 commits pushed to the master branch:

  • 7f9b5d9: 8253220: Epsilon: clean up unused code/declarations
  • e0cf023: 8245309: Re-examine use of ThreadLocalCoders in sun.net.www.ParseUtil
  • 60c4902: 8253016: Box.Filler components should be unfocusable by default
  • dd43533: 8253222: Shenandoah: unused AlwaysTrueClosure after JDK-8246591

Your commit was automatically rebased without conflicts.

Pushed as commit f509eb0.

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

@shipilev shipilev deleted the JDK-8253219-epsilon-includes branch September 16, 2020 11:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-gc hotspot-gc-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants