re PR tree-optimization/90303 (ICE in hash_odr_name with fastcall attribute starting...

	PR tree-optimization/90303
	* ipa-devirt.c (obj_type_ref_class, get_odr_type): Don't use
	TYPE_CANONICAL for TYPE_STRUCTURAL_EQUALITY_P types in !in_lto_p mode.

	* g++.target/i386/pr90303.C: New test.

From-SVN: r270835

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5973192491a6fbfd03f18a73d987504172546127..2c4150d83e415070db13edc789f861d10a3c5a91 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-05-03  Jakub Jelinek  <jakub@redhat.com>
+
+       PR tree-optimization/90303
+       * ipa-devirt.c (obj_type_ref_class, get_odr_type): Don't use
+       TYPE_CANONICAL for TYPE_STRUCTURAL_EQUALITY_P types in !in_lto_p mode.
+
 2019-05-03  Richard Biener  <rguenther@suse.de>
 
        PR tree-optimization/89698

diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c
index defa2ed3a5dc95bbd8411be1d04b8037bc9f9212..3e040e273058f27f9aaa595117aff9496baf7f2f 100644 (file)
--- a/gcc/ipa-devirt.c
+++ b/gcc/ipa-devirt.c
@@ -2020,7 +2020,7 @@ obj_type_ref_class (const_tree ref)
   ref = TREE_VALUE (TYPE_ARG_TYPES (ref));
   gcc_checking_assert (TREE_CODE (ref) == POINTER_TYPE);
   tree ret = TREE_TYPE (ref);
-  if (!in_lto_p)
+  if (!in_lto_p && !TYPE_STRUCTURAL_EQUALITY_P (ret))
     ret = TYPE_CANONICAL (ret);
   else
     ret = get_odr_type (ret)->type;
@@ -2042,7 +2042,7 @@ get_odr_type (tree type, bool insert)
   int base_id = -1;
 
   type = TYPE_MAIN_VARIANT (type);
-  if (!in_lto_p)
+  if (!in_lto_p && !TYPE_STRUCTURAL_EQUALITY_P (type))
     type = TYPE_CANONICAL (type);
 
   gcc_checking_assert (can_be_name_hashed_p (type)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 660110d04934c2765e52b2f69d0eabfb96df26f5..509eb17752d0ff6fd060f3c6f22322f79801bce0 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-05-03  Jakub Jelinek  <jakub@redhat.com>
+
+       PR tree-optimization/90303
+       * g++.target/i386/pr90303.C: New test.
+
 2019-05-03  Richard Biener  <rguenther@suse.de>
 
        PR tree-optimization/89698

diff --git a/gcc/testsuite/g++.target/i386/pr90303.C b/gcc/testsuite/g++.target/i386/pr90303.C
new file mode 100644 (file)
index 0000000..2a2dd06
--- /dev/null
+++ b/gcc/testsuite/g++.target/i386/pr90303.C
@@ -0,0 +1,8 @@
+// PR tree-optimization/90303
+// { dg-do compile { target ia32 } }
+// { dg-additional-options "-O2" }
+
+struct A { virtual void foo (); };
+template <class> class B : A {};
+typedef void (__attribute__((fastcall)) F) ();
+B<F> e;