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

[maurizio.cimadamore at oracle.com]

Changeset: c4dd9c8290a3
Author:    langtools
Date:      2017-05-12 01:28 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/c4dd9c8290a3

Automatic merge with constant-folding

! src/share/vm/classfile/vmSymbols.hpp
! src/share/vm/runtime/globals.hpp