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

[maurizio.cimadamore at oracle.com]

Changeset: a329c9fbe3a0
Author:    langtools
Date:      2017-05-09 19:18 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/a329c9fbe3a0

Automatic merge with constant-folding