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

[maurizio.cimadamore at oracle.com]

Changeset: 1662ecac0932
Author:    mcimadamore
Date:      2020-02-13 22:07 +0000
URL:       https://hg.openjdk.java.net/amber/amber/rev/1662ecac0932

Automatic merge with patterns-stage-2

! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties