diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 976d2e57595..efa79bb6c1a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-28  Jason Merrill  <jason@redhat.com>
+
+	* decl.c (expand_static_init): Avoid bogus warnings.
+
 2004-08-27  Jason Merrill  <jason@redhat.com>
 
 	PR c++/16851
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index c746e336fba..2265d4e2b26 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -5151,8 +5151,8 @@ expand_static_init (tree decl, tree init)
   if (DECL_FUNCTION_SCOPE_P (decl))
     {
       /* Emit code to perform this initialization but once.  */
-      tree if_stmt, inner_if_stmt;
-      tree then_clause, inner_then_clause;
+      tree if_stmt, inner_if_stmt = NULL_TREE;
+      tree then_clause, inner_then_clause = NULL_TREE;
       tree guard, guard_addr, guard_addr_list;
       tree acquire_fn, release_fn, abort_fn;
       tree flag, begin;