From: Jan Hubicka <jh@suse.cz>
Date: Sat, 23 Dec 2006 00:27:44 +0000 (+0100)
Subject: tree-flow-inline.h (var_ann): External variable annotations are unshared too.
X-Git-Tag: releases/gcc-4.3.0~7845
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ac5a24645e9f7793abc1f850d2a24a369a2e12b;p=thirdparty%2Fgcc.git

tree-flow-inline.h (var_ann): External variable annotations are unshared too.

	* tree-flow-inline.h (var_ann): External variable annotations are
	unshared too.
	(tree_common_ann): Handle correctly unshared variables annotations.
	* tree-dfa.c (create_var_ann): External variable annotations are
	unshared too.

From-SVN: r120164
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1c10a1494956..be8a3f568be7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2006-12-23  Jan Hubicka  <jh@suse.cz>
+
+	* tree-flow-inline.h (var_ann): External variable annotations are
+	unshared too.
+	(tree_common_ann): Handle correctly unshared variables annotations.
+	* tree-dfa.c (create_var_ann): External variable annotations are
+	unshared too.
+
 2006-12-22  Kazu Hirata  <kazu@codesourcery.com>
 
 	* basic-block.h: Remove the prototype for
diff --git a/gcc/tree-dfa.c b/gcc/tree-dfa.c
index 9c30eb53e191..59899f17f77a 100644
--- a/gcc/tree-dfa.c
+++ b/gcc/tree-dfa.c
@@ -130,7 +130,7 @@ create_var_ann (tree t)
   gcc_assert (DECL_P (t));
   gcc_assert (!t->base.ann || t->base.ann->common.type == VAR_ANN);
 
-  if (TREE_STATIC (t))
+  if (!MTAG_P (t) && (TREE_STATIC (t) || DECL_EXTERNAL (t)))
     {
       sann = GGC_CNEW (struct static_var_ann_d);
       ann = &sann->ann;
@@ -140,7 +140,7 @@ create_var_ann (tree t)
 
   ann->common.type = VAR_ANN;
 
-  if (TREE_STATIC (t))
+  if (!MTAG_P (t) && (TREE_STATIC (t) || DECL_EXTERNAL (t)))
     {
        void **slot;
        sann->uid = DECL_UID (t);
@@ -696,7 +696,7 @@ set_default_def (tree var, tree def)
       htab_remove_elt (DEFAULT_DEFS (cfun), *loc);
       return;
     }
-  gcc_assert (TREE_CODE (def) == SSA_NAME);
+  gcc_assert (!def || TREE_CODE (def) == SSA_NAME);
   loc = htab_find_slot_with_hash (DEFAULT_DEFS (cfun), &in,
                                   DECL_UID (var), INSERT);
 
diff --git a/gcc/tree-flow-inline.h b/gcc/tree-flow-inline.h
index d87adc391124..0695c6562939 100644
--- a/gcc/tree-flow-inline.h
+++ b/gcc/tree-flow-inline.h
@@ -203,7 +203,7 @@ var_ann (tree t)
   gcc_assert (t);
   gcc_assert (DECL_P (t));
   gcc_assert (TREE_CODE (t) != FUNCTION_DECL);
-  if (TREE_STATIC (t))
+  if (!MTAG_P (t) && (TREE_STATIC (t) || DECL_EXTERNAL (t)))
     {
       struct static_var_ann_d *sann
         = ((struct static_var_ann_d *)
@@ -952,6 +952,9 @@ clear_call_clobbered (tree var)
 static inline tree_ann_common_t
 tree_common_ann (tree t)
 {
+  /* Watch out static variables with unshared annotations.  */
+  if (DECL_P (t) && TREE_CODE (t) == VAR_DECL)
+    return &var_ann (t)->common;
   return &t->base.ann->common;
 }