From: Tom Tromey <tromey@redhat.com>
Date: Sun, 2 Jun 2002 16:38:05 +0000 (+0000)
Subject: re PR java/5913 (Core dump for String constant instanceof)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c442c002227503e34372613f314d1e78579cb17a;p=gcc.git

re PR java/5913 (Core dump for String constant instanceof)

	Fix for PR java/5913:
	* parse.y (patch_binop): Call patch_string on op1.

From-SVN: r54174
---

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 1ddef436b33..1de79dfbe7c 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-02  Tom Tromey  <tromey@redhat.com>
+
+	Fix for PR java/5913:
+	* parse.y (patch_binop): Call patch_string on op1.
+
 2002-06-02  Tom Tromey  <tromey@redhat.com>
 
 	Fix for PR java/1343, PR java/6336:
diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index 742cc6f3b00..197816feb12 100644
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -13538,6 +13538,15 @@ patch_binop (node, wfl_op1, wfl_op2)
 
       TREE_TYPE (node) = boolean_type_node;
 
+      /* OP1_TYPE might be NULL when OP1 is a string constant.  */
+      if ((cn = patch_string (op1))) 
+	{
+	  op1 = cn;
+	  op1_type = TREE_TYPE (op1);
+	}
+      if (op1_type == NULL_TREE)
+	abort ();
+
       if (!(op2_type = resolve_type_during_patch (op2)))
 	return error_mark_node;