8258534: Epsilon: clean up unused includes

[lhtin]

Hi all,

CLion IDE shows two warnings of unused includes(#include "utilities/macros.hpp") in EpsilonGC's code. these maybe can be removed.

Testing: macosx-x86_64-server-{release,fastdebug,slowdebug}

---

Progress

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

Issue

• JDK-8258534: Epsilon: clean up unused includes

Reviewers

• Aleksey Shipilev (@shipilev - Reviewer)
• Jie Fu (@DamonFool - Committer)

Download

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

[bridgekeeper]

Hi @lhtin, welcome to this OpenJDK project and thanks for contributing!

We do not recognize you as Contributor and need to ensure you have signed the Oracle Contributor Agreement (OCA). If you have not signed the OCA, please follow the instructions. Please fill in your GitHub username in the "Username" field of the application. Once you have signed the OCA, please let us know by writing /signed in a comment in this pull request.

If you already are an OpenJDK Author, Committer or Reviewer, please click here to open a new issue so that we can record that fact. Please use "Add GitHub user lhtin" as summary for the issue.

If you are contributing this work on behalf of your employer and your employer has signed the OCA, please let us know by writing /covered in a comment in this pull request.

[lhtin]

/covered

[openjdk]

@lhtin 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 pull request command.

[bridgekeeper]

Thank you! Please allow for a few business days to verify that your employer has signed the OCA. Also, please note that pull requests that are pending an OCA check will not usually be evaluated, so your patience is appreciated!

[shipilev]

Unfortunately, CLion makes the incorrect call here. macros.hpp is included to get access to COMPILER1 and COMPILER2 macros. So we cannot really remove that #include.

[lhtin]

Thank you for your review. When the CLion shows the two warnings, I try to found COMPILER1 and COMPILER2 macros define from utilities/macros.hpp file but can not. Or the two macros be added to utilities/macros.hpp file when building? My understanding is that the two macros come from C_FLAGS(-DCOMPILER1, -DCOMPILER2) when building.

[lhtin]

/issue add JDK-8258534
/test

[openjdk]

@lhtin The primary solved issue for a PR is set through the PR title. Since the current title does not contain an issue reference, it will now be updated.

[mlbridge]

Webrevs

• 00: Full (6d311ad)

[DamonFool]

/test

[openjdk]

@DamonFool you need to get approval to run the tests in tier1 for commits up until 6d311ad

[lhtin]

/test

[openjdk]

@lhtin you need to get approval to run the tests in tier1 for commits up until 6d311ad

[DamonFool]

Unfortunately, CLion makes the incorrect call here. macros.hpp is included to get access to COMPILER1 and COMPILER2 macros. So we cannot really remove that #include.

Hi @shipilev ,

Build tests passed on our Linux/x64 machines with this patch.
So I think the change is fine.
Am I missing something?

Thanks.

[shipilev]

This looks like a cleanup and not very time-pressing, right? I'll take a look after NY holidays.

[lhtin]

This looks like a cleanup and not very time-pressing, right? I'll take a look after NY holidays.

Yes, just a small change. Take your time.

[shipilev]

On the second look, the #include for macro.hpp is indeed excessive: COMPILER1 and COMPILER2 are already defined, so the rest of the #include-s should work fine. The only reason we would want that include if Epsilon used any of the extended definitions like COMPILER2_ONLY, but it does not.

The patch looks good then. Please make sure you run the pre-integration tests. To do that, GH Actions should be enabled here: https://github.com/lhtin/jdk/actions -- and then probably triggered manually on your branch. Then "Checks" tab should have the test results. Once that is done, I would formally approve.

[lhtin]

On the second look, the #include for macro.hpp is indeed excessive: COMPILER1 and COMPILER2 are already defined, so the rest of the #include-s should work fine. The only reason we would want that include if Epsilon used any of the extended definitions like COMPILER2_ONLY, but it does not.

The patch looks good then. Please make sure you run the pre-integration tests. To do that, GH Actions should be enabled here: https://github.com/lhtin/jdk/actions -- and then probably triggered manually on your branch. Then "Checks" tab should have the test results. Once that is done, I would formally approve.

Thank you for your review and guide of test.
The pre-integration test has finished.

[shipilev]

Excellent, you are good to go.

[openjdk]

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

8258534: Epsilon: clean up unused includes

Reviewed-by: shade, jiefu

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

• 17d1645: 8258751: Improve ExceptionHandlerTable dump
• dd8996c: 8258946: Fix optimization-unstable code involving signed integer overflow
• 5ea9607: 8258459: Decouple gc_globals.hpp from globals.hpp
• 2499ac3: 8259069: Fields could be final
• f0aae81: 8259020: null-check of g1 write_ref_field_pre_entry is not necessary
• e6f9926: 8257809: JNI warnings from Toolkit JPEG image decoding
• 9d160aa: 8257815: Replace global log2 functions with efficient implementations
• f80c63b: 8258490: Shenandoah: Full GC does not need to remark threads and drain SATB buffers
• 7f04d23: 8258800: Deprecate -XX:+AlwaysLockClassLoader
• d679caa: 8196466: javax/swing/JFileChooser/8062561/bug8062561.java fails
• ... and 181 more: https://git.openjdk.java.net/jdk/compare/8befc3210d607fa79d2c4d9286462c0c457033b2...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 (@shipilev, @DamonFool) 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).

[DamonFool]

/sponsor

[openjdk]

@DamonFool The change author (@lhtin) must issue an integrate command before the integration can be sponsored.

[lhtin]

/integrate

[DamonFool]

/sponsor

[openjdk]

@lhtin
Your change (at version 6d311ad) is now ready to be sponsored by a Committer.

[openjdk]

@DamonFool @lhtin Since your change was applied there have been 191 commits pushed to the master branch:

• 17d1645: 8258751: Improve ExceptionHandlerTable dump
• dd8996c: 8258946: Fix optimization-unstable code involving signed integer overflow
• 5ea9607: 8258459: Decouple gc_globals.hpp from globals.hpp
• 2499ac3: 8259069: Fields could be final
• f0aae81: 8259020: null-check of g1 write_ref_field_pre_entry is not necessary
• e6f9926: 8257809: JNI warnings from Toolkit JPEG image decoding
• 9d160aa: 8257815: Replace global log2 functions with efficient implementations
• f80c63b: 8258490: Shenandoah: Full GC does not need to remark threads and drain SATB buffers
• 7f04d23: 8258800: Deprecate -XX:+AlwaysLockClassLoader
• d679caa: 8196466: javax/swing/JFileChooser/8062561/bug8062561.java fails
• ... and 181 more: https://git.openjdk.java.net/jdk/compare/8befc3210d607fa79d2c4d9286462c0c457033b2...master

Your commit was automatically rebased without conflicts.

Pushed as commit 3817c32.

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