1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Attr.java Thu Apr 10 11:24:26 2014 -0700
1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java Thu Apr 10 14:01:53 2014 -0700
1.3 @@ -3009,15 +3009,6 @@
1.4 Type ctype = cfolder.fold1(opc, argtype);
1.5 if (ctype != null) {
1.6 owntype = cfolder.coerce(ctype, owntype);
1.7 -
1.8 - // Remove constant types from arguments to
1.9 - // conserve space. The parser will fold concatenations
1.10 - // of string literals; the code here also
1.11 - // gets rid of intermediate results when some of the
1.12 - // operands are constant identifiers.
1.13 - if (tree.arg.type.tsym == syms.stringType.tsym) {
1.14 - tree.arg.type = syms.stringType;
1.15 - }
1.16 }
1.17 }
1.18 }
1.19 @@ -3051,18 +3042,6 @@
1.20 Type ctype = cfolder.fold2(opc, left, right);
1.21 if (ctype != null) {
1.22 owntype = cfolder.coerce(ctype, owntype);
1.23 -
1.24 - // Remove constant types from arguments to
1.25 - // conserve space. The parser will fold concatenations
1.26 - // of string literals; the code here also
1.27 - // gets rid of intermediate results when some of the
1.28 - // operands are constant identifiers.
1.29 - if (tree.lhs.type.tsym == syms.stringType.tsym) {
1.30 - tree.lhs.type = syms.stringType;
1.31 - }
1.32 - if (tree.rhs.type.tsym == syms.stringType.tsym) {
1.33 - tree.rhs.type = syms.stringType;
1.34 - }
1.35 }
1.36 }
1.37
