diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1867f597b9b6..ebc064d0800d 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2000-06-02  Jason Merrill  <jason@casey.soma.redhat.com>
+
+	* decl.c (store_return_init): Call put_var_into_stack.
+
 2000-06-01  Mark Mitchell  <mark@codesourcery.com>
 
 	* cp-tree.h (lang_decl_flags): Add anticipated_p.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 55c7ba5d0986..1cd6f438d4e0 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -169,6 +169,7 @@ static void make_rtl_for_nonlocal_decl PARAMS ((tree, tree, const char *));
 static void push_cp_function_context PARAMS ((struct function *));
 static void pop_cp_function_context PARAMS ((struct function *));
 static void mark_binding_level PARAMS ((void *));
+static void mark_named_label_lists PARAMS ((void *, void *));
 static void mark_cp_function_context PARAMS ((struct function *));
 static void mark_saved_scope PARAMS ((void *));
 static void mark_lang_function PARAMS ((struct language_function *));
@@ -14025,6 +14026,8 @@ store_return_init (decl)
 	 here, we use the mode the back-end has already assigned for
 	 the return value.  */
       DECL_RTL (decl) = gen_reg_rtx (GET_MODE (original_result_rtx));
+      if (TREE_ADDRESSABLE (decl))
+	put_var_into_stack (decl);
     }
 }