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

[maurizio.cimadamore at oracle.com]

Changeset: ec5fc09f84a0
Author:    langtools
Date:      2017-05-05 20:58 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/ec5fc09f84a0

Automatic merge with constant-folding

! src/share/vm/interpreter/linkResolver.cpp