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

[maurizio.cimadamore at oracle.com]

Changeset: a52993ed2503
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-02 00:46 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/a52993ed2503

Automatic merge with constant-folding