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

[maurizio.cimadamore at oracle.com]

Changeset: 0439871b021f
Author:    langtools
Date:      2017-05-04 16:40 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/0439871b021f

Automatic merge with constant-folding