From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 17 Jan 2014 14:19:55 +0000 (+0000)
Subject: 	PR c++/57945
X-Git-Tag: upstream/4.9.2~1795
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1905e86a49ceb23b32a3f4339e442bd081fa2eaa;p=platform%2Fupstream%2Flinaro-gcc.git

	PR c++/57945
	* passes.c (rest_of_decl_compilation): Don't call varpool_finalize_decl
	on decls for which assemble_alias has been called.

	* c-c++-common/torture/pr57945.c: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206708 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f6b7692..239d6d6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-01-17  Jan Hubicka  <hubicka@ucw.cz>
+
+	PR c++/57945
+	* passes.c (rest_of_decl_compilation): Don't call varpool_finalize_decl
+	on decls for which assemble_alias has been called.
+
 2014-01-17  Nick Clifton  <nickc@redhat.com>
 
 	* config/msp430/msp430.opt: (mcpu): New option.
diff --git a/gcc/passes.c b/gcc/passes.c
index 3b340d3..60fb135 100644
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -187,6 +187,8 @@ rest_of_decl_compilation (tree decl,
 			  int top_level,
 			  int at_end)
 {
+  bool finalize = true;
+
   /* We deferred calling assemble_alias so that we could collect
      other attributes such as visibility.  Emit the alias now.  */
   if (!in_lto_p)
@@ -203,6 +205,7 @@ rest_of_decl_compilation (tree decl,
 	DECL_EXTERNAL (decl) = 0;
 	TREE_STATIC (decl) = 1;
 	assemble_alias (decl, alias);
+	finalize = false;
       }
   }
 
@@ -234,7 +237,7 @@ rest_of_decl_compilation (tree decl,
 	     rebuild it.  */
 	  if (in_lto_p && !at_end)
 	    ;
-	  else if (TREE_CODE (decl) != FUNCTION_DECL)
+	  else if (finalize && TREE_CODE (decl) != FUNCTION_DECL)
 	    varpool_finalize_decl (decl);
 	}
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 665d903..b5c9a25 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-17  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/57945
+	* c-c++-common/torture/pr57945.c: New test.
+
 2014-01-17  Zhenqiang Chen  <zhenqiang.chen@arm.com>
 
 	* gcc.target/arm/its.c: New testcase.
diff --git a/gcc/testsuite/c-c++-common/torture/pr57945.c b/gcc/testsuite/c-c++-common/torture/pr57945.c
new file mode 100644
index 0000000..0803e8f
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/torture/pr57945.c
@@ -0,0 +1,11 @@
+/* PR c++/57945 */
+/* { dg-do compile } */
+
+extern int j;
+static int i __attribute__((weakref("j")));
+
+int
+foo (void)
+{
+  return &i ? i : 0;
+}