archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 02:54:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8139751: Javac crash with -XDallowStringFolding=false

Browse source 
When string folding is disabled, need to keep the original expression.

Reviewed-by: mcimadamore
This commit is contained in:
Jan Lahoda 2015-10-19 12:41:45 +02:00
parent 11da417a28
commit 9cd68d0633
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
View file

@ -973,7 +973,7 @@ public class JavacParser implements Parser {
*/ */
protected JCExpression foldStrings(JCExpression tree) { protected JCExpression foldStrings(JCExpression tree) {
if (!allowStringFolding) if (!allowStringFolding)
return null; return tree;
ListBuffer<JCExpression> opStack = new ListBuffer<>(); ListBuffer<JCExpression> opStack = new ListBuffer<>();
ListBuffer<JCLiteral> litBuf = new ListBuffer<>(); ListBuffer<JCLiteral> litBuf = new ListBuffer<>();
boolean needsFolding = false; boolean needsFolding = false;

9
langtools/test/tools/javac/parser/StringFoldingTest.java
View file

@ -23,7 +23,7 @@
/* /*
* @test * @test
* @bug 7068902 * @bug 7068902 8139751
* @summary verify that string folding can be enabled or disabled * @summary verify that string folding can be enabled or disabled
* @modules jdk.compiler * @modules jdk.compiler
*/ */
@ -86,11 +86,14 @@ public class StringFoldingTest {
if (disableStringFolding) { if (disableStringFolding) {
if (text.contains("FOLDED")) { if (text.contains("FOLDED")) {
throw new AssertionError("Expected string folding"); throw new AssertionError("Expected no string folding");
}
if (!text.contains("\"F\"")) {
throw new AssertionError("Expected content not found");
} }
} else { } else {
if (!text.contains("FOLDED")) { if (!text.contains("FOLDED")) {
throw new AssertionError("Expected no string folding"); throw new AssertionError("Expected string folding");
} }
} }
} }