8291238: JDK can't be built without G1

[calvinccheung]

Please review this simple change for fixing build failure without G1.

The fix is by adding #if INCLUDE_G1GC ... #endif around some G1 specific code.

Passed builds-tier1 with G1GC disabled.

---

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-8291238: JDK can't be built without G1

Reviewers

• Thomas Stuefe (@tstuefe - Reviewer)
• Jie Fu (@DamonFool - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9800

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

Using diff file

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

[calvinccheung]

/label add hotspot-runtime

[bridgekeeper]

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

@calvinccheung
The hotspot-runtime label was successfully added.

[mlbridge]

Webrevs

• 00: Full (126d0048)

[tstuefe]

LGTM

[openjdk]

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

8291238: JDK can't be built without G1

Reviewed-by: stuefe, 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 22 new commits pushed to the master branch:

• 7739843: 8288633: The ICC_ColorSpace.fromCIEXYZ method uses the wrong rendering intent
• eb8b789: 8292061: ProblemList serviceability/attach/ConcAttachTest.java on linux-all
• 08274e6: 8290975: Minor cleanup could be done in javax.security
• 7db5abd: 8282642: vmTestbase/gc/gctests/LoadUnloadGC2/LoadUnloadGC2.java fails intermittently with exit code 1
• 124fc4a: 8290180: Convert com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh to jtreg java version
• 4591937: 8290357: Drop HeapRegion::marked_bytes()
• 7676be8: 8291037: Move PLAB resizing mechanism to G1EvacStats
• 861cc67: 8291897: TerminatingThreadLocal(s) not registered from virtual thread(s)
• 8d88be2: 8291459: JVM crash with GenerateOopMap::error_work(char const*, __va_list_tag*)
• 8a804f6: 8291454: Missing check for JLI C runtime library in CoreLibraries.gmk
• ... and 12 more: https://git.openjdk.org/jdk/compare/f9bb3676e3d2c5fe0ae505d3bcbf434f7acb524f...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.

[DamonFool]

LGTM

[calvinccheung]

Thanks @tstuefe, @DamonFool for the review.

/integrate

[openjdk]

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

• aff7689: 8292075: Remove deleted test compiler/rangechecks/TestRangeCheckHoistingScaledIV.java from ProblemList
• 3677b55: 6391806: JLabel and AbstractButton's imageUpdate method should be better specified
• 0ade264: 8290814: Hide G1RootRegions behind G1ConcurrentMark
• f5b3618: 8291970: Add TableStatistics get function to ResourceHashtable
• cbc9040: 8290278: JavaDoc of index parameter of method JTabbedPane.insertTab
• 2712bc3: 8289741: Remove unused imports from DTDBuilder.java
• af243ca: 8265433: IGV: add graph tooltips with properties
• 7739843: 8288633: The ICC_ColorSpace.fromCIEXYZ method uses the wrong rendering intent
• eb8b789: 8292061: ProblemList serviceability/attach/ConcAttachTest.java on linux-all
• 08274e6: 8290975: Minor cleanup could be done in javax.security
• ... and 19 more: https://git.openjdk.org/jdk/compare/f9bb3676e3d2c5fe0ae505d3bcbf434f7acb524f...master

Your commit was automatically rebased without conflicts.

[openjdk]

@calvinccheung Pushed as commit 8d0d9ea.

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