Backport request. The fix was pushed into jdk9 last week. Changes are applied cleanly. https://bugs.openjdk.java.net/browse/JDK-8057643 jdk9 webrev: http://cr.openjdk.java.net/~kvn/8057643/webrev/ jdk9 changeset: http://hg.openjdk.java.net/jdk9/hs-comp/hotspot/rev/d3e712a41646 Thanks, Vladimir