From fa5866c0e3a9989b74d0e24733d47cab8187103d Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@gcc.gnu.org>
Date: Thu, 10 Apr 2014 20:57:48 +0200
Subject: [PATCH] re PR lto/60567 (lto1 ICE in add_symbol_to_partition, at
lto/lto-partition.c:233 with -fno-use-linker-plugin)
PR lto/60567
* ipa.c (function_and_variable_visibility): Copy forced_by_abi flag from
decl_node to node.
* g++.dg/lto/pr60567_0.C: New test.
From-SVN: r209280
---
gcc/ChangeLog | 8 +++++---
gcc/fortran/ChangeLog | 5 +++++
gcc/ipa.c | 1 +
gcc/testsuite/ChangeLog | 5 +++++
gcc/testsuite/g++.dg/lto/pr60567_0.C | 23 +++++++++++++++++++++++
5 files changed, 39 insertions(+), 3 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/lto/pr60567_0.C
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 89f4e04943f8..e127291e1b10 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,7 +1,9 @@
-2014-04-10 Bernd Edlinger <bernd.edlinger@hotmail.de>
+2014-04-10 Jan Hubicka <hubicka@ucw.cz>
+ Jakub Jelinek <jakub@redhat.com>
- * fortran/class.c (gfc_build_class_symbol): Append "_t" to target class
- names to make the generated type names unique.
+ PR lto/60567
+ * ipa.c (function_and_variable_visibility): Copy forced_by_abi flag from
+ decl_node to node.
2014-04-10 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index dcc84fd84fb6..386a2f21e0e6 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-10 Bernd Edlinger <bernd.edlinger@hotmail.de>
+
+ * class.c (gfc_build_class_symbol): Append "_t" to target class
+ names to make the generated type names unique.
+
2014-04-04 Tobias Burnus <burnus@net-b.de>
* check.c (gfc_check_cmplx): Fix typo.
diff --git a/gcc/ipa.c b/gcc/ipa.c
index c76687604dda..26e9b03b9bdb 100644
--- a/gcc/ipa.c
+++ b/gcc/ipa.c
@@ -1032,6 +1032,7 @@ function_and_variable_visibility (bool whole_program)
== DECL_COMDAT_GROUP (decl_node->decl));
gcc_checking_assert (node->same_comdat_group);
}
+ node->forced_by_abi = decl_node->forced_by_abi;
if (DECL_EXTERNAL (decl_node->decl))
DECL_EXTERNAL (node->decl) = 1;
}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4db6ed06ad9f..4e2bb478825c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-10 Jakub Jelinek <jakub@redhat.com>
+
+ PR lto/60567
+ * g++.dg/lto/pr60567_0.C: New test.
+
2014-04-10 Bernd Edlinger <bernd.edlinger@hotmail.de>
* gfortran.dg/class_nameclash.f90: New test.
diff --git a/gcc/testsuite/g++.dg/lto/pr60567_0.C b/gcc/testsuite/g++.dg/lto/pr60567_0.C
new file mode 100644
index 000000000000..966a3c3bc742
--- /dev/null
+++ b/gcc/testsuite/g++.dg/lto/pr60567_0.C
@@ -0,0 +1,23 @@
+// PR lto/60567
+// { dg-lto-do link }
+// { dg-lto-options { { -flto -fno-use-linker-plugin } } }
+// { dg-extra-ld-options "-r -nostdlib" }
+
+#pragma implementation
+struct S {};
+
+#pragma interface
+struct T
+{
+ virtual void foo (const S &) = 0;
+};
+
+struct U
+{
+ virtual void bar (const S &) = 0;
+};
+
+struct V : public T, public U
+{
+ virtual void bar (const S &) {}
+};
--
GitLab