From: Richard Guenther <rguenther@suse.de>
Date: Tue, 7 Aug 2012 14:16:11 +0000 (+0000)
Subject: tree-dfa.c (set_ssa_default_def): Clear the SSA_NAME_DEFAULT_DEF bit of the old name... 
X-Git-Tag: releases/gcc-4.8.0~4085
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=01c59d23df7eef24a9e5a695baef59bd233ce115;p=thirdparty%2Fgcc.git

tree-dfa.c (set_ssa_default_def): Clear the SSA_NAME_DEFAULT_DEF bit of the old name when we clear the slot.

2012-08-07  Richard Guenther  <rguenther@suse.de>

	* tree-dfa.c (set_ssa_default_def): Clear the SSA_NAME_DEFAULT_DEF
	bit of the old name when we clear the slot.
	* tree-ssa-live.c (remove_unused_locals): Release any default
	def associated with an unused var.
	* tree-ssa-copy.c (may_propagate_copy_into_asm): Always return true.

From-SVN: r190201
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 65f194aeb09f..09103dab98d6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2012-08-07  Richard Guenther  <rguenther@suse.de>
+
+	* tree-dfa.c (set_ssa_default_def): Clear the SSA_NAME_DEFAULT_DEF
+	bit of the old name when we clear the slot.
+	* tree-ssa-live.c (remove_unused_locals): Release any default
+	def associated with an unused var.
+	* tree-ssa-copy.c (may_propagate_copy_into_asm): Always return true.
+
 2012-08-07  Richard Guenther  <rguenther@suse.de>
 
 	* tree-into-ssa.c (rewrite_stmt): Remove clobbers for variables
diff --git a/gcc/tree-dfa.c b/gcc/tree-dfa.c
index 12bb577df5e2..5342f1973a41 100644
--- a/gcc/tree-dfa.c
+++ b/gcc/tree-dfa.c
@@ -336,7 +336,10 @@ set_ssa_default_def (struct function *fn, tree var, tree def)
       loc = htab_find_slot_with_hash (DEFAULT_DEFS (fn), &in,
 				      DECL_UID (var), NO_INSERT);
       if (*loc)
-	htab_clear_slot (DEFAULT_DEFS (fn), loc);
+	{
+	  SSA_NAME_IS_DEFAULT_DEF (*(tree *)loc) = false;
+	  htab_clear_slot (DEFAULT_DEFS (fn), loc);
+	}
       return;
     }
   gcc_assert (TREE_CODE (def) == SSA_NAME && SSA_NAME_VAR (def) == var);
@@ -349,7 +352,7 @@ set_ssa_default_def (struct function *fn, tree var, tree def)
 
    /* Mark DEF as the default definition for VAR.  */
   *(tree *) loc = def;
-   SSA_NAME_IS_DEFAULT_DEF (def) = true;
+  SSA_NAME_IS_DEFAULT_DEF (def) = true;
 }
 
 /* Retrieve or create a default definition for VAR.  */
diff --git a/gcc/tree-ssa-copy.c b/gcc/tree-ssa-copy.c
index 7686dda1fbdb..c5fe156ce9ae 100644
--- a/gcc/tree-ssa-copy.c
+++ b/gcc/tree-ssa-copy.c
@@ -137,12 +137,9 @@ may_propagate_copy_into_stmt (gimple dest, tree orig)
 /* Similarly, but we know that we're propagating into an ASM_EXPR.  */
 
 bool
-may_propagate_copy_into_asm (tree dest)
+may_propagate_copy_into_asm (tree dest ATTRIBUTE_UNUSED)
 {
-  /* Hard register operands of asms are special.  Do not bypass.  */
-  return !(TREE_CODE (dest) == SSA_NAME
-	   && TREE_CODE (SSA_NAME_VAR (dest)) == VAR_DECL
-	   && DECL_HARD_REGISTER (SSA_NAME_VAR (dest)));
+  return true;
 }
 
 
diff --git a/gcc/tree-ssa-live.c b/gcc/tree-ssa-live.c
index 903faa916490..3edda1e378e1 100644
--- a/gcc/tree-ssa-live.c
+++ b/gcc/tree-ssa-live.c
@@ -798,9 +798,16 @@ remove_unused_locals (void)
 	{
 	  if (!is_used_p (var))
 	    {
+	      tree def;
 	      if (cfun->nonlocal_goto_save_area
 		  && TREE_OPERAND (cfun->nonlocal_goto_save_area, 0) == var)
 		cfun->nonlocal_goto_save_area = NULL;
+	      /* Release any default def associated with var.  */
+	      if ((def = ssa_default_def (cfun, var)) != NULL_TREE)
+		{
+		  set_ssa_default_def (cfun, var, NULL_TREE);
+		  release_ssa_name (def);
+		}
 	      continue;
 	    }
 	}