8357653: Inner classes of type parameters emitted as raw types in signatures #25451

biboudis · 2025-05-26T15:51:06Z

There are various occasions that the qualifier of an inner type needs to be normalized.

Briefly:

This occurs when there is an explicit type application in the signature of the method or a type application operation or when type checking an expression operation (e.g., G.Getter in the first example, M.B<?> in the second example).
The reference to an inner type may not be explicitly qualified (e.g., B<?> which is not qualified but its type needs be calculated as seen from A<String>.B<?>).

Semi-formally:

A type reference is simple name R:
- R is a non-inner class type, nothing to do
- R is an inner class type, we need to find an implicit type qualifier S<T>.R, where S is the class in which R is enclosed
- R is an array type A[], repeat the analysis for the simple type name A, and then use the implicit type qualifier to rewrite the array
A type reference is a qualified name Q.R
- find the supertype of Q, namely S<T>, where S is the class in which R is enclosed

// example 1
static class Usage1<T, G extends Getters<T>> {
  public T test(G.Getter getter) {
      return getter.get();
  }
}

// example 2
class A<T> {
  protected class B<V> {}

  public static <T, M extends A<T>> void f(Object g) {
    @SuppressWarnings("unchecked")
    M.B<?> mapping = (M.B<?>) g;
  }
}

// example 3
class A<T> {
    class B<W> {
        public T rett() { return null; }
    }
}

class C extends A<String> {
    static class D {
        {
            B<?> b = null;
            String s = b.rett();
        }
    }
}

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change requires CSR request JDK-8359213 to be approved
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issues

JDK-8357653: Inner classes of type parameters emitted as raw types in signatures (Bug - P4)
JDK-8357472: NPE in Types.containsType for type variable used as a qualifier (Bug - P3)
JDK-8359213: Inner classes of type parameters emitted as raw types in signatures (CSR)

Reviewers

Vicente Romero (@vicente-romero-oracle - Reviewer) Review applies to 629ef2a7
Maurizio Cimadamore (@mcimadamore - Reviewer)
Chen Liang (@liach - Reviewer) Review applies to 4467d125

Contributors

Maurizio Cimadamore <mcimadamore@openjdk.org>

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 25451

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

Using diff file

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

Using Webrev

Link to Webrev Comment

…natures

bridgekeeper · 2025-05-26T15:51:49Z

👋 Welcome back abimpoudis! 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 · 2025-05-26T15:51:53Z

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

8357653: Inner classes of type parameters emitted as raw types in signatures
8357472: NPE in Types.containsType for type variable used as a qualifier

Co-authored-by: Maurizio Cimadamore <mcimadamore@openjdk.org>
Reviewed-by: mcimadamore, vromero, liach

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

c9ecc82: 8362162: Use bool for caller of os::must_commit_stack_guard_pages()
bf225c2: 8361959: [GCC static analyzer] java_props_md.c leak of 'temp' variable is reported
e5ab210: 8359678: C2: assert(static_cast(result) == thing) caused by ReverseBytesNode::Value()
... and 76 more: https://git.openjdk.org/jdk/compare/117f0b4051b37d6e639799c5f6add3e2aec8e200...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.

openjdk · 2025-05-26T15:52:32Z

@biboudis 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.

biboudis · 2025-05-26T15:58:20Z

/csr needed

openjdk · 2025-05-26T15:58:27Z

@biboudis has indicated that a compatibility and specification (CSR) request is needed for this pull request.

@biboudis please create a CSR request for issue JDK-8357653 with the correct fix version. This pull request cannot be integrated until the CSR request is approved.

biboudis · 2025-05-26T15:58:48Z

/contributor add @mcimadamore

openjdk · 2025-05-26T15:59:06Z

@biboudis
Contributor Maurizio Cimadamore <mcimadamore@openjdk.org> successfully added.

mlbridge · 2025-05-26T16:10:32Z

Webrevs

mcimadamore · 2025-05-26T17:11:30Z

Looks good - I'm unsure whether we should unify the two routines as part of this fix, or if we wanna keep that for a separate PR (given that might be a potential extra risk)

vicente-romero-oracle

looks sensible to me

test/langtools/tools/javac/T8357653.java

vicente-romero-oracle

looks good

biboudis · 2025-07-07T09:35:28Z

/issue add JDK-8357472

openjdk · 2025-07-07T09:36:59Z

@biboudis
Adding additional issue to issue list: 8357472: NPE in Types.containsType for type variable used as a qualifier.

…rSuper

mcimadamore

The new fix looks good. IMHO the main thing we need to add here is some better comments for asEnclosingSuper and asOuterSuper to describe in which cases they should be used.

biboudis · 2025-07-07T15:18:20Z

I revised the text a bit. Let me know if that's a good direction.

I am still think about the opportunity we may have here o unify the two methods; maybe also by introducing some enum to emphasize the different modes of interpretation for qualified types?

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java

vicente-romero-oracle

lgtm

mcimadamore

The code looks good to go. If you want to add more examples or comments in the javadoc, that might be useful, but the PR as is looks good.

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java

vicente-romero-oracle

looks good, thanks!

liach

Bikeshedding

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java

Co-authored-by: Chen Liang <liach@openjdk.org>

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java

mcimadamore

Looks very good, I left two optional minor doc changes

Co-authored-by: Maurizio Cimadamore <54672762+mcimadamore@users.noreply.github.com>

biboudis · 2025-07-16T10:51:09Z

/integrate

openjdk · 2025-07-16T10:52:27Z

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

