Skip to content
This repository has been archived by the owner on Sep 2, 2022. It is now read-only.
/ jdk16 Public archive

8256693: getAnnotatedReceiverType parameterizes types too eagerly #33

Closed
wants to merge 3 commits into from

Conversation

jbf
Copy link
Member

@jbf jbf commented Dec 16, 2020

The fix for JDK-8256693 too often produces a ParameterizedType as the result of getAnnotatedReceiverType().getType() . A ParameterizedType is necessary only when this type or any of its transitive owner types has type parameters, but should be avoided if this isn't the case.

This implementation recursively creates a chain of ParameterizedTypes starting from the outermost type that has type parameters.

See here for the now closed JDK 17 pr: openjdk/jdk#1414


Progress

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

Issue

  • JDK-8256693: getAnnotatedReceiverType parameterizes types too eagerly

Reviewers

Download

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

Joel Borggrén-Franck added 2 commits December 16, 2020 10:36
Check type argument arrays from ParameterizedType and
AnnotatedParameterizedType has same length testing generation of the
empty case.
@bridgekeeper
Copy link

bridgekeeper bot commented Dec 16, 2020

👋 Welcome back jfranck! 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 openjdk bot added the rfr Pull request is ready for review label Dec 16, 2020
@openjdk
Copy link

openjdk bot commented Dec 16, 2020

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

  • core-libs

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.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.java.net label Dec 16, 2020
@mlbridge
Copy link

mlbridge bot commented Dec 16, 2020

Webrevs

@openjdk
Copy link

openjdk bot commented Dec 18, 2020

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

8256693: getAnnotatedReceiverType parameterizes types too eagerly

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

  • 1ce2e94: 8256843: [PPC64] runtime/logging/RedefineClasses.java fails with assert: registers not saved on stack
  • 45a150b: 8258134: assert(size == calc_size) failed: incorrect size calculation on x86_32 with AVX512 machines
  • 38593a4: 8257974: Regression 21% in DaCapo-lusearch-large after JDK-8236926
  • 7afb01d: 8258373: Update the text handling in the JPasswordField
  • cbc3fee: 8258259: Unicode linebreak matching behavior is incorrect; backout JDK-8235812
  • 7320e05: 8258647: TestCharVect2 is very slow
  • 9fdfc6d: 8225072: Add LuxTrust certificate that is expiring in March 2021 to list of allowed but expired certs
  • 30ca0a5: 8247994: Localize javadoc search
  • 47c180d: 8258515: javac should issue an error if an annotation is nested in a local class or interface
  • cb5a6b1: 8258225: compiler/c2/cr6340864/TestIntVect.java runs faster in interpreter
  • ... and 10 more: https://git.openjdk.java.net/jdk16/compare/b5a3a5b6216aa75d76c1da7f9d94a3bb6238ef36...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 openjdk bot added the ready Pull request is ready to be integrated label Dec 18, 2020
@jbf
Copy link
Member Author

jbf commented Dec 18, 2020

/integrate

@openjdk openjdk bot closed this Dec 18, 2020
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 18, 2020
@openjdk
Copy link

openjdk bot commented Dec 18, 2020

@jbf Since your change was applied there have been 20 commits pushed to the master branch:

  • 1ce2e94: 8256843: [PPC64] runtime/logging/RedefineClasses.java fails with assert: registers not saved on stack
  • 45a150b: 8258134: assert(size == calc_size) failed: incorrect size calculation on x86_32 with AVX512 machines
  • 38593a4: 8257974: Regression 21% in DaCapo-lusearch-large after JDK-8236926
  • 7afb01d: 8258373: Update the text handling in the JPasswordField
  • cbc3fee: 8258259: Unicode linebreak matching behavior is incorrect; backout JDK-8235812
  • 7320e05: 8258647: TestCharVect2 is very slow
  • 9fdfc6d: 8225072: Add LuxTrust certificate that is expiring in March 2021 to list of allowed but expired certs
  • 30ca0a5: 8247994: Localize javadoc search
  • 47c180d: 8258515: javac should issue an error if an annotation is nested in a local class or interface
  • cb5a6b1: 8258225: compiler/c2/cr6340864/TestIntVect.java runs faster in interpreter
  • ... and 10 more: https://git.openjdk.java.net/jdk16/compare/b5a3a5b6216aa75d76c1da7f9d94a3bb6238ef36...master

Your commit was automatically rebased without conflicts.

Pushed as commit 1cc98bd.

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
core-libs core-libs-dev@openjdk.java.net integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants