[jdk11u-dev] Integrated: 8261205: AssertionError: Cannot add metadata to an intersection type

[Liam Miller-Cushon]

On Tue, 25 Jan 2022 23:03:34 GMT, Liam Miller-Cushon <cushon at openjdk.org> wrote:

> This is a backport of [JDK-8888888: AssertionError: Cannot add metadata to an intersection type](https://bugs.openjdk.java.net/browse/JDK-8261205)
> 
> 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

This pull request has now been integrated.

Changeset: 1db4ed1a
Author:    Liam Miller-Cushon <cushon at openjdk.org>
Committer: Paul Hohensee <phh at openjdk.org>
URL:       https://git.openjdk.java.net/jdk11u-dev/commit/1db4ed1a62e1c93c4f32d51685723b3ec99aae03
Stats:     168 lines in 5 files changed: 163 ins; 0 del; 5 mod

8261205: AssertionError: Cannot add metadata to an intersection type

Reviewed-by: phh
Backport-of: 81f39ed3e0176b75dee1c8db24041545bcc68a86

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

PR: https://git.openjdk.java.net/jdk11u-dev/pull/794