diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fold-const.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/pr89790.C | 20 |
4 files changed, 36 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8ce3d7c..fd07440 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2019-03-25 Richard Biener <rguenther@suse.de> + + PR middle-end/89790 + * fold-const.c (operand_equal_p): Revert last change with + updated comment. + 2019-03-24 Segher Boessenkool <segher@kernel.crashing.org> * config/rs6000/rs6000.c (rs6000_legitimize_tls_address): Add REG_EQUAL diff --git a/gcc/fold-const.c b/gcc/fold-const.c index 86ad2cb..c2884a6 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -2973,6 +2973,11 @@ 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 template id), + 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 a4560af..74b1483 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-03-25 Richard Biener <rguenther@suse.de> + + PR middle-end/89790 + * g++.dg/pr89790.C: New testcase. + 2019-03-24 Uroš Bizjak <ubizjak@gmail.com> * gcc.target/i386/pr82281.c: Compile only for ia32 effective target. diff --git a/gcc/testsuite/g++.dg/pr89790.C b/gcc/testsuite/g++.dg/pr89790.C new file mode 100644 index 0000000..c4d9766 --- /dev/null +++ b/gcc/testsuite/g++.dg/pr89790.C @@ -0,0 +1,20 @@ +// { dg-do compile } +// { dg-options "-Wduplicated-cond" } + +template <typename> +class a +{ + typedef a b; + template <typename> void c(); +}; +template <typename d> template <typename> +void a<d>::c() +{ + int f; + b g; + if (g == 0) + ; + else if (f) + { + } +} |