8261205: AssertionError: Cannot add metadata to an intersection type

[cushon]

This is a backport of JDK-8888888: AssertionError: Cannot add metadata to an intersection type

Original patch does not apply cleanly to 11u

• I resolved a conflict where the loop in JavacParser that sets declaredUsingVar = true; was modified by JDK-8210742
• I adjusted the changes to imports, the original patch removed an import of com.sun.tools.javac.code.Attribute.Array from TypeAnnotations.java that was still being used in 11
• I removed the use of multi-line string literals in the test

Testing: x86_64 build, affected tests, tier1

---

Progress

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

Issue

• JDK-8261205: AssertionError: Cannot add metadata to an intersection type

Reviewers

• Paul Hohensee (@phohensee - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/794/head:pull/794
$ git checkout pull/794

Update a local copy of the PR:
$ git checkout pull/794
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/794/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 794

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/794.diff

[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]

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

[mlbridge]

Webrevs

• 01: Full - Incremental (f70fe836)
• 00: Full (d1be876e)

[phohensee]

Lgtm.

[openjdk]

@cushon This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8261205: AssertionError: Cannot add metadata to an intersection type

Reviewed-by: phh

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

• 18a0883: 8277992: Add fast jdk_svc subtests to jdk:tier3
• cd7d8c6: 8216969: ParseException thrown for certain months with russian locale
• 288c9f7: 8278381: [GCC 11] Address::make_raw() does not initialize rspec
• afb94ae: 8264650: Cross-compilation to macos/aarch64
• 562e4fe: Merge
• b8cdf1a: 8280786: Build failure on Solaris after 8262392
• ef5fff5: 8218546: Unable to connect to https://google.com using java.net.HttpClient
• 8359d7f: 8281324: Bump update version for OpenJDK: jdk-11.0.14.1
• 01c38c4: 8256321: Some "inactive" color profiles use the wrong profile class
• 85c81d9: 8280999: array_bounds should be array-bounds after 8278507
• ... and 2 more: https://git.openjdk.java.net/jdk11u-dev/compare/6837e1484bbeda710cde3763f0b0edb9c02351c2...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. Possible candidates are the reviewers of this PR (@phohensee) but any other Committer may sponsor as well.

➡️ 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).

[cushon]

/integrate

[openjdk]

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

[phohensee]

/sponsor

[openjdk]

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

• 18a0883: 8277992: Add fast jdk_svc subtests to jdk:tier3
• cd7d8c6: 8216969: ParseException thrown for certain months with russian locale
• 288c9f7: 8278381: [GCC 11] Address::make_raw() does not initialize rspec
• afb94ae: 8264650: Cross-compilation to macos/aarch64
• 562e4fe: Merge
• b8cdf1a: 8280786: Build failure on Solaris after 8262392
• ef5fff5: 8218546: Unable to connect to https://google.com using java.net.HttpClient
• 8359d7f: 8281324: Bump update version for OpenJDK: jdk-11.0.14.1
• 01c38c4: 8256321: Some "inactive" color profiles use the wrong profile class
• 85c81d9: 8280999: array_bounds should be array-bounds after 8278507
• ... and 2 more: https://git.openjdk.java.net/jdk11u-dev/compare/6837e1484bbeda710cde3763f0b0edb9c02351c2...master

Your commit was automatically rebased without conflicts.

[openjdk]

@phohensee @cushon Pushed as commit 1db4ed1.

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