From: Jan Hubicka <hubicka@ucw.cz>
Date: Wed, 2 Oct 2019 12:41:36 +0000 (+0200)
Subject: re PR c++/91222 (507.cactuBSSN_r build fails in warn_types_mismatch at ipa-devirt... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=569651fd6fdb6455da58f7811e6296c22ce34df7;p=gcc.git

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
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f76a6ce676a..49ae8b2cdf2 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 3423c4052db..6c651a38705 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);