8337795: Type annotation attached to incorrect type during class reading

[cushon]

This change fixes a bug in javac's handling of type annotations in bytecode, which was logic first added in JDK 22 as part of the fix for JDK-8225377.

---

Progress

• JDK-8337795 needs maintainer approval
• 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 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 67

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk23u/pull/67.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:

8337795: Type annotation attached to incorrect type during class reading

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

• bd44358: 8335789: [TESTBUG] XparColor.java test fails with Error. Parse Exception: Invalid or unrecognized bugid: @
• f63b702: 8340306: Add border around instructions in PassFailJFrame
• faa89f4: 8340210: Add positionTestUI() to PassFailJFrame.Builder
• b8d01b0: 8340308: PassFailJFrame: Make rows default to number of lines in instructions
• fa008de: 8332901: Select{Current,New}ItemTest.java for Choice don't open popup on macOS
• e4badd4: 8340007: Refactor KeyEvent/FunctionKeyTest.java
• 20c1153: 8340008: KeyEvent/KeyTyped/Numpad1KeyTyped.java has 15 seconds timeout
• caf28d4: 8338924: C1: assert(0 <= i && i < _len) failed: illegal index 5 for length 5
• 54bb851: 8338389: [JFR] Long strings should be added to the string pool
• 5979904: 8337876: [IR Framework] Add support for IR tests with @stable
• ... and 49 more: https://git.openjdk.org/jdk23u/compare/afba2b3467333cc1910114c2d194912763c5a5f4...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).

[openjdk]

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

[cushon]

/approval request This change fixes a bug in javac's handling of type annotations in bytecode, which was logic first added in JDK 22 as part of the fix for JDK-8225377. The patch applies cleanly, and langtools tier1 passes.

[openjdk]

@cushon
8337795: The approval request has been created successfully.

[mlbridge]

Webrevs

• 01: Full - Incremental (c7b59e5b)
• 00: Full (ca2e3434)

[bridgekeeper]

@cushon This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

[cushon]

Feel free to ask for assistance if you need help with progressing this pull request towards integration!

The backport has maintainer approval, is there anything else I should be doing to help progress this towards integration?

[phohensee]

Add a "/integrate" comment and I'll sponsor.

[cushon]

/integrate

[openjdk]

@cushon
Your change (at version c7b59e5) is now ready to be sponsored by a Committer.

[phohensee]

/sponsor

[openjdk]

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

• bd44358: 8335789: [TESTBUG] XparColor.java test fails with Error. Parse Exception: Invalid or unrecognized bugid: @
• f63b702: 8340306: Add border around instructions in PassFailJFrame
• faa89f4: 8340210: Add positionTestUI() to PassFailJFrame.Builder
• b8d01b0: 8340308: PassFailJFrame: Make rows default to number of lines in instructions
• fa008de: 8332901: Select{Current,New}ItemTest.java for Choice don't open popup on macOS
• e4badd4: 8340007: Refactor KeyEvent/FunctionKeyTest.java
• 20c1153: 8340008: KeyEvent/KeyTyped/Numpad1KeyTyped.java has 15 seconds timeout
• caf28d4: 8338924: C1: assert(0 <= i && i < _len) failed: illegal index 5 for length 5
• 54bb851: 8338389: [JFR] Long strings should be added to the string pool
• 5979904: 8337876: [IR Framework] Add support for IR tests with @stable
• ... and 49 more: https://git.openjdk.org/jdk23u/compare/afba2b3467333cc1910114c2d194912763c5a5f4...master

Your commit was automatically rebased without conflicts.

[openjdk]

@phohensee @cushon Pushed as commit a55e476.

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