Commit c442c002 by Tom Tromey Committed by Tom Tromey

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
parent 48711f4d
2002-06-02 Tom Tromey <tromey@redhat.com> 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: Fix for PR java/1343, PR java/6336:
* parse.y (make_nested_class_name): Remove extraneous `else'; fix * parse.y (make_nested_class_name): Remove extraneous `else'; fix
formatting. Changed return type. formatting. Changed return type.
......
...@@ -13538,6 +13538,15 @@ patch_binop (node, wfl_op1, wfl_op2) ...@@ -13538,6 +13538,15 @@ patch_binop (node, wfl_op1, wfl_op2)
TREE_TYPE (node) = boolean_type_node; 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))) if (!(op2_type = resolve_type_during_patch (op2)))
return error_mark_node; return error_mark_node;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment