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

[maurizio.cimadamore at oracle.com]

Changeset: d234b346770a
Author:    mcimadamore
Date:      2019-03-07 11:46 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/d234b346770a

Automatic merge with patterns-stage-1

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