b787ad6: 8361401: Warnings for use of Sun APIs should not be mandatory
6b4a5ef: 8358641: C1 option -XX:+TimeEachLinearScan is broken
9f7dc19: 8353276: C2: simplify PhaseMacroExpand::opt_bits_test
... and 110 more: https://git.openjdk.org/jdk/compare/117f0b4051b37d6e639799c5f6add3e2aec8e200...master

Your commit was automatically rebased without conflicts.

openjdk · 2025-07-16T10:52:39Z

@biboudis Pushed as commit 5e4a2ea.

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

8357653: Inner classes of type parameters emitted as raw types in sig…

f33753b

…natures

openjdk bot added the compiler compiler-dev@openjdk.org label May 26, 2025

openjdk bot added the csr Pull request needs approved CSR before integration label May 26, 2025

biboudis marked this pull request as ready for review May 26, 2025 16:06

openjdk bot added the rfr Pull request is ready for review label May 26, 2025

vicente-romero-oracle approved these changes May 27, 2025

View reviewed changes

biboudis added 2 commits June 11, 2025 11:38

Address review

3db5b0d

Restore formatting of asOuterSuper

6cec56a

mcimadamore approved these changes Jun 11, 2025

View reviewed changes

vicente-romero-oracle reviewed Jun 11, 2025

View reviewed changes

test/langtools/tools/javac/T8357653.java Outdated Show resolved Hide resolved

vicente-romero-oracle approved these changes Jun 11, 2025

View reviewed changes

Remove unused field in test

68364b8

vicente-romero-oracle approved these changes Jun 11, 2025

View reviewed changes

mcimadamore approved these changes Jun 23, 2025

View reviewed changes

biboudis added 2 commits July 7, 2025 15:02

Add test from 8357472 and simplify both methods getOuterSuper/getOwne…

846c1f3

…rSuper

Revert rename of asEnclosingSuper/asOuterSuper

6b0429c

mcimadamore reviewed Jul 7, 2025

View reviewed changes

Improve comments of asEnclosingSuper/asOuterSuper

cc6523a

vicente-romero-oracle reviewed Jul 10, 2025

View reviewed changes

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java Outdated Show resolved Hide resolved

Update comments

46089d7

mcimadamore reviewed Jul 10, 2025

View reviewed changes

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java Outdated Show resolved Hide resolved

Re-inline methods

e131c46

vicente-romero-oracle approved these changes Jul 10, 2025

View reviewed changes

mcimadamore approved these changes Jul 10, 2025

View reviewed changes

Add examples

0e063a5

vicente-romero-oracle reviewed Jul 11, 2025

View reviewed changes

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java Outdated Show resolved Hide resolved

Fix example

629ef2a

vicente-romero-oracle approved these changes Jul 11, 2025

View reviewed changes

liach reviewed Jul 11, 2025

View reviewed changes

Apply suggestions from code review

4467d12

Co-authored-by: Chen Liang <liach@openjdk.org>

liach approved these changes Jul 14, 2025

View reviewed changes

Reduce comments

a39bad3

mcimadamore reviewed Jul 14, 2025

View reviewed changes

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java Outdated Show resolved Hide resolved

mcimadamore reviewed Jul 14, 2025

View reviewed changes

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java Outdated Show resolved Hide resolved

mcimadamore approved these changes Jul 14, 2025

View reviewed changes

openjdk bot added ready Pull request is ready to be integrated and removed csr Pull request needs approved CSR before integration labels Jul 15, 2025

Apply suggestions from Maurizios code review

2d3449f

Co-authored-by: Maurizio Cimadamore <54672762+mcimadamore@users.noreply.github.com>

openjdk bot removed the ready Pull request is ready to be integrated label Jul 15, 2025

mcimadamore approved these changes Jul 15, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jul 15, 2025

openjdk bot added the integrated Pull request has been integrated label Jul 16, 2025

openjdk bot closed this Jul 16, 2025

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 16, 2025

8357653: Inner classes of type parameters emitted as raw types in signatures #25451

8357653: Inner classes of type parameters emitted as raw types in signatures #25451

Uh oh!

Conversation

biboudis commented May 26, 2025 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issues

Reviewers

Contributors

Reviewing

Uh oh!

bridgekeeper bot commented May 26, 2025

Uh oh!

openjdk bot commented May 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented May 26, 2025

Uh oh!

biboudis commented May 26, 2025

Uh oh!

openjdk bot commented May 26, 2025

Uh oh!

biboudis commented May 26, 2025

Uh oh!

openjdk bot commented May 26, 2025

Uh oh!

mlbridge bot commented May 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

mcimadamore commented May 26, 2025

Uh oh!

vicente-romero-oracle left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

vicente-romero-oracle left a comment

Choose a reason for hiding this comment

Uh oh!

biboudis commented Jul 7, 2025

Uh oh!

openjdk bot commented Jul 7, 2025

Uh oh!

mcimadamore left a comment

Choose a reason for hiding this comment

Uh oh!

biboudis commented Jul 7, 2025

Uh oh!

Uh oh!

Uh oh!

vicente-romero-oracle left a comment

Choose a reason for hiding this comment

Uh oh!

mcimadamore left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

vicente-romero-oracle left a comment

Choose a reason for hiding this comment

Uh oh!

liach left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mcimadamore left a comment

Choose a reason for hiding this comment

Uh oh!

biboudis commented Jul 16, 2025

Uh oh!

openjdk bot commented Jul 16, 2025

biboudis commented May 26, 2025 •

edited by openjdk bot

Loading

openjdk bot commented May 26, 2025 •

edited

Loading

mlbridge bot commented May 26, 2025 •

edited

Loading