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

[maurizio.cimadamore at oracle.com]

Changeset: 790e66f7d86b
Author:    mcimadamore
Date:      2019-04-08 13:45 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/790e66f7d86b

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