8260632: Build failures after JDK-8253353

[shipilev]

JDK-8253353 changed the field to uint16_t, and now shenadoahSupport.cpp code runs into ambiguity choosing between uint8_t and uint16_t when instantiating MAX2 macro:

/home/buildbot/worker/build-jdk16u-linux/build/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp:2291:43: error: no matching function for call to 'MAX2(uint8_t&, uint16_t&)'
     max_depth = MAX2(max_depth, lpt->_nest);
                                           ^
In file included from /home/buildbot/worker/build-jdk16u-linux/build/src/hotspot/share/metaprogramming/primitiveConversions.hpp:30:0,
                 from /home/buildbot/worker/build-jdk16u-linux/build/src/hotspot/share/oops/oopHandle.hpp:28,
                 from /home/buildbot/worker/build-jdk16u-linux/build/src/hotspot/share/classfile/systemDictionary.hpp:28,
                 from /home/buildbot/worker/build-jdk16u-linux/build/src/hotspot/share/classfile/javaClasses.hpp:28,
                 from /home/buildbot/worker/build-jdk16u-linux/build/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp:27:

Additional testing:

• Linux x86_64 hotspot_gc_shenandoah
• Linux x86_64 tier1 with Shenandoah

---

Progress

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

Issue

• JDK-8260632: Build failures after JDK-8253353

Reviewers

• Thomas Stuefe (@tstuefe - Reviewer)
• Tobias Hartmann (@TobiHartmann - Reviewer)
• Vladimir Kozlov (@vnkozlov - Reviewer)

Download

$ git fetch https://git.openjdk.java.net/jdk16 pull/138/head:pull/138
$ git checkout pull/138

[bridgekeeper]

👋 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]

@shipilev The following labels will be automatically applied to this pull request:

• hotspot-gc
• shenandoah

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

[mlbridge]

Webrevs

• 00: Full (67bc1fb)

[tstuefe]

Seems fine and trivial to me.

..Thomas

[openjdk]

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

8260632: Build failures after JDK-8253353

Reviewed-by: stuefe, thartmann, kvn

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 1 new commit pushed to the master branch:

• a117e11: 8260339: JVM crashes when executing PhaseIdealLoop::match_fill_loop

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.

[vnkozlov]

Good. I approved fix request for JDK 16.

[shipilev]

Thank you.

/integrate

[openjdk]

@shipilev Since your change was applied there has been 1 commit pushed to the master branch:

• a117e11: 8260339: JVM crashes when executing PhaseIdealLoop::match_fill_loop

Your commit was automatically rebased without conflicts.

Pushed as commit bc41bb1.

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