hg: amber/amber: Automatic merge with patterns-stage-1

[maurizio.cimadamore at oracle.com]

Changeset: 888ef8b908e2
Author:    mcimadamore
Date:      2019-08-02 08:55 +0000
URL:       https://hg.openjdk.java.net/amber/amber/rev/888ef8b908e2

Automatic merge with patterns-stage-1

! src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotations.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java