diff options
| author | Richard Biener <rguenther@suse.de> | 2019-03-21 14:27:32 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2019-03-21 14:27:32 +0000 |
| commit | 6d1a7fd4507f94d5ba1ac3216330280a4751a599 (patch) | |
| tree | 18b7ef21746ac24ef6c1d79d6e6d37f58ce0d026 | |
| parent | e2186cd88ed9015ad0cd6f265daa164648d30f74 (diff) | |
| download | gcc-6d1a7fd4507f94d5ba1ac3216330280a4751a599.zip gcc-6d1a7fd4507f94d5ba1ac3216330280a4751a599.tar.gz gcc-6d1a7fd4507f94d5ba1ac3216330280a4751a599.tar.bz2 | |
re PR middle-end/89779 (internal compiler error: tree check: expected class ‘type’, have ‘exceptional’ (error_mark) in tree_nop_conversion_p, at tree.c:12798)
2019-03-21 Richard Biener <rguenther@suse.de>
PR tree-optimization/89779
* tree.c (tree_nop_conversion): Consolidate and fix defensive
checks with respect to released SSA names now having error_mark_node
type.
* fold-const.c (operand_equal_p): Likewise.
* gcc.dg/torture/pr89779.c: New testcase.
From-SVN: r269838
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/fold-const.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/torture/pr89779.c | 20 | ||||
| -rw-r--r-- | gcc/tree.c | 5 |
5 files changed, 34 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7774af8..717e2f2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2019-03-21 Richard Biener <rguenther@suse.de> + + PR tree-optimization/89779 + * tree.c (tree_nop_conversion): Consolidate and fix defensive + checks with respect to released SSA names now having error_mark_node + type. + * fold-const.c (operand_equal_p): Likewise. + 2019-03-20 Andreas Krebbel <krebbel@linux.ibm.com> PR target/89775 diff --git a/gcc/fold-const.c b/gcc/fold-const.c index ec28b43..86ad2cb 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -2973,11 +2973,6 @@ operand_equal_p (const_tree arg0, const_tree arg1, unsigned int flags) || TREE_TYPE (arg1) == error_mark_node) return 0; - /* Similar, if either does not have a type (like a released SSA name), - they aren't equal. */ - if (!TREE_TYPE (arg0) || !TREE_TYPE (arg1)) - return 0; - /* We cannot consider pointers to different address space equal. */ if (POINTER_TYPE_P (TREE_TYPE (arg0)) && POINTER_TYPE_P (TREE_TYPE (arg1)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5a343b6..c8f9492 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-03-21 Richard Biener <rguenther@suse.de> + + PR tree-optimization/89779 + * gcc.dg/torture/pr89779.c: New testcase. + 2019-03-21 Paolo Carlini <paolo.carlini@oracle.com> PR c++/78645 diff --git a/gcc/testsuite/gcc.dg/torture/pr89779.c b/gcc/testsuite/gcc.dg/torture/pr89779.c new file mode 100644 index 0000000..2a9d240 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr89779.c @@ -0,0 +1,20 @@ +/* { dg-do compile } */ + +typedef int a; +void h(a); +void c(a *d, int b) +{ + int e, f, g; + for (; e; e++) + for (f = 0; f < 4; f++) + if (d) + for (g = e + 1; g; g++) + h(d[g]); +} +void i() +{ + a *j; + int k, l; + for (; k; k++) + c(j, l); +} @@ -12812,13 +12812,10 @@ tree_nop_conversion (const_tree exp) if (!CONVERT_EXPR_P (exp) && TREE_CODE (exp) != NON_LVALUE_EXPR) return false; - if (TREE_OPERAND (exp, 0) == error_mark_node) - return false; outer_type = TREE_TYPE (exp); inner_type = TREE_TYPE (TREE_OPERAND (exp, 0)); - - if (!inner_type) + if (!inner_type || inner_type == error_mark_node) return false; return tree_nop_conversion_p (outer_type, inner_type); |