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

[maurizio.cimadamore at oracle.com]

Changeset: af46c16d496e
Author:    mcimadamore
Date:      2019-01-03 23:46 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/af46c16d496e

Automatic merge with patterns-stage-1

! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java