8276932: G1: Annotate methods with override explicitly in g1CollectedHeap.hpp

[albertnetymk]

This PR consists of two commits: the first commit is generated using clang-tidy --fix src/hotspot/share/gc/g1/g1CollectedHeap.hpp -checks=modernize-use-override -p build/linux-x64-debug, and the second commit fixes some indentation issues.

Test: build

---

Progress

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

Issue

• JDK-8276932: G1: Annotate methods with override explicitly in g1CollectedHeap.hpp

Reviewers

• Thomas Schatzl (@tschatzl - Reviewer)
• Stefan Johansson (@kstefanj - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6330

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

Using diff file

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

[bridgekeeper]

👋 Welcome back ayang! 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]

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

[mlbridge]

Webrevs

• 00: Full (d7ae561e)

[tschatzl]

Lgtm.

[openjdk]

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

8276932: G1: Annotate methods with override explicitly in g1CollectedHeap.hpp

Reviewed-by: tschatzl, sjohanss

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

• fdcd16a: 8277048: Tiny improvements to the specification text for java.util.Properties.load
• b231f5b: 8276921: G1: Remove redundant failed evacuation regions calculation in RemoveSelfForwardPtrHRClosure
• ca2efb7: 8274687: JDWP deadlocks if some Java thread reaches wait in blockOnDebuggerSuspend
• 296780c: 8276983: Small fixes to DumpAllocStat::print_stats
• 8c5f030: 8276453: Undefined behavior in C1 LIR_OprDesc causes SEGV in fastdebug build
• 176d21d: 8276824: refactor Thread::is_JavaThread_protected
• 74f3e69: 8277071: [BACKOUT] JDK-8276743 Make openjdk build Zip Archive generation "reproducible"
• b85500e: 8276123: ZipFile::getEntry will not return a file entry when there is a directory entry of the same name within a Zip File
• 0d2980c: 8258192: Obsolete the CriticalJNINatives flag
• 5a2452c: 8274835: Remove unnecessary castings in java.base
• ... and 40 more: https://git.openjdk.java.net/jdk/compare/fd0a25e62b2c8abc3a419c2e80abbcf11c9e882f...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.

[albertnetymk]

Thanks for the review.

/integrate

[openjdk]

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

• fdcd16a: 8277048: Tiny improvements to the specification text for java.util.Properties.load
• b231f5b: 8276921: G1: Remove redundant failed evacuation regions calculation in RemoveSelfForwardPtrHRClosure
• ca2efb7: 8274687: JDWP deadlocks if some Java thread reaches wait in blockOnDebuggerSuspend
• 296780c: 8276983: Small fixes to DumpAllocStat::print_stats
• 8c5f030: 8276453: Undefined behavior in C1 LIR_OprDesc causes SEGV in fastdebug build
• 176d21d: 8276824: refactor Thread::is_JavaThread_protected
• 74f3e69: 8277071: [BACKOUT] JDK-8276743 Make openjdk build Zip Archive generation "reproducible"
• b85500e: 8276123: ZipFile::getEntry will not return a file entry when there is a directory entry of the same name within a Zip File
• 0d2980c: 8258192: Obsolete the CriticalJNINatives flag
• 5a2452c: 8274835: Remove unnecessary castings in java.base
• ... and 40 more: https://git.openjdk.java.net/jdk/compare/fd0a25e62b2c8abc3a419c2e80abbcf11c9e882f...master

Your commit was automatically rebased without conflicts.

[openjdk]

@albertnetymk Pushed as commit 02f7900.

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

[rvansa]

/backport jdk17u-dev

[openjdk]

@rvansa Could not automatically backport 02f79008 to openjdk/jdk17u-dev due to conflicts in the following files:

• src/hotspot/share/gc/g1/g1CollectedHeap.hpp

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk17u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk17u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-rvansa-02f79008-master

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 02f79008828b3dcce3bd6492efaa43e99376c0c5

# Backport the commit
$ git cherry-pick --no-commit 02f79008828b3dcce3bd6492efaa43e99376c0c5
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 02f79008828b3dcce3bd6492efaa43e99376c0c5'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk17u-dev with the title Backport 02f79008828b3dcce3bd6492efaa43e99376c0c5.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 02f79008 from the openjdk/jdk repository.

The commit being backported was authored by Albert Mingkun Yang on 15 Nov 2021 and was reviewed by Thomas Schatzl and Stefan Johansson.

Thanks!