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

[maurizio.cimadamore at oracle.com]

Changeset: 1cfc9fa58ad4
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-30 00:04 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/1cfc9fa58ad4

Automatic merge with constant-folding

! src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
! src/share/vm/prims/jvm.h
- test/runtime/modules/JVMAddModulePackage.java