hg: amber/amber: Automatic merge with datum

[maurizio.cimadamore at oracle.com]

Changeset: 84c4bed32dd2
Author:    mcimadamore
Date:      2018-10-24 05:30 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/84c4bed32dd2

Automatic merge with datum

! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java