From 941c3614de1559c71cd1dc4f15d888d2bcccbd63 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Sun, 5 Apr 2009 19:50:28 +0000 Subject: [PATCH] re PR c/39648 (internal compiler error: in fold_convert, at fold-const.c:2506) 2009-04-05 Richard Guenther PR tree-optimization/39648 * tree-ssa-sccvn.c (vn_reference_fold_indirect): Work around our &A vs. &A[0] IL deficiencies. * gcc.c-torture/compile/pr39648.c: New testcase. From-SVN: r145569 --- gcc/ChangeLog | 10 ++++++++-- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.c-torture/compile/pr39648.c | 12 ++++++++++++ gcc/tree-ssa-sccvn.c | 17 +++++++++++++++++ 4 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr39648.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 74b0f8d88207..19d3eaacf751 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,7 +1,13 @@ +2009-04-05 Richard Guenther + + PR tree-optimization/39648 + * tree-ssa-sccvn.c (vn_reference_fold_indirect): Work around + our &A vs. &A[0] IL deficiencies. + 2009-04-04 Jan Hubicka - * except.c (sjlj_find_directly_reachable_regions): Be ready for removed toplevel - regions. + * except.c (sjlj_find_directly_reachable_regions): Be ready for + removed toplevel regions. (sjlj_mark_call_sites): Likewise. 2009-04-04 Dave Korn diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7f7c07ef4a9d..83215bb1d6f0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-04-05 Richard Guenther + + PR tree-optimization/39648 + * gcc.c-torture/compile/pr39648.c: New testcase. + 2009-04-05 Jason Merrill PR c++/14912 diff --git a/gcc/testsuite/gcc.c-torture/compile/pr39648.c b/gcc/testsuite/gcc.c-torture/compile/pr39648.c new file mode 100644 index 000000000000..bb901fee0d58 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr39648.c @@ -0,0 +1,12 @@ +void +yysyntax_error (char *yyp) +{ + char const *yyf; + char yyformat[5]; + + yyf = yyformat; + while ((*yyp = *yyf) != '\0') { + if (yyf[1] == 's') + yyf += 2; + } +} diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c index 729787be3f70..2982e8ca051c 100644 --- a/gcc/tree-ssa-sccvn.c +++ b/gcc/tree-ssa-sccvn.c @@ -757,6 +757,23 @@ vn_reference_fold_indirect (VEC (vn_reference_op_s, heap) **ops, /* Get ops for the addressed object. */ op = VEC_index (vn_reference_op_s, *ops, i); + /* ??? If this is our usual typeof &ARRAY vs. &ARRAY[0] problem, work + around it to avoid later ICEs. */ + if (TREE_CODE (TREE_TYPE (TREE_OPERAND (op->op0, 0))) == ARRAY_TYPE + && TREE_CODE (TREE_TYPE (TREE_TYPE (op->op0))) != ARRAY_TYPE) + { + vn_reference_op_s aref; + tree dom; + aref.type = TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (op->op0))); + aref.opcode = ARRAY_REF; + aref.op0 = integer_zero_node; + if ((dom = TYPE_DOMAIN (TREE_TYPE (TREE_OPERAND (op->op0, 0)))) + && TYPE_MIN_VALUE (dom)) + aref.op0 = TYPE_MIN_VALUE (dom); + aref.op1 = NULL_TREE; + aref.op2 = NULL_TREE; + VEC_safe_push (vn_reference_op_s, heap, mem, &aref); + } copy_reference_ops_from_ref (TREE_OPERAND (op->op0, 0), &mem); /* Do the replacement - we should have at least one op in mem now. */ -- 2.47.3