8334757: AssertionError: Missing type variable in where clause

[cushon]

Please consider this fix for JDK-8334757.

This adds a missing case to argument preprocessing in RichDiagnosticFormatter to handle the JCDiagnostic.AnnotatedType wrapper types, which avoids a crash when types with type variables appear as arguments for diagnostics that use JCDiagnostic.AnnotatedType.

The wrapper type was introduced by JDK-8291643 and is only used by the diagnostics introduced in JDK-8043226, so backing out JDK-8043226 could also be considered.

---

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-8334757: AssertionError: Missing type variable in where clause (Bug - P2)(⚠️ The fixVersion in this issue is [23] but the fixVersion in .jcheck/conf is 24, a new backport will be created when this pr is integrated.)

Reviewers

• Jan Lahoda (@lahodaj - Reviewer)
• Vicente Romero (@vicente-romero-oracle - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19840

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper]

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

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

8334757: AssertionError: Missing type variable in where clause

Reviewed-by: jlahoda, vromero

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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.

[openjdk]

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

• compiler

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

• 01: Full - Incremental (61aa86bf)
• 00: Full (895c852c)

[lahodaj]

Looks sensible to me. Thanks!

[vicente-romero-oracle]

looks good

[cushon]

/integrate

[openjdk]

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

• 3733fe3: 8335789: [TESTBUG] XparColor.java test fails with Error. Parse Exception: Invalid or unrecognized bugid: @
• 3a87eb5: 8335126: Shenandoah: Improve OOM handling

Your commit was automatically rebased without conflicts.

[openjdk]

@cushon Pushed as commit babf6df.

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