Please approve this direct backport from jdk9/dev to jdk8u/jdk8u-dev. Issue: https://bugs.openjdk.java.net/browse/JDK-8038420 jdk9 changeset: http://hg.openjdk.java.net/jdk9/dev/langtools/rev/337cf1c63618 Reviewers: vromero, jlahoda