From: Martin Liska <mliska@suse.cz>
Date: Sat, 8 Apr 2017 17:09:58 +0000 (+0200)
Subject: Revert r246759.
X-Git-Tag: basepoints/gcc-8~139
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d691b7e4067261a0acbe89c83bf1b06ed18bcafd;p=thirdparty%2Fgcc.git

Revert r246759.

From-SVN: r246785
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b1e034596dad..8c6e57f3a0c0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2017-04-08  Martin Liska  <mliska@suse.cz>
+
+	Revert:
+	2017-04-07  Martin Liska  <mliska@suse.cz>
+
+	PR ipa/80212
+	* ipa-split.c (split_function): Add function part to a same comdat
+	group.
+
 2017-04-08  Aaron Sawdey  <acsawdey@linux.vnet.ibm.com>
 
 	PR target/80358
diff --git a/gcc/ipa-split.c b/gcc/ipa-split.c
index ae1de6f1e63c..da3c2c623446 100644
--- a/gcc/ipa-split.c
+++ b/gcc/ipa-split.c
@@ -1363,9 +1363,6 @@ split_function (basic_block return_bb, struct split_point *split_point,
   /* Let's take a time profile for splitted function.  */
   node->tp_first_run = cur_node->tp_first_run + 1;
 
-  if (cur_node->same_comdat_group)
-    node->add_to_same_comdat_group (cur_node);
-
   /* For usual cloning it is enough to clear builtin only when signature
      changes.  For partial inlining we however can not expect the part
      of builtin implementation to have same semantic as the whole.  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6c21c2859acd..38dc5e3194a0 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2017-04-08  Martin Liska  <mliska@suse.cz>
+
+	Revert:
+	2017-04-07  Martin Liska  <mliska@suse.cz>
+
+	PR ipa/80212
+	* g++.dg/ipa/pr80212.C: New test.
+
 2017-04-07  Jakub Jelinek  <jakub@redhat.com>
 
 	* gcc.target/i386/avx512f-vgetmantps-2.c: Add -mfpmath=sse to
diff --git a/gcc/testsuite/g++.dg/ipa/pr80212.C b/gcc/testsuite/g++.dg/ipa/pr80212.C
deleted file mode 100644
index 60d3b613035c..000000000000
--- a/gcc/testsuite/g++.dg/ipa/pr80212.C
+++ /dev/null
@@ -1,18 +0,0 @@
-// PR ipa/80212
-// { dg-options "-O2 --param partial-inlining-entry-probability=403796683 -fno-early-inlining" }
-
-struct b
-{
-  virtual b *c () const;
-};
-struct d : virtual b
-{
-};
-struct e : d
-{
-  e *
-  c () const
-  {
-  }
-};
-main () { e a; }