Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8337795: Type annotation attached to incorrect type during class reading #20460

Closed
wants to merge 2 commits into from

Conversation

cushon
Copy link
Contributor

@cushon cushon commented Aug 4, 2024

This change fixes a bug in the logic for adding type annotations to types during class reading.

The implementation searched for contained types that type annotations applied to, and then separately rewrote the type to add the annotations using StructuralTypeMapping, relying on the object identity of Type instances to keep track of them between the two passes. This produced incorrect results if the same type (with the same identity) appeared multiple times as a contained type.

This fix merges the two passes into a single visitor that both locates annotated contained types, and rewrites them to add the annotations. This requires duplicating similar logic to StructuralTypeMapping, which seems unavoidable.


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-8337795: Type annotation attached to incorrect type during class reading (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 20460

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 4, 2024

👋 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
Copy link

openjdk bot commented Aug 4, 2024

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

8337795: Type annotation attached to incorrect type during class reading

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 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
Copy link

openjdk bot commented Aug 4, 2024

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

@openjdk openjdk bot added the compiler compiler-dev@openjdk.org label Aug 4, 2024
@cushon cushon marked this pull request as ready for review August 4, 2024 20:12
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 4, 2024
@mlbridge
Copy link

mlbridge bot commented Aug 4, 2024

Webrevs

Copy link
Contributor

@vicente-romero-oracle vicente-romero-oracle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks sensible

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 9, 2024
msridhar added a commit to uber/NullAway that referenced this pull request Aug 11, 2024
We can enable the test on appropriate JDK versions once
openjdk/jdk#20460 lands. #1011
@cushon
Copy link
Contributor Author

cushon commented Aug 12, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Aug 12, 2024

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

  • f84240b: 8338011: CDS archived heap object support for 64-bit Windows
  • 04b146a: 8337334: Test tools/javac/7142086/T7142086.java timeout with fastdebug binary
  • a36fb36: 8338108: Give better error message in configure if a full XCode is missing
  • 61d1dc5: 8334466: Ambiguous method call with generics may cause FunctionDescriptorLookupError
  • 89a15f1: 8337681: PNGImageWriter uses much more memory than necessary
  • a6c0630: 8337938: ZUtils::alloc_aligned allocates without reporting to NMT
  • 0320460: 8337958: Out-of-bounds array access in secondary_super_cache
  • 692f5cb: 8338101: remove old remap assertion in map_or_reserve_memory_aligned after JDK-8338058
  • 0e7c1c1: 8338112: Test testlibrary_tests/ir_framework/tests/TestPrivilegedMode.java fails with release build
  • 6a3d045: 8337709: Use allocated states for chunking large array processing

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 12, 2024
@openjdk openjdk bot closed this Aug 12, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 12, 2024
@openjdk
Copy link

openjdk bot commented Aug 12, 2024

@cushon Pushed as commit 8d08314.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
compiler compiler-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants