From: Jan Hubicka <hubicka@ucw.cz>
Date: Mon, 9 Feb 2015 21:06:35 +0000 (+0100)
Subject: re PR ipa/61548 (FAIL: gcc.dg/tls/alias-1.c)
X-Git-Tag: releases/gcc-5.1.0~1058
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6248441777104cf224e58669aaeb858310b9f668;p=thirdparty%2Fgcc.git

re PR ipa/61548 (FAIL: gcc.dg/tls/alias-1.c)

	PR ipa/61548
	* tree-emutls.c (ipa_lower_emutls): Avoid duplicates in TLS_VARS.

From-SVN: r220549
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5f7c6214a3e9..2791de6c4f86 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-08  Jan Hubicka  <hubicka@ucw.cz>
+
+	PR ipa/61548
+	* tree-emutls.c (ipa_lower_emutls): Avoid duplicates in TLS_VARS.
+
 2015-02-08  Jan Hubicka  <hubicka@ucw.cz>
 
 	PR ipa/63566 
diff --git a/gcc/tree-emutls.c b/gcc/tree-emutls.c
index 68b2aae5e702..b4711a59c6b0 100644
--- a/gcc/tree-emutls.c
+++ b/gcc/tree-emutls.c
@@ -753,17 +753,19 @@ ipa_lower_emutls (void)
   cgraph_node *func;
   bool any_aliases = false;
   tree ctor_body = NULL;
-
+  hash_set <varpool_node *> visited;
   auto_vec <varpool_node *> tls_vars;
 
   /* Examine all global variables for TLS variables.  */
   FOR_EACH_VARIABLE (var)
-    if (DECL_THREAD_LOCAL_P (var->decl))
+    if (DECL_THREAD_LOCAL_P (var->decl)
+	&& !visited.add (var))
       {
 	gcc_checking_assert (TREE_STATIC (var->decl)
 			     || DECL_EXTERNAL (var->decl));
 	tls_vars.safe_push (var);
-	if (var->alias && var->definition)
+	if (var->alias && var->definition
+	    && !visited.add (var->ultimate_alias_target ()))
 	  tls_vars.safe_push (var->ultimate_alias_target ());
       }