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

[maurizio.cimadamore at oracle.com]

Changeset: ca2cfe15b564
Author:    langtools
Date:      2017-05-05 16:03 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/ca2cfe15b564

Automatic merge with constant-folding