diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fold-const.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/constexpr-89709.C | 18 | ||||
| -rw-r--r-- | gcc/tree.c | 2 |
5 files changed, 31 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5bd943b..d7a4f38 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2019-03-15 Jakub Jelinek <jakub@redhat.com> + PR c++/89709 + * tree.c (inchash::add_expr): Strip any location wrappers. + * fold-const.c (operand_equal_p): Move stripping of location wrapper + after hash verification. + PR debug/89704 * dwarf2out.c (add_const_value_attribute): Return false for MINUS, SIGN_EXTEND and ZERO_EXTEND. diff --git a/gcc/fold-const.c b/gcc/fold-const.c index dbc9679..ec28b43 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -2942,9 +2942,6 @@ combine_comparisons (location_t loc, int operand_equal_p (const_tree arg0, const_tree arg1, unsigned int flags) { - STRIP_ANY_LOCATION_WRAPPER (arg0); - STRIP_ANY_LOCATION_WRAPPER (arg1); - /* When checking, verify at the outermost operand_equal_p call that if operand_equal_p returns non-zero then ARG0 and ARG1 has the same hash value. */ @@ -2967,6 +2964,9 @@ operand_equal_p (const_tree arg0, const_tree arg1, unsigned int flags) return 0; } + STRIP_ANY_LOCATION_WRAPPER (arg0); + STRIP_ANY_LOCATION_WRAPPER (arg1); + /* If either is ERROR_MARK, they aren't equal. */ if (TREE_CODE (arg0) == ERROR_MARK || TREE_CODE (arg1) == ERROR_MARK || TREE_TYPE (arg0) == error_mark_node diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8780192..4e267d3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2019-03-15 Jakub Jelinek <jakub@redhat.com> + PR c++/89709 + * g++.dg/cpp0x/constexpr-89709.C: New test. + PR debug/89704 * gcc.dg/debug/pr89704.c: New test. diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-89709.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-89709.C new file mode 100644 index 0000000..30b319a --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-89709.C @@ -0,0 +1,18 @@ +// PR c++/89709 +// { dg-do compile { target c++11 } } +// { dg-options "-O" } + +struct A { int i; }; +A a; + +constexpr int * +foo () +{ + return &a.i; +} + +bool +bar () +{ + return foo () == &a.i; +} @@ -7743,6 +7743,8 @@ add_expr (const_tree t, inchash::hash &hstate, unsigned int flags) return; } + STRIP_ANY_LOCATION_WRAPPER (t); + if (!(flags & OEP_ADDRESS_OF)) STRIP_NOPS (t); |