mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-01-27 11:34:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR java/2299 (Use of += for String arrays produces Segfault during compilation)

Browse Source 
2001-03-20  Tom Tromey  <tromey@redhat.com>
	    Alexandre Petit-Bianco <apbianco@redhat.com>

	* parse.y (patch_assignment): Handle the case of a SAVE_EXPR
	inside an array reference. Insertion of the array store check
	rewritten. Fixes PR java/2299.

(http://gcc.gnu.org/ml/gcc-patches/2001-06/msg00611.html )

Co-Authored-By: Alexandre Petit-Bianco <apbianco@redhat.com>

From-SVN: r43146
This commit is contained in:
Tom Tromey 2001-06-10 18:45:06 +00:00 committed by Alexandre Petit-Bianco
parent 21a6bb3c45
commit 7abecd65ae
2 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/java/ChangeLog
View File

@ -474,6 +474,13 @@
(jdep_resolve_class): Reset TYPE_SIZE if `error_mark_node', it's
too early to lay innerclasses out.
2001-03-20 Tom Tromey <tromey@redhat.com>
Alexandre Petit-Bianco <apbianco@redhat.com>
* parse.y (patch_assignment): Handle the case of a SAVE_EXPR
inside an array reference. Insertion of the array store check
rewritten. Fixes PR java/2299.
2001-03-20 Tom Tromey <tromey@redhat.com>
* lex.c (java_read_unicode): Only accept leading `u's.

46
gcc/java/parse.y
View File

@ -12568,12 +12568,15 @@ patch_assignment (node, wfl_op1, wfl_op2)
base = TREE_OPERAND (lvalue, 0);
else
{
base = TREE_OPERAND (base, 0);
if (flag_bounds_check)
base = TREE_OPERAND (base, 1);
if (flag_check_references)
base = TREE_OPERAND (base, 1);
base = TREE_OPERAND (base, 0);
tree op = TREE_OPERAND (base, 0);
/* We can have a SAVE_EXPR here when doing String +=. */
if (TREE_CODE (op) == SAVE_EXPR)
op = TREE_OPERAND (op, 0);
if (flag_bounds_check)
base = TREE_OPERAND (TREE_OPERAND (op, 1), 0);
else
base = TREE_OPERAND (op, 0);
}
/* Build the invocation of _Jv_CheckArrayStore */
@ -12599,16 +12602,31 @@ patch_assignment (node, wfl_op1, wfl_op2)
TREE_OPERAND (lvalue, 1) = build (COMPOUND_EXPR, lhs_type,
check, TREE_OPERAND (lvalue, 1));
}
else
else if (flag_bounds_check)
{
tree hook = lvalue;
tree compound = TREE_OPERAND (lvalue, 0);
tree bound_check, new_compound;
if (TREE_CODE (compound) == SAVE_EXPR)
{
compound = TREE_OPERAND (compound, 0);
hook = TREE_OPERAND (hook, 0);
}
/* Find the array bound check, hook the original array access. */
bound_check = TREE_OPERAND (compound, 0);
TREE_OPERAND (hook, 0) = TREE_OPERAND (compound, 1);
/* Make sure the bound check will happen before the store check */
if (flag_bounds_check)
TREE_OPERAND (TREE_OPERAND (lvalue, 0), 0) =
build (COMPOUND_EXPR, void_type_node,
TREE_OPERAND (TREE_OPERAND (lvalue, 0), 0), check);
else
lvalue = build (COMPOUND_EXPR, lhs_type, check, lvalue);
}
new_compound =
build (COMPOUND_EXPR, void_type_node, bound_check, check);
/* Re-assemble the augmented array access. */
lvalue = build (COMPOUND_EXPR, lhs_type, new_compound, lvalue);
}
else
lvalue = build (COMPOUND_EXPR, lhs_type, check, lvalue);
}
/* Final locals can be used as case values in switch