8297963: Partially fix string expansion issues in UTIL_DEFUN_NAMED and related macros

[benty-amzn]

Backport JDK-8297963.

Backport is clean.

This fixes a correctness issue in a previous backport of JDK-8285093, see discussion on #915

---

Progress

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

Issue

• JDK-8297963: Partially fix string expansion issues in UTIL_DEFUN_NAMED and related macros

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev pull/1040/head:pull/1040
$ git checkout pull/1040

Update a local copy of the PR:
$ git checkout pull/1040
$ git pull https://git.openjdk.org/jdk17u-dev pull/1040/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1040

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/1040.diff

[bridgekeeper]

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

This backport pull request has now been updated with issue from the original commit.

[openjdk]

@benty-amzn 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:

8297963: Partially fix string expansion issues in UTIL_DEFUN_NAMED and related macros

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

• 4e5f5de: 8192931: Regression test java/awt/font/TextLayout/CombiningPerf.java fails
• 5fd778b: 8300692: GCC 12 reports some compiler warnings in bundled freetype
• 651ba86: 8286694: Incorrect argument processing in java launcher
• f6ad61c: 8275582: Don't purge metaspace mapping lists
• b7d83f4: 8293466: libjsig should ignore non-modifying sigaction calls
• fae1628: 8293493: Signal Handlers printout should show signal block state
• d1ad596: 8293691: converting a defined BasicType value to a string should not crash the VM
• 229288b: 8277946: NMT: Remove VM.native_memory shutdown jcmd command option
• d3c93e7: 8280048: Missing comma in copyright header
• 1cee8aa: 8231491: JDI tc02x004 failed again due to wrong # of breakpoints
• ... and 79 more: https://git.openjdk.org/jdk17u-dev/compare/3e7f840859d9081fc6cf1086bda75fa5aa76a4e9...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.

➡️ 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).

[mlbridge]

Webrevs

• 00: Full (00fec4bf)

[GoeLin]

@benty-amzn, you should elaborate on risk and your testing in the JBS fix request comment. I see this is mostly pointless for this change, but it is not me who has to assess this.
Removing the tag in the meantime.

[benty-amzn]

/integrate

[openjdk]

@benty-amzn
Your change (at version 00fec4b) is now ready to be sponsored by a Committer.

[phohensee]

/sponsor

[openjdk]

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

• 4e5f5de: 8192931: Regression test java/awt/font/TextLayout/CombiningPerf.java fails
• 5fd778b: 8300692: GCC 12 reports some compiler warnings in bundled freetype
• 651ba86: 8286694: Incorrect argument processing in java launcher
• f6ad61c: 8275582: Don't purge metaspace mapping lists
• b7d83f4: 8293466: libjsig should ignore non-modifying sigaction calls
• fae1628: 8293493: Signal Handlers printout should show signal block state
• d1ad596: 8293691: converting a defined BasicType value to a string should not crash the VM
• 229288b: 8277946: NMT: Remove VM.native_memory shutdown jcmd command option
• d3c93e7: 8280048: Missing comma in copyright header
• 1cee8aa: 8231491: JDI tc02x004 failed again due to wrong # of breakpoints
• ... and 79 more: https://git.openjdk.org/jdk17u-dev/compare/3e7f840859d9081fc6cf1086bda75fa5aa76a4e9...master

Your commit was automatically rebased without conflicts.

[openjdk]

@phohensee @benty-amzn Pushed as commit 1a38e26.

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