hg: amber/amber: Automatic merge with datum

[maurizio.cimadamore at oracle.com]

Changeset: cd1e0551d184
Author:    mcimadamore
Date:      2019-01-31 22:09 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/cd1e0551d184

Automatic merge with datum

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