From: Jan Hubicka <hubicka@ucw.cz>
Date: Sun, 8 Jun 2014 16:57:19 +0000 (+0200)
Subject: symtab.c (symtab_nonoverwritable_alias): Copy VIRTUAL flag; remove static initializer.
X-Git-Tag: releases/gcc-5.1.0~7016
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=80bc9b6eccd49c5b8031be53e65fe65ffa718906;p=thirdparty%2Fgcc.git

symtab.c (symtab_nonoverwritable_alias): Copy VIRTUAL flag; remove static initializer.

	* symtab.c (symtab_nonoverwritable_alias): Copy VIRTUAL flag;
	remove static initializer.

From-SVN: r211358
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5e5a3c60fc7d..6bc4baa0d6e8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-07  Jan Hubicka  <hubicka@ucw.cz>
+
+	* symtab.c (symtab_nonoverwritable_alias): Copy VIRTUAL flag;
+	remove static initializer.
+
 2014-06-07  Jan Hubicka  <hubicka@ucw.cz>
 
 	* varasm.c (use_blocks_for_decl_p): Check symbol table instead of alias
diff --git a/gcc/symtab.c b/gcc/symtab.c
index 79fdbc28469e..ab6c9d747e66 100644
--- a/gcc/symtab.c
+++ b/gcc/symtab.c
@@ -1154,7 +1154,9 @@ symtab_nonoverwritable_alias (symtab_node *node)
   TREE_PUBLIC (new_decl) = 0;
   DECL_COMDAT (new_decl) = 0;
   DECL_WEAK (new_decl) = 0;
-  DECL_VIRTUAL_P (new_decl) = 0;
+
+  /* Since the aliases can be added to vtables, keep DECL_VIRTUAL flag.  */
+  DECL_VIRTUAL_P (new_decl) = DECL_VIRTUAL_P (node->decl);
   if (TREE_CODE (new_decl) == FUNCTION_DECL)
     {
       DECL_STATIC_CONSTRUCTOR (new_decl) = 0;
@@ -1165,6 +1167,7 @@ symtab_nonoverwritable_alias (symtab_node *node)
   else
     {
       TREE_READONLY (new_decl) = TREE_READONLY (node->decl);
+      DECL_INITIAL (new_decl) = error_mark_node;
       new_node = varpool_create_variable_alias (new_decl, node->decl);
     }
   symtab_resolve_alias (new_node, node);