For PR java/6519:

	* parse.y (build_string_concatenation): Return just op1 only when op2
	is null and op1 is a STRING_CST, otherwise always construct a
	StringBuffer.

From-SVN: r53158

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 461f13058049660bfcafeef8de074430dcce2c9f..a4b7a38ebdd17f6038ef218f16f0f976cc094361 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,10 @@
+2002-05-04  Mark Wielaard  <mark@klomp.org>
+
+       For PR java/6519:
+       * parse.y (build_string_concatenation): Return just op1 only when op2
+       is null and op1 is a STRING_CST, otherwise always construct a
+       StringBuffer.
+
 2002-04-27  Tom Tromey  <tromey@redhat.com>
 
        For PR java/6382:

diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index 00f064d96447ed7098f00e3360d6290e8f9253ac..c45ff1ecae8674e72ec2ec8b07cf4175a555d9f7 100644 (file)
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -13834,8 +13834,8 @@ build_string_concatenation (op1, op2)
     op2 = patch_string_cst (op2);
 
   /* If either one of the constant is null and the other non null
-     operand is a String object, return it. */
-  if (JSTRING_TYPE_P (TREE_TYPE (op1)) && !op2)
+     operand is a String constant, return it. */
+  if ((TREE_CODE (op1) == STRING_CST) && !op2)
     return op1;
 
   /* If OP1 isn't already a StringBuffer, create and