diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e111d5d87da..d901c8c49bc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-15  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* tree-nested.c (get_frame_type): Mark the "non-local frame structure"
+	as addressable.
+
 2005-09-15  Michael Matz  <matz@suse.de>
 
 	* tree-vrp.c (vrp_int_const_binop <MINUS_EXPR>): Handle 0 - -INF.
diff --git a/gcc/tree-nested.c b/gcc/tree-nested.c
index 6f0b7fd20f0..d42c583ce51 100644
--- a/gcc/tree-nested.c
+++ b/gcc/tree-nested.c
@@ -220,6 +220,14 @@ get_frame_type (struct nesting_info *info)
 
       info->frame_type = type;
       info->frame_decl = create_tmp_var_for (info, type, "FRAME");
+
+      /* ??? Always make it addressable for now, since it is meant to
+	 be pointed to by the static chain pointer.  This pessimizes
+	 when it turns out that no static chains are needed because
+	 the nested functions referencing non-local variables are not
+	 reachable, but the true pessimization is to create the non-
+	 local frame structure in the first place.  */
+      TREE_ADDRESSABLE (info->frame_decl) = 1;
     }
   return type;
 }