Simple backport from jdk9. Bug: https://bugs.openjdk.java.net/browse/JDK-8033798 Fix pushed as: http://hg.openjdk.java.net/jdk9/dev/langtools/rev/b5c6e4558b06 Fix applies without an issue to http://hg.openjdk.java.net/jdk8u/jdk8u-dev/langtools /Alex