8290715: Fix incorrect uses of G1CollectedHeap::heap_region_containing()

[tschatzl]

Hi all,

please review this change that fixes some callers of G1CollectedHeap::heap_region_containing to a) fail on trying to get the Heapregion* on uncommitted regions and b) change some callers to use the correct heap_region_containing_or_null method that had been intended there.

Also remove some now unneccessary asserts as heap_region_containing will fail when it previously returned nullptr.

Testing: tier1-5

Thanks,
Thomas

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Issue

• JDK-8290715: Fix incorrect uses of G1CollectedHeap::heap_region_containing()

Reviewers

• Kim Barrett (@kimbarrett - Reviewer)
• Sangheon Kim (@sangheon - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/9584/head:pull/9584
$ git checkout pull/9584

Update a local copy of the PR:
$ git checkout pull/9584
$ git pull https://git.openjdk.org/jdk pull/9584/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9584

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/9584.diff

[bridgekeeper]

👋 Welcome back tschatzl! A progress list of the required criteria for merging this PR into pr/9572 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

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

• hotspot

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

• 02: Full (5dc2fc08)
• 01: Full - Incremental (b6afb444)
• 00: Full (b6afb444)

[tschatzl]

/label add hotspot-gc

[openjdk]

@tschatzl
The hotspot-gc label was successfully added.

[openjdk-notifier]

The dependent pull request has now been integrated, and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout submit/refs/heads/8290715-heapregion-containing-no-null
git fetch https://git.openjdk.org/jdk master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

[openjdk]

@tschatzl 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 submit/refs/heads/8290715-heapregion-containing-no-null
git fetch https://git.openjdk.org/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

[kimbarrett]

Looks good.

[openjdk]

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

8290715: Fix incorrect uses of G1CollectedHeap::heap_region_containing()

Reviewed-by: kbarrett, sangheki

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

• 18cd16d: 8291003: ARM32: constant_table.size assertion
• cfe9026: 8289511: Improve test coverage for XPath Axes: child
• eeac3da: 8289755: Remove --enable-reproducible-build from jib profile
• 791fc57: 6383195: javax.crypto.spec.PBEKeySpec is not thread safe
• e052d7f: 8288477: nmethod header size reduction
• 54a2c5a: 8290059: Do not use std::thread in panama tests
• 5214a17: 8291479: ProblemList compiler/rangechecks/TestRangeCheckHoistingScaledIV.java on ppc64le
• 471a427: 8287794: Reverse*VNode::Identity problem
• 5d1ad39: 8290839: jdk/jfr/event/compiler/TestJitRestart.java failed with "RuntimeException: No JIT restart event found: expected true, was false"

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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.

[sangheon]

Looks good.

[tschatzl]

Thanks @kimbarrett @sangheon for your reviews.

[tschatzl]

/integrate

[openjdk]

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

• 18cd16d: 8291003: ARM32: constant_table.size assertion
• cfe9026: 8289511: Improve test coverage for XPath Axes: child
• eeac3da: 8289755: Remove --enable-reproducible-build from jib profile
• 791fc57: 6383195: javax.crypto.spec.PBEKeySpec is not thread safe
• e052d7f: 8288477: nmethod header size reduction
• 54a2c5a: 8290059: Do not use std::thread in panama tests
• 5214a17: 8291479: ProblemList compiler/rangechecks/TestRangeCheckHoistingScaledIV.java on ppc64le
• 471a427: 8287794: Reverse*VNode::Identity problem
• 5d1ad39: 8290839: jdk/jfr/event/compiler/TestJitRestart.java failed with "RuntimeException: No JIT restart event found: expected true, was false"

Your commit was automatically rebased without conflicts.

[openjdk]

@tschatzl Pushed as commit f58e08e.

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