diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 03db6c25162..aaba6468cca 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-27  Richard Guenther  <rguenther@suse.de>
+
+	* tree-ssa-structalias.c (intra_create_variable_infos): Make
+	a constraint for the static chain parameter.
+
 2008-11-27  Bernd Schmidt  <bernd.schmidt@analog.com>
 
 	* config/bfin/bfin.opt (micplb): New option.
diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c
index 5083ee5a329..3be76acf1b8 100644
--- a/gcc/tree-ssa-structalias.c
+++ b/gcc/tree-ssa-structalias.c
@@ -4560,6 +4560,15 @@ intra_create_variable_infos (void)
 	    make_constraint_from (p, nonlocal_id);
 	}
     }
+
+  /* Add a constraint for the incoming static chain parameter.  */
+  if (cfun->static_chain_decl != NULL_TREE)
+    {
+      varinfo_t p, chain_vi = get_vi_for_tree (cfun->static_chain_decl);
+
+      for (p = chain_vi; p; p = p->next)
+	make_constraint_from (p, nonlocal_id);
+    }
 }
 
 /* Structure used to put solution bitmaps in a hashtable so they can