diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bf326de9eea..ce01cd2c684 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-12  Daniel Berlin  <dberlin@dberlin.org>
+
+	Fix PR tree-optimization/29587
+	* tree-ssa-structalias.c (process_constraint): Don't
+	mark address taken due only to escaped vars constraint.
+
 2006-11-12  Michael Matz  <matz@suse.de>
 	    Roger Sayle  <roger@eyesopen.com>
 
diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c
index c7ee8aabaec..42099ddedd4 100644
--- a/gcc/tree-ssa-structalias.c
+++ b/gcc/tree-ssa-structalias.c
@@ -2327,8 +2327,11 @@ process_constraint (constraint_t t)
       varinfo_t vi;
       gcc_assert (rhs.offset == 0);
       
-      for (vi = get_varinfo (rhs.var); vi != NULL; vi = vi->next)
-	vi->address_taken = true;
+      /* No need to mark address taken simply because of escaped vars
+	 constraints.  */
+      if (lhs.var != escaped_vars_id)
+	for (vi = get_varinfo (rhs.var); vi != NULL; vi = vi->next)
+	  vi->address_taken = true;
 
       VEC_safe_push (constraint_t, heap, constraints, t);
     }