Please review. Bug: https://bugs.openjdk.java.net/browse/JDK-8222288 Webrev: https://cr.openjdk.java.net/~sundar/8222288/webrev.00/ PS. Thanks to Maurizio for suggestion on javac source for 'source safe' String escape! Thanks, -Sundar