[jdk17u-dev] RFR: 8337795: Type annotation attached to incorrect type during class reading

[Liam Miller-Cushon]

This is a backport of [JDK-8337795](https://bugs.openjdk.org/browse/JDK-8337795), which is a follow-up to [JDK-8341779](https://bugs.openjdk.org/browse/JDK-8341779).

-------------

Depends on: https://git.openjdk.org/jdk17u-dev/pull/4124

Commit messages:
 - Fix merge
 - Backport 8d0831478338e9b084b2c47f46eba9faae3a5eb6

Changes: https://git.openjdk.org/jdk17u-dev/pull/4149/files
  Webrev: https://webrevs.openjdk.org/?repo=jdk17u-dev&pr=4149&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8337795
  Stats: 109 lines in 2 files changed: 25 ins; 44 del; 40 mod
  Patch: https://git.openjdk.org/jdk17u-dev/pull/4149.diff
  Fetch: git fetch https://git.openjdk.org/jdk17u-dev.git pull/4149/head:pull/4149

PR: https://git.openjdk.org/jdk17u-dev/pull/4149