diff options
| author | Jan Hubicka <hubicka@ucw.cz> | 2019-10-02 14:41:36 +0200 |
|---|---|---|
| committer | Jan Hubicka <hubicka@gcc.gnu.org> | 2019-10-02 12:41:36 +0000 |
| commit | 569651fd6fdb6455da58f7811e6296c22ce34df7 (patch) | |
| tree | 828b1d41104cb6a23eb9995512605774c4fe4b8d /gcc | |
| parent | d94b160233e3cef216075be86ca09a4f46b16891 (diff) | |
| download | gcc-569651fd6fdb6455da58f7811e6296c22ce34df7.zip gcc-569651fd6fdb6455da58f7811e6296c22ce34df7.tar.gz gcc-569651fd6fdb6455da58f7811e6296c22ce34df7.tar.bz2 | |
re PR c++/91222 (507.cactuBSSN_r build fails in warn_types_mismatch at ipa-devirt.c:1006 since r273571)
PR c++/91222
* ipa-devirt.c (warn_types_mismatch): Fix conditional on anonymous
namespace types.
From-SVN: r276454
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ipa-devirt.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f76a6ce..49ae8b2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2019-10-01 Jan Hubicka <hubicka@ucw.cz> + + PR c++/91222 + * ipa-devirt.c (warn_types_mismatch): Fix conditional on anonymous + namespace types. + 2019-10-02 Shahab Vahedi <shahab@synopsys.com> * config/arc/arc.h (ASM_SPEC): Pass -mcode-density. diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c index 3423c40..6c651a3 100644 --- a/gcc/ipa-devirt.c +++ b/gcc/ipa-devirt.c @@ -986,8 +986,8 @@ warn_types_mismatch (tree t1, tree t2, location_t loc1, location_t loc2) || (type_with_linkage_p (TYPE_MAIN_VARIANT (t2)) && type_in_anonymous_namespace_p (TYPE_MAIN_VARIANT (t2)))) { - if (type_with_linkage_p (TYPE_MAIN_VARIANT (t1)) - && !type_in_anonymous_namespace_p (TYPE_MAIN_VARIANT (t1))) + if (!type_with_linkage_p (TYPE_MAIN_VARIANT (t1)) + || !type_in_anonymous_namespace_p (TYPE_MAIN_VARIANT (t1))) { std::swap (t1, t2); std::swap (loc_t1, loc_t2); |