hg: amber/amber/langtools: Automatic merge with constant-folding

[maurizio.cimadamore at oracle.com]

Changeset: c8935c8a5b49
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-16 11:45 +0200
URL:       http://hg.openjdk.java.net/amber/amber/langtools/rev/c8935c8a5b49

Automatic merge with constant-folding

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